mux: fix chunked interleaver
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 15 Jan 2013 18:58:23 +0000 (19:58 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 16 Jan 2013 19:22:58 +0000 (20:22 +0100)
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 <michaelni@gmx.at>
libavformat/mux.c

index ae5e691..d939315 100644 (file)
@@ -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