Commit 60f77057 authored by Christophe Massiot's avatar Christophe Massiot
Browse files

i_aspect_ratio et i_matrix_coefficients pour Ptyx.

parent 33b2319e
...@@ -42,7 +42,7 @@ typedef struct sequence_s ...@@ -42,7 +42,7 @@ typedef struct sequence_s
{ {
u32 i_height, i_width, i_size; u32 i_height, i_width, i_size;
u32 i_mb_height, i_mb_width, i_mb_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; float r_frame_rate;
boolean_t b_mpeg2; boolean_t b_mpeg2;
boolean_t b_progressive; boolean_t b_progressive;
......
...@@ -676,6 +676,8 @@ static void PictureHeader( vpar_thread_t * p_vpar ) ...@@ -676,6 +676,8 @@ static void PictureHeader( vpar_thread_t * p_vpar )
P_picture->date = vpar_SynchroDecode( p_vpar, P_picture->date = vpar_SynchroDecode( p_vpar,
p_vpar->picture.i_coding_type, p_vpar->picture.i_coding_type,
i_structure ); 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 p_vpar->picture.i_l_stride = - 8 + ( p_vpar->sequence.i_width
<< ( 1 - p_vpar->picture.b_frame_structure ) ); << ( 1 - p_vpar->picture.b_frame_structure ) );
p_vpar->picture.i_c_stride = - 8 + ( p_vpar->sequence.i_chroma_width 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 ) ...@@ -924,8 +926,9 @@ static void SequenceDisplayExtension( vpar_thread_t * p_vpar )
RemoveBits( &p_vpar->bit_stream, 3 ); RemoveBits( &p_vpar->bit_stream, 3 );
if( GetBits( &p_vpar->bit_stream, 1 ) ) if( GetBits( &p_vpar->bit_stream, 1 ) )
{ {
/* Three bytes for color_desciption */ /* Two bytes for color_desciption */
RemoveBits( &p_vpar->bit_stream, 24 ); 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 */ /* display_horizontal and vertical_size and a marker_bit */
RemoveBits( &p_vpar->bit_stream, 29 ); RemoveBits( &p_vpar->bit_stream, 29 );
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment