Changeset 1185 in SHVCSoftware for branches/SHM-dev/source/Lib/TLibDecoder/SEIread.cpp

Timestamp:

8 Jul 2015, 03:34:13 (9 years ago)

Author:

seregin

Message:

macro cleanup: VPS_VUI_BSP_HRD_PARAMS, R0227_VUI_BSP_HRD_FLAG

File:

• branches/SHM-dev/source/Lib/TLibDecoder/SEIread.cpp (modified) (10 diffs)

branches/SHM-dev/source/Lib/TLibDecoder/SEIread.cpp

@@ -199 +199 @@
       {
         sei = new SEIDecodingUnitInfo;
-#if VPS_VUI_BSP_HRD_PARAMS
+#if SVC_EXTENSION
         xParseSEIDecodingUnitInfo((SEIDecodingUnitInfo&) *sei, payloadSize, sps, nestingSei, bspNestingSei, vps, pDecodedMessageOutputStream);
 #else        
@@ -214 +214 @@
       {
         sei = new SEIBufferingPeriod;
-#if VPS_VUI_BSP_HRD_PARAMS
+#if SVC_EXTENSION
         xParseSEIBufferingPeriod((SEIBufferingPeriod&) *sei, payloadSize, sps, nestingSei, bspNestingSei, vps, pDecodedMessageOutputStream);
 #else
@@ -229 +229 @@
       {
         sei = new SEIPictureTiming;
-#if VPS_VUI_BSP_HRD_PARAMS
+#if SVC_EXTENSION
         xParseSEIPictureTiming((SEIPictureTiming&)*sei, payloadSize, sps, nestingSei, bspNestingSei, vps, pDecodedMessageOutputStream);
 #else
@@ -560 +560 @@
 }
 
-#if VPS_VUI_BSP_HRD_PARAMS
+#if SVC_EXTENSION
 Void SEIReader::xParseSEIDecodingUnitInfo(SEIDecodingUnitInfo& sei, UInt payloadSize, TComSPS *sps, const SEIScalableNesting* nestingSei, const SEIBspNesting* bspNestingSei, TComVPS *vps,std::ostream *pDecodedMessageOutputStream)
 #else
@@ -571 +571 @@
   sei.m_decodingUnitIdx = val;
 
-#if VPS_VUI_BSP_HRD_PARAMS
+#if SVC_EXTENSION
   TComHRD *hrd;
   if( bspNestingSei )   // If DU info SEI contained inside a BSP nesting SEI message
@@ -645 +645 @@
 }
 
-#if VPS_VUI_BSP_HRD_PARAMS
+#if SVC_EXTENSION
 Void SEIReader::xParseSEIBufferingPeriod(SEIBufferingPeriod& sei, UInt payloadSize, TComSPS *sps, const SEIScalableNesting* nestingSei, const SEIBspNesting* bspNestingSei, TComVPS *vps, std::ostream *pDecodedMessageOutputStream)
 #else
@@ -654 +654 @@
   UInt code;
 
-#if VPS_VUI_BSP_HRD_PARAMS
+#if SVC_EXTENSION
   TComHRD *pHRD;
   if( bspNestingSei )   // If BP SEI contained inside a BSP nesting SEI message
@@ -749 +749 @@
 }
 
-#if VPS_VUI_BSP_HRD_PARAMS
+#if SVC_EXTENSION
 Void SEIReader::xParseSEIPictureTiming(SEIPictureTiming& sei, UInt payloadSize, TComSPS *sps, const SEIScalableNesting* nestingSei, const SEIBspNesting* bspNestingSei, TComVPS *vps, std::ostream *pDecodedMessageOutputStream)
 #else
@@ -758 +758 @@
   UInt code;
 
-#if VPS_VUI_BSP_HRD_PARAMS
+#if SVC_EXTENSION
   TComHRD *hrd;    
   TComVUI *vui = sps->getVuiParameters(); 
@@ -1548 +1548 @@
   assert(vps->getVpsVuiPresentFlag());
 
-#if VPS_VUI_BSP_HRD_PARAMS
+#if SVC_EXTENSION
   UInt uiCode;
   Int psIdx         = bspNestingSei.m_seiPartitioningSchemeIdx;