Changeset 1197 in SHVCSoftware
- Timestamp:
- 8 Jul 2015, 19:40:05 (9 years ago)
- Location:
- branches/SHM-dev/source/Lib/TLibCommon
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/SHM-dev/source/Lib/TLibCommon/TComSlice.cpp
r1196 r1197 500 500 { 501 501 Int numResampler = 0; 502 #if MOTION_RESAMPLING_CONSTRAINT 502 503 // motion resampling constraint 503 504 Int numMotionResamplers = 0; 504 505 Int refResamplingLayer[MAX_LAYERS]; 505 506 memset( refResamplingLayer, 0, sizeof( refResamplingLayer ) ); 506 #endif507 507 508 508 for( i=0; i < m_activeNumILRRefIdx; i++ ) … … 522 522 Bool sameBitDepths = ( g_bitDepthLayer[CHANNEL_TYPE_LUMA][m_layerId] == g_bitDepthLayer[CHANNEL_TYPE_LUMA][refLayerId] ) && ( g_bitDepthLayer[CHANNEL_TYPE_CHROMA][m_layerId] == g_bitDepthLayer[CHANNEL_TYPE_CHROMA][refLayerId] ); 523 523 524 // motion resampling constraint 525 // Allow maximum of one motion resampling process for direct reference layers, and use motion inter-layer prediction from the same layer as texture inter-layer prediction 524 526 if( !( g_posScalingFactor[refLayerIdc][0] == 65536 && g_posScalingFactor[refLayerIdc][1] == 65536 ) || !scalingOffset || !sameBitDepths 525 527 #if Q0048_CGS_3D_ASYMLUT … … 531 533 #endif 532 534 { 533 #if MOTION_RESAMPLING_CONSTRAINT534 535 UInt predType = m_pcVPS->getDirectDependencyType( m_layerId, refLayerId ) + 1; 535 536 … … 545 546 refResamplingLayer[i] -= refLayerIdc + 1; 546 547 } 547 #else548 numResampler++;549 #endif550 548 } 551 549 } … … 562 560 // Bitstream constraint for SHVC: The picture resampling process as specified in subclause G.8.1.4.1 shall not be invoked more than once for decoding of each particular picture. 563 561 assert(numResampler <= 1); 564 #if MOTION_RESAMPLING_CONSTRAINT565 562 assert( numMotionResamplers <= 1 && "Up to 1 motion resampling is allowed" ); 566 #endif567 563 } 568 564 } -
branches/SHM-dev/source/Lib/TLibCommon/TypeDef.h
r1196 r1197 90 90 91 91 #define REF_IDX_MFM 1 ///< JCTVC-L0336: motion vector mapping of inter-layer reference picture 92 #define MOTION_RESAMPLING_CONSTRAINT 1 ///< JCTVC-N0108: Allow maximum of one motion resampling process for direct reference layers, and use motion inter-layer prediction from the same layer as texture inter-layer prediction.93 92 #define AUXILIARY_PICTURES 1 ///< JCTVC-O0041: auxiliary picture layers 94 93 #define R0062_AUX_PSEUDO_MONOCHROME 1 ///> JCVVC-R0063: pseudo monochrome for auxiliary pictures
Note: See TracChangeset for help on using the changeset viewer.