Changeset 1179 in 3DVCSoftware for trunk/source/Lib/TAppCommon

Timestamp:

7 Apr 2015, 17:05:30 (10 years ago)

Author:

tech

Message:

Merged branch 13.1-dev0@1178.

Location:

trunk/source/Lib/TAppCommon

Files:

• TAppComCamPara.cpp (modified) (8 diffs)
• TAppComCamPara.h (modified) (4 diffs)
• program_options_lite.cpp (modified) (1 diff)
• program_options_lite.h (modified) (1 diff)

trunk/source/Lib/TAppCommon/TAppComCamPara.cpp

@@ -4 +4 @@
  * granted under this license.
  *
- * Copyright (c) 2010-2011, ISO/IEC
+ * Copyright (c) 2010-2015, ITU/ISO/IEC
  * All rights reserved.
  *
@@ -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();
 

trunk/source/Lib/TAppCommon/TAppComCamPara.h

@@ -4 +4 @@
  * granted under this license.
  *
- * Copyright (c) 2010-2011, ISO/IEC
+ * Copyright (c) 2010-2015, ITU/ISO/IEC
  * All rights reserved.
  *
@@ -85 +85 @@
 
   // SPS and slice header related variables
+#if !HHI_CAM_PARA_K0052
   std::vector<Int>    m_aiViewOrderIndex;                     ///< list of view order indices
+#endif
   UInt                m_uiCamParsCodedPrecision;              ///< precision for coding of camera parameters (x: max error in disparity is 2^(-x) luma samples)
   Bool                m_bCamParsVaryOverTime;                 ///< flag specifying whether camera parameters vary for given frame numbers
@@ -145 +147 @@
   // getting conversion parameters for disparity to virtual depth conversion
   Void  xGetCameraShifts          ( UInt uiSourceView, UInt uiTargetView, UInt uiFrame, Double& rdCamPosShift, Double& rdPicPosShift );
+#if !HHI_CAM_PARA_K0052
   Void  xSetPdmConversionParams   ();
+#endif
 
 public:
@@ -216 +220 @@
   Bool                getVaryingCameraParameters()  { return m_bCamParsVaryOverTime;    }
   UInt                getCamParsCodedPrecision  ()  { return m_uiCamParsCodedPrecision; }
+#if !HHI_CAM_PARA_K0052
   std::vector<Int>&   getViewOrderIndex         ()  { return m_aiViewOrderIndex;        }
+#endif
   Int**               getCodedScale             ()  { return m_aaiCodedScale;           }
   Int**               getCodedOffset            ()  { return m_aaiCodedOffset;          }

trunk/source/Lib/TAppCommon/program_options_lite.cpp

@@ -4 +4 @@
  * granted under this license.  
  *
-* Copyright (c) 2010-2014, ITU/ISO/IEC
+* Copyright (c) 2010-2015, ITU/ISO/IEC
  * All rights reserved.
  *

trunk/source/Lib/TAppCommon/program_options_lite.h

@@ -4 +4 @@
  * granted under this license.  
  *
-* Copyright (c) 2010-2014, ITU/ISO/IEC
+* Copyright (c) 2010-2015, ITU/ISO/IEC
  * All rights reserved.
  *