Changeset 573 in SHVCSoftware

Timestamp:

28 Jan 2014, 18:21:52 (11 years ago)

Author:

seregin

Message:

add bitDepthScalability flag to invoke estimation of the WP parameters conditionally (encoder only)

Location:

branches/SHM-5.0-dev/source

Files:

• 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/TAppEncTop.cpp

@@ -177 +177 @@
   delete [] mapIdxToLayer;
 #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++)
   {
@@ -190 +203 @@
     g_bitDepthYLayer[layer] = g_bitDepthY;
     g_bitDepthCLayer[layer] = g_bitDepthC;
+
+#if O0194_WEIGHTED_PREDICTION_CGS
+    m_acTEncTop[layer].setBitDepthScalabilityFlag( bitDepthScalabilityFlag );
+#endif
 #endif
     //m_acTEncTop[layer].setVPS(&vps);

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
-      m_pcSliceEncoder->estimateILWpParam( pcSlice );
+      if( m_pcEncTop->getBitDepthScalabilityFlag() )
+      {
+        m_pcSliceEncoder->estimateILWpParam( pcSlice );
+      }
 #endif
 #if AVC_SYNTAX

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

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

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

@@ -151 +151 @@
   Bool                    m_noOutputOfPriorPicsFlags;
 #endif
+#if O0194_WEIGHTED_PREDICTION_CGS
+  Bool                    m_bitDepthScalabilityFlag;
+#endif
 #endif //SVC_EXTENSION
 protected:
@@ -234 +237 @@
   Bool      getMFMEnabledFlag()                   {return m_bMFMEnabledFlag;}    
 #endif
+#if O0194_WEIGHTED_PREDICTION_CGS
+  Void      setBitDepthScalabilityFlag(Bool flag)   { m_bitDepthScalabilityFlag = flag; }
+  Bool      getBitDepthScalabilityFlag()            { return m_bitDepthScalabilityFlag; }
+#endif
 #if AVC_SYNTAX
   Void      setBLSyntaxFile( fstream* pFile ) { m_pBLSyntaxFile = pFile; }