[x265] [PATCH 3 of 3 REVIEW] CLI: add new option ctu-min(minimum CU size)

[santhoshini at multicorewareinc.com]

# HG changeset patch
# User Santhoshini Sekar<santhoshini at multicorewareinc.com>
# Date 1423816031 -19800
#      Fri Feb 13 13:57:11 2015 +0530
# Node ID 1b9aabcb173803c3dcd0142990a9b8147fa88aa3
# Parent  047eba9f4f6208bf2278bd686d2b8e5277f83526
CLI: add new option ctu-min(minimum CU size)

diff -r 047eba9f4f62 -r 1b9aabcb1738 doc/reST/cli.rst
--- a/doc/reST/cli.rst	Fri Feb 13 13:55:57 2015 +0530
+++ b/doc/reST/cli.rst	Fri Feb 13 13:57:11 2015 +0530
@@ -477,6 +477,10 @@
 	and less frame parallelism as well. Because of this the faster
 	presets use a CU size of 32. Default: 64
 
+.. option:: --ctu-min, <64|32|16|8>
+
+	Minimum CU size (width and height). Default: 8
+
 .. option:: --rect, --no-rect
 
 	Enable analysis of rectangular motion partitions Nx2N and 2NxN
diff -r 047eba9f4f62 -r 1b9aabcb1738 source/CMakeLists.txt
--- a/source/CMakeLists.txt	Fri Feb 13 13:55:57 2015 +0530
+++ b/source/CMakeLists.txt	Fri Feb 13 13:57:11 2015 +0530
@@ -21,7 +21,7 @@
 include(CheckCXXCompilerFlag)
 
 # X265_BUILD must be incremented each time the public API is changed
-set(X265_BUILD 45)
+set(X265_BUILD 46)
 configure_file("${PROJECT_SOURCE_DIR}/x265.def.in"
                "${PROJECT_BINARY_DIR}/x265.def")
 configure_file("${PROJECT_SOURCE_DIR}/x265_config.h.in"
diff -r 047eba9f4f62 -r 1b9aabcb1738 source/common/param.cpp
--- a/source/common/param.cpp	Fri Feb 13 13:55:57 2015 +0530
+++ b/source/common/param.cpp	Fri Feb 13 13:57:11 2015 +0530
@@ -571,6 +571,7 @@
     OPT("repeat-headers") p->bRepeatHeaders = atobool(value);
     OPT("wpp") p->bEnableWavefront = atobool(value);
     OPT("ctu") p->maxCUSize = (uint32_t)atoi(value);
+    OPT("ctu-min") p->minCUSize = (uint32_t)atoi(value);
     OPT("tu-intra-depth") p->tuQTMaxIntraDepth = (uint32_t)atoi(value);
     OPT("tu-inter-depth") p->tuQTMaxInterDepth = (uint32_t)atoi(value);
     OPT("max-tu-size") p->maxTUSize = (uint32_t)atoi(value);
@@ -1297,6 +1298,7 @@
     s += sprintf(s, " bitdepth=%d", p->internalBitDepth);
     BOOL(p->bEnableWavefront, "wpp");
     s += sprintf(s, " ctu=%d", p->maxCUSize);
+    s += sprintf(s, " ctu-min=%d", p->minCUSize);
     s += sprintf(s, " max-tu-size=%d", p->maxTUSize);
     s += sprintf(s, " tu-intra-depth=%d", p->tuQTMaxIntraDepth);
     s += sprintf(s, " tu-inter-depth=%d", p->tuQTMaxInterDepth);
diff -r 047eba9f4f62 -r 1b9aabcb1738 source/x265cli.h
--- a/source/x265cli.h	Fri Feb 13 13:55:57 2015 +0530
+++ b/source/x265cli.h	Fri Feb 13 13:57:11 2015 +0530
@@ -71,6 +71,7 @@
     { "no-wpp",               no_argument, NULL, 0 },
     { "wpp",                  no_argument, NULL, 0 },
     { "ctu",            required_argument, NULL, 's' },
+    { "ctu-min",       required_argument, NULL, 's' },
     { "max-tu-size",    required_argument, NULL, 's' },
     { "tu-intra-depth", required_argument, NULL, 0 },
     { "tu-inter-depth", required_argument, NULL, 0 },
@@ -265,6 +266,7 @@
     H0("                                 psnr, ssim, grain, zerolatency, fastdecode\n");
     H0("\nQuad-Tree size and depth:\n");
     H0("-s/--ctu <64|32|16>              Maximum CU size (WxH). Default %d\n", param->maxCUSize);
+    H0("   --ctu-min <64|32|16|8>        Minimum CU size (WxH). Default %d\n", param->minCUSize);
     H0("   --max-tu-size <32|16|8|4>     Maximum TU size (WxH). Default %d\n", param->maxTUSize);
     H0("   --tu-intra-depth <integer>    Max TU recursive depth for intra CUs. Default %d\n", param->tuQTMaxIntraDepth);
     H0("   --tu-inter-depth <integer>    Max TU recursive depth for inter CUs. Default %d\n", param->tuQTMaxInterDepth);