X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fcodec%2Fvorbis.c;h=acc74d0faac547c838122b87de76b51323784293;hb=6ee1e193fd896ab9a4729fde14f009d9ce629815;hp=7c1ae379cd2753d602a2bc5fbb98b45298eb7f4e;hpb=516eb3ebdff3bcda5f3e8389e2154111f07bc04e;p=vlc diff --git a/modules/codec/vorbis.c b/modules/codec/vorbis.c index 7c1ae379cd..acc74d0faa 100644 --- a/modules/codec/vorbis.c +++ b/modules/codec/vorbis.c @@ -1,7 +1,10 @@ /***************************************************************************** - * vorbis.c: vorbis decoder/encoder/packetizer module making use of libvorbis. + * vorbis.c: vorbis decoder/encoder/packetizer module using of libvorbis. ***************************************************************************** - * Copyright (C) 2001-2003 VideoLAN + * Copyright (C) 2001-2003 the VideoLAN team + * Copyright (C) 2007 Société des arts technologiques + * Copyright (C) 2007 Savoir-faire Linux + * * $Id$ * * Authors: Gildas Bazin @@ -18,16 +21,17 @@ * * 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. *****************************************************************************/ /***************************************************************************** * Preamble *****************************************************************************/ #include -#include -#include -#include +#include +#include +#include +#include #include @@ -77,9 +81,15 @@ 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[7] = +static int pi_channels_maps[9] = { 0, AOUT_CHAN_CENTER, @@ -90,9 +100,37 @@ static int pi_channels_maps[7] = AOUT_CHAN_LEFT | AOUT_CHAN_RIGHT | AOUT_CHAN_CENTER | AOUT_CHAN_REARLEFT | AOUT_CHAN_REARRIGHT, AOUT_CHAN_LEFT | AOUT_CHAN_RIGHT | AOUT_CHAN_CENTER - | AOUT_CHAN_REARLEFT | AOUT_CHAN_REARRIGHT | AOUT_CHAN_LFE + | AOUT_CHAN_REARLEFT | AOUT_CHAN_REARRIGHT | AOUT_CHAN_LFE, + AOUT_CHAN_LEFT | AOUT_CHAN_RIGHT | AOUT_CHAN_CENTER + | AOUT_CHAN_REARLEFT | AOUT_CHAN_REARRIGHT | AOUT_CHAN_MIDDLELEFT + | AOUT_CHAN_MIDDLERIGHT, + AOUT_CHAN_LEFT | AOUT_CHAN_RIGHT | AOUT_CHAN_CENTER | AOUT_CHAN_REARLEFT + | AOUT_CHAN_REARRIGHT | AOUT_CHAN_MIDDLELEFT | AOUT_CHAN_MIDDLERIGHT + | AOUT_CHAN_LFE }; +/* +** channel order as defined in http://www.ogghelp.com/ogg/glossary.cfm#Audio_Channels +*/ + +/* recommended vorbis channel order for 6 channels */ +static const uint32_t pi_6channels_in[] = +{ AOUT_CHAN_LEFT, AOUT_CHAN_CENTER, AOUT_CHAN_RIGHT, + AOUT_CHAN_REARLEFT, AOUT_CHAN_REARRIGHT,AOUT_CHAN_LFE,0 }; + +/* recommended vorbis channel order for 4 channels */ +static const uint32_t pi_4channels_in[] = +{ AOUT_CHAN_LEFT, AOUT_CHAN_RIGHT, AOUT_CHAN_CENTER, AOUT_CHAN_LFE, 0 }; + +/* recommended vorbis channel order for 3 channels */ +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 ****************************************************************************/ @@ -109,10 +147,12 @@ 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 ); + #ifdef MODULE_NAME_IS_tremor -static void Interleave ( int32_t *, const int32_t **, int, int ); +static void Interleave ( int32_t *, const int32_t **, int, int, int * ); #else -static void Interleave ( float *, const float **, int, int ); +static void Interleave ( float *, const float **, int, int, int * ); #endif #ifndef MODULE_NAME_IS_tremor @@ -126,22 +166,20 @@ static block_t *Encode ( encoder_t *, aout_buffer_t * ); *****************************************************************************/ #define ENC_QUALITY_TEXT N_("Encoding quality") #define ENC_QUALITY_LONGTEXT N_( \ - "Allows you to specify a quality between 1 (low) and 10 (high), instead " \ + "Enforce a quality between 1 (low) and 10 (high), instead " \ "of specifying a particular bitrate. This will produce a VBR stream." ) #define ENC_MAXBR_TEXT N_("Maximum encoding bitrate") #define ENC_MAXBR_LONGTEXT N_( \ - "Allows you to specify a maximum bitrate in kbps. " \ - "Useful for streaming applications." ) + "Maximum bitrate in kbps. This is useful for streaming applications." ) #define ENC_MINBR_TEXT N_("Minimum encoding bitrate") #define ENC_MINBR_LONGTEXT N_( \ - "Allows you to specify a minimum bitrate in kbps. " \ - "Useful for encoding for a fixed-size channel." ) + "Minimum bitrate in kbps. This is useful for encoding for a fixed-size channel." ) #define ENC_CBR_TEXT N_("CBR encoding") #define ENC_CBR_LONGTEXT N_( \ - "Allows you to force a constant bitrate encoding (CBR)." ) + "Force a constant bitrate encoding (CBR)." ) vlc_module_begin(); - + set_shortname( "Vorbis" ); set_description( _("Vorbis audio decoder") ); #ifdef MODULE_NAME_IS_tremor set_capability( "decoder", 90 ); @@ -162,9 +200,11 @@ vlc_module_begin(); add_submodule(); set_description( _("Vorbis audio encoder") ); set_capability( "encoder", 100 ); +#if defined(HAVE_VORBIS_VORBISENC_H) set_callbacks( OpenEncoder, CloseEncoder ); +#endif - add_integer( ENC_CFG_PREFIX "quality", 3, NULL, ENC_QUALITY_TEXT, + add_integer( ENC_CFG_PREFIX "quality", 0, NULL, ENC_QUALITY_TEXT, ENC_QUALITY_LONGTEXT, VLC_FALSE ); add_integer( ENC_CFG_PREFIX "max-bitrate", 0, NULL, ENC_MAXBR_TEXT, ENC_MAXBR_LONGTEXT, VLC_FALSE ); @@ -205,8 +245,10 @@ static int OpenDecoder( vlc_object_t *p_this ) /* Misc init */ aout_DateSet( &p_sys->end_date, 0 ); + p_sys->i_last_block_size = 0; p_sys->b_packetizer = VLC_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 ); @@ -261,6 +303,9 @@ 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 { @@ -280,6 +325,7 @@ static void *DecodeBlock( decoder_t *p_dec, block_t **pp_block ) if( p_sys->i_headers == 0 && p_dec->fmt_in.i_extra ) { /* Headers already available as extra data */ + msg_Dbg( p_dec, "headers already available as extra data" ); p_sys->i_headers = 3; } else if( oggpacket.bytes && p_sys->i_headers < 3 ) @@ -357,13 +403,20 @@ static int ProcessHeaders( decoder_t *p_dec ) /* Setup the format */ p_dec->fmt_out.audio.i_rate = p_sys->vi.rate; p_dec->fmt_out.audio.i_channels = p_sys->vi.channels; + + if( p_dec->fmt_out.audio.i_channels > 9 ) + { + msg_Err( p_dec, "invalid number of channels (not between 1 and 9): %i", + p_dec->fmt_out.audio.i_channels ); + return VLC_EGENERIC; + } + p_dec->fmt_out.audio.i_physical_channels = p_dec->fmt_out.audio.i_original_channels = 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 ); - aout_DateSet( &p_sys->end_date, 0 ); msg_Dbg( p_dec, "channels:%d samplerate:%ld bitrate:%ld", p_sys->vi.channels, p_sys->vi.rate, p_sys->vi.bitrate_nominal ); @@ -422,6 +475,9 @@ static int ProcessHeaders( decoder_t *p_dec ) p_dec->fmt_in.p_extra, p_dec->fmt_out.i_extra ); } + ConfigureChannelOrder(p_sys->pi_chan_table, p_sys->vi.channels, + p_dec->fmt_out.audio.i_physical_channels, VLC_TRUE); + return VLC_SUCCESS; } @@ -508,10 +564,10 @@ static aout_buffer_t *DecodePacket( decoder_t *p_dec, ogg_packet *p_oggpacket ) /* Interleave the samples */ #ifdef MODULE_NAME_IS_tremor Interleave( (int32_t *)p_aout_buffer->p_buffer, - (const int32_t **)pp_pcm, p_sys->vi.channels, i_samples ); + (const int32_t **)pp_pcm, p_sys->vi.channels, i_samples, p_sys->pi_chan_table); #else Interleave( (float *)p_aout_buffer->p_buffer, - (const float **)pp_pcm, p_sys->vi.channels, i_samples ); + (const float **)pp_pcm, p_sys->vi.channels, i_samples, p_sys->pi_chan_table); #endif /* Tell libvorbis how many samples we actually consumed */ @@ -520,7 +576,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 ); + i_samples * p_sys->i_input_rate / INPUT_RATE_DEFAULT ); return p_aout_buffer; } else @@ -547,8 +603,9 @@ 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_block->i_pts; + p_block->i_length = aout_DateIncrement( &p_sys->end_date, + i_samples * p_sys->i_input_rate / INPUT_RATE_DEFAULT ) - + p_block->i_pts; else p_block->i_length = 0; @@ -556,16 +613,19 @@ static block_t *SendPacket( decoder_t *p_dec, ogg_packet *p_oggpacket, } /***************************************************************************** - * ParseVorbisComments: FIXME should be done in demuxer + * ParseVorbisComments *****************************************************************************/ 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] ); @@ -581,47 +641,160 @@ static void ParseVorbisComments( decoder_t *p_dec ) *psz_value = '\0'; psz_value++; input_Control( p_input, INPUT_ADD_INFO, _("Vorbis comment"), - psz_name, psz_value ); - /* HACK, we should use meta */ - if( strstr( psz_name, "artist" ) ) + 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" ) ) { - input_Control( p_input, INPUT_ADD_INFO, _("Meta-information"), - _("Artist"), psz_value ); + if( psz_value && ( *psz_value != '\0' ) ) + { + input_item_SetTitle( p_item, psz_value ); + p_item->psz_name = strdup( psz_value ); + } } - else if( strstr( psz_name, "title" ) ) + else if( !strcasecmp( psz_name, "album" ) ) { - p_input->input.p_item->psz_name = strdup( psz_value ); + 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( !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->pf_gain[AUDIO_REPLAY_GAIN_TRACK] = atof( psz_value ); + } + else if( !strcasecmp( psz_name, "REPLAYGAIN_TRACK_PEAK" ) || + !strcasecmp( psz_name, "RG_PEAK" ) ) + { + audio_replay_gain_t *r = &p_dec->fmt_out.audio_replay_gain; + + r->pb_peak[AUDIO_REPLAY_GAIN_TRACK] = VLC_TRUE; + r->pf_peak[AUDIO_REPLAY_GAIN_TRACK] = atof( psz_value ); + } + else if( !strcasecmp( psz_name, "REPLAYGAIN_ALBUM_GAIN" ) || + !strcasecmp( psz_name, "RG_AUDIOPHILE" ) ) + { + audio_replay_gain_t *r = &p_dec->fmt_out.audio_replay_gain; + + r->pb_gain[AUDIO_REPLAY_GAIN_ALBUM] = VLC_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->pf_peak[AUDIO_REPLAY_GAIN_ALBUM] = atof( psz_value ); } } /* FIXME */ - var_SetInteger( p_input, "item-change", p_input->input.p_item->i_id ); + var_SetInteger( p_input, "item-change", p_item->i_id ); free( psz_comment ); i++; } } +/***************************************************************************** + * 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) +{ + const uint32_t *pi_channels_in; + switch( i_channels ) + { + case 6: + case 5: + pi_channels_in = pi_6channels_in; + break; + case 4: + pi_channels_in = pi_4channels_in; + break; + case 3: + pi_channels_in = pi_3channels_in; + break; + default: + { + int i; + for( i = 0; i< i_channels; ++i ) + { + pi_chan_table[i] = i; + } + return; + } + } + + if( b_decode ) + aout_CheckChannelReorder( pi_channels_in, pi_channels_out, + i_channel_mask & AOUT_CHAN_PHYSMASK, + i_channels, + pi_chan_table ); + else + aout_CheckChannelReorder( pi_channels_out, pi_channels_in, + i_channel_mask & AOUT_CHAN_PHYSMASK, + i_channels, + pi_chan_table ); +} + /***************************************************************************** * Interleave: helper function to interleave channels *****************************************************************************/ #ifdef MODULE_NAME_IS_tremor static void Interleave( int32_t *p_out, const int32_t **pp_in, - int i_nb_channels, int i_samples ) + int i_nb_channels, int i_samples, int *pi_chan_table) { int i, j; for ( j = 0; j < i_samples; j++ ) for ( i = 0; i < i_nb_channels; i++ ) - p_out[j * i_nb_channels + i] = pp_in[i][j] * (FIXED32_ONE >> 24); + p_out[j * i_nb_channels + pi_chan_table[i]] = pp_in[i][j] * (FIXED32_ONE >> 24); } #else static void Interleave( float *p_out, const float **pp_in, - int i_nb_channels, int i_samples ) + int i_nb_channels, int i_samples, int *pi_chan_table ) { int i, j; for ( j = 0; j < i_samples; j++ ) for ( i = 0; i < i_nb_channels; i++ ) - p_out[j * i_nb_channels + i] = pp_in[i][j]; + p_out[j * i_nb_channels + pi_chan_table[i]] = pp_in[i][j]; } #endif @@ -633,7 +806,7 @@ static void CloseDecoder( vlc_object_t *p_this ) decoder_t *p_dec = (decoder_t *)p_this; decoder_sys_t *p_sys = p_dec->p_sys; - if( !p_sys->b_packetizer && p_sys->i_headers >= 3 ) + if( !p_sys->b_packetizer && p_sys->i_headers > 3 ) { vorbis_block_clear( &p_sys->vb ); vorbis_dsp_clear( &p_sys->vd ); @@ -671,6 +844,12 @@ struct encoder_sys_t * Common properties */ mtime_t i_pts; + + /* + ** Channel reordering + */ + int pi_chan_table[AOUT_CHAN_MAX]; + }; /***************************************************************************** @@ -703,7 +882,7 @@ static int OpenEncoder( vlc_object_t *p_this ) p_enc->fmt_in.i_codec = VLC_FOURCC('f','l','3','2'); p_enc->fmt_out.i_codec = VLC_FOURCC('v','o','r','b'); - sout_CfgParse( p_enc, ENC_CFG_PREFIX, ppsz_enc_options, p_enc->p_cfg ); + 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; @@ -795,6 +974,9 @@ static int OpenEncoder( vlc_object_t *p_this ) p_sys->i_samples_delay = 0; 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); + return VLC_SUCCESS; } @@ -826,7 +1008,7 @@ static block_t *Encode( encoder_t *p_enc, aout_buffer_t *p_aout_buf ) for( j = 0 ; j < p_aout_buf->i_nb_samples ; j++ ) { buffer[i][j]= ((float *)p_aout_buf->p_buffer) - [j * p_sys->i_channels + i ]; + [j * p_sys->i_channels + p_sys->pi_chan_table[i]]; } }