[x265] [PATCH 1 of 3] uncrustify : compress.cpp
aarthi at multicorewareinc.com
aarthi at multicorewareinc.com
Thu Aug 1 07:48:05 CEST 2013
# HG changeset patch
# User sumalatha
# Date 1375335752 -19800
# Node ID e108bfd4d6f516fee95061033fd03b08a37ebaa5
# Parent 8eebc88f86e03f61d865c1211cee3247df1abb95
uncrustify : compress.cpp
diff -r 8eebc88f86e0 -r e108bfd4d6f5 source/encoder/compress.cpp
--- a/source/encoder/compress.cpp Wed Jul 31 15:43:37 2013 -0500
+++ b/source/encoder/compress.cpp Thu Aug 01 11:12:32 2013 +0530
@@ -285,8 +285,8 @@
Bool bSubBranch = true;
Bool bTrySplitDQP = true;
Bool bBoundary = false;
+#if EARLY_EXIT_NO_RDO
UInt64 nxnCost = 0;
-#if EARLY_EXIT_NO_RDO
UInt64 inter2Nx2NCost = 0;
#endif
UInt lpelx = outTempCU->getCUPelX();
@@ -299,9 +299,9 @@
// If slice start or slice end is within this cu...
TComSlice * slice = outTempCU->getPic()->getSlice();
Bool bSliceEnd = slice->getSliceCurEndCUAddr() > outTempCU->getSCUAddr() &&
- slice->getSliceCurEndCUAddr() < outTempCU->getSCUAddr() + outTempCU->getTotalNumPart();
+ slice->getSliceCurEndCUAddr() < outTempCU->getSCUAddr() + outTempCU->getTotalNumPart();
Bool bInsidePicture = (rpelx < outTempCU->getSlice()->getSPS()->getPicWidthInLumaSamples()) &&
- (bpely < outTempCU->getSlice()->getSPS()->getPicHeightInLumaSamples());
+ (bpely < outTempCU->getSlice()->getSPS()->getPicHeightInLumaSamples());
// We need to split, so don't try these modes.
TComYuv* tempYuv = NULL;
@@ -347,6 +347,7 @@
m_bestPredYuv[depth] = tempYuv;
}
//reusing the buffer gives md5 hash error - need to look into it. suspect it happens when inSlice condition is false.
+
/*else
{
outBestCU = m_interCU_NxN[PartitionIndex][depth];
@@ -382,14 +383,13 @@
TComPic* subPic = subTempPartCU->getPic();
m_origYuv[nextDepth]->copyFromPicYuv(subPic->getPicYuvOrg(), subTempPartCU->getAddr(), subTempPartCU->getZorderIdxInCU());
- Bool bInSlice = subTempPartCU->getSCUAddr() < slice->getSliceCurEndCUAddr() ;
+ Bool bInSlice = subTempPartCU->getSCUAddr() < slice->getSliceCurEndCUAddr();
if (bInSlice && (subTempPartCU->getCUPelX() < slice->getSPS()->getPicWidthInLumaSamples()) &&
(subTempPartCU->getCUPelY() < slice->getSPS()->getPicHeightInLumaSamples()))
{
xComputeCostInter(subTempPartCU, m_bestPredYuvNxN[partUnitIdx][nextDepth], SIZE_2Nx2N, 0);
nxnCost += subTempPartCU->m_totalCost;
}
-
}
}
#endif // if EARLY_EXIT_NO_RDO
More information about the x265-devel
mailing list