Changeset 1118 in 3DVCSoftware for branches/HTM-12.2-dev0/source/Lib/TLibCommon/TComSlice.cpp

Timestamp:

8 Nov 2014, 21:07:36 (9 years ago)

Author:

tech

Message:

Merged 12.2-dev1-Hisilicon@1116.

File:

• branches/HTM-12.2-dev0/source/Lib/TLibCommon/TComSlice.cpp (modified) (3 diffs)

branches/HTM-12.2-dev0/source/Lib/TLibCommon/TComSlice.cpp

@@ -1972 +1972 @@
     m_ivMvScalingFlag[i] = true; 
     m_bIVPFlag [i]      = false;
+#if MTK_SINGLE_DEPTH_VPS_FLAG_J0060
+    m_singleDepthModeFlag[ i ] = false;
+#endif
 #endif
 #endif
@@ -3081 +3084 @@
       i++;
     }
+#if SHARP_DLT_SIMP_J0029
+    iIdxUp = bFound ?  iIdxDown + 1 : iNumDepthValues-1;
+#else
     // iterate over indices to find upper closest depth
     i = iNumDepthValues-2;
@@ -3097 +3103 @@
     // assert monotony
     assert(iIdxDown<=iIdxUp);
+#endif
 
     // assign closer depth value/idx