Changeset 488 in SHVCSoftware for branches

Timestamp:

16 Nov 2013, 03:39:23 (11 years ago)

Author:

seregin

Message:

fix WP with ILR picture

Location:

branches/SHM-4.0-dev/source/Lib

Files:

• TLibCommon/TypeDef.h (modified) (1 diff)
• TLibEncoder/WeightPredAnalysis.cpp (modified) (4 diffs)

branches/SHM-4.0-dev/source/Lib/TLibCommon/TypeDef.h

@@ -46 +46 @@
 #if SVC_EXTENSION
 #define O0194_DIFFERENT_BITDEPTH_EL_BL   1      ///< JCTVC-O0194: Support for different bitdepth values for BL and EL, add required configuration parameters (and Some bugfixes when REPN_FORMAT_IN_VPS (JCTVC-N0092) is enabled)
+#if O0194_DIFFERENT_BITDEPTH_EL_BL
 #define O0194_JOINT_US_BITSHIFT          1      ///< JCTVC-O0194: Joint Upsampling and bit-shift
+#endif
 #define O0194_WEIGHTED_PREDICTION_CGS    1      ///< JCTVC-O0194: Weighted prediciton for color gamut scalability
 #define MFM_ENCCONSTRAINT                1      ///< JCTVC-O0216: Encoder constraint for motion field mapping

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

@@ -232 +232 @@
       slice->getRefPic(eRefPicList, refIdxTemp)->getSlice(0)->getWpAcDcParam(refWeightACDCParam);
 #if O0194_WEIGHTED_PREDICTION_CGS
-      if (slice->getRefPic(eRefPicList, refIdxTemp)->isILR(slice->getLayerId()))
+      UInt currLayerId = slice->getLayerId();
+      UInt refLayerId  = slice->getRefPic(eRefPicList, refIdxTemp)->getLayerId();
+      Bool validILRPic = slice->getRefPic(eRefPicList, refIdxTemp)->isILR( currLayerId ) && !( refLayerId == 0 && slice->getVPS()->getAvcBaseLayerFlag() );
+
+      if( validILRPic )
       {
         refWeightACDCParam = (wpACDCParam *)g_refWeightACDCParam;
@@ -251 +255 @@
         Int64 refAC = refWeightACDCParam[comp].iAC;
 #if O0194_WEIGHTED_PREDICTION_CGS
-        if (slice->getRefPic(eRefPicList, refIdxTemp)->isILR(slice->getLayerId()))
+        if( validILRPic )
         {
           refAC = ( refAC * currWeightACDCParam[comp].iSamples ) /refWeightACDCParam[comp].iSamples;
 #if O0194_JOINT_US_BITSHIFT
-          refAC <<= (g_bitDepthYLayer[1]-g_bitDepthYLayer[0]);
-          refDC <<= (g_bitDepthYLayer[1]-g_bitDepthYLayer[0]);
+          refAC <<= (g_bitDepthYLayer[currLayerId]-g_bitDepthYLayer[refLayerId]);
+          refDC <<= (g_bitDepthYLayer[currLayerId]-g_bitDepthYLayer[refLayerId]);
 #endif
         }
@@ -266 +270 @@
         Int offset = (Int)( ((currDC<<log2Denom) - ((Int64)weight * refDC) + (Int64)realOffset) >> realLog2Denom );
 #if O0194_WEIGHTED_PREDICTION_CGS
-        if (slice->getRefPic(eRefPicList, refIdxTemp)->isILR(slice->getLayerId()))
-        {
-        }
-        else
+        if( !validILRPic )
         {
           dWeight = 1;
@@ -297 +298 @@
 #if O0194_WEIGHTED_PREDICTION_CGS
         // make sure the reference frames other than ILR are not using weighted prediction
-        if (!(slice->getRefPic(eRefPicList, refIdxTemp)->isILR(slice->getLayerId())))
+        else
+        if( !validILRPic )
         {
           continue;