From 1191db31c1ed02255590ee5e9c0c836589f6508a Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Tue, 15 Jan 2013 19:58:23 +0100 Subject: [PATCH] mux: fix chunked interleaver The code did not account properly for packets that where added to the end of the packet list. Also flags for such packets where not set correctly leading to incorrect chunked interleaving. Reported-by: bcoudurier Signed-off-by: Michael Niedermayer --- libavformat/mux.c | 27 ++++++++++++++------------- 1 file changed, 14 insertions(+), 13 deletions(-) diff --git a/libavformat/mux.c b/libavformat/mux.c index ae5e6918c1..d93931518a 100644 --- a/libavformat/mux.c +++ b/libavformat/mux.c @@ -549,20 +549,21 @@ int ff_interleave_add_packet(AVFormatContext *s, AVPacket *pkt, next_point = &s->packet_buffer; } - if (*next_point) { - if (chunked) { - uint64_t max= av_rescale_q_rnd(s->max_chunk_duration, AV_TIME_BASE_Q, st->time_base, AV_ROUND_UP); - if ( st->interleaver_chunk_size + pkt->size <= s->max_chunk_size-1U - && st->interleaver_chunk_duration + pkt->duration <= max-1U) { - st->interleaver_chunk_size += pkt->size; - st->interleaver_chunk_duration += pkt->duration; - goto next_non_null; - } else { - st->interleaver_chunk_size = - st->interleaver_chunk_duration = 0; - this_pktl->pkt.flags |= CHUNK_START; - } + if (chunked) { + uint64_t max= av_rescale_q_rnd(s->max_chunk_duration, AV_TIME_BASE_Q, st->time_base, AV_ROUND_UP); + if ( st->interleaver_chunk_size + pkt->size <= s->max_chunk_size-1U + && st->interleaver_chunk_duration + pkt->duration <= max-1U) { + st->interleaver_chunk_size += pkt->size; + st->interleaver_chunk_duration += pkt->duration; + } else { + st->interleaver_chunk_size = + st->interleaver_chunk_duration = 0; + this_pktl->pkt.flags |= CHUNK_START; } + } + if (*next_point) { + if (chunked && !(this_pktl->pkt.flags & CHUNK_START)) + goto next_non_null; if (compare(s, &s->packet_buffer_end->pkt, pkt)) { while ( *next_point