Changeset 1475 in SHVCSoftware for branches/SHM-dev/source/App/TAppDecoder/TAppDecTop.cpp

Timestamp:

22 Sep 2015, 20:18:26 (9 years ago)

Author:

seregin

Message:

port rev 4600, remove macro Q0074_COLOUR_REMAPPING_SEI

File:

• branches/SHM-dev/source/App/TAppDecoder/TAppDecTop.cpp (modified) (14 diffs)

branches/SHM-dev/source/App/TAppDecoder/TAppDecTop.cpp

@@ -62 +62 @@
 #if SVC_EXTENSION
 TAppDecTop::TAppDecTop()
-#if Q0074_COLOUR_REMAPPING_SEI
 : m_pcSeiColourRemappingInfoPrevious(NULL)
-#endif
 {
   memset( m_apcTDecTop, 0, sizeof(m_apcTDecTop) );
@@ -77 +75 @@
 TAppDecTop::TAppDecTop()
 : m_iPOCLastDisplay(-MAX_INT)
-#if Q0074_COLOUR_REMAPPING_SEI
  ,m_pcSeiColourRemappingInfoPrevious(NULL)
-#endif
 {
 }
@@ -163 +159 @@
 #endif
 
-#if Q0074_COLOUR_REMAPPING_SEI
   // clear contents of colour-remap-information-SEI output file
   if (!m_colourRemapSEIFileName.empty())
@@ -174 +169 @@
     }
   }
-#endif
 
   // main decoder loop
@@ -629 +623 @@
   m_cTDecTop.destroy();
 #endif
-#if Q0074_COLOUR_REMAPPING_SEI
   if (m_pcSeiColourRemappingInfoPrevious != NULL)
   {
@@ -635 +628 @@
     m_pcSeiColourRemappingInfoPrevious = NULL;
   }
-#endif
 }
 
@@ -656 +648 @@
   m_cTDecTop.setForceDecodeBitDepth(m_forceDecodeBitDepth);
 #endif
-
   if (!m_outputDecodedSEIMessagesFilename.empty())
   {
@@ -674 +665 @@
 #endif
 
-#if Q0074_COLOUR_REMAPPING_SEI
   if (m_pcSeiColourRemappingInfoPrevious != NULL)
   {
@@ -680 +670 @@
     m_pcSeiColourRemappingInfoPrevious = NULL;
   }
-#endif
 }
 
@@ -911 +900 @@
         }
 
-#if Q0074_COLOUR_REMAPPING_SEI
         if (!m_colourRemapSEIFileName.empty())
         {
           xOutputColourRemapPic(pcPic);
         }
-#endif
 
         // update POC of display order
@@ -1083 +1070 @@
         }
 
-#if Q0074_COLOUR_REMAPPING_SEI
         if (!m_colourRemapSEIFileName.empty())
         {
           xOutputColourRemapPic(pcPic);
         }
-#endif
 
         // update POC of display order
@@ -1146 +1131 @@
   return false;
 }
-
-#if Q0074_COLOUR_REMAPPING_SEI
 
 Void TAppDecTop::xOutputColourRemapPic(TComPic* pcPic)
@@ -1468 +1451 @@
   }
 }
-#endif
 
 #if ALIGNED_BUMPING
@@ -1491 +1473 @@
       conf.getWindowBottomOffset()* yScal + defDisp.getWindowBottomOffset() );
 
-#if Q0074_COLOUR_REMAPPING_SEI
     if( !m_colourRemapSEIFileName.empty() )
     {
       xOutputColourRemapPic(pic);
     }
-#endif
   }
   // update POC of display order