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

Timestamp:

26 Jan 2015, 17:11:15 (10 years ago)

Author:

nokia

Message:

Implementation of JCTVC-R0235 - Processing of bitstreams without an available base layer

Location:

branches/SHM-dev/source/App/TAppDecoder

Files:

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

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

@@ -249 +249 @@
       }
       fclose (targetDecLayerIdSetFile);
-      if ( m_targetDecLayerIdSet.size() > 0 && !isLayerIdZeroIncluded )
+#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

@@ -1113 +1113 @@
     return true;
   }
+#if R0235_SMALLEST_LAYER_ID
+  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))
+  {
+    return true;
+  }
+#endif
   for (std::vector<Int>::iterator it = m_targetDecLayerIdSet.begin(); it != m_targetDecLayerIdSet.end(); it++)
   {