X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fpacketizer%2Fh264.c;h=79f5f53e5410fc300e2650f64ec3aba5c8e7dac3;hb=7d1d56fec646569bd14262f6b9dde31becbe2137;hp=879dfeb5f2c62ad7e70349ca9a9c83af46ed1c72;hpb=2bf327dfbfaea5fd719be71899bafc3c32b3bb45;p=vlc diff --git a/modules/packetizer/h264.c b/modules/packetizer/h264.c index 879dfeb5f2..79f5f53e54 100644 --- a/modules/packetizer/h264.c +++ b/modules/packetizer/h264.c @@ -28,7 +28,12 @@ * Preamble *****************************************************************************/ -#include +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif + +#include +#include #include #include #include @@ -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(); @@ -83,15 +88,15 @@ 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; @@ -169,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; @@ -178,14 +182,14 @@ 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->b_header= false; p_sys->slice.i_nal_type = -1; p_sys->slice.i_nal_ref_idc = -1; @@ -219,39 +223,58 @@ 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( (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 = 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; @@ -324,7 +347,7 @@ static block_t *Packetize( decoder_t *p_dec, block_t **pp_block ) block_ChainRelease( p_sys->p_frame ); p_sys->p_frame = NULL; p_sys->slice.i_frame_type = 0; - p_sys->b_slice = VLC_FALSE; + p_sys->b_slice = false; } block_Release( *pp_block ); return NULL; @@ -391,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 @@ -439,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; } @@ -464,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; @@ -485,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; } @@ -520,7 +551,6 @@ 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 @@ -546,7 +576,7 @@ static block_t *ParseNALBlock( decoder_t *p_dec, block_t *p_frag ) p_sps->i_pts = p_sys->p_frame->i_pts; \ block_ChainAppend( &p_sps, p_pps ); \ block_ChainAppend( &p_sps, p_sys->p_frame ); \ - p_sys->b_header = VLC_TRUE; \ + p_sys->b_header = true; \ p_pic = block_ChainGather( p_sps ); \ } else { \ p_pic = block_ChainGather( p_sys->p_frame ); \ @@ -556,7 +586,7 @@ static block_t *ParseNALBlock( decoder_t *p_dec, block_t *p_frag ) \ p_sys->slice.i_frame_type = 0; \ p_sys->p_frame = NULL; \ - p_sys->b_slice = VLC_FALSE; \ + p_sys->b_slice = false; \ } while(0) if( p_sys->b_slice && ( !p_sys->b_sps || !p_sys->b_pps ) ) @@ -567,21 +597,21 @@ static block_t *ParseNALBlock( decoder_t *p_dec, block_t *p_frag ) /* 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 || !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; + uint8_t *dec = NULL; + int i_dec = 0, i_first_mb, i_slice_type; slice_t slice; - vlc_bool_t b_pic; + bool b_pic; bs_t s; /* do not convert the whole frame */ @@ -646,7 +676,8 @@ static block_t *ParseNALBlock( decoder_t *p_dec, block_t *p_frag ) 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 ) + else if( (p_sys->i_pic_order_cnt_type == 1) && + (!p_sys->i_delta_pic_order_always_zero_flag) ) { slice.i_delta_pic_order_cnt0 = bs_read_se( &s ); if( p_sys->i_pic_order_present_flag && !slice.i_field_pic_flag ) @@ -655,25 +686,27 @@ static block_t *ParseNALBlock( decoder_t *p_dec, block_t *p_frag ) /* Detection of the first VCL NAL unit of a primary coded picture * (cf. 7.4.1.2.4) */ - b_pic = VLC_FALSE; + 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 = VLC_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 = VLC_TRUE; + 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 = VLC_TRUE; + 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 = VLC_TRUE; + 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 = VLC_TRUE; + b_pic = true; /* */ p_sys->slice = slice; @@ -681,20 +714,20 @@ static block_t *ParseNALBlock( decoder_t *p_dec, block_t *p_frag ) if( b_pic && p_sys->b_slice ) OUTPUT; - p_sys->b_slice = VLC_TRUE; + 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 ); @@ -826,7 +859,7 @@ static block_t *ParseNALBlock( decoder_t *p_dec, block_t *p_frag ) 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 */