/* $Id: encvorbis.c,v 1.6 2005/03/05 15:08:32 titer Exp $
This file is part of the HandBrake source code.
- Homepage: <http://handbrake.m0k.org/>.
+ Homepage: <http://handbrake.fr/>.
It may be used under the terms of the GNU General Public License. */
#include "hb.h"
int encvorbisInit( hb_work_object_t * w, hb_job_t * job )
{
+ hb_audio_t * audio = w->audio;
int i;
ogg_packet header[3];
struct ovectl_ratemanage2_arg ctl_rate_arg;
hb_work_private_t * pv = calloc( 1, sizeof( hb_work_private_t ) );
w->private_data = pv;
- pv->out_discrete_channels = HB_AMIXDOWN_GET_DISCRETE_CHANNEL_COUNT(w->amixdown);
+ pv->out_discrete_channels = HB_AMIXDOWN_GET_DISCRETE_CHANNEL_COUNT(audio->config.out.mixdown);
pv->job = job;
hb_log( "encvorbis: opening libvorbis" );
+ /* 28kbps/channel seems to be the minimum for 6ch vorbis. */
+ int min_bitrate = 28 * pv->out_discrete_channels;
+ if (pv->out_discrete_channels > 2 && audio->config.out.bitrate < min_bitrate)
+ {
+ hb_log( "encvorbis: Selected bitrate (%d kbps) too low for %d channel audio.", audio->config.out.bitrate, pv->out_discrete_channels);
+ hb_log( "encvorbis: Resetting bitrate to %d kbps", min_bitrate);
+ /* Naughty! We shouldn't modify the audio from here. */
+ audio->config.out.bitrate = min_bitrate;
+ }
+
/* init */
vorbis_info_init( &pv->vi );
if( vorbis_encode_setup_managed( &pv->vi, pv->out_discrete_channels,
- job->arate, -1, 1000 * job->abitrate, -1 ) )
+ audio->config.out.samplerate, -1, 1000 * audio->config.out.bitrate, -1 ) )
{
- hb_log( "encvorbis: vorbis_encode_setup_managed failed" );
+ hb_error( "encvorbis: vorbis_encode_setup_managed failed.\n" );
*job->die = 1;
return 0;
}
hb_log( "encvorbis: vorbis_encode_ctl( ratemanage2_get ) failed" );
}
- ctl_rate_arg.bitrate_average_kbps = 1000 * job->abitrate;
+ ctl_rate_arg.bitrate_average_kbps = audio->config.out.bitrate;
ctl_rate_arg.management_active = 1;
if( vorbis_encode_ctl( &pv->vi, OV_ECTL_RATEMANAGE2_SET, &ctl_rate_arg ) ||
vorbis_encode_setup_init( &pv->vi ) )
{
- hb_log( "encvorbis: vorbis_encode_ctl( ratemanage2_set ) OR vorbis_encode_setup_init failed" );
+ hb_error( "encvorbis: vorbis_encode_ctl( ratemanage2_set ) OR vorbis_encode_setup_init failed.\n" );
*job->die = 1;
return 0;
}
void encvorbisClose( hb_work_object_t * w )
{
hb_work_private_t * pv = w->private_data;
-
+
vorbis_block_clear( &pv->vb );
vorbis_dsp_clear( &pv->vd );
vorbis_comment_clear( &pv->vc );
vorbis_info_clear( &pv->vi );
-
- hb_list_empty( &pv->list );
-
+
+ if (pv->list)
+ hb_list_empty( &pv->list );
+
free( pv->buf );
free( pv );
w->private_data = NULL;
hb_work_private_t * pv = w->private_data;
hb_buffer_t * buf;
+ if ( (*buf_in)->size <= 0 )
+ {
+ /* EOF on input - send it downstream & say we're done */
+ *buf_out = *buf_in;
+ *buf_in = NULL;
+ return HB_WORK_DONE;
+ }
+
hb_list_add( pv->list, *buf_in );
*buf_in = NULL;