<div dir="ltr"><div class="gmail_extra"><br><div class="gmail_quote">On Tue, Jun 27, 2017 at 6:26 PM, <span dir="ltr"><<a href="mailto:bhavna@multicorewareinc.com" target="_blank">bhavna@multicorewareinc.com</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"># HG changeset patch<br>
# User Bhavna Hariharan <<a href="mailto:bhavna@multicorewareinc.com">bhavna@multicorewareinc.com</a>><br>
# Date 1498561871 -19800<br>
# Tue Jun 27 16:41:11 2017 +0530<br>
# Node ID fa076d29d6191699e314484a94dcae<wbr>472e9c102a<br>
# Parent 81037290f79061cadb55bf59708e83<wbr>fbb6069193<br>
move rc stats out of csv-log-level<br></blockquote><div><br></div><div>Pushed to default branch</div><div> </div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
<br>
diff -r 81037290f790 -r fa076d29d619 source/common/picyuv.cpp<br>
--- a/source/common/picyuv.cpp Mon Jun 26 14:51:00 2017 +0530<br>
+++ b/source/common/picyuv.cpp Tue Jun 27 16:41:11 2017 +0530<br>
@@ -340,24 +340,24 @@<br>
pixel *U = m_picOrg[1];<br>
pixel *V = m_picOrg[2];<br>
<br>
+ pixel *yPic = m_picOrg[0];<br>
+ pixel *uPic = m_picOrg[1];<br>
+ pixel *vPic = m_picOrg[2];<br>
+<br>
+ for (int r = 0; r < height; r++)<br>
+ {<br>
+ for (int c = 0; c < width; c++)<br>
+ {<br>
+ m_maxLumaLevel = X265_MAX(yPic[c], m_maxLumaLevel);<br>
+ m_minLumaLevel = X265_MIN(yPic[c], m_minLumaLevel);<br>
+ lumaSum += yPic[c];<br>
+ }<br>
+ yPic += m_stride;<br>
+ }<br>
+ m_avgLumaLevel = (double)lumaSum / (m_picHeight * m_picWidth);<br>
+<br>
if (param.csvLogLevel >= 2)<br>
{<br>
- pixel *yPic = m_picOrg[0];<br>
- pixel *uPic = m_picOrg[1];<br>
- pixel *vPic = m_picOrg[2];<br>
-<br>
- for (int r = 0; r < height; r++)<br>
- {<br>
- for (int c = 0; c < width; c++)<br>
- {<br>
- m_maxLumaLevel = X265_MAX(yPic[c], m_maxLumaLevel);<br>
- m_minLumaLevel = X265_MIN(yPic[c], m_minLumaLevel);<br>
- lumaSum += yPic[c];<br>
- }<br>
- yPic += m_stride;<br>
- }<br>
- m_avgLumaLevel = (double)lumaSum / (m_picHeight * m_picWidth);<br>
-<br>
if (param.internalCsp != X265_CSP_I400)<br>
{<br>
for (int r = 0; r < height >> m_vChromaShift; r++)<br>
diff -r 81037290f790 -r fa076d29d619 source/encoder/encoder.cpp<br>
--- a/source/encoder/encoder.cpp Mon Jun 26 14:51:00 2017 +0530<br>
+++ b/source/encoder/encoder.cpp Tue Jun 27 16:41:11 2017 +0530<br>
@@ -1742,6 +1742,10 @@<br>
<br>
#define ELAPSED_MSEC(start, end) (((double)(end) - (start)) / 1000)<br>
<br>
+ frameStats->maxLumaLevel = curFrame->m_fencPic->m_<wbr>maxLumaLevel;<br>
+ frameStats->minLumaLevel = curFrame->m_fencPic->m_<wbr>minLumaLevel;<br>
+ frameStats->avgLumaLevel = curFrame->m_fencPic->m_<wbr>avgLumaLevel;<br>
+<br>
if (m_param->csvLogLevel >= 2)<br>
{<br>
frameStats->decideWaitTime = ELAPSED_MSEC(0, curEncoder->m_<wbr>slicetypeWaitTime);<br>
@@ -1761,9 +1765,6 @@<br>
frameStats->avgLumaDistortion = curFrame->m_encData->m_<wbr>frameStats.avgLumaDistortion;<br>
frameStats->avgPsyEnergy = curFrame->m_encData->m_<wbr>frameStats.avgPsyEnergy;<br>
frameStats->avgResEnergy = curFrame->m_encData->m_<wbr>frameStats.avgResEnergy;<br>
- frameStats->avgLumaLevel = curFrame->m_fencPic->m_<wbr>avgLumaLevel;<br>
- frameStats->maxLumaLevel = curFrame->m_fencPic->m_<wbr>maxLumaLevel;<br>
- frameStats->minLumaLevel = curFrame->m_fencPic->m_<wbr>minLumaLevel;<br>
<br>
frameStats->maxChromaULevel = curFrame->m_fencPic->m_<wbr>maxChromaULevel;<br>
frameStats->minChromaULevel = curFrame->m_fencPic->m_<wbr>minChromaULevel;<br>
diff -r 81037290f790 -r fa076d29d619 source/encoder/frameencoder.<wbr>cpp<br>
--- a/source/encoder/frameencoder.<wbr>cpp Mon Jun 26 14:51:00 2017 +0530<br>
+++ b/source/encoder/frameencoder.<wbr>cpp Tue Jun 27 16:41:11 2017 +0530<br>
@@ -1798,7 +1798,7 @@<br>
totQP += ctu.m_qp[absPartIdx] * (ctu.m_numPartitions >> (depth * 2));<br>
}<br>
<br>
- if (m_param->csvLogLevel >= 1)<br>
+ if (m_param->csvLogLevel >= 1 || m_param->rc.bStatWrite)<br>
{<br>
if (ctu.m_slice->m_sliceType == I_SLICE)<br>
{<br>
______________________________<wbr>_________________<br>
x265-devel mailing list<br>
<a href="mailto:x265-devel@videolan.org">x265-devel@videolan.org</a><br>
<a href="https://mailman.videolan.org/listinfo/x265-devel" rel="noreferrer" target="_blank">https://mailman.videolan.org/<wbr>listinfo/x265-devel</a><br>
</blockquote></div><br></div></div>