Changeset 699 in 3DVCSoftware for branches/HTM-8.2-dev3-Samsung/source/App/TAppEncoder

Timestamp:

15 Nov 2013, 05:46:48 (11 years ago)

Author:

samsung-htm

Message:

Integration of F0147 and F0151
F0147: DMM simplification and signalling
F0151: Removal of IC in depth coding

Location:

branches/HTM-8.2-dev3-Samsung/source/App/TAppEncoder

Files:

• TAppEncCfg.cpp (modified) (2 diffs)
• TAppEncCfg.h (modified) (1 diff)
• TAppEncTop.cpp (modified) (1 diff)

branches/HTM-8.2-dev3-Samsung/source/App/TAppEncoder/TAppEncCfg.cpp

@@ -511 +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
@@ -2422 +2426 @@
 #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

branches/HTM-8.2-dev3-Samsung/source/App/TAppEncoder/TAppEncCfg.h

@@ -122 +122 @@
 #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

branches/HTM-8.2-dev3-Samsung/source/App/TAppEncoder/TAppEncTop.cpp

@@ -177 +177 @@
 #endif
 #if H_3D_IC
+#if SEC_ONLY_TEXTURE_IC_F0151
+    m_cTEncTop.setUseIC                        ( vps.getViewIndex( layerId ) == 0 || isDepth ? false : m_abUseIC );
+#else
     m_cTEncTop.setUseIC                        ( vps.getViewIndex( layerId ) == 0 ? false : m_abUseIC[isDepth ? 1 : 0] );
+#endif
 #endif
   //========== Depth intra modes ==========