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

Timestamp:

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

Author:

seregin

Message:

macro cleanup: REPN_FORMAT_IN_VPS

Location:

branches/SHM-dev/source/App/TAppEncoder

Files:

• TAppEncCfg.cpp (modified) (3 diffs)
• TAppEncCfg.h (modified) (2 diffs)
• TAppEncLayerCfg.cpp (modified) (6 diffs)
• TAppEncLayerCfg.h (modified) (2 diffs)
• TAppEncTop.cpp (modified) (5 diffs)

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

@@ -737 +737 @@
   Double* cfg_fQP            [MAX_LAYERS];
   Int*    cfg_layerId        [MAX_LAYERS];
-#if REPN_FORMAT_IN_VPS
   Int*    cfg_repFormatIdx  [MAX_LAYERS];
-#endif
   Int*    cfg_SourceWidth   [MAX_LAYERS]; 
   Int*    cfg_SourceHeight  [MAX_LAYERS];
@@ -848 +846 @@
     cfg_colourRemapSEIFileRoot[layer] = &m_acLayerCfg[layer].m_colourRemapSEIFileRoot;
 #endif
-#if REPN_FORMAT_IN_VPS
-    cfg_repFormatIdx[layer] = &m_acLayerCfg[layer].m_repFormatIdx;
-#endif
+    cfg_repFormatIdx[layer]         = &m_acLayerCfg[layer].m_repFormatIdx;
     cfg_layerId[layer]              = &m_acLayerCfg[layer].m_layerId;
     cfg_SourceWidth[layer]          = &m_acLayerCfg[layer].m_iSourceWidth;
@@ -1041 +1037 @@
   ("FrameRate%d,-fr%d",                             cfg_FrameRate,                               0, MAX_LAYERS, "Frame rate for layer %d")
   ("LambdaModifier%d,-LM%d",                        m_adLambdaModifier,                Double(1.0), MAX_TLAYER, "Lambda modifier for temporal layer %d")
-#if REPN_FORMAT_IN_VPS
   ("RepFormatIdx%d",                                cfg_repFormatIdx,                           -1, MAX_LAYERS, "Index to the representation format structure used from the VPS")
-#endif
   ("LayerId%d",                                     cfg_layerId,                                -1, MAX_LAYERS,  "Layer id")
 

branches/SHM-dev/source/App/TAppEncoder/TAppEncCfg.h

@@ -472 +472 @@
   Int       m_adaptiveResolutionChange;                       ///< Indicate adaptive resolution change frame
   Bool      m_skipPictureAtArcSwitch;                         ///< Indicates that when ARC up-switching is performed the higher layer picture is a skip picture
-#if REPN_FORMAT_IN_VPS
+
   RepFormatCfg m_repFormatCfg[16];                            ///< Rep_format structures
-#endif
 #if N0383_IL_CONSTRAINED_TILE_SETS_SEI
   Bool      m_interLayerConstrainedTileSetsSEIEnabled;
@@ -557 +556 @@
   Void cfgStringToArrayNumEntries(Int **arr, string const cfgString, Int &numEntries, const char* logString);
 
-#if REPN_FORMAT_IN_VPS
   RepFormatCfg* getRepFormatCfg(Int i)  { return &m_repFormatCfg[i]; }
-#endif
 #if LAYER_CTB
   Bool getUsePCM()                  { return m_usePCM;               }

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

@@ -45 +45 @@
   m_cReconFile(string("")),
   m_conformanceMode( 0 ),
-  m_aidQP(NULL)
-#if REPN_FORMAT_IN_VPS
-, m_repFormatIdx (-1)
-#endif
+  m_aidQP(NULL),
+  m_repFormatIdx (-1)
 #if Q0074_COLOUR_REMAPPING_SEI
 ,  m_colourRemapSEIFileRoot(string(""))
@@ -214 +212 @@
   printf("Input File                        : %s\n", m_cInputFile.c_str()  );
   printf("Reconstruction File               : %s\n", m_cReconFile.c_str()  );
-#if REPN_FORMAT_IN_VPS
+#if SVC_EXTENSION
   printf("Real     Format                   : %dx%d %dHz\n", m_iSourceWidth - ( m_confWinLeft + m_confWinRight ) * TComSPS::getWinUnitX( m_chromaFormatIDC ), m_iSourceHeight - ( m_confWinTop + m_confWinBottom ) * TComSPS::getWinUnitY( m_chromaFormatIDC ), m_iFrameRate );
 #else
@@ -314 +312 @@
         m_aiPad[0] = m_confWinRight  = ((m_iSourceWidth / minCuSize) + 1) * minCuSize - m_iSourceWidth;
         m_iSourceWidth  += m_confWinRight;
-#if REPN_FORMAT_IN_VPS
+#if SVC_EXTENSION
         m_confWinRight /= TComSPS::getWinUnitX( m_chromaFormatIDC );
 #endif
@@ -327 +325 @@
           m_aiPad[1] = m_confWinBottom << 1;
         }
-#if REPN_FORMAT_IN_VPS
+#if SVC_EXTENSION
         m_confWinBottom /= TComSPS::getWinUnitY( m_chromaFormatIDC );
 #endif
@@ -346 +344 @@
       m_confWinRight  = m_aiPad[0];
       m_confWinBottom = m_aiPad[1];
-#if REPN_FORMAT_IN_VPS
+#if SVC_EXTENSION
       m_confWinRight /= TComSPS::getWinUnitX( m_chromaFormatIDC );
       m_confWinBottom /= TComSPS::getWinUnitY( m_chromaFormatIDC );
@@ -429 +427 @@
   xConfirmPara( m_aiPad[1] % TComSPS::getWinUnitY(CHROMA_420) != 0, "Vertical padding must be an integer multiple of the specified chroma subsampling");
 
-#if !REPN_FORMAT_IN_VPS
+#if !SVC_EXTENSION
   xConfirmPara( m_confLeft   % TComSPS::getWinUnitX(CHROMA_420) != 0, "Left conformance window offset must be an integer multiple of the specified chroma subsampling");
   xConfirmPara( m_confRight  % TComSPS::getWinUnitX(CHROMA_420) != 0, "Right conformance window offset must be an integer multiple of the specified chroma subsampling");

branches/SHM-dev/source/App/TAppEncoder/TAppEncLayerCfg.h

@@ -118 +118 @@
   Bool      m_useHighPrecisionPredictionWeighting;
 
-#if REPN_FORMAT_IN_VPS
   Int       m_repFormatIdx;
-#endif
 #if Q0074_COLOUR_REMAPPING_SEI
   string    m_colourRemapSEIFileRoot;                           ///< Colour Remapping Information SEI message parameters file
@@ -206 +204 @@
   Bool    getRCForceIntraQP()         {return m_RCForceIntraQP;        }
 #endif
-#if REPN_FORMAT_IN_VPS
   Int     getRepFormatIdx()           { return m_repFormatIdx;  }
   Void    setRepFormatIdx(Int x)      { m_repFormatIdx = x;     }
   Void    setSourceWidth(Int x)       { m_iSourceWidth = x;     }
   Void    setSourceHeight(Int x)      { m_iSourceHeight = x;    }
-#endif
   Int     getMaxTidIlRefPicsPlus1()   { return m_maxTidIlRefPicsPlus1; }
 #if LAYER_CTB

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 );