[x265] [PATCH 2 of 2] rd: Rename function names in compress.cpp
sumalatha at multicorewareinc.com
sumalatha at multicorewareinc.com
Tue Dec 24 06:06:58 CET 2013
# HG changeset patch
# User Sumalatha Polureddy
# Date 1387858851 -19800
# Node ID 6605fc7ee05a2aacb2d151b8173e3fc4f440af6a
# Parent d23e0552587db4879b6e362d4084f3db4bfd8f0d
rd: Rename function names in compress.cpp
diff -r d23e0552587d -r 6605fc7ee05a source/Lib/TLibEncoder/TEncCu.cpp
--- a/source/Lib/TLibEncoder/TEncCu.cpp Tue Dec 24 09:47:31 2013 +0530
+++ b/source/Lib/TLibEncoder/TEncCu.cpp Tue Dec 24 09:50:51 2013 +0530
@@ -395,7 +395,7 @@
/* At the start of analysis, the best CU is a null pointer
On return, it points to the CU encode with best chosen mode*/
- xCompressInterCU(outBestCU, m_tempCU[0], cu, 0, 0, 4);
+ compressInterCU(outBestCU, m_tempCU[0], cu, 0, 0, 4);
}
else
xCompressCU(m_bestCU[0], m_tempCU[0], 0);
diff -r d23e0552587d -r 6605fc7ee05a source/Lib/TLibEncoder/TEncCu.h
--- a/source/Lib/TLibEncoder/TEncCu.h Tue Dec 24 09:47:31 2013 +0530
+++ b/source/Lib/TLibEncoder/TEncCu.h Tue Dec 24 09:50:51 2013 +0530
@@ -162,17 +162,17 @@
void finishCU(TComDataCU* cu, uint32_t absPartIdx, uint32_t depth);
void xCompressCU(TComDataCU*& outBestCU, TComDataCU*& outTempCU, uint32_t depth, PartSize parentSize = SIZE_NONE);
void xCompressIntraCU(TComDataCU*& outBestCU, TComDataCU*& outTempCU, uint32_t depth);
- void xCompressInterCU(TComDataCU*& outBestCU, TComDataCU*& outTempCU, TComDataCU*& cu, uint32_t depth, uint32_t partitionIndex, UChar minDepth);
+ void compressInterCU(TComDataCU*& outBestCU, TComDataCU*& outTempCU, TComDataCU*& cu, uint32_t depth, uint32_t partitionIndex, UChar minDepth);
void xEncodeCU(TComDataCU* cu, uint32_t absPartIdx, uint32_t depth);
int xComputeQP(TComDataCU* cu);
void xCheckBestMode(TComDataCU*& outBestCU, TComDataCU*& outTempCU, uint32_t depth);
void xCheckRDCostMerge2Nx2N(TComDataCU*& outBestCU, TComDataCU*& outTempCU, bool *earlyDetectionSkipMode,
TComYuv*& outBestPredYuv, TComYuv*& rpcYuvReconBest);
- void xComputeCostIntraInInter(TComDataCU* cu, PartSize partSize);
+ void computeCostIntraInInter(TComDataCU* cu, PartSize partSize);
void xCheckRDCostInter(TComDataCU*& outBestCU, TComDataCU*& outTempCU, PartSize partSize, bool bUseMRG = false);
- void xComputeCostInter(TComDataCU* outTempCU, TComYuv* outPredYUV, PartSize partSize, bool bUseMRG = false);
- void xComputeCostMerge2Nx2N(TComDataCU*& outBestCU, TComDataCU*& outTempCU, TComYuv*& bestPredYuv, TComYuv*& tmpPredYuv);
+ void computeCostInter(TComDataCU* outTempCU, TComYuv* outPredYUV, PartSize partSize, bool bUseMRG = false);
+ void computeCostMerge2Nx2N(TComDataCU*& outBestCU, TComDataCU*& outTempCU, TComYuv*& bestPredYuv, TComYuv*& tmpPredYuv);
void encodeResAndCalcRDIntraInInter(TComDataCU* cu, TComYuv* fencYuv, TComYuv* predYuv, TShortYUV* outResiYuv, TComYuv* outReconYuv);
void recurEncodeResNoRD(TComDataCU* lcu, TComDataCU* cu, uint32_t absPartIdx, UChar depth);
void xCheckRDCostIntra(TComDataCU*& outBestCU, TComDataCU*& outTempCU, PartSize partSize);
diff -r d23e0552587d -r 6605fc7ee05a source/encoder/compress.cpp
--- a/source/encoder/compress.cpp Tue Dec 24 09:47:31 2013 +0530
+++ b/source/encoder/compress.cpp Tue Dec 24 09:50:51 2013 +0530
@@ -76,7 +76,7 @@
cu->m_totalCost = m_rdCost->calcRdCost(cu->m_totalDistortion, cu->m_totalBits);
}
-void TEncCu::xComputeCostIntraInInter(TComDataCU* cu, PartSize partSize)
+void TEncCu::computeCostIntraInInter(TComDataCU* cu, PartSize partSize)
{
uint32_t depth = cu->getDepth(0);
@@ -193,7 +193,7 @@
}
/** check RD costs for a CU block encoded with merge */
-void TEncCu::xComputeCostInter(TComDataCU* outTempCU, TComYuv* outPredYuv, PartSize partSize, bool bUseMRG)
+void TEncCu::computeCostInter(TComDataCU* outTempCU, TComYuv* outPredYuv, PartSize partSize, bool bUseMRG)
{
UChar depth = outTempCU->getDepth(0);
@@ -213,7 +213,7 @@
outTempCU->m_totalCost = m_rdCost->calcRdSADCost(distortion, outTempCU->m_totalBits);
}
-void TEncCu::xComputeCostMerge2Nx2N(TComDataCU*& outBestCU, TComDataCU*& outTempCU, TComYuv*& bestPredYuv, TComYuv*& yuvReconBest)
+void TEncCu::computeCostMerge2Nx2N(TComDataCU*& outBestCU, TComDataCU*& outTempCU, TComYuv*& bestPredYuv, TComYuv*& yuvReconBest)
{
assert(outTempCU->getSlice()->getSliceType() != I_SLICE);
TComMvField mvFieldNeighbours[MRG_MAX_NUM_CANDS << 1]; // double length for mv of both lists
@@ -317,7 +317,7 @@
x265_emms();
}
-void TEncCu::xCompressInterCU(TComDataCU*& outBestCU, TComDataCU*& outTempCU, TComDataCU*& cu, uint32_t depth, uint32_t PartitionIndex, UChar minDepth)
+void TEncCu::compressInterCU(TComDataCU*& outBestCU, TComDataCU*& outTempCU, TComDataCU*& cu, uint32_t depth, uint32_t PartitionIndex, UChar minDepth)
{
m_abortFlag = false;
@@ -408,7 +408,7 @@
}
/* Compute Merge Cost */
- xComputeCostMerge2Nx2N(m_bestMergeCU[depth], m_mergeCU[depth], m_modePredYuv[3][depth], m_bestMergeRecoYuv[depth]);
+ computeCostMerge2Nx2N(m_bestMergeCU[depth], m_mergeCU[depth], m_modePredYuv[3][depth], m_bestMergeRecoYuv[depth]);
TComYuv* bestMergePred;
bestMergePred = m_modePredYuv[3][depth];
bool earlyskip = false;
@@ -452,7 +452,7 @@
{
/*Compute 2Nx2N mode costs*/
{
- xComputeCostInter(m_interCU_2Nx2N[depth], m_modePredYuv[0][depth], SIZE_2Nx2N);
+ computeCostInter(m_interCU_2Nx2N[depth], m_modePredYuv[0][depth], SIZE_2Nx2N);
/*Choose best mode; initialise outBestCU to 2Nx2N*/
outBestCU = m_interCU_2Nx2N[depth];
tempYuv = m_modePredYuv[0][depth];
@@ -463,8 +463,8 @@
/*Compute Rect costs*/
if (m_cfg->param.bEnableRectInter)
{
- xComputeCostInter(m_interCU_Nx2N[depth], m_modePredYuv[1][depth], SIZE_Nx2N);
- xComputeCostInter(m_interCU_2NxN[depth], m_modePredYuv[2][depth], SIZE_2NxN);
+ computeCostInter(m_interCU_Nx2N[depth], m_modePredYuv[1][depth], SIZE_Nx2N);
+ computeCostInter(m_interCU_2NxN[depth], m_modePredYuv[2][depth], SIZE_2NxN);
}
if (m_interCU_Nx2N[depth]->m_totalCost < outBestCU->m_totalCost)
@@ -525,7 +525,7 @@
}
if (bdoIntra)
{
- xComputeCostIntraInInter(m_intraInInterCU[depth], SIZE_2Nx2N);
+ computeCostIntraInInter(m_intraInInterCU[depth], SIZE_2Nx2N);
if (m_cfg->param.rdLevel > 2)
{
encodeResAndCalcRDIntraInInter(m_intraInInterCU[depth], m_origYuv[depth], m_modePredYuv[5][depth],
@@ -717,7 +717,7 @@
{
m_rdSbacCoders[nextDepth][CI_CURR_BEST]->load(m_rdSbacCoders[nextDepth][CI_NEXT_BEST]);
}
- xCompressInterCU(subBestPartCU, subTempPartCU, outTempCU, nextDepth, nextDepth_partIndex, minDepth);
+ compressInterCU(subBestPartCU, subTempPartCU, outTempCU, nextDepth, nextDepth_partIndex, minDepth);
#if EARLY_EXIT
if (subBestPartCU->getPredictionMode(0) != MODE_INTRA)
{
More information about the x265-devel
mailing list