X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fcodec%2Fvorbis.c;h=acc74d0faac547c838122b87de76b51323784293;hb=6ee1e193fd896ab9a4729fde14f009d9ce629815;hp=1064af0c8d7349b10da8689501232cc00a840a54;hpb=b372cf284d910f394ab13f37644e1fb8ca94b35c;p=vlc diff --git a/modules/codec/vorbis.c b/modules/codec/vorbis.c index 1064af0c8d..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 @@ -25,9 +28,10 @@ * Preamble *****************************************************************************/ #include -#include -#include -#include +#include +#include +#include +#include #include @@ -77,13 +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, @@ -94,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 }; /* @@ -103,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 */ @@ -189,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, @@ -236,6 +248,7 @@ static int OpenDecoder( vlc_object_t *p_this ) 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 ); @@ -290,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 { @@ -387,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 ); @@ -553,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 @@ -580,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; @@ -589,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] ); @@ -614,29 +641,92 @@ 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 ); + psz_name, "%s", psz_value ); +#ifndef HAVE_TAGLIB if( !strcasecmp( psz_name, "artist" ) ) { - vlc_meta_SetArtist( p_input->input.p_item->p_meta, - psz_value ); - vlc_input_item_AddInfo( p_input->input.p_item, - _(VLC_META_INFO_CAT), _(VLC_META_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" ) ) { - vlc_meta_SetTitle( p_input->input.p_item->p_meta, - psz_value ); - p_input->input.p_item->psz_name = strdup( psz_value ); + 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" ) ) { - vlc_meta_SetAlbum( p_input->input.p_item->p_meta, - 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++; } @@ -792,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;