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

Timestamp:

30 Jul 2014, 19:51:27 (10 years ago)

Author:

tech

Message:

Merged 11.2-dev2-Samsung@1026.

File:

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

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

@@ -1952 +1952 @@
     m_viewIndex         [i] = -1; 
     m_vpsDepthModesFlag [i] = false;
+#if SEC_HLS_CLEANUP_I0100
+    m_ivMvScalingFlag[i] = true; 
+#else
+    m_ivMvScalingFlag = true; 
+#endif
+#endif
 #if SEPARATE_FLAG_I0085
     m_bIVPFlag [i]      = false;
@@ -1986 +1992 @@
     m_iSubPULog2Size       [ i ] = 0;
 #endif
+#endif
+#if MTK_I0099_VPS_EX2
+    m_bLimQtPredFlag       [ i ] = false;
 #endif
 #if H_3D_VSP
@@ -2518 +2527 @@
 , m_pcmLog2MaxSize            (  5)
 , m_uiPCMLog2MinSize          (  7)
+#if !MTK_I0099_VPS_EX2
 #if H_3D_QTLPC
 , m_bUseQTL                   (false)
 , m_bUsePC                    (false)
+#endif
 #endif
 , m_bitDepthY                 (  8)