Changeset 414 in 3DVCSoftware


Ignore:
Timestamp:
17 May 2013, 14:17:35 (12 years ago)
Author:
rwth
Message:
  • renamed LGE_CONCATENATE to LGE_CONCATENATE_D0141
Location:
branches/HTM-6.2-dev3-RWTH-Fix/source/Lib
Files:
4 edited

Legend:

Unmodified
Added
Removed

  • branches/HTM-6.2-dev3-RWTH-Fix/source/Lib/TLibCommon/ContextTables.h

    r406 r414  
    138138#define SDC_NUM_SIGN_FLAG_CTX            1
    139139#endif
    140 #if LGE_CONCATENATE
     140#if LGE_CONCATENATE_D0141
    141141#define SDC_NUM_RESIDUAL_CTX             1
    142142#else
    … …  
    581581};
    582582   
    583 #if LGE_CONCATENATE
     583#if LGE_CONCATENATE_D0141
    584584static const UChar INIT_SDC_RESIDUAL[3][SDC_NUM_RESIDUAL_CTX] =
    585585{

  • branches/HTM-6.2-dev3-RWTH-Fix/source/Lib/TLibCommon/TypeDef.h

    r406 r414  
    7474#define INTEL_SDC64_D0193                 1   // JCT3V-D0193: SDC binary clean up (use a 1 bit binary code to signal sdc_pred_mode when CU size is 64x64)
    7575#define RWTH_SDC_CTX_SIMPL_D0032          1   // JCT3V-D0032: CABAC Context Reduction for Simplified Depth Coding
    76 #define LGE_CONCATENATE                 1 // JCT3V-D0141: concatenate binarization for residual index coding
     76#define LGE_CONCATENATE_D0141                 1 // JCT3V-D0141: concatenate binarization for residual index coding
    7777#endif
    7878#define FIX_SDC_ENC_RD_WVSO_D0163         1   // JCT3V-D0163: fix for SDC encoder rd-cost (VSO -> WVSO)

  • branches/HTM-6.2-dev3-RWTH-Fix/source/Lib/TLibDecoder/TDecSbac.cpp

    r406 r414  
    4141#define GetNumDepthValues()     (pcCU->getSlice()->getSPS()->getNumDepthValues())
    4242#define GetBitsPerDepthValue()  (pcCU->getSlice()->getSPS()->getBitsPerDepthValue())
    43 #if LGE_CONCATENATE
     43#if LGE_CONCATENATE_D0141
    4444#define PrefixThreshold ( ((GetNumDepthValues() * 3) >> 2) )
    4545#define BitsPerSuffix ( (UInt)ceil( Log2(GetNumDepthValues() - PrefixThreshold) ) )
    … …  
    26772677   
    26782678    // decode residual magnitude
    2679 #if LGE_CONCATENATE
     2679#if LGE_CONCATENATE_D0141
    26802680    //prefix part
    26812681    UInt uiCount = 0;

  • branches/HTM-6.2-dev3-RWTH-Fix/source/Lib/TLibEncoder/TEncSbac.cpp

    r406 r414  
    4545#define GetNumDepthValues()     (pcCU->getSlice()->getSPS()->getNumDepthValues())
    4646#define GetBitsPerDepthValue()  (pcCU->getSlice()->getSPS()->getBitsPerDepthValue())
    47 #if LGE_CONCATENATE
     47#if LGE_CONCATENATE_D0141
    4848#define PrefixThreshold ( ((GetNumDepthValues() * 3) >> 2) )
    4949#define BitsPerSuffix ( (UInt)ceil( Log2(GetNumDepthValues() - PrefixThreshold) ) )
    … …  
    26532653  UInt uiSign     = segmentDCOffset < 0 ? 1 : 0;
    26542654  UInt uiAbsIdx   = abs(segmentDCOffset);
    2655 #if !LGE_CONCATENATE
     2655#if !LGE_CONCATENATE_D0141
    26562656  UInt uiBit = 0;
    26572657#endif
    … …  
    26802680    // encode residual magnitude
    26812681    uiAbsIdx -= 1;
    2682 #if LGE_CONCATENATE
     2682#if LGE_CONCATENATE_D0141
    26832683    //prefix part
    26842684    if ( uiAbsIdx == 0 )
Note: See TracChangeset for help on using the changeset viewer.