[x265] [PATCH] stats: remove --cu-stats option
Divya Manivannan
divya at multicorewareinc.com
Fri Jun 5 14:50:54 CEST 2015
# HG changeset patch
# User Divya Manivannan <divya at multicorewareinc.com>
# Date 1433508607 -19800
# Fri Jun 05 18:20:07 2015 +0530
# Node ID 2c806c77fd172f3d4bd5480e4b94ecf4b8601c3d
# Parent 1cb4b4945d2f983e24bf091c05d84d418bb41dda
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 1cb4b4945d2f -r 2c806c77fd17 doc/reST/cli.rst
--- a/doc/reST/cli.rst Thu Jun 04 10:27:29 2015 +0530
+++ b/doc/reST/cli.rst Fri Jun 05 18:20:07 2015 +0530
@@ -124,13 +124,6 @@
is more of a problem for P frames where some blocks are much more
expensive than others.
-
-.. option:: --cu-stats, --no-cu-stats
-
- Records statistics on how each CU was coded (split depths and other
- mode decisions) and reports those statistics at the end of the
- encode. Default disabled
-
.. option:: --ssim, --no-ssim
Calculate and report Structural Similarity values. It is
diff -r 1cb4b4945d2f -r 2c806c77fd17 source/CMakeLists.txt
--- a/source/CMakeLists.txt Thu Jun 04 10:27:29 2015 +0530
+++ b/source/CMakeLists.txt Fri Jun 05 18:20:07 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 1cb4b4945d2f -r 2c806c77fd17 source/encoder/encoder.cpp
--- a/source/encoder/encoder.cpp Thu Jun 04 10:27:29 2015 +0530
+++ b/source/encoder/encoder.cpp Fri Jun 05 18:20:07 2015 +0530
@@ -1048,143 +1048,6 @@
#undef ELAPSED_SEC
#undef ELAPSED_MSEC
#endif
-
- if (!m_param->bLogCuStats)
- return;
-
- for (int sliceType = 2; sliceType >= 0; sliceType--)
- {
- if (sliceType == P_SLICE && !m_analyzeP.m_numPics)
- continue;
- if (sliceType == B_SLICE && !m_analyzeB.m_numPics)
- continue;
-
- StatisticLog finalLog;
- for (uint32_t depth = 0; depth <= g_maxCUDepth; depth++)
- {
- int cuSize = g_maxCUSize >> depth;
-
- for (int i = 0; i < m_param->frameNumThreads; i++)
- {
- StatisticLog& enclog = m_frameEncoder[i]->m_sliceTypeLog[sliceType];
- if (!depth)
- finalLog.totalCu += enclog.totalCu;
- finalLog.cntIntra[depth] += enclog.cntIntra[depth];
- for (int m = 0; m < INTER_MODES; m++)
- {
- if (m < INTRA_MODES)
- finalLog.cuIntraDistribution[depth][m] += enclog.cuIntraDistribution[depth][m];
- finalLog.cuInterDistribution[depth][m] += enclog.cuInterDistribution[depth][m];
- }
-
- if (cuSize == 8 && m_sps.quadtreeTULog2MinSize < 3)
- finalLog.cntIntraNxN += enclog.cntIntraNxN;
- if (sliceType != I_SLICE)
- {
- finalLog.cntTotalCu[depth] += enclog.cntTotalCu[depth];
- finalLog.cntInter[depth] += enclog.cntInter[depth];
- finalLog.cntSkipCu[depth] += enclog.cntSkipCu[depth];
- }
- }
-
- uint64_t cntInter, cntSkipCu, cntIntra = 0, cntIntraNxN = 0, encCu = 0;
- uint64_t cuInterDistribution[INTER_MODES], cuIntraDistribution[INTRA_MODES];
-
- // check for 0/0, if true assign 0 else calculate percentage
- for (int n = 0; n < INTER_MODES; n++)
- {
- if (!finalLog.cntInter[depth])
- cuInterDistribution[n] = 0;
- else
- cuInterDistribution[n] = (finalLog.cuInterDistribution[depth][n] * 100) / finalLog.cntInter[depth];
-
- if (n < INTRA_MODES)
- {
- if (!finalLog.cntIntra[depth])
- {
- cntIntraNxN = 0;
- cuIntraDistribution[n] = 0;
- }
- else
- {
- cntIntraNxN = (finalLog.cntIntraNxN * 100) / finalLog.cntIntra[depth];
- cuIntraDistribution[n] = (finalLog.cuIntraDistribution[depth][n] * 100) / finalLog.cntIntra[depth];
- }
- }
- }
-
- if (!finalLog.totalCu)
- encCu = 0;
- else if (sliceType == I_SLICE)
- {
- cntIntra = (finalLog.cntIntra[depth] * 100) / finalLog.totalCu;
- cntIntraNxN = (finalLog.cntIntraNxN * 100) / finalLog.totalCu;
- }
- else
- encCu = ((finalLog.cntIntra[depth] + finalLog.cntInter[depth]) * 100) / finalLog.totalCu;
-
- if (sliceType == I_SLICE)
- {
- cntInter = 0;
- cntSkipCu = 0;
- }
- else if (!finalLog.cntTotalCu[depth])
- {
- cntInter = 0;
- cntIntra = 0;
- cntSkipCu = 0;
- }
- else
- {
- cntInter = (finalLog.cntInter[depth] * 100) / finalLog.cntTotalCu[depth];
- cntIntra = (finalLog.cntIntra[depth] * 100) / finalLog.cntTotalCu[depth];
- cntSkipCu = (finalLog.cntSkipCu[depth] * 100) / finalLog.cntTotalCu[depth];
- }
-
- // print statistics
- char stats[256] = { 0 };
- int len = 0;
- if (sliceType != I_SLICE)
- len += sprintf(stats + len, " EncCU "X265_LL "%% Merge "X265_LL "%%", encCu, cntSkipCu);
-
- if (cntInter)
- {
- len += sprintf(stats + len, " Inter "X265_LL "%%", cntInter);
- if (m_param->bEnableAMP)
- len += sprintf(stats + len, "(%dx%d "X265_LL "%% %dx%d "X265_LL "%% %dx%d "X265_LL "%% AMP "X265_LL "%%)",
- cuSize, cuSize, cuInterDistribution[0],
- cuSize / 2, cuSize, cuInterDistribution[2],
- cuSize, cuSize / 2, cuInterDistribution[1],
- cuInterDistribution[3]);
- else if (m_param->bEnableRectInter)
- len += sprintf(stats + len, "(%dx%d "X265_LL "%% %dx%d "X265_LL "%% %dx%d "X265_LL "%%)",
- cuSize, cuSize, cuInterDistribution[0],
- cuSize / 2, cuSize, cuInterDistribution[2],
- cuSize, cuSize / 2, cuInterDistribution[1]);
- }
- if (cntIntra)
- {
- len += sprintf(stats + len, " Intra "X265_LL "%%(DC "X265_LL "%% P "X265_LL "%% Ang "X265_LL "%%",
- cntIntra, cuIntraDistribution[0],
- cuIntraDistribution[1], cuIntraDistribution[2]);
- if (sliceType != I_SLICE)
- {
- if (cuSize == 8 && m_sps.quadtreeTULog2MinSize < 3)
- len += sprintf(stats + len, " %dx%d "X265_LL "%%", cuSize / 2, cuSize / 2, cntIntraNxN);
- }
-
- len += sprintf(stats + len, ")");
- if (sliceType == I_SLICE)
- {
- if (cuSize == 8 && m_sps.quadtreeTULog2MinSize < 3)
- len += sprintf(stats + len, " %dx%d: "X265_LL "%%", cuSize / 2, cuSize / 2, cntIntraNxN);
- }
- }
- const char slicechars[] = "BPI";
- if (stats[0])
- x265_log(m_param, X265_LOG_INFO, "%c%-2d:%s\n", slicechars[sliceType], cuSize, stats);
- }
- }
}
void Encoder::fetchStats(x265_stats *stats, size_t statsSizeBytes)
@@ -1902,6 +1765,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 option\n");
}
void Encoder::allocAnalysis(x265_analysis_data* analysis)
diff -r 1cb4b4945d2f -r 2c806c77fd17 source/encoder/frameencoder.cpp
--- a/source/encoder/frameencoder.cpp Thu Jun 04 10:27:29 2015 +0530
+++ b/source/encoder/frameencoder.cpp Fri Jun 05 18:20:07 2015 +0530
@@ -904,7 +904,7 @@
// Completed CU processing
curRow.completed++;
- if (m_param->bLogCuStats || m_param->rc.bStatWrite)
+ if (m_param->rc.bStatWrite)
curEncData.m_rowStat[row].sumQpAq += collectCTUStatistics(*ctu, qTreeInterCnt, qTreeIntraCnt, qTreeSkipCnt);
else if (m_param->rc.aqMode)
curEncData.m_rowStat[row].sumQpAq += calcCTUQP(*ctu);
diff -r 1cb4b4945d2f -r 2c806c77fd17 source/x265cli.h
--- a/source/x265cli.h Thu Jun 04 10:27:29 2015 +0530
+++ b/source/x265cli.h Fri Jun 05 18:20:07 2015 +0530
@@ -247,7 +247,6 @@
H0("-D/--output-depth 8|10 Output bit depth (also internal bit depth). Default %d\n", param->internalBitDepth);
H0(" --log-level <string> Logging level: none error warning info debug full. Default %s\n", x265::logLevelNames[param->logLevel + 1]);
H0(" --no-progress Disable CLI progress reports\n");
- H0(" --[no-]cu-stats Enable logging stats about distribution of cu across all modes. Default %s\n",OPT(param->bLogCuStats));
H1(" --csv <filename> Comma separated log file, log level >= 3 frame log, else one line per run\n");
H0("\nInput Options:\n");
H0(" --input <filename> Raw YUV or Y4M input file name. `-` for stdin\n");
More information about the x265-devel
mailing list