Changeset 1209 in 3DVCSoftware for branches/HTM-14.1-update-dev1-HHI/source/Lib/TLibCommon/TComRom.cpp

Timestamp:

13 May 2015, 15:16:14 (10 years ago)

Author:

hhi

Message:

Alignment and reactivation of DMM and depth encoder optimizations:

• new macro NH_3D_DMM for DMM functionality, including several clean-ups.
• new macro NH_3D_SDC for SDC functionality, currently only used for covering common SDC and DMM parts.
• new macro NH_3D_ENC_DEPTH for encoder optimizations related to depth.
• temporary macro TEMP_SDC_CLEANUP for covering several proposed cleanups related to SDC and DMM.

File:

• branches/HTM-14.1-update-dev1-HHI/source/Lib/TLibCommon/TComRom.cpp (modified) (8 diffs)

branches/HTM-14.1-update-dev1-HHI/source/Lib/TLibCommon/TComRom.cpp

@@ -253 +253 @@
     }
   }
-#if H_3D_DIM_DMM
+
+#if NH_3D_DMM
   if( !g_dmmWedgeLists.empty() ) 
   {
-    for( UInt ui = 0; ui < g_dmmWedgeLists.size(); ui++ )
-    { 
-      g_dmmWedgeLists[ui].clear(); 
-    }
+    for( UInt ui = 0; ui < g_dmmWedgeLists.size(); ui++ ) { g_dmmWedgeLists[ui].clear(); }
     g_dmmWedgeLists.clear();
   }
-  if( !g_dmmWedgeRefLists.empty() )
-  {
-    for( UInt ui = 0; ui < g_dmmWedgeRefLists.size(); ui++ ) 
-    { 
-      g_dmmWedgeRefLists[ui].clear(); 
-    }
-    g_dmmWedgeRefLists.clear();
-  }
   if( !g_dmmWedgeNodeLists.empty() )
   {
-    for( UInt ui = 0; ui < g_dmmWedgeNodeLists.size(); ui++ )
-    { 
-      g_dmmWedgeNodeLists[ui].clear(); 
-    }
+    for( UInt ui = 0; ui < g_dmmWedgeNodeLists.size(); ui++ ) { g_dmmWedgeNodeLists[ui].clear(); }
     g_dmmWedgeNodeLists.clear();
   }
@@ -523 +510 @@
   //0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, DM
   { 0, 1, 2, 2, 2, 2, 3, 5, 7, 8, 10, 12, 13, 15, 17, 18, 19, 20, 21, 22, 23, 23, 24, 24, 25, 25, 26, 27, 27, 28, 28, 29, 29, 30, 31, DM_CHROMA_IDX};
-#if H_3D_DIM_DMM
+#if NH_3D_DMM
 // ====================================================================================================================
 // Depth coding modes
@@ -539 +526 @@
 { //2x2   4x4   8x8 16x16 32x32 64x64
      0,    7,   10,   9,    9,   13 };
-const UChar g_dmm3IntraTabIdxBits[6] =
-{ //2x2   4x4   8x8 16x16 32x32 64x64
-     0,    4,    7,    8,    8,    0 };
+
 Bool g_wedgePattern[32*32];
 extern std::vector< std::vector<TComWedgelet> >   g_dmmWedgeLists;
-extern std::vector< std::vector<TComWedgeRef> >   g_dmmWedgeRefLists;
 extern std::vector< std::vector<TComWedgeNode> >  g_dmmWedgeNodeLists;
 #endif
@@ -753 +737 @@
 #endif
 #endif
-#if H_3D_DIM_DMM
+#if NH_3D_DMM
 std::vector< std::vector<TComWedgelet>  > g_dmmWedgeLists;
-std::vector< std::vector<TComWedgeRef>  > g_dmmWedgeRefLists;
 std::vector< std::vector<TComWedgeNode> > g_dmmWedgeNodeLists;
+
 Void initWedgeLists( Bool initNodeList )
 {
   if( !g_dmmWedgeLists.empty() ) return;
-  for( UInt ui = g_aucConvertToBit[DIM_MIN_SIZE]; ui < (g_aucConvertToBit[DIM_MAX_SIZE]); ui++ )
-  {
-    UInt uiWedgeBlockSize = ((UInt)DIM_MIN_SIZE)<<ui;
+  for( UInt ui = g_aucConvertToBit[DMM_MIN_SIZE]; ui < (g_aucConvertToBit[DMM_MAX_SIZE]); ui++ )
+  {
+    UInt uiWedgeBlockSize = ((UInt)DMM_MIN_SIZE)<<ui;
     std::vector<TComWedgelet> acWedgeList;
     std::vector<TComWedgeRef> acWedgeRefList;
     createWedgeList( uiWedgeBlockSize, uiWedgeBlockSize, acWedgeList, acWedgeRefList, g_dmmWedgeResolution[ui] );
     g_dmmWedgeLists.push_back( acWedgeList );
-    g_dmmWedgeRefLists.push_back( acWedgeRefList );
+
     if( initNodeList )
     {
@@ -827 +811 @@
   }
 }
+
 Void createWedgeList( UInt uiWidth, UInt uiHeight, std::vector<TComWedgelet> &racWedgeList, std::vector<TComWedgeRef> &racWedgeRefList, WedgeResolution eWedgeRes )
 {
@@ -867 +852 @@
   }
 }
+
 Void addWedgeletToList( TComWedgelet cWedgelet, std::vector<TComWedgelet> &racWedgeList, std::vector<TComWedgeRef> &racWedgeRefList )
 {
@@ -900 +886 @@
   if( bValid )
   {
-    cWedgelet.findClosestAngle();
     racWedgeList.push_back( cWedgelet );
     TComWedgeRef cWedgeRef;
@@ -907 +892 @@
   }
 }
-#endif //H_3D_DIM_DMM
+WedgeList* getWedgeListScaled( UInt blkSize ) 
+{ 
+  return &g_dmmWedgeLists[ g_aucConvertToBit[( 16 >= blkSize ) ? blkSize : 16] ]; 
+}
+WedgeNodeList* getWedgeNodeListScaled( UInt blkSize )
+{
+  return &g_dmmWedgeNodeLists[ g_aucConvertToBit[( 16 >= blkSize ) ? blkSize : 16] ]; 
+}
+#endif //NH_3D_DMM
 //! \}