Changeset 1203 in SHVCSoftware for branches/SHM-dev/source/Lib/TLibDecoder


Ignore:
Timestamp:
8 Jul 2015, 20:57:55 (9 years ago)
Author:
seregin
Message:

macro cleanup: REPN_FORMAT_IN_VPS

Location:
branches/SHM-dev/source/Lib/TLibDecoder
Files:
6 edited

Legend:

Unmodified
Added
Removed

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

    r1200 r1203  
    738738  {
    739739    Window &conf = pcSPS->getConformanceWindow();
    740 #if REPN_FORMAT_IN_VPS
     740#if SVC_EXTENSION
    741741    READ_UVLC(   uiCode, "conf_win_left_offset" );               conf.setWindowLeftOffset  ( uiCode );
    742742    READ_UVLC(   uiCode, "conf_win_right_offset" );              conf.setWindowRightOffset ( uiCode );
    … …  
    11881188    pcSlice->setDependentSliceSegmentFlag(false);
    11891189  }
    1190 #if REPN_FORMAT_IN_VPS
     1190#if SVC_EXTENSION
    11911191  Int numCTUs = ((pcSlice->getPicWidthInLumaSamples()+sps->getMaxCUWidth()-1)/sps->getMaxCUWidth())*((pcSlice->getPicHeightInLumaSamples()+sps->getMaxCUHeight()-1)/sps->getMaxCUHeight());
    11921192#else
    … …  
    17891789    pcSlice->setSliceQp (26 + pps->getPicInitQPMinus26() + iCode);
    17901790
    1791 #if REPN_FORMAT_IN_VPS
     1791#if SVC_EXTENSION
    17921792    g_bitDepthLayer[CHANNEL_TYPE_LUMA][pcSlice->getLayerId()] = pcSlice->getBitDepthY();
    17931793    g_bitDepthLayer[CHANNEL_TYPE_CHROMA][pcSlice->getLayerId()] = pcSlice->getBitDepthC();
    … …  
    23362336#endif
    23372337
    2338 #if REPN_FORMAT_IN_VPS
     2338#if SVC_EXTENSION
    23392339  Int qpBdOffsetY = pcCU->getSlice()->getQpBDOffsetY();
    23402340#else
    … …  
    29572957  vps->checkNecessaryLayerFlagCondition(); 
    29582958
    2959 #if REPN_FORMAT_IN_VPS
    29602959  READ_UVLC( uiCode, "vps_num_rep_formats_minus1" );
    29612960  vps->setVpsNumRepFormats( uiCode + 1 );
    … …  
    30053004    }
    30063005  }
    3007 #endif
    30083006
    30093007  READ_FLAG(uiCode, "max_one_active_ref_layer_flag" );
    … …  
    31833181}
    31843182
    3185 #if REPN_FORMAT_IN_VPS
    31863183Void  TDecCavlc::parseRepFormat( RepFormat *repFormat, RepFormat *repFormatPrev )
    31873184{
    … …  
    32353232  }
    32363233}
    3237 #endif //REPN_FORMAT_IN_VPS
     3234
    32383235#if VPS_DPB_SIZE_TABLE
    32393236Void TDecCavlc::parseVpsDpbSizeTable( TComVPS *vps )

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

    r1185 r1203  
    132132  Void  parseVPSVUI         ( TComVPS* pcVPS );
    133133  Void  defaultVPSVUI       ( TComVPS* pcVPS );
    134 #if REPN_FORMAT_IN_VPS
    135134  Void  parseRepFormat      ( RepFormat *repFormat, RepFormat *repFormatPrev );
    136 #endif
    137135#if VPS_DPB_SIZE_TABLE
    138136  Void  parseVpsDpbSizeTable( TComVPS *vps );

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

    r1128 r1203  
    222222
    223223  TComSlice * pcSlice = pcCU->getPic()->getSlice(pcCU->getPic()->getCurrSliceIdx());
    224 #if REPN_FORMAT_IN_VPS
     224
     225#if SVC_EXTENSION
    225226  if( ( uiRPelX < pcSlice->getPicWidthInLumaSamples() ) && ( uiBPelY < pcSlice->getPicHeightInLumaSamples() ) )
    226227#else
    … …  
    254255      uiTPelY   = pcCU->getCUPelY() + g_auiRasterToPelY[ g_auiZscanToRaster[uiIdx] ];
    255256
    256 #if REPN_FORMAT_IN_VPS
     257#if SVC_EXTENSION
    257258      if ( !isLastCtuOfSliceSegment && ( uiLPelX < pcCU->getSlice()->getPicWidthInLumaSamples() ) && ( uiTPelY < pcCU->getSlice()->getPicHeightInLumaSamples() ) )
    258259#else
    … …  
    406407  TComSlice * pcSlice = pCtu->getPic()->getSlice(pCtu->getPic()->getCurrSliceIdx());
    407408
    408 #if REPN_FORMAT_IN_VPS
     409#if SVC_EXTENSION
    409410  if( ( uiRPelX >= pcSlice->getPicWidthInLumaSamples() ) || ( uiBPelY >= pcSlice->getPicHeightInLumaSamples() ) )
    410 
    411411#else
    412412  if( ( uiRPelX >= pcSlice->getSPS()->getPicWidthInLumaSamples() ) || ( uiBPelY >= pcSlice->getSPS()->getPicHeightInLumaSamples() ) )
    … …  
    426426      uiTPelY = pCtu->getCUPelY() + g_auiRasterToPelY[ g_auiZscanToRaster[uiIdx] ];
    427427
    428 #if REPN_FORMAT_IN_VPS
     428#if SVC_EXTENSION
    429429      if( ( uiLPelX < pcSlice->getPicWidthInLumaSamples() ) && ( uiTPelY < pcSlice->getPicHeightInLumaSamples() ) )
    430430#else

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

    r1029 r1203  
    946946  {
    947947    UInt uiSign;
    948 #if REPN_FORMAT_IN_VPS
     948#if SVC_EXTENSION
    949949    Int qpBdOffsetY = pcCU->getSlice()->getQpBDOffsetY();
    950950#else

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

    r1200 r1203  
    288288    }
    289289
    290 #if REPN_FORMAT_IN_VPS
    291290    rpcPic->create ( pcSlice->getPicWidthInLumaSamples(), pcSlice->getPicHeightInLumaSamples(), pcSlice->getChromaFormatIdc(), g_uiMaxCUWidth, g_uiMaxCUHeight, g_uiMaxCUDepth,
    292291                     conformanceWindow, defaultDisplayWindow, numReorderPics, pcSlice->getSPS(), true);
    293 #else
    294     rpcPic->create ( pcSlice->getSPS()->getPicWidthInLumaSamples(), pcSlice->getSPS()->getPicHeightInLumaSamples(), pcSlice->getSPS()->getChromaFormatIdc(), g_uiMaxCUWidth, g_uiMaxCUHeight, g_uiMaxCUDepth,
    295                      conformanceWindow, defaultDisplayWindow, numReorderPics, pcSlice->getSPS(), true);
    296 #endif
    297 
    298292#else //SVC_EXTENSION
    299293    rpcPic->create ( pcSlice->getSPS()->getPicWidthInLumaSamples(), pcSlice->getSPS()->getPicHeightInLumaSamples(), pcSlice->getSPS()->getChromaFormatIdc(), g_uiMaxCUWidth, g_uiMaxCUHeight, g_uiMaxCUDepth,
    … …  
    345339  }
    346340
    347 #if REPN_FORMAT_IN_VPS
    348341  rpcPic->create ( pcSlice->getPicWidthInLumaSamples(), pcSlice->getPicHeightInLumaSamples(), pcSlice->getChromaFormatIdc(), g_uiMaxCUWidth, g_uiMaxCUHeight, g_uiMaxCUDepth,
    349342                   conformanceWindow, defaultDisplayWindow, numReorderPics, pcSlice->getSPS(), true);
    350 #else
    351   rpcPic->create ( pcSlice->getSPS()->getPicWidthInLumaSamples(), pcSlice->getSPS()->getPicHeightInLumaSamples(), pcSlice->getSPS()->getChromaFormatIdc(), g_uiMaxCUWidth, g_uiMaxCUHeight, g_uiMaxCUDepth,
    352                    conformanceWindow, defaultDisplayWindow, numReorderPics, pcSlice->getSPS(), true);
    353 #endif
    354343#else  //SVC_EXTENSION
    355344  rpcPic->create ( pcSlice->getSPS()->getPicWidthInLumaSamples(), pcSlice->getSPS()->getPicHeightInLumaSamples(), pcSlice->getSPS()->getChromaFormatIdc(), g_uiMaxCUWidth, g_uiMaxCUHeight, g_uiMaxCUDepth,
    … …  
    652641  for (UInt channel = 0; channel < MAX_NUM_CHANNEL_TYPE; channel++)
    653642  {
    654 #if REPN_FORMAT_IN_VPS
     643#if SVC_EXTENSION
    655644    g_bitDepth[channel] = isLuma(ChannelType(channel)) ? m_apcSlicePilot->getBitDepthY() : m_apcSlicePilot->getBitDepthC();
    656645#else
    … …  
    677666
    678667  m_cSAO.destroy();
    679 #if REPN_FORMAT_IN_VPS
     668#if SVC_EXTENSION
    680669  m_cSAO.create( m_apcSlicePilot->getPicWidthInLumaSamples(), m_apcSlicePilot->getPicHeightInLumaSamples(), sps->getChromaFormatIdc(), sps->getMaxCUWidth(), sps->getMaxCUHeight(), sps->getMaxCUDepth(), pps->getSaoOffsetBitShift(CHANNEL_TYPE_LUMA), pps->getSaoOffsetBitShift(CHANNEL_TYPE_CHROMA) );
    681670#else
    … …  
    12051194  xActivateParameterSets();
    12061195
    1207 #if REPN_FORMAT_IN_VPS
     1196#if SVC_EXTENSION
    12081197  // Initialize ILRP if needed, only for the current layer 
    12091198  // ILRP intialization should go along with activation of parameters sets,
    … …  
    12111200  xInitILRP(m_apcSlicePilot);
    12121201#endif
     1202
    12131203  if (!m_apcSlicePilot->getDependentSliceSegmentFlag())
    12141204  {
    … …  
    22842274
    22852275#if SVC_EXTENSION
    2286 #if !REPN_FORMAT_IN_VPS
    2287 Void TDecTop::xInitILRP(TComSPS *pcSPS)
    2288 #else
    22892276Void TDecTop::xInitILRP(TComSlice *slice)
    2290 #endif
    2291 {
    2292 #if REPN_FORMAT_IN_VPS
     2277{
    22932278  TComSPS* pcSPS = slice->getSPS();
    22942279  Int bitDepthY   = slice->getBitDepthY();
    … …  
    22962281  Int picWidth    = slice->getPicWidthInLumaSamples();
    22972282  Int picHeight   = slice->getPicHeightInLumaSamples();
    2298 #endif
    2299   if(m_layerId>0)
    2300   {
    2301 #if REPN_FORMAT_IN_VPS
     2283
     2284  if( m_layerId > 0 )
     2285  {
     2286
    23022287    g_bitDepth[CHANNEL_TYPE_LUMA]     = bitDepthY;
    23032288    g_bitDepth[CHANNEL_TYPE_CHROMA]   = bitDepthC;
    2304 #else
    2305     g_bitDepth[CHANNEL_TYPE_LUMA]     = pcSPS->getBitDepthY();
    2306     g_bitDepth[CHANNEL_TYPE_CHROMA]   = pcSPS->getBitDepthC();
    2307 #endif
    23082289    g_uiMaxCUWidth  = pcSPS->getMaxCUWidth();
    23092290    g_uiMaxCUHeight = pcSPS->getMaxCUHeight();
    … …  
    23382319
    23392320#if AUXILIARY_PICTURES
    2340 #if REPN_FORMAT_IN_VPS
    23412321        m_cIlpPic[j]->create(picWidth, picHeight, slice->getChromaFormatIdc(), g_uiMaxCUWidth, g_uiMaxCUHeight, g_uiMaxCUDepth, conformanceWindow, defaultDisplayWindow, numReorderPics, pcSPS, true);
    23422322#else
    2343         m_cIlpPic[j]->create(pcSPS->getPicWidthInLumaSamples(), pcSPS->getPicHeightInLumaSamples(), pcSPS->getChromaFormatIdc(), g_uiMaxCUWidth, g_uiMaxCUHeight, g_uiMaxCUDepth, conformanceWindow, defaultDisplayWindow, numReorderPics, pcSPS, true);
    2344 #endif
    2345 #else
    2346 #if REPN_FORMAT_IN_VPS
    23472323        m_cIlpPic[j]->create(picWidth, picHeight, g_uiMaxCUWidth, g_uiMaxCUHeight, g_uiMaxCUDepth, conformanceWindow, defaultDisplayWindow, numReorderPics, pcSPS, true);
    2348 #else
    2349         m_cIlpPic[j]->create(pcSPS->getPicWidthInLumaSamples(), pcSPS->getPicHeightInLumaSamples(), g_uiMaxCUWidth, g_uiMaxCUHeight, g_uiMaxCUDepth, conformanceWindow, defaultDisplayWindow, numReorderPics, pcSPS, true);
    2350 #endif
    23512324#endif
    23522325        for (Int i=0; i<m_cIlpPic[j]->getPicSym()->getNumberOfCtusInFrame(); i++)

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

    r1199 r1203  
    136136#if AVC_BASE
    137137  fstream*                m_pBLReconFile;
    138 #if !REPN_FORMAT_IN_VPS
    139   Int                     m_iBLSourceWidth;
    140   Int                     m_iBLSourceHeight;
    141 #endif
    142138#endif
    143139
    … …  
    258254  Void      setBLReconFile( fstream* pFile )                                { m_pBLReconFile = pFile; }
    259255  fstream*  getBLReconFile()                                                { return m_pBLReconFile;  }
    260 #if !REPN_FORMAT_IN_VPS
    261   Void      setBLsize( Int iWidth, Int iHeight ) { m_iBLSourceWidth = iWidth; m_iBLSourceHeight = iHeight; }
    262   Int       getBLWidth() { return  m_iBLSourceWidth; }
    263   Int       getBLHeight() { return  m_iBLSourceHeight; }
    264 #endif
    265 #endif
    266 #if REPN_FORMAT_IN_VPS
     256#endif
    267257  Void      xInitILRP(TComSlice *slice);
    268 #else
    269   Void      xInitILRP(TComSPS *pcSPS);
    270 #endif
    271258  CommonDecoderParams*    getCommonDecoderParams()                          { return m_commonDecoderParams; }
    272259  Void                    setCommonDecoderParams(CommonDecoderParams* x)    { m_commonDecoderParams = x;    }
Note: See TracChangeset for help on using the changeset viewer.