summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjbrjake <[email protected]>2008-02-16 15:15:52 +0000
committerjbrjake <[email protected]>2008-02-16 15:15:52 +0000
commit81dabcdb25f2dac8a67cd47bf3eca31dd889271f (patch)
tree67b2c60e1aeebc14654d74b8aa4a8cc42a4d47e7
parentd6308581fa42b2c7503430c0fb8c3d9a828edb50 (diff)
Wires up the CLI for doing AAC and AC3 at the same time, with a new audio encoder value, aac+ac3. Allows up to 4 source tracks to be selected, all are handled the same way. (Track-by-track audio configuration waits for 0.9.3.)
git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@1268 b64f7644-9d1e-0410-96f1-a4d463321fa5
-rw-r--r--test/test.c37
1 files changed, 34 insertions, 3 deletions
diff --git a/test/test.c b/test/test.c
index 671592366..bebc85745 100644
--- a/test/test.c
+++ b/test/test.c
@@ -832,6 +832,28 @@ static int HandleEvents( hb_handle_t * h )
job->audios[0] = 0;
job->audio_mixdowns[0] = audio_mixdown;
}
+
+ if( audio_mixdown == HB_AMIXDOWN_DOLBYPLII_AC3)
+ {
+
+
+ int i;
+ for( i = 3 ; i > 0; i--)
+ {
+ job->audios[i*2+1] = job->audios[i];
+ job->audios[i*2] = job->audios[i];
+ if(job->audios[i] != -1 )
+ {
+ job->audio_mixdowns[i*2+1] = HB_AMIXDOWN_AC3;
+ job->audio_mixdowns[i*2] = HB_AMIXDOWN_DOLBYPLII;
+ }
+ }
+
+ job->audios[1] = job->audios[0];
+ job->audio_mixdowns[1] = HB_AMIXDOWN_AC3;
+ job->audio_mixdowns[0] = HB_AMIXDOWN_DOLBYPLII;
+ }
+
if( abitrate )
{
job->abitrate = abitrate;
@@ -1186,12 +1208,15 @@ static void ShowHelp()
"### Audio Options-----------------------------------------------------------\n\n"
- " -E, --aencoder <string> Set audio encoder (faac/lame/vorbis/ac3, ac3\n"
- " meaning passthrough, default: guessed)\n"
+ " -E, --aencoder <string> Audio encoder (faac/lame/vorbis/ac3/aac+ac3) \n"
+ " ac3 meaning passthrough, ac3+aac meaning an\n"
+ " aac dpl2 mixdown paired with ac3 pass-thru\n"
+ " (default: guessed)\n"
" -B, --ab <kb/s> Set audio bitrate (default: 128)\n"
" -a, --audio <string> Select audio channel(s), separated by commas\n"
" (\"none\" for no audio, \"1,2,3\" for multiple\n"
- " tracks, default: first one, max: eight)\n"
+ " tracks, default: first one,\n"
+ " max 8 normally, max 4 with aac+ac3)\n"
" -6, --mixdown <string> Format for surround sound downmixing\n"
" (mono/stereo/dpl1/dpl2/6ch, default: dpl2)\n"
" -R, --arate Set audio samplerate (" );
@@ -1580,6 +1605,12 @@ static int ParseOptions( int argc, char ** argv )
{
acodec = HB_ACODEC_VORBIS;
}
+ else if( !strcasecmp( optarg, "aac+ac3") )
+ {
+ acodec = HB_ACODEC_FAAC;
+ audio_mixdown = HB_AMIXDOWN_DOLBYPLII_AC3;
+ arate = 48000;
+ }
break;
case 'w':
width = atoi( optarg );