/*****************************************************************************
* vorbis.c: vorbis decoder/encoder/packetizer module making use of libvorbis.
*****************************************************************************
- * Copyright (C) 2001-2003 VideoLAN
+ * Copyright (C) 2001-2003 the VideoLAN team
* $Id$
*
* Authors: Gildas Bazin <gbazin@videolan.org>
audio_date_t end_date;
int i_last_block_size;
+ /*
+ ** Channel reordering
+ */
+ int pi_chan_table[AOUT_CHAN_MAX];
};
static int pi_channels_maps[7] =
| AOUT_CHAN_REARLEFT | AOUT_CHAN_REARRIGHT | AOUT_CHAN_LFE
};
+/*
+** channel order as defined in http://www.ogghelp.com/ogg/glossary.cfm#Audio_Channels
+*/
+
+/* 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_REARLEFT, AOUT_CHAN_REARRIGHT,AOUT_CHAN_LFE,0 };
+
+/* recommended vorbis channel order for 4 channels */
+static const uint32_t pi_4channels_in[] =
+{ AOUT_CHAN_LEFT, AOUT_CHAN_RIGHT, AOUT_CHAN_CENTER, AOUT_CHAN_LFE, 0 };
+
+/* recommended vorbis channel order for 3 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 );
+
#ifdef MODULE_NAME_IS_tremor
-static void Interleave ( int32_t *, const int32_t **, int, int );
+static void Interleave ( int32_t *, const int32_t **, int, int, int * );
#else
-static void Interleave ( float *, const float **, int, int );
+static void Interleave ( float *, const float **, int, int, int * );
#endif
#ifndef MODULE_NAME_IS_tremor
#define ENC_MINBR_LONGTEXT N_( \
"Allows you to specify a minimum bitrate in kbps. " \
"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)." )
vlc_module_begin();
-
+ set_shortname( "Vorbis" );
set_description( _("Vorbis audio decoder") );
#ifdef MODULE_NAME_IS_tremor
set_capability( "decoder", 90 );
#else
set_capability( "decoder", 100 );
#endif
+ set_category( CAT_INPUT );
+ set_subcategory( SUBCAT_INPUT_ACODEC );
set_callbacks( OpenDecoder, CloseDecoder );
add_submodule();
add_submodule();
set_description( _("Vorbis audio encoder") );
set_capability( "encoder", 100 );
- set_callbacks( OpenEncoder, CloseEncoder );
+#if defined(HAVE_VORBIS_VORBISENC_H)
+ set_callbacks( OpenEncoder, CloseEncoder );
+#endif
add_integer( ENC_CFG_PREFIX "quality", 0, NULL, ENC_QUALITY_TEXT,
ENC_QUALITY_LONGTEXT, VLC_FALSE );
ENC_MAXBR_LONGTEXT, VLC_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 );
#endif
vlc_module_end();
#ifndef MODULE_NAME_IS_tremor
static const char *ppsz_enc_options[] = {
- "quality", "max-bitrate", "min-bitrate", NULL
+ "quality", "max-bitrate", "min-bitrate", "cbr", NULL
};
#endif
/* Misc init */
aout_DateSet( &p_sys->end_date, 0 );
+ p_sys->i_last_block_size = 0;
p_sys->b_packetizer = VLC_FALSE;
p_sys->i_headers = 0;
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 )
p_dec->fmt_in.p_extra =
realloc( p_dec->fmt_in.p_extra, p_dec->fmt_in.i_extra +
oggpacket.bytes + 2 );
- p_extra = p_dec->fmt_in.p_extra + p_dec->fmt_in.i_extra;
+ 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;
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);
+
return VLC_SUCCESS;
}
#endif
if( p_oggpacket->bytes &&
+#ifdef MODULE_NAME_IS_tremor
+ vorbis_synthesis( &p_sys->vb, p_oggpacket, 1 ) == 0 )
+#else
vorbis_synthesis( &p_sys->vb, p_oggpacket ) == 0 )
+#endif
vorbis_synthesis_blockin( &p_sys->vd, &p_sys->vb );
/* **pp_pcm is a multichannel float vector. In stereo, for
/* Interleave the samples */
#ifdef MODULE_NAME_IS_tremor
Interleave( (int32_t *)p_aout_buffer->p_buffer,
- (const int32_t **)pp_pcm, p_sys->vi.channels, i_samples );
+ (const int32_t **)pp_pcm, p_sys->vi.channels, i_samples, p_sys->pi_chan_table);
#else
Interleave( (float *)p_aout_buffer->p_buffer,
- (const float **)pp_pcm, p_sys->vi.channels, i_samples );
+ (const float **)pp_pcm, p_sys->vi.channels, i_samples, p_sys->pi_chan_table);
#endif
/* Tell libvorbis how many samples we actually consumed */
psz_value++;
input_Control( p_input, INPUT_ADD_INFO, _("Vorbis comment"),
psz_name, psz_value );
+ /* HACK, we should use meta */
+ if( strcasestr( psz_name, "artist" ) )
+ {
+ input_Control( p_input, INPUT_ADD_INFO, _("Meta-information"),
+ _("Artist"), psz_value );
+ }
+ else if( strcasestr( psz_name, "title" ) )
+ {
+ p_input->input.p_item->psz_name = strdup( psz_value );
+ }
}
+ /* FIXME */
+ var_SetInteger( p_input, "item-change", p_input->input.p_item->i_id );
free( psz_comment );
i++;
}
/*****************************************************************************
* Interleave: helper function to interleave channels
*****************************************************************************/
-static void Interleave(
+static void ConfigureChannelOrder(int *pi_chan_table, int i_channels, uint32_t i_channel_mask, vlc_bool_t b_decode)
+{
+ const uint32_t *pi_channels_in;
+ switch( i_channels )
+ {
+ case 6:
+ case 5:
+ pi_channels_in = pi_6channels_in;
+ break;
+ case 4:
+ pi_channels_in = pi_4channels_in;
+ break;
+ case 3:
+ pi_channels_in = pi_3channels_in;
+ break;
+ default:
+ {
+ int i;
+ for( i = 0; i< i_channels; ++i )
+ {
+ pi_chan_table[i] = i;
+ }
+ return;
+ }
+ }
+
+ if( b_decode )
+ aout_CheckChannelReorder( pi_channels_in, pi_channels_out,
+ 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 );
+}
+
+/*****************************************************************************
+ * Interleave: helper function to interleave channels
+ *****************************************************************************/
#ifdef MODULE_NAME_IS_tremor
- int32_t *p_out, const int32_t **pp_in,
+static void Interleave( int32_t *p_out, const int32_t **pp_in,
+ int i_nb_channels, int i_samples, int *pi_chan_table)
+{
+ int i, j;
+
+ for ( j = 0; j < i_samples; j++ )
+ for ( i = 0; i < i_nb_channels; i++ )
+ p_out[j * i_nb_channels + pi_chan_table[i]] = pp_in[i][j] * (FIXED32_ONE >> 24);
+}
#else
- float *p_out, const float **pp_in,
-#endif
- int i_nb_channels, int i_samples )
+static void Interleave( float *p_out, const float **pp_in,
+ int i_nb_channels, int i_samples, int *pi_chan_table )
{
int i, j;
for ( j = 0; j < i_samples; j++ )
- {
for ( i = 0; i < i_nb_channels; i++ )
- {
- p_out[j * i_nb_channels + i] = pp_in[i][j];
- }
- }
+ p_out[j * i_nb_channels + pi_chan_table[i]] = pp_in[i][j];
}
+#endif
/*****************************************************************************
* CloseDecoder: vorbis decoder destruction
* Common properties
*/
mtime_t i_pts;
+
+ /*
+ ** Channel reordering
+ */
+ int pi_chan_table[AOUT_CHAN_MAX];
+
};
/*****************************************************************************
i_quality = val.i_int;
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 );
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);
+
return VLC_SUCCESS;
}
for( j = 0 ; j < p_aout_buf->i_nb_samples ; j++ )
{
buffer[i][j]= ((float *)p_aout_buf->p_buffer)
- [j * p_sys->i_channels + i ];
+ [j * p_sys->i_channels + p_sys->pi_chan_table[i]];
}
}
projects / vlc / blobdiff