MrBesen/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

avformat: implement retiming directly in mxfenc and gxfenc

Browse Source 
Generic retime functionality is replaced by a few lines of code directly in the
muxers which used it, which seems a lot easier to understand and this way the
retiming is not dependant of the input durations.

Also remove retimeinterleave, since it is not used by anything anymore.

Signed-off-by: Marton Balint <cus@passwd.hu>
This commit is contained in:
Marton Balint 2020-04-28 00:39:40 +02:00
parent c5324d92c5
commit 8360fd2610
5 changed files with 25 additions and 116 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libavformat/Makefile
View File

@ -205,7 +205,7 @@ OBJS-$(CONFIG_GIF_DEMUXER) += gifdec.o
OBJS-$(CONFIG_GSM_DEMUXER) += gsmdec.o
OBJS-$(CONFIG_GSM_MUXER) += rawenc.o
OBJS-$(CONFIG_GXF_DEMUXER) += gxf.o
OBJS-$(CONFIG_GXF_MUXER) += gxfenc.o retimeinterleave.o
OBJS-$(CONFIG_GXF_MUXER) += gxfenc.o
OBJS-$(CONFIG_G722_DEMUXER) += g722.o rawdec.o
OBJS-$(CONFIG_G722_MUXER) += rawenc.o
OBJS-$(CONFIG_G723_1_DEMUXER) += g723_1.o
@ -347,7 +347,7 @@ OBJS-$(CONFIG_MUSX_DEMUXER) += musx.o
OBJS-$(CONFIG_MV_DEMUXER) += mvdec.o
OBJS-$(CONFIG_MVI_DEMUXER) += mvi.o
OBJS-$(CONFIG_MXF_DEMUXER) += mxfdec.o mxf.o
OBJS-$(CONFIG_MXF_MUXER) += mxfenc.o mxf.o retimeinterleave.o avc.o
OBJS-$(CONFIG_MXF_MUXER) += mxfenc.o mxf.o avc.o
OBJS-$(CONFIG_MXG_DEMUXER) += mxg.o
OBJS-$(CONFIG_NC_DEMUXER) += ncdec.o
OBJS-$(CONFIG_NISTSPHERE_DEMUXER) += nistspheredec.o pcm.o

21
libavformat/gxfenc.c
View File

