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


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

macro cleanup: REPN_FORMAT_IN_VPS

Location:
branches/SHM-dev/source/Lib/TLibEncoder
Files:
9 edited

Legend:

Unmodified
Added
Removed

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

    r1199 r1203  
    587587  if (conf.getWindowEnabledFlag())
    588588  {
    589 #if REPN_FORMAT_IN_VPS
     589#if SVC_EXTENSION
    590590    WRITE_UVLC( conf.getWindowLeftOffset(),   "conf_win_left_offset"   );
    591591    WRITE_UVLC( conf.getWindowRightOffset(),  "conf_win_right_offset"  );
    … …  
    16061606  Int iDQp  = pcCU->getQP( uiAbsPartIdx ) - pcCU->getRefQP( uiAbsPartIdx );
    16071607
    1608 #if REPN_FORMAT_IN_VPS
     1608#if SVC_EXTENSION
    16091609  Int qpBdOffsetY =  pcCU->getSlice()->getQpBDOffsetY();
    16101610#else
    … …  
    21322132  }
    21332133
    2134 #if REPN_FORMAT_IN_VPS
    21352134  // The value of vps_num_rep_formats_minus1 shall be in the range of 0 to 255, inclusive.
    21362135  assert( vps->getVpsNumRepFormats() > 0 && vps->getVpsNumRepFormats() <= 256 );
    … …  
    21662165    }
    21672166  }
    2168 #endif
    21692167
    21702168  WRITE_FLAG(vps->getMaxOneActiveRefLayerFlag(), "max_one_active_ref_layer_flag");
    … …  
    22302228}
    22312229
    2232 #if REPN_FORMAT_IN_VPS
    22332230Void  TEncCavlc::codeRepFormat( RepFormat *repFormat )
    22342231{
    … …  
    22632260  }
    22642261}
    2265 #endif
     2262
    22662263#if VPS_DPB_SIZE_TABLE
    22672264Void TEncCavlc::codeVpsDpbSizeTable(TComVPS *vps)

  • branches/SHM-dev/source/Lib/TLibEncoder/TEncCavlc.h

    r1185 r1203  
    160160  Void codeVPSExtension        ( TComVPS* pcVPS );
    161161  Void codeVPSVUI              ( TComVPS *vps   );
    162 #if REPN_FORMAT_IN_VPS
    163162  Void  codeRepFormat          ( RepFormat *repFormat );
    164 #endif
    165163#if VPS_DPB_SIZE_TABLE
    166164  Void  codeVpsDpbSizeTable    (TComVPS *vps);

  • branches/SHM-dev/source/Lib/TLibEncoder/TEncCfg.h

    r1150 r1203  
    11631163
    11641164#if SVC_EXTENSION
    1165 #if REPN_FORMAT_IN_VPS
    11661165struct RepFormatCfg
    11671166{
    … …  
    11821181};
    11831182std::istringstream &operator>>(std::istringstream &in, RepFormatCfg &repFormatCfg);
    1184 #endif
    11851183#endif //SVC_EXTENSION
    11861184

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

    r1029 r1203  
    410410  {
    411411    Int idQP = m_pcEncCfg->getMaxDeltaQP();
    412 #if REPN_FORMAT_IN_VPS
     412#if SVC_EXTENSION
    413413    iMinQP = Clip3( -rpcTempCU->getSlice()->getQpBDOffsetY(), MAX_QP, iBaseQP-idQP );
    414414    iMaxQP = Clip3( -rpcTempCU->getSlice()->getQpBDOffsetY(), MAX_QP, iBaseQP+idQP );
    … …  
    446446  TComSlice * pcSlice = rpcTempCU->getPic()->getSlice(rpcTempCU->getPic()->getCurrSliceIdx());
    447447  // We need to split, so don't try these modes.
    448 #if REPN_FORMAT_IN_VPS
     448#if SVC_EXTENSION
    449449  if ( ( uiRPelX < rpcBestCU->getSlice()->getPicWidthInLumaSamples() ) &&
    450450       ( uiBPelY < rpcBestCU->getSlice()->getPicHeightInLumaSamples() ) )
    … …  
    808808  {
    809809    Int idQP = m_pcEncCfg->getMaxDeltaQP();
    810 #if REPN_FORMAT_IN_VPS
     810#if SVC_EXTENSION
    811811    iMinQP = Clip3( -rpcTempCU->getSlice()->getQpBDOffsetY(), MAX_QP, iBaseQP-idQP );
    812812    iMaxQP = Clip3( -rpcTempCU->getSlice()->getQpBDOffsetY(), MAX_QP, iBaseQP+idQP );
    … …  
    858858        pcSubTempPartCU->initSubCU( rpcTempCU, uiPartUnitIdx, uhNextDepth, iQP );           // clear sub partition datas or init.
    859859
    860 #if REPN_FORMAT_IN_VPS
     860#if SVC_EXTENSION
    861861        if( ( pcSubBestPartCU->getCUPelX() < pcSlice->getPicWidthInLumaSamples() ) && ( pcSubBestPartCU->getCUPelY() < pcSlice->getPicHeightInLumaSamples() ) )
    862862#else
    … …  
    10321032    iQpOffset = Int(floor( dQpOffset + 0.49999 ));
    10331033  }
    1034 #if REPN_FORMAT_IN_VPS
     1034#if SVC_EXTENSION
    10351035  return Clip3(-pcCU->getSlice()->getQpBDOffsetY(), MAX_QP, iBaseQp+iQpOffset );
    10361036#else
    … …  
    10631063#endif
    10641064
    1065 #if REPN_FORMAT_IN_VPS
     1065#if SVC_EXTENSION
    10661066  if( ( uiRPelX < pcSlice->getPicWidthInLumaSamples() ) && ( uiBPelY < pcSlice->getPicHeightInLumaSamples() ) )
    10671067#else
    … …  
    10931093      uiLPelX   = pcCU->getCUPelX() + g_auiRasterToPelX[ g_auiZscanToRaster[uiAbsPartIdx] ];
    10941094      uiTPelY   = pcCU->getCUPelY() + g_auiRasterToPelY[ g_auiZscanToRaster[uiAbsPartIdx] ];
    1095 #if REPN_FORMAT_IN_VPS
     1095
     1096#if SVC_EXTENSION
    10961097      if( ( uiLPelX < pcSlice->getPicWidthInLumaSamples() ) && ( uiTPelY < pcSlice->getPicHeightInLumaSamples() ) )
    10971098#else

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

    r1201 r1203  
    22372237      }
    22382238
    2239 #if REPN_FORMAT_IN_VPS
     2239#if SVC_EXTENSION
    22402240      sliceQP = Clip3( -pcSlice->getQpBDOffsetY(), MAX_QP, sliceQP );
    22412241#else
    … …  
    30163016      const Int minCuWidth  = pcPic->getMinCUWidth();
    30173017      const Int minCuHeight = pcPic->getMinCUHeight();
    3018 #if REPN_FORMAT_IN_VPS
     3018#if SVC_EXTENSION
    30193019      const Int paddedWidth = ((pcSlice->getPicWidthInLumaSamples()  + minCuWidth  - 1) / minCuWidth) * minCuWidth;
    30203020      const Int paddedHeight= ((pcSlice->getPicHeightInLumaSamples() + minCuHeight - 1) / minCuHeight) * minCuHeight;

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

    r1029 r1203  
    876876  Int iDQp  = pcCU->getQP( uiAbsPartIdx ) - pcCU->getRefQP( uiAbsPartIdx );
    877877 
    878 #if REPN_FORMAT_IN_VPS 
     878#if SVC_EXTENSION 
    879879  Int qpBdOffsetY =  pcCU->getSlice()->getQpBDOffsetY();
    880880#else

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

    r1201 r1203  
    46964696  }
    46974697
    4698 #if REPN_FORMAT_IN_VPS
     4698#if SVC_EXTENSION
    46994699  qpMin =  bHighPass ? Clip3( -pcCU->getSlice()->getQpBDOffsetY(), MAX_QP, pcCU->getQP(0) - m_iMaxDeltaQP ) : pcCU->getQP( 0 );
    47004700  qpMax =  bHighPass ? Clip3( -pcCU->getSlice()->getQpBDOffsetY(), MAX_QP, pcCU->getQP(0) + m_iMaxDeltaQP ) : pcCU->getQP( 0 );

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

    r1201 r1203  
    339339  if(eSliceType!=I_SLICE)
    340340  {
    341 #if REPN_FORMAT_IN_VPS
     341#if SVC_EXTENSION
    342342    if (!(( m_pcCfg->getMaxDeltaQP() == 0 ) && (dQP == -rpcSlice->getQpBDOffsetY() ) && (rpcSlice->getPPS()->getTransquantBypassEnableFlag())))
    343343#else
    … …  
    413413    }
    414414
    415 #if REPN_FORMAT_IN_VPS
     415#if SVC_EXTENSION
    416416    iQP = max( -rpcSlice->getQpBDOffsetY(), min( MAX_QP, (Int) floor( dQP + 0.5 ) ) );
    417417#else
    … …  
    474474  {
    475475    dQP = xGetQPValueAccordingToLambda( dLambda );
    476 #if REPN_FORMAT_IN_VPS
     476#if SVC_EXTENSION
    477477    iQP = max( -rpcSlice->getQpBDOffsetY(), min( MAX_QP, (Int) floor( dQP + 0.5 ) ) );
    478478#else
    … …  
    721721    pCtu->initCtu( pcPic, ctuRsAddr );
    722722
    723 #if REPN_FORMAT_IN_VPS
     723#if SVC_EXTENSION
    724724    Int height  = min( pcSlice->getSPS()->getMaxCUHeight(),pcSlice->getPicHeightInLumaSamples() - ctuRsAddr / pcPic->getFrameWidthInCtus() * pcSlice->getSPS()->getMaxCUHeight() );
    725725    Int width   = min( pcSlice->getSPS()->getMaxCUWidth(),pcSlice->getPicWidthInLumaSamples() - ctuRsAddr % pcPic->getFrameWidthInCtus() * pcSlice->getSPS()->getMaxCUWidth() );
    … …  
    897897        }
    898898
    899 #if REPN_FORMAT_IN_VPS
     899#if SVC_EXTENSION
    900900        estQP     = Clip3( -pcSlice->getQpBDOffsetY(), MAX_QP, estQP );
    901901#else

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

    r1200 r1203  
    813813  for (UInt channelType = 0; channelType < MAX_NUM_CHANNEL_TYPE; channelType++)
    814814  {
    815 #if REPN_FORMAT_IN_VPS
     815#if SVC_EXTENSION
    816816    m_cSPS.setBitDepth    (ChannelType(channelType), m_cVPS.getVpsRepFormat( m_cVPS.getVpsRepFormatIdx( m_cVPS.getLayerIdxInVps( m_layerId ) ) )->getBitDepthVps(ChannelType(channelType))            );
    817817    m_cSPS.setQpBDOffset  (ChannelType(channelType), (6 * (m_cVPS.getVpsRepFormat( m_cVPS.getVpsRepFormatIdx( m_cVPS.getLayerIdxInVps( m_layerId ) ) )->getBitDepthVps(ChannelType(channelType)) - 8)));
    … …  
    14081408}
    14091409
    1410 #if !REPN_FORMAT_IN_VPS
    1411 Void TEncTop::xInitILRP()
    1412 {
    1413   if(m_layerId>0)
    1414   {
    1415     g_bitDepthY     = m_cSPS.getBitDepthY();
    1416     g_bitDepthC     = m_cSPS.getBitDepthC();
    1417     g_uiMaxCUWidth  = m_cSPS.getMaxCUWidth();
    1418     g_uiMaxCUHeight = m_cSPS.getMaxCUHeight();
    1419     g_uiMaxCUDepth  = m_cSPS.getMaxCUDepth();
    1420     g_uiAddCUDepth  = max (0, m_cSPS.getLog2MinCodingBlockSize() - (Int)m_cSPS.getQuadtreeTULog2MinSize() );
    1421 
    1422     Int  numReorderPics[MAX_TLAYER];
    1423     Window &conformanceWindow = m_cSPS.getConformanceWindow();
    1424     Window defaultDisplayWindow = m_cSPS.getVuiParametersPresentFlag() ? m_cSPS.getVuiParameters()->getDefaultDisplayWindow() : Window();
    1425 
    1426     if (m_cIlpPic[0] == NULL)
    1427     {
    1428       for (Int j=0; j < m_numLayer; j++) // consider to set to NumDirectRefLayers[LayerIdInVps[nuh_layer_id]]
    1429       {
    1430         m_cIlpPic[j] = new  TComPic;
    1431 #if AUXILIARY_PICTURES
    1432         m_cIlpPic[j]->create(m_iSourceWidth, m_iSourceHeight, m_chromaFormatIDC, g_uiMaxCUWidth, g_uiMaxCUHeight, g_uiMaxCUDepth, conformanceWindow, defaultDisplayWindow, numReorderPics, &m_cSPS, true);
    1433 #else
    1434         m_cIlpPic[j]->create(m_iSourceWidth, m_iSourceHeight, g_uiMaxCUWidth, g_uiMaxCUHeight, g_uiMaxCUDepth, conformanceWindow, defaultDisplayWindow, numReorderPics, &m_cSPS, true);
    1435 #endif
    1436         for (Int i=0; i<m_cIlpPic[j]->getPicSym()->getNumberOfCUsInFrame(); i++)
    1437         {
    1438           m_cIlpPic[j]->getPicSym()->getCU(i)->initCU(m_cIlpPic[j], i);
    1439         }
    1440       }
    1441     }
    1442   }
    1443 }
    1444 #else
    14451410Void TEncTop::xInitILRP()
    14461411{
    … …  
    15101475  }
    15111476}
    1512 #endif
    15131477
    15141478Window& TEncTop::getScaledRefLayerWindowForLayer(Int layerId)
Note: See TracChangeset for help on using the changeset viewer.