/*****************************************************************************
- * 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_sout.h>
+#include "../demux/xiph.h"
#include <ogg/ogg.h>
#include <tremor/ivorbiscodec.h>
#else
-#include <vorbis/codec.h>
-
-/* vorbis header */
-#ifdef HAVE_VORBIS_VORBISENC_H
-# include <vorbis/vorbisenc.h>
-# ifndef OV_ECTL_RATEMANAGE_AVG
-# define OV_ECTL_RATEMANAGE_AVG 0x0
-# endif
-#endif
+#include <vorbis/vorbisenc.h>
+
+# ifndef OV_ECTL_RATEMANAGE_AVG
+# define OV_ECTL_RATEMANAGE_AVG 0x0
+# endif
#endif
struct decoder_sys_t
{
/* Module mode */
- vlc_bool_t b_packetizer;
+ bool b_packetizer;
- /*
- * Input properties
- */
- int i_headers;
+ bool b_has_headers;
/*
* Vorbis properties
/*
* Common properties
*/
- audio_date_t end_date;
+ date_t end_date;
int i_last_block_size;
/*
int pi_chan_table[AOUT_CHAN_MAX];
};
-static int pi_channels_maps[7] =
+static const 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_REARCENTER | AOUT_CHAN_MIDDLELEFT
+ | AOUT_CHAN_MIDDLERIGHT | 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_LFE,
};
/*
-** channel order as defined in http://www.ogghelp.com/ogg/glossary.cfm#Audio_Channels
+** channel order as defined in http://www.xiph.org/vorbis/doc/Vorbis_I_spec.html#x1-800004.3.9
*/
+/* recommended vorbis channel order for 8 channels */
+static const uint32_t pi_8channels_in[] =
+{ AOUT_CHAN_LEFT, AOUT_CHAN_CENTER, AOUT_CHAN_RIGHT,
+ AOUT_CHAN_MIDDLELEFT, AOUT_CHAN_MIDDLERIGHT,
+ AOUT_CHAN_REARLEFT, AOUT_CHAN_REARRIGHT,AOUT_CHAN_LFE,0 };
+
+/* recommended vorbis channel order for 7 channels */
+static const uint32_t pi_7channels_in[] =
+{ AOUT_CHAN_LEFT, AOUT_CHAN_CENTER, AOUT_CHAN_RIGHT,
+ AOUT_CHAN_MIDDLELEFT, AOUT_CHAN_MIDDLERIGHT,
+ AOUT_CHAN_REARCENTER,AOUT_CHAN_LFE,0 };
+
/* 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 const uint32_t pi_3channels_in[] =
{ AOUT_CHAN_LEFT, AOUT_CHAN_CENTER, AOUT_CHAN_RIGHT, 0 };
-/* our internal channel order (WG-4 order) */
-static const uint32_t pi_channels_out[] =
-{ AOUT_CHAN_LEFT, AOUT_CHAN_RIGHT, AOUT_CHAN_REARLEFT, AOUT_CHAN_REARRIGHT,
- AOUT_CHAN_CENTER, AOUT_CHAN_LFE, 0 };
-
/****************************************************************************
* Local prototypes
****************************************************************************/
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 * );
#define ENC_CBR_LONGTEXT N_( \
"Force a constant bitrate encoding (CBR)." )
-vlc_module_begin();
- set_shortname( "Vorbis" );
- set_description( _("Vorbis audio decoder") );
+vlc_module_begin ()
+ set_shortname( "Vorbis" )
+ set_description( N_("Vorbis audio decoder") )
#ifdef MODULE_NAME_IS_tremor
- set_capability( "decoder", 90 );
+ set_capability( "decoder", 90 )
#else
- set_capability( "decoder", 100 );
+ set_capability( "decoder", 100 )
#endif
- set_category( CAT_INPUT );
- set_subcategory( SUBCAT_INPUT_ACODEC );
- set_callbacks( OpenDecoder, CloseDecoder );
+ set_category( CAT_INPUT )
+ set_subcategory( SUBCAT_INPUT_ACODEC )
+ set_callbacks( OpenDecoder, CloseDecoder )
- add_submodule();
- set_description( _("Vorbis audio packetizer") );
- set_capability( "packetizer", 100 );
- set_callbacks( OpenPacketizer, CloseDecoder );
+ add_submodule ()
+ 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_capability( "encoder", 100 );
-#if defined(HAVE_VORBIS_VORBISENC_H)
- set_callbacks( OpenEncoder, CloseEncoder );
-#endif
+ add_submodule ()
+ set_description( N_("Vorbis audio encoder") )
+ set_capability( "encoder", 130 )
+ set_callbacks( OpenEncoder, CloseEncoder )
add_integer( ENC_CFG_PREFIX "quality", 0, NULL, ENC_QUALITY_TEXT,
- ENC_QUALITY_LONGTEXT, VLC_FALSE );
+ ENC_QUALITY_LONGTEXT, false )
+ change_integer_range( 0, 10 )
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 );
- add_bool( ENC_CFG_PREFIX "cbr", 0, NULL, ENC_CBR_TEXT,
- ENC_CBR_LONGTEXT, VLC_FALSE );
+ ENC_MINBR_LONGTEXT, false )
+ add_bool( ENC_CFG_PREFIX "cbr", false, NULL, ENC_CBR_TEXT,
+ ENC_CBR_LONGTEXT, false )
#endif
-vlc_module_end();
+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
decoder_t *p_dec = (decoder_t*)p_this;
decoder_sys_t *p_sys;
- if( p_dec->fmt_in.i_codec != VLC_FOURCC('v','o','r','b') )
+ if( p_dec->fmt_in.i_codec != VLC_CODEC_VORBIS )
{
return VLC_EGENERIC;
}
/* 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;
- }
+ if( ( p_dec->p_sys = p_sys = malloc( sizeof(*p_sys) ) ) == NULL )
+ return VLC_ENOMEM;
/* Misc init */
- aout_DateSet( &p_sys->end_date, 0 );
+ date_Set( &p_sys->end_date, 0 );
p_sys->i_last_block_size = 0;
- p_sys->b_packetizer = VLC_FALSE;
- p_sys->i_headers = 0;
+ p_sys->b_packetizer = false;
+ p_sys->b_has_headers = false;
/* Take care of vorbis init */
vorbis_info_init( &p_sys->vi );
/* Set output properties */
p_dec->fmt_out.i_cat = AUDIO_ES;
#ifdef MODULE_NAME_IS_tremor
- p_dec->fmt_out.i_codec = VLC_FOURCC('f','i','3','2');
+ p_dec->fmt_out.i_codec = VLC_CODEC_FI32;
#else
- p_dec->fmt_out.i_codec = VLC_FOURCC('f','l','3','2');
+ p_dec->fmt_out.i_codec = VLC_CODEC_FL32;
#endif
/* Set callbacks */
if( i_ret == VLC_SUCCESS )
{
- p_dec->p_sys->b_packetizer = VLC_TRUE;
- p_dec->fmt_out.i_codec = VLC_FOURCC('v','o','r','b');
+ p_dec->p_sys->b_packetizer = true;
+ p_dec->fmt_out.i_codec = VLC_CODEC_VORBIS;
}
return i_ret;
oggpacket.packetno = 0;
/* Check for headers */
- 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 )
+ if( !p_sys->b_has_headers )
{
- /* Backup headers as extra data */
- uint8_t *p_extra;
-
- p_dec->fmt_in.p_extra =
- realloc( p_dec->fmt_in.p_extra, p_dec->fmt_in.i_extra +
- oggpacket.bytes + 2 );
- p_extra = (uint8_t *)p_dec->fmt_in.p_extra + p_dec->fmt_in.i_extra;
- *(p_extra++) = oggpacket.bytes >> 8;
- *(p_extra++) = oggpacket.bytes & 0xFF;
-
- memcpy( p_extra, oggpacket.packet, oggpacket.bytes );
- p_dec->fmt_in.i_extra += oggpacket.bytes + 2;
-
- block_Release( *pp_block );
- p_sys->i_headers++;
- return NULL;
- }
-
- if( p_sys->i_headers == 3 )
- {
- if( ProcessHeaders( p_dec ) != VLC_SUCCESS )
+ if( ProcessHeaders( p_dec ) )
{
- p_sys->i_headers = 0;
- p_dec->fmt_in.i_extra = 0;
block_Release( *pp_block );
return NULL;
}
- else p_sys->i_headers++;
+ p_sys->b_has_headers = true;
}
return ProcessPacket( p_dec, &oggpacket, pp_block );
{
decoder_sys_t *p_sys = p_dec->p_sys;
ogg_packet oggpacket;
- uint8_t *p_extra;
- int i_extra;
- if( !p_dec->fmt_in.i_extra ) return VLC_EGENERIC;
+ unsigned pi_size[XIPH_MAX_HEADER_COUNT];
+ void *pp_data[XIPH_MAX_HEADER_COUNT];
+ unsigned i_count;
+ if( xiph_SplitHeaders( pi_size, pp_data, &i_count,
+ p_dec->fmt_in.i_extra, p_dec->fmt_in.p_extra) )
+ return VLC_EGENERIC;
+ if( i_count < 3 )
+ goto error;
oggpacket.granulepos = -1;
- oggpacket.b_o_s = 1; /* yes this actually is a b_o_s packet :) */
oggpacket.e_o_s = 0;
oggpacket.packetno = 0;
- p_extra = p_dec->fmt_in.p_extra;
- i_extra = p_dec->fmt_in.i_extra;
/* Take care of the initial Vorbis header */
- oggpacket.bytes = *(p_extra++) << 8;
- oggpacket.bytes |= (*(p_extra++) & 0xFF);
- oggpacket.packet = p_extra;
- p_extra += oggpacket.bytes;
- i_extra -= (oggpacket.bytes + 2);
- if( i_extra < 0 )
- {
- msg_Err( p_dec, "header data corrupted");
- return VLC_EGENERIC;
- }
-
+ oggpacket.b_o_s = 1; /* yes this actually is a b_o_s packet :) */
+ oggpacket.bytes = pi_size[0];
+ oggpacket.packet = pp_data[0];
if( vorbis_synthesis_headerin( &p_sys->vi, &p_sys->vc, &oggpacket ) < 0 )
{
msg_Err( p_dec, "this bitstream does not contain Vorbis audio data");
- return VLC_EGENERIC;
+ goto error;
}
/* 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 < 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;
+ goto error;
}
p_dec->fmt_out.audio.i_physical_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 );
+ date_Init( &p_sys->end_date, p_sys->vi.rate, 1 );
msg_Dbg( p_dec, "channels:%d samplerate:%ld bitrate:%ld",
p_sys->vi.channels, p_sys->vi.rate, p_sys->vi.bitrate_nominal );
/* The next packet in order is the comments header */
- oggpacket.b_o_s = 0;
- oggpacket.bytes = *(p_extra++) << 8;
- oggpacket.bytes |= (*(p_extra++) & 0xFF);
- oggpacket.packet = p_extra;
- p_extra += oggpacket.bytes;
- i_extra -= (oggpacket.bytes + 2);
- if( i_extra < 0 )
- {
- msg_Err( p_dec, "header data corrupted");
- return VLC_EGENERIC;
- }
-
+ oggpacket.b_o_s = 0;
+ oggpacket.bytes = pi_size[1];
+ oggpacket.packet = pp_data[1];
if( vorbis_synthesis_headerin( &p_sys->vi, &p_sys->vc, &oggpacket ) < 0 )
{
msg_Err( p_dec, "2nd Vorbis header is corrupted" );
- return VLC_EGENERIC;
+ goto error;
}
ParseVorbisComments( p_dec );
/* The next packet in order is the codebooks header
* We need to watch out that this packet is not missing as a
* missing or corrupted header is fatal. */
- oggpacket.bytes = *(p_extra++) << 8;
- oggpacket.bytes |= (*(p_extra++) & 0xFF);
- oggpacket.packet = p_extra;
- i_extra -= (oggpacket.bytes + 2);
- if( i_extra < 0 )
- {
- msg_Err( p_dec, "header data corrupted");
- return VLC_EGENERIC;
- }
-
+ oggpacket.b_o_s = 0;
+ oggpacket.bytes = pi_size[2];
+ oggpacket.packet = pp_data[2];
if( vorbis_synthesis_headerin( &p_sys->vi, &p_sys->vc, &oggpacket ) < 0 )
{
msg_Err( p_dec, "3rd Vorbis header is corrupted" );
else
{
p_dec->fmt_out.i_extra = p_dec->fmt_in.i_extra;
- p_dec->fmt_out.p_extra =
- realloc( p_dec->fmt_out.p_extra, p_dec->fmt_out.i_extra );
+ p_dec->fmt_out.p_extra = xrealloc( p_dec->fmt_out.p_extra,
+ p_dec->fmt_out.i_extra );
memcpy( p_dec->fmt_out.p_extra,
p_dec->fmt_in.p_extra, p_dec->fmt_out.i_extra );
}
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);
+ for( unsigned i = 0; i < i_count; i++ )
+ free( pp_data[i] );
return VLC_SUCCESS;
+
+error:
+ for( unsigned i = 0; i < i_count; i++ )
+ free( pp_data[i] );
+ return VLC_EGENERIC;
}
/*****************************************************************************
block_t *p_block = *pp_block;
/* Date management */
- if( p_block && p_block->i_pts > 0 &&
- p_block->i_pts != aout_DateGet( &p_sys->end_date ) )
+ if( p_block && p_block->i_pts > VLC_TS_INVALID &&
+ p_block->i_pts != date_Get( &p_sys->end_date ) )
{
- aout_DateSet( &p_sys->end_date, p_block->i_pts );
+ date_Set( &p_sys->end_date, p_block->i_pts );
}
- if( !aout_DateGet( &p_sys->end_date ) )
+ if( !date_Get( &p_sys->end_date ) )
{
/* We've just started the stream, wait for the first PTS. */
if( p_block ) block_Release( p_block );
}
else
{
- aout_buffer_t *p_aout_buffer;
-
- if( p_sys->i_headers >= 3 )
- p_aout_buffer = DecodePacket( p_dec, p_oggpacket );
- else
- p_aout_buffer = NULL;
-
- if( p_block ) block_Release( p_block );
+ aout_buffer_t *p_aout_buffer = DecodePacket( p_dec, p_oggpacket );
+ if( p_block )
+ block_Release( p_block );
return p_aout_buffer;
}
}
aout_buffer_t *p_aout_buffer;
p_aout_buffer =
- p_dec->pf_aout_buffer_new( p_dec, i_samples );
+ decoder_NewAudioBuffer( p_dec, i_samples );
if( p_aout_buffer == NULL ) return NULL;
vorbis_synthesis_read( &p_sys->vd, i_samples );
/* 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 );
+ p_aout_buffer->i_pts = date_Get( &p_sys->end_date );
+ p_aout_buffer->i_length = date_Increment( &p_sys->end_date,
+ i_samples ) - p_aout_buffer->i_pts;
return p_aout_buffer;
}
else
p_sys->i_last_block_size = i_block_size;
/* Date management */
- p_block->i_dts = p_block->i_pts = aout_DateGet( &p_sys->end_date );
+ p_block->i_dts = p_block->i_pts = date_Get( &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;
- else
- p_block->i_length = 0;
+ p_block->i_length = date_Increment( &p_sys->end_date, i_samples ) - p_block->i_pts;
return p_block;
}
/*****************************************************************************
- * 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] );
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 = '\0';
psz_value++;
- input_Control( p_input, INPUT_ADD_INFO, _("Vorbis comment"),
- psz_name, psz_value );
- if( !strcasecmp( psz_name, "artist" ) )
- {
- if( psz_value && ( *psz_value != '\0' ) )
- {
- vlc_meta_SetArtist( p_item->p_meta,
- 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' ) )
- {
- vlc_meta_SetTitle( p_item->p_meta,
- psz_value );
- p_item->psz_name = strdup( psz_value );
- }
- }
- else if( !strcasecmp( psz_name, "album" ) )
+
+ if( !p_dec->p_description )
+ p_dec->p_description = vlc_meta_New();
+ if( p_dec->p_description )
+ vlc_meta_AddExtra( p_dec->p_description, psz_name, psz_value );
+
+ 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 );
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 )
{
+ case 8:
+ pi_channels_in = pi_8channels_in;
+ break;
+ case 7:
+ pi_channels_in = pi_7channels_in;
+ break;
case 6:
case 5:
pi_channels_in = pi_6channels_in;
}
if( b_decode )
- aout_CheckChannelReorder( pi_channels_in, pi_channels_out,
+ aout_CheckChannelReorder( pi_channels_in, NULL,
i_channel_mask & AOUT_CHAN_PHYSMASK,
i_channels,
pi_chan_table );
else
- aout_CheckChannelReorder( pi_channels_out, pi_channels_in,
+ aout_CheckChannelReorder( NULL, pi_channels_in,
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->b_has_headers )
{
vorbis_block_clear( &p_sys->vb );
vorbis_dsp_clear( &p_sys->vd );
free( p_sys );
}
-#if defined(HAVE_VORBIS_VORBISENC_H) && !defined(MODULE_NAME_IS_tremor)
+#ifndef MODULE_NAME_IS_tremor
/*****************************************************************************
* encoder_sys_t : vorbis encoder descriptor
int i_samples_delay;
int i_channels;
- /*
- * Common properties
- */
- mtime_t i_pts;
-
/*
** Channel reordering
*/
{
encoder_t *p_enc = (encoder_t *)p_this;
encoder_sys_t *p_sys;
- int i_quality, i_min_bitrate, i_max_bitrate, i;
+ int i_quality, i_min_bitrate, i_max_bitrate;
ogg_packet header[3];
- vlc_value_t val;
- uint8_t *p_extra;
- if( p_enc->fmt_out.i_codec != VLC_FOURCC('v','o','r','b') &&
+ if( p_enc->fmt_out.i_codec != VLC_CODEC_VORBIS &&
!p_enc->b_force )
{
return VLC_EGENERIC;
/* 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_enc->fmt_in.i_codec = VLC_FOURCC('f','l','3','2');
- p_enc->fmt_out.i_codec = VLC_FOURCC('v','o','r','b');
+ p_enc->fmt_in.i_codec = VLC_CODEC_FL32;
+ p_enc->fmt_out.i_codec = VLC_CODEC_VORBIS;
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;
+ i_quality = var_GetInteger( p_enc, ENC_CFG_PREFIX "quality" );
if( i_quality > 10 ) i_quality = 10;
if( i_quality < 0 ) i_quality = 0;
- var_Get( p_enc, ENC_CFG_PREFIX "cbr", &val );
- if( val.b_bool ) i_quality = 0;
- var_Get( p_enc, ENC_CFG_PREFIX "max-bitrate", &val );
- i_max_bitrate = val.i_int;
- var_Get( p_enc, ENC_CFG_PREFIX "min-bitrate", &val );
- i_min_bitrate = val.i_int;
+
+ if( var_GetBool( p_enc, ENC_CFG_PREFIX "cbr" ) ) i_quality = 0;
+ i_max_bitrate = var_GetInteger( p_enc, ENC_CFG_PREFIX "max-bitrate" );
+ i_min_bitrate = var_GetInteger( p_enc, ENC_CFG_PREFIX "min-bitrate" );
/* Initialize vorbis encoder */
vorbis_info_init( &p_sys->vi );
/* Create and store headers */
vorbis_analysis_headerout( &p_sys->vd, &p_sys->vc,
&header[0], &header[1], &header[2]);
- p_enc->fmt_out.i_extra = 3 * 2 + header[0].bytes +
- header[1].bytes + header[2].bytes;
- p_extra = p_enc->fmt_out.p_extra = malloc( p_enc->fmt_out.i_extra );
- for( i = 0; i < 3; i++ )
+ for( int i = 0; i < 3; i++ )
{
- *(p_extra++) = header[i].bytes >> 8;
- *(p_extra++) = header[i].bytes & 0xFF;
- memcpy( p_extra, header[i].packet, header[i].bytes );
- p_extra += header[i].bytes;
+ if( xiph_AppendHeaders( &p_enc->fmt_out.i_extra, &p_enc->fmt_out.p_extra,
+ header[i].bytes, header[i].packet ) )
+ {
+ p_enc->fmt_out.i_extra = 0;
+ p_enc->fmt_out.p_extra = NULL;
+ }
}
p_sys->i_channels = p_enc->fmt_in.audio.i_channels;
p_sys->i_last_block_size = 0;
p_sys->i_samples_delay = 0;
- 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;
}
int i;
unsigned int j;
- p_sys->i_pts = p_aout_buf->start_date -
+ mtime_t i_pts = p_aout_buf->i_pts -
(mtime_t)1000000 * (mtime_t)p_sys->i_samples_delay /
(mtime_t)p_enc->fmt_in.audio.i_rate;
p_block->i_length = (mtime_t)1000000 *
(mtime_t)i_samples / (mtime_t)p_enc->fmt_in.audio.i_rate;
- p_block->i_dts = p_block->i_pts = p_sys->i_pts;
+ p_block->i_dts = p_block->i_pts = i_pts;
p_sys->i_samples_delay -= i_samples;
/* Update pts */
- p_sys->i_pts += p_block->i_length;
+ i_pts += p_block->i_length;
block_ChainAppend( &p_chain, p_block );
}
}
projects / vlc / blobdiff