Changeset 1006 in SHVCSoftware for branches/SHM-upgrade/source/App/TAppDecoder

Timestamp:

27 Jan 2015, 19:44:15 (10 years ago)

Author:

seregin

Message:

port implementation of JCTVC-R0235 - Processing of bitstreams without an available base layer (rev 1005)

Location:

branches/SHM-upgrade/source/App/TAppDecoder

Files:

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

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

@@ -265 +265 @@
       }
       fclose (targetDecLayerIdSetFile);
+#if !R0235_SMALLEST_LAYER_ID  // LayerId=0 is not required anymore in some cases
       if ( m_targetDecLayerIdSet.size() > 0 && !isLayerIdZeroIncluded )
       {
@@ -270 +271 @@
         return false;
       }
+#endif
     }
     else

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

@@ -1212 +1212 @@
     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++)
   {