/*****************************************************************************
- * 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>
/*****************************************************************************
* Preamble
*****************************************************************************/
-#include <vlc/vlc.h>
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#include <vlc_common.h>
+#include <vlc_plugin.h>
#include <vlc_codec.h>
#include <vlc_aout.h>
#include <vlc_input.h>
+#include <vlc_playlist.h>
#include <vlc_sout.h>
#include <ogg/ogg.h>
struct decoder_sys_t
{
/* Module mode */
- vlc_bool_t b_packetizer;
+ bool b_packetizer;
/*
* Input properties
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 */
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 * );
vlc_module_begin();
set_shortname( "Vorbis" );
- set_description( _("Vorbis audio decoder") );
+ set_description( N_("Vorbis audio decoder") );
#ifdef MODULE_NAME_IS_tremor
set_capability( "decoder", 90 );
#else
set_callbacks( OpenDecoder, CloseDecoder );
add_submodule();
- set_description( _("Vorbis audio packetizer") );
+ 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_description( N_("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,
- ENC_QUALITY_LONGTEXT, VLC_FALSE );
+ ENC_QUALITY_LONGTEXT, false );
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 );
+ ENC_MINBR_LONGTEXT, false );
add_bool( ENC_CFG_PREFIX "cbr", 0, NULL, ENC_CBR_TEXT,
- ENC_CBR_LONGTEXT, VLC_FALSE );
+ ENC_CBR_LONGTEXT, false );
#endif
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
/* 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;
- }
+ return VLC_ENOMEM;
/* Misc init */
aout_DateSet( &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;
if( i_ret == VLC_SUCCESS )
{
- p_dec->p_sys->b_packetizer = VLC_TRUE;
+ p_dec->p_sys->b_packetizer = true;
p_dec->fmt_out.i_codec = VLC_FOURCC('v','o','r','b');
}
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 );
}
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;
}
}
/*****************************************************************************
- * ParseVorbisComments: FIXME should be done in demuxer
+ * ParseVorbisComments
*****************************************************************************/
static void ParseVorbisComments( decoder_t *p_dec )
{
{
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++;
input_Control( p_input, INPUT_ADD_INFO, _("Vorbis comment"),
psz_name, "%s", psz_value );
- if( !strcasecmp( psz_name, "artist" ) )
+/*TODO: dot he test at the beginning and save time !! */
+#ifndef HAVE_TAGLIB
+ if( psz_value && ( *psz_value != '\0' ) )
{
- if( psz_value && ( *psz_value != '\0' ) )
+ if( !strcasecmp( psz_name, "artist" ) )
+ input_item_SetArtist( p_item, psz_value );
+ else if( !strcasecmp( psz_name, "title" ) )
{
- vlc_meta_SetArtist( p_item->p_meta,
- psz_value );
- input_ItemAddInfo( p_item,
- _(VLC_META_INFO_CAT),
- _(VLC_META_ARTIST),
- "%s", psz_value );
+ input_item_SetTitle( p_item, psz_value );
+ p_item->psz_name = strdup( psz_value );
}
- }
- else if( !strcasecmp( psz_name, "title" ) )
- {
- if( psz_value && ( *psz_value != '\0' ) )
+ else if( !strcasecmp( psz_name, "album" ) )
{
- vlc_meta_SetTitle( p_item->p_meta,
- psz_value );
- p_item->psz_name = strdup( psz_value );
+ input_item_SetAlbum( p_item, psz_value );
}
+ else if( !strcasecmp( psz_name, "musicbrainz_trackid" ) )
+ input_item_SetTrackID( p_item, psz_value );
+#if 0 //not used
+ else if( !strcasecmp( psz_name, "musicbrainz_artistid" ) )
+ vlc_meta_SetArtistID( p_item, psz_value );
+ else if( !strcasecmp( psz_name, "musicbrainz_albumid" ) )
+ input_item_SetAlbumID( p_item, psz_value );
+#endif
}
- else if( !strcasecmp( psz_name, "album" ) )
+#endif
+ if( !strcasecmp( psz_name, "REPLAYGAIN_TRACK_GAIN" ) ||
+ !strcasecmp( psz_name, "RG_RADIO" ) )
{
- if( psz_value && ( *psz_value != '\0' ) )
- {
- vlc_meta_SetAlbum( p_item->p_meta,
- psz_value );
- }
+ audio_replay_gain_t *r = &p_dec->fmt_out.audio_replay_gain;
+
+ r->pb_gain[AUDIO_REPLAY_GAIN_TRACK] = true;
+ r->pf_gain[AUDIO_REPLAY_GAIN_TRACK] = atof( psz_value );
}
- else if( !strcasecmp( psz_name, "musicbrainz_trackid" ) )
+ else if( !strcasecmp( psz_name, "REPLAYGAIN_TRACK_PEAK" ) ||
+ !strcasecmp( psz_name, "RG_PEAK" ) )
{
- if( psz_value && ( *psz_value != '\0' ) )
- {
- vlc_meta_SetTrackID( p_item->p_meta,
- psz_value );
- }
+ audio_replay_gain_t *r = &p_dec->fmt_out.audio_replay_gain;
+
+ r->pb_peak[AUDIO_REPLAY_GAIN_TRACK] = true;
+ r->pf_peak[AUDIO_REPLAY_GAIN_TRACK] = atof( psz_value );
}
-#if 0 //not used
- else if( !strcasecmp( psz_name, "musicbrainz_artistid" ) )
+ else if( !strcasecmp( psz_name, "REPLAYGAIN_ALBUM_GAIN" ) ||
+ !strcasecmp( psz_name, "RG_AUDIOPHILE" ) )
{
- if( psz_value && ( *psz_value != '\0' ) )
- {
- vlc_meta_SetArtistID( p_item->p_meta,
- psz_value );
- }
+ audio_replay_gain_t *r = &p_dec->fmt_out.audio_replay_gain;
+
+ r->pb_gain[AUDIO_REPLAY_GAIN_ALBUM] = true;
+ r->pf_gain[AUDIO_REPLAY_GAIN_ALBUM] = atof( psz_value );
}
- else if( !strcasecmp( psz_name, "musicbrainz_albumid" ) )
+ else if( !strcasecmp( psz_name, "REPLAYGAIN_ALBUM_PEAK" ) )
{
- if( psz_value && ( *psz_value != '\0' ) )
- {
- vlc_meta_SetAlbumID( p_item->p_meta,
- psz_value );
- }
+ audio_replay_gain_t *r = &p_dec->fmt_out.audio_replay_gain;
+
+ r->pb_peak[AUDIO_REPLAY_GAIN_ALBUM] = true;
+ r->pf_peak[AUDIO_REPLAY_GAIN_ALBUM] = atof( psz_value );
}
-#endif
}
- /* FIXME */
- var_SetInteger( p_input, "item-change", p_item->i_id );
+ var_SetInteger( pl_Yield( p_input ), "item-change", p_item->i_id );
+ pl_Release( p_input );
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)
+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 )
/* 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_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;
}
projects / vlc / blobdiff