i_aspect_ratio et i_matrix_coefficients pour Ptyx.

diff --git a/include/vpar_headers.h b/include/vpar_headers.h
index 641707a6fffb56cd4c80ef16e33b0df11b51797a..89683811446734d895f847b09d650ff97f194eb3 100644 (file)
--- a/include/vpar_headers.h
+++ b/include/vpar_headers.h
@@ -42,7 +42,7 @@ typedef struct sequence_s
 {
     u32                 i_height, i_width, i_size;
     u32                 i_mb_height, i_mb_width, i_mb_size;
-    unsigned int        i_aspect_ratio;
+    unsigned int        i_aspect_ratio, i_matrix_coefficients;
     float               r_frame_rate;
     boolean_t           b_mpeg2;
     boolean_t           b_progressive;

diff --git a/src/video_parser/vpar_headers.c b/src/video_parser/vpar_headers.c
index df9ab7cb07809c90bca334bd5d1be46addbe5845..86d2f56287221e6fd632e56585d15ef077726600 100644 (file)
--- a/src/video_parser/vpar_headers.c
+++ b/src/video_parser/vpar_headers.c
@@ -676,6 +676,8 @@ static void PictureHeader( vpar_thread_t * p_vpar )
         P_picture->date = vpar_SynchroDecode( p_vpar,
                                               p_vpar->picture.i_coding_type,
                                               i_structure );
+        P_picture->i_aspect_ratio = p_vpar->sequence.i_aspect_ratio;
+        P_picture->i_matrix_coefficients = p_vpar->sequence.i_matrix_coefficients;
         p_vpar->picture.i_l_stride = - 8 + ( p_vpar->sequence.i_width
                     << ( 1 - p_vpar->picture.b_frame_structure ) );
         p_vpar->picture.i_c_stride = - 8 + ( p_vpar->sequence.i_chroma_width
@@ -924,8 +926,9 @@ static void SequenceDisplayExtension( vpar_thread_t * p_vpar )
     RemoveBits( &p_vpar->bit_stream, 3 );
     if( GetBits( &p_vpar->bit_stream, 1 ) )
     {
-        /* Three bytes for color_desciption */
-        RemoveBits( &p_vpar->bit_stream, 24 );
+        /* Two bytes for color_desciption */
+        RemoveBits( &p_vpar->bit_stream, 16 );
+        p_vpar->sequence.i_matrix_coefficients = GetBits( &p_vpar->bit_stream, 8 );
     }
     /* display_horizontal and vertical_size and a marker_bit */
     RemoveBits( &p_vpar->bit_stream, 29 );