Changeset 1172 in 3DVCSoftware for branches/HTM-13.1-dev0/source/Lib/TAppCommon/TAppComCamPara.cpp

Timestamp:

5 Apr 2015, 22:58:19 (9 years ago)

Author:

tech

Message:

K0050: Camera paramters.

File:

• branches/HTM-13.1-dev0/source/Lib/TAppCommon/TAppComCamPara.cpp (modified) (7 diffs)

branches/HTM-13.1-dev0/source/Lib/TAppCommon/TAppComCamPara.cpp

@@ -399 +399 @@
 
 
+#if !HHI_CAM_PARA_K0052
 Void
 TAppComCamPara::xGetViewOrderIndices( const std::vector<Int>& raiId2SortedId, std::vector<Int>& raiVOIdx )
@@ -411 +412 @@
   }
 }
+#endif
 
 
@@ -447 +449 @@
     else
     {
-    Int     iBaseView  = m_aiBaseViews[ iBaseViewId ];
-    Double  dFL1, dFLX;
-    Double  dCP1, dCPX;
-    Double  dCS1, dCSX;
-    Double  dZN1, dZNX;
-    Double  dZF1, dZFX;
-    Bool    bInterpolated;
-    xGetGeometryData( iBaseView, m_uiFirstFrameId, dFL1, dCP1, dCS1, bInterpolated );  AOT( bInterpolated );
-    xGetZNearZFar   ( iBaseView, m_uiFirstFrameId, dZN1, dZF1 );
-
-    for( UInt uiFrameId = m_uiFirstFrameId + 1; !bChangeDetected && uiFrameId <= m_uiLastFrameId; uiFrameId++ )
-    {
-      xGetGeometryData( iBaseView, uiFrameId, dFLX, dCPX, dCSX, bInterpolated );  AOT( bInterpolated );
-      xGetZNearZFar   ( iBaseView, uiFrameId, dZNX, dZFX );
-
-      if( dFL1 != dFLX || dCP1 != dCPX || dCS1 != dCSX || dZN1 != dZNX || dZF1 != dZFX )
-      {
-        bChangeDetected = true;
-      }
-    }
-  }
+      Int     iBaseView  = m_aiBaseViews[ iBaseViewId ];
+      Double  dFL1, dFLX;
+      Double  dCP1, dCPX;
+      Double  dCS1, dCSX;
+      Double  dZN1, dZNX;
+      Double  dZF1, dZFX;
+      Bool    bInterpolated;
+      xGetGeometryData( iBaseView, m_uiFirstFrameId, dFL1, dCP1, dCS1, bInterpolated );  AOT( bInterpolated );
+      xGetZNearZFar   ( iBaseView, m_uiFirstFrameId, dZN1, dZF1 );
+
+      for( UInt uiFrameId = m_uiFirstFrameId + 1; !bChangeDetected && uiFrameId <= m_uiLastFrameId; uiFrameId++ )
+      {
+        xGetGeometryData( iBaseView, uiFrameId, dFLX, dCPX, dCSX, bInterpolated );  AOT( bInterpolated );
+        xGetZNearZFar   ( iBaseView, uiFrameId, dZNX, dZFX );
+
+        if( dFL1 != dFLX || dCP1 != dCPX || dCS1 != dCSX || dZN1 != dZNX || dZF1 != dZFX )
+        {
+          bChangeDetected = true;
+        }
+      }
+    }
   }
   return bChangeDetected;
@@ -721 +723 @@
   else
   {
-  Double  dScale, dOffset;
-  Bool    bInterpolated = xGetShiftParameterReal( uiSourceView, uiTargetView, uiFrame, false, bByIdx, dScale, dOffset );
-  AOT(    bInterpolated ); // must be base view
-
-  Double  dMultOffset   = (Double)( 1 << ( m_uiCamParsCodedPrecision + 1 ) );
-  Double  dMultScale    = (Double)( 1 << ( m_uiCamParsCodedPrecision + 1 + m_uiInputBitDepth ) );
-  riOffset              = (Int)floor( dMultOffset * dOffset + .5 );
-  riScale               = (Int)floor( dMultScale  * dScale  + .5 );
-}
-
+    Double  dScale, dOffset;
+    Bool    bInterpolated = xGetShiftParameterReal( uiSourceView, uiTargetView, uiFrame, false, bByIdx, dScale, dOffset );
+    AOT(    bInterpolated ); // must be base view
+
+    Double  dMultOffset   = (Double)( 1 << ( m_uiCamParsCodedPrecision + 1 ) );
+    Double  dMultScale    = (Double)( 1 << ( m_uiCamParsCodedPrecision + 1 + m_uiInputBitDepth ) );
+    riOffset              = (Int)floor( dMultOffset * dOffset + .5 );
+    riScale               = (Int)floor( dMultScale  * dScale  + .5 );
+  }
 }
 
@@ -958 +959 @@
 
 
+
+#if !HHI_CAM_PARA_K0052
 Void
 TAppComCamPara::xSetPdmConversionParams()
@@ -995 +998 @@
   }
 }
+#endif
 
 
@@ -1280 +1284 @@
 
   //===== set derived parameters =====
+#if !HHI_CAM_PARA_K0052
   xGetViewOrderIndices( m_aiBaseId2SortedId, m_aiViewOrderIndex );
+#endif
   m_bCamParsVaryOverTime = xGetCamParsChangeFlag();