Changeset 753 in 3DVCSoftware for branches/HTM-9.1-dev0-RWTH/source/Lib/TLibCommon

Timestamp:

22 Dec 2013, 20:21:39 (11 years ago)

Author:

rwth

Message:

• finalize H_3D_DELTA_DLT implementation

Location:

branches/HTM-9.1-dev0-RWTH/source/Lib/TLibCommon

Files:

• TComSlice.cpp (modified) (4 diffs)
• TComSlice.h (modified) (3 diffs)
• TypeDef.h (modified) (1 diff)

branches/HTM-9.1-dev0-RWTH/source/Lib/TLibCommon/TComSlice.cpp

@@ -2581 +2581 @@
 }
 
-#if RWTH_DELTA_DLT
-Void TComDLT::getDeltaDLT( Int layerIdInVps, Int* piDLTInRef, Int iDLTInRefNum, Int* piDeltaDLTOut, Int *piDeltaDLTOutNum )
+#if H_3D_DELTA_DLT
+Void TComDLT::getDeltaDLT( Int layerIdInVps, Int* piDLTInRef, UInt uiDLTInRefNum, Int* piDeltaDLTOut, UInt *puiDeltaDLTOutNum )
 {
   Bool abBM0[ 256 ];
@@ -2591 +2591 @@
   
   // convert reference DLT to bit string
-  for( Int i = 0; i < iDLTInRefNum; i++ )
+  for( Int i = 0; i < uiDLTInRefNum; i++ )
   {
     abBM0[ piDLTInRef[ i ] ] = true;
@@ -2601 +2601 @@
   }
   
-  *piDeltaDLTOutNum = 0;
+  *puiDeltaDLTOutNum = 0;
   for( Int i = 0; i < 256; i++ )
   {
     if( abBM0[ i ] ^ abBM1[ i ] )
     {
-      piDeltaDLTOut[ *piDeltaDLTOutNum ] = i;
-      *piDeltaDLTOutNum = *piDeltaDLTOutNum + 1;
-    }
-  }
-}
-
-Void TComDLT::setDeltaDLT( Int layerIdInVps, Int* piDLTInRef, Int iDLTInRefNum, Int* piDeltaDLTIn, Int piDeltaDLTInNum )
+      piDeltaDLTOut[ *puiDeltaDLTOutNum ] = i;
+      *puiDeltaDLTOutNum = *puiDeltaDLTOutNum + 1;
+    }
+  }
+}
+
+Void TComDLT::setDeltaDLT( Int layerIdInVps, Int* piDLTInRef, UInt uiDLTInRefNum, Int* piDeltaDLTIn, UInt uiDeltaDLTInNum )
 {
   Bool abBM0[ 256 ];
@@ -2621 +2621 @@
   
   // convert reference DLT to bit string
-  for( Int i = 0; i < iDLTInRefNum; i++ )
+  for( Int i = 0; i < uiDLTInRefNum; i++ )
   {
     abBM0[ piDLTInRef[ i ] ] = true;
   }
   // convert delta DLT to bit string
-  for( Int i = 0; i < piDeltaDLTInNum; i++ )
+  for( Int i = 0; i < uiDeltaDLTInNum; i++ )
   {
     abBM1[ piDeltaDLTIn[ i ] ] = true;

branches/HTM-9.1-dev0-RWTH/source/Lib/TLibCommon/TComSlice.h

@@ -1204 +1204 @@
   Int         m_iNumDepthViews;
   UInt        m_uiDepthViewBitDepth;
-  
-#if RWTH_DELTA_DLT
-  Bool        m_bUseDeltaDLTFlag         [ MAX_NUM_LAYERS ];
-#endif
 
 public:
@@ -1218 +1214 @@
   Bool    getUseDLTFlag      ( Int layerIdInVps )         { return m_bUseDLTFlag[ layerIdInVps ]; }
   Void    setUseDLTFlag      ( Int layerIdInVps, Bool b ) { m_bUseDLTFlag[ layerIdInVps ]  = b;   }
-
-#if RWTH_DELTA_DLT
-  Bool    getUseDeltaDLTFlag      ( Int layerIdInVps )         { return m_bUseDeltaDLTFlag[ layerIdInVps ]; }
-  Void    setUseDeltaDLTFlag      ( Int layerIdInVps, Bool b ) { m_bUseDeltaDLTFlag[ layerIdInVps ]  = b;   }
-#endif
   
   Bool    getInterViewDltPredEnableFlag( Int layerIdInVps )         { return m_bInterViewDltPredEnableFlag[ layerIdInVps ]; }
   Void    setInterViewDltPredEnableFlag( Int layerIdInVps, Bool b ) { m_bInterViewDltPredEnableFlag[ layerIdInVps ] = b;    }
-
 
   Void    setNumDepthViews   ( Int n )                    { m_iNumDepthViews = n; }
@@ -1239 +1229 @@
   Pel     idx2DepthValue( Int layerIdInVps, UInt uiIdx )  { return getUseDLTFlag(layerIdInVps)?m_iIdx2DepthValue[layerIdInVps][uiIdx]:uiIdx; }
   Void    setDepthLUTs( Int layerIdInVps, Int* idx2DepthValue = NULL, Int iNumDepthValues = 0 );
-#if RWTH_DELTA_DLT
-  Void    getDeltaDLT( Int layerIdInVps, Int* piDLTInRef, Int iDLTInRefNum, Int* piDeltaDLTOut, Int *piDeltaDLTOutNum );
-  Void    setDeltaDLT( Int layerIdInVps, Int* piDLTInRef, Int iDLTInRefNum, Int* piDeltaDLTIn, Int piDeltaDLTInNum );
+#if H_3D_DELTA_DLT
+  Int*    idx2DepthValue( Int layerIdInVps )  { return m_iIdx2DepthValue[layerIdInVps]; }
+  Void    getDeltaDLT( Int layerIdInVps, Int* piDLTInRef, UInt uiDLTInRefNum, Int* piDeltaDLTOut, UInt *puiDeltaDLTOutNum );
+  Void    setDeltaDLT( Int layerIdInVps, Int* piDLTInRef, UInt uiDLTInRefNum, Int* piDeltaDLTIn, UInt uiDeltaDLTInNum );
 #endif
 };

branches/HTM-9.1-dev0-RWTH/source/Lib/TLibCommon/TypeDef.h

@@ -222 +222 @@
 #define Log2( n ) ( log((double)n) / log(2.0) )
 #endif
-#define RWTH_DELTA_DLT                    1
+#define H_3D_DELTA_DLT                    1
 #endif