Changeset 1502 in SHVCSoftware for branches/SHM-dev/source/Lib/TLibCommon/TComWeightPrediction.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/TComWeightPrediction.cpp (modified) (4 diffs)

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

@@ -290 +290 @@
     for ( Int yuv=0 ; yuv<numValidComponent ; yuv++ )
     {
-#if SVC_EXTENSION
-      const Int bitDepth            = pcSlice->getBitDepth(toChannelType(ComponentID(yuv)));
-#else
       const Int bitDepth            = pcSlice->getSPS()->getBitDepth(toChannelType(ComponentID(yuv)));
-#endif
       const Int offsetScalingFactor = bUseHighPrecisionPredictionWeighting ? 1 : (1 << (bitDepth-8));
 
@@ -315 +311 @@
     for ( Int yuv=0 ; yuv<numValidComponent ; yuv++ )
     {
-#if SVC_EXTENSION
-      const Int bitDepth            = pcSlice->getBitDepth(toChannelType(ComponentID(yuv)));
-#else
       const Int bitDepth            = pcSlice->getSPS()->getBitDepth(toChannelType(ComponentID(yuv)));
-#endif
       const Int offsetScalingFactor = bUseHighPrecisionPredictionWeighting ? 1 : (1 << (bitDepth-8));
 
@@ -351 +343 @@
   if( iRefIdx0 >= 0 && iRefIdx1 >= 0 )
   {
-#if SVC_EXTENSION
-    addWeightBi(pcYuvSrc0, pcYuvSrc1, pcCU->getSlice()->getBitDepths(), uiPartIdx, iWidth, iHeight, pwp0, pwp1, rpcYuvDst );
-#else
     addWeightBi(pcYuvSrc0, pcYuvSrc1, pcCU->getSlice()->getSPS()->getBitDepths(), uiPartIdx, iWidth, iHeight, pwp0, pwp1, rpcYuvDst );
-#endif
   }
   else if ( iRefIdx0 >= 0 && iRefIdx1 <  0 )
   {
-#if SVC_EXTENSION
-    addWeightUni( pcYuvSrc0, pcCU->getSlice()->getBitDepths(), uiPartIdx, iWidth, iHeight, pwp0, rpcYuvDst );
-#else
     addWeightUni( pcYuvSrc0, pcCU->getSlice()->getSPS()->getBitDepths(), uiPartIdx, iWidth, iHeight, pwp0, rpcYuvDst );
-#endif
   }
   else if ( iRefIdx0 <  0 && iRefIdx1 >= 0 )
   {
-#if SVC_EXTENSION
-    addWeightUni( pcYuvSrc1, pcCU->getSlice()->getBitDepths(), uiPartIdx, iWidth, iHeight, pwp1, rpcYuvDst );
-#else
     addWeightUni( pcYuvSrc1, pcCU->getSlice()->getSPS()->getBitDepths(), uiPartIdx, iWidth, iHeight, pwp1, rpcYuvDst );
-#endif
   }
   else
@@ -407 +387 @@
     getWpScaling(pcCU, -1, iRefIdx, pwpTmp, pwp);
   }
-#if SVC_EXTENSION
-  addWeightUni( pcYuvSrc, pcCU->getSlice()->getBitDepths(), uiPartAddr, iWidth, iHeight, pwp, pcYuvPred );
-#else
   addWeightUni( pcYuvSrc, pcCU->getSlice()->getSPS()->getBitDepths(), uiPartAddr, iWidth, iHeight, pwp, pcYuvPred );
-#endif
-}
+}