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

Timestamp:

9 Aug 2012, 12:53:16 (12 years ago)

Author:

tech

Message:

Adopted modifications:

• disparity vector generation (A0097)
• inter-view motion prediction modification (A0049)
• simplification of disparity vector derivation (A0126)
• region boundary chain coding (A0070)
• residual skip intra (A0087)
• VSO modification (A0033/A0093)

+ Clean ups + Bug fixes

Update of cfg files (A0033 modification 2)

Location:

trunk/source/Lib/TAppCommon

Files:

• TAppComCamPara.cpp (modified) (2 diffs)
• TAppComCamPara.h (modified) (2 diffs)

trunk/source/Lib/TAppCommon/TAppComCamPara.cpp

@@ -654 +654 @@
 }
 
+#if SAIT_VSO_EST_A0033
+Double g_dDispCoeff;
+#endif
 
 Bool
@@ -685 +688 @@
     iTargetViewNum = (Int) uiTargetView;
   }
+
+#if SAIT_VSO_EST_A0033
+  // This part should be modified later.
+  {
+    Double dFL1, dCS1, dCP1, dZN1, dZF1; 
+    Bool   bInterpolated;
+    Double dPos[3];
+    xGetGeometryData( m_aiBaseViews[0], uiFrame, dFL1, dPos[0], dCS1, bInterpolated );
+    xGetGeometryData( m_aiBaseViews[1], uiFrame, dFL1, dPos[1], dCS1, bInterpolated );
+
+    xGetGeometryData( iSourceViewNum, uiFrame, dFL1, dCP1, dCS1, bInterpolated );
+    xGetZNearZFar   ( iSourceViewNum, uiFrame, dZN1, dZF1 );
+
+    Double dBaseLine = dPos[0] - dPos[1]; //Max(Max(dPos[0],dPos[1]),dPos[2]) - Min(Min(dPos[0],dPos[1]),dPos[2]);
+    g_dDispCoeff = fabs( dFL1 * ( dBaseLine / 2.0 ) / 255.0 * ( 1.0/dZN1 - 1.0/dZF1 ) );
+  }
+#endif
 
   xGetGeometryData( iSourceViewNum, uiFrame, dFocalLengthSource, dPositionSource, dIntersectionSource, bInterpolatedSource );

trunk/source/Lib/TAppCommon/TAppComCamPara.h

@@ -69 +69 @@
   // view lists
   std::vector<Int>    m_aiViewsInCfgFile;                     ///< views for which parameters are specified in cfg file (from left to right)
-  std::vector<Int>    m_aiSynthViews;                           ///< View numbers of External ViewReferences
-  std::vector<Int>    m_aiRelSynthViewsNum;                   ///< Relative view numbers of External ViewReferences
+  std::vector<Int>    m_aiSynthViews;                         ///< View numbers of External ViewReferences
+  std::vector<Int>    m_aiRelSynthViewsNum;                   ///< Relative view numbers of External ViewReferences
   std::vector<Int>    m_aiBaseViews;                          ///< View numbers of Base View References (in coding order)
   std::vector<Int>    m_aiSortedBaseViews;                    ///< View numbers of Base View References (from left to right)
@@ -92 +92 @@
 
   // scale and offset parameters
-  Double***           m_adBaseViewShiftParameter;                                                       ///< ShiftParameters between BaseViews e.g. [2][1][0] shift scale from view 2 to view 1; [2][1][1] shift offset from view 2 to view 1
-  Int64 ***           m_aiBaseViewShiftParameter;                                       ///< ShiftParameters between BaseViews e.g. [2][1][0] shift scale from view 2 to view 1; [2][1][1] shift offset from view 2 to view 1           /* do we need 64 bit? */
-  Double***           m_adSynthViewShiftParameter;                                        ///< ShiftParameters between BaseViews and ERViews e.g. [2][1][0] shift scale from base view 2 to er view 1;
-  Int64 ***           m_aiSynthViewShiftParameter;                              ///< ShiftParameters between BaseViews and ERViews e.g. [2][1][0] shift scale from base view 2 to er view 1;            /* do we need 64 bit? */
+  Double***           m_adBaseViewShiftParameter;             ///< ShiftParameters between BaseViews e.g. [2][1][0] shift scale from view 2 to view 1; [2][1][1] shift offset from view 2 to view 1
+  Int64 ***           m_aiBaseViewShiftParameter;             ///< ShiftParameters between BaseViews e.g. [2][1][0] shift scale from view 2 to view 1; [2][1][1] shift offset from view 2 to view 1     /* do we need 64 bit? */
+  Double***           m_adSynthViewShiftParameter;            ///< ShiftParameters between BaseViews and ERViews e.g. [2][1][0] shift scale from base view 2 to er view 1;
+  Int64 ***           m_aiSynthViewShiftParameter;            ///< ShiftParameters between BaseViews and ERViews e.g. [2][1][0] shift scale from base view 2 to er view 1;    /* do we need 64 bit? */
 
   // look-up tables
-  Double****          m_adBaseViewShiftLUT;                                                                             ///< Disparity LUT
-  Int****             m_aiBaseViewShiftLUT;                                                                       ///< Disparity LUT
-  Double****          m_adSynthViewShiftLUT;                                                                    ///< Disparity LUT
-  Int****             m_aiSynthViewShiftLUT;                                                                    ///< Disparity LUT
+  Double****          m_adBaseViewShiftLUT;                    ///< Disparity LUT
+  Int****             m_aiBaseViewShiftLUT;                    ///< Disparity LUT
+  Double****          m_adSynthViewShiftLUT;                   ///< Disparity LUT
+  Int****             m_aiSynthViewShiftLUT;                   ///< Disparity LUT