X-Git-Url: http://git.osdn.jp/view?a=blobdiff_plain;ds=sidebyside;f=test%2Ftest.c;h=c75482f0cbaffc5b663ad16d9c46df776ad6f54e;hb=91808a1f62713db501fada2de3ba4fcabfff0b7a;hp=81543c3089885b9bec02800b062b95d6a64c5513;hpb=0f7cba7abcdf2d40f125f734839dfdfaa264c70d;p=handbrake-jp%2Fhandbrake-jp-git.git

diff --git a/test/test.c b/test/test.c
index 81543c30..c75482f0 100644
--- a/test/test.c
+++ b/test/test.c
@@ -30,9 +30,9 @@
 #endif
 
 /* Options */
-static int    debug       = HB_DEBUG_NONE;
+static int    debug       = HB_DEBUG_ALL;
 static int    update      = 0;
-static int    dvdnav      = 0;
+static int    dvdnav      = 1;
 static char * input       = NULL;
 static char * output      = NULL;
 static char * format      = NULL;
@@ -99,7 +99,6 @@ static int    chapter_start = 0;
 static int    chapter_end   = 0;
 static int    chapter_markers = 0;
 static char * marker_file   = NULL;
-static int	  crf			= 1;
 static char	  *x264opts		= NULL;
 static char	  *x264opts2 	= NULL;
 static int	  maxHeight		= 0;
@@ -591,7 +590,6 @@ static int HandleEvents( hb_handle_t * h )
                     }
                     vcodec = HB_VCODEC_X264;
                     job->vquality = 20.0;
-                    job->crf = 1;
                     if( !atracks )
                     {
                         atracks = strdup("1,1");
@@ -674,7 +672,6 @@ static int HandleEvents( hb_handle_t * h )
                     }
                     vcodec = HB_VCODEC_X264;
                     job->vquality = 20.0;
-                    job->crf = 1;
                     if( !atracks )
                     {
                         atracks = strdup("1");
@@ -716,7 +713,6 @@ static int HandleEvents( hb_handle_t * h )
                     job->largeFileSize = 1;
                     vcodec = HB_VCODEC_X264;
                     job->vquality = 20.0;
-                    job->crf = 1;
                     if( !atracks )
                     {
                         atracks = strdup("1,1");
@@ -758,7 +754,6 @@ static int HandleEvents( hb_handle_t * h )
                     }
                     vcodec = HB_VCODEC_X264;
                     job->vquality = 20.0;
-                    job->crf = 1;
                     if( !atracks )
                     {
                         atracks = strdup("1");
@@ -799,7 +794,6 @@ static int HandleEvents( hb_handle_t * h )
                     }
                     vcodec = HB_VCODEC_X264;
                     job->vquality = 20.0;
-                    job->crf = 1;
                     if( !atracks )
                     {
                         atracks = strdup("1,1");
@@ -1937,11 +1931,6 @@ static int HandleEvents( hb_handle_t * h )
 
             job->file = strdup( output );
 
-            if( crf )
-            {
-                job->crf = 1;
-            }
-            
             if( color_matrix )
             {
                 job->color_matrix = color_matrix;
@@ -2169,7 +2158,8 @@ static void ShowHelp()
     "                            if the preset name has spaces, surround it with\n"
     "                            double quotation marks\n"
     "    -z, --preset-list       See a list of available built-in presets\n"
-    "        --dvdnav            Use dvdnav (Experimental)\n"
+    "        --no-dvdnav         Do not use dvdnav for reading DVDs\n"
+    "                            (experimental, enabled by default for testing)\n"
     "\n"
 
     "### Source Options-----------------------------------------------------------\n\n"
@@ -2208,7 +2198,6 @@ static void ShowHelp()
     "                            same style as mencoder:\n"
     "                            option1=value1:option2=value2\n"
     "    -q, --quality <float>   Set video quality (0.0..1.0)\n"
-    "    -Q, --cqp               Use with -q for CQP instead of CRF\n"
     "    -S, --size <MB>         Set target size\n"
     "    -b, --vb <kb/s>         Set video bitrate (default: 1000)\n"
     "    -2, --two-pass          Use two-pass mode\n"
@@ -2317,12 +2306,13 @@ static void ShowHelp()
      "           or\n"
      "          <fast/slow/slower>\n"
      "    -5, --decomb            Selectively deinterlaces when it detects combing\n"
-     "          <MO:ME:MT:ST:BT:BX:BY>     (default: 1:2:6:9:80:16:16)\n"
+     "          <MO:ME:MT:ST:BT:BX:BY:FD:MG:VA:LA:DI:ER:NO:MD:PP>\n"
+     "          (default: 7:2:6:9:80:16:16:10:20:20:4:2:50:24:-1)\n"
      "    -9, --detelecine        Detelecine (ivtc) video with pullup filter\n"
      "                            Note: this filter drops duplicate frames to\n"
      "                            restore the pre-telecine framerate, unless you\n"
      "                            specify a constant framerate (--rate 29.97)\n"
-     "          <L:R:T:B:SB:MP>   (default 1:1:4:4:0:0)\n"
+     "          <L:R:T:B:SB:MP:FD>   (default 1:1:4:4:0:0:-1)\n"
      "    -8, --denoise           Denoise video with hqdn3d filter\n"
      "          <SL:SC:TL:TC>     (default 4:3:6:4.5)\n"
      "           or\n"
@@ -2510,7 +2500,7 @@ static int ParseOptions( int argc, char ** argv )
             { "update",      no_argument,       NULL,    'u' },
             { "verbose",     optional_argument, NULL,    'v' },
             { "cpu",         required_argument, NULL,    'C' },
-            { "dvdnav",      no_argument,       NULL,    DVDNAV },
+            { "no-dvdnav",      no_argument,       NULL,    DVDNAV },
 
             { "format",      required_argument, NULL,    'f' },
             { "input",       required_argument, NULL,    'i' },
@@ -2565,7 +2555,6 @@ static int ParseOptions( int argc, char ** argv )
             { "ab",          required_argument, NULL,    'B' },
             { "rate",        required_argument, NULL,    'r' },
             { "arate",       required_argument, NULL,    'R' },
-            { "cqp",         no_argument,       NULL,    'Q' },
             { "x264opts",    required_argument, NULL,    'x' },
             { "turbo",       no_argument,       NULL,    'T' },
             { "maxHeight",   required_argument, NULL,    'Y' },
@@ -2588,7 +2577,7 @@ static int ParseOptions( int argc, char ** argv )
         int c;
 
 		c = getopt_long( argc, argv,
-						 "hv::uC:f:4i:Io:t:Lc:m::M:a:A:6:s:UF::N:e:E:2dD:7895gOw:l:n:b:q:S:B:r:R:Qx:TY:X:Z:z",
+						 "hv::uC:f:4i:Io:t:Lc:m::M:a:A:6:s:UF::N:e:E:2dD:7895gOw:l:n:b:q:S:B:r:R:x:TY:X:Z:z",
                          long_options, &option_index );
         if( c < 0 )
         {
@@ -2628,7 +2617,7 @@ static int ParseOptions( int argc, char ** argv )
                 ShowPresets();
                 exit ( 0 );
             case DVDNAV:
-                dvdnav = 1;
+                dvdnav = 0;
                 break;
 
             case 'f':
@@ -2963,9 +2952,6 @@ static int ParseOptions( int argc, char ** argv )
                     abitrates = strdup( optarg );
                 }
                 break;
-            case 'Q':
-                crf = 0;
-                break;
             case 'x':
                 x264opts = strdup( optarg );
                 break;