summaryrefslogtreecommitdiffstats
path: root/libhb
diff options
context:
space:
mode:
authormaurj <handbrake@maurj.com>2007-03-27 21:28:40 +0000
committermaurj <handbrake@maurj.com>2007-03-27 21:28:40 +0000
commit557b5fb91bc4ea84418e4f56b7b8ae3b5fdda398 (patch)
tree83d4d165f7f35fbaab903a23214d6a5afa65eb68 /libhb
parent45dec221d2e25d7cb80ca3ae6631cde0d8891f0d (diff)
Amended the code comments about 6-channel and 1-channel audio extraction to reflect that it's no longer just for AAC, following saintdev's addition of 6-ch and 1-ch for OGM.
git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@458 b64f7644-9d1e-0410-96f1-a4d463321fa5
Diffstat (limited to 'libhb')
-rw-r--r--libhb/deca52.c6
-rw-r--r--libhb/work.c13
2 files changed, 9 insertions, 10 deletions
diff --git a/libhb/deca52.c b/libhb/deca52.c
index 511a9a15e..a5f312335 100644
--- a/libhb/deca52.c
+++ b/libhb/deca52.c
@@ -70,12 +70,12 @@ int deca52Init( hb_work_object_t * w, hb_job_t * job )
work.c has already done some of this deduction for us in do_job() */
if (w->config->a52.channelsused == 6) {
- /* we're going to be encoding to AAC,
+ /* we're going to be encoding to a 6ch-supporting format,
and have turned on the "preserve 5.1" flag */
pv->flags_out = A52_3F2R | A52_LFE;
} else if (w->config->a52.channelsused == 1) {
- /* we're going to be encoding to AAC, */
- /* and want to keep the mono-ness of the source audio */
+ /* we're going to be encoding to a 1ch-supporting format,
+ so mix down to a mono track */
pv->flags_out = A52_MONO;
} else if (w->config->a52.channelsused == 2 && w->config->a52.channels == 5 && w->config->a52.lfechannels == 1) {
/* we are mixing a 5.1 source down to stereo, so use dolby surround */
diff --git a/libhb/work.c b/libhb/work.c
index e8fafbdc4..97c332bec 100644
--- a/libhb/work.c
+++ b/libhb/work.c
@@ -274,28 +274,27 @@ static void do_job( hb_job_t * job, int cpu_count )
/* store this audio's channel counts in the audio struct */
/* we will only end up with a channelsused value other than 2
- if we are encoding to AAC. All other audio encodings will get
+ if we are encoding to AAC or OGM. All other audio encodings will get
a stereo mix. */
if (audio->channels == 5 && audio->lfechannels == 1) {
/* we have a 5.1 AC-3 source soundtrack */
if ((job->acodec == HB_ACODEC_FAAC || job->acodec == HB_ACODEC_VORBIS) && job->surround) {
- /* we're going to be encoding to AAC,
+ /* we're going to be encoding to a 6ch-supporting format,
and have turned on the "preserve 5.1" flag */
audio->channelsused = 6;
} else {
- /* mix 5.1 down to Dolby Digital (2-channel) for
- non-AAC audio, or for AAC without 5.1 preservation */
+ /* mix 5.1 down to Dolby Digital (2-channel) */
audio->channelsused = 2;
}
} else if (audio->channels == 1 && audio->lfechannels == 0) {
/* we have a 1.0 mono AC-3 source soundtrack */
if (job->acodec == HB_ACODEC_FAAC || job->acodec == HB_ACODEC_VORBIS) {
- /* we're going to be encoding to AAC,
- so mix down to a mono AAC track */
+ /* we're going to be encoding to a 1ch-supporting format,
+ so mix down to a mono track */
audio->channelsused = 1;
} else {
- /* mix up the mono track to stereo for non-AAC formats */
+ /* mix up the mono track to stereo */
audio->channelsused = 2;
}
} else {