Changeset 459 in 3DVCSoftware for branches/HTM-DEV-0.3-dev1/source/App/TAppEncoder

Timestamp:

6 Jun 2013, 11:46:05 (12 years ago)

Author:

hhi

Message:

Integation of depth intra methods in macro H_3D_DIM, including:

• DMM coding modes in H_3D_DIM_DMM.
• RBC coding mode in H_3D_DIM_RBC.

Location:

branches/HTM-DEV-0.3-dev1/source/App/TAppEncoder

Files:

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

branches/HTM-DEV-0.3-dev1/source/App/TAppEncoder/TAppEncCfg.cpp

@@ -389 +389 @@
 #if H_3D
   ("DepthFlag",             m_depthFlag          , std::vector<Int>(1,0), "Depth Flag")
+#if H_3D_DIM
+  ("DMM",                   m_useDMM,           true,  "Depth intra model modes")
+  ("RBC",                   m_useRBC,           true,  "Region boundary chain mode")
+  ("SDC",                   m_useSDC,           true,  "Simplified depth coding")
+  ("DLT",                   m_useDLT,           true,  "Depth lookup table")
+#endif
 #endif
   ("LayerIdInNuh",          m_layerIdInNuh       , std::vector<Int>(1,0), "LayerId in Nuh")
@@ -2278 +2284 @@
   printf("WVSO:%d ", m_bUseWVSO );  
 #endif
+#if H_3D_DIM
+  printf("DMM:%d ", m_useDMM );
+  printf("RBC:%d ", m_useRBC );
+  printf("SDC:%d ", m_useSDC );
+  printf("DLT:%d ", m_useDLT );
+#endif
   printf("\n\n");  
 

branches/HTM-DEV-0.3-dev1/source/App/TAppEncoder/TAppEncCfg.h

@@ -405 +405 @@
   TRenModSetupStrParser       m_cRenModStrParser;
 #endif
+#if H_3D_DIM
+  Bool      m_useDMM;                                        ///< flag for using DMM
+  Bool      m_useRBC;                                        ///< flag for using RBC
+  Bool      m_useSDC;                                        ///< flag for using SDC
+  Bool      m_useDLT;                                        ///< flag for using DLT
+#endif
 #endif
   // internal member functions

branches/HTM-DEV-0.3-dev1/source/App/TAppEncoder/TAppEncTop.cpp

@@ -120 +120 @@
   xSetDirectDependencyFlags( vps );
 #if H_3D
+  for( Int layer = 0; layer < m_numberOfLayers; layer++ )
+  {
+    vps.setVpsDepthModesFlag( layer, ((vps.getDepthId( layer ) != 0) && (m_useDMM || m_useRBC || m_useSDC || m_useDLT)) ? true : false );
+  }
+
   vps.initViewIndex(); 
   m_ivPicLists.setVPS      ( &vps ); 
@@ -166 +171 @@
     m_cTEncTop.setDWeight                      ( isDepth ? m_iDWeight             : 0     );
 #endif // H_3D_VSO
+
+  //========== Depth intra modes ==========
+#if H_3D_DIM
+    m_cTEncTop.setUseDMM                       ( isDepth ? m_useDMM               : false );
+    m_cTEncTop.setUseRBC                       ( isDepth ? m_useRBC               : false );
+    m_cTEncTop.setUseSDC                       ( isDepth ? m_useSDC               : false );
+    m_cTEncTop.setUseDLT                       ( isDepth ? m_useDLT               : false );
+#endif
 #endif // H_3D
 
@@ -543 +556 @@
   // initialize global variables
   initROM();
+#if H_3D_DIM_DMM
+  initWedgeLists( true );
+#endif
 
   for( Int layer=0; layer < m_numberOfLayers; layer++)