Changeset 598 in 3DVCSoftware for branches/HTM-DEV-2.0-dev0/source/App/TAppEncoder

Timestamp:

29 Aug 2013, 13:55:40 (11 years ago)

Author:

tech

Message:

Merged dev2: DEV-2.0-LG@595

Location:

branches/HTM-DEV-2.0-dev0/source/App/TAppEncoder

Files:

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

branches/HTM-DEV-2.0-dev0/source/App/TAppEncoder/TAppEncCfg.cpp

@@ -505 +505 @@
 #if H_3D_IC
   ("IlluCompEnable",           m_abUseIC, std::vector<Bool>(2, true), "Enable illumination compensation")
+#endif
+#if LGE_INTER_SDC_E0156
+  ("InterSDC",                 m_bDepthInterSDCFlag,        true, "Enable depth inter SDC")
 #endif
   // Coding tools
@@ -2289 +2292 @@
   printf("DLT:%d ", m_useDLT );
 #endif
+#if LGE_INTER_SDC_E0156
+  printf( "interSDC: %d ", m_bDepthInterSDCFlag ? 1 : 0 );
+#endif
   printf("\n\n");  
 

branches/HTM-DEV-2.0-dev0/source/App/TAppEncoder/TAppEncCfg.h

@@ -432 +432 @@
   Bool      m_bUsePC;                                         ///< flag for using Predictive Coding with QTL
 #endif
+#if LGE_INTER_SDC_E0156
+  Bool m_bDepthInterSDCFlag;                                ///< flag for inter SDC of depth map coding
+#endif
 #endif
   // internal member functions

branches/HTM-DEV-2.0-dev0/source/App/TAppEncoder/TAppEncTop.cpp

@@ -187 +187 @@
     m_cTEncTop.setUseQTL                       ( isDepth ? m_bUseQTL               : false );
     m_cTEncTop.setUsePC                        ( isDepth ? m_bUsePC                : false );
+#endif
+    //====== Depth Inter SDC =========
+#if LGE_INTER_SDC_E0156
+    m_cTEncTop.setInterSDCEnable               ( isDepth ? m_bDepthInterSDCFlag    : false );
 #endif
 #endif // H_3D
@@ -1225 +1229 @@
     vps.setViewSynthesisPredFlag( layer, !isLayerZero && !isDepth && m_viewSynthesisPredFlag );         
 #endif      
+#if LGE_INTER_SDC_E0156
+    vps.setInterSDCFlag( layer, !isLayerZero && isDepth && m_bDepthInterSDCFlag );
+#endif
   }  
 #if H_3D_TMVP