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

Timestamp:

21 Nov 2013, 13:28:24 (12 years ago)

Author:

tech

Message:

Merged DEV3 ( branch HTM-8.2-dev3-Samsung@699 )

File:

• branches/HTM-8.2-dev0/source/App/TAppEncoder/TAppEncCfg.h (modified) (2 diffs)

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

@@ -126 +126 @@
 #endif
 #if H_3D_IC
+#if SEC_ONLY_TEXTURE_IC_F0151
+  Bool   m_abUseIC;
+#else
   vector<Bool> m_abUseIC;                                    ///< flag for using illumination compensation for inter-view prediction
+#endif
 #endif
 #if H_3D_NBDV_REF
@@ -465 +469 @@
 #if H_3D_DIM
   Bool      m_useDMM;                                        ///< flag for using DMM
+#if !SEC_DMM3_RBC_F0147
   Bool      m_useRBC;                                        ///< flag for using RBC
+#endif
   Bool      m_useSDC;                                        ///< flag for using SDC
   Bool      m_useDLT;                                        ///< flag for using DLT