/*****************************************************************************
- * 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 <gbazin@videolan.org>
int pi_chan_table[AOUT_CHAN_MAX];
};
-static int pi_channels_maps[7] =
+static int pi_channels_maps[9] =
{
0,
AOUT_CHAN_CENTER,
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
};
/*
/* 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 */
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,
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;
}
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 );
}
/*****************************************************************************
- * ParseVorbisComments: FIXME should be done in demuxer
+ * ParseVorbisComments
*****************************************************************************/
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),
{
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 );
}
}
{
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
+ 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 );
}
}
- else if( !strcasecmp( psz_name, "REPLAYGAIN_TRACK_GAIN" ) ||
+#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_peak[AUDIO_REPLAY_GAIN_ALBUM] = VLC_TRUE;
r->pf_peak[AUDIO_REPLAY_GAIN_ALBUM] = atof( psz_value );
}
-#if 0 //not used
- else if( !strcasecmp( psz_name, "musicbrainz_artistid" ) )
- {
- if( psz_value && ( *psz_value != '\0' ) )
- {
- vlc_meta_SetArtistID( p_item->p_meta,
- psz_value );
- }
- }
- else if( !strcasecmp( psz_name, "musicbrainz_albumid" ) )
- {
- if( psz_value && ( *psz_value != '\0' ) )
- {
- vlc_meta_SetAlbumID( p_item->p_meta,
- psz_value );
- }
- }
-#endif
}
/* FIXME */
var_SetInteger( p_input, "item-change", p_item->i_id );