Changeset 468 in SHVCSoftware for branches/SHM-4.0-dev/source/Lib/TLibEncoder

Timestamp:

14 Nov 2013, 09:02:43 (11 years ago)

Author:

nokia

Message:

Integration of O0194: Support different bit-depth values for different layers, enable weighted prediction for ILR for color gamut scalability.

Location:

branches/SHM-4.0-dev/source/Lib/TLibEncoder

Files:

• TEncSlice.cpp (modified) (1 diff)
• WeightPredAnalysis.cpp (modified) (4 diffs)

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

@@ -931 +931 @@
   }
 #if O0194_WEIGHTED_PREDICTION_CGS
-  else{
+  else
+  {
     // Calculate for the base layer to be used in EL as Inter layer reference
     xCalcACDCParamSlice(pcSlice);

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(1)){
+      if (slice->getRefPic(eRefPicList, refIdxTemp)->isILR(slice->getLayerId()))
+      {
         refWeightACDCParam = (wpACDCParam *)g_refWeightACDCParam;
       }
@@ -250 +251 @@
         Int64 refAC = refWeightACDCParam[comp].iAC;
 #if O0194_WEIGHTED_PREDICTION_CGS
-        if (slice->getRefPic(eRefPicList, refIdxTemp)->isILR(1)){
+        if (slice->getRefPic(eRefPicList, refIdxTemp)->isILR(slice->getLayerId()))
+        {
           refAC *= (double)currWeightACDCParam[comp].iSamples/refWeightACDCParam[comp].iSamples;
 #if O0194_JOINT_US_BITSHIFT
@@ -264 +266 @@
         Int offset = (Int)( ((currDC<<log2Denom) - ((Int64)weight * refDC) + (Int64)realOffset) >> realLog2Denom );
 #if O0194_WEIGHTED_PREDICTION_CGS
-        if (slice->getRefPic(eRefPicList, refIdxTemp)->isILR(1)){
+        if (slice->getRefPic(eRefPicList, refIdxTemp)->isILR(slice->getLayerId())){
         }
         else{
@@ -293 +295 @@
 #if O0194_WEIGHTED_PREDICTION_CGS
         // make sure the reference frames other than ILR are not using weighted prediction
-        if (!(slice->getRefPic(eRefPicList, refIdxTemp)->isILR(1)))
-        {
+        if (!(slice->getRefPic(eRefPicList, refIdxTemp)->isILR(slice->getLayerId()))){
           continue;
         }