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

Timestamp:

22 Jul 2015, 00:07:31 (9 years ago)

Author:

seregin

Message:

port rev 4402

Location:

branches/SHM-dev/source/Lib

Files:

• TLibCommon/TComYuv.cpp (modified) (3 diffs)
• TLibCommon/TComYuv.h (modified) (1 diff)
• TLibCommon/TypeDef.h (modified) (1 diff)
• TLibEncoder/TEncCfg.h (modified) (3 diffs)
• TLibEncoder/TEncSearch.cpp (modified) (1 diff)

branches/SHM-dev/source/Lib/TLibCommon/TComYuv.cpp

@@ -410 +410 @@
                               const UInt uiPartIdx,
                               const UInt uiWidth,
-                              const UInt uiHeight
-#if !DISABLING_CLIP_FOR_BIPREDME
-                              ,const Int bitDepths[MAX_NUM_CHANNEL_TYPE]
-#endif
+                              const UInt uiHeight,
+                              const Int bitDepths[MAX_NUM_CHANNEL_TYPE],
+                              const Bool bClipToBitDepths
                               )
 {
@@ -419 +418 @@
   {
     const ComponentID compID=ComponentID(comp);
-#if !DISABLING_CLIP_FOR_BIPREDME
-    const Int clipBd=bitDepths[toChannelType(compID)];
-#endif
-
     const Pel* pSrc  = pcYuvSrc->getAddr(compID, uiPartIdx);
     Pel* pDst  = getAddr(compID, uiPartIdx);
@@ -430 +425 @@
     const Int iWidth  = uiWidth >>getComponentScaleX(compID);
     const Int iHeight = uiHeight>>getComponentScaleY(compID);
-
-    for ( Int y = iHeight-1; y >= 0; y-- )
-    {
-      for ( Int x = iWidth-1; x >= 0; x-- )
-      {
-#if DISABLING_CLIP_FOR_BIPREDME
-        pDst[x ] = (2 * pDst[x]) - pSrc[x];
-#else
-        pDst[x ] = ClipBD((2 * pDst[x]) - pSrc[x], clipBd);
-#endif
-      }
-      pSrc += iSrcStride;
-      pDst += iDstStride;
+    if (bClipToBitDepths)
+    {
+      const Int clipBd=bitDepths[toChannelType(compID)];
+      for ( Int y = iHeight-1; y >= 0; y-- )
+      {
+        for ( Int x = iWidth-1; x >= 0; x-- )
+        {
+          pDst[x ] = ClipBD((2 * pDst[x]) - pSrc[x], clipBd);
+        }
+        pSrc += iSrcStride;
+        pDst += iDstStride;
+      }
+    }
+    else
+    {
+      for ( Int y = iHeight-1; y >= 0; y-- )
+      {
+        for ( Int x = iWidth-1; x >= 0; x-- )
+        {
+          pDst[x ] = (2 * pDst[x]) - pSrc[x];
+        }
+        pSrc += iSrcStride;
+        pDst += iDstStride;
+      }
     }
   }

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

@@ -140 +140 @@
 
   Void         removeHighFreq             ( const TComYuv* pcYuvSrc, const UInt uiPartIdx, const UInt uiWidth, const UInt uiHeight
-#if !DISABLING_CLIP_FOR_BIPREDME
-                                          , const Int bitDepths[MAX_NUM_CHANNEL_TYPE]
-#endif
+                                          , const Int bitDepths[MAX_NUM_CHANNEL_TYPE], const Bool bClipToBitDepths
                                           );
 

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

@@ -208 +208 @@
 #define SBH_THRESHOLD                                     4  ///< I0156: value of the fixed SBH controlling threshold
 
-#define DISABLING_CLIP_FOR_BIPREDME                       1  ///< Ticket #175
-
 #define C1FLAG_NUMBER                                     8 // maximum number of largerThan1 flag coded in one chunk :  16 in HM5
 #define C2FLAG_NUMBER                                     1 // maximum number of largerThan2 flag coded in one chunk:  16 in HM5

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

@@ -172 +172 @@
   Int       m_iSearchRange;                     //  0:Full frame
   Int       m_bipredSearchRange;
+  Bool      m_bClipForBiPredMeEnabled;
 
   //====== Quality control ========
@@ -544 +545 @@
   Void      setSearchRange                  ( Int   i )      { m_iSearchRange = i; }
   Void      setBipredSearchRange            ( Int   i )      { m_bipredSearchRange = i; }
+  Void      setClipForBiPredMeEnabled       ( Bool  b )      { m_bClipForBiPredMeEnabled = b; }
 
   //====== Quality control ========
@@ -606 +608 @@
   //==== Motion search ========
   Bool      getDisableIntraPUsInInterSlices () const { return m_bDisableIntraPUsInInterSlices; }
-  Int       getFastSearch                   ()      { return  m_iFastSearch; }
-  Int       getSearchRange                  ()      { return  m_iSearchRange; }
+  Int       getFastSearch                   () const { return m_iFastSearch; }
+  Int       getSearchRange                  () const { return m_iSearchRange; }
+  Bool      getClipForBiPredMeEnabled       () const { return m_bClipForBiPredMeEnabled; }
 
   //==== Quality control ========

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

@@ -3892 +3892 @@
     pcYuvOrg->copyPartToPartYuv( pcYuv, uiPartAddr, iRoiWidth, iRoiHeight );
 
-    pcYuv->removeHighFreq( pcYuvOther, uiPartAddr, iRoiWidth, iRoiHeight
-#if !DISABLING_CLIP_FOR_BIPREDME
-                          , pcCU->getSlice()->getSPS()->getBitDepths().recon
-#endif
-                          );
+    pcYuv->removeHighFreq( pcYuvOther, uiPartAddr, iRoiWidth, iRoiHeight, pcCU->getSlice()->getSPS()->getBitDepths().recon, m_pcEncCfg->getClipForBiPredMeEnabled() );
 
     fWeight = 0.5;