Changeset 673 in SHVCSoftware for branches/SHM-6-dev
- Timestamp:
- 14 Apr 2014, 02:28:43 (11 years ago)
- Location:
- branches/SHM-6-dev/source/Lib
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/SHM-6-dev/source/Lib/TLibCommon/TypeDef.h
r669 r673 185 185 #define TSLAYERS_IL_RPS 1 ///< JCTVC-O0120 IL RPS based on max temporal sub-layers 186 186 #define P0079_DERIVE_NUMACTIVE_REF_PICS 1 ///< JCTVC-P0079 Modification of derivation of variable NumActiveRefLayerPics 187 #define Q0060_MAX_TID_REF_EQUAL_TO_ZERO 1 ///< JCTVC-Q0060 handling the case max_tid_il_ref_pics_plus1 is equal to 0. 187 188 #if REF_IDX_MFM 188 189 #define N0139_POSITION_ROUNDING_OFFSET 1 ///< JCTVC-N0139: offset for collocated block in motion mapping -
branches/SHM-6-dev/source/Lib/TLibDecoder/TDecCAVLC.cpp
r672 r673 2676 2676 for( Int i = 0; i < rpcSlice->getNumILRRefIdx(); i++ ) 2677 2677 { 2678 #if Q0060_MAX_TID_REF_EQUAL_TO_ZERO 2679 if((rpcSlice->getVPS()->getMaxTidIlRefPicsPlus1(rpcSlice->getVPS()->getLayerIdInVps(i),rpcSlice->getLayerId()) > rpcSlice->getTLayer() || rpcSlice->getTLayer()==0) && 2680 (rpcSlice->getVPS()->getMaxTSLayersMinus1(rpcSlice->getVPS()->getLayerIdInVps(i)) >= rpcSlice->getTLayer()) ) 2681 #else 2678 2682 if(rpcSlice->getVPS()->getMaxTidIlRefPicsPlus1(rpcSlice->getVPS()->getLayerIdInVps(i),rpcSlice->getLayerId()) > rpcSlice->getTLayer() && 2679 2683 (rpcSlice->getVPS()->getMaxTSLayersMinus1(rpcSlice->getVPS()->getLayerIdInVps(i)) >= rpcSlice->getTLayer()) ) 2684 #endif 2680 2685 { 2681 2686 rpcSlice->setActiveNumILRRefIdx(1); … … 2710 2715 { 2711 2716 #if O0225_TID_BASED_IL_RPS_DERIV && TSLAYERS_IL_RPS 2717 #if Q0060_MAX_TID_REF_EQUAL_TO_ZERO 2718 if((rpcSlice->getVPS()->getMaxTidIlRefPicsPlus1(0,rpcSlice->getLayerId()) > rpcSlice->getTLayer() || rpcSlice->getTLayer()==0) && 2719 (rpcSlice->getVPS()->getMaxTSLayersMinus1(0) >= rpcSlice->getTLayer()) ) 2720 #else 2712 2721 if( (rpcSlice->getVPS()->getMaxTidIlRefPicsPlus1(0,rpcSlice->getLayerId()) > rpcSlice->getTLayer()) && 2713 2722 (rpcSlice->getVPS()->getMaxTSLayersMinus1(0) >= rpcSlice->getTLayer()) ) 2723 #endif 2714 2724 { 2715 2725 #endif … … 2737 2747 for(i = 0, numRefLayerPics = 0; i < rpcSlice->getNumILRRefIdx(); i++ ) 2738 2748 { 2749 #if Q0060_MAX_TID_REF_EQUAL_TO_ZERO 2750 if((rpcSlice->getVPS()->getMaxTidIlRefPicsPlus1(rpcSlice->getVPS()->getLayerIdInVps(i),rpcSlice->getLayerId()) > rpcSlice->getTLayer() || rpcSlice->getTLayer()==0) && 2751 (rpcSlice->getVPS()->getMaxTSLayersMinus1(rpcSlice->getVPS()->getLayerIdInVps(i)) >= rpcSlice->getTLayer()) ) 2752 #else 2739 2753 if(rpcSlice->getVPS()->getMaxTidIlRefPicsPlus1(rpcSlice->getVPS()->getLayerIdInVps(i),rpcSlice->getLayerId()) > rpcSlice->getTLayer() && 2740 2754 (rpcSlice->getVPS()->getMaxTSLayersMinus1(rpcSlice->getVPS()->getLayerIdInVps(i)) >= rpcSlice->getTLayer()) ) 2755 #endif 2741 2756 { 2742 2757 refLayerPicIdc[ numRefLayerPics++ ] = i; -
branches/SHM-6-dev/source/Lib/TLibEncoder/TEncGOP.cpp
r652 r673 967 967 } 968 968 969 #if !O0225_TID_BASED_IL_RPS_DERIV 969 #if !O0225_TID_BASED_IL_RPS_DERIV || Q0060_MAX_TID_REF_EQUAL_TO_ZERO 970 970 pcSlice->setActiveNumILRRefIdx( activeNumILRRefIdxTmp ); 971 971 #endif
Note: See TracChangeset for help on using the changeset viewer.