Chiebot-Mirror
/
FFmpeg
mirror of https://github.com/FFmpeg/FFmpeg.git
8
0
Fork 0
Code Issues Projects Releases Wiki Activity

avformat/mux: Don't use stack packet when writing interleaved packets

Browse Source 
Currently the interleave_packet functions use a packet for
a new packet to be interleaved (may be NULL if there is none) and
a packet for output; said packet is always a stack packet in
interleaved_write_packet(). But all the interleave_packet functions
in use first move the packet to the packet list and then check whether
a packet can be returned, i.e. the effective lifetime of the new packet
ends before the packet for output is touched.

So one can use one packet both for input and output by adding a new
parameter that indicates whether there is a packet to add to the packet
list; there is just one complication: In case the muxer is flushed,
there is no packet available. This can be solved by reusing one of
the packets from AVFormatInternal. They are currently unused when
flushing in av_interleaved_write_frame().

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
pull/369/head
Andreas Rheinhardt 3 years ago
parent 9190302b2e
commit 4fa8daab79
5 changed files with 49 additions and 48 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 18
      libavformat/avformat.h
  2. 7
      libavformat/gxfenc.c
  3. 19
      libavformat/internal.h
  4. 44
      libavformat/mux.c
  5. 9
      libavformat/mxfenc.c

18
libavformat/avformat.h
Unescape View File

