X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fcodec%2Fmpeg_audio.c;h=9333b30a5682ed1213163e24b50f644c81641181;hb=be378fbc80c384e2541517d6853b59411b7e67de;hp=cb645c8372745b17c942893d6f72484af8dd8797;hpb=bf48c33dbb564a5ede1581ab9bcb2db9213fba2f;p=vlc diff --git a/modules/codec/mpeg_audio.c b/modules/codec/mpeg_audio.c index cb645c8372..9333b30a56 100644 --- a/modules/codec/mpeg_audio.c +++ b/modules/codec/mpeg_audio.c @@ -27,9 +27,15 @@ /***************************************************************************** * Preamble *****************************************************************************/ -#include +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif + +#include +#include #include #include +#include #include @@ -39,7 +45,7 @@ struct decoder_sys_t { /* Module mode */ - vlc_bool_t b_packetizer; + bool b_packetizer; /* * Input properties @@ -61,7 +67,9 @@ struct decoder_sys_t unsigned int i_rate, i_max_frame_size, i_frame_length; unsigned int i_layer, i_bit_rate; - vlc_bool_t b_discontinuity; + bool b_discontinuity; + + int i_input_rate; }; enum { @@ -105,7 +113,7 @@ static int SyncInfo( uint32_t i_header, unsigned int * pi_channels, * Module descriptor *****************************************************************************/ vlc_module_begin(); - set_description( _("MPEG audio layer I/II/III decoder") ); + set_description( N_("MPEG audio layer I/II/III decoder") ); set_category( CAT_INPUT ); set_subcategory( SUBCAT_INPUT_ACODEC ); #if defined(UNDER_CE) @@ -116,7 +124,7 @@ vlc_module_begin(); set_callbacks( OpenDecoder, CloseDecoder ); add_submodule(); - set_description( _("MPEG audio layer I/II/III packetizer") ); + set_description( N_("MPEG audio layer I/II/III packetizer") ); set_capability( "packetizer", 10 ); set_callbacks( OpenPacketizer, CloseDecoder ); vlc_module_end(); @@ -136,7 +144,7 @@ static int OpenDecoder( vlc_object_t *p_this ) /* HACK: Don't use this codec if we don't have an mpga audio filter */ if( p_dec->i_object_type == VLC_OBJECT_DECODER && - !config_FindModule( p_this, "mpgatofixed32" ) ) + !module_Exists( p_this, "mpgatofixed32" ) ) { return VLC_EGENERIC; } @@ -144,17 +152,15 @@ static int OpenDecoder( vlc_object_t *p_this ) /* Allocate the memory needed to store the decoder's structure */ if( ( p_dec->p_sys = p_sys = (decoder_sys_t *)malloc(sizeof(decoder_sys_t)) ) == NULL ) - { - msg_Err( p_dec, "out of memory" ); - return VLC_EGENERIC; - } + return VLC_ENOMEM; /* Misc init */ - p_sys->b_packetizer = VLC_FALSE; + p_sys->b_packetizer = false; p_sys->i_state = STATE_NOSYNC; aout_DateSet( &p_sys->end_date, 0 ); - p_sys->bytestream = block_BytestreamInit( p_dec ); - p_sys->b_discontinuity = VLC_FALSE; + p_sys->bytestream = block_BytestreamInit(); + p_sys->b_discontinuity = false; + p_sys->i_input_rate = INPUT_RATE_DEFAULT; /* Set output properties */ p_dec->fmt_out.i_cat = AUDIO_ES; @@ -179,7 +185,7 @@ static int OpenPacketizer( vlc_object_t *p_this ) int i_ret = OpenDecoder( p_this ); - if( i_ret == VLC_SUCCESS ) p_dec->p_sys->b_packetizer = VLC_TRUE; + if( i_ret == VLC_SUCCESS ) p_dec->p_sys->b_packetizer = true; return i_ret; } @@ -208,7 +214,7 @@ static void *DecodeBlock( decoder_t *p_dec, block_t **pp_block ) } // aout_DateSet( &p_sys->end_date, 0 ); block_Release( *pp_block ); - p_sys->b_discontinuity = VLC_TRUE; + p_sys->b_discontinuity = true; return NULL; } @@ -220,6 +226,9 @@ static void *DecodeBlock( decoder_t *p_dec, block_t **pp_block ) return NULL; } + if( (*pp_block)->i_rate > 0 ) + p_sys->i_input_rate = (*pp_block)->i_rate; + block_BytestreamPush( &p_sys->bytestream, *pp_block ); while( 1 ) @@ -285,18 +294,19 @@ static void *DecodeBlock( decoder_t *p_dec, block_t **pp_block ) msg_Dbg( p_dec, "emulated startcode" ); block_SkipByte( &p_sys->bytestream ); p_sys->i_state = STATE_NOSYNC; - p_sys->b_discontinuity = VLC_TRUE; + p_sys->b_discontinuity = true; break; } if( p_sys->i_bit_rate == 0 ) { - /* Free birate, but 99% emulated startcode :( */ + /* Free bitrate, but 99% emulated startcode :( */ if( p_dec->p_sys->i_free_frame_size == MPGA_HEADER_SIZE ) { msg_Dbg( p_dec, "free bitrate mode"); } - p_sys->i_frame_size = p_sys->i_free_frame_size; + /* The -1 below is to account for the frame padding */ + p_sys->i_frame_size = p_sys->i_free_frame_size - 1; } p_sys->i_state = STATE_NEXT_SYNC; @@ -360,7 +370,7 @@ static void *DecodeBlock( decoder_t *p_dec, block_t **pp_block ) msg_Dbg( p_dec, "emulated startcode on next frame" ); block_SkipByte( &p_sys->bytestream ); p_sys->i_state = STATE_NOSYNC; - p_sys->b_discontinuity = VLC_TRUE; + p_sys->b_discontinuity = true; break; } @@ -440,7 +450,7 @@ static void *DecodeBlock( decoder_t *p_dec, block_t **pp_block ) case STATE_SEND_DATA: if( !(p_buf = GetOutBuffer( p_dec, &p_out_buffer )) ) { - //p_dec->b_error = VLC_TRUE; + //p_dec->b_error = true; return NULL; } @@ -535,9 +545,10 @@ static aout_buffer_t *GetAoutBuffer( decoder_t *p_dec ) 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 ); + aout_DateIncrement( &p_sys->end_date, + p_sys->i_frame_length * p_sys->i_input_rate / INPUT_RATE_DEFAULT ); p_buf->b_discontinuity = p_sys->b_discontinuity; - p_sys->b_discontinuity = VLC_FALSE; + p_sys->b_discontinuity = false; /* Hack for libmad filter */ p_buf->i_nb_bytes = p_sys->i_frame_size + MAD_BUFFER_GUARD; @@ -559,8 +570,9 @@ static block_t *GetSoutBuffer( decoder_t *p_dec ) p_block->i_pts = p_block->i_dts = aout_DateGet( &p_sys->end_date ); p_block->i_length = - aout_DateIncrement( &p_sys->end_date, p_sys->i_frame_length ) - - p_block->i_pts; + aout_DateIncrement( &p_sys->end_date, + p_sys->i_frame_length * p_sys->i_input_rate / INPUT_RATE_DEFAULT ) - + p_block->i_pts; return p_block; } @@ -621,7 +633,7 @@ static int SyncInfo( uint32_t i_header, unsigned int * pi_channels, }; int i_version, i_mode, i_emphasis; - vlc_bool_t b_padding, b_mpeg_2_5, b_crc; + bool b_padding, b_mpeg_2_5, b_crc; int i_frame_size = 0; int i_bitrate_index, i_samplerate_index; int i_max_bit_rate; @@ -696,6 +708,9 @@ static int SyncInfo( uint32_t i_header, unsigned int * pi_channels, default: break; } + + /* Free bitrate mode can support higher bitrates */ + if( !*pi_bit_rate ) *pi_max_frame_size *= 2; } else {