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

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

Files:

• App/TAppEncoder/TAppEncCfg.cpp (modified) (3 diffs)
• App/TAppEncoder/TAppEncCfg.h (modified) (1 diff)
• App/TAppEncoder/TAppEncTop.cpp (modified) (2 diffs)
• Lib/TLibEncoder/TEncGOP.cpp (modified) (1 diff)
• Lib/TLibEncoder/TEncSlice.cpp (modified) (1 diff)
• Lib/TLibEncoder/TEncTop.h (modified) (2 diffs)

branches/SHM-5.0-dev/source/App/TAppEncoder/TAppEncCfg.cpp

@@ -587 +587 @@
 #endif
 #if N0147_IRAP_ALIGN_FLAG
-    ("CrossLayerIrapAlignFlag", m_crossLayerIrapAlignFlag, true, "align IRAP across layers" )  
+  ("CrossLayerIrapAlignFlag", m_crossLayerIrapAlignFlag, true, "align IRAP across layers" )  
+#endif
+#if O0194_WEIGHTED_PREDICTION_CGS
+  ("InterLayerWeightedPred", m_useInterLayerWeightedPred, false, "enable IL WP parameters estimation at encoder" )  
 #endif
 #if AVC_BASE
@@ -2347 +2350 @@
   printf("Cross layer IRAP alignment    : %d\n", m_crossLayerIrapAlignFlag );
 #endif
+#if O0194_WEIGHTED_PREDICTION_CGS
+  printf("InterLayerWeightedPred        : %d\n", m_useInterLayerWeightedPred );
+#endif
   for(UInt layer=0; layer<m_numLayers; layer++)
   {
@@ -2492 +2498 @@
   printf("O0194_DIFFERENT_BITDEPTH_EL_BL: %d ", O0194_DIFFERENT_BITDEPTH_EL_BL);
   printf("O0194_JOINT_US_BITSHIFT: %d ", O0194_JOINT_US_BITSHIFT);
-  printf("O0194_WEIGHTED_PREDICTION_CGS: %d ",O0194_WEIGHTED_PREDICTION_CGS);
 #else
   printf("RecalQP:%d", m_recalculateQPAccordingToLambda ? 1 : 0 );

branches/SHM-5.0-dev/source/App/TAppEncoder/TAppEncCfg.h

@@ -381 +381 @@
 #endif
 #if O0215_PHASE_ALIGNMENT
-  Bool m_phaseAlignFlag;
+  Bool      m_phaseAlignFlag;
 #endif
 #if O0223_PICTURE_TYPES_ALIGN_FLAG
-  Bool m_crossLayerPictureTypeAlignFlag;
+  Bool      m_crossLayerPictureTypeAlignFlag;
 #endif
 #if N0147_IRAP_ALIGN_FLAG
-  Bool m_crossLayerIrapAlignFlag;
+  Bool      m_crossLayerIrapAlignFlag;
 #endif
 #if O0149_CROSS_LAYER_BLA_FLAG
-  bool      m_crossLayerBLAFlag;
+  Bool      m_crossLayerBLAFlag;
+#endif
+#if O0194_WEIGHTED_PREDICTION_CGS
+  Bool      m_useInterLayerWeightedPred;
 #endif
 public:

branches/SHM-5.0-dev/source/App/TAppEncoder/TAppEncTop.cpp

@@ -178 +178 @@
 #endif
 
-#if O0194_WEIGHTED_PREDICTION_CGS
-  Bool bitDepthScalabilityFlag = false;
-  for(UInt layer=0; layer<m_numLayers; layer++)
-  {
-    if( m_acLayerCfg[0].m_internalBitDepthY != m_acLayerCfg[layer].m_internalBitDepthY )
-    {
-      bitDepthScalabilityFlag = true;
-      break;
-    }
-  }
-#endif
-
   for(UInt layer=0; layer<m_numLayers; layer++)
   {
@@ -205 +193 @@
 
 #if O0194_WEIGHTED_PREDICTION_CGS
-    m_acTEncTop[layer].setBitDepthScalabilityFlag( bitDepthScalabilityFlag );
+    m_acTEncTop[layer].setInterLayerWeightedPredFlag( m_useInterLayerWeightedPred );
 #endif
 #endif

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