Changeset 950 in 3DVCSoftware for trunk/source/Lib/TLibCommon/TComDataCU.h
- Timestamp:
- 25 Apr 2014, 12:38:00 (10 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/source/Lib/TLibCommon/TComDataCU.h
r884 r950 70 70 Bool abMergeFlag[2]; // for two segments 71 71 UChar auhMergeIndex[2]; // for two segments 72 #if !RWTH_DBBP_NO_SPU_H0057 72 73 Char ahVSPFlag[2]; // for two segments 73 74 DisInfo acDvInfo[2]; // for two segments 75 #endif 74 76 75 77 PartSize eVirtualPartSize; … … 193 195 Bool* m_pbSDCFlag; 194 196 Pel* m_apSegmentDCOffset[2]; 197 #if HS_DMM_SDC_PREDICTOR_UNIFY_H0108 198 Pel m_apDmmPredictor[2]; 199 #endif 195 200 #endif 196 201 #endif … … 233 238 #endif 234 239 240 #if ETRIKHU_CLEANUP_H0083 241 TComMotionCand m_mergCands[MRG_IVSHIFT+1]; 242 Int m_baseListidc; 243 #endif 244 235 245 protected: 236 246 … … 239 249 Bool xAddMVPCandOrder ( AMVPInfo* pInfo, RefPicList eRefPicList, Int iRefIdx, UInt uiPartUnitIdx, MVP_DIR eDir ); 240 250 #if H_3D_VSP 251 #if ETRIKHU_CLEANUP_H0083 252 Bool xAddVspCand( Int mrgCandIdx, DisInfo* pDInfo, Int& iCount); 253 #else 241 254 Bool xAddVspCand( Int mrgCandIdx, DisInfo* pDInfo, Int& iCount, 242 255 Bool* abCandIsInter, TComMvField* pcMvFieldNeighbours, UChar* puhInterDirNeighbours, Int* vspFlag, Int& iCount3DV, InheritedVSPDisInfo* inheritedVSPDisInfo); 243 256 #endif 257 #endif 244 258 #if H_3D_IV_MERGE 259 #if ETRIKHU_CLEANUP_H0083 260 Bool xAddIvMRGCand( Int mrgCandIdx, Int& iCount, Int* ivCandDir, TComMv* ivCandMv, Int* ivCandRefIdx ); 261 #else 245 262 Bool xAddIvMRGCand( Int mrgCandIdx, Int& iCount, Bool* abCandIsInter, TComMvField* pcMvFieldNeighbours, UChar* puhInterDirNeighbours, Int* ivCandDir, TComMv* ivCandMv, 246 263 Int* ivCandRefIdx, Int posIvDC, Int* vspFlag, Int &iCount3DV, InheritedVSPDisInfo* inheritedVSPDisInfo ); 264 #endif 265 #if ETRIKHU_CLEANUP_H0083 266 Bool xGetPosFirstAvailDmvCand( Int iCount, Int& iFirDispCand ); 267 #else 247 268 Bool xGetPosFirstAvailDmvCand( Int iCount, TComMvField* pcMvFieldNeighbours, Int* ivCandDir, Int posIvDC, Int* vspFlag, Int& iFirDispCand ); 269 #endif 248 270 #endif 249 271 … … 485 507 486 508 #if H_3D 509 #if !ETRIKHU_CLEANUP_H0083 487 510 Void rightShiftMergeCandList( TComMvField* pcMvFieldNeighbours, UChar* puhInterDirNeighbours, Int* iVSPIndexTrue, InheritedVSPDisInfo* inheritedVSPDisInfo, UInt start, UInt num, Int &iCount3DV); 511 #endif 488 512 Bool getDispforDepth ( UInt uiPartIdx, UInt uiPartAddr, DisInfo* cDisp); 489 513 Bool getDispMvPredCan(UInt uiPartIdx, RefPicList eRefPicList, Int iRefIdx, Int* paiPdmRefIdx, TComMv* pacPdmMv, DisInfo* pDis, Int* iPdm ); … … 508 532 #if H_3D_SPIVMP 509 533 , TComMvField* pcMFieldSP, UChar* puhInterDirSP 534 #endif 535 #if SEC_ADAPT_DISABLE_IVMP 536 , Bool bICFlag 510 537 #endif 511 538 ); … … 556 583 Pel getSDCSegmentDCOffset( UInt uiSeg, UInt uiPartIdx ) { return m_apSegmentDCOffset[uiSeg][uiPartIdx]; } 557 584 Void setSDCSegmentDCOffset( Pel pOffset, UInt uiSeg, UInt uiPartIdx) { m_apSegmentDCOffset[uiSeg][uiPartIdx] = pOffset; } 585 #if HS_DMM_SDC_PREDICTOR_UNIFY_H0108 586 Void setDmmPredictor ( Pel pOffset, UInt uiSeg) { m_apDmmPredictor[uiSeg] = pOffset; } 587 Pel getDmmPredictor ( UInt uiSeg) { return m_apDmmPredictor[uiSeg]; } 588 #endif 558 589 UInt getCtxSDCFlag ( UInt uiAbsPartIdx ); 559 590 UInt getCtxAngleFlag ( UInt uiAbsPartIdx ); … … 635 666 Bool getAvailableFlagA0() { return m_bAvailableFlagA0;} 636 667 Bool getAvailableFlagB2() { return m_bAvailableFlagB2;} 668 #if ETRIKHU_CLEANUP_H0083 637 669 Void initAvailableFlags() { m_bAvailableFlagA1 = m_bAvailableFlagB1 = m_bAvailableFlagB0 = m_bAvailableFlagA0 = m_bAvailableFlagB2 = 0; } 670 Void buildMCL(TComMvField* pcMFieldNeighbours, UChar* puhInterDirNeighbours 671 #if H_3D_VSP 672 , Int* vspFlag 673 #endif 674 #if H_3D_SPIVMP 675 , Bool* pbSPIVMPFlag 676 #endif 677 , Int& numValidMergeCand 678 ); 679 #else 680 Void initAvailableFlags() { m_bAvailableFlagA1 = m_bAvailableFlagB1 = m_bAvailableFlagB0 = m_bAvailableFlagA0 = m_bAvailableFlagB2 = 0; } 681 #endif 638 682 Void getInterMergeCandidates( UInt uiAbsPartIdx, UInt uiPUIdx, TComMvField* pcMvFieldNeighbours, UChar* puhInterDirNeighbours, Int& numValidMergeCand, Int mrgCandIdx = -1); 639 683 Void xGetInterMergeCandidates ( UInt uiAbsPartIdx, UInt uiPUIdx, TComMvField* pcMFieldNeighbours, UChar* puhInterDirNeighbours … … 642 686 #endif 643 687 #if H_3D_VSP 688 #if !ETRIKHU_CLEANUP_H0083 644 689 , Int* vspFlag 690 #endif 645 691 , InheritedVSPDisInfo* inheritedVSPDisInfo 646 692 #endif 647 693 #if H_3D_SPIVMP 694 #if ETRIKHU_CLEANUP_H0083 695 , TComMvField* pcMvFieldSP, UChar* puhInterDirSP 696 #else 648 697 , Bool* pbSPIVMPFlag, TComMvField* pcMvFieldSP, UChar* puhInterDirSP 698 #endif 649 699 #endif 650 700 , Int& numValidMergeCand, Int mrgCandIdx = -1
Note: See TracChangeset for help on using the changeset viewer.