<div dir="ltr"><div class="gmail_extra"><br><div class="gmail_quote">On Mon, May 22, 2017 at 12:08 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 1495434924 -19800<br>
# Mon May 22 12:05:24 2017 +0530<br>
# Node ID 355cf3582263acc9bbcb8faa24f1df<wbr>a009f41de3<br>
# Parent b4149e898b508ae540f1d90bc3c561<wbr>32a94e3e8f<br>
add condition to handle i400<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 b4149e898b50 -r 355cf3582263 doc/reST/cli.rst<br>
--- a/doc/reST/cli.rst Fri May 19 17:50:52 2017 +0530<br>
+++ b/doc/reST/cli.rst Mon May 22 12:05:24 2017 +0530<br>
@@ -93,7 +93,7 @@<br>
**Distortion** Average luma and chroma distortion. Calculated as<br>
SSE is done on fenc and recon(after quantization).<br>
<br>
- **Psy Energy ** Average psy energy calculated as the sum of absolute<br>
+ **Psy Energy** Average psy energy calculated as the sum of absolute<br>
difference between source and recon energy. Energy is measured by sa8d<br>
minus SAD.<br>
<br>
diff -r b4149e898b50 -r 355cf3582263 source/common/picyuv.cpp<br>
--- a/source/common/picyuv.cpp Fri May 19 17:50:52 2017 +0530<br>
+++ b/source/common/picyuv.cpp Mon May 22 12:05:24 2017 +0530<br>
@@ -354,24 +354,27 @@<br>
}<br>
m_avgLumaLevel = (double)lumaSum / (m_picHeight * m_picWidth);<br>
<br>
- for (int r = 0; r < height >> m_vChromaShift; r++)<br>
+ if (param.internalCsp != X265_CSP_I400)<br>
{<br>
- for (int c = 0; c < width >> m_hChromaShift; c++)<br>
+ for (int r = 0; r < height >> m_vChromaShift; r++)<br>
{<br>
- m_maxChromaULevel = X265_MAX(uPic[c], m_maxChromaULevel);<br>
- m_minChromaULevel = X265_MIN(uPic[c], m_minChromaULevel);<br>
- cbSum += uPic[c];<br>
+ for (int c = 0; c < width >> m_hChromaShift; c++)<br>
+ {<br>
+ m_maxChromaULevel = X265_MAX(uPic[c], m_maxChromaULevel);<br>
+ m_minChromaULevel = X265_MIN(uPic[c], m_minChromaULevel);<br>
+ cbSum += uPic[c];<br>
<br>
- m_maxChromaVLevel = X265_MAX(vPic[c], m_maxChromaVLevel);<br>
- m_minChromaVLevel = X265_MIN(vPic[c], m_minChromaVLevel);<br>
- crSum += vPic[c];<br>
+ m_maxChromaVLevel = X265_MAX(vPic[c], m_maxChromaVLevel);<br>
+ m_minChromaVLevel = X265_MIN(vPic[c], m_minChromaVLevel);<br>
+ crSum += vPic[c];<br>
+ }<br>
+<br>
+ uPic += m_strideC;<br>
+ vPic += m_strideC;<br>
}<br>
-<br>
- uPic += m_strideC;<br>
- vPic += m_strideC;<br>
+ m_avgChromaULevel = (double)cbSum / ((height >> m_vChromaShift) * (width >> m_hChromaShift));<br>
+ m_avgChromaVLevel = (double)crSum / ((height >> m_vChromaShift) * (width >> m_hChromaShift));<br>
}<br>
- m_avgChromaULevel = (double)cbSum / ((height >> m_vChromaShift) * (width >> m_hChromaShift));<br>
- m_avgChromaVLevel = (double)crSum / ((height >> m_vChromaShift) * (width >> m_hChromaShift));<br>
}<br>
<br>
#if HIGH_BIT_DEPTH<br>
diff -r b4149e898b50 -r 355cf3582263 source/x265-extras.cpp<br>
--- a/source/x265-extras.cpp Fri May 19 17:50:52 2017 +0530<br>
+++ b/source/x265-extras.cpp Mon May 22 12:05:24 2017 +0530<br>
@@ -112,7 +112,9 @@<br>
}<br>
fprintf(csvfp, ", Avg Luma Distortion, Avg Chroma Distortion, Avg psyEnergy, Avg Residual Energy,"<br>
" Min Luma Level, Max Luma Level, Avg Luma Level");<br>
- fprintf(csvfp, ", Min Cb Level, Max Cb Level, Avg Cb Level, Min Cr Level, Max Cr Level, Avg Cr Level");<br>
+<br>
+ if (param.internalCsp != X265_CSP_I400)<br>
+ fprintf(csvfp, ", Min Cb Level, Max Cb Level, Avg Cb Level, Min Cr Level, Max Cr Level, Avg Cr Level");<br>
<br>
if (level >= 2)<br>
{<br>
@@ -215,8 +217,12 @@<br>
frameStats->avgResEnergy);<br>
<br>
fprintf(csvfp, ", %d, %d, %.2lf", frameStats->minLumaLevel, frameStats->maxLumaLevel, frameStats->avgLumaLevel);<br>
- fprintf(csvfp, ", %d, %d, %.2lf", frameStats->minChromaULevel, frameStats->maxChromaULevel, frameStats->avgChromaULevel);<br>
- fprintf(csvfp, ", %d, %d, %.2lf", frameStats->minChromaVLevel, frameStats->maxChromaVLevel, frameStats->avgChromaVLevel);<br>
+<br>
+ if (param.internalCsp != X265_CSP_I400)<br>
+ {<br>
+ fprintf(csvfp, ", %d, %d, %.2lf", frameStats->minChromaULevel, frameStats->maxChromaULevel, frameStats->avgChromaULevel);<br>
+ fprintf(csvfp, ", %d, %d, %.2lf", frameStats->minChromaVLevel, frameStats->maxChromaVLevel, frameStats->avgChromaVLevel);<br>
+ }<br>
<br>
if (level >= 2)<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>