Changeset 917 in 3DVCSoftware

Timestamp:

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

Author:

samsung-htm

Message:

Integration of JCT3V-H0070: Adaptive Disabling IVMP

Location:

branches/HTM-10.2-dev1-Samsung

Files:

• checklist/ETRIKHU_H0083_verified_by_Samsung.doc (added)
• checklist/SEC_H0070.doc (added)
• codingresults/ETRIKHU_H0083_vs_LGE_H0111_verified_by_Samsung.xls (added)
• codingresults/SEC_H0070_vs_ETRIKHU_H0083.xls (added)
• source/Lib/TLibCommon/TComDataCU.cpp (modified) (4 diffs)
• source/Lib/TLibCommon/TComDataCU.h (modified) (1 diff)
• source/Lib/TLibCommon/TypeDef.h (modified) (1 diff)

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
 
   ////////////////////////////////

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

@@ -528 +528 @@
     , TComMvField* pcMFieldSP, UChar* puhInterDirSP
 #endif
+#if SEC_ADAPT_DISABLE_IVMP
+    , Bool bICFlag
+#endif
     );   
 #endif

branches/HTM-10.2-dev1-Samsung/source/Lib/TLibCommon/TypeDef.h

@@ -160 +160 @@
                                               // SEC_DEPTH_DV_DERIVAITON_G0074, Simplification of DV derivation for depth, JCT3V-G0074
                                               // QC_DEPTH_MERGE_SIMP_G0127 Remove DV candidate and shifting candidate for depth coding
+
+#define SEC_ADAPT_DISABLE_IVMP            1   // Disalbing IVMP merge candidates when IC is enabled, JCT3V-H0070
 
 #define H_3D_TMVP                         1   // QC_TMVP_C0047