<div dir="ltr"><br><div class="gmail_extra"><br><div class="gmail_quote">On Wed, Jan 10, 2018 at 12:12 PM, <span dir="ltr"><<a href="mailto:vignesh@multicorewareinc.com" target="_blank">vignesh@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 Vignesh Vijayakumar<br>
# Date 1515049621 -19800<br>
# Thu Jan 04 12:37:01 2018 +0530<br>
# Node ID 711d8c6cbb3cf3d164bb65d5662609<wbr>3b9023f8bf<br>
# Parent 69cfe46e8a3b44281278d560c2e99f<wbr>18eff2a950<br>
Fix Mac OS build warnings<br>
1. due to SEA motion search<br>
2. due to condition check for CTUInfo<br>
<br>
diff -r 69cfe46e8a3b -r 711d8c6cbb3c source/common/framedata.cpp<br>
--- a/source/common/framedata.cpp Tue Jan 02 16:41:36 2018 +0530<br>
+++ b/source/common/framedata.cpp Thu Jan 04 12:37:01 2018 +0530<br>
@@ -78,15 +78,12 @@<br>
X265_FREE(m_cuStat);<br>
X265_FREE(m_rowStat);<br>
<br>
- if (m_meBuffer)<br>
+ for (int i = 0; i < INTEGRAL_PLANE_NUM; i++)<br>
{<br>
- for (int i = 0; i < INTEGRAL_PLANE_NUM; i++)<br>
+ if (m_meBuffer[i] != NULL)<br>
{<br>
- if (m_meBuffer[i] != NULL)<br>
- {<br>
- X265_FREE(m_meBuffer[i]);<br>
- m_meBuffer[i] = NULL;<br>
- }<br>
+ X265_FREE(m_meBuffer[i]);<br>
+ m_meBuffer[i] = NULL;<br>
}<br>
}<br>
}<br>
diff -r 69cfe46e8a3b -r 711d8c6cbb3c source/encoder/analysis.cpp<br>
--- a/source/encoder/analysis.cpp Tue Jan 02 16:41:36 2018 +0530<br>
+++ b/source/encoder/analysis.cpp Thu Jan 04 12:37:01 2018 +0530<br>
@@ -159,36 +159,33 @@<br>
if (m_param->bCTUInfo && (*m_frame->m_ctuInfo + ctu.m_cuAddr))<br>
{<br>
x265_ctu_info_t* ctuTemp = *m_frame->m_ctuInfo + ctu.m_cuAddr;<br>
- if (ctuTemp->ctuPartitions)<br>
+ int32_t depthIdx = 0;<br>
+ uint32_t maxNum8x8Partitions = 64;<br>
+ uint8_t* depthInfoPtr = m_frame->m_addOnDepth[ctu.m_<wbr>cuAddr];<br>
+ uint8_t* contentInfoPtr = m_frame->m_addOnCtuInfo[ctu.m_<wbr>cuAddr];<br>
+ int* prevCtuInfoChangePtr = m_frame->m_addOnPrevChange[<wbr>ctu.m_cuAddr];<br>
+ do<br>
{<br>
- int32_t depthIdx = 0;<br>
- uint32_t maxNum8x8Partitions = 64;<br>
- uint8_t* depthInfoPtr = m_frame->m_addOnDepth[ctu.m_<wbr>cuAddr];<br>
- uint8_t* contentInfoPtr = m_frame->m_addOnCtuInfo[ctu.m_<wbr>cuAddr];<br>
- int* prevCtuInfoChangePtr = m_frame->m_addOnPrevChange[<wbr>ctu.m_cuAddr];<br>
- do<br>
- {<br>
- uint8_t depth = (uint8_t)ctuTemp-><wbr>ctuPartitions[depthIdx];<br>
- uint8_t content = (uint8_t)(*((int32_t *)ctuTemp->ctuInfo + depthIdx));<br>
- int prevCtuInfoChange = m_frame->m_prevCtuInfoChange[<wbr>ctu.m_cuAddr * maxNum8x8Partitions + depthIdx];<br>
- memset(depthInfoPtr, depth, sizeof(uint8_t) * numPartition >> 2 * depth);<br>
- memset(contentInfoPtr, content, sizeof(uint8_t) * numPartition >> 2 * depth);<br>
- memset(prevCtuInfoChangePtr, 0, sizeof(int) * numPartition >> 2 * depth);<br>
- for (uint32_t l = 0; l < numPartition >> 2 * depth; l++)<br>
- prevCtuInfoChangePtr[l] = prevCtuInfoChange;<br>
- depthInfoPtr += ctu.m_numPartitions >> 2 * depth;<br>
- contentInfoPtr += ctu.m_numPartitions >> 2 * depth;<br>
- prevCtuInfoChangePtr += ctu.m_numPartitions >> 2 * depth;<br>
- depthIdx++;<br>
- } while (ctuTemp->ctuPartitions[<wbr>depthIdx] != 0);<br>
-<br>
- m_additionalCtuInfo = m_frame->m_addOnCtuInfo[ctu.m_<wbr>cuAddr];<br>
- m_prevCtuInfoChange = m_frame->m_addOnPrevChange[<wbr>ctu.m_cuAddr];<br>
- memcpy(ctu.m_cuDepth, m_frame->m_addOnDepth[ctu.m_<wbr>cuAddr], sizeof(uint8_t) * numPartition);<br>
- //Calculate log2CUSize from depth<br>
- for (uint32_t i = 0; i < cuGeom.numPartitions; i++)<br>
- ctu.m_log2CUSize[i] = (uint8_t)m_param-><wbr>maxLog2CUSize - ctu.m_cuDepth[i];<br>
- }<br>
+ uint8_t depth = (uint8_t)ctuTemp-><wbr>ctuPartitions[depthIdx];<br>
+ uint8_t content = (uint8_t)(*((int32_t *)ctuTemp->ctuInfo + depthIdx));<br>
+ int prevCtuInfoChange = m_frame->m_prevCtuInfoChange[<wbr>ctu.m_cuAddr * maxNum8x8Partitions + depthIdx];<br>
+ memset(depthInfoPtr, depth, sizeof(uint8_t) * numPartition >> 2 * depth);<br>
+ memset(contentInfoPtr, content, sizeof(uint8_t) * numPartition >> 2 * depth);<br>
+ memset(prevCtuInfoChangePtr, 0, sizeof(int) * numPartition >> 2 * depth);<br>
+ for (uint32_t l = 0; l < numPartition >> 2 * depth; l++)<br>
+ prevCtuInfoChangePtr[l] = prevCtuInfoChange;<br>
+ depthInfoPtr += ctu.m_numPartitions >> 2 * depth;<br>
+ contentInfoPtr += ctu.m_numPartitions >> 2 * depth;<br>
+ prevCtuInfoChangePtr += ctu.m_numPartitions >> 2 * depth;<br>
+ depthIdx++;<br>
+ } while (ctuTemp->ctuPartitions[<wbr>depthIdx] != 0);<br>
+<br>
+ m_additionalCtuInfo = m_frame->m_addOnCtuInfo[ctu.m_<wbr>cuAddr];<br>
+ m_prevCtuInfoChange = m_frame->m_addOnPrevChange[<wbr>ctu.m_cuAddr];<br>
+ memcpy(ctu.m_cuDepth, m_frame->m_addOnDepth[ctu.m_<wbr>cuAddr], sizeof(uint8_t) * numPartition);<br>
+ //Calculate log2CUSize from depth<br>
+ for (uint32_t i = 0; i < cuGeom.numPartitions; i++)<br>
+ ctu.m_log2CUSize[i] = (uint8_t)m_param-><wbr>maxLog2CUSize - ctu.m_cuDepth[i];<br>
}<br>
<br>
if (m_param-><wbr>analysisMultiPassRefine && m_param->rc.bStatRead)<br>
diff -r 69cfe46e8a3b -r 711d8c6cbb3c source/encoder/dpb.cpp<br>
--- a/source/encoder/dpb.cpp Tue Jan 02 16:41:36 2018 +0530<br>
+++ b/source/encoder/dpb.cpp Thu Jan 04 12:37:01 2018 +0530<br>
@@ -93,15 +93,12 @@<br>
curFrame->m_encData->m_<wbr>freeListNext = m_frameDataFreeList;<br>
m_frameDataFreeList = curFrame->m_encData;<br>
<br>
- if (curFrame->m_encData->m_<wbr>meBuffer)<br>
+ for (int i = 0; i < INTEGRAL_PLANE_NUM; i++)<br>
{<br>
- for (int i = 0; i < INTEGRAL_PLANE_NUM; i++)<br>
+ if (curFrame->m_encData->m_<wbr>meBuffer[i] != NULL)<br>
{<br>
- if (curFrame->m_encData->m_<wbr>meBuffer[i] != NULL)<br>
- {<br>
- X265_FREE(curFrame->m_encData-<wbr>>m_meBuffer[i]);<br>
- curFrame->m_encData->m_<wbr>meBuffer[i] = NULL;<br>
- }<br>
+ X265_FREE(curFrame->m_encData-<wbr>>m_meBuffer[i]);<br>
+ curFrame->m_encData->m_<wbr>meBuffer[i] = NULL;<br>
}<br>
}<br>
<br>
diff -r 69cfe46e8a3b -r 711d8c6cbb3c source/encoder/framefilter.cpp<br>
--- a/source/encoder/framefilter.<wbr>cpp Tue Jan 02 16:41:36 2018 +0530<br>
+++ b/source/encoder/framefilter.<wbr>cpp Thu Jan 04 12:37:01 2018 +0530<br>
@@ -795,7 +795,7 @@<br>
void FrameFilter::<wbr>computeMEIntegral(int row)<br>
{<br>
int lastRow = row == (int)m_frame->m_encData->m_<wbr>slice->m_sps->numCuInHeight - 1;<br>
- if (m_frame->m_encData->m_<wbr>meIntegral && m_frame->m_lowres.sliceType != X265_TYPE_B)<br>
+ if (m_frame->m_lowres.sliceType != X265_TYPE_B)<br>
{<br>
/* If WPP, other than first row, integral calculation for current row needs to wait till the<br>
* integral for the previous row is computed */<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 class="gmail_extra">Pushed.</div></div>