X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fcodec%2Fmpeg_audio.c;h=08dc775647532a6f7610724dbed5f5b4232447d8;hb=2ef307b4e9e69c887ec2d554345015016ce55bbc;hp=f025be51f93b5ea0e1e0a3ed0a924eeae702587d;hpb=174f75debc6ff4b0b3a7037bc21e7b77bfe2a9d8;p=vlc diff --git a/modules/codec/mpeg_audio.c b/modules/codec/mpeg_audio.c index f025be51f9..08dc775647 100644 --- a/modules/codec/mpeg_audio.c +++ b/modules/codec/mpeg_audio.c @@ -35,9 +35,13 @@ #include #include #include +#include +#include #include +#include "../packetizer/packetizer_helper.h" + /***************************************************************************** * decoder_sys_t : decoder descriptor *****************************************************************************/ @@ -56,8 +60,8 @@ struct decoder_sys_t /* * Common properties */ - audio_date_t end_date; - unsigned int i_current_layer; + date_t end_date; + unsigned int i_current_layer; mtime_t i_pts; @@ -69,16 +73,6 @@ struct decoder_sys_t bool b_discontinuity; }; -enum { - - STATE_NOSYNC, - STATE_SYNC, - STATE_HEADER, - STATE_NEXT_SYNC, - STATE_GET_DATA, - STATE_SEND_DATA -}; - /* This isn't the place to put mad-specific stuff. However, it makes the * mad plug-in's life much easier if we put 8 extra bytes at the end of the * buffer, because that way it doesn't have to copy the aout_buffer_t to a @@ -93,9 +87,9 @@ enum { static int OpenDecoder ( vlc_object_t * ); static int OpenPacketizer( vlc_object_t * ); static void CloseDecoder ( vlc_object_t * ); -static void *DecodeBlock ( decoder_t *, block_t ** ); +static block_t *DecodeBlock ( decoder_t *, block_t ** ); -static uint8_t *GetOutBuffer ( decoder_t *, void ** ); +static uint8_t *GetOutBuffer ( decoder_t *, block_t ** ); static aout_buffer_t *GetAoutBuffer( decoder_t * ); static block_t *GetSoutBuffer( decoder_t * ); @@ -147,8 +141,9 @@ static int Open( vlc_object_t *p_this ) /* Misc init */ p_sys->b_packetizer = false; p_sys->i_state = STATE_NOSYNC; - aout_DateSet( &p_sys->end_date, 0 ); - p_sys->bytestream = block_BytestreamInit(); + date_Set( &p_sys->end_date, 0 ); + block_BytestreamInit( &p_sys->bytestream ); + p_sys->i_pts = VLC_TS_INVALID; p_sys->b_discontinuity = false; /* Set output properties */ @@ -157,10 +152,8 @@ static int Open( vlc_object_t *p_this ) p_dec->fmt_out.audio.i_rate = 0; /* So end_date gets initialized */ /* Set callback */ - p_dec->pf_decode_audio = (aout_buffer_t *(*)(decoder_t *, block_t **)) - DecodeBlock; - p_dec->pf_packetize = (block_t *(*)(decoder_t *, block_t **)) - DecodeBlock; + p_dec->pf_decode_audio = DecodeBlock; + p_dec->pf_packetize = DecodeBlock; /* Start with the minimum size for a free bitrate frame */ p_sys->i_free_frame_size = MPGA_HEADER_SIZE; @@ -193,13 +186,13 @@ static int OpenPacketizer( vlc_object_t *p_this ) **************************************************************************** * This function is called just after the thread is launched. ****************************************************************************/ -static void *DecodeBlock( decoder_t *p_dec, block_t **pp_block ) +static block_t *DecodeBlock( decoder_t *p_dec, block_t **pp_block ) { decoder_sys_t *p_sys = p_dec->p_sys; uint8_t p_header[MAD_BUFFER_GUARD]; uint32_t i_header; uint8_t *p_buf; - void *p_out_buffer; + block_t *p_out_buffer; if( !pp_block || !*pp_block ) return NULL; @@ -210,13 +203,13 @@ static void *DecodeBlock( decoder_t *p_dec, block_t **pp_block ) p_sys->i_state = STATE_NOSYNC; block_BytestreamEmpty( &p_sys->bytestream ); } - aout_DateSet( &p_sys->end_date, 0 ); + date_Set( &p_sys->end_date, 0 ); block_Release( *pp_block ); p_sys->b_discontinuity = true; return NULL; } - if( !aout_DateGet( &p_sys->end_date ) && !(*pp_block)->i_pts ) + if( !date_Get( &p_sys->end_date ) && (*pp_block)->i_pts <= VLC_TS_INVALID ) { /* We've just started the stream, wait for the first PTS. */ msg_Dbg( p_dec, "waiting for PTS" ); @@ -254,10 +247,10 @@ static void *DecodeBlock( decoder_t *p_dec, block_t **pp_block ) case STATE_SYNC: /* New frame, set the Presentation Time Stamp */ p_sys->i_pts = p_sys->bytestream.p_block->i_pts; - if( p_sys->i_pts != 0 && - p_sys->i_pts != aout_DateGet( &p_sys->end_date ) ) + if( p_sys->i_pts > VLC_TS_INVALID && + p_sys->i_pts != date_Get( &p_sys->end_date ) ) { - aout_DateSet( &p_sys->end_date, p_sys->i_pts ); + date_Set( &p_sys->end_date, p_sys->i_pts ); } p_sys->i_state = STATE_HEADER; @@ -284,6 +277,8 @@ static void *DecodeBlock( decoder_t *p_dec, block_t **pp_block ) &p_sys->i_max_frame_size, &p_sys->i_layer ); + p_dec->fmt_in.i_profile = p_sys->i_layer; + if( p_sys->i_frame_size == -1 ) { msg_Dbg( p_dec, "emulated startcode" ); @@ -457,11 +452,13 @@ static void *DecodeBlock( decoder_t *p_dec, block_t **pp_block ) /* Copy the whole frame into the buffer. When we reach this point * we already know we have enough data available. */ - block_GetBytes( &p_sys->bytestream, p_buf, p_sys->i_frame_size ); + block_GetBytes( &p_sys->bytestream, + p_buf, __MIN( (unsigned)p_sys->i_frame_size, p_out_buffer->i_buffer ) ); /* Get beginning of next frame for libmad */ if( !p_sys->b_packetizer ) { + assert( p_out_buffer->i_buffer >= (unsigned)p_sys->i_frame_size + MAD_BUFFER_GUARD ); memcpy( p_buf + p_sys->i_frame_size, p_header, MAD_BUFFER_GUARD ); } @@ -470,7 +467,7 @@ static void *DecodeBlock( decoder_t *p_dec, block_t **pp_block ) /* Make sure we don't reuse the same pts twice */ if( p_sys->i_pts == p_sys->bytestream.p_block->i_pts ) - p_sys->i_pts = p_sys->bytestream.p_block->i_pts = 0; + p_sys->i_pts = p_sys->bytestream.p_block->i_pts = VLC_TS_INVALID; /* So p_block doesn't get re-added several times */ *pp_block = block_BytestreamPop( &p_sys->bytestream ); @@ -485,7 +482,7 @@ static void *DecodeBlock( decoder_t *p_dec, block_t **pp_block ) /***************************************************************************** * GetOutBuffer: *****************************************************************************/ -static uint8_t *GetOutBuffer( decoder_t *p_dec, void **pp_out_buffer ) +static uint8_t *GetOutBuffer( decoder_t *p_dec, block_t **pp_out_buffer ) { decoder_sys_t *p_sys = p_dec->p_sys; uint8_t *p_buf; @@ -495,8 +492,8 @@ static uint8_t *GetOutBuffer( decoder_t *p_dec, void **pp_out_buffer ) msg_Dbg( p_dec, "MPGA channels:%d samplerate:%d bitrate:%d", p_sys->i_channels, p_sys->i_rate, p_sys->i_bit_rate ); - aout_DateInit( &p_sys->end_date, p_sys->i_rate ); - aout_DateSet( &p_sys->end_date, p_sys->i_pts ); + date_Init( &p_sys->end_date, p_sys->i_rate, 1 ); + date_Set( &p_sys->end_date, p_sys->i_pts ); } p_dec->fmt_out.audio.i_rate = p_sys->i_rate; @@ -538,14 +535,15 @@ static aout_buffer_t *GetAoutBuffer( decoder_t *p_dec ) p_buf = decoder_NewAudioBuffer( p_dec, p_sys->i_frame_length ); if( p_buf == NULL ) return NULL; - p_buf->start_date = aout_DateGet( &p_sys->end_date ); - p_buf->end_date = - aout_DateIncrement( &p_sys->end_date, p_sys->i_frame_length ); - p_buf->b_discontinuity = p_sys->b_discontinuity; + p_buf->i_pts = date_Get( &p_sys->end_date ); + p_buf->i_length = date_Increment( &p_sys->end_date, p_sys->i_frame_length ) + - p_buf->i_pts; + if( p_sys->b_discontinuity ) + p_buf->i_flags |= BLOCK_FLAG_DISCONTINUITY; p_sys->b_discontinuity = false; /* Hack for libmad filter */ - p_buf->i_nb_bytes = p_sys->i_frame_size + MAD_BUFFER_GUARD; + p_buf = block_Realloc( p_buf, 0, p_sys->i_frame_size + MAD_BUFFER_GUARD ); return p_buf; } @@ -561,10 +559,10 @@ static block_t *GetSoutBuffer( decoder_t *p_dec ) p_block = block_New( p_dec, p_sys->i_frame_size ); if( p_block == NULL ) return NULL; - p_block->i_pts = p_block->i_dts = aout_DateGet( &p_sys->end_date ); + p_block->i_pts = p_block->i_dts = date_Get( &p_sys->end_date ); p_block->i_length = - aout_DateIncrement( &p_sys->end_date, p_sys->i_frame_length ) - p_block->i_pts; + date_Increment( &p_sys->end_date, p_sys->i_frame_length ) - p_block->i_pts; return p_block; } @@ -625,7 +623,7 @@ static int SyncInfo( uint32_t i_header, unsigned int * pi_channels, }; int i_version, i_mode, i_emphasis; - bool b_padding, b_mpeg_2_5, b_crc; + bool b_padding, b_mpeg_2_5; int i_frame_size = 0; int i_bitrate_index, i_samplerate_index; int i_max_bit_rate; @@ -633,7 +631,7 @@ static int SyncInfo( uint32_t i_header, unsigned int * pi_channels, b_mpeg_2_5 = 1 - ((i_header & 0x100000) >> 20); i_version = 1 - ((i_header & 0x80000) >> 19); *pi_layer = 4 - ((i_header & 0x60000) >> 17); - b_crc = !((i_header >> 16) & 0x01); + //bool b_crc = !((i_header >> 16) & 0x01); i_bitrate_index = (i_header & 0xf000) >> 12; i_samplerate_index = (i_header & 0xc00) >> 10; b_padding = (i_header & 0x200) >> 9;