Changeset 1485 in SHVCSoftware

Timestamp:

4 Nov 2015, 03:25:23 (9 years ago)

Author:

seregin

Message:

ignore NAL unit with layerId equal to 63

Location:

branches/SHM-dev/source

Files:

• App/TAppDecoder/TAppDecTop.cpp (modified) (1 diff)
• Lib/TLibCommon/TComPic.cpp (modified) (1 diff)
• Lib/TLibCommon/TComPicSym.cpp (modified) (1 diff)
• Lib/TLibCommon/TComSlice.cpp (modified) (1 diff)
• Lib/TLibDecoder/TDecTop.cpp (modified) (2 diffs)

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

@@ -234 +234 @@
     {
       read(nalu);
+
+#if SVC_EXTENSION
+      // ignore any NAL units with nuh_layer_id == 63
+      if( nalu.m_nuhLayerId == 63 )
+      {
+        printf("Ignore NAL unit with m_nuhLayerId equal to 63\n");
+        continue;
+      }
+#endif
+
       if( (m_iMaxTemporalLayer >= 0 && nalu.m_temporalId > m_iMaxTemporalLayer) || !isNaluWithinTargetDecLayerIdSet(&nalu)  ||
 #if CONFORMANCE_BITSTREAM_MODE

branches/SHM-dev/source/Lib/TLibCommon/TComPic.cpp

@@ -88 +88 @@
   const Window& conformanceWindow = vps.getConformanceWindow( &sps, layerId );
 
+  m_layerId = layerId;
+
   m_picSym.create( vps, sps, pps, uiMaxDepth, layerId );
 

branches/SHM-dev/source/Lib/TLibCommon/TComPicSym.cpp

@@ -121 +121 @@
   allocateNewSlice();
 
+#if SVC_EXTENSION
+   m_apSlices.back()->setLayerId( layerId );
+#endif
+
 #if ADAPTIVE_QP_SELECTION
   if (m_pParentARLBuffer == NULL)

branches/SHM-dev/source/Lib/TLibCommon/TComSlice.cpp

@@ -3594 +3594 @@
 
       pcIlpPic[refLayerIdc]->getPicYuvRec()->setBorderExtension( false );
-      pcIlpPic[refLayerIdc]->getPicYuvRec()->extendPicBorder();      
+      pcIlpPic[refLayerIdc]->getPicYuvRec()->extendPicBorder();
       pcIlpPic[refLayerIdc]->setIsLongTerm(true);
 

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

@@ -170 +170 @@
   m_cGopDecoder.create();
   m_apcSlicePilot = new TComSlice;
-#if SVC_EXTENSION
-  m_apcSlicePilot->setLayerId(m_layerId);
-#endif
   m_uiSliceIdx = 0;
 }
@@ -1969 +1966 @@
   // ignore any NAL units with nuh_layer_id == 63
   if( nalu.m_nuhLayerId == 63 )
-  {  
+  {
     return false;
   }