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

branches/SHM-dev/source/Lib/TLibEncoder/WeightPredAnalysis.cpp

@@ -432 +432 @@
       {
         const ComponentID compID        = ComponentID(comp);
-#if SVC_EXTENSION
-        const Int         bitDepth      = slice->getBitDepth(toChannelType(compID));
-#else
         const Int         bitDepth      = slice->getSPS()->getBitDepth(toChannelType(compID));
-#endif
         const Int         range         = bUseHighPrecisionWeighting ? (1<<bitDepth)/2 : 128;
         const Int         realLog2Denom = log2Denom + (bUseHighPrecisionWeighting ? RExt__PREDICTION_WEIGHTING_ANALYSIS_DC_PRECISION : (bitDepth - 8));
@@ -453 +449 @@
           refAC = ( refAC * currWeightACDCParam[comp].numSamples ) / refWeightACDCParam[comp].numSamples;
 
-          const Int bitDepthLuma = slice->getBitDepth(CHANNEL_TYPE_LUMA);
-          const Int refBitDepthLuma  = slice->getRefPic(eRefPicList, refIdxTemp)->getSlice(0)->getBitDepth(CHANNEL_TYPE_LUMA);
+          const Int bitDepthLuma = slice->getSPS()->getBitDepth(CHANNEL_TYPE_LUMA);
+          const Int refBitDepthLuma  = slice->getRefPic(eRefPicList, refIdxTemp)->getSlice(0)->getSPS()->getBitDepth(CHANNEL_TYPE_LUMA);
           const Int delta = bitDepthLuma - refBitDepthLuma;
 
@@ -557 +553 @@
         const Int          width      = pPic->getWidth(compID);
         const Int          height     = pPic->getHeight(compID);
-#if SVC_EXTENSION
-        const Int          bitDepth   = slice->getBitDepth(toChannelType(compID));
-#else
         const Int          bitDepth   = slice->getSPS()->getBitDepth(toChannelType(compID));
-#endif
               WPScalingParam &wp      = m_wp[refList][refIdxTemp][compID];
               Int          weight     = wp.iWeight;
@@ -679 +671 @@
         const Int          width     = pPic->getWidth(compID);
         const Int          height    = pPic->getHeight(compID);
-#if SVC_EXTENSION
-        const Int          bitDepth   = slice->getBitDepth(toChannelType(compID));
-#else
         const Int          bitDepth   = slice->getSPS()->getBitDepth(toChannelType(compID));
-#endif
 
         // calculate SAD costs with/without wp for luma