Changeset e114bdd7ffd180a04bf83e8c1af5c4132a3771ad

Timestamp:

21/08/08 19:08:54 (3 months ago)

Author:

Laurent Aimar <fenrir@videolan.org>

git-committer:

Laurent Aimar <fenrir@videolan.org> 1219338534 +0200

git-parent:

[0bf165646d0dd39ad1bc698cdde0bbff1711e24d]

git-author:

Laurent Aimar <fenrir@videolan.org> 1219338381 +0200

Message:

Added BLOCK_FLAG_END_OF_SEQUENCE and use it for mpeg2.

Files:

• include/vlc_block.h (modified) (1 diff)
• modules/codec/avcodec/video.c (modified) (7 diffs)
• modules/packetizer/mpegvideo.c (modified) (2 diffs)

include/vlc_block.h

@@ -69 +69 @@
-/** This is not a key frame for bitrate shaping */
-#define BLOCK_FLAG_NO_KEYFRAME   0x0080
+/** This block contains the last part of a sequence  */
+#define BLOCK_FLAG_END_OF_SEQUENCE 0x0100
-/** This block contains a clock reference */
-#define BLOCK_FLAG_CLOCK         0x0200

modules/codec/avcodec/video.c

@@ -82 +82 @@
-    int i_buffer_orig, i_buffer;
-    char *p_buffer_orig, *p_buffer;
+
+
+    /* */
+    bool b_flush;
-};
-
@@ -319 +323 @@
-    p_sys->b_has_b_frames = false;
-    p_sys->b_first_frame = true;
+    p_sys->b_flush = false;
-    p_sys->i_late_frames = 0;
-    p_sys->i_buffer = 0;
@@ -479 +484 @@
-    if( p_block->i_buffer > 0 )
-    {
+        p_sys->b_flush = ( p_block->i_flags & BLOCK_FLAG_END_OF_SEQUENCE ) != 0;
+
-        p_sys->i_buffer = p_block->i_buffer;
-        if( p_sys->i_buffer + FF_INPUT_BUFFER_PADDING_SIZE >
@@ -502 +509 @@
-    }
-
-
+|| p_sys->b_flush 
-    {
-        int i_used, b_gotpicture;
@@ -509 +516 @@
-        i_used = avcodec_decode_video( p_sys->p_context, p_sys->p_ff_pic,
-                                       &b_gotpicture,
-
+
+
-        if( b_null_size && p_sys->p_context->width > 0 &&
-
+
+
-        {
-            /* Reparse it to not drop the I frame */
@@ -522 +531 @@
-        }
-
+        if( p_sys->b_flush )
+            p_sys->b_first_frame = true;
+
+        if( p_sys->i_buffer <= 0 )
+            p_sys->b_flush = false;
+
-        if( i_used < 0 )
-        {
@@ -537 +552 @@
-        p_sys->i_buffer -= i_used;
-        p_sys->p_buffer += i_used;
+
+    p_sys->b_first_frame = true;
-
-        /* Nothing to display */

modules/packetizer/mpegvideo.c

@@ -446 +446 @@
-             (p_frag->p_buffer[3] == 0x00 || p_frag->p_buffer[3] > 0xaf) )
-    {
+        const bool b_eos = p_frag->p_buffer[3] == 0xb7;
+
-        mtime_t i_duration;
-
+        if( b_eos )
+        {
+            block_ChainLastAppend( &p_sys->pp_last, p_frag );
+            p_frag = NULL;
+        }
+
-        p_pic = block_ChainGather( p_sys->p_frame );
+
+        if( b_eos )
+            p_pic->i_flags |= BLOCK_FLAG_END_OF_SEQUENCE;
-
-        i_duration = (mtime_t)( 1000000 * p_sys->i_frame_rate_base /
@@ -564 +575 @@
-    }
-
+    if( !p_frag )
+        return p_pic;
-    /*
-     * Check info of current fragment