Changeset 1030 in 3DVCSoftware for branches/HTM-11.2-dev0/source/App/TAppEncoder/TAppEncCfg.h

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/App/TAppEncoder/TAppEncCfg.h (modified) (2 diffs)

branches/HTM-11.2-dev0/source/App/TAppEncoder/TAppEncCfg.h

@@ -131 +131 @@
   Int                    m_iSubPUMPILog2Size;                    
 #endif
+#endif
+#if MTK_I0099_VPS_EX2
+  Bool                   m_bLimQtPredFlag;
 #endif
 #if H_3D_ARP                                                  /// < flag and number of weighting factors in ARP
@@ -479 +482 @@
   Bool     m_useSingleDepthMode;                          ///< flag for using single depth mode
 #endif
+#if !MTK_I0099_VPS_EX2 || MTK_I0099_FIX
+#if H_3D_QTLPC
+  Bool      m_bUseQTL;                                        ///< flag for using depth QuadTree Limitation
+#if !MTK_I0099_VPS_EX2
+  Bool      m_bUsePC;                                         ///< flag for using Predictive Coding with QTL
+#endif
+#endif
+#endif
+
 #if H_3D_QTLPC
   Bool      m_bUseQTL;                                        ///< flag for using depth QuadTree Limitation