Changeset 1270 in 3DVCSoftware for branches/HTM-14.1-update-dev3/source/Lib/TLibCommon/TComDataCU.h
- Timestamp:
- 13 Jul 2015, 15:22:02 (9 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/HTM-14.1-update-dev3/source/Lib/TLibCommon/TComDataCU.h
r1259 r1270 50 50 #include "TComPattern.h" 51 51 52 #if H_3D_ARP53 #include "TComYuv.h"54 #endif55 52 #if H_3D 56 53 #include <algorithm> … … 65 62 static const UInt NUM_MOST_PROBABLE_MODES=3; 66 63 67 #if H_3D_DBBP64 #if NH_3D_DBBP 68 65 typedef struct _DBBPTmpData 69 66 { … … 176 173 Bool* m_pbSPIVMPFlag; ///< array of sub-PU IVMP flags to indicate whehter a block uses sub-PU IVMP ///< 0: non-SPIVMP; 1: SPIVMP 177 174 #endif 178 #if H_3D_ARP175 #if NH_3D_ARP 179 176 UChar* m_puhARPW; 180 177 #endif … … 193 190 #endif 194 191 #endif 195 #if H_3D_DBBP192 #if NH_3D_DBBP 196 193 Bool* m_pbDBBPFlag; ///< array of DBBP flags 197 194 DbbpTmpData m_sDBBPTmpData; … … 249 246 250 247 /// compute scaling factor from POC difference 251 #if ! H_3D_ARP248 #if !NH_3D_ARP 252 249 Int xGetDistScaleFactor ( Int iCurrPOC, Int iCurrRefPOC, Int iColPOC, Int iColRefPOC ); 253 250 #endif … … 266 263 // create / destroy / initialize / copy 267 264 // ------------------------------------------------------------------------------------------------------------------- 268 #if H_3D_ARP 265 #if NH_3D_ARP 266 /// compute scaling factor from POC difference 269 267 Int xGetDistScaleFactor ( Int iCurrPOC, Int iCurrRefPOC, Int iColPOC, Int iColRefPOC ); 270 268 #endif … … 317 315 #endif 318 316 317 #if NH_3D_ARP 318 Void setSlice ( TComSlice* pcSlice) { m_pcSlice = pcSlice; } 319 Void setPic ( TComDataCU* pcCU ) { m_pcPic = pcCU->getPic(); } 320 #endif 319 321 // ------------------------------------------------------------------------------------------------------------------- 320 322 // member functions for CU data … … 327 329 Void setCUTransquantBypassSubParts( Bool flag, UInt uiAbsPartIdx, UInt uiDepth ); 328 330 329 #if H_3D_DBBP331 #if NH_3D_DBBP 330 332 Pel* getVirtualDepthBlock(UInt uiAbsPartIdx, UInt uiWidth, UInt uiHeight, UInt& uiDepthStride); 331 333 #endif … … 351 353 Void setPredModeSubParts ( PredMode eMode, UInt uiAbsPartIdx, UInt uiDepth ); 352 354 353 #if H_3D_DBBP355 #if NH_3D_DBBP 354 356 Bool* getDBBPFlag () { return m_pbDBBPFlag; } 355 357 Bool getDBBPFlag ( UInt uiIdx ) { return m_pbDBBPFlag[uiIdx]; } … … 452 454 template <typename T> 453 455 Void setSubPart ( T bParameter, T* pbBaseCtu, UInt uiCUAddr, UInt uiCUDepth, UInt uiPUIdx ); 454 #if NH_3D_VSP456 #if H_3D_VSP || NH_3D_DBBP 455 457 template<typename T> 456 458 Void setSubPartT ( T uiParameter, T* puhBaseLCU, UInt uiCUAddr, UInt uiCUDepth, UInt uiPUIdx ); … … 480 482 #if NH_3D_NBDV 481 483 Void setDvInfoSubParts ( DisInfo cDvInfo, UInt uiAbsPartIdx, UInt uiDepth ); 484 #if H_3D_VSP || NH_3D_DBBP 482 485 Void setDvInfoSubParts ( DisInfo cDvInfo, UInt uiAbsPartIdx, UInt uiPartIdx, UInt uiDepth); 486 #endif 483 487 DisInfo* getDvInfo () { return m_pDvInfo; } 484 488 DisInfo getDvInfo (UInt uiIdx) { return m_pDvInfo[uiIdx]; } … … 531 535 ); 532 536 #endif 533 #if H_3D_ARP537 #if NH_3D_ARP 534 538 UChar* getARPW () { return m_puhARPW; } 535 539 UChar getARPW ( UInt uiIdx ) { return m_puhARPW[uiIdx]; } 536 540 Void setARPW ( UInt uiIdx, UChar w ) { m_puhARPW[uiIdx] = w; } 537 541 Void setARPWSubParts ( UChar w, UInt uiAbsPartIdx, UInt uiDepth ); 538 Double getARPWFactor ( UInt uiIdx );539 542 #endif 540 543 #if H_3D_IC … … 730 733 UInt getCtxSkipFlag ( UInt uiAbsPartIdx ); 731 734 UInt getCtxInterDir ( UInt uiAbsPartIdx ); 732 #if H_3D_ARP735 #if NH_3D_ARP 733 736 UInt getCTXARPWFlag ( UInt uiAbsPartIdx ); 734 737 #endif
Note: See TracChangeset for help on using the changeset viewer.