Changeset 100 in 3DVCSoftware for trunk/source/Lib/TLibRenderer/TRenModel.h

Timestamp:

9 Aug 2012, 12:53:16 (13 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)

File:

• trunk/source/Lib/TLibRenderer/TRenModel.h (modified) (5 diffs)

trunk/source/Lib/TLibRenderer/TRenModel.h

@@ -50 +50 @@
 
   // Creation
+#if LGE_VSO_EARLY_SKIP_A0093
+  Void  create           ( Int iNumOfBaseViews, Int iNumOfModels, Int iWidth, Int iHeight, Int iShiftPrec, Int iHoleMargin, Bool bEarlySkip );
+#else
   Void  create           ( Int iNumOfBaseViews, Int iNumOfModels, Int iWidth, Int iHeight, Int iShiftPrec, Int iHoleMargin );
+#endif
   Void  createSingleModel( Int iBaseViewNum, Int iContent, Int iModelNum, Int iLeftViewNum, Int iRightViewNum, Bool bUseOrgRef, Int iBlendMode );
 
@@ -57 +61 @@
   Void  setSingleModel   ( Int iModelNum, Int** ppiShiftLutLeft, Int** ppiBaseShiftLutLeft, Int** ppiShiftLutRight, Int** ppiBaseShiftLutRight, Int iDistToLeft, TComPicYuv* pcPicYuvRefView );
 
+  // Set horizontal offset
+  Void  setHorOffset     ( UInt uiHorOff );
+
   // Set Mode
   Void  setErrorMode     ( Int iView, Int iContent, int iPlane );
 
   // Get Distortion, set Data
+#ifdef LGE_VSO_EARLY_SKIP_A0093
+  Int64 getDist          ( Int iStartPosX, Int iStartPosY, Int iWidth, Int iHeight, Int iStride, Pel* piNewData, Pel * piOrgData, Int iOrgStride);
+#else
   Int64 getDist          ( Int iStartPosX, Int iStartPosY, Int iWidth, Int iHeight, Int iStride, Pel* piNewData  );
+#endif
   Void  setData          ( Int iStartPosX, Int iStartPosY, Int iWidth, Int iHeight, Int iStride, Pel* piNewData  );
 
   // Get Rendered View
-  Void  getSynthVideo    ( Int iModelNum, Int iViewNum, TComPicYuv*& rpcPicYuvSynthVideo );
-  Void  getSynthDepth    ( Int iModelNum, Int iViewNum, TComPicYuv*& rpcPicYuvSynthDepth );
+
+  Void  getSynthVideo    ( Int iModelNum, Int iViewNum, TComPicYuv* pcPicYuvSynthVideo );
+  Void  getSynthDepth    ( Int iModelNum, Int iViewNum, TComPicYuv* pcPicYuvSynthDepth );
 
   // Get Total Distortion
@@ -74 +86 @@
   // helpers
   Void xSetLRViewAndAddModel( Int iModelNum, Int iBaseViewNum, Int iContent, Int iViewPos, Bool bAdd );
-  Void xCopy2PicYuv ( Pel** ppiSrcVideoPel, Int* piStrides, TComPicYuv* rpcPicYuvTarget );
 
   // Settings
@@ -80 +91 @@
   Int**  m_aaaiSubPelShiftLut[2];
   Int    m_iHoleMargin;
+#if LGE_VSO_EARLY_SKIP_A0093
+  Bool   m_bEarlySkip; 
+#endif
 
   /// Size of Video and Depth
@@ -88 +102 @@
 
   Int m_iNumOfBaseViews;
+
+#if HHI_VSO_SPEEDUP_A033                 
+  // Horizontal Offset in input data
+  UInt m_uiHorOff;          
+#endif
 
   /// Current Error Type ///