Changeset 485 in 3DVCSoftware for branches

Timestamp:

20 Jun 2013, 12:32:01 (12 years ago)

Author:

rwth

Message:

• code cleanup for H_3D_DIM_DLT

Location:

branches/HTM-DEV-0.3-dev1/source

Files:

• App/TAppEncoder/TAppEncTop.cpp (modified) (1 diff)
• Lib/TLibCommon/TComRom.h (modified) (1 diff)
• Lib/TLibCommon/TComSlice.cpp (modified) (2 diffs)
• Lib/TLibCommon/TypeDef.h (modified) (1 diff)
• Lib/TLibDecoder/TDecCAVLC.cpp (modified) (1 diff)
• Lib/TLibDecoder/TDecSbac.cpp (modified) (1 diff)
• Lib/TLibEncoder/TEncSbac.cpp (modified) (1 diff)

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

@@ -1051 +1051 @@
   }
   
-  if( uiNumFrames == 0 || (Int)ceil(Log2(iNumDepthValues)) == (Int)ceil(Log2(((1 << g_bitDepthY)-1))) )
+  if( uiNumFrames == 0 || numBitsForValue(iNumDepthValues) == g_bitDepthY )
   {
     // don't use DLT

branches/HTM-DEV-0.3-dev1/source/Lib/TLibCommon/TComRom.h

@@ -159 +159 @@
 __inline Void mapDepthModeToIntraDir(  Int& intraMode ) { if( isDimMode( intraMode ) ) intraMode = DC_IDX; }
 
+#if H_3D_DIM_SDC || H_3D_DIM_DLT
+__inline UInt numBitsForValue( UInt value ) { UInt bits = 0; while (value != 0) { value >>= 1; bits++; } return bits; };
+#endif
+
 #if H_3D_DIM_DMM
 extern const WedgeResolution                                 g_dmmWedgeResolution [6];

branches/HTM-DEV-0.3-dev1/source/Lib/TLibCommon/TComSlice.cpp

@@ -1485 +1485 @@
     // allocate some memory and initialize with default mapping
     m_iNumDepthmapValues[i] = ((1 << g_bitDepthY)-1)+1;
-    m_iBitsPerDepthValue[i] = (Int)ceil(Log2(m_iNumDepthmapValues[i]));
+    m_iBitsPerDepthValue[i] = numBitsForValue(m_iNumDepthmapValues[i]);
     
     m_iDepthValue2Idx[i]    = (Int*) xMalloc(Int, m_iNumDepthmapValues[i]);
@@ -1579 +1579 @@
     // update DLT variables
     m_iNumDepthmapValues[layerIdInVps] = iNumDepthValues;
-    m_iBitsPerDepthValue[layerIdInVps] = (Int)ceil(Log2(m_iNumDepthmapValues[layerIdInVps]));
+    m_iBitsPerDepthValue[layerIdInVps] = numBitsForValue(m_iNumDepthmapValues[layerIdInVps]);
   }
 #endif

branches/HTM-DEV-0.3-dev1/source/Lib/TLibCommon/TypeDef.h

@@ -119 +119 @@
                                               // HHI_DEPTH_INTRA_SEARCH_RAU_C0160
                                               // LG_ZEROINTRADEPTHRESI_A0087
-#if H_3D_DIM_DLT || H_3D_DIM_SDC
-#define Log2( n ) ( log((double)n) / log(2.0) )
-#endif
 #endif
 

branches/HTM-DEV-0.3-dev1/source/Lib/TLibDecoder/TDecCAVLC.cpp

@@ -987 +987 @@
               free(aiIdx2DepthValue);
             }
-            else
-              pcVPS->setDepthLUTs(i);
           }
-          else
-            pcVPS->setDepthLUTs(i);
 #endif
         }

branches/HTM-DEV-0.3-dev1/source/Lib/TLibDecoder/TDecSbac.cpp

@@ -565 +565 @@
     if ( uiCount == uiPrefixThreshold )
     {
-      for ( UInt ui = 0; ui < ( (UInt)ceil( Log2(uiNumDepthValues - uiPrefixThreshold) ) ); ui++ )
+      for ( UInt ui = 0; ui < numBitsForValue(uiNumDepthValues - uiPrefixThreshold); ui++ )
       {
         m_pcTDecBinIf->decodeBinEP( uiBit );

branches/HTM-DEV-0.3-dev1/source/Lib/TLibEncoder/TEncSbac.cpp

@@ -630 +630 @@
       {
         uiAbsIdx -= uiPrefixThreshold;
-        UInt uiSuffixLength = ( (UInt)ceil( Log2(uiNumDepthValues - uiPrefixThreshold) ) );
+        UInt uiSuffixLength = numBitsForValue(uiNumDepthValues - uiPrefixThreshold);
         UInt uiBitInfo = 0;
         for ( Int i = 0; i < uiSuffixLength; i++)