[x265] [PATCH] nits: Whitespace, remove a comment
gopi.satykrishna at multicorewareinc.com
gopi.satykrishna at multicorewareinc.com
Mon Aug 29 10:22:06 CEST 2016
# HG changeset patch
# User Gopi Satykrishna Akisetty <gopi.satykrishna at multicorewareinc.com>
# Date 1472458749 -19800
# Mon Aug 29 13:49:09 2016 +0530
# Node ID 895070c4841484ce565894c22352f01444926549
# Parent 7878a576a112f61b9aa496397d995eb918d4f0dc
nits: Whitespace, remove a comment
diff -r 7878a576a112 -r 895070c48414 source/common/frame.cpp
--- a/source/common/frame.cpp Mon Aug 29 09:35:54 2016 +0530
+++ b/source/common/frame.cpp Mon Aug 29 13:49:09 2016 +0530
@@ -63,7 +63,7 @@
if (quantOffsets)
{
int32_t cuCount;
- if (param->rc.qgSize == 8 )
+ if (param->rc.qgSize == 8)
cuCount = m_lowres.maxBlocksInRowFullRes * m_lowres.maxBlocksInColFullRes;
else
cuCount = m_lowres.maxBlocksInRow * m_lowres.maxBlocksInCol;
diff -r 7878a576a112 -r 895070c48414 source/encoder/slicetype.cpp
--- a/source/encoder/slicetype.cpp Mon Aug 29 09:35:54 2016 +0530
+++ b/source/encoder/slicetype.cpp Mon Aug 29 13:49:09 2016 +0530
@@ -127,7 +127,6 @@
modeTwoConst = 11.f;
loopIncr = 16;
}
- //int blockCount = curFrame->m_lowres.maxBlocksInRowFullRes * curFrame->m_lowres.maxBlocksInColFullRes;
float* quantOffsets = curFrame->m_quantOffsets;
for (int y = 0; y < 3; y++)
@@ -352,9 +351,9 @@
if (qgSize == 8)
{
invQscaleFactor = (fenc.invQscaleFactor[cuX * 2 + cuY * widthInCU * 4] +
- fenc.invQscaleFactor[cuX * 2 + cuY * widthInCU * 4 + 1] +
- fenc.invQscaleFactor[cuX * 2 + cuY * widthInCU * 4 + fenc.maxBlocksInRowFullRes] +
- fenc.invQscaleFactor[cuX * 2 + cuY * widthInCU * 4 + fenc.maxBlocksInRowFullRes + 1]) / 4;
+ fenc.invQscaleFactor[cuX * 2 + cuY * widthInCU * 4 + 1] +
+ fenc.invQscaleFactor[cuX * 2 + cuY * widthInCU * 4 + fenc.maxBlocksInRowFullRes] +
+ fenc.invQscaleFactor[cuX * 2 + cuY * widthInCU * 4 + fenc.maxBlocksInRowFullRes + 1]) / 4;
icostAq = (bFrameScoreCU && fenc.invQscaleFactor) ? ((icost * invQscaleFactor + 128) >> 8) : icost;
}
else
@@ -854,9 +853,9 @@
double qpOffset;
if (m_param->rc.qgSize == 8)
qpOffset = (qp_offset[lowresCol * 2 + lowresRow * widthInLowresCu * 4] +
- qp_offset[lowresCol * 2 + lowresRow * widthInLowresCu * 4 + 1] +
- qp_offset[lowresCol * 2 + lowresRow * widthInLowresCu * 4 + curFrame->m_lowres.maxBlocksInRowFullRes] +
- qp_offset[lowresCol * 2 + lowresRow * widthInLowresCu * 4 + curFrame->m_lowres.maxBlocksInRowFullRes + 1]) / 4;
+ qp_offset[lowresCol * 2 + lowresRow * widthInLowresCu * 4 + 1] +
+ qp_offset[lowresCol * 2 + lowresRow * widthInLowresCu * 4 + curFrame->m_lowres.maxBlocksInRowFullRes] +
+ qp_offset[lowresCol * 2 + lowresRow * widthInLowresCu * 4 + curFrame->m_lowres.maxBlocksInRowFullRes + 1]) / 4;
else
qpOffset = qp_offset[lowresCuIdx];
lowresCuCost = (uint16_t)((lowresCuCost * x265_exp2fix8(qpOffset) + 128) >> 8);
@@ -1915,9 +1914,9 @@
{
const int cuXY = cuX + cuY * m_8x8Width;
int invQscaleFactor = (frame->invQscaleFactor[cuX * 2 + cuY * m_8x8Width * 4] +
- frame->invQscaleFactor[cuX * 2 + cuY * m_8x8Width * 4 + 1] +
- frame->invQscaleFactor[cuX * 2 + cuY * m_8x8Width * 4 + frame->maxBlocksInRowFullRes] +
- frame->invQscaleFactor[cuX * 2 + cuY * m_8x8Width * 4 + frame->maxBlocksInRowFullRes + 1]) / 4;
+ frame->invQscaleFactor[cuX * 2 + cuY * m_8x8Width * 4 + 1] +
+ frame->invQscaleFactor[cuX * 2 + cuY * m_8x8Width * 4 + frame->maxBlocksInRowFullRes] +
+ frame->invQscaleFactor[cuX * 2 + cuY * m_8x8Width * 4 + frame->maxBlocksInRowFullRes + 1]) / 4;
int intracost = ((frame->intraCost[cuXY]) / 4 * invQscaleFactor + 128) >> 8;
if (intracost)
@@ -1970,9 +1969,9 @@
double qp_adj;
if (m_param->rc.qgSize == 8)
qp_adj = (qp_offset[cux * 2 + cuy * m_8x8Width * 4] +
- qp_offset[cux * 2 + cuy * m_8x8Width * 4 + 1] +
- qp_offset[cux * 2 + cuy * m_8x8Width * 4 + frames[b]->maxBlocksInRowFullRes] +
- qp_offset[cux * 2 + cuy * m_8x8Width * 4 + frames[b]->maxBlocksInRowFullRes + 1]) / 4;
+ qp_offset[cux * 2 + cuy * m_8x8Width * 4 + 1] +
+ qp_offset[cux * 2 + cuy * m_8x8Width * 4 + frames[b]->maxBlocksInRowFullRes] +
+ qp_offset[cux * 2 + cuy * m_8x8Width * 4 + frames[b]->maxBlocksInRowFullRes + 1]) / 4;
else
qp_adj = qp_offset[cuxy];
cuCost = (cuCost * x265_exp2fix8(qp_adj) + 128) >> 8;
@@ -2297,9 +2296,9 @@
if (m_lookahead.m_param->rc.qgSize == 8)
{
invQscaleFactor = (fenc->invQscaleFactor[cuX * 2 + cuY * widthInCU * 4] +
- fenc->invQscaleFactor[cuX * 2 + cuY * widthInCU * 4 + 1] +
- fenc->invQscaleFactor[cuX * 2 + cuY * widthInCU * 4 + fenc->maxBlocksInRowFullRes] +
- fenc->invQscaleFactor[cuX * 2 + cuY * widthInCU * 4 + fenc->maxBlocksInRowFullRes + 1]) / 4;
+ fenc->invQscaleFactor[cuX * 2 + cuY * widthInCU * 4 + 1] +
+ fenc->invQscaleFactor[cuX * 2 + cuY * widthInCU * 4 + fenc->maxBlocksInRowFullRes] +
+ fenc->invQscaleFactor[cuX * 2 + cuY * widthInCU * 4 + fenc->maxBlocksInRowFullRes + 1]) / 4;
bcostAq = (bFrameScoreCU && fenc->invQscaleFactor) ? ((bcost * invQscaleFactor + 128) >> 8) : bcost;
}
else
More information about the x265-devel
mailing list