/*****************************************************************************
* vorbis.c: vorbis decoder/encoder/packetizer module making use of libvorbis.
*****************************************************************************
- * Copyright (C) 1999-2001 VideoLAN
- * $Id: vorbis.c,v 1.24 2003/11/22 23:39:14 fenrir Exp $
+ * Copyright (C) 2001-2003 VideoLAN
+ * $Id$
*
- * Authors: Gildas Bazin <gbazin@netcourrier.com>
+ * Authors: Gildas Bazin <gbazin@videolan.org>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
- *
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
*****************************************************************************/
#include <vlc/vlc.h>
#include <vlc/decoder.h>
+#include <vlc/sout.h>
#include <ogg/ogg.h>
};
-static int pi_channels_maps[6] =
+static int pi_channels_maps[7] =
{
0,
- AOUT_CHAN_CENTER, AOUT_CHAN_LEFT | AOUT_CHAN_RIGHT,
+ AOUT_CHAN_CENTER,
+ AOUT_CHAN_LEFT | AOUT_CHAN_RIGHT,
AOUT_CHAN_CENTER | AOUT_CHAN_LEFT | AOUT_CHAN_RIGHT,
AOUT_CHAN_LEFT | AOUT_CHAN_RIGHT | AOUT_CHAN_REARLEFT
| AOUT_CHAN_REARRIGHT,
AOUT_CHAN_LEFT | AOUT_CHAN_RIGHT | AOUT_CHAN_CENTER
- | AOUT_CHAN_REARLEFT | AOUT_CHAN_REARRIGHT
+ | AOUT_CHAN_REARLEFT | AOUT_CHAN_REARRIGHT,
+ AOUT_CHAN_LEFT | AOUT_CHAN_RIGHT | AOUT_CHAN_CENTER
+ | AOUT_CHAN_REARLEFT | AOUT_CHAN_REARRIGHT | AOUT_CHAN_LFE
};
/****************************************************************************
/*****************************************************************************
* Module descriptor
*****************************************************************************/
+#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 " \
+ "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." )
+#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." )
+
vlc_module_begin();
set_description( _("Vorbis audio decoder") );
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 );
set_callbacks( OpenEncoder, CloseEncoder );
+
+ add_integer( ENC_CFG_PREFIX "quality", 0, NULL, ENC_QUALITY_TEXT,
+ ENC_QUALITY_LONGTEXT, VLC_FALSE );
+ add_integer( ENC_CFG_PREFIX "max-bitrate", 0, NULL, ENC_MAXBR_TEXT,
+ ENC_MAXBR_LONGTEXT, VLC_FALSE );
+ add_integer( ENC_CFG_PREFIX "min-bitrate", 0, NULL, ENC_MINBR_TEXT,
+ ENC_MINBR_LONGTEXT, VLC_FALSE );
#endif
vlc_module_end();
+#ifndef MODULE_NAME_IS_tremor
+static const char *ppsz_enc_options[] = {
+ "quality", "max-bitrate", "min-bitrate", NULL
+};
+#endif
+
/*****************************************************************************
* OpenDecoder: probe the decoder and return score
*****************************************************************************/
if( vorbis_synthesis_headerin( &p_sys->vi, &p_sys->vc,
&oggpacket ) < 0 )
{
- msg_Err( p_dec, "This bitstream does not contain Vorbis "
- "audio data");
+ msg_Err( p_dec, "this bitstream does not contain Vorbis "
+ "audio data.");
block_Release( *pp_block );
return NULL;
}
return NULL;
}
p_sys->i_headers++;
-
+
ParseVorbisComments( p_dec );
return ProcessPacket( p_dec, &oggpacket, pp_block );
return NULL;
}
p_sys->i_headers++;
-
+
if( !p_sys->b_packetizer )
{
/* Initialize the Vorbis packet->PCM decoder */
static void ParseVorbisComments( decoder_t *p_dec )
{
input_thread_t *p_input = (input_thread_t *)p_dec->p_parent;
- input_info_category_t *p_cat =
- input_InfoCategory( p_input, _("Vorbis Comment") );
int i = 0;
char *psz_name, *psz_value, *psz_comment;
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" );
+ msg_Warn( p_dec, "out of memory" );
break;
}
psz_name = psz_comment;
{
*psz_value = '\0';
psz_value++;
- input_AddInfo( p_cat, psz_name, psz_value );
+ input_Control( p_input, INPUT_ADD_INFO, _("Vorbis comment"),
+ psz_name, psz_value );
}
free( psz_comment );
i++;
/*****************************************************************************
* Interleave: helper function to interleave channels
*****************************************************************************/
+static void Interleave(
#ifdef MODULE_NAME_IS_tremor
-static void Interleave( int32_t *p_out, const int32_t **pp_in,
+ int32_t *p_out, const int32_t **pp_in,
#else
-static void Interleave( float *p_out, const float **pp_in,
+ float *p_out, const float **pp_in,
#endif
int i_nb_channels, int i_samples )
{
{
encoder_t *p_enc = (encoder_t *)p_this;
encoder_sys_t *p_sys;
+ int i_quality, i_min_bitrate, i_max_bitrate;
+ vlc_value_t val;
- if( p_enc->fmt_out.i_codec != VLC_FOURCC('v','o','r','b') )
+ if( p_enc->fmt_out.i_codec != VLC_FOURCC('v','o','r','b') &&
+ !p_enc->b_force )
{
return VLC_EGENERIC;
}
p_enc->pf_header = Headers;
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');
+
+ sout_ParseCfg( 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;
+ if( i_quality > 10 ) i_quality = 10;
+ if( i_quality < 0 ) 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;
/* Initialize vorbis encoder */
vorbis_info_init( &p_sys->vi );
- if( vorbis_encode_setup_managed( &p_sys->vi,
- p_enc->fmt_in.audio.i_channels, p_enc->fmt_in.audio.i_rate,
- -1, p_enc->fmt_out.i_bitrate, -1 ) ||
- vorbis_encode_ctl( &p_sys->vi, OV_ECTL_RATEMANAGE_AVG, NULL ) ||
- vorbis_encode_setup_init( &p_sys->vi ) ){}
+ if( i_quality > 0 )
+ {
+ /* VBR mode */
+ if( vorbis_encode_setup_vbr( &p_sys->vi,
+ p_enc->fmt_in.audio.i_channels, p_enc->fmt_in.audio.i_rate,
+ i_quality * 0.1 ) )
+ {
+ vorbis_info_clear( &p_sys->vi );
+ free( p_enc->p_sys );
+ msg_Err( p_enc, "VBR mode initialisation failed" );
+ return VLC_EGENERIC;
+ }
+
+ /* Do we have optional hard quality restrictions? */
+ if( i_max_bitrate > 0 || i_min_bitrate > 0 )
+ {
+ struct ovectl_ratemanage_arg ai;
+ vorbis_encode_ctl( &p_sys->vi, OV_ECTL_RATEMANAGE_GET, &ai );
+
+ ai.bitrate_hard_min = i_min_bitrate;
+ ai.bitrate_hard_max = i_max_bitrate;
+ ai.management_active = 1;
+
+ vorbis_encode_ctl( &p_sys->vi, OV_ECTL_RATEMANAGE_SET, &ai );
+
+ }
+ else
+ {
+ /* Turn off management entirely */
+ vorbis_encode_ctl( &p_sys->vi, OV_ECTL_RATEMANAGE_SET, NULL );
+ }
+ }
+ else
+ {
+ if( vorbis_encode_setup_managed( &p_sys->vi,
+ p_enc->fmt_in.audio.i_channels, p_enc->fmt_in.audio.i_rate,
+ i_min_bitrate > 0 ? i_min_bitrate * 1000: -1,
+ p_enc->fmt_out.i_bitrate,
+ i_max_bitrate > 0 ? i_max_bitrate * 1000: -1 ) )
+ {
+ vorbis_info_clear( &p_sys->vi );
+ msg_Err( p_enc, "CBR mode initialisation failed" );
+ free( p_enc->p_sys );
+ return VLC_EGENERIC;
+ }
+ }
+
+ vorbis_encode_setup_init( &p_sys->vi );
/* add a comment */
vorbis_comment_init( &p_sys->vc);
ogg_packet oggpacket;
block_t *p_block, *p_chain = NULL;
float **buffer;
- int i, j;
+ int i;
+ unsigned int j;
p_sys->i_pts = p_aout_buf->start_date -
(mtime_t)1000000 * (mtime_t)p_sys->i_samples_delay /
buffer = vorbis_analysis_buffer( &p_sys->vd, p_aout_buf->i_nb_samples );
-#if 0
- if( id->ff_dec_c->channels != id->ff_enc_c->channels )
- {
- int i, j;
-
- /* dumb downmixing */
- for( i = 0; i < id->ff_enc_c->frame_size; i++ )
- {
- for( j = 0 ; j < id->f_dst.i_channels; j++ )
- {
- p_buffer[i*id->f_dst.i_channels+j] =
- p_buffer[i*id->f_src.i_channels+j];
- }
- }
- }
-#endif
-
/* convert samples to float and uninterleave */
for( i = 0; i < p_sys->i_channels; i++ )
{
projects / vlc / blobdiff