[x265] [PATCH] no-rdo: remove unused checks
sumalatha at multicorewareinc.com
sumalatha at multicorewareinc.com
Wed Oct 16 08:47:32 CEST 2013
# HG changeset patch
# User Sumalatha Polureddy
# Date 1381906041 -19800
# Node ID 3cdbc62783e197cd5cf6dcf5b1cc76e2cd6d93c2
# Parent 09c0e0209d84313a49a15ac3806f03223a1546de
no-rdo: remove unused checks
diff -r 09c0e0209d84 -r 3cdbc62783e1 source/Lib/TLibEncoder/TEncCu.cpp
--- a/source/Lib/TLibEncoder/TEncCu.cpp Wed Oct 16 10:11:23 2013 +0530
+++ b/source/Lib/TLibEncoder/TEncCu.cpp Wed Oct 16 12:17:21 2013 +0530
@@ -1611,14 +1611,6 @@
m_rdGoOnSbacCoder->store(m_rdSbacCoders[depth][CI_TEMP_BEST]);
outTempCU->m_totalBits = m_entropyCoder->getNumberOfWrittenBits();
- if (!m_cfg->param.bEnableRDO)
- {
- UInt partEnum = PartitionFromSizes(outTempCU->getWidth(0), outTempCU->getHeight(0));
- UInt SATD = primitives.satd[partEnum](m_origYuv[depth]->getLumaAddr(), m_origYuv[depth]->getStride(),
- m_tmpPredYuv[depth]->getLumaAddr(), m_tmpPredYuv[depth]->getStride());
- x265_emms();
- outTempCU->m_totalDistortion = SATD;
- }
outTempCU->m_totalCost = m_rdCost->calcRdCost(outTempCU->m_totalDistortion, outTempCU->m_totalBits);
xCheckDQP(outTempCU);
diff -r 09c0e0209d84 -r 3cdbc62783e1 source/Lib/TLibEncoder/TEncSearch.cpp
--- a/source/Lib/TLibEncoder/TEncSearch.cpp Wed Oct 16 10:11:23 2013 +0530
+++ b/source/Lib/TLibEncoder/TEncSearch.cpp Wed Oct 16 12:17:21 2013 +0530
@@ -2225,9 +2225,6 @@
UChar interDirNeighbours[MRG_MAX_NUM_CANDS];
int numValidMergeCand = 0;
- if (!m_cfg->param.bEnableRDO)
- cu->m_totalCost = 0;
-
for (int partIdx = 0; partIdx < numPart; partIdx++)
{
UInt listCost[2] = { MAX_UINT, MAX_UINT };
@@ -2509,8 +2506,6 @@
#if CU_STAT_LOGFILE
meCost += mrgCost;
#endif
- if (!m_cfg->param.bEnableRDO)
- cu->m_totalCost += mrgCost;
}
else
{
@@ -2524,15 +2519,8 @@
#if CU_STAT_LOGFILE
meCost += meCost;
#endif
- if (!m_cfg->param.bEnableRDO)
- cu->m_totalCost += meCost;
}
}
- else
- {
- if (!m_cfg->param.bEnableRDO)
- cu->m_totalCost += costTemp;
- }
motionCompensation(cu, predYuv, REF_PIC_LIST_X, partIdx);
}
More information about the x265-devel
mailing list