/*****************************************************************************
- * 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 (Centrale Réseaux) and its contributors
+ * 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>
*
* 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 <vlc/vlc.h>
-#include <vlc/decoder.h>
-#include <vlc/input.h>
-#include <vlc/sout.h>
+#include <vlc_codec.h>
+#include <vlc_aout.h>
+#include <vlc_input.h>
+#include <vlc_sout.h>
#include <ogg/ogg.h>
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,
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 */
*****************************************************************************/
#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 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_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 );
/* 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
{
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 )
/* 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 );
/* 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
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;
}
/*****************************************************************************
- * 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] );
*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" ) )
{
- input_Control( p_input, INPUT_ADD_INFO, _("Meta-information"),
- _("Artist"), psz_value );
+ 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" ) )
+ {
+ 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++;
}
if( b_decode )
aout_CheckChannelReorder( pi_channels_in, pi_channels_out,
- i_channel_mask & AOUT_CHAN_PHYSMASK,
- i_channels,
- pi_chan_table );
+ 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 );
+ i_channel_mask & AOUT_CHAN_PHYSMASK,
+ i_channels,
+ pi_chan_table );
}
/*****************************************************************************
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 );
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;
projects / vlc / blobdiff