@ -27,7 +27,6 @@
#include "avformat.h"
#include "internal.h"
#include "gxf.h"
#include "retimeinterleave.h"
#define GXF_SAMPLES_PER_FRAME 32768
#define GXF_AUDIO_PACKET_SIZE 65536
@ -45,7 +44,7 @@ typedef struct GXFTimecode{
} GXFTimecode;
typedef struct GXFStreamContext {
RetimeInterleaveContext aic;
int64_t pkt_cnt;
uint32_t track_type;
uint32_t sample_size;
uint32_t sample_rate;
@ -815,7 +814,6 @@ static int gxf_write_header(AVFormatContext *s)
return -1;
}
}
ff_retime_interleave_init(&sc->aic, st->time_base);
/* FIXME first 10 audio tracks are 0 to 9 next 22 are A to V */
sc->media_info = media_info<<8 | ('0'+tracks[media_info]++);
sc->order = s->nb_streams - st->index;
@ -1012,10 +1010,19 @@ static int gxf_compare_field_nb(AVFormatContext *s, const AVPacket *next,
static int gxf_interleave_packet(AVFormatContext *s, AVPacket *out, AVPacket *pkt, int flush)
{
if (pkt && s->streams[pkt->stream_index]->codecpar->codec_type == AVMEDIA_TYPE_VIDEO)
pkt->duration = 2; // enforce 2 fields
return ff_retime_interleave(s, out, pkt, flush,
ff_interleave_packet_per_dts, gxf_compare_field_nb);
int ret;
if (pkt) {
AVStream *st = s->streams[pkt->stream_index];
GXFStreamContext *sc = st->priv_data;
if (st->codecpar->codec_type == AVMEDIA_TYPE_VIDEO)
pkt->pts = pkt->dts = sc->pkt_cnt * 2; // enforce 2 fields
else
pkt->pts = pkt->dts = sc->pkt_cnt * GXF_SAMPLES_PER_FRAME;
sc->pkt_cnt++;
if ((ret = ff_interleave_add_packet(s, pkt, gxf_compare_field_nb)) < 0)
return ret;
}
return ff_interleave_packet_per_dts(s, out, NULL, flush);
}
AVOutputFormat ff_gxf_muxer = {

14
libavformat/mxfenc.c
View File

@ -52,7 +52,6 @@
#include "libavcodec/h264_ps.h"
#include "libavcodec/golomb.h"
#include "libavcodec/internal.h"
#include "retimeinterleave.h"
#include "avformat.h"
#include "avio_internal.h"
#include "internal.h"
@ -79,7 +78,7 @@ typedef struct MXFIndexEntry {
} MXFIndexEntry;
typedef struct MXFStreamContext {
RetimeInterleaveContext aic;
int64_t pkt_cnt; ///< pkt counter for muxed packets
UID track_essence_element_key;
int index; ///< index in mxf_essence_container_uls table
const UID *codec_ul;
@ -2598,7 +2597,6 @@ static int mxf_write_header(AVFormatContext *s)
return -1;
}
}
ff_retime_interleave_init(&sc->aic, av_inv_q(mxf->tc.rate));
if (sc->index == -1) {
sc->index = mxf_get_essence_container_ul_index(st->codecpar->codec_id);
@ -3087,8 +3085,14 @@ static int mxf_compare_timestamps(AVFormatContext *s, const AVPacket *next,
static int mxf_interleave(AVFormatContext *s, AVPacket *out, AVPacket *pkt, int flush)
{
return ff_retime_interleave(s, out, pkt, flush,
mxf_interleave_get_packet, mxf_compare_timestamps);
int ret;
if (pkt) {
MXFStreamContext *sc = s->streams[pkt->stream_index]->priv_data;
pkt->pts = pkt->dts = sc->pkt_cnt++;
if ((ret = ff_interleave_add_packet(s, pkt, mxf_compare_timestamps)) < 0)
return ret;
}
return mxf_interleave_get_packet(s, out, NULL, flush);
}
#define MXF_COMMON_OPTIONS \

51
libavformat/retimeinterleave.c
View File

@ -1,51 +0,0 @@
/*
* Retime Interleaving functions
*
* Copyright (c) 2009 Baptiste Coudurier <baptiste dot coudurier at gmail dot com>
*
* This file is part of FFmpeg.
*
* FFmpeg is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
* version 2.1 of the License, or (at your option) any later version.
*
* FFmpeg is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with FFmpeg; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
#include "libavutil/mathematics.h"
#include "avformat.h"
#include "retimeinterleave.h"
#include "internal.h"
void ff_retime_interleave_init(RetimeInterleaveContext *aic, AVRational time_base)
{
aic->time_base = time_base;
}
int ff_retime_interleave(AVFormatContext *s, AVPacket *out, AVPacket *pkt, int flush,
int (*get_packet)(AVFormatContext *, AVPacket *, AVPacket *, int),
int (*compare_ts)(AVFormatContext *, const AVPacket *, const AVPacket *))
{
int ret;
if (pkt) {
AVStream *st = s->streams[pkt->stream_index];
RetimeInterleaveContext *aic = st->priv_data;
pkt->duration = av_rescale_q(pkt->duration, st->time_base, aic->time_base);
// rewrite pts and dts to be decoded time line position
pkt->pts = pkt->dts = aic->dts;
aic->dts += pkt->duration;
if ((ret = ff_interleave_add_packet(s, pkt, compare_ts)) < 0)
return ret;
}
return get_packet(s, out, NULL, flush);
}

51
libavformat/retimeinterleave.h
View File

@ -1,51 +0,0 @@
/*
* audio interleaving prototypes and declarations
*
* Copyright (c) 2009 Baptiste Coudurier <baptiste dot coudurier at gmail dot com>
*
* This file is part of FFmpeg.
*
* FFmpeg is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
* version 2.1 of the License, or (at your option) any later version.
*
* FFmpeg is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with FFmpeg; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
#ifndef AVFORMAT_RETIMEINTERLEAVE_H
#define AVFORMAT_RETIMEINTERLEAVE_H
#include "avformat.h"
typedef struct RetimeInterleaveContext {
uint64_t dts; ///< current dts
AVRational time_base; ///< time base of output packets
} RetimeInterleaveContext;
/**
* Init the retime interleave context
*/
void ff_retime_interleave_init(RetimeInterleaveContext *aic, AVRational time_base);
/**
* Retime packets per RetimeInterleaveContext->time_base and interleave them
* correctly.
* The first element of AVStream->priv_data must be RetimeInterleaveContext
* when using this function.
*
* @param get_packet function will output a packet when streams are correctly interleaved.
* @param compare_ts function will compare AVPackets and decide interleaving order.
*/
int ff_retime_interleave(AVFormatContext *s, AVPacket *out, AVPacket *pkt, int flush,
int (*get_packet)(AVFormatContext *, AVPacket *, AVPacket *, int),
int (*compare_ts)(AVFormatContext *, const AVPacket *, const AVPacket *));
#endif /* AVFORMAT_AUDIOINTERLEAVE_H */