Changeset 296 in 3DVCSoftware for trunk/source/Lib/TLibCommon/TComResidualGenerator.h

Timestamp:

20 Feb 2013, 22:07:43 (12 years ago)

Author:

tech

Message:

Reintegrated branch 5.1-dev0 rev. 295.

File:

• trunk/source/Lib/TLibCommon/TComResidualGenerator.h (modified) (4 diffs)

trunk/source/Lib/TLibCommon/TComResidualGenerator.h

@@ -50 +50 @@
 
 
-#if HHI_INTER_VIEW_RESIDUAL_PRED
+#if H3D_IVRP
 
 class TComResidualGenerator
@@ -69 +69 @@
   Void  setRecResidualPic     ( TComPic*      pcPic );
 
-#if QC_MULTI_DIS_CAN_A0097
-  Bool  getResidualSamples    ( TComDataCU*   pcCU,  UInt uiPUIdx, TComYuv* pcYuv, Int iDisp 
-#if QC_SIMPLIFIEDIVRP_M24938
-    , Bool bRecon
+#if H3D_NBDV
+#if MTK_RELEASE_DV_CONSTRAINT_C0129
+  Bool  getResidualSamples    ( TComDataCU*   pcCU,  UInt uiPUIdx, TComYuv* pcYuv, TComMv iDisp_x, Bool bRecon );
+  Bool  getResidualSamples    ( TComPic* pcPic, UInt uiXPos, UInt uiYPos, UInt uiBlkWidth, UInt uiBlkHeight, TComYuv* pcYuv , TComMv iDisp_x, Bool bRecon );
+#else
+  Bool  getResidualSamples    ( TComDataCU*   pcCU,  UInt uiPUIdx, TComYuv* pcYuv, Int iDisp, Bool bRecon ); 
+  Bool  getResidualSamples    ( TComPic* pcPic, UInt uiXPos, UInt uiYPos, UInt uiBlkWidth, UInt uiBlkHeight, TComYuv* pcYuv , Int iDisp, Bool bRecon ); 
 #endif
-);
-  Bool  getResidualSamples    ( TComPic* pcPic, UInt uiXPos, UInt uiYPos, UInt uiBlkWidth, UInt uiBlkHeight, TComYuv* pcYuv , Int iDisp 
-#if QC_SIMPLIFIEDIVRP_M24938
-    , Bool bRecon
-#endif  
-  );
-#else
-  Bool  getResidualSamples    ( TComDataCU*   pcCU,  UInt uiPUIdx, TComYuv* pcYuv 
-#if QC_SIMPLIFIEDIVRP_M24938
-    , Bool bRecon
-#endif
-    );
-  Bool  getResidualSamples    ( TComPic* pcPic, UInt uiXPos, UInt uiYPos, UInt uiBlkWidth, UInt uiBlkHeight, TComYuv* pcYuv 
-#if QC_SIMPLIFIEDIVRP_M24938
-    , Bool bRecon
-#endif
-    );
-#endif
+#else // H3D_NBDV
+  Bool  getResidualSamples    ( TComDataCU*   pcCU,  UInt uiPUIdx, TComYuv* pcYuv, Bool bRecon ); 
+  Bool  getResidualSamples    ( TComPic* pcPic, UInt uiXPos, UInt uiYPos, UInt uiBlkWidth, UInt uiBlkHeight, TComYuv* pcYuv, Bool bRecon ); 
+#endif // H3D_NBDV
 
 private:
@@ -100 +89 @@
   Void  xClearIntViewResidual ( TComDataCU*   pcCU,  TComYuv* pcCUResidual, UInt uiPartIdx    );
   Void  xClearResidual        (                      TComYuv* pcCUResidual, UInt uiAbsPartIdx, UInt uiWidth, UInt uiHeight );
-#if QC_MULTI_DIS_CAN_A0097
-  Void  xSetPredResidualBlock ( TComPic*      pcPic, UInt uiBaseViewId, UInt uiXPos, UInt uiYPos, UInt uiBlkWidth, UInt uiBlkHeight, TComYuv* pcYuv, Int iDisp 
-#if QC_SIMPLIFIEDIVRP_M24938
-    , UInt * puiXPosInRefView , UInt * puiYPosInRefView , Bool bRecon
+#if H3D_NBDV
+#if MTK_RELEASE_DV_CONSTRAINT_C0129
+  Void  xSetPredResidualBlock ( TComPic*      pcPic, UInt uiBaseViewId, UInt uiXPos, UInt uiYPos, UInt uiBlkWidth, UInt uiBlkHeight, TComYuv* pcYuv, TComMv iDisp, UInt * puiXPosInRefView , UInt * puiYPosInRefView , Bool bRecon  );    
+#else
+  Void  xSetPredResidualBlock ( TComPic*      pcPic, UInt uiBaseViewId, UInt uiXPos, UInt uiYPos, UInt uiBlkWidth, UInt uiBlkHeight, TComYuv* pcYuv, Int iDisp, UInt * puiXPosInRefView , UInt * puiYPosInRefView , Bool bRecon  ); 
 #endif
-  );
 #else
-  Void  xSetPredResidualBlock ( TComPic*      pcPic, UInt uiBaseViewId, UInt uiXPos, UInt uiYPos, UInt uiBlkWidth, UInt uiBlkHeight, TComYuv* pcYuv 
-#if QC_SIMPLIFIEDIVRP_M24938
-    , UInt * puiXPosInRefView , UInt * puiYPosInRefView , Bool bRecon
-#endif
-    );
+  Void  xSetPredResidualBlock ( TComPic*      pcPic, UInt uiBaseViewId, UInt uiXPos, UInt uiYPos, UInt uiBlkWidth, UInt uiBlkHeight, TComYuv* pcYuv, UInt * puiXPosInRefView , UInt * puiYPosInRefView , Bool bRecon  ); 
 #endif
   Bool  xIsNonZero            ( TComYuv*      pcYuv, UInt uiBlkWidth, UInt uiBlkHeight );
-#if QC_SIMPLIFIEDIVRP_M24938
   Bool  xIsNonZeroByCBF       ( UInt uiBaseViewId , UInt uiXPos , UInt uiYPos, UInt uiBlkWidth , UInt uiBlkHeight );
-#endif
-
   Void  xDumpResidual         ( TComPic*      pcPic, char* pFilenameBase );
-
 private:
   // general parameters
@@ -140 +121 @@
 #endif // __TCOM_RESIDUAL_GENERATOR__
 
-#endif // HHI_INTER_VIEW_RESIDUAL_PRED
+#endif // H3D_IVRP