Changeset 1200 in SHVCSoftware for branches/SHM-dev/source/Lib/TLibCommon


Ignore:
Timestamp:
8 Jul 2015, 20:22:40 (10 years ago)
Author:
seregin
Message:

macro cleanup: O0194_DIFFERENT_BITDEPTH_EL_BL

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

Legend:

Unmodified
Added
Removed

  • branches/SHM-dev/source/Lib/TLibCommon/CommonDef.h

    r1177 r1200  
    140140extern Int g_bitDepth[MAX_NUM_CHANNEL_TYPE];
    141141
    142 #if O0194_DIFFERENT_BITDEPTH_EL_BL
     142#if SVC_EXTENSION
    143143extern Int  g_bitDepthLayer[MAX_NUM_CHANNEL_TYPE][MAX_LAYERS];
    144144#endif

  • branches/SHM-dev/source/Lib/TLibCommon/TComRom.cpp

    r1029 r1200  
    678678UInt g_predefSetIntraModes[NUM_INTRA_MODE-1] = {26,10,18,34,2,22,14,30,6,24,12,28,8,20,16,32,4,17,19,15,21,13,23,11,25,9,27,7,29,5,31,3,33,0,2};
    679679#endif
    680 #if O0194_DIFFERENT_BITDEPTH_EL_BL
    681680Int  g_bitDepthLayer[MAX_NUM_CHANNEL_TYPE][MAX_LAYERS];
    682 #endif
    683681#if O0194_WEIGHTED_PREDICTION_CGS
    684682void * g_refWeightACDCParam; // type=wpACDCParam

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

    r1199 r1200  
    515515                            );
    516516
    517 #if O0194_DIFFERENT_BITDEPTH_EL_BL
    518517        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] );
    519518
    … …  
    525524#endif
    526525          ) // ratio 1x
    527 #else
    528         if(!( g_posScalingFactor[refLayerIdc][0] == 65536 && g_posScalingFactor[refLayerIdc][1] == 65536 ) || (!scalingOffset)) // ratio 1x
    529 #endif
    530526        {
    531527          UInt predType = m_pcVPS->getDirectDependencyType( m_layerId, refLayerId ) + 1;

  • branches/SHM-dev/source/Lib/TLibCommon/TypeDef.h

    r1199 r1200  
    5858#define O0164_MULTI_LAYER_HRD            1      ///< JCTVC-O0164: Multi-layer HRD operation
    5959
    60 #define O0194_DIFFERENT_BITDEPTH_EL_BL   1      ///< JCTVC-O0194: Support for different bitdepth values for BL and EL, add required configuration parameters (and Some bugfixes when REPN_FORMAT_IN_VPS (JCTVC-N0092) is enabled)
    61 #if O0194_DIFFERENT_BITDEPTH_EL_BL
    6260#define O0194_JOINT_US_BITSHIFT          1      ///< JCTVC-O0194: Joint Upsampling and bit-shift
    63 #endif
    6461#define Q0048_CGS_3D_ASYMLUT             1      ///< JCTVC-Q0048: Colour gamut scalability with look-up table
    6562#if Q0048_CGS_3D_ASYMLUT
Note: See TracChangeset for help on using the changeset viewer.