diff options
| author | Rodeo <[email protected]> | 2013-01-04 13:22:07 +0000 |
|---|---|---|
| committer | Rodeo <[email protected]> | 2013-01-04 13:22:07 +0000 |
| commit | 15b164a418a5f0b0da912a3acc980b861267e7da (patch) | |
| tree | d8322fe014ce9843cda25a7f69805f15ad807599 /test | |
| parent | e0ec7fbfd2fcf1d8759049a0826f571939fce536 (diff) | |
CLI: fix logging of the default mixdown in --help.
Also, some minor cosmetics/refactoring.
git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@5143 b64f7644-9d1e-0410-96f1-a4d463321fa5
Diffstat (limited to 'test')
| -rw-r--r-- | test/test.c | 29 |
1 files changed, 17 insertions, 12 deletions
diff --git a/test/test.c b/test/test.c index 3b1d8f6df..c03859b55 100644 --- a/test/test.c +++ b/test/test.c @@ -2858,12 +2858,12 @@ static void ShowHelp() " tracks, default: first one).\n" " Multiple output tracks can be used for one input.\n" " -E, --aencoder <string> Audio encoder(s):\n" ); - for( i = 0; i < hb_audio_encoders_count; i++ ) + for (i = 0; i < hb_audio_encoders_count; i++) { - fprintf( out, " %s\n", - hb_audio_encoders[i].short_name ); + fprintf(out, " %s\n", + hb_audio_encoders[i].short_name); } - fprintf( out, + fprintf(out, " copy:* will passthrough the corresponding\n" " audio unmodified to the muxer if it is a\n" " supported passthrough audio type.\n" @@ -2876,17 +2876,19 @@ static void ShowHelp() " --audio-copy-mask Set audio codecs that are permitted when the\n" " <string> \"copy\" audio encoder option is specified\n" " (" ); - for( i = 0, j = 0; i < hb_audio_encoders_count; i++ ) + for (i = j = 0; i < hb_audio_encoders_count; i++) { - if( !strncmp( hb_audio_encoders[i].short_name, "copy:", 5 ) ) + if ((hb_audio_encoders[i].encoder & HB_ACODEC_PASS_FLAG) && + (hb_audio_encoders[i].encoder != HB_ACODEC_AUTO_PASS)) { - if( j != 0 ) - fprintf( out, "/" ); - fprintf( out, "%s", hb_audio_encoders[i].short_name + 5 ); + if (j) + fprintf(out, "/"); + // skip "copy:" + fprintf(out, "%s", hb_audio_encoders[i].short_name + 5); j = 1; } } - fprintf( out, ", default: all).\n" + fprintf(out, ", default: all).\n" " Separated by commas for multiple allowed options.\n" " --audio-fallback Set audio codec to use when it is not possible\n" " <string> to copy an audio track without re-encoding.\n" @@ -2908,10 +2910,13 @@ static void ShowHelp() } fprintf(out, " Separated by commas for more than one audio track.\n" - " Default: up to %s for ffac3 and ffflac,\n", + " Default: up to %s for ffflac and ffflac24,\n", + hb_mixdown_get_short_name_from_mixdown(HB_AMIXDOWN_7POINT1)); + fprintf(out, + " up to %s for ffac3,\n", hb_mixdown_get_short_name_from_mixdown(HB_AMIXDOWN_5POINT1)); fprintf(out, - " up to %s for other encoders).\n", + " up to %s for other encoders.\n", hb_mixdown_get_short_name_from_mixdown(HB_AMIXDOWN_DOLBYPLII)); fprintf(out, " --normalize-mix Normalize audio mix levels to prevent clipping.\n" |