<div dir="ltr"><br><div class="gmail_extra"><br><br><div class="gmail_quote">On Fri, Feb 14, 2014 at 4:59 AM, <span dir="ltr"><<a href="mailto:deepthi@multicorewareinc.com" target="_blank">deepthi@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 Deepthi Nandakumar <<a href="mailto:deepthi@multicorewareinc.com">deepthi@multicorewareinc.com</a>><br>
# Date 1392372120 -19800<br>
# Node ID ed28c1935087ddf2c7aae6c5b491592fa6162d7e<br>
# Parent 6ac5fa8bf0f9d8994c69978f7f46a50d666c79ac<br>
ratecontrol: cleanup, remove sliceQPBase.<br>
<br>
Always a duplicate of sliceQp.<br>
<br>
diff -r 6ac5fa8bf0f9 -r ed28c1935087 source/Lib/TLibCommon/TComSlice.cpp<br>
--- a/source/Lib/TLibCommon/TComSlice.cpp Fri Feb 14 15:04:23 2014 +0530<br>
+++ b/source/Lib/TLibCommon/TComSlice.cpp Fri Feb 14 15:32:00 2014 +0530<br>
@@ -54,7 +54,6 @@<br>
, m_sliceType(I_SLICE)<br>
, m_sliceQp(0)<br>
, m_dependentSliceSegmentFlag(false)<br>
- , m_sliceQpBase(0)<br>
, m_deblockingFilterDisable(false)<br>
, m_deblockingFilterOverrideFlag(false)<br>
, m_deblockingFilterBetaOffsetDiv2(0)<br>
diff -r 6ac5fa8bf0f9 -r ed28c1935087 source/Lib/TLibCommon/TComSlice.h<br>
--- a/source/Lib/TLibCommon/TComSlice.h Fri Feb 14 15:04:23 2014 +0530<br>
+++ b/source/Lib/TLibCommon/TComSlice.h Fri Feb 14 15:32:00 2014 +0530<br>
@@ -1303,7 +1303,6 @@<br>
SliceType m_sliceType;<br>
int m_sliceQp;<br>
bool m_dependentSliceSegmentFlag;<br>
- int m_sliceQpBase;<br>
bool m_deblockingFilterDisable;<br>
bool m_deblockingFilterOverrideFlag; //< offsets for deblocking filter inherit from PPS<br>
int m_deblockingFilterBetaOffsetDiv2; //< beta offset for deblocking filter<br>
@@ -1414,9 +1413,7 @@<br>
bool getDependentSliceSegmentFlag() const { return m_dependentSliceSegmentFlag; }<br>
<br>
void setDependentSliceSegmentFlag(bool val) { m_dependentSliceSegmentFlag = val; }<br>
-<br>
- int getSliceQpBase() { return m_sliceQpBase; }<br>
-<br>
+<br>
int getSliceQpDelta() { return m_sliceQpDelta; }<br>
<br>
int getSliceQpDeltaCb() { return m_sliceQpDeltaCb; }<br>
@@ -1476,8 +1473,6 @@<br>
<br>
void setSliceQp(int i) { m_sliceQp = i; }<br>
<br>
- void setSliceQpBase(int i) { m_sliceQpBase = i; }<br>
-<br>
void setSliceQpDelta(int i) { m_sliceQpDelta = i; }<br>
<br>
void setSliceQpDeltaCb(int i) { m_sliceQpDeltaCb = i; }<br>
diff -r 6ac5fa8bf0f9 -r ed28c1935087 source/encoder/encoder.cpp<br>
--- a/source/encoder/encoder.cpp Fri Feb 14 15:04:23 2014 +0530<br>
+++ b/source/encoder/encoder.cpp Fri Feb 14 15:32:00 2014 +0530<br>
@@ -831,11 +831,10 @@<br>
{<br>
char c = (slice->isIntra() ? 'I' : slice->isInterP() ? 'P' : 'B');<br>
int poc = slice->getPOC();<br>
- int QP_Base = slice->getSliceQpBase();<br>
int QP = slice->getSliceQp();<br>
if (!slice->isReferenced())<br>
c += 32; // lower case if unreferenced<br>
- fprintf(stderr, "\rPOC %4d ( %c-SLICE, nQP %d QP %d) %10d bits", poc, c, QP_Base, QP, bits);<br>
+ fprintf(stderr, "\rPOC %4d ( %c-SLICE, QP %d) %10d bits", poc, c, QP, bits);<br>
if (param.bEnablePsnr)<br>
fprintf(stderr, " [Y:%6.2lf U:%6.2lf V:%6.2lf]", psnrY, psnrU, psnrV);<br>
if (param.bEnableSsim)<br>
@@ -860,7 +859,7 @@<br>
// per frame CSV logging if the file handle is valid<br>
if (m_csvfpt)<br>
{<br>
- fprintf(m_csvfpt, "%d, %c-SLICE, %4d, %d, %d, %10d,", m_outputCount++, c, poc, QP_Base, QP, bits);<br>
+ fprintf(m_csvfpt, "%d, %c-SLICE, %4d, %d, %10d,", m_outputCount++, c, poc, QP, bits);<br></blockquote><div><br></div><div>this removes a column from the CSV, so the header has to be updated. I'll do this in a follow-on commit</div>
<div> </div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
double psnr = (psnrY * 6 + psnrU + psnrV) / 8;<br>
if (param.bEnablePsnr)<br>
fprintf(m_csvfpt, "%.3lf, %.3lf, %.3lf, %.3lf,", psnrY, psnrU, psnrV, psnr);<br>
diff -r 6ac5fa8bf0f9 -r ed28c1935087 source/encoder/frameencoder.cpp<br>
--- a/source/encoder/frameencoder.cpp Fri Feb 14 15:04:23 2014 +0530<br>
+++ b/source/encoder/frameencoder.cpp Fri Feb 14 15:32:00 2014 +0530<br>
@@ -414,7 +414,6 @@<br>
{<br>
qp = MAX_QP;<br>
slice->setSliceQp(qp);<br>
- slice->setSliceQpBase(qp);<br>
}<br>
slice->setSliceQpDelta(0);<br>
slice->setSliceQpDeltaCb(0);<br>
diff -r 6ac5fa8bf0f9 -r ed28c1935087 source/encoder/ratecontrol.cpp<br>
--- a/source/encoder/ratecontrol.cpp Fri Feb 14 15:04:23 2014 +0530<br>
+++ b/source/encoder/ratecontrol.cpp Fri Feb 14 15:32:00 2014 +0530<br>
@@ -402,7 +402,6 @@<br>
framesDone++;<br>
/* set the final QP to slice structure */<br>
curSlice->setSliceQp(qp);<br>
- curSlice->setSliceQpBase(qp);<br>
curSlice->m_avgQpRc = qp;<br>
}<br>
<br>
_______________________________________________<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" target="_blank">https://mailman.videolan.org/listinfo/x265-devel</a><br>
</blockquote></div><br><br clear="all"><div><br></div>-- <br>Steve Borho
</div></div>