X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fpacketizer%2Fmpegvideo.c;h=3ff42ad96a8099e4badb407c1cf6cc32618ad031;hb=7b0dd84fff6c300cab5e0bdbf2a29fb1b3618e62;hp=c307db513ce9f091d664217823f013f9f3400850;hpb=386b36feda62acb423b13eb23a08be19891e8798;p=vlc diff --git a/modules/packetizer/mpegvideo.c b/modules/packetizer/mpegvideo.c index c307db513c..3ff42ad96a 100644 --- a/modules/packetizer/mpegvideo.c +++ b/modules/packetizer/mpegvideo.c @@ -41,13 +41,17 @@ /***************************************************************************** * Preamble *****************************************************************************/ -#include /* malloc(), free() */ -#include -#include -#include +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif -#include "vlc_block_helper.h" +#include +#include +#include +#include +#include +#include "../codec/cc.h" #define SYNC_INTRAFRAME_TEXT N_("Sync on Intra Frame") #define SYNC_INTRAFRAME_LONGTEXT N_("Normally the packetizer would " \ @@ -63,12 +67,12 @@ static void Close( vlc_object_t * ); vlc_module_begin(); set_category( CAT_SOUT ); set_subcategory( SUBCAT_SOUT_PACKETIZER ); - set_description( _("MPEG-I/II video packetizer") ); + set_description( N_("MPEG-I/II video packetizer") ); set_capability( "packetizer", 50 ); set_callbacks( Open, Close ); add_bool( "packetizer-mpegvideo-sync-iframe", 0, NULL, SYNC_INTRAFRAME_TEXT, - SYNC_INTRAFRAME_LONGTEXT, VLC_TRUE ); + SYNC_INTRAFRAME_LONGTEXT, true ); vlc_module_end(); /***************************************************************************** @@ -76,6 +80,7 @@ vlc_module_end(); *****************************************************************************/ static block_t *Packetize( decoder_t *, block_t ** ); static block_t *ParseMPEGBlock( decoder_t *, block_t * ); +static block_t *GetCc( decoder_t *p_dec, bool pb_present[4] ); struct decoder_sys_t { @@ -84,7 +89,7 @@ struct decoder_sys_t */ block_bytestream_t bytestream; int i_state; - int i_offset; + size_t i_offset; uint8_t p_startcode[3]; /* Sequence header and extension */ @@ -95,17 +100,17 @@ struct decoder_sys_t block_t *p_frame; block_t **pp_last; - vlc_bool_t b_frame_slice; + bool b_frame_slice; mtime_t i_pts; mtime_t i_dts; /* Sequence properties */ int i_frame_rate; int i_frame_rate_base; - vlc_bool_t b_seq_progressive; - vlc_bool_t b_low_delay; + bool b_seq_progressive; + bool b_low_delay; int i_aspect_ratio_info; - vlc_bool_t b_inited; + bool b_inited; /* Picture properties */ int i_temporal_ref; @@ -116,15 +121,22 @@ struct decoder_sys_t int i_progressive_frame; mtime_t i_interpolated_dts; - mtime_t i_old_duration; mtime_t i_last_ref_pts; + bool b_second_field; /* Number of pictures since last sequence header */ int i_seq_old; /* Sync behaviour */ - vlc_bool_t b_sync_on_intra_frame; - vlc_bool_t b_discontinuity; + bool b_sync_on_intra_frame; + bool b_discontinuity; + + /* */ + bool b_cc_reset; + uint32_t i_cc_flags; + mtime_t i_cc_pts; + mtime_t i_cc_dts; + cc_data_t cc; }; enum { @@ -149,12 +161,16 @@ static int Open( vlc_object_t *p_this ) es_format_Init( &p_dec->fmt_out, VIDEO_ES, VLC_FOURCC('m','p','g','v') ); p_dec->pf_packetize = Packetize; + p_dec->pf_get_cc = GetCc; p_dec->p_sys = p_sys = malloc( sizeof( decoder_sys_t ) ); + if( !p_dec->p_sys ) + return VLC_ENOMEM; + memset( p_dec->p_sys, 0, sizeof( decoder_sys_t ) ); /* Misc init */ p_sys->i_state = STATE_NOSYNC; - p_sys->bytestream = block_BytestreamInit( p_dec ); + p_sys->bytestream = block_BytestreamInit(); p_sys->p_startcode[0] = 0; p_sys->p_startcode[1] = 0; p_sys->p_startcode[2] = 1; @@ -164,14 +180,14 @@ static int Open( vlc_object_t *p_this ) p_sys->p_ext = NULL; p_sys->p_frame = NULL; p_sys->pp_last = &p_sys->p_frame; - p_sys->b_frame_slice = VLC_FALSE; + p_sys->b_frame_slice = false; p_sys->i_dts = p_sys->i_pts = 0; p_sys->i_frame_rate = 1; p_sys->i_frame_rate_base = 1; - p_sys->b_seq_progressive = VLC_TRUE; - p_sys->b_low_delay = VLC_TRUE; + p_sys->b_seq_progressive = true; + p_sys->b_low_delay = true; p_sys->i_seq_old = 0; p_sys->i_temporal_ref = 0; @@ -183,14 +199,20 @@ static int Open( vlc_object_t *p_this ) p_sys->b_inited = 0; p_sys->i_interpolated_dts = 0; - p_sys->i_old_duration = 0; p_sys->i_last_ref_pts = 0; + p_sys->b_second_field = 0; - p_sys->b_discontinuity = VLC_FALSE; + p_sys->b_discontinuity = false; p_sys->b_sync_on_intra_frame = var_CreateGetBool( p_dec, "packetizer-mpegvideo-sync-iframe" ); if( p_sys->b_sync_on_intra_frame ) msg_Dbg( p_dec, "syncing on intra frame now" ); + p_sys->b_cc_reset = false; + p_sys->i_cc_pts = 0; + p_sys->i_cc_dts = 0; + p_sys->i_cc_flags = 0; + cc_Init( &p_sys->cc ); + return VLC_SUCCESS; } @@ -235,19 +257,28 @@ static block_t *Packetize( decoder_t *p_dec, block_t **pp_block ) return NULL; } - if( (*pp_block)->i_flags & (BLOCK_FLAG_DISCONTINUITY|BLOCK_FLAG_CORRUPTED) ) + if( (*pp_block)->i_flags&(BLOCK_FLAG_DISCONTINUITY|BLOCK_FLAG_CORRUPTED) ) { - p_sys->i_state = STATE_NOSYNC; - p_sys->b_discontinuity = VLC_TRUE; - 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->b_frame_slice = VLC_FALSE; + if( (*pp_block)->i_flags&BLOCK_FLAG_CORRUPTED ) + { + p_sys->i_state = STATE_NOSYNC; + block_BytestreamFlush( &p_sys->bytestream ); + + p_sys->b_discontinuity = true; + 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->b_frame_slice = false; + } +// p_sys->i_interpolated_dts = +// p_sys->i_last_ref_pts = 0; + block_Release( *pp_block ); return NULL; } + block_BytestreamPush( &p_sys->bytestream, *pp_block ); while( 1 ) @@ -323,7 +354,7 @@ static block_t *Packetize( decoder_t *p_dec, block_t **pp_block ) if( p_pic->i_flags & BLOCK_FLAG_TYPE_I ) { msg_Dbg( p_dec, "synced on intra frame" ); - p_sys->b_discontinuity = VLC_FALSE; + p_sys->b_discontinuity = false; p_pic->i_flags |= BLOCK_FLAG_DISCONTINUITY; } else @@ -360,6 +391,33 @@ static block_t *Packetize( decoder_t *p_dec, block_t **pp_block ) } } +/***************************************************************************** + * GetCc: + *****************************************************************************/ +static block_t *GetCc( decoder_t *p_dec, bool pb_present[4] ) +{ + decoder_sys_t *p_sys = p_dec->p_sys; + block_t *p_cc; + int i; + + for( i = 0; i < 4; i++ ) + pb_present[i] = p_sys->cc.pb_present[i]; + + if( p_sys->cc.i_data <= 0 ) + return NULL; + + p_cc = block_New( p_dec, p_sys->cc.i_data); + if( p_cc ) + { + memcpy( p_cc->p_buffer, p_sys->cc.p_data, p_sys->cc.i_data ); + p_cc->i_dts = + p_cc->i_pts = p_sys->cc.b_reorder ? p_sys->i_cc_pts : p_sys->i_cc_dts; + p_cc->i_flags = ( p_sys->cc.b_reorder ? p_sys->i_cc_flags : BLOCK_FLAG_TYPE_P ) & ( BLOCK_FLAG_TYPE_I|BLOCK_FLAG_TYPE_P|BLOCK_FLAG_TYPE_B); + } + cc_Flush( &p_sys->cc ); + return p_cc; +} + /***************************************************************************** * ParseMPEGBlock: Re-assemble fragments into a block containing a picture *****************************************************************************/ @@ -381,7 +439,7 @@ static block_t *ParseMPEGBlock( decoder_t *p_dec, block_t *p_frag ) 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->b_frame_slice = VLC_FALSE; + p_sys->b_frame_slice = false; } else if( p_sys->b_frame_slice && @@ -433,14 +491,16 @@ static block_t *ParseMPEGBlock( decoder_t *p_dec, block_t *p_frag ) else { /* Correct interpolated dts when we receive a new pts/dts */ - if( p_sys->i_last_ref_pts > 0 ) + if( p_sys->i_last_ref_pts > 0 && !p_sys->b_second_field ) p_sys->i_interpolated_dts = p_sys->i_last_ref_pts; if( p_sys->i_dts > 0 ) p_sys->i_interpolated_dts = p_sys->i_dts; - p_sys->i_last_ref_pts = p_sys->i_pts; + if( !p_sys->b_second_field ) + p_sys->i_last_ref_pts = p_sys->i_pts; } p_pic->i_dts = p_sys->i_interpolated_dts; + p_sys->i_interpolated_dts += i_duration; /* Set PTS only if we have a B frame or if it comes from the stream */ if( p_sys->i_pts > 0 ) @@ -456,17 +516,6 @@ static block_t *ParseMPEGBlock( decoder_t *p_dec, block_t *p_frag ) p_pic->i_pts = 0; } - if( p_sys->b_low_delay || p_sys->i_picture_type == 0x03 ) - { - /* Trivial case (DTS == PTS) */ - p_sys->i_interpolated_dts += i_duration; - } - else - { - p_sys->i_interpolated_dts += p_sys->i_old_duration; - p_sys->i_old_duration = i_duration; - } - switch ( p_sys->i_picture_type ) { case 0x01: @@ -483,14 +532,35 @@ static block_t *ParseMPEGBlock( decoder_t *p_dec, block_t *p_frag ) p_pic->i_length = p_sys->i_interpolated_dts - p_pic->i_dts; #if 0 - msg_Dbg( p_dec, "pic: type=%d dts="I64Fd" pts-dts="I64Fd, + msg_Dbg( p_dec, "pic: type=%d dts=%"PRId64" pts-dts=%"PRId64, p_sys->i_picture_type, p_pic->i_dts, p_pic->i_pts - p_pic->i_dts); #endif /* Reset context */ p_sys->p_frame = NULL; p_sys->pp_last = &p_sys->p_frame; - p_sys->b_frame_slice = VLC_FALSE; + p_sys->b_frame_slice = false; + + if( p_sys->i_picture_structure != 0x03 ) + { + p_sys->b_second_field = !p_sys->b_second_field; + } + else + { + p_sys->b_second_field = 0; + } + + /* CC */ + p_sys->b_cc_reset = true; + p_sys->i_cc_pts = p_pic->i_pts; + p_sys->i_cc_dts = p_pic->i_dts; + p_sys->i_cc_flags = p_pic->i_flags; + } + + if( !p_pic && p_sys->b_cc_reset ) + { + p_sys->b_cc_reset = false; + cc_Flush( &p_sys->cc ); } /* @@ -549,8 +619,8 @@ static block_t *ParseMPEGBlock( decoder_t *p_dec, block_t *p_frag ) p_dec->fmt_out.video.i_frame_rate = p_sys->i_frame_rate; p_dec->fmt_out.video.i_frame_rate_base = p_sys->i_frame_rate_base; - p_sys->b_seq_progressive = VLC_TRUE; - p_sys->b_low_delay = VLC_TRUE; + p_sys->b_seq_progressive = true; + p_sys->b_low_delay = true; if ( !p_sys->b_inited ) { @@ -583,9 +653,9 @@ static block_t *ParseMPEGBlock( decoder_t *p_dec, block_t *p_frag ) if( p_frag->i_buffer >= 10 ) { p_sys->b_seq_progressive = - p_frag->p_buffer[5]&0x08 ? VLC_TRUE : VLC_FALSE; + p_frag->p_buffer[5]&0x08 ? true : false; p_sys->b_low_delay = - p_frag->p_buffer[9]&0x80 ? VLC_TRUE : VLC_FALSE; + p_frag->p_buffer[9]&0x80 ? true : false; } /* Do not set aspect ratio : in case we're transcoding, @@ -611,6 +681,10 @@ static block_t *ParseMPEGBlock( decoder_t *p_dec, block_t *p_frag ) p_sys->i_progressive_frame = p_frag->p_buffer[8] >> 7; } } + else if( p_frag->p_buffer[3] == 0xb2 && p_frag->i_buffer > 4 ) + { + cc_Extract( &p_sys->cc, &p_frag->p_buffer[4], p_frag->i_buffer - 4 ); + } else if( p_frag->p_buffer[3] == 0x00 ) { /* Picture start code */ @@ -629,7 +703,7 @@ static block_t *ParseMPEGBlock( decoder_t *p_dec, block_t *p_frag ) else if( p_frag->p_buffer[3] >= 0x01 && p_frag->p_buffer[3] <= 0xaf ) { /* Slice start code */ - p_sys->b_frame_slice = VLC_TRUE; + p_sys->b_frame_slice = true; } /* Append the block */