[x265] [PATCH] stats: remove --cu-stats option

[Divya Manivannan]

# HG changeset patch
# User Divya Manivannan <divya at multicorewareinc.com>
# Date 1432809496 -19800
#      Thu May 28 16:08:16 2015 +0530
# Node ID 43b26edba7aed482297bcd27cfbe9266eb2fd669
# Parent  1f697f9a4d5d9f825ffe26ef93f339fcf6de7be1
stats: remove --cu-stats option

--cu-stats option collected data based on slicetype. This is removed and those data will be collected based on frame.
A warning message is displayed when --cu-stats option is given by the user.

diff -r 1f697f9a4d5d -r 43b26edba7ae source/CMakeLists.txt
--- a/source/CMakeLists.txt	Wed May 27 18:09:06 2015 +0530
+++ b/source/CMakeLists.txt	Thu May 28 16:08:16 2015 +0530
@@ -30,7 +30,7 @@
 mark_as_advanced(FPROFILE_USE FPROFILE_GENERATE NATIVE_BUILD)
 
 # X265_BUILD must be incremented each time the public API is changed
-set(X265_BUILD 60)
+set(X265_BUILD 61)
 configure_file("${PROJECT_SOURCE_DIR}/x265.def.in"
                "${PROJECT_BINARY_DIR}/x265.def")
 configure_file("${PROJECT_SOURCE_DIR}/x265_config.h.in"
diff -r 1f697f9a4d5d -r 43b26edba7ae source/common/param.cpp
--- a/source/common/param.cpp	Wed May 27 18:09:06 2015 +0530
+++ b/source/common/param.cpp	Thu May 28 16:08:16 2015 +0530
@@ -103,6 +103,7 @@
     param->logLevel = X265_LOG_INFO;
     param->csvfn = NULL;
     param->rc.lambdaFileName = NULL;
+    param->bLogCuStats = 0;
     param->decodedPictureHashSEI = 0;
 
     /* Quality Measurement Metrics */
@@ -580,6 +581,7 @@
             p->logLevel = parseName(value, logLevelNames, bError) - 1;
         }
     }
+    OPT("cu-stats") p->bLogCuStats = atobool(value);
     OPT("annexb") p->bAnnexB = atobool(value);
     OPT("repeat-headers") p->bRepeatHeaders = atobool(value);
     OPT("wpp") p->bEnableWavefront = atobool(value);
diff -r 1f697f9a4d5d -r 43b26edba7ae source/encoder/encoder.cpp
--- a/source/encoder/encoder.cpp	Wed May 27 18:09:06 2015 +0530
+++ b/source/encoder/encoder.cpp	Thu May 28 16:08:16 2015 +0530
@@ -1757,6 +1757,9 @@
     }
     else
         m_param->rc.qgSize = p->maxCUSize;
+
+    if (p->bLogCuStats)
+        x265_log(p, X265_LOG_WARNING, "--cu-stats option is replaced by --log-level 4 option\n");
 }
 
 void Encoder::allocAnalysis(x265_analysis_data* analysis)
diff -r 1f697f9a4d5d -r 43b26edba7ae source/x265.h
--- a/source/x265.h	Wed May 27 18:09:06 2015 +0530
+++ b/source/x265.h	Thu May 28 16:08:16 2015 +0530
@@ -439,6 +439,10 @@
 
     /*== Logging Features ==*/
 
+    /* Enable analysis and logging distribution of CUs encoded across various
+     * modes during mode decision. Default disabled */
+    int       bLogCuStats;
+
     /* Enable the measurement and reporting of PSNR. Default is enabled */
     int       bEnablePsnr;
 
diff -r 1f697f9a4d5d -r 43b26edba7ae source/x265cli.h
--- a/source/x265cli.h	Wed May 27 18:09:06 2015 +0530
+++ b/source/x265cli.h	Thu May 28 16:08:16 2015 +0530
@@ -54,6 +54,8 @@
     { "allow-non-conformance",no_argument, NULL, 0 },
     { "no-allow-non-conformance",no_argument, NULL, 0 },
     { "csv",            required_argument, NULL, 0 },
+    { "no-cu-stats",          no_argument, NULL, 0 },
+    { "cu-stats",             no_argument, NULL, 0 },
     { "y4m",                  no_argument, NULL, 0 },
     { "no-progress",          no_argument, NULL, 0 },
     { "output",         required_argument, NULL, 'o' },