Changeset 1203 in SHVCSoftware for branches/SHM-dev/source/App/TAppEncoder/TAppEncTop.cpp

Timestamp:

8 Jul 2015, 20:57:55 (9 years ago)

Author:

seregin

Message:

macro cleanup: REPN_FORMAT_IN_VPS

File:

• branches/SHM-dev/source/App/TAppEncoder/TAppEncTop.cpp (modified) (5 diffs)

branches/SHM-dev/source/App/TAppEncoder/TAppEncTop.cpp

@@ -93 +93 @@
   }
 
-#if REPN_FORMAT_IN_VPS  
   Int maxRepFormatIdx = -1;
   Int formatIdx = -1;
@@ -183 +182 @@
     m_acTEncTop[mapIdxToLayer[idx]].setSkipPictureAtArcSwitch             ( m_skipPictureAtArcSwitch );
   }
+
   delete [] mapIdxToLayer;
-#endif
 
   //Populate PTL in VPS
@@ -2198 +2197 @@
 Void TAppEncTop::xWriteRecon(UInt layer, Int iNumEncoded)
 {
-#if REPN_FORMAT_IN_VPS
+#if SVC_EXTENSION
   ChromaFormat chromaFormatIdc = m_acLayerCfg[layer].getChromaFormatIDC();
   Int xScal = TComSPS::getWinUnitX( chromaFormatIdc );
@@ -2224 +2223 @@
       if( !m_acLayerCfg[layer].getReconFile().empty() && pcPicYuvRecTop->isReconstructed() && pcPicYuvRecBottom->isReconstructed() )
       {
-#if REPN_FORMAT_IN_VPS
+#if SVC_EXTENSION
         m_acTVideoIOYuvReconFile[layer].write( pcPicYuvRecTop, pcPicYuvRecBottom, ipCSC, m_acLayerCfg[layer].getConfWinLeft() * xScal, m_acLayerCfg[layer].getConfWinRight() * xScal, 
           m_acLayerCfg[layer].getConfWinTop() * yScal, m_acLayerCfg[layer].getConfWinBottom() * yScal, NUM_CHROMA_FORMAT, m_isTopFieldFirst );
@@ -2249 +2248 @@
       if( !m_acLayerCfg[layer].getReconFile().empty() && pcPicYuvRec->isReconstructed() )
       {
-#if REPN_FORMAT_IN_VPS
+#if SVC_EXTENSION
         m_acTVideoIOYuvReconFile[layer].write( pcPicYuvRec, ipCSC, m_acLayerCfg[layer].getConfWinLeft() * xScal, m_acLayerCfg[layer].getConfWinRight() * xScal,
           m_acLayerCfg[layer].getConfWinTop() * yScal, m_acLayerCfg[layer].getConfWinBottom() * yScal );