[x265] [PATCH 5 of 6] cleanup: remove unused code invRecurTransformNxN
Min Chen
chenm003 at 163.com
Fri Aug 16 12:52:35 CEST 2013
# HG changeset patch
# User Min Chen <chenm003 at 163.com>
# Date 1376650260 -28800
# Node ID 983cc77e85267cfc8c86cf4cd4a2b0054ce5e247
# Parent 23b8aafb1fded20981d39cf5cae48c59f041bef8
cleanup: remove unused code invRecurTransformNxN
diff -r 23b8aafb1fde -r 983cc77e8526 source/Lib/TLibCommon/TComTrQuant.cpp
--- a/source/Lib/TLibCommon/TComTrQuant.cpp Fri Aug 16 18:50:20 2013 +0800
+++ b/source/Lib/TLibCommon/TComTrQuant.cpp Fri Aug 16 18:51:00 2013 +0800
@@ -495,57 +495,6 @@
}
}
-Void TComTrQuant::invRecurTransformNxN(TComDataCU* cu, UInt absPartIdx, TextType eTxt, Short* residual, UInt addr, UInt stride, UInt width, UInt height, UInt maxTrMode, UInt trMode, TCoeff* coeff)
-{
- if (!cu->getCbf(absPartIdx, eTxt, trMode))
- {
- return;
- }
- const UInt stopTrMode = cu->getTransformIdx(absPartIdx);
-
- if (trMode == stopTrMode)
- {
- UInt depth = cu->getDepth(absPartIdx) + trMode;
- UInt log2TrSize = g_convertToBit[cu->getSlice()->getSPS()->getMaxCUWidth() >> depth] + 2;
- if (eTxt != TEXT_LUMA && log2TrSize == 2)
- {
- UInt qpDiv = cu->getPic()->getNumPartInCU() >> ((depth - 1) << 1);
- if ((absPartIdx % qpDiv) != 0)
- {
- return;
- }
- width <<= 1;
- height <<= 1;
- }
- Short* resi = residual + addr;
- Int scalingListType = (cu->isIntra(absPartIdx) ? 0 : 3) + g_eTTable[(Int)eTxt];
- assert(scalingListType < 6);
- invtransformNxN(cu->getCUTransquantBypass(absPartIdx), REG_DCT, resi, stride, coeff, width, height, scalingListType, cu->getTransformSkip(absPartIdx, eTxt));
- }
- else
- {
- trMode++;
- width >>= 1;
- height >>= 1;
- Int trWidth = width, trHeight = height;
- UInt addrOffset = trHeight * stride;
- UInt coefOffset = trWidth * trHeight;
- UInt partOffset = cu->getTotalNumPart() >> (trMode << 1);
- {
- invRecurTransformNxN(cu, absPartIdx, eTxt, residual, addr, stride, width, height, maxTrMode, trMode, coeff);
- coeff += coefOffset;
- absPartIdx += partOffset;
- invRecurTransformNxN(cu, absPartIdx, eTxt, residual, addr + trWidth, stride, width, height, maxTrMode, trMode, coeff);
- coeff += coefOffset;
- absPartIdx += partOffset;
- invRecurTransformNxN(cu, absPartIdx, eTxt, residual, addr + addrOffset, stride, width, height, maxTrMode, trMode, coeff);
- coeff += coefOffset;
- absPartIdx += partOffset;
- invRecurTransformNxN(cu, absPartIdx, eTxt, residual, addr + addrOffset + trWidth, stride, width, height, maxTrMode, trMode, coeff);
- }
- }
-}
-
// ------------------------------------------------------------------------------------------------
// Logical transform
// ------------------------------------------------------------------------------------------------
diff -r 23b8aafb1fde -r 983cc77e8526 source/Lib/TLibCommon/TComTrQuant.h
--- a/source/Lib/TLibCommon/TComTrQuant.h Fri Aug 16 18:50:20 2013 +0800
+++ b/source/Lib/TLibCommon/TComTrQuant.h Fri Aug 16 18:51:00 2013 +0800
@@ -129,9 +129,6 @@
Void invtransformNxN(Bool transQuantBypass, UInt mode, Short* residual, UInt stride, TCoeff* coeff, UInt width, UInt height, Int scalingListType, Bool useTransformSkip = false, int lastPos = MAX_INT);
- Void invRecurTransformNxN(TComDataCU* cu, UInt absPartIdx, TextType ttype, Short* residual, UInt addr, UInt stride,
- UInt width, UInt height, UInt maxTrMode, UInt trMode, TCoeff* coeff);
-
// Misc functions
Void setQPforQuant(Int qpy, TextType ttype, Int qpBdOffset, Int chromaQPOffset);
More information about the x265-devel
mailing list