Changeset 917 in 3DVCSoftware for branches/HTM-10.2-dev1-Samsung/source/Lib/TLibCommon/TComDataCU.cpp

Timestamp:

15 Apr 2014, 04:37:44 (10 years ago)

Author:

samsung-htm

Message:

Integration of JCT3V-H0070: Adaptive Disabling IVMP

File:

• branches/HTM-10.2-dev1-Samsung/source/Lib/TLibCommon/TComDataCU.cpp (modified) (4 diffs)

branches/HTM-10.2-dev1-Samsung/source/Lib/TLibCommon/TComDataCU.cpp

@@ -4763 +4763 @@
   if ( ivMvPredFlag && cDisInfo.m_aVIdxCan!=-1)
   {
+#if SEC_ADAPT_DISABLE_IVMP
+    getInterViewMergeCands(uiPUIdx, ivCandRefIdx, ivCandMv, &cDisInfo, ivCandDir , bIsDepth, pcMvFieldSP, puhInterDirSP, bICFlag );
+#else
     getInterViewMergeCands(uiPUIdx, ivCandRefIdx, ivCandMv, &cDisInfo, ivCandDir , bIsDepth, pcMvFieldSP, puhInterDirSP );
+#endif
   }  
 
@@ -7248 +7252 @@
 , TComMvField* pcMvFieldSP, UChar* puhInterDirSP
 #endif
+#if SEC_ADAPT_DISABLE_IVMP
+, Bool bICFlag
+#endif
 )
 {
@@ -7283 +7290 @@
     pacPdmMv[i].setIDVFlag   (false);
   }
+#endif
+
+#if SEC_ADAPT_DISABLE_IVMP
+  if(!bICFlag)
+  {
 #endif
 
@@ -7551 +7563 @@
   }
 
+#if SEC_ADAPT_DISABLE_IVMP
+  }
+#endif
 
   ////////////////////////////////