Changeset 1502 in SHVCSoftware for branches/SHM-dev/source/Lib/TLibCommon/TComTrQuant.cpp

Timestamp:

11 Dec 2015, 00:05:48 (8 years ago)

Author:

seregin

Message:

infer parameters in SPS after activation, fixing chroma scaling for non 4:2:0

File:

• branches/SHM-dev/source/Lib/TLibCommon/TComTrQuant.cpp (modified) (10 diffs)

branches/SHM-dev/source/Lib/TLibCommon/TComTrQuant.cpp

@@ -114 +114 @@
   *this = QpParam(cu.getQP( 0 ),
                   toChannelType(compID),
-#if SVC_EXTENSION
-                  cu.getSlice()->getQpBDOffset(toChannelType(compID)),
-#else
                   cu.getSlice()->getSPS()->getQpBDOffset(toChannelType(compID)),
-#endif
                   chromaQpOffset,
                   cu.getPic()->getChromaFormat());
@@ -1143 +1139 @@
   TComDataCU* pcCU          = rTu.getCU();
   const UInt uiAbsPartIdx   = rTu.GetAbsPartIdxTU();
-#if SVC_EXTENSION
-  const Int channelBitDepth = pcCU->getSlice()->getBitDepth(toChannelType(compID));
-#else
   const Int channelBitDepth = pcCU->getSlice()->getSPS()->getBitDepth(toChannelType(compID));
-#endif
 
   TCoeff* piCoef    = pSrc;
@@ -1345 +1337 @@
   const Int                  channelBitDepth    = pcCU->getSlice()->getSPS()->getStreamBitDepth(toChannelType(compID));
 #else
-#if SVC_EXTENSION
-  const Int                  channelBitDepth    = pcCU->getSlice()->getBitDepth(toChannelType(compID));
-#else
   const Int                  channelBitDepth    = pcCU->getSlice()->getSPS()->getBitDepth(toChannelType(compID));
-#endif
 #endif
 
@@ -1529 +1517 @@
       else
       {
-#if SVC_EXTENSION
-        const Int channelBitDepth=pcCU->getSlice()->getBitDepth(toChannelType(compID));
-#else
         const Int channelBitDepth=pcCU->getSlice()->getSPS()->getBitDepth(toChannelType(compID));
-#endif
         xT( channelBitDepth, rTu.useDST(compID), pcResidual, uiStride, m_plTempCoeff, uiWidth, uiHeight, pcCU->getSlice()->getSPS()->getMaxLog2TrDynamicRange(toChannelType(compID)) );
       }
@@ -1667 +1651 @@
       const Int channelBitDepth = pcCU->getSlice()->getSPS()->getStreamBitDepth(toChannelType(compID));
 #else
-#if SVC_EXTENSION
-      const Int channelBitDepth = pcCU->getSlice()->getBitDepth(toChannelType(compID));
-#else
       const Int channelBitDepth = pcCU->getSlice()->getSPS()->getBitDepth(toChannelType(compID));
-#endif
 #endif
       xIT( channelBitDepth, rTu.useDST(compID), m_plTempCoeff, pcResidual, uiStride, uiWidth, uiHeight, pcCU->getSlice()->getSPS()->getMaxLog2TrDynamicRange(toChannelType(compID)) );
@@ -2045 +2025 @@
   const Int height          = rect.height;
   const Int maxLog2TrDynamicRange = rTu.getCU()->getSlice()->getSPS()->getMaxLog2TrDynamicRange(toChannelType(component));
-#if SVC_EXTENSION
-  const Int channelBitDepth = rTu.getCU()->getSlice()->getBitDepth(toChannelType(component));
-#else
   const Int channelBitDepth = rTu.getCU()->getSlice()->getSPS()->getBitDepth(toChannelType(component));
-#endif
 
   Int iTransformShift = getTransformShift(channelBitDepth, rTu.GetEquivalentLog2TrSize(component), maxLog2TrDynamicRange);
@@ -2101 +2077 @@
   const Int channelBitDepth = rTu.getCU()->getSlice()->getSPS()->getStreamBitDepth(toChannelType(component));
 #else
-#if SVC_EXTENSION
-  const Int channelBitDepth = rTu.getCU()->getSlice()->getBitDepth(toChannelType(component));
-#else
   const Int channelBitDepth = rTu.getCU()->getSlice()->getSPS()->getBitDepth(toChannelType(component));
-#endif
 #endif
 
@@ -2175 +2147 @@
   const Bool             extendedPrecision = pcCU->getSlice()->getSPS()->getSpsRangeExtension().getExtendedPrecisionProcessingFlag();
   const Int              maxLog2TrDynamicRange = pcCU->getSlice()->getSPS()->getMaxLog2TrDynamicRange(toChannelType(compID));
-#if SVC_EXTENSION
-  const Int              channelBitDepth = rTu.getCU()->getSlice()->getBitDepth(channelType);
-#else
   const Int              channelBitDepth = rTu.getCU()->getSlice()->getSPS()->getBitDepth(channelType);
-#endif
 
   /* for 422 chroma blocks, the effective scaling applied during transformation is not a power of 2, hence it cannot be
@@ -3364 +3332 @@
   const UInt           uiHeight                       = rect.height;
   const Int            maxLog2TrDynamicRange          = pcCU->getSlice()->getSPS()->getMaxLog2TrDynamicRange(toChannelType(compID));
-#if SVC_EXTENSION
-  const Int            channelBitDepth                = pcCU->getSlice()->getBitDepth(toChannelType(compID));
-#else
   const Int            channelBitDepth                = pcCU->getSlice()->getSPS()->getBitDepth(toChannelType(compID));
-#endif
   const Int            iTransformShift                = getTransformShift(channelBitDepth, rTu.GetEquivalentLog2TrSize(compID), maxLog2TrDynamicRange);
   const Int            scalingListType                = getScalingListType(pcCU->getPredictionMode(uiAbsPartIdx), compID);
@@ -3431 +3395 @@
   const Int            channelBitDepth    = pcCU->getSlice()->getSPS()->getStreamBitDepth(toChannelType(compID));
 #else
-#if SVC_EXTENSION
-  const Int            channelBitDepth    = pcCU->getSlice()->getBitDepth(toChannelType(compID));
-#else
   const Int            channelBitDepth    = pcCU->getSlice()->getSPS()->getBitDepth(toChannelType(compID));
-#endif
 #endif
   const Int            iTransformShift    = getTransformShift(channelBitDepth, rTu.GetEquivalentLog2TrSize(compID), maxLog2TrDynamicRange);