Changeset 989 in 3DVCSoftware for branches/HTM-11.2-dev1-Samsung/source

Timestamp:

15 Jul 2014, 03:16:08 (10 years ago)

Author:

samsung-htm

Message:

Integration of JCT3V-I0086: Simplification of Shifted DV Candidate

Location:

branches/HTM-11.2-dev1-Samsung/source/Lib/TLibCommon

Files:

• TComDataCU.cpp (modified) (4 diffs)
• TComDataCU.h (modified) (1 diff)
• TypeDef.h (modified) (1 diff)

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

@@ -3310 +3310 @@
   for(Int iLoop = 0; iLoop < 2; iLoop ++ ) 
   {
+#if !SEC_SIMP_SHIFTED_DV_I0086
     // IvDcShift (Derived from spatial Iv neighboring blocks)
     if( iLoop == 1 )
@@ -3343 +3344 @@
       }
     }
+#endif
 
     /// iLoop = 0 --> IvMCShift
@@ -3390 +3392 @@
 } 
 
+#if !SEC_SIMP_SHIFTED_DV_I0086
 inline Bool TComDataCU::xGetPosFirstAvailDmvCand(Int iCount, Int& posFirstAvailDmvCand )
 {
@@ -3406 +3409 @@
   return false;  
 }
+#endif
                                       
 #endif

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

@@ -246 +246 @@
 #if H_3D_IV_MERGE
   Bool          xAddIvMRGCand( Int mrgCandIdx, Int& iCount, Int*   ivCandDir, TComMv* ivCandMv, Int* ivCandRefIdx ); 
+#if! SEC_SIMP_SHIFTED_DV_I0086
   Bool          xGetPosFirstAvailDmvCand( Int iCount, Int& iFirDispCand );
+#endif
 #endif
 

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

@@ -172 +172 @@
                                               // MTK_DIS_SPBIP8X4_H0205        Disable bi-prediction for 8x4 and 4x8 sub PU and remove the SPIVMP 2Nx2N restriction
                                               // SEC_ADAPT_DISABLE_IVMP        Disalbing IVMP merge candidates when IC is enabled, JCT3V-H0070
+
+#define SEC_SIMP_SHIFTED_DV_I0086         1   // Simplification of Shifted DV candidate, JCT3V-I0086
 
 #define H_3D_TMVP                         1   // QC_TMVP_C0047