diff options
| author | saintdev <[email protected]> | 2007-09-16 03:09:07 +0000 |
|---|---|---|
| committer | saintdev <[email protected]> | 2007-09-16 03:09:07 +0000 |
| commit | b67ea5e9820f3ed2e969da3ae94205e4097c5da6 (patch) | |
| tree | 9867a351c8c351fc382e11ccf8eca89013d15e30 | |
| parent | ae3318562ae54ad4d01e7a6bbb04cabff10abf0f (diff) | |
Re-enable 6ch vorbis audio.
Vorbis won't allow bitrates < 168kbps with 6ch audio, so anything less is reset to 168kbps.
git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@966 b64f7644-9d1e-0410-96f1-a4d463321fa5
| -rw-r--r-- | libhb/encvorbis.c | 18 | ||||
| -rw-r--r-- | libhb/work.c | 4 |
2 files changed, 16 insertions, 6 deletions
diff --git a/libhb/encvorbis.c b/libhb/encvorbis.c index cfe506fdd..a90b285d2 100644 --- a/libhb/encvorbis.c +++ b/libhb/encvorbis.c @@ -56,12 +56,21 @@ int encvorbisInit( hb_work_object_t * w, hb_job_t * 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 && job->abitrate < min_bitrate) + { + hb_log( "encvorbis: Selected bitrate (%d kbps) too low for %d channel audio.", job->abitrate, pv->out_discrete_channels); + hb_log( "encvorbis: Resetting bitrate to %d kbps", min_bitrate); + job->abitrate = 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 ) ) { - hb_log( "encvorbis: vorbis_encode_setup_managed failed" ); + hb_error( "encvorbis: vorbis_encode_setup_managed failed.\n" ); *job->die = 1; return 0; } @@ -77,7 +86,7 @@ int encvorbisInit( hb_work_object_t * w, hb_job_t * job ) 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; } @@ -144,8 +153,9 @@ void encvorbisClose( hb_work_object_t * w ) 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 ); diff --git a/libhb/work.c b/libhb/work.c index 5b3f914c2..326da8e61 100644 --- a/libhb/work.c +++ b/libhb/work.c @@ -326,9 +326,9 @@ static void do_job( hb_job_t * job, int cpu_count ) /* audioCodecsSupportMono and audioCodecsSupport6Ch are the same for now, but this may change in the future, so they are separated for flexibility */ int audioCodecsSupportMono = ((audio->codec == HB_ACODEC_AC3 || - audio->codec == HB_ACODEC_DCA) && job->acodec == HB_ACODEC_FAAC); + audio->codec == HB_ACODEC_DCA) && (job->acodec == HB_ACODEC_FAAC || job->acodec == HB_ACODEC_VORBIS)); int audioCodecsSupport6Ch = ((audio->codec == HB_ACODEC_AC3 || - audio->codec == HB_ACODEC_DCA) && job->acodec == HB_ACODEC_FAAC); + audio->codec == HB_ACODEC_DCA) && (job->acodec == HB_ACODEC_FAAC || job->acodec == HB_ACODEC_VORBIS)); /* find out what the format of our source audio is */ switch (audio->input_channel_layout & HB_INPUT_CH_LAYOUT_DISCRETE_NO_LFE_MASK) { |