X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fpacketizer%2Fmpegvideo.c;h=704f4d08d7cad2a28c39575e7dd7c6c957eeafab;hb=6ee1e193fd896ab9a4729fde14f009d9ce629815;hp=85e053e60bb341b90fd31e78bd00e5ce86529f6a;hpb=e42f7d101ca73eb0c38e56bbf61c4483aeb19a4d;p=vlc diff --git a/modules/packetizer/mpegvideo.c b/modules/packetizer/mpegvideo.c index 85e053e60b..704f4d08d7 100644 --- a/modules/packetizer/mpegvideo.c +++ b/modules/packetizer/mpegvideo.c @@ -1,11 +1,13 @@ /***************************************************************************** - * mpegvideo.c + * mpegvideo.c: parse and packetize an MPEG1/2 video stream ***************************************************************************** - * Copyright (C) 2001, 2002 VideoLAN - * $Id: mpegvideo.c,v 1.17 2003/08/11 17:31:15 gbazin Exp $ + * 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 @@ -19,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. *****************************************************************************/ /***************************************************************************** @@ -39,506 +41,606 @@ /***************************************************************************** * Preamble *****************************************************************************/ -#include -#include -#include -#include -#include "codecs.h" /* WAVEFORMATEX BITMAPINFOHEADER */ - -#include /* malloc(), free() */ -#include /* strdup() */ -/***************************************************************************** - * Local prototypes - *****************************************************************************/ -typedef struct packetizer_s -{ - /* Input properties */ - decoder_fifo_t *p_fifo; - bit_stream_t bit_stream; - - /* Output properties */ - sout_packetizer_input_t *p_sout_input; - sout_format_t output_format; - - mtime_t i_interpolated_dts; - mtime_t i_old_duration; - mtime_t i_last_ref_pts; - double d_frame_rate; - int i_progressive_sequence; - int i_low_delay; - uint8_t p_sequence_header[150]; - int i_sequence_header_length; - int i_last_sequence_header; - -} packetizer_t; - -static int Open ( vlc_object_t * ); -static int Run ( decoder_fifo_t * ); +#include +#include +#include +#include -static int InitThread ( packetizer_t * ); -static void PacketizeThread ( packetizer_t * ); -static void EndThread ( packetizer_t * ); +#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 *****************************************************************************/ +static int Open ( vlc_object_t * ); +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_capability( "packetizer", 50 ); - set_callbacks( Open, NULL ); + set_callbacks( Open, Close ); + + add_bool( "packetizer-mpegvideo-sync-iframe", 0, NULL, SYNC_INTRAFRAME_TEXT, + SYNC_INTRAFRAME_LONGTEXT, VLC_TRUE ); vlc_module_end(); /***************************************************************************** - * OpenDecoder: probe the packetizer and return score - ***************************************************************************** - * Tries to launch a decoder and return score so that the interface is able - * to choose. + * Local prototypes + *****************************************************************************/ +static block_t *Packetize( decoder_t *, block_t ** ); +static block_t *ParseMPEGBlock( decoder_t *, block_t * ); + +struct decoder_sys_t +{ + /* + * Input properties + */ + block_bytestream_t bytestream; + int i_state; + int i_offset; + uint8_t p_startcode[3]; + + /* Sequence header and extension */ + block_t *p_seq; + block_t *p_ext; + + /* Current frame being built */ + block_t *p_frame; + block_t **pp_last; + + vlc_bool_t 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; + int i_aspect_ratio_info; + vlc_bool_t b_inited; + + /* Picture properties */ + int i_temporal_ref; + int i_picture_type; + int i_picture_structure; + int i_top_field_first; + int i_repeat_first_field; + int i_progressive_frame; + + mtime_t i_interpolated_dts; + 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; +}; + +enum { + STATE_NOSYNC, + STATE_NEXT_SYNC +}; + +/***************************************************************************** + * Open: *****************************************************************************/ static int Open( vlc_object_t *p_this ) { - decoder_fifo_t *p_fifo = (decoder_fifo_t*) p_this; + decoder_t *p_dec = (decoder_t*)p_this; + decoder_sys_t *p_sys; - if( p_fifo->i_fourcc != VLC_FOURCC( 'm', 'p', 'g', 'v') && - p_fifo->i_fourcc != VLC_FOURCC( 'm', 'p', 'g', '1') && - p_fifo->i_fourcc != VLC_FOURCC( 'm', 'p', 'g', '2') ) + if( p_dec->fmt_in.i_codec != VLC_FOURCC( 'm', 'p', 'g', '1' ) && + p_dec->fmt_in.i_codec != VLC_FOURCC( 'm', 'p', 'g', '2' ) && + p_dec->fmt_in.i_codec != VLC_FOURCC( 'm', 'p', 'g', 'v' ) ) { return VLC_EGENERIC; } - p_fifo->pf_run = Run; + es_format_Init( &p_dec->fmt_out, VIDEO_ES, VLC_FOURCC('m','p','g','v') ); + p_dec->pf_packetize = Packetize; + + p_dec->p_sys = p_sys = malloc( sizeof( decoder_sys_t ) ); + + /* Misc init */ + p_sys->i_state = STATE_NOSYNC; + p_sys->bytestream = block_BytestreamInit( p_dec ); + p_sys->p_startcode[0] = 0; + p_sys->p_startcode[1] = 0; + p_sys->p_startcode[2] = 1; + p_sys->i_offset = 0; + + p_sys->p_seq = NULL; + 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->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->i_seq_old = 0; + + p_sys->i_temporal_ref = 0; + p_sys->i_picture_type = 0; + p_sys->i_picture_structure = 0x03; /* frame */ + p_sys->i_top_field_first = 0; + p_sys->i_repeat_first_field = 0; + p_sys->i_progressive_frame = 0; + p_sys->b_inited = 0; + + p_sys->i_interpolated_dts = 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" ); + return VLC_SUCCESS; } /***************************************************************************** - * RunDecoder: this function is called just after the thread is created + * Close: *****************************************************************************/ -static int Run( decoder_fifo_t *p_fifo ) +static void Close( vlc_object_t *p_this ) { - packetizer_t *p_pack; - int b_error; - - msg_Info( p_fifo, "Running mpegvideo packetizer" ); - if( !( p_pack = malloc( sizeof( packetizer_t ) ) ) ) - { - msg_Err( p_fifo, "out of memory" ); - DecoderError( p_fifo ); - return( -1 ); - } - memset( p_pack, 0, sizeof( packetizer_t ) ); + decoder_t *p_dec = (decoder_t*)p_this; + decoder_sys_t *p_sys = p_dec->p_sys; - p_pack->p_fifo = p_fifo; + block_BytestreamRelease( &p_sys->bytestream ); - if( InitThread( p_pack ) != 0 ) + if( p_sys->p_seq ) { - DecoderError( p_fifo ); - return( -1 ); + block_Release( p_sys->p_seq ); } - - while( ( !p_pack->p_fifo->b_die )&&( !p_pack->p_fifo->b_error ) ) + if( p_sys->p_ext ) { - PacketizeThread( p_pack ); + block_Release( p_sys->p_ext ); } - - - if( ( b_error = p_pack->p_fifo->b_error ) ) + if( p_sys->p_frame ) { - DecoderError( p_pack->p_fifo ); + block_ChainRelease( p_sys->p_frame ); } - EndThread( p_pack ); - - if( p_pack ) - { - free( p_pack ); - } + var_Destroy( p_dec, "packetizer-mpegvideo-sync-iframe" ); - if( b_error ) - { - return( -1 ); - } - - return( 0 ); + free( p_sys ); } - /***************************************************************************** - * InitThread: initialize data before entering main loop + * Packetize: *****************************************************************************/ - -static int InitThread( packetizer_t *p_pack ) +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; - p_pack->output_format.i_cat = VIDEO_ES; - p_pack->output_format.i_fourcc = VLC_FOURCC( 'm', 'p', 'g', 'v'); - p_pack->output_format.i_width = 0; - p_pack->output_format.i_height = 0; - p_pack->output_format.i_bitrate= 0; - p_pack->output_format.i_extra_data = 0; - p_pack->output_format.p_extra_data = NULL; - - p_pack->p_sout_input = NULL; - - if( InitBitstream( &p_pack->bit_stream, p_pack->p_fifo, - NULL, NULL ) != VLC_SUCCESS ) + if( pp_block == NULL || *pp_block == NULL ) { - msg_Err( p_pack->p_fifo, "cannot initialize bitstream" ); - return -1; + return NULL; } - return( 0 ); -} + 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 ); + + 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; -/* from ISO 13818-2 */ -/* converting frame_rate_code to frame_rate */ -static const double pd_frame_rates[16] = -{ - 0, 24000.0/1001, 24, 25, 30000.0/1001, 30, 50, 60000.0/1001, 60, - 0, 0, 0, 0, 0, 0, 0 -}; + block_Release( *pp_block ); + return NULL; + } -static int CopyUntilNextStartCode( packetizer_t *p_pack, - sout_buffer_t *p_sout_buffer, - unsigned int *pi_pos ) -{ - int i_copy = 0; - do - { - p_sout_buffer->p_buffer[(*pi_pos)++] = - GetBits( &p_pack->bit_stream, 8 ); - i_copy++; + block_BytestreamPush( &p_sys->bytestream, *pp_block ); - if( *pi_pos + 2048 > p_sout_buffer->i_buffer_size ) + while( 1 ) + { + switch( p_sys->i_state ) { - sout_BufferRealloc( p_pack->p_sout_input->p_sout, - p_sout_buffer, - p_sout_buffer->i_buffer_size + 50 * 1024); - } - } while( ShowBits( &p_pack->bit_stream, 24 ) != 0x01 && - !p_pack->p_fifo->b_die && !p_pack->p_fifo->b_error ); + 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; + } - return( i_copy ); -} + if( p_sys->i_offset ) + { + block_SkipBytes( &p_sys->bytestream, p_sys->i_offset ); + p_sys->i_offset = 0; + block_BytestreamFlush( &p_sys->bytestream ); + } -/***************************************************************************** - * PacketizeThread: packetize an unit (here copy a complete pes) - *****************************************************************************/ -static void PacketizeThread( packetizer_t *p_pack ) -{ - sout_buffer_t *p_sout_buffer = NULL; - vlc_bool_t b_seen_slice = VLC_FALSE; - int32_t i_pos; - int i_skipped; - mtime_t i_duration; /* of the parsed picture */ - - mtime_t i_pts = 0; - mtime_t i_dts = 0; - - /* needed to calculate pts/dts */ - int i_temporal_ref = 0; - int i_picture_coding_type = 0; - int i_picture_structure = 0x03; /* frame picture */ - int i_top_field_first = 0; - int i_repeat_first_field = 0; - int i_progressive_frame = 0; - - if( !p_pack->p_sout_input ) - { - byte_t p_temp[512];/* 150 bytes is the maximal size - of a sequence_header + sequence_extension */ - int i_frame_rate_code; + if( p_sys->i_state != STATE_NEXT_SYNC ) + { + /* Need more data */ + return NULL; + } + p_sys->i_offset = 1; /* To find next startcode */ - /* skip data until we find a sequence_header_code */ - /* TODO: store skipped somewhere so can send it to the mux - * after the input is created */ - i_skipped = 0; - while( ShowBits( &p_pack->bit_stream, 32 ) != 0x1B3 && - !p_pack->p_fifo->b_die && !p_pack->p_fifo->b_error ) - { - RemoveBits( &p_pack->bit_stream, 8 ); - i_skipped++; - } - msg_Warn( p_pack->p_fifo, "sequence_header_code found (%d skipped)", - i_skipped ); + case STATE_NEXT_SYNC: + /* TODO: If p_block == NULL, flush the buffer without checking the + * next sync word */ - /* copy the start_code */ - i_pos = 0; - GetChunk( &p_pack->bit_stream, p_temp, 4 ); i_pos += 4; + /* 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; + } - /* horizontal_size_value */ - p_pack->output_format.i_width = ShowBits( &p_pack->bit_stream, 12 ); - /* vertical_size_value */ - p_pack->output_format.i_height= ShowBits( &p_pack->bit_stream, 24 ) & 0xFFF; - /* frame_rate_code */ - i_frame_rate_code = ShowBits( &p_pack->bit_stream, 32 ) & 0xF; + /* 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 = p_sys->bytestream.p_block->i_pts; + p_pic->i_dts = p_sys->bytestream.p_block->i_dts; - /* copy headers */ - GetChunk( &p_pack->bit_stream, p_temp + i_pos, 7 ); i_pos += 7; + block_GetBytes( &p_sys->bytestream, p_pic->p_buffer, + p_pic->i_buffer ); - /* intra_quantiser_matrix [non_intra_quantiser_matrix] */ - if( ShowBits( &p_pack->bit_stream, 7 ) & 0x1 ) - { + /* don't reuse the same timestamps several times */ + if( p_pic->i_buffer >= 4 && p_pic->p_buffer[3] == 0x00 ) + { + /* We have a picture start code */ + p_sys->bytestream.p_block->i_pts = 0; + p_sys->bytestream.p_block->i_dts = 0; + } - GetChunk( &p_pack->bit_stream, p_temp + i_pos, 64 ); i_pos += 64; + p_sys->i_offset = 0; - if( ShowBits( &p_pack->bit_stream, 8 ) & 0x1 ) + /* Get picture if any */ + if( !( p_pic = ParseMPEGBlock( p_dec, p_pic ) ) ) { - GetChunk( &p_pack->bit_stream, p_temp + i_pos, 65); i_pos += 65; + p_sys->i_state = STATE_NOSYNC; + break; } - } - /* non_intra_quantiser_matrix */ - else if( ShowBits( &p_pack->bit_stream, 8 ) & 0x1 ) - { - GetChunk( &p_pack->bit_stream, p_temp + i_pos, 65); i_pos += 65; - } - /* nothing */ - else - { - GetChunk( &p_pack->bit_stream, p_temp + i_pos, 1 ); i_pos += 1; - } - /* sequence_extension (10 bytes) */ - if( ShowBits( &p_pack->bit_stream, 32 ) != 0x1B5 ) - { - msg_Dbg( p_pack->p_fifo, "ARRGG no extension_start_code" ); - p_pack->i_progressive_sequence = 1; - p_pack->i_low_delay = 1; - } - else - { - GetChunk( &p_pack->bit_stream, p_temp + i_pos, 10 ); - p_pack->i_progressive_sequence = ( p_temp[i_pos+5]&0x08 ) ? 1 : 0; - p_pack->i_low_delay = ( p_temp[i_pos+9]&0x80 ) ? 1 : 0; - i_pos += 10; - } + /* 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; + } + } - /* remember sequence_header and sequence_extention */ - memcpy( p_pack->p_sequence_header, p_temp, i_pos ); - p_pack->i_sequence_header_length = i_pos; + /* 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 && + 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; + } - p_pack->d_frame_rate = pd_frame_rates[i_frame_rate_code]; + /* 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; - msg_Warn( p_pack->p_fifo, - "creating input (image size %dx%d, frame rate %.2f)", - p_pack->output_format.i_width, - p_pack->output_format.i_height, - p_pack->d_frame_rate ); + /* So p_block doesn't get re-added several times */ + *pp_block = block_BytestreamPop( &p_sys->bytestream ); - /* now we have informations to create the input */ - p_pack->p_sout_input = sout_InputNew( p_pack->p_fifo, - &p_pack->output_format ); + p_sys->i_state = STATE_NOSYNC; - if( !p_pack->p_sout_input ) - { - msg_Err( p_pack->p_fifo, "cannot add a new stream" ); - p_pack->p_fifo->b_error = VLC_TRUE; - return; + return p_pic; } + } +} - p_sout_buffer = sout_BufferNew( p_pack->p_sout_input->p_sout, - 100 * 1024 ); - p_sout_buffer->i_size = i_pos; - memcpy( p_sout_buffer->p_buffer, p_temp, i_pos ); +/***************************************************************************** + * ParseMPEGBlock: Re-assemble fragments into a block containing a picture + *****************************************************************************/ +static block_t *ParseMPEGBlock( decoder_t *p_dec, block_t *p_frag ) +{ + decoder_sys_t *p_sys = p_dec->p_sys; + block_t *p_pic = NULL; + + /* + * Check if previous picture is finished + */ + if( ( p_sys->b_frame_slice && + (p_frag->p_buffer[3] == 0x00 || p_frag->p_buffer[3] > 0xaf) ) && + p_sys->p_seq == NULL ) + { + /* We have a picture but without a sequence header we can't + * do anything */ + msg_Dbg( p_dec, "waiting for sequence start" ); + 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; } - else + else if( p_sys->b_frame_slice && + (p_frag->p_buffer[3] == 0x00 || p_frag->p_buffer[3] > 0xaf) ) { - p_sout_buffer = - sout_BufferNew( p_pack->p_sout_input->p_sout, 100 * 1024 ); - i_pos = 0; - } + mtime_t i_duration; - p_pack->i_last_sequence_header++; + p_pic = block_ChainGather( p_sys->p_frame ); - for( ;; ) - { - uint32_t i_code; - if( p_pack->p_fifo->b_die || p_pack->p_fifo->b_error ) + i_duration = (mtime_t)( 1000000 * p_sys->i_frame_rate_base / + p_sys->i_frame_rate ); + + if( !p_sys->b_seq_progressive && p_sys->i_picture_structure != 0x03 ) { - break; + i_duration /= 2; } - i_code = ShowBits( &p_pack->bit_stream, 32 ); - - if( b_seen_slice && ( i_code < 0x101 || i_code > 0x1af ) ) + if( p_sys->b_seq_progressive ) { - break; + if( p_sys->i_top_field_first == 0 && + p_sys->i_repeat_first_field == 1 ) + { + i_duration *= 2; + } + else if( p_sys->i_top_field_first == 1 && + p_sys->i_repeat_first_field == 1 ) + { + i_duration *= 3; + } } - - if( i_code == 0x1B8 ) /* GOP */ + else { - /* usefull for bad MPEG-1 : repeat the sequence_header - every second */ - if( p_pack->i_last_sequence_header > (int) p_pack->d_frame_rate ) + if( p_sys->i_picture_structure == 0x03 ) { - memcpy( p_sout_buffer->p_buffer + i_pos, - p_pack->p_sequence_header, - p_pack->i_sequence_header_length ); - i_pos += p_pack->i_sequence_header_length; - p_pack->i_last_sequence_header = 0; + if( p_sys->i_progressive_frame && p_sys->i_repeat_first_field ) + { + i_duration += i_duration / 2; + } } - CopyUntilNextStartCode( p_pack, p_sout_buffer, &i_pos ); } - else if( i_code == 0x100 ) /* Picture */ + + if( p_sys->b_low_delay || p_sys->i_picture_type == 0x03 ) + { + /* Trivial case (DTS == PTS) */ + /* Correct interpolated dts when we receive a new pts/dts */ + if( p_sys->i_pts > 0 ) p_sys->i_interpolated_dts = p_sys->i_pts; + if( p_sys->i_dts > 0 ) p_sys->i_interpolated_dts = p_sys->i_dts; + } + else { - /* picture_start_code */ - GetChunk( &p_pack->bit_stream, - p_sout_buffer->p_buffer + i_pos, 4 ); i_pos += 4; + /* Correct interpolated dts when we receive a new pts/dts */ + 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; + + if( !p_sys->b_second_field ) + p_sys->i_last_ref_pts = p_sys->i_pts; + } - NextPTS( &p_pack->bit_stream, &i_pts, &i_dts ); - i_temporal_ref = ShowBits( &p_pack->bit_stream, 10 ); - i_picture_coding_type = ShowBits( &p_pack->bit_stream, 13 ) & 0x3; + p_pic->i_dts = p_sys->i_interpolated_dts; + p_sys->i_interpolated_dts += i_duration; - CopyUntilNextStartCode( p_pack, p_sout_buffer, &i_pos ); + /* Set PTS only if we have a B frame or if it comes from the stream */ + if( p_sys->i_pts > 0 ) + { + p_pic->i_pts = p_sys->i_pts; } - else if( i_code == 0x1b5 ) + else if( p_sys->i_picture_type == 0x03 ) { - /* extention start code 32 */ - GetChunk( &p_pack->bit_stream, - p_sout_buffer->p_buffer + i_pos, 4 ); i_pos += 4; - - if( ShowBits( &p_pack->bit_stream, 4 ) == 0x08 ) - { - /* picture coding extention */ - - /* extention start code identifier(b1000) 4 */ - /* f_code[2][2] 16 */ - /* intra_dc_precision 2 */ - /* picture_structure 2 */ - /* top_field_first 1 */ - i_picture_structure = - ShowBits( &p_pack->bit_stream, 24 ) & 0x03; - i_top_field_first = - ShowBits( &p_pack->bit_stream, 25 ) & 0x01; - i_repeat_first_field = - ShowBits( &p_pack->bit_stream, 31 ) & 0x01; - - GetChunk( &p_pack->bit_stream, - p_sout_buffer->p_buffer + i_pos, 4 ); i_pos += 4; - - i_progressive_frame = - ShowBits( &p_pack->bit_stream, 1 ) & 0x01; - } - CopyUntilNextStartCode( p_pack, p_sout_buffer, &i_pos ); + p_pic->i_pts = p_pic->i_dts; } else { - if( i_code >= 0x101 && i_code <= 0x1af ) - { - b_seen_slice = VLC_TRUE; - } + p_pic->i_pts = 0; + } - if( i_code == 0x1B3 ) - { - p_pack->i_last_sequence_header = 0; - } - CopyUntilNextStartCode( p_pack, p_sout_buffer, &i_pos ); + switch ( p_sys->i_picture_type ) + { + case 0x01: + p_pic->i_flags |= BLOCK_FLAG_TYPE_I; + break; + case 0x02: + p_pic->i_flags |= BLOCK_FLAG_TYPE_P; + break; + case 0x03: + p_pic->i_flags |= BLOCK_FLAG_TYPE_B; + break; } - } - if( i_pts <= 0 && i_dts <= 0 && p_pack->i_interpolated_dts <= 0 ) - { - msg_Dbg( p_pack->p_fifo, "need a starting pts/dts" ); - sout_BufferDelete( p_pack->p_sout_input->p_sout, p_sout_buffer ); - return; - } + p_pic->i_length = p_sys->i_interpolated_dts - p_pic->i_dts; - sout_BufferRealloc( p_pack->p_sout_input->p_sout, - p_sout_buffer, i_pos ); - p_sout_buffer->i_size = i_pos; +#if 0 + msg_Dbg( p_dec, "pic: type=%d dts="I64Fd" pts-dts="I64Fd, + p_sys->i_picture_type, p_pic->i_dts, p_pic->i_pts - p_pic->i_dts); +#endif - /* calculate frame duration */ - if( p_pack->i_progressive_sequence || i_picture_structure == 0x03) - { - i_duration = (mtime_t)( 1000000 / p_pack->d_frame_rate ); - } - else - { - i_duration = (mtime_t)( 1000000 / p_pack->d_frame_rate / 2); - } + /* Reset context */ + p_sys->p_frame = NULL; + p_sys->pp_last = &p_sys->p_frame; + p_sys->b_frame_slice = VLC_FALSE; - if( p_pack->i_progressive_sequence ) - { - if( i_top_field_first == 0 && i_repeat_first_field == 1 ) + if( p_sys->i_picture_structure != 0x03 ) { - i_duration = 2 * i_duration; + p_sys->b_second_field = !p_sys->b_second_field; } - else if( i_top_field_first == 1 && i_repeat_first_field == 1 ) + else { - i_duration = 3 * i_duration; + p_sys->b_second_field = 0; } } - else + + /* + * Check info of current fragment + */ + if( p_frag->p_buffer[3] == 0xb8 ) { - if( i_picture_structure == 0x03 ) + /* Group start code */ + if( p_sys->p_seq && + p_sys->i_seq_old > p_sys->i_frame_rate/p_sys->i_frame_rate_base ) { - if( i_progressive_frame && i_repeat_first_field ) + /* Usefull for mpeg1: repeat sequence header every second */ + block_ChainLastAppend( &p_sys->pp_last, block_Duplicate( p_sys->p_seq ) ); + if( p_sys->p_ext ) { - i_duration += i_duration / 2; + block_ChainLastAppend( &p_sys->pp_last, block_Duplicate( p_sys->p_ext ) ); } + + p_sys->i_seq_old = 0; } } - - if( p_pack->i_low_delay || i_picture_coding_type == 0x03 ) + else if( p_frag->p_buffer[3] == 0xb3 && p_frag->i_buffer >= 8 ) { - /* Trivial case (DTS == PTS) */ - /* Correct interpolated dts when we receive a new pts/dts */ - if( i_pts > 0 ) p_pack->i_interpolated_dts = i_pts; - if( i_dts > 0 ) p_pack->i_interpolated_dts = i_dts; + /* Sequence header code */ + static const int code_to_frame_rate[16][2] = + { + { 1, 1 }, /* invalid */ + { 24000, 1001 }, { 24, 1 }, { 25, 1 }, { 30000, 1001 }, + { 30, 1 }, { 50, 1 }, { 60000, 1001 }, { 60, 1 }, + /* Unofficial 15fps from Xing*/ + { 15, 1001 }, + /* Unofficial economy rates from libmpeg3 */ + { 5, 1001 }, { 10, 1001 }, { 12, 1001 }, { 15, 1001 }, + { 1, 1 }, { 1, 1 } /* invalid */ + }; + + if( p_sys->p_seq ) block_Release( p_sys->p_seq ); + if( p_sys->p_ext ) block_Release( p_sys->p_ext ); + + p_sys->p_seq = block_Duplicate( p_frag ); + p_sys->i_seq_old = 0; + p_sys->p_ext = NULL; + + p_dec->fmt_out.video.i_width = + ( p_frag->p_buffer[4] << 4)|(p_frag->p_buffer[5] >> 4 ); + p_dec->fmt_out.video.i_height = + ( (p_frag->p_buffer[5]&0x0f) << 8 )|p_frag->p_buffer[6]; + p_sys->i_aspect_ratio_info = p_frag->p_buffer[7] >> 4; + + /* TODO: MPEG1 aspect ratio */ + + p_sys->i_frame_rate = code_to_frame_rate[p_frag->p_buffer[7]&0x0f][0]; + p_sys->i_frame_rate_base = + code_to_frame_rate[p_frag->p_buffer[7]&0x0f][1]; + + 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; + + if ( !p_sys->b_inited ) + { + 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; + } } - else + else if( p_frag->p_buffer[3] == 0xb5 ) { - /* Correct interpolated dts when we receive a new pts/dts */ - if( p_pack->i_last_ref_pts ) - p_pack->i_interpolated_dts = p_pack->i_last_ref_pts; - if( i_dts > 0 ) p_pack->i_interpolated_dts = i_dts; - - p_pack->i_last_ref_pts = i_pts; - } - - /* Don't even try to calculate the PTS unless it is given in the - * original stream */ - p_sout_buffer->i_pts = i_pts ? i_pts : -1; + int i_type = p_frag->p_buffer[4] >> 4; - p_sout_buffer->i_dts = p_pack->i_interpolated_dts; - - if( p_pack->i_low_delay || i_picture_coding_type == 0x03 ) - { - /* Trivial case (DTS == PTS) */ - p_pack->i_interpolated_dts += i_duration; - } - else - { - p_pack->i_interpolated_dts += p_pack->i_old_duration; - p_pack->i_old_duration = i_duration; - } + /* 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 - p_sout_buffer->i_length = p_pack->p_pack->i_interpolated_dts - - p_sout_buffer->i_dts; + /* sequence extension */ + if( p_sys->p_ext) block_Release( p_sys->p_ext ); + p_sys->p_ext = block_Duplicate( p_frag ); - p_sout_buffer->i_bitrate = (int)( 8 * i_pos * p_pack->d_frame_rate ); + if( p_frag->i_buffer >= 10 ) + { + p_sys->b_seq_progressive = + p_frag->p_buffer[5]&0x08 ? VLC_TRUE : VLC_FALSE; + p_sys->b_low_delay = + p_frag->p_buffer[9]&0x80 ? VLC_TRUE : VLC_FALSE; + } + /* Do not set aspect ratio : in case we're transcoding, + * transcode will take our fmt_out as a fmt_in to libmpeg2. + * libmpeg2.c will then believe that the user has requested + * a specific aspect ratio, which she hasn't. Thus in case + * of aspect ratio change, we're screwed. --Meuuh + */ #if 0 - msg_Dbg( p_pack->p_fifo, "------------> dts=%lld pts=%lld duration=%lld", - p_sout_buffer->i_dts, p_sout_buffer->i_pts, - p_sout_buffer->i_length ); + p_dec->fmt_out.video.i_aspect = + mpeg2_aspect[p_sys->i_aspect_ratio_info][0] * + VOUT_ASPECT_FACTOR / + mpeg2_aspect[p_sys->i_aspect_ratio_info][1]; #endif - sout_InputSendBuffer( p_pack->p_sout_input, p_sout_buffer ); -} + } + else if( i_type == 0x08 ) + { + /* 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] == 0x00 ) + { + /* Picture start code */ + p_sys->i_seq_old++; + if( p_frag->i_buffer >= 6 ) + { + p_sys->i_temporal_ref = + ( p_frag->p_buffer[4] << 2 )|(p_frag->p_buffer[5] >> 6); + p_sys->i_picture_type = ( p_frag->p_buffer[5] >> 3 ) & 0x03; + } -/***************************************************************************** - * EndThread : packetizer thread destruction - *****************************************************************************/ -static void EndThread ( packetizer_t *p_pack) -{ - if( p_pack->p_sout_input ) + p_sys->i_dts = p_frag->i_dts; + p_sys->i_pts = p_frag->i_pts; + } + else if( p_frag->p_buffer[3] >= 0x01 && p_frag->p_buffer[3] <= 0xaf ) { - sout_InputDelete( p_pack->p_sout_input ); + /* Slice start code */ + p_sys->b_frame_slice = VLC_TRUE; } + + /* Append the block */ + block_ChainLastAppend( &p_sys->pp_last, p_frag ); + + return p_pic; }