Mcdeint is broken, so avoid using it as a deinterlacer. No more "Slowest," "Slow...

[handbrake-jp/handbrake-jp-git.git] / test / test.c

diff --git a/test/test.c b/test/test.c
index 8926369..106f7a2 100644 (file)
--- a/test/test.c
+++ b/test/test.c
@@ -523,42 +523,42 @@ static int HandleEvents( hb_handle_t * h )
                 if (!strcmp(preset_name, "iPhone / iPod Touch"))
                 {
                     mux = HB_MUX_MP4;
+                    job->ipod_atom = 1;
                     vcodec = HB_VCODEC_X264;
-                    job->h264_level = 30;
                     job->vbitrate = 960;
                     job->abitrate = 128;
                     job->arate = 48000;
                     acodec = HB_ACODEC_FAAC;
                     job->width = 480;
-                    x264opts = strdup("cabac=0:ref=1:analyse=all:me=umh:subme=6:no-fast-pskip=1:trellis=1");
+                    x264opts = strdup("level=30:cabac=0:ref=1:analyse=all:me=umh:subme=6:no-fast-pskip=1:trellis=1");
                     job->chapter_markers = 1;
                 }
 
                 if (!strcmp(preset_name, "iPod High-Rez"))
                 {
                     mux = HB_MUX_MP4;
+                    job->ipod_atom = 1;
                     vcodec = HB_VCODEC_X264;
-                    job->h264_level = 30;
                     job->vbitrate = 1500;
                     job->abitrate = 160;
                     job->arate = 48000;
                     acodec = HB_ACODEC_FAAC;
                     job->width = 640;
-                    x264opts = strdup("bframes=0:cabac=0:ref=1:vbv-maxrate=1500:vbv-bufsize=2000:analyse=all:me=umh:subme=6:no-fast-pskip=1");
+                    x264opts = strdup("level=30:bframes=0:cabac=0:ref=1:vbv-maxrate=1500:vbv-bufsize=2000:analyse=all:me=umh:subme=6:no-fast-pskip=1");
                     job->chapter_markers = 1;
                 }
 
                 if (!strcmp(preset_name, "iPod Low-Rez"))
                 {
                     mux = HB_MUX_MP4;
+                    job->ipod_atom = 1;
                     vcodec = HB_VCODEC_X264;
-                    job->h264_level = 30;
                     job->vbitrate = 700;
                     job->abitrate = 160;
                     job->arate = 48000;
                     acodec = HB_ACODEC_FAAC;
                     job->width = 320;
-                    x264opts = strdup("bframes=0:cabac=0:ref=1:vbv-maxrate=768:vbv-bufsize=2000:analyse=all:me=umh:subme=6:no-fast-pskip=1");
+                    x264opts = strdup("level=30:bframes=0:cabac=0:ref=1:vbv-maxrate=768:vbv-bufsize=2000:analyse=all:me=umh:subme=6:no-fast-pskip=1");
                     job->chapter_markers = 1;
                 }
 
@@ -832,6 +832,26 @@ 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;
@@ -1166,7 +1186,7 @@ static void ShowHelp()
      "    -d, --deinterlace       Deinterlace video with yadif/mcdeint filter\n"
      "          <YM:FD:MM:QP>     (default 0:-1:-1:1)\n"
      "           or\n"
-     "          <fast/slow/slower/slowest>\n"            
+     "          <fast/slow/slower>\n"            
      "    -7, --deblock           Deblock video with pp7 filter\n"
      "          <QP:M>            (default 0:2)\n"
      "    -8, --denoise           Denoise video with hqdn3d filter\n"
@@ -1186,12 +1206,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, aac+ac3 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 (" );
@@ -1245,11 +1268,11 @@ static void ShowPresets()
 
     printf("\n+ Film:  -e x264 -b 1800 -E ac3 -f mkv -m -p -2 -T -x ref=3:mixed-refs:bframes=16:bime:weightb:b-rdo:direct=auto:b-pyramid:me=umh:subme=7:analyse=all:8x8dct:trellis=1:no-fast-pskip\n");
 
-    printf("\n+ iPhone / iPod Touch:  -e x264b30 -b 960 -B 128 -R 48 -E faac -f mp4 -w 480 -m -x cabac=0:ref=1:analyse=all:me=umh:subme=6:no-fast-pskip=1:trellis=1\n");
+    printf("\n+ iPhone / iPod Touch:  -e x264 -b 960 -B 128 -R 48 -E faac -f mp4 -I -w 480 -m -x level=30:cabac=0:ref=1:analyse=all:me=umh:subme=6:no-fast-pskip=1:trellis=1\n");
 
-    printf("\n+ iPod High-Rez:  -e x264b30 -b 1500 -B 160 -R 48 -E faac -f mp4 -w 640 -m -x bframes=0:cabac=0:ref=1:vbv-maxrate=1500:vbv-bufsize=2000:analyse=all:me=umh:subme=6:no-fast-pskip=1\n");
+    printf("\n+ iPod High-Rez:  -e x264 -b 1500 -B 160 -R 48 -E faac -f mp4 -I -w 640 -m -x level=30:bframes=0:cabac=0:ref=1:vbv-maxrate=1500:vbv-bufsize=2000:analyse=all:me=umh:subme=6:no-fast-pskip=1\n");
 
-    printf("\n+ iPod Low-Rez:  -e x264b30 -b 700 -B 160 -R 48 -E faac -f mp4 -w 320 -m -x bframes=0:cabac=0:ref=1:vbv-maxrate=768:vbv-bufsize=2000:analyse=all:me=umh:subme=6:no-fast-pskip=1\n");
+    printf("\n+ iPod Low-Rez:  -e x264 -b 700 -B 160 -R 48 -E faac -f mp4 -I -w 320 -m -x level=30:bframes=0:cabac=0:ref=1:vbv-maxrate=768:vbv-bufsize=2000:analyse=all:me=umh:subme=6:no-fast-pskip=1\n");
 
     printf("\n+ Normal:  -e x264 -b 1500 -B 160 -R 48 -E faac -f mp4 -m -p -2 -T -x ref=2:bframes=2:subme=5:me=umh\n");
 
@@ -1468,15 +1491,11 @@ static int ParseOptions( int argc, char ** argv )
                     }
                     else if (!( strcmp( optarg, "slow" ) ))
                     {
-                        deinterlace_opt = "0";
+                        deinterlace_opt = "2";
                     }
                     else if (!( strcmp( optarg, "slower" ) ))
                     {
-                        deinterlace_opt = "2:-1:1";
-                    }
-                    else if (!( strcmp( optarg, "slowest" ) ))
-                    {
-                        deinterlace_opt = "1:-1:1";
+                        deinterlace_opt = "0";
                     }
                     else
                     {
@@ -1580,6 +1599,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 );