Changeset 41 in 3DVCSoftware for branches/0.3-poznan-univ/source/App/TAppCommon

Timestamp:

26 Mar 2012, 09:03:21 (13 years ago)

Author:

poznan-univ

Message:

Adjustment for FlexCO, and high-level syntax improvement.

Location:

branches/0.3-poznan-univ/source/App/TAppCommon

Files:

• TAppComCamPara.cpp (modified) (4 diffs)
• TAppComCamPara.h (modified) (3 diffs)

branches/0.3-poznan-univ/source/App/TAppCommon/TAppComCamPara.cpp

@@ -877 +877 @@
       radShiftParams[ uiSourceView][ uiTargetView ][ 1 ] = dOffset;
 
+      for( UInt uiDepthValue = 0; uiDepthValue < SizeOfLUT; uiDepthValue++ )
+      {
+        // real-valued look-up tables
 #if POZNAN_NONLINEAR_DEPTH
-      TComNonlinearDepthBackward cNonlinearDepthBwd(m_fDepthPower, (POZNAN_LUT_INCREASED_PRECISION) ? g_uiBitIncrement : 0, (POZNAN_LUT_INCREASED_PRECISION) ? g_uiBitIncrement : 0);
+        Double  dShiftLuma;
+        if(m_bUseNonlinearDepth)
+          dShiftLuma      = ( m_cNonlinearDepthModel.BackwardD((Double)uiDepthValue, dScale) + dOffset ) * Double( 1 << m_iLog2Precision );
+        else
+          dShiftLuma      = ( (Double)uiDepthValue * dScale + dOffset ) * Double( 1 << m_iLog2Precision );
+#else
+        Double  dShiftLuma      = ( (Double)uiDepthValue * dScale + dOffset ) * Double( 1 << m_iLog2Precision );
 #endif
-
-      for( UInt uiDepthValue = 0; uiDepthValue < SizeOfLUT; uiDepthValue++ )
-      {
-        Double  dDepthValue = (Double)uiDepthValue;
-        Int64   iDepthValue = (Int64)uiDepthValue;
-#if POZNAN_NONLINEAR_DEPTH
-        dDepthValue = cNonlinearDepthBwd(dDepthValue);
-        iDepthValue = (Int64)(dDepthValue+0.5);
-#endif
-#if POZNAN_LUT_INCREASED_PRECISION
-        dDepthValue /= (1<<g_uiBitIncrement);
-#endif
-        // real-valued look-up tables
-
-        Double  dShiftLuma      = ( dDepthValue * dScale + dOffset ) * Double( 1 << m_iLog2Precision );
         Double  dShiftChroma    = dShiftLuma / 2;
         radLUT[ uiSourceView ][ uiTargetView ][ 0 ][ uiDepthValue ] = dShiftLuma;
@@ -900 +894 @@
 
         // integer-valued look-up tables
-        Int64   iTempScale      = iDepthValue * iScale;
-#if POZNAN_LUT_INCREASED_PRECISION
-        iTempScale >>= g_uiBitIncrement;
+#if POZNAN_NONLINEAR_DEPTH
+        Int64   iTempScale;
+        if(m_bUseNonlinearDepth)
+          iTempScale      = (Int64)m_cNonlinearDepthModel.BackwardI(uiDepthValue, iScale);
+        else
+          iTempScale      = (Int64)uiDepthValue * iScale;
+
+#else
+        Int64   iTempScale      = (Int64)uiDepthValue * iScale;
 #endif
         Int64   iTestScale      = ( iTempScale + iOffset       );   // for checking accuracy of camera parameters
@@ -1254 +1254 @@
                       Int    iLog2Precision
 #if POZNAN_NONLINEAR_DEPTH
-                      ,Float fDepthPower
+                      ,TComNonlinearDepthModel* pcNonlinearDepthModel
 #endif
                       )
@@ -1266 +1266 @@
 
 #if POZNAN_NONLINEAR_DEPTH
-  m_fDepthPower             = fDepthPower;
+  m_bUseNonlinearDepth = (pcNonlinearDepthModel != NULL) ? true : false;
+  if(pcNonlinearDepthModel != NULL)
+    m_cNonlinearDepthModel    = *pcNonlinearDepthModel;
 #endif
 

branches/0.3-poznan-univ/source/App/TAppCommon/TAppComCamPara.h

@@ -105 +105 @@
 
 #if POZNAN_NONLINEAR_DEPTH
-  Float               m_fDepthPower;
+  TComNonlinearDepthModel m_cNonlinearDepthModel;
+  Bool                m_bUseNonlinearDepth;
 #endif
 
@@ -166 +167 @@
                 Int     iLog2Precision 
 #if POZNAN_NONLINEAR_DEPTH
-                ,Float  fDepthPower
+                ,TComNonlinearDepthModel* pcNonlinearDepthModel
 #endif
                 );
@@ -178 +179 @@
                 Int     iLog2Precision
 #if POZNAN_NONLINEAR_DEPTH
-                ,Float  fDepthPower
+                ,TComNonlinearDepthModel* pcNonlinearDepthModel
 #endif
               );