diff options
| author | dynaflash <[email protected]> | 2007-03-24 15:04:29 +0000 |
|---|---|---|
| committer | dynaflash <[email protected]> | 2007-03-24 15:04:29 +0000 |
| commit | 72508e88b7f4d09b42f3341546d2e838787bf510 (patch) | |
| tree | d191ec734ca9b106a0f842662d4fc7713e54db75 | |
| parent | 3be01292bc6526ba1ee14b77e37646769c81c939 (diff) | |
saintdev's fix to correctly allocate bitrate for non-stereo audio
git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@447 b64f7644-9d1e-0410-96f1-a4d463321fa5
| -rw-r--r-- | libhb/encfaac.c | 2 | ||||
| -rw-r--r-- | test/test.c | 9 |
2 files changed, 9 insertions, 2 deletions
diff --git a/libhb/encfaac.c b/libhb/encfaac.c index 3cbe48f24..84e1fcbaf 100644 --- a/libhb/encfaac.c +++ b/libhb/encfaac.c @@ -74,7 +74,7 @@ int encfaacInit( hb_work_object_t * w, hb_job_t * job ) } cfg->useTns = 0; - cfg->bitRate = job->abitrate * 500; /* Per channel */ + cfg->bitRate = job->abitrate * 1000 / w->config->aac.channelsused; /* Per channel */ cfg->bandWidth = 0; cfg->outputFormat = 0; cfg->inputFormat = FAAC_INPUT_FLOAT; diff --git a/test/test.c b/test/test.c index 38e58a23d..bc6b51ab0 100644 --- a/test/test.c +++ b/test/test.c @@ -963,7 +963,14 @@ static int CheckOptions( int argc, char ** argv ) { /* only attempt 5.1 export if exporting to AAC */ surround = 0; - } + } else { + if (!abitrate && surround) + { + /* If we don't get a audio bitrate on the command line, and + surround is being used, default to 384 */ + abitrate = 384; + } + } } |