<div dir="ltr"><br><div class="gmail_extra"><br><div class="gmail_quote">On Thu, Jul 26, 2018 at 1:41 PM, <span dir="ltr"><<a href="mailto:ashok@multicorewareinc.com" target="_blank">ashok@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 Ashok Kumar Mishra <<a href="mailto:ashok@multicorewareinc.com">ashok@multicorewareinc.com</a>><br>
# Date 1532592494 -19800<br>
# Thu Jul 26 13:38:14 2018 +0530<br>
# Node ID 613074c6714fd88a7ac318746dc4aa<wbr>0be87945b5<br>
# Parent c5ae4495d43dc01979381282f9bf93<wbr>904d4baca3<br>
remove whitespace<br>
<br>
diff -r c5ae4495d43d -r 613074c6714f source/common/lowres.cpp<br>
--- a/source/common/lowres.cpp Thu Jul 26 10:15:48 2018 +0530<br>
+++ b/source/common/lowres.cpp Thu Jul 26 13:38:14 2018 +0530<br>
@@ -61,8 +61,8 @@<br>
if (qgSize == 8)<br>
CHECKED_MALLOC_ZERO(<wbr>invQscaleFactor8x8, int, cuCount);<br>
}<br>
- if (origPic->m_param->bAQMotion)<br>
- CHECKED_MALLOC_ZERO(<wbr>qpAqMotionOffset, double, cuCountFullRes);<br>
+ if (origPic->m_param->bAQMotion)<br>
+ CHECKED_MALLOC_ZERO(<wbr>qpAqMotionOffset, double, cuCountFullRes);<br>
if (origPic->m_param-><wbr>bDynamicRefine)<br>
CHECKED_MALLOC_ZERO(<wbr>blockVariance, uint32_t, cuCountFullRes);<br>
CHECKED_MALLOC(propagateCost, uint16_t, cuCount);<br>
@@ -131,8 +131,8 @@<br>
X265_FREE(invQscaleFactor);<br>
X265_FREE(qpCuTreeOffset);<br>
X265_FREE(propagateCost);<br>
- X265_FREE(invQscaleFactor8x8);<br>
- X265_FREE(qpAqMotionOffset);<br>
+ X265_FREE(invQscaleFactor8x8);<br>
+ X265_FREE(qpAqMotionOffset);<br>
X265_FREE(blockVariance);<br>
}<br>
// (re) initialize lowres state<br>
diff -r c5ae4495d43d -r 613074c6714f source/common/param.cpp<br>
--- a/source/common/param.cpp Thu Jul 26 10:15:48 2018 +0530<br>
+++ b/source/common/param.cpp Thu Jul 26 13:38:14 2018 +0530<br>
@@ -134,8 +134,8 @@<br>
param->bEmitInfoSEI = 1;<br>
param->bEmitHDRSEI = 0;<br>
param->bEmitIDRRecoverySEI = 0;<br>
- <br>
- /* CU definitions */<br>
+<br>
+ /* CU definitions */<br>
param->maxCUSize = 64;<br>
param->minCUSize = 8;<br>
param->tuQTMaxInterDepth = 1;<br>
@@ -196,8 +196,8 @@<br>
param->bEnableSAO = 1;<br>
param->bSaoNonDeblocked = 0;<br>
param->bLimitSAO = 0;<br>
- <br>
- /* Coding Quality */<br>
+<br>
+ /* Coding Quality */<br>
param->cbQpOffset = 0;<br>
param->crQpOffset = 0;<br>
param->rdPenalty = 0;<br>
@@ -309,9 +309,9 @@<br>
param->bMVType = 0;<br>
param->bSingleSeiNal = 0;<br>
<br>
- /* SEI messages */<br>
- param-><wbr>preferredTransferCharacteristi<wbr>cs = -1;<br>
- param->pictureStructure = -1;<br>
+ /* SEI messages */<br>
+ param-><wbr>preferredTransferCharacteristi<wbr>cs = -1;<br>
+ param->pictureStructure = -1;<br>
}<br>
<br>
int x265_param_default_preset(<wbr>x265_param* param, const char* preset, const char* tune)<br>
@@ -1019,7 +1019,7 @@<br>
OPT("refine-mv")p->mvRefine = atobool(value);<br>
OPT("force-flush")p-><wbr>forceFlush = atoi(value);<br>
OPT("splitrd-skip") p->bEnableSplitRdSkip = atobool(value);<br>
- OPT("lowpass-dct") p->bLowPassDct = atobool(value);<br>
+ OPT("lowpass-dct") p->bLowPassDct = atobool(value);<br>
OPT("vbv-end") p->vbvBufferEnd = atof(value);<br>
OPT("vbv-end-fr-adj") p->vbvEndFrameAdjust = atof(value);<br>
OPT("copy-pic") p->bCopyPicToFrame = atobool(value);<br>
@@ -1037,7 +1037,7 @@<br>
{<br>
bError = true;<br>
}<br>
- }<br>
+ }<br>
OPT("gop-lookahead") p->gopLookahead = atoi(value);<br>
OPT("analysis-save") p->analysisSave = strdup(value);<br>
OPT("analysis-load") p->analysisLoad = strdup(value);<br>
@@ -1045,8 +1045,8 @@<br>
OPT("max-ausize-factor") p->maxAUSizeFactor = atof(value);<br>
OPT("dynamic-refine") p->bDynamicRefine = atobool(value);<br>
OPT("single-sei") p->bSingleSeiNal = atobool(value);<br>
- OPT("atc-sei") p-><wbr>preferredTransferCharacteristi<wbr>cs = atoi(value);<br>
- OPT("pic-struct") p->pictureStructure = atoi(value);<br>
+ OPT("atc-sei") p-><wbr>preferredTransferCharacteristi<wbr>cs = atoi(value);<br>
+ OPT("pic-struct") p->pictureStructure = atoi(value);<br>
OPT("chunk-start") p->chunkStart = atoi(value);<br>
OPT("chunk-end") p->chunkEnd = atoi(value);<br>
OPT("nalu-file") p->naluFile = strdup(value);<br>
diff -r c5ae4495d43d -r 613074c6714f source/common/quant.cpp<br>
--- a/source/common/quant.cpp Thu Jul 26 10:15:48 2018 +0530<br>
+++ b/source/common/quant.cpp Thu Jul 26 13:38:14 2018 +0530<br>
@@ -806,7 +806,7 @@<br>
if (usePsyMask)<br>
{<br>
bool enable512 = detect512();<br>
- <br>
+<br>
if (enable512)<br>
<a href="http://primitives.cu" rel="noreferrer" target="_blank">primitives.cu</a>[log2TrSize - 2].psyRdoQuant(m_resiDctCoeff, m_fencDctCoeff, costUncoded, &totalUncodedCost, &totalRdCost, &psyScale, blkPos);<br>
else<br>
diff -r c5ae4495d43d -r 613074c6714f source/encoder/frameencoder.<wbr>cpp<br>
--- a/source/encoder/frameencoder.<wbr>cpp Thu Jul 26 10:15:48 2018 +0530<br>
+++ b/source/encoder/frameencoder.<wbr>cpp Thu Jul 26 13:38:14 2018 +0530<br>
@@ -674,14 +674,14 @@<br>
sei->m_picStruct = (poc & 1) ? 1 /* top */ : 2 /* bottom */;<br>
else if (m_param->interlaceMode == 1)<br>
sei->m_picStruct = (poc & 1) ? 2 /* bottom */ : 1 /* top */;<br>
- else<br>
- sei->m_picStruct = m_param->pictureStructure;<br>
- <br>
- if (m_param->interlaceMode)<br>
- sei->m_sourceScanType = 0;<br>
- else<br>
- sei->m_sourceScanType = 1;<br>
- <br>
+ else<br>
+ sei->m_picStruct = m_param->pictureStructure;<br>
+<br>
+ if (m_param->interlaceMode)<br>
+ sei->m_sourceScanType = 0;<br>
+ else<br>
+ sei->m_sourceScanType = 1;<br>
+<br>
sei->m_duplicateFlag = false;<br>
}<br>
<br>
@@ -702,17 +702,17 @@<br>
sei->alignAndSerialize(m_bs, false, m_param->bSingleSeiNal, NAL_UNIT_PREFIX_SEI, m_nalList);<br>
}<br>
<br>
- if (m_param-><wbr>preferredTransferCharacteristi<wbr>cs > -1 && slice->isIRAP())<br>
- {<br>
- SEIAlternativeTC m_seiAlternativeTC;<br>
- m_seiAlternativeTC.m_<wbr>preferredTransferCharacteristi<wbr>cs = m_param-><wbr>preferredTransferCharacteristi<wbr>cs;<br>
- m_bs.resetBits();<br>
- int payloadSize = m_seiAlternativeTC.<wbr>countPayloadSize(*slice->m_<wbr>sps);<br>
- m_seiAlternativeTC.setSize(<wbr>payloadSize);<br>
- m_seiAlternativeTC.write(m_bs, *slice->m_sps);<br>
- m_seiAlternativeTC.<wbr>alignAndSerialize(m_bs, false, m_param->bSingleSeiNal, NAL_UNIT_PREFIX_SEI, m_nalList);<br>
- }<br>
- <br>
+ if (m_param-><wbr>preferredTransferCharacteristi<wbr>cs > -1 && slice->isIRAP())<br>
+ {<br>
+ SEIAlternativeTC m_seiAlternativeTC;<br>
+ m_seiAlternativeTC.m_<wbr>preferredTransferCharacteristi<wbr>cs = m_param-><wbr>preferredTransferCharacteristi<wbr>cs;<br>
+ m_bs.resetBits();<br>
+ int payloadSize = m_seiAlternativeTC.<wbr>countPayloadSize(*slice->m_<wbr>sps);<br>
+ m_seiAlternativeTC.setSize(<wbr>payloadSize);<br>
+ m_seiAlternativeTC.write(m_bs, *slice->m_sps);<br>
+ m_seiAlternativeTC.<wbr>alignAndSerialize(m_bs, false, m_param->bSingleSeiNal, NAL_UNIT_PREFIX_SEI, m_nalList);<br>
+ }<br>
+<br>
bool isSei = false;<br>
/* Write user SEI */<br>
for (int i = 0; i < m_frame->m_userSEI.<wbr>numPayloads; i++)<br>
@@ -1420,7 +1420,7 @@<br>
}<br>
curRow.avgQPComputed = 1;<br>
}<br>
- } <br>
+ }<br>
<br>
// Initialize restrict on MV range in slices<br>
tld.analysis.m_sliceMinY = -(int16_t)(rowInSlice * m_param->maxCUSize * 4) + 3 * 4;<br>
@@ -1525,7 +1525,7 @@<br>
{<br>
// NOTE: in VBV mode, we may reencode anytime, so we can't do Deblock stage-Horizon and SAO<br>
if (!bIsVbv)<br>
- { <br>
+ {<br>
// Delay one row to avoid intra prediction conflict<br>
if (m_pool && !bFirstRowInSlice)<br>
{ <br>
@@ -1802,24 +1802,24 @@<br>
else if ((uint32_t)m_rce.encodeOrder <= 2 * (m_param->fpsNum / m_param->fpsDenom))<br>
rowCount = X265_MIN((maxRows + 1) / 2, maxRows - 1);<br>
else<br>
- rowCount = X265_MIN(m_refLagRows / m_param->maxSlices, maxRows - 1);<br>
+ rowCount = X265_MIN(m_refLagRows / m_param->maxSlices, maxRows - 1);<br>
<br>
if (rowInSlice == rowCount)<br>
{<br>
m_rowSliceTotalBits[sliceId] = 0;<br>
if (bIsVbv && !(m_param->rc.bEnableConstVbv && m_param->bEnableWavefront))<br>
- { <br>
+ {<br>
for (uint32_t i = m_sliceBaseRow[sliceId]; i < rowCount + m_sliceBaseRow[sliceId]; i++)<br>
m_rowSliceTotalBits[sliceId] += curEncData.m_rowStat[i].<wbr>encodedBits;<br>
}<br>
else<br>
{<br>
uint32_t startAddr = m_sliceBaseRow[sliceId] * numCols;<br>
- uint32_t finishAddr = startAddr + rowCount * numCols;<br>
+ uint32_t finishAddr = startAddr + rowCount * numCols;<br>
<br>
- for (uint32_t cuAddr = startAddr; cuAddr < finishAddr; cuAddr++)<br>
+ for (uint32_t cuAddr = startAddr; cuAddr < finishAddr; cuAddr++)<br>
m_rowSliceTotalBits[sliceId] += curEncData.m_cuStat[cuAddr].<wbr>totalBits;<br>
- } <br>
+ }<br>
<br>
if (ATOMIC_INC(&m_sliceCnt) == (int)m_param->maxSlices)<br>
{<br>
@@ -2132,7 +2132,7 @@<br>
Frame *FrameEncoder::<wbr>getEncodedPicture(NALList& output)<br>
{<br>
if (m_frame)<br>
- { <br>
+ {<br>
/* block here until worker thread completes */<br>
m_done.wait();<br>
<br>
diff -r c5ae4495d43d -r 613074c6714f source/x265.h<br>
--- a/source/x265.h Thu Jul 26 10:15:48 2018 +0530<br>
+++ b/source/x265.h Thu Jul 26 13:38:14 2018 +0530<br>
@@ -343,7 +343,7 @@<br>
REGION_REFRESH_INFO = 134,<br>
MASTERING_DISPLAY_INFO = 137,<br>
CONTENT_LIGHT_LEVEL_INFO = 144,<br>
- ALTERNATIVE_TRANSFER_<wbr>CHARACTERISTICS = 147,<br>
+ ALTERNATIVE_TRANSFER_<wbr>CHARACTERISTICS = 147,<br>
} SEIPayloadType;<br>
<br>
typedef struct x265_sei_payload<br>
@@ -652,7 +652,7 @@<br>
<br>
/* data to calculate aggregate VMAF score */<br>
typedef struct x265_vmaf_data<br>
-{ <br>
+{<br>
int width;<br>
int height;<br>
size_t offset; <br>
@@ -1698,12 +1698,12 @@<br>
<br>
<br>
/* First frame of the chunk. Frames preceeding this in display order will<br>
- * be encoded, however, they will be discarded in the bitstream.<br>
+ * be encoded, however, they will be discarded in the bitstream.<br>
* Default 0 (disabled). */<br>
int chunkStart;<br>
<br>
/* Last frame of the chunk. Frames following this in display order will be<br>
- * used in taking lookahead decisions, but, they will not be encoded.<br>
+ * used in taking lookahead decisions, but, they will not be encoded.<br>
* Default 0 (disabled). */<br>
int chunkEnd;<br>
/* File containing base64 encoded SEI messages in POC order */<br>
</blockquote></div><br></div><div class="gmail_extra"><br></div><div class="gmail_extra">Pushed.</div></div>