Changeset 1197 in SHVCSoftware


Ignore:
Timestamp:
8 Jul 2015, 19:40:05 (9 years ago)
Author:
seregin
Message:

macro cleanup: MOTION_RESAMPLING_CONSTRAINT

Location:
branches/SHM-dev/source/Lib/TLibCommon
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • branches/SHM-dev/source/Lib/TLibCommon/TComSlice.cpp

    r1196 r1197  
    500500    {
    501501      Int numResampler = 0;
    502 #if MOTION_RESAMPLING_CONSTRAINT
     502
     503      // motion resampling constraint
    503504      Int numMotionResamplers = 0;
    504505      Int refResamplingLayer[MAX_LAYERS];
    505506      memset( refResamplingLayer, 0, sizeof( refResamplingLayer ) );
    506 #endif
    507507
    508508      for( i=0; i < m_activeNumILRRefIdx; i++ )
     
    522522        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] );
    523523
     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
    524526        if( !( g_posScalingFactor[refLayerIdc][0] == 65536 && g_posScalingFactor[refLayerIdc][1] == 65536 ) || !scalingOffset || !sameBitDepths
    525527#if Q0048_CGS_3D_ASYMLUT
     
    531533#endif
    532534        {
    533 #if MOTION_RESAMPLING_CONSTRAINT
    534535          UInt predType = m_pcVPS->getDirectDependencyType( m_layerId, refLayerId ) + 1;
    535536
     
    545546            refResamplingLayer[i] -= refLayerIdc + 1;
    546547          }
    547 #else
    548           numResampler++;
    549 #endif
    550548        }
    551549      }
     
    562560      // 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.
    563561      assert(numResampler <= 1);
    564 #if MOTION_RESAMPLING_CONSTRAINT
    565562      assert( numMotionResamplers <= 1  && "Up to 1 motion resampling is allowed" );
    566 #endif
    567563    }
    568564  }
  • branches/SHM-dev/source/Lib/TLibCommon/TypeDef.h

    r1196 r1197  
    9090
    9191#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.
    9392#define AUXILIARY_PICTURES               1      ///< JCTVC-O0041: auxiliary picture layers
    9493#define R0062_AUX_PSEUDO_MONOCHROME      1      ///> JCVVC-R0063: pseudo monochrome for auxiliary pictures
Note: See TracChangeset for help on using the changeset viewer.