@ -553,9 +553,21 @@ typedef struct AVOutputFormat {
/** /**
* A format-specific function for interleavement. * A format-specific function for interleavement.
* If unset, packets will be interleaved by dts. * If unset, packets will be interleaved by dts.
*/ *
int (*interleave_packet)(struct AVFormatContext *, AVPacket *out, * @param s An AVFormatContext for output. pkt will be added to
AVPacket *in, int flush); * resp. taken from its packet buffer.
* @param[in,out] pkt A packet to be interleaved if has_packet is set;
* also used to return packets. If no packet is returned
* (e.g. on error), pkt is blank on return.
* @param flush 1 if no further packets are available as input and
* all remaining packets should be output.
* @param has_packet If set, pkt contains a packet to be interleaved
* on input; otherwise pkt is blank on input.
* @return 1 if a packet was output, 0 if no packet could be output,
* < 0 if an error occurred
*/
int (*interleave_packet)(struct AVFormatContext *s, AVPacket *pkt,
int flush, int has_packet);
/** /**
* Test if the given codec can be stored in this container. * Test if the given codec can be stored in this container.
* *

7
libavformat/gxfenc.c
Unescape View File

@ -992,10 +992,11 @@ static int gxf_compare_field_nb(AVFormatContext *s, const AVPacket *next,
(field_nb[1] == field_nb[0] && sc[1]->order > sc[0]->order); (field_nb[1] == field_nb[0] && sc[1]->order > sc[0]->order);
} }
static int gxf_interleave_packet(AVFormatContext *s, AVPacket *out, AVPacket *pkt, int flush) static int gxf_interleave_packet(AVFormatContext *s, AVPacket *pkt,
int flush, int has_packet)
{ {
int ret; int ret;
if (pkt) { if (has_packet) {
AVStream *st = s->streams[pkt->stream_index]; AVStream *st = s->streams[pkt->stream_index];
GXFStreamContext *sc = st->priv_data; GXFStreamContext *sc = st->priv_data;
if (st->codecpar->codec_type == AVMEDIA_TYPE_VIDEO) if (st->codecpar->codec_type == AVMEDIA_TYPE_VIDEO)
@ -1006,7 +1007,7 @@ static int gxf_interleave_packet(AVFormatContext *s, AVPacket *out, AVPacket *pk
if ((ret = ff_interleave_add_packet(s, pkt, gxf_compare_field_nb)) < 0) if ((ret = ff_interleave_add_packet(s, pkt, gxf_compare_field_nb)) < 0)
return ret; return ret;
} }
return ff_interleave_packet_per_dts(s, out, NULL, flush); return ff_interleave_packet_per_dts(s, pkt, flush, 0);
} }
const AVOutputFormat ff_gxf_muxer = { const AVOutputFormat ff_gxf_muxer = {

19
libavformat/internal.h
Unescape View File

@ -107,7 +107,8 @@ typedef struct FFFormatContext {
struct PacketList *parse_queue_end; struct PacketList *parse_queue_end;
/** /**
* The generic code uses this as a temporary packet * The generic code uses this as a temporary packet
* to parse packets; it may also be used for other means * to parse packets or for muxing, especially flushing.
* For demuxers, it may also be used for other means
* for short periods that are guaranteed not to overlap * for short periods that are guaranteed not to overlap
* with calls to av_read_frame() (or ff_read_packet()) * with calls to av_read_frame() (or ff_read_packet())
* or with each other. * or with each other.
@ -746,18 +747,10 @@ int ff_add_attached_pic(AVFormatContext *s, AVStream *st, AVIOContext *pb,
/** /**
* Interleave an AVPacket per dts so it can be muxed. * Interleave an AVPacket per dts so it can be muxed.
* * See the documentation of AVOutputFormat.interleave_packet for details.
* @param s an AVFormatContext for output. pkt resp. out will be added to */
* resp. taken from its packet buffer. int ff_interleave_packet_per_dts(AVFormatContext *s, AVPacket *pkt,
* @param out the interleaved packet will be output here int flush, int has_packet);
* @param pkt the input packet; will be blank on return if not NULL
* @param flush 1 if no further packets are available as input and all
* remaining packets should be output
* @return 1 if a packet was output, 0 if no packet could be output
* (in which case out may be uninitialized), < 0 if an error occurred
*/
int ff_interleave_packet_per_dts(AVFormatContext *s, AVPacket *out,
AVPacket *pkt, int flush);
void ff_free_stream(AVFormatContext *s, AVStream *st); void ff_free_stream(AVFormatContext *s, AVStream *st);

44
libavformat/mux.c
Unescape View File

@ -903,8 +903,8 @@ static int interleave_compare_dts(AVFormatContext *s, const AVPacket *next,
return comp > 0; return comp > 0;
} }
int ff_interleave_packet_per_dts(AVFormatContext *s, AVPacket *out, int ff_interleave_packet_per_dts(AVFormatContext *s, AVPacket *pkt,
AVPacket *pkt, int flush) int flush, int has_packet)
{ {
FFFormatContext *const si = ffformatcontext(s); FFFormatContext *const si = ffformatcontext(s);
int stream_count = 0; int stream_count = 0;
@ -912,7 +912,7 @@ int ff_interleave_packet_per_dts(AVFormatContext *s, AVPacket *out,
int ret; int ret;
int eof = flush; int eof = flush;
if (pkt) { if (has_packet) {
if ((ret = ff_interleave_add_packet(s, pkt, interleave_compare_dts)) < 0) if ((ret = ff_interleave_add_packet(s, pkt, interleave_compare_dts)) < 0)
return ret; return ret;
} }
@ -1009,7 +1009,7 @@ int ff_interleave_packet_per_dts(AVFormatContext *s, AVPacket *out,
AVStream *const st = s->streams[pktl->pkt.stream_index]; AVStream *const st = s->streams[pktl->pkt.stream_index];
FFStream *const sti = ffstream(st); FFStream *const sti = ffstream(st);
*out = pktl->pkt; *pkt = pktl->pkt;
si->packet_buffer = pktl->next; si->packet_buffer = pktl->next;
if (!si->packet_buffer) if (!si->packet_buffer)
@ -1055,20 +1055,16 @@ const AVPacket *ff_interleaved_peek(AVFormatContext *s, int stream)
} }
/** /**
* Interleave an AVPacket correctly so it can be muxed. * A wrapper around AVOutputFormat.interleave_packet.
* @param out the interleaved packet will be output here * See its documentation for details.
* @param in the input packet; will always be blank on return if not NULL
* @param flush 1 if no further packets are available as input and all
* remaining packets should be output
* @return 1 if a packet was output, 0 if no packet could be output,
* < 0 if an error occurred
*/ */
static int interleave_packet(AVFormatContext *s, AVPacket *out, AVPacket *in, int flush) static int interleave_packet(AVFormatContext *s, AVPacket *pkt,
int flush, int has_packet)
{ {
if (s->oformat->interleave_packet) { if (s->oformat->interleave_packet) {
return s->oformat->interleave_packet(s, out, in, flush); return s->oformat->interleave_packet(s, pkt, flush, has_packet);
} else } else
return ff_interleave_packet_per_dts(s, out, in, flush); return ff_interleave_packet_per_dts(s, pkt, flush, has_packet);
} }
static int check_bitstream(AVFormatContext *s, FFStream *sti, AVPacket *pkt) static int check_bitstream(AVFormatContext *s, FFStream *sti, AVPacket *pkt)
@ -1090,20 +1086,18 @@ static int check_bitstream(AVFormatContext *s, FFStream *sti, AVPacket *pkt)
return 1; return 1;
} }
static int interleaved_write_packet(AVFormatContext *s, AVPacket *pkt, int flush) static int interleaved_write_packet(AVFormatContext *s, AVPacket *pkt,
int flush, int has_packet)
{ {
for (;; ) { for (;; ) {
AVPacket opkt; int ret = interleave_packet(s, pkt, flush, has_packet);
int ret = interleave_packet(s, &opkt, pkt, flush);
if (ret <= 0) if (ret <= 0)
return ret; return ret;
pkt = NULL; has_packet = 0;
ret = write_packet(s, &opkt);
av_packet_unref(&opkt);
ret = write_packet(s, pkt);
av_packet_unref(pkt);
if (ret < 0) if (ret < 0)
return ret; return ret;
} }
@ -1127,7 +1121,7 @@ static int write_packet_common(AVFormatContext *s, AVStream *st, AVPacket *pkt,
if (interleaved) { if (interleaved) {
if (pkt->dts == AV_NOPTS_VALUE && !(s->oformat->flags & AVFMT_NOTIMESTAMPS)) if (pkt->dts == AV_NOPTS_VALUE && !(s->oformat->flags & AVFMT_NOTIMESTAMPS))
return AVERROR(EINVAL); return AVERROR(EINVAL);
return interleaved_write_packet(s, pkt, 0); return interleaved_write_packet(s, pkt, 0, 1);
} else { } else {
return write_packet(s, pkt); return write_packet(s, pkt);
} }
@ -1251,7 +1245,7 @@ int av_interleaved_write_frame(AVFormatContext *s, AVPacket *pkt)
return ret; return ret;
} else { } else {
av_log(s, AV_LOG_TRACE, "av_interleaved_write_frame FLUSH\n"); av_log(s, AV_LOG_TRACE, "av_interleaved_write_frame FLUSH\n");
return interleaved_write_packet(s, NULL, 1/*flush*/); return interleaved_write_packet(s, ffformatcontext(s)->parse_pkt, 1/*flush*/, 0);
} }
} }
@ -1271,7 +1265,7 @@ int av_write_trailer(AVFormatContext *s)
ret = ret1; ret = ret1;
} }
} }
ret1 = interleaved_write_packet(s, NULL, 1); ret1 = interleaved_write_packet(s, pkt, 1, 0);
if (ret >= 0) if (ret >= 0)
ret = ret1; ret = ret1;

