Changeset 621 in 3DVCSoftware for branches/HTM-8.0-dev0/source/Lib/TLibEncoder

Timestamp:

10 Sep 2013, 14:59:07 (12 years ago)

Author:

tech

Message:

Fixed xRestrictBipredMergeCand call.
Other minor cleanups.

Location:

branches/HTM-8.0-dev0/source/Lib/TLibEncoder

Files:

• TEncSearch.cpp (modified) (1 diff)
• TEncTop.cpp (modified) (2 diffs)

branches/HTM-8.0-dev0/source/Lib/TLibEncoder/TEncSearch.cpp

@@ -3642 +3642 @@
 #if H_3D_VSP
   xRestrictBipredMergeCand( pcCU, iPUIdx, cMvFieldNeighbours, uhInterDirNeighbours,vspFlag, numValidMergeCand );
-#endif
+#else
+  xRestrictBipredMergeCand( pcCU, iPUIdx, cMvFieldNeighbours, uhInterDirNeighbours, numValidMergeCand );
+#endif
+
 
   ruiCost = MAX_UINT;

branches/HTM-8.0-dev0/source/Lib/TLibEncoder/TEncTop.cpp

@@ -515 +515 @@
   // mark it should be extended
   rpcPic->getPicYuvRec()->setBorderExtension(false);
+
+#if H_MV
   rpcPic->getPicYuvOrg()->setBorderExtension(false);
+#endif
 }
 
@@ -755 +758 @@
 #endif
   m_cPPS.setSignHideFlag(getSignHideFlag());
-#if L0386_DB_METRIC
-  if ( getDeblockingFilterMetric() )
-  {
-    m_cPPS.setDeblockingFilterControlPresentFlag (true);
-    m_cPPS.setDeblockingFilterOverrideEnabledFlag(true);
-    m_cPPS.setPicDisableDeblockingFilterFlag(false);
-    m_cPPS.setDeblockingFilterBetaOffsetDiv2(0);
-    m_cPPS.setDeblockingFilterTcOffsetDiv2(0);
-  } 
-  else
-  {
   m_cPPS.setDeblockingFilterControlPresentFlag (m_DeblockingFilterControlPresent );
-  }
-#else
-  m_cPPS.setDeblockingFilterControlPresentFlag (m_DeblockingFilterControlPresent );
-#endif
   m_cPPS.setLog2ParallelMergeLevelMinus2   (m_log2ParallelMergeLevelMinus2 );
   m_cPPS.setCabacInitPresentFlag(CABAC_INIT_PRESENT_FLAG);