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


Ignore:
Timestamp:
8 Jul 2015, 20:30:17 (11 years ago)
Author:
seregin
Message:

macro cleanup: O0194_WEIGHTED_PREDICTION_CGS

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

Legend:

Unmodified
Added
Removed

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

    r1200 r1201  
    142142#if SVC_EXTENSION
    143143extern Int  g_bitDepthLayer[MAX_NUM_CHANNEL_TYPE][MAX_LAYERS];
    144 #endif
    145 #if O0194_WEIGHTED_PREDICTION_CGS
    146144extern void* g_refWeightACDCParam; //type:wpACDCParam
    147145#endif

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

    r1029 r1201  
    340340Void TComRdCost::setDistParam( TComPattern* pcPatternKey, Pel* piRefY, Int iRefStride, Int iStep, DistParam& rcDistParam, Bool bHADME )
    341341{
    342 #if O0194_WEIGHTED_PREDICTION_CGS
    343   // Bug fix: The correct bit depth has not been used for weighted cost calculation
     342#if SVC_EXTENSION
     343  // Set bit depth for weighted cost calculation
    344344  rcDistParam.bitDepth = g_bitDepth[CHANNEL_TYPE_LUMA];
    345345#endif

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

    r1200 r1201  
    679679#endif
    680680Int  g_bitDepthLayer[MAX_NUM_CHANNEL_TYPE][MAX_LAYERS];
    681 #if O0194_WEIGHTED_PREDICTION_CGS
    682681void * g_refWeightACDCParam; // type=wpACDCParam
    683 #endif
    684682Int g_mvScalingFactor  [MAX_LAYERS][2] = {{0,0}, {0,0}};
    685683Int g_posScalingFactor [MAX_LAYERS][2] = {{0,0}, {0,0}};

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

    r1199 r1201  
    18851885  Int64 iAC;
    18861886  Int64 iDC;
    1887 #if O0194_WEIGHTED_PREDICTION_CGS
     1887#if SVC_EXTENSION
    18881888  Int iSamples;
    18891889#endif

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

    r1200 r1201  
    7070#define R0179_ENC_OPT_3DLUT_SIZE         0      ///< JCTVC-R0179: RD decision based LUT size selection
    7171#endif
    72 #define O0194_WEIGHTED_PREDICTION_CGS    1      ///< JCTVC-O0194: Weighted prediction for colour gamut scalability
    7372#define POC_RESET_IDC                    1      ///< JCTVC-P0041: Include poc_reset_idc and related derivation
    7473#if POC_RESET_IDC
Note: See TracChangeset for help on using the changeset viewer.