Changeset b160af605b251682ad86348cc4e07287084e891c

Timestamp:

02/27/07 20:39:41 (2 years ago)

Author:

Laurent Aimar <fenrir@videolan.org>

git-committer:

Laurent Aimar <fenrir@videolan.org> 1172605181 +0000

git-parent:

[b1184c1e58512481458293fdc7d8d16f2dc9211c]

git-author:

Laurent Aimar <fenrir@videolan.org> 1172605181 +0000

Message:

Added all missing case for "Detection of the first VCL NAL unit of a primary coded picture".
Fixed prepend of SPS/PPS per I frame.

Files:

• modules/packetizer/h264.c (modified) (10 diffs)

modules/packetizer/h264.c

@@ -59 +59 @@
-static block_t *PacketizeAVC1( decoder_t *, block_t ** );
-
+typedef struct
+{
+    int i_nal_type;
+    int i_nal_ref_idc;
+
+    int i_frame_type;
+    int i_pic_parameter_set_id;
+    int i_frame_num;
+
+    int i_field_pic_flag;
+    int i_bottom_field_flag;
+
+    int i_idr_pic_id;
+
+    int i_pic_order_cnt_lsb;
+    int i_delta_pic_order_cnt_bottom;
+
+    int i_delta_pic_order_cnt0;
+    int i_delta_pic_order_cnt1;
+} slice_t;
+
-struct decoder_sys_t
-{
@@ -82 +103 @@
-    int i_log2_max_frame_num;
-    int b_frame_mbs_only;
+    int i_pic_order_cnt_type;
+    int i_delta_pic_order_always_zero_flag;
+    int i_log2_max_pic_order_cnt_lsb;
+
+    /* Value from Picture Parameter Set */
+    int i_pic_order_present_flag;
-
-    /* Useful values of the Slice Header */
-
-
-
-
-
+
-};
-
@@ -166 +189 @@
-    p_sys->b_header= VLC_FALSE;
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-
-    /* Setup properties */
@@ -223 +251 @@
-        p_dec->fmt_out.i_extra = p_sys->p_pps->i_buffer + p_sys->p_sps->i_buffer;
-        p_dec->fmt_out.p_extra = (uint8_t*)malloc( p_dec->fmt_out.i_extra );
-
-
+(uint8_t*)
+(uint8_t*)
-        p_sys->b_header = VLC_TRUE;
-
@@ -336 +364 @@
-
-                /* Remove trailing 0 bytes */
-
+
+
-                p_sys->i_offset = 0;
-
@@ -484 +513 @@
-#define OUTPUT \
-    do {                                                      \
-
+slice.
-            break;                                            \
-                                                              \
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-        p_pic->i_length = 0;    /* FIXME */                   \
-i_frame_type;      
-                                                  
-i_frame_type = 0;      
+slice.i_frame_type;
+
+slice.i_frame_type = 0;
-        p_sys->p_frame = NULL;                                \
-        p_sys->b_slice = VLC_FALSE;                           \
-                                                              \
-        if( ( p_pic->i_flags & BLOCK_FLAG_TYPE_I ) &&         \
-              p_sys->p_sps && p_sys->p_pps )                  \
-        {                                                     \
-            block_t *p_sps = block_Duplicate( p_sys->p_sps ); \
-            block_t *p_pps = block_Duplicate( p_sys->p_pps ); \
-            p_sps->i_dts = p_pps->i_dts = p_pic->i_dts;       \
-            p_sps->i_pts = p_pps->i_pts = p_pic->i_pts;       \
-            block_ChainAppend( &p_sps, p_pps );               \
-            block_ChainAppend( &p_sps, p_pic );               \
-            p_pic = p_sps;                                    \
-            p_sys->b_header = VLC_TRUE;                       \
-        }                                                     \
-    } while(0)
-
-
-
+
-    {
-        block_ChainRelease( p_sys->p_frame );
-
+/PPS
-
-        /* Reset context */
+        p_sys->slice.i_frame_type = 0;
-        p_sys->p_frame = NULL;
-        p_sys->b_slice = VLC_FALSE;
-    }
-
-!p_sys->b_sps
+( !p_sys->b_sps || !p_sys->b_pps )
-        i_nal_type >= NAL_SLICE && i_nal_type <= NAL_SLICE_IDR )
-    {
@@ -529 +557 @@
-    {
-        uint8_t *dec;
-
-
+
+
+
-        bs_t s;
-
@@ -545 +574 @@
-        {
-        case 0: case 5:
-p_sys->
+slice.
-            break;
-        case 1: case 6:
-p_sys->
+slice.
-            break;
-        case 2: case 7:
-p_sys->
+slice.
-            break;
-        case 3: case 8: /* SP */
-p_sys->
+slice.
-            break;
-        case 4: case 9:
-p_sys->
+slice.
-            break;
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-        /* Detection of the first VCL NAL unit of a primary coded picture
-         * (cf. 7.4.1.2.4) */
-
-
-
-
+
+
+
+
+
-            b_pic = VLC_TRUE;
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-        p_sys->b_slice = VLC_TRUE;
@@ -624 +684 @@
-        /* Skip i_log2_max_frame_num */
-        p_sys->i_log2_max_frame_num = bs_read_ue( &s );
+        if( p_sys->i_log2_max_frame_num > 12)
+            p_sys->i_log2_max_frame_num = 12;
-        /* Read poc_type */
-i_tmp
-i_tmp
+p_sys->i_pic_order_cnt_type
+p_sys->i_pic_order_cnt_type
-        {
-            /* skip i_log2_max_poc_lsb */
-
-
-
+
+
+
+
+
-        {
-            int i_cycle;
-            /* skip b_delta_pic_order_always_zero */
-bs_skip
+p_sys->i_delta_pic_order_always_zero_flag = bs_read
-            /* skip i_offset_for_non_ref_pic */
-            bs_read_se( &s );
@@ -732 +796 @@
-    {
-        bs_t s;
+
-        bs_init( &s, &p_frag->p_buffer[5], p_frag->i_buffer - 5 );
+        bs_read_ue( &s ); // pps id
+        bs_read_ue( &s ); // sps id
+        bs_skip( &s, 1 ); // entropy coding mode flag
+        p_sys->i_pic_order_present_flag = bs_read( &s, 1 );
-
-        if( !p_sys->b_pps ) msg_Dbg( p_dec, "found NAL_PPS" );