X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fcodec%2Fvorbis.c;h=03a3053cb3a67d44337f03e7eef9c89bbd75cdda;hb=3bc199aba78a566d81f6551ba0bb79982b237031;hp=79a75e3e3fbf6054595a5176112ce12b2f7bb7c2;hpb=4f028428053d0342c55deb6ba8b8da114c6a0caa;p=vlc diff --git a/modules/codec/vorbis.c b/modules/codec/vorbis.c index 79a75e3e3f..03a3053cb3 100644 --- a/modules/codec/vorbis.c +++ b/modules/codec/vorbis.c @@ -27,11 +27,15 @@ /***************************************************************************** * Preamble *****************************************************************************/ -#include +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif + +#include +#include #include #include #include -#include #include #include @@ -40,15 +44,11 @@ #include #else -#include - -/* vorbis header */ -#ifdef HAVE_VORBIS_VORBISENC_H -# include -# ifndef OV_ECTL_RATEMANAGE_AVG -# define OV_ECTL_RATEMANAGE_AVG 0x0 -# endif -#endif +#include + +# ifndef OV_ECTL_RATEMANAGE_AVG +# define OV_ECTL_RATEMANAGE_AVG 0x0 +# endif #endif @@ -58,7 +58,7 @@ struct decoder_sys_t { /* Module mode */ - vlc_bool_t b_packetizer; + bool b_packetizer; /* * Input properties @@ -79,18 +79,16 @@ struct decoder_sys_t /* * Common properties */ - audio_date_t end_date; + 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, @@ -127,11 +125,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 ****************************************************************************/ @@ -148,7 +141,7 @@ static block_t *SendPacket( decoder_t *, ogg_packet *, block_t * ); static void ParseVorbisComments( decoder_t * ); -static void ConfigureChannelOrder(int *, int, uint32_t, vlc_bool_t ); +static void ConfigureChannelOrder(int *, int, uint32_t, bool ); #ifdef MODULE_NAME_IS_tremor static void Interleave ( int32_t *, const int32_t **, int, int, int * ); @@ -179,46 +172,45 @@ 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( _("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( _("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( _("Vorbis audio encoder") ); - set_capability( "encoder", 100 ); -#if defined(HAVE_VORBIS_VORBISENC_H) - set_callbacks( OpenEncoder, CloseEncoder ); -#endif + add_submodule () + set_description( N_("Vorbis audio encoder") ) + set_capability( "encoder", 100 ) + set_callbacks( OpenEncoder, CloseEncoder ) add_integer( ENC_CFG_PREFIX "quality", 0, NULL, ENC_QUALITY_TEXT, - ENC_QUALITY_LONGTEXT, VLC_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, VLC_FALSE ); + ENC_MAXBR_LONGTEXT, false ) add_integer( ENC_CFG_PREFIX "min-bitrate", 0, NULL, ENC_MINBR_TEXT, - ENC_MINBR_LONGTEXT, VLC_FALSE ); - add_bool( ENC_CFG_PREFIX "cbr", 0, NULL, ENC_CBR_TEXT, - ENC_CBR_LONGTEXT, VLC_FALSE ); + ENC_MINBR_LONGTEXT, false ) + add_bool( ENC_CFG_PREFIX "cbr", false, NULL, ENC_CBR_TEXT, + ENC_CBR_LONGTEXT, false ) #endif -vlc_module_end(); +vlc_module_end () #ifndef MODULE_NAME_IS_tremor -static const char *ppsz_enc_options[] = { +static const char *const ppsz_enc_options[] = { "quality", "max-bitrate", "min-bitrate", "cbr", NULL }; #endif @@ -231,25 +223,20 @@ 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 ) - { - msg_Err( p_dec, "out of memory" ); - return VLC_EGENERIC; - } + if( ( p_dec->p_sys = p_sys = malloc( sizeof(*p_sys) ) ) == NULL ) + return VLC_ENOMEM; /* Misc init */ - aout_DateSet( &p_sys->end_date, 0 ); + date_Set( &p_sys->end_date, 0 ); p_sys->i_last_block_size = 0; - p_sys->b_packetizer = VLC_FALSE; + 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 ); @@ -258,9 +245,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 */ @@ -280,8 +267,8 @@ static int OpenPacketizer( vlc_object_t *p_this ) if( i_ret == VLC_SUCCESS ) { - p_dec->p_sys->b_packetizer = VLC_TRUE; - p_dec->fmt_out.i_codec = VLC_FOURCC('v','o','r','b'); + p_dec->p_sys->b_packetizer = true; + p_dec->fmt_out.i_codec = VLC_CODEC_VORBIS; } return i_ret; @@ -304,9 +291,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 { @@ -417,7 +401,7 @@ static int ProcessHeaders( decoder_t *p_dec ) pi_channels_maps[p_sys->vi.channels]; p_dec->fmt_out.i_bitrate = p_sys->vi.bitrate_nominal; - aout_DateInit( &p_sys->end_date, p_sys->vi.rate ); + date_Init( &p_sys->end_date, p_sys->vi.rate, 1 ); msg_Dbg( p_dec, "channels:%d samplerate:%ld bitrate:%ld", p_sys->vi.channels, p_sys->vi.rate, p_sys->vi.bitrate_nominal ); @@ -477,7 +461,7 @@ static int ProcessHeaders( decoder_t *p_dec ) } ConfigureChannelOrder(p_sys->pi_chan_table, p_sys->vi.channels, - p_dec->fmt_out.audio.i_physical_channels, VLC_TRUE); + p_dec->fmt_out.audio.i_physical_channels, true); return VLC_SUCCESS; } @@ -493,12 +477,12 @@ static void *ProcessPacket( decoder_t *p_dec, ogg_packet *p_oggpacket, /* Date management */ if( p_block && p_block->i_pts > 0 && - p_block->i_pts != aout_DateGet( &p_sys->end_date ) ) + p_block->i_pts != date_Get( &p_sys->end_date ) ) { - aout_DateSet( &p_sys->end_date, p_block->i_pts ); + date_Set( &p_sys->end_date, p_block->i_pts ); } - if( !aout_DateGet( &p_sys->end_date ) ) + if( !date_Get( &p_sys->end_date ) ) { /* We've just started the stream, wait for the first PTS. */ if( p_block ) block_Release( p_block ); @@ -558,7 +542,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; @@ -575,9 +559,9 @@ static aout_buffer_t *DecodePacket( decoder_t *p_dec, ogg_packet *p_oggpacket ) vorbis_synthesis_read( &p_sys->vd, i_samples ); /* 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->i_pts = date_Get( &p_sys->end_date ); + p_aout_buffer->i_length = date_Increment( &p_sys->end_date, + i_samples ) - p_aout_buffer->i_pts; return p_aout_buffer; } else @@ -601,12 +585,10 @@ static block_t *SendPacket( decoder_t *p_dec, ogg_packet *p_oggpacket, p_sys->i_last_block_size = i_block_size; /* Date management */ - p_block->i_dts = p_block->i_pts = aout_DateGet( &p_sys->end_date ); + p_block->i_dts = p_block->i_pts = date_Get( &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 = date_Increment( &p_sys->end_date, i_samples ) - p_block->i_pts; else p_block->i_length = 0; @@ -618,88 +600,32 @@ 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 ); - input_ItemAddInfo( p_item, - _(VLC_META_INFO_CAT), - _(VLC_META_ARTIST), - "%s", 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" ) ) { audio_replay_gain_t *r = &p_dec->fmt_out.audio_replay_gain; - r->pb_gain[AUDIO_REPLAY_GAIN_TRACK] = VLC_TRUE; + r->pb_gain[AUDIO_REPLAY_GAIN_TRACK] = true; r->pf_gain[AUDIO_REPLAY_GAIN_TRACK] = atof( psz_value ); } else if( !strcasecmp( psz_name, "REPLAYGAIN_TRACK_PEAK" ) || @@ -707,7 +633,7 @@ static void ParseVorbisComments( decoder_t *p_dec ) { audio_replay_gain_t *r = &p_dec->fmt_out.audio_replay_gain; - r->pb_peak[AUDIO_REPLAY_GAIN_TRACK] = VLC_TRUE; + r->pb_peak[AUDIO_REPLAY_GAIN_TRACK] = true; r->pf_peak[AUDIO_REPLAY_GAIN_TRACK] = atof( psz_value ); } else if( !strcasecmp( psz_name, "REPLAYGAIN_ALBUM_GAIN" ) || @@ -715,18 +641,17 @@ static void ParseVorbisComments( decoder_t *p_dec ) { audio_replay_gain_t *r = &p_dec->fmt_out.audio_replay_gain; - r->pb_gain[AUDIO_REPLAY_GAIN_ALBUM] = VLC_TRUE; + r->pb_gain[AUDIO_REPLAY_GAIN_ALBUM] = true; r->pf_gain[AUDIO_REPLAY_GAIN_ALBUM] = atof( psz_value ); } else if( !strcasecmp( psz_name, "REPLAYGAIN_ALBUM_PEAK" ) ) { audio_replay_gain_t *r = &p_dec->fmt_out.audio_replay_gain; - r->pb_peak[AUDIO_REPLAY_GAIN_ALBUM] = VLC_TRUE; + r->pb_peak[AUDIO_REPLAY_GAIN_ALBUM] = true; r->pf_peak[AUDIO_REPLAY_GAIN_ALBUM] = atof( psz_value ); } } - var_SetInteger( pl_Get( p_input ), "item-change", p_item->i_id ); free( psz_comment ); i++; } @@ -735,7 +660,7 @@ static void ParseVorbisComments( decoder_t *p_dec ) /***************************************************************************** * Interleave: helper function to interleave channels *****************************************************************************/ -static void ConfigureChannelOrder(int *pi_chan_table, int i_channels, uint32_t i_channel_mask, vlc_bool_t b_decode) +static void ConfigureChannelOrder(int *pi_chan_table, int i_channels, uint32_t i_channel_mask, bool b_decode) { const uint32_t *pi_channels_in; switch( i_channels ) @@ -762,12 +687,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 ); @@ -818,7 +743,7 @@ static void CloseDecoder( vlc_object_t *p_this ) free( p_sys ); } -#if defined(HAVE_VORBIS_VORBISENC_H) && !defined(MODULE_NAME_IS_tremor) +#ifndef MODULE_NAME_IS_tremor /***************************************************************************** * encoder_sys_t : vorbis encoder descriptor @@ -861,10 +786,9 @@ static int OpenEncoder( vlc_object_t *p_this ) encoder_sys_t *p_sys; int i_quality, i_min_bitrate, i_max_bitrate, i; ogg_packet header[3]; - 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; @@ -872,28 +796,22 @@ static int OpenEncoder( vlc_object_t *p_this ) /* Allocate the memory needed to store the decoder's structure */ if( ( p_sys = (encoder_sys_t *)malloc(sizeof(encoder_sys_t)) ) == NULL ) - { - msg_Err( p_enc, "out of memory" ); - return VLC_EGENERIC; - } + return VLC_ENOMEM; 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 ); - var_Get( p_enc, ENC_CFG_PREFIX "quality", &val ); - i_quality = val.i_int; + i_quality = var_GetInteger( p_enc, ENC_CFG_PREFIX "quality" ); if( i_quality > 10 ) i_quality = 10; if( i_quality < 0 ) i_quality = 0; - var_Get( p_enc, ENC_CFG_PREFIX "cbr", &val ); - if( val.b_bool ) i_quality = 0; - var_Get( p_enc, ENC_CFG_PREFIX "max-bitrate", &val ); - i_max_bitrate = val.i_int; - var_Get( p_enc, ENC_CFG_PREFIX "min-bitrate", &val ); - i_min_bitrate = val.i_int; + + if( var_GetBool( p_enc, ENC_CFG_PREFIX "cbr" ) ) i_quality = 0; + i_max_bitrate = var_GetInteger( p_enc, ENC_CFG_PREFIX "max-bitrate" ); + i_min_bitrate = var_GetInteger( p_enc, ENC_CFG_PREFIX "min-bitrate" ); /* Initialize vorbis encoder */ vorbis_info_init( &p_sys->vi ); @@ -975,7 +893,7 @@ static int OpenEncoder( vlc_object_t *p_this ) p_sys->i_pts = 0; ConfigureChannelOrder(p_sys->pi_chan_table, p_sys->vi.channels, - p_enc->fmt_in.audio.i_physical_channels, VLC_TRUE); + p_enc->fmt_in.audio.i_physical_channels, true); return VLC_SUCCESS; } @@ -994,7 +912,7 @@ static block_t *Encode( encoder_t *p_enc, aout_buffer_t *p_aout_buf ) int i; unsigned int j; - p_sys->i_pts = p_aout_buf->start_date - + p_sys->i_pts = p_aout_buf->i_pts - (mtime_t)1000000 * (mtime_t)p_sys->i_samples_delay / (mtime_t)p_enc->fmt_in.audio.i_rate;