* twolame.c: libtwolame encoder (MPEG-1/2 layer II) module
* (using libtwolame from http://users.tpg.com.au/adslblvi/)
*****************************************************************************
- * Copyright (C) 2004-2005 VideoLAN (Centrale Réseaux) and its contributors
+ * Copyright (C) 2004-2005 the VideoLAN team
* $Id$
*
* Authors: Christophe Massiot <massiot@via.ecp.fr>
*
* 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/sout.h>
-#include <vlc/aout.h>
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#include <vlc_common.h>
+#include <vlc_plugin.h>
+#include <vlc_codec.h>
+#include <vlc_sout.h>
+#include <vlc_aout.h>
#include <twolame.h>
#define ENC_QUALITY_TEXT N_("Encoding quality")
#define ENC_QUALITY_LONGTEXT N_( \
- "Allows you to specify a quality between 0.0 (high) and 50.0 (low), " \
+ "Force a specific encoding quality between 0.0 (high) and 50.0 (low), " \
"instead of specifying a particular bitrate. " \
"This will produce a VBR stream." )
#define ENC_MODE_TEXT N_("Stereo mode")
-#define ENC_MODE_LONGTEXT N_( \
- "[0=stereo, 1=dual-mono, 2=joint-stereo]" )
+#define ENC_MODE_LONGTEXT N_( "Handling mode for stereo streams" )
#define ENC_VBR_TEXT N_("VBR mode")
#define ENC_VBR_LONGTEXT N_( \
- "By default the encoding is CBR." )
+ "Use Variable BitRate. Default is to use Constant BitRate (CBR)." )
#define ENC_PSY_TEXT N_("Psycho-acoustic model")
#define ENC_PSY_LONGTEXT N_( \
"Integer from -1 (no model) to 4." )
-vlc_module_begin();
- set_shortname( "Twolame");
- set_description( _("Libtwolame audio encoder") );
- set_capability( "encoder", 50 );
- set_callbacks( OpenEncoder, CloseEncoder );
- set_category( CAT_INPUT );
- set_subcategory( SUBCAT_INPUT_ACODEC );
+static const int pi_stereo_values[] = { 0, 1, 2 };
+static const char *const ppsz_stereo_descriptions[] =
+{ N_("Stereo"), N_("Dual mono"), N_("Joint stereo") };
+
+
+vlc_module_begin ()
+ set_shortname( "Twolame")
+ set_description( N_("Libtwolame audio encoder") )
+ set_capability( "encoder", 50 )
+ set_callbacks( OpenEncoder, CloseEncoder )
+ set_category( CAT_INPUT )
+ set_subcategory( SUBCAT_INPUT_ACODEC )
add_float( ENC_CFG_PREFIX "quality", 0.0, NULL, ENC_QUALITY_TEXT,
- ENC_QUALITY_LONGTEXT, VLC_FALSE );
+ ENC_QUALITY_LONGTEXT, false )
add_integer( ENC_CFG_PREFIX "mode", 0, NULL, ENC_MODE_TEXT,
- ENC_MODE_LONGTEXT, VLC_FALSE );
- add_bool( ENC_CFG_PREFIX "vbr", 0, NULL, ENC_VBR_TEXT,
- ENC_VBR_LONGTEXT, VLC_FALSE );
+ ENC_MODE_LONGTEXT, false )
+ change_integer_list( pi_stereo_values, ppsz_stereo_descriptions, NULL );
+ add_bool( ENC_CFG_PREFIX "vbr", false, NULL, ENC_VBR_TEXT,
+ ENC_VBR_LONGTEXT, false )
add_integer( ENC_CFG_PREFIX "psy", 3, NULL, ENC_PSY_TEXT,
- ENC_PSY_LONGTEXT, VLC_FALSE );
-vlc_module_end();
+ ENC_PSY_LONGTEXT, false )
+vlc_module_end ()
-static const char *ppsz_enc_options[] = {
+static const char *const ppsz_enc_options[] = {
"quality", "mode", "vbr", "psy", NULL
};
/*****************************************************************************
* OpenEncoder: probe the encoder and return score
*****************************************************************************/
+static const uint16_t mpa_bitrate_tab[2][15] =
+{
+ {0, 32, 48, 56, 64, 80, 96, 112, 128, 160, 192, 224, 256, 320, 384},
+ {0, 8, 16, 24, 32, 40, 48, 56, 64, 80, 96, 112, 128, 144, 160}
+};
+
+static const uint16_t mpa_freq_tab[6] =
+{ 44100, 48000, 32000, 22050, 24000, 16000 };
+
static int OpenEncoder( vlc_object_t *p_this )
{
encoder_t *p_enc = (encoder_t *)p_this;
encoder_sys_t *p_sys;
- vlc_value_t val;
+ int i_frequency;
- if( p_enc->fmt_out.i_codec != VLC_FOURCC('m','p','g','a') &&
+ if( p_enc->fmt_out.i_codec != VLC_CODEC_MPGA &&
p_enc->fmt_out.i_codec != VLC_FOURCC('m','p','2','a') &&
p_enc->fmt_out.i_codec != VLC_FOURCC('m','p','2',' ') &&
!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 )
+ for ( i_frequency = 0; i_frequency < 6; i_frequency++ )
{
- msg_Err( p_enc, "out of memory" );
+ if ( p_enc->fmt_out.audio.i_rate == mpa_freq_tab[i_frequency] )
+ break;
+ }
+ if ( i_frequency == 6 )
+ {
+ msg_Err( p_enc, "MPEG audio doesn't support frequency=%d",
+ p_enc->fmt_out.audio.i_rate );
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 )
+ return VLC_ENOMEM;
p_enc->p_sys = p_sys;
p_enc->pf_encode_audio = Encode;
- p_enc->fmt_in.i_codec = AOUT_FMT_S16_NE;
- p_enc->fmt_out.i_codec = VLC_FOURCC('m','p','g','a');
+ p_enc->fmt_in.i_codec = VLC_CODEC_S16N;
+
+ p_enc->fmt_out.i_cat = AUDIO_ES;
+ p_enc->fmt_out.i_codec = VLC_CODEC_MPGA;
- 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 );
p_sys->p_twolame = twolame_init();
twolame_set_in_samplerate( p_sys->p_twolame, p_enc->fmt_out.audio.i_rate );
twolame_set_out_samplerate( p_sys->p_twolame, p_enc->fmt_out.audio.i_rate );
- var_Get( p_enc, ENC_CFG_PREFIX "vbr", &val );
- if ( val.b_bool )
+ if( var_GetBool( p_enc, ENC_CFG_PREFIX "vbr" ) )
{
- float i_quality;
- var_Get( p_enc, ENC_CFG_PREFIX "quality", &val );
- i_quality = val.i_int;
- if ( i_quality > 50.0 ) i_quality = 50.0;
- if ( i_quality < 0.0 ) i_quality = 0.0;
+ float f_quality = var_GetFloat( p_enc, ENC_CFG_PREFIX "quality" );
+ if ( f_quality > 50.0 ) f_quality = 50.0;
+ if ( f_quality < 0.0 ) f_quality = 0.0;
twolame_set_VBR( p_sys->p_twolame, 1 );
- twolame_set_VBR_q( p_sys->p_twolame, i_quality );
+ twolame_set_VBR_q( p_sys->p_twolame, f_quality );
}
else
{
- twolame_set_bitrate( p_sys->p_twolame, p_enc->fmt_out.i_bitrate / 1000 );
+ int i;
+ for ( i = 1; i < 14; i++ )
+ {
+ if ( p_enc->fmt_out.i_bitrate / 1000
+ <= mpa_bitrate_tab[i_frequency / 3][i] )
+ break;
+ }
+ if ( p_enc->fmt_out.i_bitrate / 1000
+ != mpa_bitrate_tab[i_frequency / 3][i] )
+ {
+ msg_Warn( p_enc, "MPEG audio doesn't support bitrate=%d, using %d",
+ p_enc->fmt_out.i_bitrate,
+ mpa_bitrate_tab[i_frequency / 3][i] * 1000 );
+ p_enc->fmt_out.i_bitrate = mpa_bitrate_tab[i_frequency / 3][i]
+ * 1000;
+ }
+
+ twolame_set_bitrate( p_sys->p_twolame,
+ p_enc->fmt_out.i_bitrate / 1000 );
}
if ( p_enc->fmt_in.audio.i_channels == 1 )
else
{
twolame_set_num_channels( p_sys->p_twolame, 2 );
- var_Get( p_enc, ENC_CFG_PREFIX "mode", &val );
- switch ( val.i_int )
+ switch( var_GetInteger( p_enc, ENC_CFG_PREFIX "mode" ) )
{
case 1:
twolame_set_mode( p_sys->p_twolame, TWOLAME_DUAL_CHANNEL );
}
}
- var_Get( p_enc, ENC_CFG_PREFIX "psy", &val );
- twolame_set_psymodel( p_sys->p_twolame, val.i_int );
+ twolame_set_psymodel( p_sys->p_twolame,
+ var_GetInteger( p_enc, ENC_CFG_PREFIX "psy" ) );
if ( twolame_init_params( p_sys->p_twolame ) )
{
int i_nb_samples = p_aout_buf->i_nb_samples;
block_t *p_chain = NULL;
- p_sys->i_pts = p_aout_buf->start_date -
+ p_sys->i_pts = p_aout_buf->i_pts -
(mtime_t)1000000 * (mtime_t)p_sys->i_nb_samples /
(mtime_t)p_enc->fmt_out.audio.i_rate;
p_sys->p_out_buffer, MAX_CODED_FRAME_SIZE );
p_sys->i_nb_samples = 0;
p_block = block_New( p_enc, i_used );
- p_enc->p_vlc->pf_memcpy( p_block->p_buffer, p_sys->p_out_buffer,
- i_used );
+ vlc_memcpy( p_block->p_buffer, p_sys->p_out_buffer, i_used );
p_block->i_length = (mtime_t)1000000 *
(mtime_t)MPEG_FRAME_SIZE / (mtime_t)p_enc->fmt_out.audio.i_rate;
p_block->i_dts = p_block->i_pts = p_sys->i_pts;
projects / vlc / blobdiff