Ignore:
Timestamp:
20 Feb 2013, 22:07:43 (11 years ago)
Author:
tech
Message:

Reintegrated branch 5.1-dev0 rev. 295.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/source/Lib/TLibCommon/TComResidualGenerator.h

    r189 r296  
    5050
    5151
    52 #if HHI_INTER_VIEW_RESIDUAL_PRED
     52#if H3D_IVRP
    5353
    5454class TComResidualGenerator
     
    6969  Void  setRecResidualPic     ( TComPic*      pcPic );
    7070
    71 #if QC_MULTI_DIS_CAN_A0097
    72   Bool  getResidualSamples    ( TComDataCU*   pcCU,  UInt uiPUIdx, TComYuv* pcYuv, Int iDisp
    73 #if QC_SIMPLIFIEDIVRP_M24938
    74     , Bool bRecon
     71#if H3D_NBDV
     72#if MTK_RELEASE_DV_CONSTRAINT_C0129
     73  Bool  getResidualSamples    ( TComDataCU*   pcCU,  UInt uiPUIdx, TComYuv* pcYuv, TComMv iDisp_x, Bool bRecon );
     74  Bool  getResidualSamples    ( TComPic* pcPic, UInt uiXPos, UInt uiYPos, UInt uiBlkWidth, UInt uiBlkHeight, TComYuv* pcYuv , TComMv iDisp_x, Bool bRecon );
     75#else
     76  Bool  getResidualSamples    ( TComDataCU*   pcCU,  UInt uiPUIdx, TComYuv* pcYuv, Int iDisp, Bool bRecon );
     77  Bool  getResidualSamples    ( TComPic* pcPic, UInt uiXPos, UInt uiYPos, UInt uiBlkWidth, UInt uiBlkHeight, TComYuv* pcYuv , Int iDisp, Bool bRecon );
    7578#endif
    76 );
    77   Bool  getResidualSamples    ( TComPic* pcPic, UInt uiXPos, UInt uiYPos, UInt uiBlkWidth, UInt uiBlkHeight, TComYuv* pcYuv , Int iDisp
    78 #if QC_SIMPLIFIEDIVRP_M24938
    79     , Bool bRecon
    80 #endif 
    81   );
    82 #else
    83   Bool  getResidualSamples    ( TComDataCU*   pcCU,  UInt uiPUIdx, TComYuv* pcYuv
    84 #if QC_SIMPLIFIEDIVRP_M24938
    85     , Bool bRecon
    86 #endif
    87     );
    88   Bool  getResidualSamples    ( TComPic* pcPic, UInt uiXPos, UInt uiYPos, UInt uiBlkWidth, UInt uiBlkHeight, TComYuv* pcYuv
    89 #if QC_SIMPLIFIEDIVRP_M24938
    90     , Bool bRecon
    91 #endif
    92     );
    93 #endif
     79#else // H3D_NBDV
     80  Bool  getResidualSamples    ( TComDataCU*   pcCU,  UInt uiPUIdx, TComYuv* pcYuv, Bool bRecon );
     81  Bool  getResidualSamples    ( TComPic* pcPic, UInt uiXPos, UInt uiYPos, UInt uiBlkWidth, UInt uiBlkHeight, TComYuv* pcYuv, Bool bRecon );
     82#endif // H3D_NBDV
    9483
    9584private:
     
    10089  Void  xClearIntViewResidual ( TComDataCU*   pcCU,  TComYuv* pcCUResidual, UInt uiPartIdx    );
    10190  Void  xClearResidual        (                      TComYuv* pcCUResidual, UInt uiAbsPartIdx, UInt uiWidth, UInt uiHeight );
    102 #if QC_MULTI_DIS_CAN_A0097
    103   Void  xSetPredResidualBlock ( TComPic*      pcPic, UInt uiBaseViewId, UInt uiXPos, UInt uiYPos, UInt uiBlkWidth, UInt uiBlkHeight, TComYuv* pcYuv, Int iDisp
    104 #if QC_SIMPLIFIEDIVRP_M24938
    105     , UInt * puiXPosInRefView , UInt * puiYPosInRefView , Bool bRecon
     91#if H3D_NBDV
     92#if MTK_RELEASE_DV_CONSTRAINT_C0129
     93  Void  xSetPredResidualBlock ( TComPic*      pcPic, UInt uiBaseViewId, UInt uiXPos, UInt uiYPos, UInt uiBlkWidth, UInt uiBlkHeight, TComYuv* pcYuv, TComMv iDisp, UInt * puiXPosInRefView , UInt * puiYPosInRefView , Bool bRecon  );   
     94#else
     95  Void  xSetPredResidualBlock ( TComPic*      pcPic, UInt uiBaseViewId, UInt uiXPos, UInt uiYPos, UInt uiBlkWidth, UInt uiBlkHeight, TComYuv* pcYuv, Int iDisp, UInt * puiXPosInRefView , UInt * puiYPosInRefView , Bool bRecon  );
    10696#endif
    107   );
    10897#else
    109   Void  xSetPredResidualBlock ( TComPic*      pcPic, UInt uiBaseViewId, UInt uiXPos, UInt uiYPos, UInt uiBlkWidth, UInt uiBlkHeight, TComYuv* pcYuv
    110 #if QC_SIMPLIFIEDIVRP_M24938
    111     , UInt * puiXPosInRefView , UInt * puiYPosInRefView , Bool bRecon
    112 #endif
    113     );
     98  Void  xSetPredResidualBlock ( TComPic*      pcPic, UInt uiBaseViewId, UInt uiXPos, UInt uiYPos, UInt uiBlkWidth, UInt uiBlkHeight, TComYuv* pcYuv, UInt * puiXPosInRefView , UInt * puiYPosInRefView , Bool bRecon  );
    11499#endif
    115100  Bool  xIsNonZero            ( TComYuv*      pcYuv, UInt uiBlkWidth, UInt uiBlkHeight );
    116 #if QC_SIMPLIFIEDIVRP_M24938
    117101  Bool  xIsNonZeroByCBF       ( UInt uiBaseViewId , UInt uiXPos , UInt uiYPos, UInt uiBlkWidth , UInt uiBlkHeight );
    118 #endif
    119 
    120102  Void  xDumpResidual         ( TComPic*      pcPic, char* pFilenameBase );
    121 
    122103private:
    123104  // general parameters
     
    140121#endif // __TCOM_RESIDUAL_GENERATOR__
    141122
    142 #endif // HHI_INTER_VIEW_RESIDUAL_PRED
     123#endif // H3D_IVRP
    143124
    144125
Note: See TracChangeset for help on using the changeset viewer.