Changeset 1247 in 3DVCSoftware for branches/HTM-14.1-update-dev1-RWTH/source/Lib/TLibCommon

Timestamp:

2 Jun 2015, 15:08:23 (10 years ago)

Author:

tech

Message:

Fixes:

• Windows compiler warning
• Naming DLT related syntax elements.

Location:

branches/HTM-14.1-update-dev1-RWTH/source/Lib/TLibCommon

Files:

• TComRom.cpp (modified) (7 diffs)
• TComRom.h (modified) (2 diffs)
• TypeDef.h (modified) (1 diff)

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

@@ -253 +253 @@
     }
   }
-
 #if NH_3D_DMM
   if( !g_dmmWedgeLists.empty() ) 
@@ -526 +525 @@
 { //2x2   4x4   8x8 16x16 32x32 64x64
      0,    7,   10,   9,    9,   13 };
-
 Bool g_wedgePattern[32*32];
 extern std::vector< std::vector<TComWedgelet> >   g_dmmWedgeLists;
@@ -539 +537 @@
 const Bool g_bEncDecTraceEnable  = true;
 const Bool g_bEncDecTraceDisable = false;
-Bool   g_HLSTraceEnable = false;
+Bool   g_HLSTraceEnable = true;
 Bool   g_bJustDoIt = false;
 UInt64 g_nSymbolCounter = 0;
@@ -740 +738 @@
 std::vector< std::vector<TComWedgelet>  > g_dmmWedgeLists;
 std::vector< std::vector<TComWedgeNode> > g_dmmWedgeNodeLists;
-
 Void initWedgeLists( Bool initNodeList )
 {
@@ -751 +748 @@
     createWedgeList( uiWedgeBlockSize, uiWedgeBlockSize, acWedgeList, acWedgeRefList, g_dmmWedgeResolution[ui] );
     g_dmmWedgeLists.push_back( acWedgeList );
-
     if( initNodeList )
     {
@@ -811 +807 @@
   }
 }
-
 Void createWedgeList( UInt uiWidth, UInt uiHeight, std::vector<TComWedgelet> &racWedgeList, std::vector<TComWedgeRef> &racWedgeRefList, WedgeResolution eWedgeRes )
 {
@@ -852 +847 @@
   }
 }
-
 Void addWedgeletToList( TComWedgelet cWedgelet, std::vector<TComWedgelet> &racWedgeList, std::vector<TComWedgeRef> &racWedgeRefList )
 {

branches/HTM-14.1-update-dev1-RWTH/source/Lib/TLibCommon/TComRom.h

@@ -91 +91 @@
 extern const UChar  g_aucIntraModeNumFast_NotUseMPM[MAX_CU_DEPTH];
 extern const UChar  g_chroma422IntraAngleMappingTable[NUM_INTRA_MODE];
-
 // ====================================================================================================================
 // Depth coding modes
@@ -101 +100 @@
 extern       std::vector< std::vector<TComWedgelet> >        g_dmmWedgeLists;
 extern       std::vector< std::vector<TComWedgeNode> >       g_dmmWedgeNodeLists;
-
 Void initWedgeLists( Bool initNodeList = false );
 Void createWedgeList( UInt uiWidth, UInt uiHeight, std::vector<TComWedgelet> &racWedgeList, std::vector<TComWedgeRef> &racWedgeRefList, WedgeResolution eWedgeRes );
 Void addWedgeletToList( TComWedgelet cWedgelet, std::vector<TComWedgelet> &racWedgeList, std::vector<TComWedgeRef> &racWedgeRefList );
-
 WedgeList*     getWedgeListScaled    ( UInt blkSize );
 WedgeNodeList* getWedgeNodeListScaled( UInt blkSize );
-
 __inline Void mapDmmToIntraDir( UInt& intraMode ) { if( isDmmMode( intraMode ) ) intraMode = DC_IDX; }
 __inline Void mapDmmToIntraDir(  Int& intraMode ) { if( isDmmMode( intraMode ) ) intraMode = DC_IDX; }

branches/HTM-14.1-update-dev1-RWTH/source/Lib/TLibCommon/TypeDef.h

@@ -65 +65 @@
 /////////////////////////////////////////////////////////////////////////////////////////
 #if NH_MV
-#define H_MV_ENC_DEC_TRAC                 0  //< CU/PU level tracking
+#define H_MV_ENC_DEC_TRAC                 1  //< CU/PU level tracking
 
 #if NH_3D