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

Timestamp:

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

Author:

seregin

Message:

macro cleanup: REPN_FORMAT_IN_VPS

File:

• branches/SHM-dev/source/App/TAppEncoder/TAppEncLayerCfg.cpp (modified) (6 diffs)

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