Changeset 1274 in 3DVCSoftware for branches/HTM-14.1-update-dev2/source/Lib/TLibCommon/TComSlice.cpp
- Timestamp:
- 14 Jul 2015, 12:31:09 (9 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/HTM-14.1-update-dev2/source/Lib/TLibCommon/TComSlice.cpp
r1225 r1274 224 224 m_aaiCodedScale [i].resize(MAX_NUM_LAYERS); 225 225 } 226 226 227 #endif 227 228 … … 277 278 m_iSliceChromaQpDelta[component] = 0; 278 279 } 279 #if H_3D_IV_MERGE280 #if NH_3D_IV_MERGE 280 281 m_maxNumMergeCand = MRG_MAX_NUM_CANDS_MEM; 281 282 #else … … 1995 1996 m_dimensionId[i][j] = 0; 1996 1997 } 1997 #if H_3D_ARP1998 #if NH_3D_ARP 1998 1999 #endif 1999 2000 } … … 2031 2032 Int TComVPS::scalTypeToScalIdx( ScalabilityType scalType ) const 2032 2033 { 2033 assert( scalType >= 0 && scalType <= MAX_NUM_SCALABILITY_TYPES );2034 assert( scalType == MAX_NUM_SCALABILITY_TYPES || getScalabilityMaskFlag( scalType ) );2034 assert( (Int)scalType >= 0 && (Int)scalType <= MAX_NUM_SCALABILITY_TYPES ); 2035 assert( (Int)scalType == MAX_NUM_SCALABILITY_TYPES || getScalabilityMaskFlag( scalType ) ); 2035 2036 Int scalIdx = 0; 2036 2037 for( Int curScalType = 0; curScalType < scalType; curScalType++ ) … … 3584 3585 #endif 3585 3586 } 3586 #if H_3D3587 Void TComSlice::setDefaultRefView( 3588 { 3589 setDefaultRefViewIdx( -1);3590 setDefaultRefViewIdxAvailableFlag( false);3587 #if NH_3D_NBDV 3588 Void TComSlice::setDefaultRefView() 3589 { 3590 setDefaultRefViewIdx(-1); 3591 setDefaultRefViewIdxAvailableFlag(false); 3591 3592 3592 3593 Int valid = 0; 3593 3594 Int DefaultRefViewIdx = -1; 3594 for( UInt curViewIdx = 0; curViewIdx < getViewIndex() && valid == 0; curViewIdx++ ) 3595 { 3596 for( Int iRefListId = 0; ( iRefListId < (isInterB() ? 2 : 1) ) && !isIntra() && valid == 0; iRefListId++ ) 3597 { 3598 RefPicList eRefPicList = RefPicList( iRefListId ); 3599 Int iNumRefPics = getNumRefIdx( eRefPicList ); 3600 for( Int i = 0; i < iNumRefPics; i++ ) 3595 3596 for(UInt curViewIdx = 0; curViewIdx < getViewIndex() && valid == 0; curViewIdx++) 3597 { 3598 for(Int iRefListId = 0; (iRefListId < (isInterB() ? 2 : 1)) && !isIntra() && valid == 0; iRefListId++) 3599 { 3600 RefPicList eRefPicList = RefPicList(iRefListId); 3601 Int iNumRefPics = getNumRefIdx(eRefPicList); 3602 3603 for(Int i = 0; i < iNumRefPics; i++) 3601 3604 { 3602 if(getPOC() == getRefPic( eRefPicList, i )->getPOC() && curViewIdx == getRefPic( eRefPicList, i)->getViewIndex())3605 if(getPOC() == getRefPic(eRefPicList, i)->getPOC() && curViewIdx == getRefPic(eRefPicList, i)->getViewIndex()) 3603 3606 { 3604 3607 valid = 1; … … 3609 3612 } 3610 3613 } 3611 if( valid ) 3612 { 3613 setDefaultRefViewIdx( DefaultRefViewIdx ); 3614 setDefaultRefViewIdxAvailableFlag( true ); 3615 } 3616 } 3617 #endif 3618 3619 #if H_3D_ARP 3614 3615 if(valid) 3616 { 3617 setDefaultRefViewIdx(DefaultRefViewIdx); 3618 setDefaultRefViewIdxAvailableFlag(true); 3619 } 3620 } 3621 #endif 3622 3623 #if NH_3D_ARP 3620 3624 Void TComSlice::setARPStepNum( TComPicLists*ivPicLists ) 3621 3625 { … … 3684 3688 m_arpRefPicAvailable[eRefPicList][layerIdInNuh] = false; 3685 3689 } 3690 } 3691 } 3692 } 3693 if( m_nARPStepNum > 1) 3694 { 3695 for(Int i = 0; i < getNumActiveRefLayerPics(); i ++ ) 3696 { 3697 Int iLayerId = getRefPicLayerId( i ); 3698 Int iViewIdx = getVPS()->getViewIndex(iLayerId); 3699 Bool bIsDepth = ( getVPS()->getDepthId ( iLayerId ) == 1 ); 3700 if( iViewIdx<getViewIndex() && !bIsDepth ) 3701 { 3702 setBaseViewRefPicList( ivPicLists->getPicList( iLayerId ), iViewIdx ); 3686 3703 } 3687 3704 } … … 3844 3861 setupLUT = setupLUT || getViewSynthesisPredFlag( ); 3845 3862 3846 #if H_3D_NBDV_REF3863 #if NH_3D_NBDV_REF 3847 3864 setupLUT = setupLUT || getDepthRefinementFlag( ); 3848 3865 #endif 3849 3866 3850 #if H_3D_IV_MERGE3867 #if NH_3D_IV_MERGE 3851 3868 setupLUT = setupLUT || ( getIvMvPredFlag() && getIsDepth() ); 3852 3869 #endif
Note: See TracChangeset for help on using the changeset viewer.