Changeset 1325 in 3DVCSoftware for branches/HTM-15.1-MV-draft-4/source/Lib/TLibCommon/TComRom.h

Timestamp:

7 Sep 2015, 18:40:35 (10 years ago)

Author:

tech

Message:

Removed 3D-HEVC.

File:

• branches/HTM-15.1-MV-draft-4/source/Lib/TLibCommon/TComRom.h (modified) (6 diffs)

branches/HTM-15.1-MV-draft-4/source/Lib/TLibCommon/TComRom.h

@@ -39 +39 @@
 #include<stdio.h>
 #include<iostream>
-#if NH_3D_DMM
-#include "TComWedgelet.h"
-#endif
 //! \ingroup TLibCommon
 //! \{
@@ -91 +88 @@
 extern const UChar  g_aucIntraModeNumFast_NotUseMPM[MAX_CU_DEPTH];
 extern const UChar  g_chroma422IntraAngleMappingTable[NUM_INTRA_MODE];
-#if NH_3D_DMM
-// ====================================================================================================================
-// Depth coding modes
-// ====================================================================================================================
-extern const WedgeResolution                                 g_dmmWedgeResolution [6];
-extern const UChar                                           g_dmm1TabIdxBits     [6];
-extern Bool                                                  g_wedgePattern[32*32];
-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; }
-#endif
 // ====================================================================================================================
 // Mode-Dependent DST Matrices
@@ -203 +183 @@
 #define DTRACE_PU_S(x)             writeToTraceFile( x,   g_tracePU );
 #define DTRACE_TU_S(x)             writeToTraceFile( x,   g_traceTU );
+
 #define D_DEC_INDENT( b )            decIndent        ( b );
 #define D_PRINT_INC_INDENT( b, str ) prinStrIncIndent( b, str );
 #define D_PRINT_INDENT( b, str )     printStrIndent   ( b, str);
+
  Void           tracePSHeader   ( const Char* psName, Int layerId ); 
  Void           writeToTraceFile( const Char* symbolName, Int val, Bool doIt );
@@ -211 +193 @@
  UInt64         incSymbolCounter();          
  Void           stopAtPos       ( Int poc, Int layerId, Int cuPelX, Int cuPelY, Int cuWidth, Int cuHeight );           
+
  Void           printStr         ( std::string str );
  Void           printStrIndent   ( Bool b, std::string str );
  Void           prinStrIncIndent ( Bool b, std::string str );
  Void           decIndent        ( Bool b );
+
  template <typename T>
  std::string n2s ( T Number )
@@ -222 +206 @@
    return ss.str();
  };
+
 #endif
 #else
@@ -238 +223 @@
 #define DTRACE_PU_S(x) ;            
 #define DTRACE_TU_S(x) ;            
+
 #define D_DEC_INDENT( b ) ;
 #define D_PRINT_INC_INDENT( b, str );