X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fpacketizer%2Fmpeg4video.c;h=af61cc172ece1491b215505aca1cb481bdc53227;hb=26ae73ad5db4cac8e465a651ee0b8afea5a5dd0b;hp=7f953c35b2e1739cd2cd0ea8c2a8a2ec73536a9f;hpb=05492281965ed211badf7e1f4c2220be720d3356;p=vlc diff --git a/modules/packetizer/mpeg4video.c b/modules/packetizer/mpeg4video.c index 7f953c35b2..af61cc172e 100644 --- a/modules/packetizer/mpeg4video.c +++ b/modules/packetizer/mpeg4video.c @@ -37,8 +37,9 @@ #include #include -#include "vlc_bits.h" -#include "vlc_block_helper.h" +#include +#include +#include "packetizer_helper.h" /***************************************************************************** * Module descriptor @@ -57,17 +58,12 @@ vlc_module_end () /**************************************************************************** * Local prototypes ****************************************************************************/ -static block_t *Packetize( decoder_t *, block_t ** ); - struct decoder_sys_t { /* * Input properties */ - block_bytestream_t bytestream; - int i_state; - size_t i_offset; - uint8_t p_startcode[3]; + packetizer_t packetizer; /* * Common properties @@ -94,10 +90,11 @@ struct decoder_sys_t block_t **pp_last; }; -enum { - STATE_NOSYNC, - STATE_NEXT_SYNC -}; +static block_t *Packetize( decoder_t *, block_t ** ); + +static void PacketizeReset( void *p_private, bool b_broken ); +static block_t *PacketizeParse( void *p_private, bool *pb_ts_used, block_t * ); +static int PacketizeValidate( void *p_private, block_t * ); static block_t *ParseMPEGBlock( decoder_t *, block_t * ); static int ParseVOL( decoder_t *, es_format_t *, uint8_t *, int ); @@ -124,6 +121,8 @@ static int vlc_log2( unsigned int ); #define TEXTURE_SPATIAL_LAYER_START_CODE 0x1bf #define TEXTURE_SNR_LAYER_START_CODE 0x1c0 +static const uint8_t p_mp4v_startcode[3] = { 0x00, 0x00, 0x01 }; + /***************************************************************************** * Open: probe the packetizer and return score *****************************************************************************/ @@ -132,30 +131,8 @@ static int Open( vlc_object_t *p_this ) decoder_t *p_dec = (decoder_t*)p_this; decoder_sys_t *p_sys; - switch( p_dec->fmt_in.i_codec ) - { - case VLC_FOURCC( 'm', '4', 's', '2'): - case VLC_FOURCC( 'M', '4', 'S', '2'): - case VLC_FOURCC( 'm', 'p', '4', 's'): - case VLC_FOURCC( 'M', 'P', '4', 'S'): - case VLC_FOURCC( 'm', 'p', '4', 'v'): - case VLC_FOURCC( 'M', 'P', '4', 'V'): - case VLC_FOURCC( 'D', 'I', 'V', 'X'): - case VLC_FOURCC( 'd', 'i', 'v', 'x'): - case VLC_FOURCC( 'X', 'V', 'I', 'D'): - case VLC_FOURCC( 'X', 'v', 'i', 'D'): - case VLC_FOURCC( 'x', 'v', 'i', 'd'): - case VLC_FOURCC( 'D', 'X', '5', '0'): - case VLC_FOURCC( 'd', 'x', '5', '0'): - case VLC_FOURCC( 0x04, 0, 0, 0): - case VLC_FOURCC( '3', 'I', 'V', '2'): - case VLC_FOURCC( 'm', '4', 'c', 'c'): - case VLC_FOURCC( 'M', '4', 'C', 'C'): - break; - - default: - return VLC_EGENERIC; - } + if( p_dec->fmt_in.i_codec != VLC_CODEC_MP4V ) + return VLC_EGENERIC; /* Allocate the memory needed to store the decoder's structure */ if( ( p_dec->p_sys = p_sys = malloc( sizeof(decoder_sys_t) ) ) == NULL ) @@ -163,24 +140,25 @@ static int Open( vlc_object_t *p_this ) memset( p_sys, 0, sizeof(decoder_sys_t) ); /* Misc init */ - p_sys->i_state = STATE_NOSYNC; - p_sys->bytestream = block_BytestreamInit(); - p_sys->p_startcode[0] = 0; - p_sys->p_startcode[1] = 0; - p_sys->p_startcode[2] = 1; - p_sys->i_offset = 0; + packetizer_Init( &p_sys->packetizer, + p_mp4v_startcode, sizeof(p_mp4v_startcode), + NULL, 0, + PacketizeReset, PacketizeParse, PacketizeValidate, p_dec ); + p_sys->p_frame = NULL; p_sys->pp_last = &p_sys->p_frame; /* Setup properties */ es_format_Copy( &p_dec->fmt_out, &p_dec->fmt_in ); - p_dec->fmt_out.i_codec = VLC_FOURCC( 'm', 'p', '4', 'v' ); + p_dec->fmt_out.i_codec = VLC_CODEC_MP4V; + + free(p_dec->fmt_out.p_extra); if( p_dec->fmt_in.i_extra ) { /* We have a vol */ p_dec->fmt_out.i_extra = p_dec->fmt_in.i_extra; - p_dec->fmt_out.p_extra = malloc( p_dec->fmt_in.i_extra ); + p_dec->fmt_out.p_extra = xmalloc( p_dec->fmt_in.i_extra ); memcpy( p_dec->fmt_out.p_extra, p_dec->fmt_in.p_extra, p_dec->fmt_in.i_extra ); @@ -207,10 +185,12 @@ static int Open( vlc_object_t *p_this ) static void Close( vlc_object_t *p_this ) { decoder_t *p_dec = (decoder_t*)p_this; + decoder_sys_t *p_sys = p_dec->p_sys; - block_BytestreamRelease( &p_dec->p_sys->bytestream ); - if( p_dec->p_sys->p_frame ) block_ChainRelease( p_dec->p_sys->p_frame ); - free( p_dec->p_sys ); + packetizer_Clean( &p_sys->packetizer ); + if( p_sys->p_frame ) + block_ChainRelease( p_sys->p_frame ); + free( p_sys ); } /**************************************************************************** @@ -219,125 +199,69 @@ static void Close( vlc_object_t *p_this ) 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; - mtime_t i_pts, i_dts; - if( pp_block == NULL || *pp_block == NULL ) return NULL; + return packetizer_Packetize( &p_sys->packetizer, pp_block ); +} - 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 ); +/***************************************************************************** + * Helpers: + *****************************************************************************/ +static void PacketizeReset( void *p_private, bool b_broken ) +{ + decoder_t *p_dec = p_private; + decoder_sys_t *p_sys = p_dec->p_sys; - if( p_sys->p_frame ) - block_ChainRelease( p_sys->p_frame ); - p_sys->p_frame = NULL; - p_sys->pp_last = &p_sys->p_frame; - } -// p_sys->i_interpolated_pts = -// p_sys->i_interpolated_dts = -// p_sys->i_last_ref_pts = -// p_sys->i_last_time_ref = -// p_sys->i_time_ref = -// p_sys->i_last_time = -// p_sys->i_last_timeincr = 0; - - block_Release( *pp_block ); - return NULL; + if( b_broken ) + { + if( p_sys->p_frame ) + block_ChainRelease( p_sys->p_frame ); + p_sys->p_frame = NULL; + p_sys->pp_last = &p_sys->p_frame; } - block_BytestreamPush( &p_sys->bytestream, *pp_block ); + p_sys->i_interpolated_pts = + p_sys->i_interpolated_dts = + p_sys->i_last_ref_pts = VLC_TS_INVALID; - while( 1 ) - { - switch( p_sys->i_state ) - { + p_sys->i_last_time_ref = + p_sys->i_time_ref = + p_sys->i_last_time = + p_sys->i_last_timeincr = 0; +} - case STATE_NOSYNC: - if( block_FindStartcodeFromOffset( &p_sys->bytestream, - &p_sys->i_offset, p_sys->p_startcode, 3 ) == VLC_SUCCESS ) - { - p_sys->i_state = STATE_NEXT_SYNC; - } - - if( p_sys->i_offset ) - { - block_SkipBytes( &p_sys->bytestream, p_sys->i_offset ); - p_sys->i_offset = 0; - block_BytestreamFlush( &p_sys->bytestream ); - } - - if( p_sys->i_state != STATE_NEXT_SYNC ) - { - /* Need more data */ - return NULL; - } - - p_sys->i_offset = 1; /* To find next startcode */ - - case STATE_NEXT_SYNC: - /* TODO: If p_block == NULL, flush the buffer without checking the - * next sync word */ - - /* Find the next startcode */ - if( block_FindStartcodeFromOffset( &p_sys->bytestream, - &p_sys->i_offset, p_sys->p_startcode, 3 ) != VLC_SUCCESS ) - { - /* Need more data */ - return NULL; - } - - /* Get the new fragment and set the pts/dts */ - p_pic = block_New( p_dec, p_sys->i_offset ); - block_BytestreamFlush( &p_sys->bytestream ); - p_pic->i_pts = i_pts = p_sys->bytestream.p_block->i_pts; - p_pic->i_dts = i_dts = p_sys->bytestream.p_block->i_dts; - - block_GetBytes( &p_sys->bytestream, p_pic->p_buffer, - p_pic->i_buffer ); - - p_sys->i_offset = 0; - - /* Get picture if any */ - if( !( p_pic = ParseMPEGBlock( p_dec, p_pic ) ) ) - { - p_sys->i_state = STATE_NOSYNC; - break; - } - - /* don't reuse the same timestamps several times */ - if( i_pts == p_sys->bytestream.p_block->i_pts && - i_dts == p_sys->bytestream.p_block->i_dts ) - { - p_sys->bytestream.p_block->i_pts = 0; - p_sys->bytestream.p_block->i_dts = 0; - } - - /* We've just started the stream, wait for the first PTS. - * We discard here so we can still get the sequence header. */ - if( p_sys->i_interpolated_pts <= 0 && - p_sys->i_interpolated_dts <= 0 ) - { - msg_Dbg( p_dec, "need a starting pts/dts" ); - p_sys->i_state = STATE_NOSYNC; - block_Release( p_pic ); - break; - } - - /* When starting the stream we can have the first frame with - * a null DTS (i_interpolated_pts is initialized to 0) */ - if( !p_pic->i_dts ) p_pic->i_dts = p_pic->i_pts; - - /* So p_block doesn't get re-added several times */ - *pp_block = block_BytestreamPop( &p_sys->bytestream ); - - p_sys->i_state = STATE_NOSYNC; - - return p_pic; - } +static block_t *PacketizeParse( void *p_private, bool *pb_ts_used, block_t *p_block ) +{ + decoder_t *p_dec = p_private; + const mtime_t i_dts = p_block->i_dts; + const mtime_t i_pts = p_block->i_pts; + + block_t *p_au = ParseMPEGBlock( p_dec, p_block ); + + *pb_ts_used = p_au && p_au->i_dts == i_dts && p_au->i_pts == i_pts; + + return p_au; +} + + +static int PacketizeValidate( void *p_private, block_t *p_au ) +{ + decoder_t *p_dec = p_private; + decoder_sys_t *p_sys = p_dec->p_sys; + + /* We've just started the stream, wait for the first PTS. + * We discard here so we can still get the sequence header. */ + if( p_sys->i_interpolated_pts <= VLC_TS_INVALID && + p_sys->i_interpolated_dts <= VLC_TS_INVALID ) + { + msg_Dbg( p_dec, "need a starting pts/dts" ); + return VLC_EGENERIC; } + + /* When starting the stream we can have the first frame with + * a null DTS (i_interpolated_pts is initialized to 0) */ + if( !p_au->i_dts ) + p_au->i_dts = p_au->i_pts; + return VLC_SUCCESS; } /***************************************************************************** @@ -366,7 +290,7 @@ static block_t *ParseMPEGBlock( decoder_t *p_dec, block_t *p_frag ) if( (size_t)p_dec->fmt_out.i_extra != p_frag->i_buffer ) { p_dec->fmt_out.p_extra = - realloc( p_dec->fmt_out.p_extra, p_frag->i_buffer ); + xrealloc( p_dec->fmt_out.p_extra, p_frag->i_buffer ); p_dec->fmt_out.i_extra = p_frag->i_buffer; } memcpy( p_dec->fmt_out.p_extra, p_frag->p_buffer, p_frag->i_buffer ); @@ -580,9 +504,9 @@ static int ParseVOP( decoder_t *p_dec, block_t *p_vop ) p_sys->i_last_timeincr = i_time_increment; /* Correct interpolated dts when we receive a new pts/dts */ - if( p_vop->i_pts > 0 ) + if( p_vop->i_pts > VLC_TS_INVALID ) p_sys->i_interpolated_pts = p_vop->i_pts; - if( p_vop->i_dts > 0 ) + if( p_vop->i_dts > VLC_TS_INVALID ) p_sys->i_interpolated_dts = p_vop->i_dts; if( (p_sys->i_flags & BLOCK_FLAG_TYPE_B) || !p_sys->b_frame ) @@ -591,16 +515,16 @@ static int ParseVOP( decoder_t *p_dec, block_t *p_vop ) p_sys->i_interpolated_dts = p_sys->i_interpolated_pts; - if( p_vop->i_pts > 0 ) + if( p_vop->i_pts > VLC_TS_INVALID ) p_sys->i_interpolated_dts = p_vop->i_pts; - if( p_vop->i_dts > 0 ) + if( p_vop->i_dts > VLC_TS_INVALID ) p_sys->i_interpolated_dts = p_vop->i_dts; p_sys->i_interpolated_pts = p_sys->i_interpolated_dts; } else { - if( p_sys->i_last_ref_pts > 0 ) + if( p_sys->i_last_ref_pts > VLC_TS_INVALID ) p_sys->i_interpolated_dts = p_sys->i_last_ref_pts; p_sys->i_last_ref_pts = p_sys->i_interpolated_pts;