X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fpacketizer%2Fmpegvideo.c;h=685abdbfbd1b2fe7afb2eb2d99c3990b0c9b5c5d;hb=662b0388884c3f7e769feff5b5de5fcb9465e908;hp=a5bb56500c2b4ec1da8355e9b99310bbeb64811f;hpb=85b29bdc288a1573d43bd524908be5748a9b3640;p=vlc diff --git a/modules/packetizer/mpegvideo.c b/modules/packetizer/mpegvideo.c index a5bb56500c..685abdbfbd 100644 --- a/modules/packetizer/mpegvideo.c +++ b/modules/packetizer/mpegvideo.c @@ -1,12 +1,13 @@ /***************************************************************************** * mpegvideo.c: parse and packetize an MPEG1/2 video stream ***************************************************************************** - * Copyright (C) 2001, 2002 VideoLAN (Centrale Réseaux) and its contributors + * Copyright (C) 2001-2006 the VideoLAN team * $Id$ * * Authors: Laurent Aimar * Eric Petit * Gildas Bazin + * Jean-Paul Saman * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -20,7 +21,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ /***************************************************************************** @@ -40,13 +41,17 @@ /***************************************************************************** * Preamble *****************************************************************************/ -#include /* malloc(), free() */ #include -#include -#include +#include +#include +#include +#include "../codec/cc.h" -#include "vlc_block_helper.h" +#define SYNC_INTRAFRAME_TEXT N_("Sync on Intra Frame") +#define SYNC_INTRAFRAME_LONGTEXT N_("Normally the packetizer would " \ + "sync on the next full frame. This flags instructs the packetizer " \ + "to sync on the first Intra Frame found.") /***************************************************************************** * Module descriptor @@ -60,6 +65,9 @@ vlc_module_begin(); set_description( _("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 ); vlc_module_end(); /***************************************************************************** @@ -67,6 +75,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, vlc_bool_t pb_present[4] ); struct decoder_sys_t { @@ -107,12 +116,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; + vlc_bool_t 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; + + /* */ + vlc_bool_t b_cc_reset; + uint32_t i_cc_flags; + mtime_t i_cc_pts; + mtime_t i_cc_dts; + cc_data_t cc; }; enum { @@ -137,6 +156,7 @@ 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 ) ); @@ -171,8 +191,19 @@ 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_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 = VLC_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; } @@ -200,6 +231,8 @@ static void Close( vlc_object_t *p_this ) block_ChainRelease( p_sys->p_frame ); } + var_Destroy( p_dec, "packetizer-mpegvideo-sync-iframe" ); + free( p_sys ); } @@ -216,17 +249,28 @@ static block_t *Packetize( decoder_t *p_dec, block_t **pp_block ) return NULL; } - if( (*pp_block)->i_flags & BLOCK_FLAG_DISCONTINUITY ) + if( (*pp_block)->i_flags&(BLOCK_FLAG_DISCONTINUITY|BLOCK_FLAG_CORRUPTED) ) { - p_sys->i_state = STATE_NOSYNC; - 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 = 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; + } +// 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 ) @@ -294,6 +338,26 @@ static block_t *Packetize( decoder_t *p_dec, block_t **pp_block ) break; } + /* If a discontinuity has been encountered, then wait till + * the next Intra frame before continuing with packetizing */ + if( p_sys->b_discontinuity && + p_sys->b_sync_on_intra_frame ) + { + if( p_pic->i_flags & BLOCK_FLAG_TYPE_I ) + { + msg_Dbg( p_dec, "synced on intra frame" ); + p_sys->b_discontinuity = VLC_FALSE; + p_pic->i_flags |= BLOCK_FLAG_DISCONTINUITY; + } + else + { + msg_Dbg( p_dec, "waiting on intra frame" ); + p_sys->i_state = STATE_NOSYNC; + block_Release( p_pic ); + break; + } + } + /* 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_dts <= 0 && p_sys->i_pts <= 0 && @@ -319,6 +383,33 @@ static block_t *Packetize( decoder_t *p_dec, block_t **pp_block ) } } +/***************************************************************************** + * GetCc: + *****************************************************************************/ +static block_t *GetCc( decoder_t *p_dec, vlc_bool_t 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 *****************************************************************************/ @@ -392,14 +483,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 ) @@ -415,17 +508,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: @@ -450,6 +532,27 @@ static block_t *ParseMPEGBlock( decoder_t *p_dec, block_t *p_frag ) p_sys->p_frame = NULL; p_sys->pp_last = &p_sys->p_frame; p_sys->b_frame_slice = VLC_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 = VLC_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 = VLC_FALSE; + cc_Flush( &p_sys->cc ); } /* @@ -513,7 +616,7 @@ static block_t *ParseMPEGBlock( decoder_t *p_dec, block_t *p_frag ) if ( !p_sys->b_inited ) { - msg_Dbg( p_dec, "Size %dx%d fps=%.3f", + msg_Dbg( p_dec, "size %dx%d fps=%.3f", p_dec->fmt_out.video.i_width, p_dec->fmt_out.video.i_height, p_sys->i_frame_rate / (float)p_sys->i_frame_rate_base ); p_sys->b_inited = 1; @@ -523,17 +626,19 @@ static block_t *ParseMPEGBlock( decoder_t *p_dec, block_t *p_frag ) { int i_type = p_frag->p_buffer[4] >> 4; - /* Extention start code */ + /* Extension start code */ if( i_type == 0x01 ) { +#if 0 static const int mpeg2_aspect[16][2] = { {0,1}, {1,1}, {4,3}, {16,9}, {221,100}, {0,1}, {0,1}, {0,1}, {0,1}, {0,1}, {0,1}, {0,1}, {0,1}, {0,1}, {0,1}, {0,1} }; +#endif - /* sequence extention */ + /* sequence extension */ if( p_sys->p_ext) block_Release( p_sys->p_ext ); p_sys->p_ext = block_Duplicate( p_frag ); @@ -561,13 +666,17 @@ static block_t *ParseMPEGBlock( decoder_t *p_dec, block_t *p_frag ) } else if( i_type == 0x08 ) { - /* picture extention */ + /* picture extension */ p_sys->i_picture_structure = p_frag->p_buffer[6]&0x03; p_sys->i_top_field_first = p_frag->p_buffer[7] >> 7; p_sys->i_repeat_first_field= (p_frag->p_buffer[7]>>1)&0x01; 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 */