Changeset 1486 in SHVCSoftware

Timestamp:

20 Nov 2015, 17:22:56 (9 years ago)

Author:

seregin

Message:

fix for poc reset ticket #82, patch-by Usman Hakeem <usman.hakeem@…> and Hendry <fhendry@…>

Location:

branches/SHM-dev/source

Files:

• App/TAppDecoder/TAppDecTop.cpp (modified) (1 diff)
• Lib/TLibCommon/TypeDef.h (modified) (1 diff)
• Lib/TLibDecoder/TDecTop.cpp (modified) (5 diffs)

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

@@ -1961 +1961 @@
   }
 
+#if CONFORMANCE_BITSTREAM_FIX
+  if (!vps) return;
+#else 
   assert( vps != NULL );    // No picture in any DPB?
+#endif
   std::sort( listOfPocs.begin(), listOfPocs.end() );    // Sort in increasing order of POC
   Int targetLsIdx = vps->getOutputLayerSetIdx( getCommonDecoderParams()->getTargetOutputLayerSetIdx() );

branches/SHM-dev/source/Lib/TLibCommon/TypeDef.h

@@ -68 +68 @@
 #define NO_CLRAS_OUTPUT_FLAG             1
 
+#define CONFORMANCE_BITSTREAM_FIX        1
 /// scalability types
 enum ScalabilityType

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

@@ -847 +847 @@
   }
 
+#if !CONFORMANCE_BITSTREAM_FIX  //This update previous Tid0 POC is moved down and invoke only after the POC derivation has been finalized
   xUpdatePreviousTid0POC(m_apcSlicePilot);
+#endif
 
   m_apcSlicePilot->setAssociatedIRAPPOC(m_pocCRA);
@@ -908 +910 @@
     Int iMaxPOClsb = 1 << sps->getBitsForPOC();
     m_apcSlicePilot->setPOC( m_apcSlicePilot->getPOC() & (iMaxPOClsb - 1) );
+#if !CONFORMANCE_BITSTREAM_FIX  //This update previous Tid0 POC is moved down and invoke only after the POC derivation has been finalized
     xUpdatePreviousTid0POC(m_apcSlicePilot);
+#endif
   }
 
@@ -1035 +1039 @@
     }
 
+#if CONFORMANCE_BITSTREAM_FIX
+    if( m_apcSlicePilot->getPocResetIdc() && m_apcSlicePilot->getFirstSliceInPic() )
+#else
     if( m_apcSlicePilot->getPocResetIdc() && m_apcSlicePilot->getSliceIdx() == 0 )
+#endif
     {
       Int pocResetPeriodId = m_apcSlicePilot->getPocResetPeriodId();
@@ -1237 +1245 @@
   }
 
+#if CONFORMANCE_BITSTREAM_FIX
+  xUpdatePreviousTid0POC(m_apcSlicePilot);
+#endif
+
   if( m_parseIdc == 1 || m_parseIdc == 3)
   {
@@ -1242 +1254 @@
     if(    !m_apcSlicePilot->getRaslPicFlag() 
       && !m_apcSlicePilot->getRadlPicFlag()
-      && (m_apcSlicePilot->getNalUnitType() % 2 == 1)
+      && (m_apcSlicePilot->getNalUnitType() % 2 == 1
+#if CONFORMANCE_BITSTREAM_FIX
+        || (m_apcSlicePilot->getNalUnitType() > 15 && m_apcSlicePilot->getNalUnitType() < 24))
+#else
+        )
+#endif
       && ( nalu.m_temporalId == 0 )
       && !m_apcSlicePilot->getDiscardableFlag() )