<div dir="ltr"><br><div class="gmail_extra"><br><br><div class="gmail_quote">On Mon, Nov 4, 2013 at 12:39 AM, <span dir="ltr"><<a href="mailto:shazeb@multicorewareinc.com" target="_blank">shazeb@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 Shazeb Nawaz Khan <<a href="mailto:shazeb@multicorewareinc.com">shazeb@multicorewareinc.com</a>><br>
# Date 1383547146 -19800<br>
# Mon Nov 04 12:09:06 2013 +0530<br>
# Node ID 3ae2ba820005bae1b2a9cc1e8de5c186fdf0c8df<br>
# Parent 2ab39c2dd50f691c2c7abf2d6df48f1f9843dc7e<br>
Dropping the 'm_' prefix from names used for members of struct type Lowres<br></blockquote><div><br></div><div>Thanks, pushed to default</div><div> </div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
diff -r 2ab39c2dd50f -r 3ae2ba820005 source/Lib/TLibCommon/TComDataCU.cpp<br>
--- a/source/Lib/TLibCommon/TComDataCU.cpp Mon Nov 04 11:40:49 2013 +0530<br>
+++ b/source/Lib/TLibCommon/TComDataCU.cpp Mon Nov 04 12:09:06 2013 +0530<br>
@@ -246,7 +246,7 @@<br>
m_totalDistortion = 0;<br>
m_totalBits = 0;<br>
m_numPartitions = pic->getNumPartInCU();<br>
- int qp = pic->m_lowres.m_invQscaleFactor ? pic->getCU(getAddr())->getQP(0) : m_slice->getSliceQp();<br>
+ int qp = pic->m_lowres.invQscaleFactor ? pic->getCU(getAddr())->getQP(0) : m_slice->getSliceQp();<br>
for (int i = 0; i < 4; i++)<br>
{<br>
m_avgCost[i] = 0;<br>
diff -r 2ab39c2dd50f -r 3ae2ba820005 source/common/lowres.cpp<br>
--- a/source/common/lowres.cpp Mon Nov 04 11:40:49 2013 +0530<br>
+++ b/source/common/lowres.cpp Mon Nov 04 12:09:06 2013 +0530<br>
@@ -47,9 +47,9 @@<br>
<br>
if (*aqMode)<br>
{<br>
- m_qpAqOffset = (double*)x265_malloc(sizeof(double) * cuCount);<br>
- m_invQscaleFactor = (int*)x265_malloc(sizeof(int) * cuCount);<br>
- if (!m_qpAqOffset || !m_invQscaleFactor)<br>
+ qpAqOffset = (double*)x265_malloc(sizeof(double) * cuCount);<br>
+ invQscaleFactor = (int*)x265_malloc(sizeof(int) * cuCount);<br>
+ if (!qpAqOffset || !invQscaleFactor)<br>
*aqMode = 0;<br>
}<br>
<br>
@@ -110,8 +110,8 @@<br>
X265_FREE(lowresMvCosts[0][i]);<br>
X265_FREE(lowresMvCosts[1][i]);<br>
}<br>
- X265_FREE(m_qpAqOffset);<br>
- X265_FREE(m_invQscaleFactor);<br>
+ X265_FREE(qpAqOffset);<br>
+ X265_FREE(invQscaleFactor);<br>
}<br>
<br>
// (re) initialize lowres state<br>
@@ -127,7 +127,7 @@<br>
satdCost = -1;<br>
memset(costEst, -1, sizeof(costEst));<br>
<br>
- if (m_qpAqOffset && m_invQscaleFactor)<br>
+ if (qpAqOffset && invQscaleFactor)<br>
memset(costEstAq, -1, sizeof(costEstAq));<br>
<br>
for (int y = 0; y < bframes + 2; y++)<br>
diff -r 2ab39c2dd50f -r 3ae2ba820005 source/common/lowres.h<br>
--- a/source/common/lowres.h Mon Nov 04 11:40:49 2013 +0530<br>
+++ b/source/common/lowres.h Mon Nov 04 12:09:06 2013 +0530<br>
@@ -35,15 +35,15 @@<br>
{<br>
/* lowres buffers, sizes and strides */<br>
pixel *buffer[4];<br>
- double *m_qpAqOffset; // qp Aq offset values for each Cu<br>
- int* m_invQscaleFactor; // qScale values for qp Aq Offsets<br>
+ double *qpAqOffset; // qp Aq offset values for each Cu<br>
+ int *invQscaleFactor; // qScale values for qp Aq Offsets<br>
int width; // width of lowres frame in pixels<br>
int lines; // height of lowres frame in pixel lines<br>
int frameNum; // Presentation frame number<br>
int sliceType; // Slice type decided by lookahead<br>
int leadingBframes; // number of leading B frames for P or I<br>
- uint64_t m_wp_ssd[3]; // This is different than m_SSDY, this is sum(pixel^2) - sum(pixel)^2 for entire frame<br>
- uint64_t m_wp_sum[3];<br>
+ uint64_t wp_ssd[3]; // This is different than m_SSDY, this is sum(pixel^2) - sum(pixel)^2 for entire frame<br>
+ uint64_t wp_sum[3];<br>
<br>
bool bIntraCalculated;<br>
bool bScenecut; // Set to false if the frame cannot possibly be part of a real scenecut.<br>
diff -r 2ab39c2dd50f -r 3ae2ba820005 source/encoder/frameencoder.cpp<br>
--- a/source/encoder/frameencoder.cpp Mon Nov 04 11:40:49 2013 +0530<br>
+++ b/source/encoder/frameencoder.cpp Mon Nov 04 12:09:06 2013 +0530<br>
@@ -1153,7 +1153,7 @@<br>
{<br>
for (int w = 0; w < 4 && (block_x + w) < maxBlockCols; w++)<br>
{<br>
- qp_offset += pic->m_lowres.m_qpAqOffset[block_x + w + (block_y * maxBlockCols)];<br>
+ qp_offset += pic->m_lowres.qpAqOffset[block_x + w + (block_y * maxBlockCols)];<br>
cnt++;<br>
}<br>
}<br>
diff -r 2ab39c2dd50f -r 3ae2ba820005 source/encoder/ratecontrol.cpp<br>
--- a/source/encoder/ratecontrol.cpp Mon Nov 04 11:40:49 2013 +0530<br>
+++ b/source/encoder/ratecontrol.cpp Mon Nov 04 12:09:06 2013 +0530<br>
@@ -55,8 +55,8 @@<br>
{<br>
uint32_t sum = (uint32_t)sum_ssd;<br>
uint32_t ssd = (uint32_t)(sum_ssd >> 32);<br>
- pic->m_lowres.m_wp_sum[i] += sum;<br>
- pic->m_lowres.m_wp_ssd[i] += ssd;<br>
+ pic->m_lowres.wp_sum[i] += sum;<br>
+ pic->m_lowres.wp_ssd[i] += ssd;<br>
return ssd - ((uint64_t)sum * sum >> shift);<br>
}<br>
<br>
@@ -106,8 +106,8 @@<br>
double qp_adj = acEnergyCu(pic, block_x, block_y);<br>
if (cfg->param.rc.aqMode)<br>
{<br>
- pic->m_lowres.m_qpAqOffset[block_xy] = qp_adj;<br>
- pic->m_lowres.m_invQscaleFactor[block_xy] = x265_exp2fix8(qp_adj);<br>
+ pic->m_lowres.qpAqOffset[block_xy] = qp_adj;<br>
+ pic->m_lowres.invQscaleFactor[block_xy] = x265_exp2fix8(qp_adj);<br>
block_xy++;<br>
}<br>
}<br>
@@ -117,9 +117,9 @@<br>
for(int i=0; i < 3; i++)<br>
{<br>
UInt64 sum, ssd;<br>
- sum = pic->m_lowres.m_wp_sum[i];<br>
- ssd = pic->m_lowres.m_wp_ssd[i];<br>
- pic->m_lowres.m_wp_ssd[i] = ssd - (sum*sum + (block_x * block_y) / 2 ) / (block_x * block_y);<br>
+ sum = pic->m_lowres.wp_sum[i];<br>
+ ssd = pic->m_lowres.wp_ssd[i];<br>
+ pic->m_lowres.wp_ssd[i] = ssd - (sum*sum + (block_x * block_y) / 2 ) / (block_x * block_y);<br>
}<br>
}<br>
}<br>
diff -r 2ab39c2dd50f -r 3ae2ba820005 source/encoder/slicetype.cpp<br>
--- a/source/encoder/slicetype.cpp Mon Nov 04 11:40:49 2013 +0530<br>
+++ b/source/encoder/slicetype.cpp Mon Nov 04 12:09:06 2013 +0530<br>
@@ -483,8 +483,8 @@<br>
if (bFrameScoreCU)<br>
{<br>
costIntra += icost;<br>
- if (fenc->m_invQscaleFactor)<br>
- costIntraAq += (icost * fenc->m_invQscaleFactor[cuXY] + 128) >> 8;<br>
+ if (fenc->invQscaleFactor)<br>
+ costIntraAq += (icost * fenc->invQscaleFactor[cuXY] + 128) >> 8;<br>
}<br>
}<br>
if (!bBidir)<br>
@@ -504,8 +504,8 @@<br>
if (bFrameScoreCU)<br>
{<br>
costEst += bcost;<br>
- if (fenc->m_invQscaleFactor)<br>
- costEstAq += (bcost * fenc->m_invQscaleFactor[cuXY] + 128) >> 8;<br>
+ if (fenc->invQscaleFactor)<br>
+ costEstAq += (bcost * fenc->invQscaleFactor[cuXY] + 128) >> 8;<br>
}<br>
}<br>
fenc->lowresCosts[b - p0][p1 - b][cuXY] = (uint16_t)(X265_MIN(bcost, LOWRES_COST_MASK) | (listused << LOWRES_COST_SHIFT));<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>