Changeset 1029 in 3DVCSoftware for branches/HTM-11.2-dev0/source/Lib/TLibCommon/TComDataCU.cpp

Timestamp:

30 Jul 2014, 18:43:21 (10 years ago)

Author:

tech

Message:

Merged 11.2-dev1-MediaTek@1004.

File:

• branches/HTM-11.2-dev0/source/Lib/TLibCommon/TComDataCU.cpp (modified) (5 diffs)

branches/HTM-11.2-dev0/source/Lib/TLibCommon/TComDataCU.cpp

@@ -3373 +3373 @@
   for(Int iLoop = 0; iLoop < 2; iLoop ++ ) 
   {
+#if !SEC_SIMP_SHIFTED_DV_I0086
     // IvDcShift (Derived from spatial Iv neighboring blocks)
     if( iLoop == 1 )
@@ -3406 +3407 @@
       }
     }
+#endif
 
     /// iLoop = 0 --> IvMCShift
@@ -3453 +3455 @@
 } 
 
+#if !SEC_SIMP_SHIFTED_DV_I0086
 inline Bool TComDataCU::xGetPosFirstAvailDmvCand(Int iCount, Int& posFirstAvailDmvCand )
 {
@@ -3469 +3472 @@
   return false;  
 }
+#endif
                                       
 #endif
@@ -6146 +6150 @@
 
   TComMv cMv; 
+#if MTK_I0093
+  Int iDisp     = getSlice()->getDepthToDisparityB( 0 )[ 1 << ( getSlice()->getSPS()->getBitDepthY() - 1 ) ];
+#else
   Int iDisp     = getSlice()->getDepthToDisparityB( 0 )[ 128 ];
+#endif
   cMv.setHor(iDisp);
   cMv.setVer(0);