Changeset 1330 in SHVCSoftware for branches/SHM-dev/source/Lib

Timestamp:

22 Jul 2015, 01:27:17 (9 years ago)

Author:

seregin

Message:

port rev 4408

Location:

branches/SHM-dev/source/Lib

Files:

• TLibCommon/CommonDef.h (modified) (1 diff)
• TLibEncoder/TEncCfg.h (modified) (3 diffs)
• TLibEncoder/TEncSlice.cpp (modified) (1 diff)

branches/SHM-dev/source/Lib/TLibCommon/CommonDef.h

@@ -199 +199 @@
 // Explicit temporal layer QP offset
 #define MAX_TLAYER                  7           ///< max number of temporal layer
-#define HB_LAMBDA_FOR_LDC           1           ///< use of B-style lambda for non-key pictures in low-delay mode
 
 // Fast estimation of generalized B in low-delay mode

branches/SHM-dev/source/Lib/TLibEncoder/TEncCfg.h

@@ -224 +224 @@
   Bool      m_bFastUDIUseMPMEnabled;
   Bool      m_bFastMEForGenBLowDelayEnabled;
+  Bool      m_bUseBLambdaForNonKeyLowDelayPictures;
   Bool      m_usePCM;
   Int       m_PCMBitDepth[MAX_NUM_CHANNEL_TYPE];
@@ -644 +645 @@
   Void      setFastUDIUseMPMEnabled         ( Bool  b )     { m_bFastUDIUseMPMEnabled = b; }
   Void      setFastMEForGenBLowDelayEnabled ( Bool  b )     { m_bFastMEForGenBLowDelayEnabled = b; }
+  Void      setUseBLambdaForNonKeyLowDelayPictures ( Bool b ) { m_bUseBLambdaForNonKeyLowDelayPictures = b; }
+
   Void      setPCMInputBitDepthFlag         ( Bool  b )     { m_bPCMInputBitDepthFlag = b; }
   Void      setPCMFilterDisableFlag         ( Bool  b )     {  m_bPCMFilterDisableFlag = b; }
@@ -668 +671 @@
   Bool      getFastUDIUseMPMEnabled         ()      { return m_bFastUDIUseMPMEnabled; }
   Bool      getFastMEForGenBLowDelayEnabled ()      { return m_bFastMEForGenBLowDelayEnabled; }
+  Bool      getUseBLambdaForNonKeyLowDelayPictures () { return m_bUseBLambdaForNonKeyLowDelayPictures; }
   Bool      getPCMInputBitDepthFlag         ()      { return m_bPCMInputBitDepthFlag;   }
   Bool      getPCMFilterDisableFlag         ()      { return m_bPCMFilterDisableFlag;   }

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

@@ -445 +445 @@
   setUpLambda(rpcSlice, dLambda, iQP);
 #endif
-#if HB_LAMBDA_FOR_LDC
-  // restore original slice type
-
-  if(!(isField && pocLast == 1) || !m_pcCfg->getEfficientFieldIRAPEnabled())
-  {
+
+  if (m_pcCfg->getFastMEForGenBLowDelayEnabled())
+  {
+    // restore original slice type
+
+    if(!(isField && pocLast == 1) || !m_pcCfg->getEfficientFieldIRAPEnabled())
+    {
 #if ALLOW_RECOVERY_POINT_AS_RAP
-    if(m_pcCfg->getDecodingRefreshType() == 3)
-    {
-      eSliceType = (pocLast == 0 || (pocCurr)                     % m_pcCfg->getIntraPeriod() == 0 || m_pcGOPEncoder->getGOPSize() == 0) ? I_SLICE : eSliceType;
-    }
-    else
-    {
-#endif
-      eSliceType = (pocLast == 0 || (pocCurr - (isField ? 1 : 0)) % m_pcCfg->getIntraPeriod() == 0 || m_pcGOPEncoder->getGOPSize() == 0) ? I_SLICE : eSliceType;
+      if(m_pcCfg->getDecodingRefreshType() == 3)
+      {
+        eSliceType = (pocLast == 0 || (pocCurr)                     % m_pcCfg->getIntraPeriod() == 0 || m_pcGOPEncoder->getGOPSize() == 0) ? I_SLICE : eSliceType;
+      }
+      else
+      {
+#endif
+        eSliceType = (pocLast == 0 || (pocCurr - (isField ? 1 : 0)) % m_pcCfg->getIntraPeriod() == 0 || m_pcGOPEncoder->getGOPSize() == 0) ? I_SLICE : eSliceType;
 #if ALLOW_RECOVERY_POINT_AS_RAP
-    }
-#endif
-  }
-
-#if SVC_EXTENSION
-  if( m_pcCfg->getLayerId() > 0 && m_pcCfg->getNumActiveRefLayers() > 0 )
-  {
-    eSliceType=B_SLICE;
-  }
-#endif
-  rpcSlice->setSliceType        ( eSliceType );
-#endif
+      }
+#endif
+    }
+
+#if SVC_EXTENSION
+    if( m_pcCfg->getLayerId() > 0 && m_pcCfg->getNumActiveRefLayers() > 0 )
+    {
+      eSliceType=B_SLICE;
+    }
+#endif
+
+    rpcSlice->setSliceType        ( eSliceType );
+  }
 
   if (m_pcCfg->getUseRecalculateQPAccordingToLambda())