From: maurj Date: Mon, 2 Apr 2007 13:05:07 +0000 (+0000) Subject: Amended work.c to remember the number of source A52 channels and lfe channels, so... X-Git-Url: http://git.osdn.jp/view?a=commitdiff_plain;h=1b1cd08334815551df82388e1d43613ccca159b0;hp=6c53a33a96264d4bd15b3251a6621145b96d4871;p=handbrake-jp%2Fhandbrake-jp-git.git Amended work.c to remember the number of source A52 channels and lfe channels, so that deca52.c can correctly detect a 5.1 source which needs mixing down to Dolby Digital. Previously it was just mixing 5.1 down to stereo. This has been broken since rev 438, when the multi-soundtrack bug was fixed. git-svn-id: svn://localhost/HandBrake/trunk@472 b64f7644-9d1e-0410-96f1-a4d463321fa5 --- diff --git a/libhb/work.c b/libhb/work.c index 3c1ceadd..0a939218 100644 --- a/libhb/work.c +++ b/libhb/work.c @@ -304,6 +304,11 @@ static void do_job( hb_job_t * job, int cpu_count ) audio->channelsused = 2; } + /* remember the number of source channels, so that deca52.c knows what source we had */ + audio->config.a52.channels = audio->channels; + audio->config.a52.lfechannels = audio->lfechannels; + + /* pass round the number of channels we actually used */ audio->config.aac.channelsused = audio->config.a52.channelsused = audio->config.vorbis.channelsused = audio->channelsused; audio->config.vorbis.language = audio->lang_simple;