X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fcodec%2Fvorbis.c;h=acc74d0faac547c838122b87de76b51323784293;hb=6ee1e193fd896ab9a4729fde14f009d9ce629815;hp=e56ae9fc850b91f57324a0572bc259372933f4ac;hpb=70a8bb9649c3e44350d0fd579c24b8a9ddd7af34;p=vlc diff --git a/modules/codec/vorbis.c b/modules/codec/vorbis.c index e56ae9fc85..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 the VideoLAN team + * Copyright (C) 2007 Société des arts technologiques + * Copyright (C) 2007 Savoir-faire Linux + * * $Id$ * * Authors: Gildas Bazin @@ -86,7 +89,7 @@ struct decoder_sys_t int pi_chan_table[AOUT_CHAN_MAX]; }; -static int pi_channels_maps[7] = +static int pi_channels_maps[9] = { 0, AOUT_CHAN_CENTER, @@ -97,7 +100,13 @@ 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 }; /* @@ -106,7 +115,7 @@ static int pi_channels_maps[7] = /* 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_LEFT, AOUT_CHAN_CENTER, AOUT_CHAN_RIGHT, AOUT_CHAN_REARLEFT, AOUT_CHAN_REARRIGHT,AOUT_CHAN_LFE,0 }; /* recommended vorbis channel order for 4 channels */ @@ -192,7 +201,7 @@ vlc_module_begin(); set_description( _("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, @@ -395,10 +404,9 @@ static int ProcessHeaders( decoder_t *p_dec ) 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 < 0 || - p_dec->fmt_out.audio.i_channels > 6 ) + if( p_dec->fmt_out.audio.i_channels > 9 ) { - msg_Err( p_dec, "invalid number of channels (not between 1 and 6): %i", + msg_Err( p_dec, "invalid number of channels (not between 1 and 9): %i", p_dec->fmt_out.audio.i_channels ); return VLC_EGENERIC; } @@ -409,7 +417,6 @@ static int ProcessHeaders( decoder_t *p_dec ) 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 ); @@ -606,7 +613,7 @@ 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 ) { @@ -635,12 +642,12 @@ static void ParseVorbisComments( decoder_t *p_dec ) 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' ) ) { - vlc_meta_SetArtist( p_item->p_meta, - psz_value ); + input_item_SetArtist( p_item, psz_value ); input_ItemAddInfo( p_item, _(VLC_META_INFO_CAT), _(VLC_META_ARTIST), @@ -651,8 +658,7 @@ static void ParseVorbisComments( decoder_t *p_dec ) { if( psz_value && ( *psz_value != '\0' ) ) { - vlc_meta_SetTitle( p_item->p_meta, - psz_value ); + input_item_SetTitle( p_item, psz_value ); p_item->psz_name = strdup( psz_value ); } } @@ -660,16 +666,14 @@ static void ParseVorbisComments( decoder_t *p_dec ) { if( psz_value && ( *psz_value != '\0' ) ) { - vlc_meta_SetAlbum( p_item->p_meta, - psz_value ); + input_item_SetAlbum( p_item, psz_value ); } } else if( !strcasecmp( psz_name, "musicbrainz_trackid" ) ) { if( psz_value && ( *psz_value != '\0' ) ) { - vlc_meta_SetTrackID( p_item->p_meta, - psz_value ); + input_item_SetTrackID( p_item, psz_value ); } } #if 0 //not used @@ -677,19 +681,49 @@ static void ParseVorbisComments( decoder_t *p_dec ) { if( psz_value && ( *psz_value != '\0' ) ) { - vlc_meta_SetArtistID( p_item->p_meta, - psz_value ); + vlc_meta_SetArtistID( p_item, psz_value ); } } else if( !strcasecmp( psz_name, "musicbrainz_albumid" ) ) { if( psz_value && ( *psz_value != '\0' ) ) { - vlc_meta_SetAlbumID( p_item->p_meta, - psz_value ); + 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_item->i_id );