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

Timestamp:

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

Author:

tech

Message:

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

File:

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

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

@@ -378 +378 @@
 #if H_3D_DIM
   ("DMM",                   m_useDMM,           true,  "Depth intra model modes")
+#if !SEC_DMM3_RBC_F0147
   ("RBC",                   m_useRBC,           true,  "Region boundary chain mode")
+#endif
   ("SDC",                   m_useSDC,           true,  "Simplified depth coding")
   ("DLT",                   m_useDLT,           true,  "Depth lookup table")
@@ -509 +511 @@
 #endif
 #if H_3D_IC
+#if SEC_ONLY_TEXTURE_IC_F0151
+  ("IlluCompEnable",           m_abUseIC, true, "Enable illumination compensation")
+#else
   ("IlluCompEnable",           m_abUseIC, std::vector<Bool>(2, true), "Enable illumination compensation")
+#endif
 #endif
 #if H_3D_INTER_SDC
@@ -2431 +2437 @@
 #endif
 #if H_3D_IC
+#if SEC_ONLY_TEXTURE_IC_F0151
+  printf( "IlluCompEnable: %d ", m_abUseIC);
+#else
   printf( "IlluCompEnable: %d %d ", m_abUseIC[0] ? 1 : 0, m_abUseIC[1] ? 1 : 0 );
+#endif
 #endif
 #if H_3D_NBDV_REF
@@ -2444 +2454 @@
 #if H_3D_DIM
   printf("DMM:%d ", m_useDMM );
+#if !SEC_DMM3_RBC_F0147
   printf("RBC:%d ", m_useRBC );
+#endif
   printf("SDC:%d ", m_useSDC );
   printf("DLT:%d ", m_useDLT );