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


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
Files:
7 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

  • branches/SHM-dev/source/Lib/TLibDecoder/TDecCAVLC.cpp

    r1199 r1200  
    17901790
    17911791#if REPN_FORMAT_IN_VPS
    1792 #if O0194_DIFFERENT_BITDEPTH_EL_BL
    17931792    g_bitDepthLayer[CHANNEL_TYPE_LUMA][pcSlice->getLayerId()] = pcSlice->getBitDepthY();
    17941793    g_bitDepthLayer[CHANNEL_TYPE_CHROMA][pcSlice->getLayerId()] = pcSlice->getBitDepthC();
    1795 #endif
     1794
    17961795    assert( pcSlice->getSliceQp() >= -pcSlice->getQpBDOffsetY() );
    17971796#else   

  • branches/SHM-dev/source/Lib/TLibDecoder/TDecTop.cpp

    r1199 r1200  
    567567      pBLPic->getSlice(0)->setVPS( activeVPS );
    568568
    569 #if O0194_DIFFERENT_BITDEPTH_EL_BL
    570569      g_bitDepthLayer[CHANNEL_TYPE_LUMA][0] = repFormat->getBitDepthVpsLuma();
    571570      g_bitDepthLayer[CHANNEL_TYPE_CHROMA][0] = repFormat->getBitDepthVpsChroma();
    572 #endif
    573571    }
    574572  }

  • branches/SHM-dev/source/Lib/TLibEncoder/TEncTop.cpp

    r1199 r1200  
    611611
    612612#if SVC_EXTENSION //Temporal solution, should be modified
    613       if(m_layerId > 0)
    614       {
    615         for(UInt i = 0; i < m_cVPS.getNumDirectRefLayers( m_layerId ); i++ )
     613      if( m_layerId > 0 )
     614      {
     615        for( UInt i = 0; i < m_cVPS.getNumDirectRefLayers( m_layerId ); i++ )
    616616        {
    617617          const Window scalEL = getPPS()->getScaledRefLayerWindowForLayer(m_cVPS.getRefLayerId(m_layerId, i));
    … …  
    621621
    622622          TEncTop *pcEncTopBase = (TEncTop *)getRefLayerEnc( i );
    623 #if O0194_DIFFERENT_BITDEPTH_EL_BL
     623
    624624          UInt refLayerId = m_cVPS.getRefLayerId(m_layerId, i);
    625625          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] );
    … …  
    644644#endif
    645645            )
    646 #else
    647           if(m_iSourceWidth != pcEncTopBase->getSourceWidth() || m_iSourceHeight != pcEncTopBase->getSourceHeight()
    648             || !equalOffsets
    649             || !zeroPhase
    650           )
    651 #endif
    652646          {
    653647            pcEPic->setSpatialEnhLayerFlag( i, true );
    … …  
    658652        }
    659653      }
    660 #endif
    661 
    662 #if SVC_EXTENSION
     654
    663655      pcEPic->create( m_iSourceWidth, m_iSourceHeight, m_chromaFormatIDC, g_uiMaxCUWidth, g_uiMaxCUHeight, g_uiMaxCUDepth, m_cPPS.getMaxCuDQPDepth()+1 ,
    664656                      m_conformanceWindow, m_defaultDisplayWindow, m_numReorderPics, &m_cSPS);
    … …  
    673665
    674666#if SVC_EXTENSION //Temporal solution, should be modified
    675       if(m_layerId > 0)
    676       {
    677         for(UInt i = 0; i < m_cVPS.getNumDirectRefLayers( m_layerId ); i++ )
     667      if( m_layerId > 0 )
     668      {
     669        for( UInt i = 0; i < m_cVPS.getNumDirectRefLayers( m_layerId ); i++ )
    678670        {
    679671          const Window scalEL = getPPS()->getScaledRefLayerWindowForLayer(m_cVPS.getRefLayerId(m_layerId, i));
    … …  
    683675
    684676          TEncTop *pcEncTopBase = (TEncTop *)getRefLayerEnc( i );
    685 #if O0194_DIFFERENT_BITDEPTH_EL_BL
     677
    686678          UInt refLayerId = m_cVPS.getRefLayerId(m_layerId, i);
    687679          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] );
    … …  
    696688            || pcEncTopBase->getSPS()->getMaxCUWidth() != m_cSPS.getMaxCUWidth() || pcEncTopBase->getSPS()->getMaxCUHeight() != m_cSPS.getMaxCUHeight() || pcEncTopBase->getSPS()->getMaxCUDepth() != m_cSPS.getMaxCUDepth()
    697689#endif
    698 )
    699 #else
    700           if(m_iSourceWidth != pcEncTopBase->getSourceWidth() || m_iSourceHeight != pcEncTopBase->getSourceHeight()
    701             || !equalOffsets
    702             || !zeroPhase
    703           )
    704 #endif
     690            )
    705691          {
    706692            rpcPic->setSpatialEnhLayerFlag( i, true );
    … …  
    711697        }
    712698      }
    713 #endif
    714 
    715 #if SVC_EXTENSION
     699
    716700      rpcPic->create( m_iSourceWidth, m_iSourceHeight, m_chromaFormatIDC, g_uiMaxCUWidth, g_uiMaxCUHeight, g_uiMaxCUDepth, m_conformanceWindow, m_defaultDisplayWindow, m_numReorderPics, &m_cSPS);
    717701#else  //SVC_EXTENSION
Note: See TracChangeset for help on using the changeset viewer.