Changeset 1107 in SHVCSoftware for branches/SHM-dev/source/App/TAppDecoder

Timestamp:

6 Jul 2015, 21:01:55 (9 years ago)

Author:

seregin

Message:

macro cleanup: R0235_SMALLEST_LAYER_ID

Location:

branches/SHM-dev/source/App/TAppDecoder

Files:

• TAppDecCfg.cpp (modified) (1 diff)
• TAppDecTop.cpp (modified) (2 diffs)

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

@@ -259 +259 @@
       }
       fclose (targetDecLayerIdSetFile);
-#if !R0235_SMALLEST_LAYER_ID  // LayerId=0 is not required anymore in some cases
-      if ( m_targetDecLayerIdSet.size() > 0 && !isLayerIdZeroIncluded )
-      {
-        fprintf(stderr, "TargetDecLayerIdSet must contain LayerId=0, aborting" );
-        return false;
-      }
-#endif
     }
     else

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

@@ -1284 +1284 @@
     return true;
   }
-#if R0235_SMALLEST_LAYER_ID
+#if SVC_EXTENSION
   if (nalu->m_layerId == 0 && (nalu->m_nalUnitType == NAL_UNIT_VPS || nalu->m_nalUnitType == NAL_UNIT_SPS || nalu->m_nalUnitType == NAL_UNIT_PPS || nalu->m_nalUnitType == NAL_UNIT_EOS))
   {
@@ -1299 +1299 @@
   return false;
 }
+
 #if ALIGNED_BUMPING
 // Function outputs a picture, and marks it as not needed for output.