Changeset 574 in SHVCSoftware for branches/SHM-5.0-dev/source/Lib

Timestamp:

28 Jan 2014, 19:40:20 (11 years ago)

Author:

seregin

Message:

move IL WP setting into the config file

Location:

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

Files:

• TEncGOP.cpp (modified) (1 diff)
• TEncSlice.cpp (modified) (1 diff)
• TEncTop.h (modified) (2 diffs)

branches/SHM-5.0-dev/source/Lib/TLibEncoder/TEncGOP.cpp

@@ -1558 +1558 @@
 #if O0194_WEIGHTED_PREDICTION_CGS
       // Calculate for the base layer to be used in EL as Inter layer reference
-      if( m_pcEncTop->getBitDepthScalabilityFlag() )
+      if( m_pcEncTop->getInterLayerWeightedPredFlag() )
       {
         m_pcSliceEncoder->estimateILWpParam( pcSlice );

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

@@ -811 +811 @@
   }
 #if O0194_WEIGHTED_PREDICTION_CGS
-  else if( m_ppcTEncTop[pcSlice->getLayerId()]->getBitDepthScalabilityFlag() )
+  else if( m_ppcTEncTop[pcSlice->getLayerId()]->getInterLayerWeightedPredFlag() )
   {
     // Calculate for the base layer to be used in EL as Inter layer reference

branches/SHM-5.0-dev/source/Lib/TLibEncoder/TEncTop.h

@@ -152 +152 @@
 #endif
 #if O0194_WEIGHTED_PREDICTION_CGS
-  Bool                    m_bitDepthScalabilityFlag;
+  Bool                    m_interLayerWeightedPredFlag;
 #endif
 #endif //SVC_EXTENSION
@@ -238 +238 @@
 #endif
 #if O0194_WEIGHTED_PREDICTION_CGS
-  Void      setBitDepthScalabilityFlag(Bool flag)   { m_bitDepthScalabilityFlag = flag; }
-  Bool      getBitDepthScalabilityFlag()            { return m_bitDepthScalabilityFlag; }
+  Void      setInterLayerWeightedPredFlag(Bool flag)   { m_interLayerWeightedPredFlag = flag; }
+  Bool      getInterLayerWeightedPredFlag()            { return m_interLayerWeightedPredFlag; }
 #endif
 #if AVC_SYNTAX