X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fcodec%2Fvorbis.c;h=62cb4d2595df2548510e2dc8f85ef8ddc0e9f838;hb=89b6530d8abd99b96b9f33af022022241fe97ee2;hp=a9a7784417a8934d460e37744e9b88869ee78194;hpb=5e15258c9ef28558fe2abc941fc1527e02b04c21;p=vlc diff --git a/modules/codec/vorbis.c b/modules/codec/vorbis.c index a9a7784417..62cb4d2595 100644 --- a/modules/codec/vorbis.c +++ b/modules/codec/vorbis.c @@ -31,12 +31,11 @@ # include "config.h" #endif -#include +#include #include #include #include #include -#include #include #include @@ -87,15 +86,13 @@ struct decoder_sys_t audio_date_t end_date; int i_last_block_size; - int i_input_rate; - /* ** Channel reordering */ int pi_chan_table[AOUT_CHAN_MAX]; }; -static int pi_channels_maps[9] = +static const int pi_channels_maps[9] = { 0, AOUT_CHAN_CENTER, @@ -132,11 +129,6 @@ static const uint32_t pi_4channels_in[] = static const uint32_t pi_3channels_in[] = { AOUT_CHAN_LEFT, AOUT_CHAN_CENTER, AOUT_CHAN_RIGHT, 0 }; -/* our internal channel order (WG-4 order) */ -static const uint32_t pi_channels_out[] = -{ AOUT_CHAN_LEFT, AOUT_CHAN_RIGHT, AOUT_CHAN_REARLEFT, AOUT_CHAN_REARRIGHT, - AOUT_CHAN_CENTER, AOUT_CHAN_LFE, 0 }; - /**************************************************************************** * Local prototypes ****************************************************************************/ @@ -184,43 +176,44 @@ static block_t *Encode ( encoder_t *, aout_buffer_t * ); #define ENC_CBR_LONGTEXT N_( \ "Force a constant bitrate encoding (CBR)." ) -vlc_module_begin(); - set_shortname( "Vorbis" ); - set_description( N_("Vorbis audio decoder") ); +vlc_module_begin () + set_shortname( "Vorbis" ) + set_description( N_("Vorbis audio decoder") ) #ifdef MODULE_NAME_IS_tremor - set_capability( "decoder", 90 ); + set_capability( "decoder", 90 ) #else - set_capability( "decoder", 100 ); + set_capability( "decoder", 100 ) #endif - set_category( CAT_INPUT ); - set_subcategory( SUBCAT_INPUT_ACODEC ); - set_callbacks( OpenDecoder, CloseDecoder ); + set_category( CAT_INPUT ) + set_subcategory( SUBCAT_INPUT_ACODEC ) + set_callbacks( OpenDecoder, CloseDecoder ) - add_submodule(); - set_description( N_("Vorbis audio packetizer") ); - set_capability( "packetizer", 100 ); - set_callbacks( OpenPacketizer, CloseDecoder ); + add_submodule () + set_description( N_("Vorbis audio packetizer") ) + set_capability( "packetizer", 100 ) + set_callbacks( OpenPacketizer, CloseDecoder ) #ifndef MODULE_NAME_IS_tremor # define ENC_CFG_PREFIX "sout-vorbis-" - add_submodule(); - set_description( N_("Vorbis audio encoder") ); - set_capability( "encoder", 100 ); + add_submodule () + set_description( N_("Vorbis audio encoder") ) + set_capability( "encoder", 100 ) #if defined(HAVE_VORBIS_VORBISENC_H) - set_callbacks( OpenEncoder, CloseEncoder ); + set_callbacks( OpenEncoder, CloseEncoder ) #endif add_integer( ENC_CFG_PREFIX "quality", 0, NULL, ENC_QUALITY_TEXT, - ENC_QUALITY_LONGTEXT, false ); + ENC_QUALITY_LONGTEXT, false ) + change_integer_range( 0, 10 ) add_integer( ENC_CFG_PREFIX "max-bitrate", 0, NULL, ENC_MAXBR_TEXT, - ENC_MAXBR_LONGTEXT, false ); + ENC_MAXBR_LONGTEXT, false ) add_integer( ENC_CFG_PREFIX "min-bitrate", 0, NULL, ENC_MINBR_TEXT, - ENC_MINBR_LONGTEXT, false ); + ENC_MINBR_LONGTEXT, false ) add_bool( ENC_CFG_PREFIX "cbr", 0, NULL, ENC_CBR_TEXT, - ENC_CBR_LONGTEXT, false ); + ENC_CBR_LONGTEXT, false ) #endif -vlc_module_end(); +vlc_module_end () #ifndef MODULE_NAME_IS_tremor static const char *const ppsz_enc_options[] = { @@ -236,14 +229,13 @@ static int OpenDecoder( vlc_object_t *p_this ) decoder_t *p_dec = (decoder_t*)p_this; decoder_sys_t *p_sys; - if( p_dec->fmt_in.i_codec != VLC_FOURCC('v','o','r','b') ) + if( p_dec->fmt_in.i_codec != VLC_CODEC_VORBIS ) { return VLC_EGENERIC; } /* 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 ) + if( ( p_dec->p_sys = p_sys = malloc( sizeof(*p_sys) ) ) == NULL ) return VLC_ENOMEM; /* Misc init */ @@ -251,7 +243,6 @@ static int OpenDecoder( vlc_object_t *p_this ) p_sys->i_last_block_size = 0; p_sys->b_packetizer = false; p_sys->i_headers = 0; - p_sys->i_input_rate = INPUT_RATE_DEFAULT; /* Take care of vorbis init */ vorbis_info_init( &p_sys->vi ); @@ -260,9 +251,9 @@ static int OpenDecoder( vlc_object_t *p_this ) /* Set output properties */ p_dec->fmt_out.i_cat = AUDIO_ES; #ifdef MODULE_NAME_IS_tremor - p_dec->fmt_out.i_codec = VLC_FOURCC('f','i','3','2'); + p_dec->fmt_out.i_codec = VLC_CODEC_FI32; #else - p_dec->fmt_out.i_codec = VLC_FOURCC('f','l','3','2'); + p_dec->fmt_out.i_codec = VLC_CODEC_FL32; #endif /* Set callbacks */ @@ -283,7 +274,7 @@ static int OpenPacketizer( vlc_object_t *p_this ) if( i_ret == VLC_SUCCESS ) { p_dec->p_sys->b_packetizer = true; - p_dec->fmt_out.i_codec = VLC_FOURCC('v','o','r','b'); + p_dec->fmt_out.i_codec = VLC_CODEC_VORBIS; } return i_ret; @@ -306,9 +297,6 @@ static void *DecodeBlock( decoder_t *p_dec, block_t **pp_block ) /* Block to Ogg packet */ oggpacket.packet = (*pp_block)->p_buffer; oggpacket.bytes = (*pp_block)->i_buffer; - - if( (*pp_block)->i_rate > 0 ) - p_sys->i_input_rate = (*pp_block)->i_rate; } else { @@ -560,7 +548,7 @@ static aout_buffer_t *DecodePacket( decoder_t *p_dec, ogg_packet *p_oggpacket ) aout_buffer_t *p_aout_buffer; p_aout_buffer = - p_dec->pf_aout_buffer_new( p_dec, i_samples ); + decoder_NewAudioBuffer( p_dec, i_samples ); if( p_aout_buffer == NULL ) return NULL; @@ -578,8 +566,7 @@ static aout_buffer_t *DecodePacket( decoder_t *p_dec, ogg_packet *p_oggpacket ) /* Date management */ p_aout_buffer->start_date = aout_DateGet( &p_sys->end_date ); - p_aout_buffer->end_date = aout_DateIncrement( &p_sys->end_date, - i_samples * p_sys->i_input_rate / INPUT_RATE_DEFAULT ); + p_aout_buffer->end_date = aout_DateIncrement( &p_sys->end_date, i_samples ); return p_aout_buffer; } else @@ -606,9 +593,7 @@ static block_t *SendPacket( decoder_t *p_dec, ogg_packet *p_oggpacket, p_block->i_dts = p_block->i_pts = aout_DateGet( &p_sys->end_date ); if( p_sys->i_headers >= 3 ) - p_block->i_length = aout_DateIncrement( &p_sys->end_date, - i_samples * p_sys->i_input_rate / INPUT_RATE_DEFAULT ) - - p_block->i_pts; + p_block->i_length = aout_DateIncrement( &p_sys->end_date, i_samples ) - p_block->i_pts; else p_block->i_length = 0; @@ -620,78 +605,26 @@ static block_t *SendPacket( decoder_t *p_dec, ogg_packet *p_oggpacket, *****************************************************************************/ static void ParseVorbisComments( decoder_t *p_dec ) { - input_thread_t *p_input = (input_thread_t *)p_dec->p_parent; char *psz_name, *psz_value, *psz_comment; - input_item_t *p_item; int i = 0; - if( p_input->i_object_type != VLC_OBJECT_INPUT ) return; - - p_item = input_GetItem( p_input ); - while( i < p_dec->p_sys->vc.comments ) { psz_comment = strdup( p_dec->p_sys->vc.user_comments[i] ); if( !psz_comment ) - { - msg_Warn( p_dec, "out of memory" ); break; - } psz_name = psz_comment; psz_value = strchr( psz_comment, '=' ); if( psz_value ) { *psz_value = '\0'; psz_value++; - input_Control( p_input, INPUT_ADD_INFO, _("Vorbis comment"), - psz_name, "%s", psz_value ); -#ifndef HAVE_TAGLIB - if( !strcasecmp( psz_name, "artist" ) ) - { - if( psz_value && ( *psz_value != '\0' ) ) - { - input_item_SetArtist( p_item, psz_value ); - } - } - else if( !strcasecmp( psz_name, "title" ) ) - { - if( psz_value && ( *psz_value != '\0' ) ) - { - input_item_SetTitle( p_item, psz_value ); - p_item->psz_name = strdup( psz_value ); - } - } - else if( !strcasecmp( psz_name, "album" ) ) - { - if( psz_value && ( *psz_value != '\0' ) ) - { - input_item_SetAlbum( p_item, psz_value ); - } - } - else if( !strcasecmp( psz_name, "musicbrainz_trackid" ) ) - { - if( psz_value && ( *psz_value != '\0' ) ) - { - input_item_SetTrackID( p_item, psz_value ); - } - } -#if 0 //not used - else if( !strcasecmp( psz_name, "musicbrainz_artistid" ) ) - { - if( psz_value && ( *psz_value != '\0' ) ) - { - vlc_meta_SetArtistID( p_item, psz_value ); - } - } - else if( !strcasecmp( psz_name, "musicbrainz_albumid" ) ) - { - if( psz_value && ( *psz_value != '\0' ) ) - { - input_item_SetAlbumID( p_item, psz_value ); - } - } -#endif -#endif + + if( !p_dec->p_description ) + p_dec->p_description = vlc_meta_New(); + if( p_dec->p_description ) + vlc_meta_AddExtra( p_dec->p_description, psz_name, psz_value ); + if( !strcasecmp( psz_name, "REPLAYGAIN_TRACK_GAIN" ) || !strcasecmp( psz_name, "RG_RADIO" ) ) { @@ -724,8 +657,6 @@ static void ParseVorbisComments( decoder_t *p_dec ) r->pf_peak[AUDIO_REPLAY_GAIN_ALBUM] = atof( psz_value ); } } - var_SetInteger( pl_Yield( p_input ), "item-change", p_item->i_id ); - pl_Release( p_input ); free( psz_comment ); i++; } @@ -761,12 +692,12 @@ static void ConfigureChannelOrder(int *pi_chan_table, int i_channels, uint32_t i } if( b_decode ) - aout_CheckChannelReorder( pi_channels_in, pi_channels_out, + aout_CheckChannelReorder( pi_channels_in, NULL, i_channel_mask & AOUT_CHAN_PHYSMASK, i_channels, pi_chan_table ); else - aout_CheckChannelReorder( pi_channels_out, pi_channels_in, + aout_CheckChannelReorder( NULL, pi_channels_in, i_channel_mask & AOUT_CHAN_PHYSMASK, i_channels, pi_chan_table ); @@ -863,7 +794,7 @@ static int OpenEncoder( vlc_object_t *p_this ) vlc_value_t val; uint8_t *p_extra; - if( p_enc->fmt_out.i_codec != VLC_FOURCC('v','o','r','b') && + if( p_enc->fmt_out.i_codec != VLC_CODEC_VORBIS && !p_enc->b_force ) { return VLC_EGENERIC; @@ -875,8 +806,8 @@ static int OpenEncoder( vlc_object_t *p_this ) p_enc->p_sys = p_sys; p_enc->pf_encode_audio = Encode; - p_enc->fmt_in.i_codec = VLC_FOURCC('f','l','3','2'); - p_enc->fmt_out.i_codec = VLC_FOURCC('v','o','r','b'); + p_enc->fmt_in.i_codec = VLC_CODEC_FL32; + p_enc->fmt_out.i_codec = VLC_CODEC_VORBIS; config_ChainParse( p_enc, ENC_CFG_PREFIX, ppsz_enc_options, p_enc->p_cfg );