summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--test/test.c80
1 files changed, 66 insertions, 14 deletions
diff --git a/test/test.c b/test/test.c
index f72538667..5cacd82b9 100644
--- a/test/test.c
+++ b/test/test.c
@@ -623,7 +623,7 @@ static int HandleEvents( hb_handle_t * h )
}
if( !acodecs )
{
- acodecs = strdup("faac,ac3pass");
+ acodecs = strdup("faac,copy:ac3");
}
if( !abitrates )
{
@@ -796,7 +796,7 @@ static int HandleEvents( hb_handle_t * h )
}
if( !acodecs )
{
- acodecs = strdup("faac,ac3pass");
+ acodecs = strdup("faac,copy:ac3");
}
if( !abitrates )
{
@@ -885,7 +885,7 @@ static int HandleEvents( hb_handle_t * h )
}
if( !acodecs )
{
- acodecs = strdup("faac,ac3pass");
+ acodecs = strdup("faac,copy:ac3");
}
if( !abitrates )
{
@@ -966,7 +966,7 @@ static int HandleEvents( hb_handle_t * h )
}
if( !acodecs )
{
- acodecs = strdup("faac,ac3pass");
+ acodecs = strdup("faac,copy:ac3");
}
if( !abitrates )
{
@@ -1788,6 +1788,52 @@ static int HandleEvents( hb_handle_t * h )
}
/* Audio Track Names */
+ /* Fix up passthru that needs to fallback to ac3 encode */
+ for( i = 0; i < hb_list_count( job->list_audio ); )
+ {
+ audio = hb_list_audio_config_item( job->list_audio, i );
+ if ( ( audio->out.codec & HB_ACODEC_AC3 ) &&
+ ( audio->out.codec & HB_ACODEC_PASS_FLAG ) &&
+ !( audio->out.codec & audio->in.codec ) )
+ {
+ int channels;
+ audio->out.codec = HB_ACODEC_AC3;
+ channels = HB_INPUT_CH_LAYOUT_GET_DISCRETE_COUNT(audio->in.channel_layout);
+ // bitrate setting is a placeholder till we get
+ // defaults and limits implemented in libhb
+ if (channels == 1)
+ {
+ audio->out.mixdown = HB_AMIXDOWN_MONO;
+ audio->out.bitrate = 96;
+ }
+ if (channels == 2)
+ {
+ audio->out.mixdown = HB_AMIXDOWN_DOLBYPLII;
+ audio->out.bitrate = 224;
+ }
+ else
+ {
+ audio->out.mixdown = HB_AMIXDOWN_6CH;
+ audio->out.bitrate = 640;
+ }
+ }
+ // fix 'copy' to select a specific codec
+ if ( audio->out.codec & HB_ACODEC_PASS_FLAG )
+ {
+ audio->out.codec &= (audio->in.codec | HB_ACODEC_PASS_FLAG);
+ if ( !( audio->out.codec & HB_ACODEC_MASK ) )
+ {
+ // Passthru not possible, drop audio.
+ fprintf( stderr, "Passthru requested and input codec is not the same as output codec for track %d\n",
+ audio->out.track );
+ hb_audio_t * item = hb_list_item( job->list_audio, i );
+ hb_list_rem( job->list_audio, item );
+ continue;
+ }
+ }
+ i++;
+ }
+
if( size )
{
job->vbitrate = hb_calc_bitrate( job, size );
@@ -2362,15 +2408,17 @@ static void ShowHelp()
#ifdef __APPLE_CC__
fprintf( out,
" -E, --aencoder <string> Audio encoder(s)\n"
- " (ca_aac/faac/lame/vorbis/ac3/ac3pass/dtspass)\n"
- " ac3pass and dtspass meaning passthrough\n"
+ " (ca_aac/faac/lame/vorbis/ac3/copy/copy:ac3/copy:dts)\n"
+ " copy, copy:ac3 and copy:dts meaning passthrough.\n"
+ " copy will passthrough either ac3 or dts.\n"
" Separated by commas for more than one audio track.\n"
" (default: guessed)\n" );
#else
fprintf( out,
" -E, --aencoder <string> Audio encoder(s):\n"
- " (faac/lame/vorbis/ac3/ac3pass/dtspass)\n"
- " ac3pass and dtspass meaning passthrough\n"
+ " (faac/lame/vorbis/ac3/copy/copy:ac3/copy:dts)\n"
+ " copy, copy:ac3 and copy:dts meaning passthrough.\n"
+ " copy will passthrough either ac3 or dts.\n"
" Separated by commas for more than one audio track.\n"
" (default: guessed)\n" );
#endif
@@ -2521,7 +2569,7 @@ static void ShowPresets()
{
printf("\n< Apple\n");
- printf("\n + Universal: -e x264 -q 20.0 -a 1,1 -E faac,ac3pass -B 160,160 -6 dpl2,auto -R Auto,Auto -D 0.0,0.0 -f mp4 -X 720 --loose-anamorphic -m -x cabac=0:ref=2:me=umh:bframes=0:8x8dct=0:trellis=0:subme=6\n");
+ printf("\n + Universal: -e x264 -q 20.0 -a 1,1 -E faac,copy:ac3 -B 160,160 -6 dpl2,auto -R Auto,Auto -D 0.0,0.0 -f mp4 -X 720 --loose-anamorphic -m -x cabac=0:ref=2:me=umh:bframes=0:8x8dct=0:trellis=0:subme=6\n");
printf("\n + iPod: -e x264 -b 700 -a 1 -E faac -B 160 -6 dpl2 -R Auto -D 0.0 -f mp4 -I -X 320 -m -x level=30:bframes=0:cabac=0:ref=1:vbv-maxrate=768:vbv-bufsize=2000:analyse=all:me=umh:no-fast-pskip=1:subme=6:8x8dct=0:trellis=0\n");
@@ -2529,7 +2577,7 @@ static void ShowPresets()
printf("\n + iPad: -e x264 -q 20.0 -r 29.97 --pfr -a 1 -E faac -B 160 -6 dpl2 -R Auto -D 0.0 -f mp4 -4 -X 1024 --loose-anamorphic -m\n");
- printf("\n + AppleTV: -e x264 -q 20.0 -a 1,1 -E faac,ac3pass -B 160,160 -6 dpl2,auto -R Auto,Auto -D 0.0,0.0 -f mp4 -4 -X 960 --loose-anamorphic -m -x cabac=0:ref=2:me=umh:b-pyramid=none:b-adapt=2:weightb=0:trellis=0:weightp=0:vbv-maxrate=9500:vbv-bufsize=9500\n");
+ printf("\n + AppleTV: -e x264 -q 20.0 -a 1,1 -E faac,copy:ac3 -B 160,160 -6 dpl2,auto -R Auto,Auto -D 0.0,0.0 -f mp4 -4 -X 960 --loose-anamorphic -m -x cabac=0:ref=2:me=umh:b-pyramid=none:b-adapt=2:weightb=0:trellis=0:weightp=0:vbv-maxrate=9500:vbv-bufsize=9500\n");
printf("\n>\n");
@@ -2537,7 +2585,7 @@ static void ShowPresets()
printf("\n + Normal: -e x264 -q 20.0 -a 1 -E faac -B 160 -6 dpl2 -R Auto -D 0.0 -f mp4 --strict-anamorphic -m -x ref=2:bframes=2:subme=6:mixed-refs=0:weightb=0:8x8dct=0:trellis=0\n");
- printf("\n + High Profile: -e x264 -q 20.0 -a 1,1 -E faac,ac3pass -B 160,160 -6 dpl2,auto -R Auto,Auto -D 0.0,0.0 -f mp4 --detelecine --decomb --loose-anamorphic -m -x b-adapt=2:rc-lookahead=50\n");
+ printf("\n + High Profile: -e x264 -q 20.0 -a 1,1 -E faac,copy:ac3 -B 160,160 -6 dpl2,auto -R Auto,Auto -D 0.0,0.0 -f mp4 --detelecine --decomb --loose-anamorphic -m -x b-adapt=2:rc-lookahead=50\n");
printf("\n>\n");
@@ -2545,7 +2593,7 @@ static void ShowPresets()
printf("\n + Classic: -b 1000 -a 1 -E faac -B 160 -6 dpl2 -R Auto -D 0.0 -f mp4\n");
- printf("\n + AppleTV Legacy: -e x264 -b 2500 -a 1,1 -E faac,ac3pass -B 160,160 -6 dpl2,auto -R Auto,Auto -D 0.0,0.0 -f mp4 -4 --strict-anamorphic -m -x ref=1:b-pyramid=none:subme=5:me=umh:no-fast-pskip=1:cabac=0:weightb=0:8x8dct=0:trellis=0\n");
+ printf("\n + AppleTV Legacy: -e x264 -b 2500 -a 1,1 -E faac,copy:ac3 -B 160,160 -6 dpl2,auto -R Auto,Auto -D 0.0,0.0 -f mp4 -4 --strict-anamorphic -m -x ref=1:b-pyramid=none:subme=5:me=umh:no-fast-pskip=1:cabac=0:weightb=0:8x8dct=0:trellis=0\n");
printf("\n + iPhone Legacy: -e x264 -b 960 -a 1 -E faac -B 128 -6 dpl2 -R Auto -D 0.0 -f mp4 -I -X 480 -m -x level=30:cabac=0:ref=1:analyse=all:me=umh:no-fast-pskip=1:psy-rd=0,0:bframes=0:subme=6:8x8dct=0:trellis=0\n");
@@ -3376,11 +3424,15 @@ static int get_acodec_for_string( char *codec )
{
return HB_ACODEC_AC3;
}
- else if( !strcasecmp( codec, "ac3pass" ) )
+ else if( !strcasecmp( codec, "copy" ) )
+ {
+ return HB_ACODEC_AC3_PASS | HB_ACODEC_DCA_PASS;
+ }
+ else if( !strcasecmp( codec, "copy:ac3" ) )
{
return HB_ACODEC_AC3_PASS;
}
- else if( !strcasecmp( codec, "dtspass" ) || !strcasecmp( codec, "dcapass" ) )
+ else if( !strcasecmp( codec, "copy:dts" ) || !strcasecmp( codec, "copy:dca" ) )
{
return HB_ACODEC_DCA_PASS;
}
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-29 08:39:32 +0000