X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fpacketizer%2Fh264.c;h=79f5f53e5410fc300e2650f64ec3aba5c8e7dac3;hb=7d1d56fec646569bd14262f6b9dde31becbe2137;hp=8b9b4c6579b3fc1fc2fdfde8bb0cea96c5afb7ea;hpb=b725ca4af86867d20b66c43a9d518f1fcda53d57;p=vlc diff --git a/modules/packetizer/h264.c b/modules/packetizer/h264.c index 8b9b4c6579..79f5f53e54 100644 --- a/modules/packetizer/h264.c +++ b/modules/packetizer/h264.c @@ -27,11 +27,16 @@ /***************************************************************************** * Preamble *****************************************************************************/ -#include /* malloc(), free() */ -#include -#include -#include +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif + +#include +#include +#include +#include +#include #include "vlc_block_helper.h" #include "vlc_bits.h" @@ -45,7 +50,7 @@ static void Close( vlc_object_t * ); vlc_module_begin(); set_category( CAT_SOUT ); set_subcategory( SUBCAT_SOUT_PACKETIZER ); - set_description( _("H.264 video packetizer") ); + set_description( N_("H.264 video packetizer") ); set_capability( "packetizer", 50 ); set_callbacks( Open, Close ); vlc_module_end(); @@ -57,20 +62,41 @@ vlc_module_end(); static block_t *Packetize( decoder_t *, block_t ** ); 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 { block_bytestream_t bytestream; int i_state; - int i_offset; + size_t i_offset; uint8_t startcode[4]; - vlc_bool_t b_slice; + bool b_slice; block_t *p_frame; - vlc_bool_t b_sps; - vlc_bool_t b_pps; - vlc_bool_t b_header; + bool b_sps; + bool b_pps; + bool b_header; /* avcC data */ int i_avcC_length_size; @@ -80,13 +106,15 @@ struct decoder_sys_t /* Useful values of the Sequence Parameter Set */ 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 */ - int i_nal_type; - int i_nal_ref_idc; - int i_idr_pic_id; - int i_frame_num; - int i_frame_type; + slice_t slice; }; enum @@ -146,8 +174,7 @@ static int Open( vlc_object_t *p_this ) /* Allocate the memory needed to store the decoder's structure */ if( ( p_dec->p_sys = p_sys = malloc( sizeof(decoder_sys_t) ) ) == NULL ) { - msg_Err( p_dec, "out of memory" ); - return VLC_EGENERIC; + return VLC_ENOMEM; } p_sys->i_state = STATE_NOSYNC; p_sys->i_offset = 0; @@ -155,20 +182,25 @@ static int Open( vlc_object_t *p_this ) p_sys->startcode[1] = 0; p_sys->startcode[2] = 0; p_sys->startcode[3] = 1; - p_sys->bytestream = block_BytestreamInit( p_dec ); - p_sys->b_slice = VLC_FALSE; + p_sys->bytestream = block_BytestreamInit(); + p_sys->b_slice = false; p_sys->p_frame = NULL; - p_sys->b_sps = VLC_FALSE; - p_sys->b_pps = VLC_FALSE; + p_sys->b_sps = false; + p_sys->b_pps = false; p_sys->p_sps = 0; p_sys->p_pps = 0; - p_sys->b_header= VLC_FALSE; - - p_sys->i_nal_type = -1; - p_sys->i_nal_ref_idc = -1; - p_sys->i_idr_pic_id = -1; - p_sys->i_frame_num = -1; - p_sys->i_frame_type = 0; + p_sys->b_header= false; + + p_sys->slice.i_nal_type = -1; + p_sys->slice.i_nal_ref_idc = -1; + p_sys->slice.i_idr_pic_id = -1; + p_sys->slice.i_frame_num = -1; + p_sys->slice.i_frame_type = 0; + p_sys->slice.i_pic_parameter_set_id = -1; + p_sys->slice.i_field_pic_flag = 0; + p_sys->slice.i_bottom_field_flag = -1; + p_sys->slice.i_pic_order_cnt_lsb = -1; + p_sys->slice.i_delta_pic_order_cnt_bottom = -1; /* Setup properties */ es_format_Copy( &p_dec->fmt_out, &p_dec->fmt_in ); @@ -191,49 +223,68 @@ static int Open( vlc_object_t *p_this ) i_sps = (*p++)&0x1f; for( i = 0; i < i_sps; i++ ) { - int i_length = GetWBE( p ); - block_t *p_sps = nal_get_annexeb( p_dec, p + 2, i_length ); - + uint16_t i_length = GetWBE( p ); p += 2; + if( i_length > + (uint8_t*)p_dec->fmt_in.p_extra + p_dec->fmt_in.i_extra - p ) + { + return VLC_EGENERIC; + } + block_t *p_sps = nal_get_annexeb( p_dec, p, i_length ); + if( !p_sps ) + return VLC_EGENERIC; p_sys->p_sps = block_Duplicate( p_sps ); p_sps->i_pts = p_sps->i_dts = mdate(); ParseNALBlock( p_dec, p_sps ); - p += 2 + i_length; + p += i_length; } /* Read PPS */ i_pps = *p++; for( i = 0; i < i_pps; i++ ) { - int i_length = GetWBE( p ); - block_t *p_pps = nal_get_annexeb( p_dec, p + 2, i_length ); - + uint16_t i_length = GetWBE( p ); p += 2; + if( i_length > + (uint8_t*)p_dec->fmt_in.p_extra + p_dec->fmt_in.i_extra - p ) + { + return VLC_EGENERIC; + } + block_t *p_pps = nal_get_annexeb( p_dec, p, i_length ); + if( !p_pps ) + return VLC_EGENERIC; p_sys->p_pps = block_Duplicate( p_pps ); p_pps->i_pts = p_pps->i_dts = mdate(); ParseNALBlock( p_dec, p_pps ); - p += 2 + i_length; + p += i_length; } msg_Dbg( p_dec, "avcC length size=%d, sps=%d, pps=%d", p_sys->i_avcC_length_size, i_sps, i_pps ); /* FIXME: FFMPEG isn't happy at all if you leave this */ - if( p_dec->fmt_out.i_extra ) free( p_dec->fmt_out.p_extra ); - p_dec->fmt_out.i_extra = 0; p_dec->fmt_out.p_extra = NULL; - + if( p_dec->fmt_out.i_extra > 0 ) free( p_dec->fmt_out.p_extra ); + p_dec->fmt_out.i_extra = 0; + p_dec->fmt_out.p_extra = NULL; + /* Set the new extradata */ 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 ); - memcpy( p_dec->fmt_out.p_extra, p_sys->p_sps->p_buffer, p_sys->p_sps->i_buffer); - memcpy( p_dec->fmt_out.p_extra+p_sys->p_sps->i_buffer, p_sys->p_pps->p_buffer, p_sys->p_pps->i_buffer); - p_sys->b_header = VLC_TRUE; + p_dec->fmt_out.p_extra = malloc( p_dec->fmt_out.i_extra ); + if( p_dec->fmt_out.p_extra ) + { + memcpy( (uint8_t*)p_dec->fmt_out.p_extra, + p_sys->p_sps->p_buffer, p_sys->p_sps->i_buffer); + memcpy( (uint8_t*)p_dec->fmt_out.p_extra+p_sys->p_sps->i_buffer, + p_sys->p_pps->p_buffer, p_sys->p_pps->i_buffer); + p_sys->b_header = true; + } + else p_dec->fmt_out.i_extra = 0; /* Set callback */ p_dec->pf_packetize = PacketizeAVC1; } else { - /* This type of stream contains data with 3 of 4 byte startcodes + /* This type of stream contains data with 3 of 4 byte startcodes * The fmt_in.p_extra MAY contain SPS/PPS with 4 byte startcodes * The fmt_out.p_extra should be the same */ - + /* Set callback */ p_dec->pf_packetize = Packetize; @@ -282,7 +333,25 @@ static block_t *Packetize( decoder_t *p_dec, block_t **pp_block ) decoder_sys_t *p_sys = p_dec->p_sys; block_t *p_pic; - if( !pp_block || !*pp_block ) return NULL; + if( !pp_block || !*pp_block ) + return NULL; + + if( (*pp_block)->i_flags&(BLOCK_FLAG_DISCONTINUITY|BLOCK_FLAG_CORRUPTED) ) + { + if( (*pp_block)->i_flags&BLOCK_FLAG_CORRUPTED ) + { + p_sys->i_state = STATE_NOSYNC; + block_BytestreamFlush( &p_sys->bytestream ); + + if( p_sys->p_frame ) + block_ChainRelease( p_sys->p_frame ); + p_sys->p_frame = NULL; + p_sys->slice.i_frame_type = 0; + p_sys->b_slice = false; + } + block_Release( *pp_block ); + return NULL; + } block_BytestreamPush( &p_sys->bytestream, *pp_block ); @@ -334,7 +403,8 @@ static block_t *Packetize( decoder_t *p_dec, block_t **pp_block ) p_pic->i_buffer-1 ); /* Remove trailing 0 bytes */ - while( p_pic->i_buffer && (!p_pic->p_buffer[p_pic->i_buffer-1] ) ) p_pic->i_buffer--; + while( p_pic->i_buffer && (!p_pic->p_buffer[p_pic->i_buffer-1] ) ) + p_pic->i_buffer--; p_sys->i_offset = 0; /* Parse the NAL */ @@ -344,7 +414,7 @@ static block_t *Packetize( decoder_t *p_dec, block_t **pp_block ) break; } #if 0 - msg_Dbg( p_dec, "pts="I64Fd" dts="I64Fd, + msg_Dbg( p_dec, "pts=%"PRId64" dts=%"PRId64, p_pic->i_pts, p_pic->i_dts ); #endif @@ -370,7 +440,13 @@ static block_t *PacketizeAVC1( decoder_t *p_dec, block_t **pp_block ) block_t *p_ret = NULL; uint8_t *p; - if( !pp_block || !*pp_block ) return NULL; + if( !pp_block || !*pp_block ) + return NULL; + if( (*pp_block)->i_flags&(BLOCK_FLAG_DISCONTINUITY|BLOCK_FLAG_CORRUPTED) ) + { + block_Release( *pp_block ); + return NULL; + } p_block = *pp_block; *pp_block = NULL; @@ -386,18 +462,23 @@ static block_t *PacketizeAVC1( decoder_t *p_dec, block_t **pp_block ) i_size = (i_size << 8) | (*p++); } - if( i_size > 0 ) + if( i_size <= 0 || + i_size > ( p_block->p_buffer + p_block->i_buffer - p ) ) { - block_t *p_part = nal_get_annexeb( p_dec, p, i_size ); + msg_Err( p_dec, "Broken frame : size %d is too big", i_size ); + break; + } - p_part->i_dts = p_block->i_dts; - p_part->i_pts = p_block->i_pts; + block_t *p_part = nal_get_annexeb( p_dec, p, i_size ); + if( !p_part ) + break; + p_part->i_dts = p_block->i_dts; + p_part->i_pts = p_block->i_pts; - /* Parse the NAL */ - if( ( p_pic = ParseNALBlock( p_dec, p_part ) ) ) - { - block_ChainAppend( &p_ret, p_pic ); - } + /* Parse the NAL */ + if( ( p_pic = ParseNALBlock( p_dec, p_part ) ) ) + { + block_ChainAppend( &p_ret, p_pic ); } p += i_size; } @@ -411,6 +492,7 @@ static block_t *nal_get_annexeb( decoder_t *p_dec, uint8_t *p, int i_size ) block_t *p_nal; p_nal = block_New( p_dec, 4 + i_size ); + if( !p_nal ) return NULL; /* Add start code */ p_nal->p_buffer[0] = 0x00; @@ -432,20 +514,22 @@ static void nal_get_decoded( uint8_t **pp_ret, int *pi_ret, *pp_ret = dst; - while( src < end ) + if( dst ) { - if( src < end - 3 && src[0] == 0x00 && src[1] == 0x00 && - src[2] == 0x03 ) + while( src < end ) { - *dst++ = 0x00; - *dst++ = 0x00; + if( src < end - 3 && src[0] == 0x00 && src[1] == 0x00 && + src[2] == 0x03 ) + { + *dst++ = 0x00; + *dst++ = 0x00; - src += 3; - continue; + src += 3; + continue; + } + *dst++ = *src++; } - *dst++ = *src++; } - *pi_ret = dst - *pp_ret; } @@ -467,10 +551,9 @@ static inline int bs_read_se( bs_t *s ) return val&0x01 ? (val+1)/2 : -(val/2); } - /***************************************************************************** * ParseNALBlock: parses annexB type NALs - * All p_frag blocks are required to start with 0 0 0 1 4-byte startcode + * All p_frag blocks are required to start with 0 0 0 1 4-byte startcode *****************************************************************************/ static block_t *ParseNALBlock( decoder_t *p_dec, block_t *p_frag ) { @@ -482,53 +565,53 @@ static block_t *ParseNALBlock( decoder_t *p_dec, block_t *p_frag ) #define OUTPUT \ do { \ - if( !p_sys->b_header && p_sys->i_frame_type != BLOCK_FLAG_TYPE_I) \ + if( !p_sys->b_header && p_sys->slice.i_frame_type != BLOCK_FLAG_TYPE_I) \ break; \ \ - p_pic = block_ChainGather( p_sys->p_frame ); \ - p_pic->i_length = 0; /* FIXME */ \ - p_pic->i_flags |= p_sys->i_frame_type; \ - \ - p_sys->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 ) \ - { \ + if( p_sys->slice.i_frame_type == 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; \ + p_sps->i_dts = p_sys->p_frame->i_dts; \ + p_sps->i_pts = p_sys->p_frame->i_pts; \ block_ChainAppend( &p_sps, p_pps ); \ - block_ChainAppend( &p_sps, p_pic ); \ - p_pic = p_sps; \ - p_sys->b_header = VLC_TRUE; \ - } \ + block_ChainAppend( &p_sps, p_sys->p_frame ); \ + p_sys->b_header = true; \ + p_pic = block_ChainGather( p_sps ); \ + } else { \ + p_pic = block_ChainGather( p_sys->p_frame ); \ + } \ + p_pic->i_length = 0; /* FIXME */ \ + p_pic->i_flags |= p_sys->slice.i_frame_type; \ + \ + p_sys->slice.i_frame_type = 0; \ + p_sys->p_frame = NULL; \ + p_sys->b_slice = false; \ } while(0) - - if( p_sys->b_slice && !p_sys->b_sps ) + if( p_sys->b_slice && ( !p_sys->b_sps || !p_sys->b_pps ) ) { block_ChainRelease( p_sys->p_frame ); - msg_Warn( p_dec, "waiting for SPS" ); + msg_Warn( p_dec, "waiting for SPS/PPS" ); /* Reset context */ + p_sys->slice.i_frame_type = 0; p_sys->p_frame = NULL; - p_sys->b_slice = VLC_FALSE; + p_sys->b_slice = false; } - if( !p_sys->b_sps && + if( ( !p_sys->b_sps || !p_sys->b_pps ) && i_nal_type >= NAL_SLICE && i_nal_type <= NAL_SLICE_IDR ) { - p_sys->b_slice = VLC_TRUE; + p_sys->b_slice = true; /* Fragment will be discarded later on */ } else if( i_nal_type >= NAL_SLICE && i_nal_type <= NAL_SLICE_IDR ) { - uint8_t *dec; - int i_dec, i_first_mb, i_slice_type, i_frame_num; - vlc_bool_t b_pic = VLC_FALSE; + uint8_t *dec = NULL; + int i_dec = 0, i_first_mb, i_slice_type; + slice_t slice; + bool b_pic; bs_t s; /* do not convert the whole frame */ @@ -543,74 +626,108 @@ static block_t *ParseNALBlock( decoder_t *p_dec, block_t *p_frag ) switch( (i_slice_type = bs_read_ue( &s )) ) { case 0: case 5: - p_sys->i_frame_type = BLOCK_FLAG_TYPE_P; + slice.i_frame_type = BLOCK_FLAG_TYPE_P; break; case 1: case 6: - p_sys->i_frame_type = BLOCK_FLAG_TYPE_B; + slice.i_frame_type = BLOCK_FLAG_TYPE_B; break; case 2: case 7: - p_sys->i_frame_type = BLOCK_FLAG_TYPE_I; + slice.i_frame_type = BLOCK_FLAG_TYPE_I; break; case 3: case 8: /* SP */ - p_sys->i_frame_type = BLOCK_FLAG_TYPE_P; + slice.i_frame_type = BLOCK_FLAG_TYPE_P; break; case 4: case 9: - p_sys->i_frame_type = BLOCK_FLAG_TYPE_I; + slice.i_frame_type = BLOCK_FLAG_TYPE_I; + break; + default: + slice.i_frame_type = 0; break; } - /* pic_parameter_set_id */ - bs_read_ue( &s ); - /* frame_num */ - i_frame_num = bs_read( &s, p_sys->i_log2_max_frame_num + 4 ); + /* */ + slice.i_nal_type = i_nal_type; + slice.i_nal_ref_idc = i_nal_ref_idc; - /* Detection of the first VCL NAL unit of a primary coded picture - * (cf. 7.4.1.2.4) */ - if( i_frame_num != p_sys->i_frame_num || - ( (i_nal_ref_idc != p_sys->i_nal_ref_idc) && - (!i_nal_ref_idc || !p_sys->i_nal_ref_idc) ) ) - { - b_pic = VLC_TRUE; - } - p_sys->i_frame_num = i_frame_num; - p_sys->i_nal_ref_idc = i_nal_ref_idc; + slice.i_pic_parameter_set_id = bs_read_ue( &s ); + slice.i_frame_num = bs_read( &s, p_sys->i_log2_max_frame_num + 4 ); + slice.i_field_pic_flag = 0; + slice.i_bottom_field_flag = -1; if( !p_sys->b_frame_mbs_only ) { /* field_pic_flag */ - if( bs_read( &s, 1 ) ) - { - /* bottom_field_flag */ - bs_read( &s, 1 ); - } + slice.i_field_pic_flag = bs_read( &s, 1 ); + if( slice.i_field_pic_flag ) + slice.i_bottom_field_flag = bs_read( &s, 1 ); } - if( i_nal_type == NAL_SLICE_IDR ) + slice.i_idr_pic_id = p_sys->slice.i_idr_pic_id; + if( slice.i_nal_type == NAL_SLICE_IDR ) + slice.i_idr_pic_id = bs_read_ue( &s ); + + slice.i_pic_order_cnt_lsb = -1; + slice.i_delta_pic_order_cnt_bottom = -1; + slice.i_delta_pic_order_cnt0 = 0; + slice.i_delta_pic_order_cnt1 = 0; + if( p_sys->i_pic_order_cnt_type == 0 ) + { + slice.i_pic_order_cnt_lsb = bs_read( &s, p_sys->i_log2_max_pic_order_cnt_lsb + 4 ); + if( p_sys->i_pic_order_present_flag && !slice.i_field_pic_flag ) + slice.i_delta_pic_order_cnt_bottom = bs_read_se( &s ); + } + else if( (p_sys->i_pic_order_cnt_type == 1) && + (!p_sys->i_delta_pic_order_always_zero_flag) ) { - /* id_pic_id */ - int i_idr_pic_id = bs_read_ue( &s ); - if( p_sys->i_nal_type != i_nal_type ) b_pic = VLC_TRUE; - if( p_sys->i_idr_pic_id != i_idr_pic_id ) b_pic = VLC_TRUE; - p_sys->i_idr_pic_id = i_idr_pic_id; + slice.i_delta_pic_order_cnt0 = bs_read_se( &s ); + if( p_sys->i_pic_order_present_flag && !slice.i_field_pic_flag ) + slice.i_delta_pic_order_cnt1 = bs_read_se( &s ); } - p_sys->i_nal_type = i_nal_type; - if( b_pic && p_sys->b_slice ) OUTPUT; + /* Detection of the first VCL NAL unit of a primary coded picture + * (cf. 7.4.1.2.4) */ + b_pic = false; + if( slice.i_frame_num != p_sys->slice.i_frame_num || + slice.i_pic_parameter_set_id != p_sys->slice.i_pic_parameter_set_id || + slice.i_field_pic_flag != p_sys->slice.i_field_pic_flag || + slice.i_nal_ref_idc != p_sys->slice.i_nal_ref_idc ) + b_pic = true; + if( (slice.i_bottom_field_flag != -1) && + (p_sys->slice.i_bottom_field_flag != -1) && + (slice.i_bottom_field_flag != p_sys->slice.i_bottom_field_flag) ) + b_pic = true; + if( p_sys->i_pic_order_cnt_type == 0 && + ( slice.i_pic_order_cnt_lsb != p_sys->slice.i_pic_order_cnt_lsb || + slice.i_delta_pic_order_cnt_bottom != p_sys->slice.i_delta_pic_order_cnt_bottom ) ) + b_pic = true; + else if( p_sys->i_pic_order_cnt_type == 1 && + ( slice.i_delta_pic_order_cnt0 != p_sys->slice.i_delta_pic_order_cnt0 || + slice.i_delta_pic_order_cnt1 != p_sys->slice.i_delta_pic_order_cnt1 ) ) + b_pic = true; + if( ( slice.i_nal_type == NAL_SLICE_IDR || p_sys->slice.i_nal_type == NAL_SLICE_IDR ) && + ( slice.i_nal_type != p_sys->slice.i_nal_type || slice.i_idr_pic_id != p_sys->slice.i_idr_pic_id ) ) + b_pic = true; + + /* */ + p_sys->slice = slice; - p_sys->b_slice = VLC_TRUE; + if( b_pic && p_sys->b_slice ) + OUTPUT; + + p_sys->b_slice = true; free( dec ); } else if( i_nal_type == NAL_SPS ) { - uint8_t *dec; - int i_dec; + uint8_t *dec = NULL; + int i_dec = 0; bs_t s; int i_tmp; if( !p_sys->b_sps ) msg_Dbg( p_dec, "found NAL_SPS" ); - p_sys->b_sps = VLC_TRUE; + p_sys->b_sps = true; nal_get_decoded( &dec, &i_dec, &p_frag->p_buffer[5], p_frag->i_buffer - 5 ); @@ -622,18 +739,22 @@ static block_t *ParseNALBlock( decoder_t *p_dec, block_t *p_frag ) bs_read_ue( &s ); /* 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 = bs_read_ue( &s ); - if( i_tmp == 0 ) + p_sys->i_pic_order_cnt_type = bs_read_ue( &s ); + if( p_sys->i_pic_order_cnt_type == 0 ) { /* skip i_log2_max_poc_lsb */ - bs_read_ue( &s ); + p_sys->i_log2_max_pic_order_cnt_lsb = bs_read_ue( &s ); + if( p_sys->i_log2_max_pic_order_cnt_lsb > 12 ) + p_sys->i_log2_max_pic_order_cnt_lsb = 12; } - else if( i_tmp == 1 ) + else if( p_sys->i_pic_order_cnt_type == 1 ) { int i_cycle; /* skip b_delta_pic_order_always_zero */ - bs_skip( &s, 1 ); + p_sys->i_delta_pic_order_always_zero_flag = bs_read( &s, 1 ); /* skip i_offset_for_non_ref_pic */ bs_read_se( &s ); /* skip i_offset_for_top_to_bottom_field */ @@ -730,10 +851,15 @@ static block_t *ParseNALBlock( decoder_t *p_dec, block_t *p_frag ) else if( i_nal_type == NAL_PPS ) { 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" ); - p_sys->b_pps = VLC_TRUE; + p_sys->b_pps = true; /* TODO */