9
libavformat/mxfenc.c
Unescape View File

@ -3096,7 +3096,7 @@ static void mxf_deinit(AVFormatContext *s)
} }
} }
static int mxf_interleave_get_packet(AVFormatContext *s, AVPacket *out, AVPacket *pkt, int flush) static int mxf_interleave_get_packet(AVFormatContext *s, AVPacket *out, int flush)
{ {
FFFormatContext *const si = ffformatcontext(s); FFFormatContext *const si = ffformatcontext(s);
int i, stream_count = 0; int i, stream_count = 0;
@ -3161,16 +3161,17 @@ static int mxf_compare_timestamps(AVFormatContext *s, const AVPacket *next,
(next->dts == pkt->dts && sc->order < sc2->order); (next->dts == pkt->dts && sc->order < sc2->order);
} }
static int mxf_interleave(AVFormatContext *s, AVPacket *out, AVPacket *pkt, int flush) static int mxf_interleave(AVFormatContext *s, AVPacket *pkt,
int flush, int has_packet)
{ {
int ret; int ret;
if (pkt) { if (has_packet) {
MXFStreamContext *sc = s->streams[pkt->stream_index]->priv_data; MXFStreamContext *sc = s->streams[pkt->stream_index]->priv_data;
pkt->pts = pkt->dts = sc->pkt_cnt++; pkt->pts = pkt->dts = sc->pkt_cnt++;
if ((ret = ff_interleave_add_packet(s, pkt, mxf_compare_timestamps)) < 0) if ((ret = ff_interleave_add_packet(s, pkt, mxf_compare_timestamps)) < 0)
return ret; return ret;
} }
return mxf_interleave_get_packet(s, out, NULL, flush); return mxf_interleave_get_packet(s, pkt, flush);
} }
#define MXF_COMMON_OPTIONS \ #define MXF_COMMON_OPTIONS \

Write Preview
Loading…
Cancel
Save