Changeset 850 in SHVCSoftware for branches/SHM-dev/source/Lib/TLibDecoder

Timestamp:

1 Aug 2014, 22:23:56 (10 years ago)

Author:

qualcomm

Message:

Constraint checking such when slice_temporal_mvp_enabled_flag is equal to 0, and TemporalId is equal to 0, succeeding pictures shall not use earlier pictures as TMVP reference

Adoption of JCTVC-R0226. (Macro: R0226_SLICE_TMVP)

From: Hendry <fhendry@…>

Location:

branches/SHM-dev/source/Lib/TLibDecoder

Files:

• TDecCAVLC.cpp (modified) (1 diff)
• TDecTop.cpp (modified) (3 diffs)
• TDecTop.h (modified) (1 diff)

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

@@ -2960 +2960 @@
     if (rpcSlice->getSPS()->getTMVPFlagsPresent())
     {
+#if R0226_SLICE_TMVP
+      READ_FLAG( uiCode, "slice_temporal_mvp_enabled_flag" );
+#else
       READ_FLAG( uiCode, "slice_temporal_mvp_enable_flag" );
+#endif
       rpcSlice->setEnableTMVPFlag( uiCode == 1 ? true : false );
     }

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

@@ -1313 +1313 @@
 #endif
 
+#if R0226_SLICE_TMVP
+  if ( m_apcSlicePilot->getTLayer() == 0 && m_apcSlicePilot->getEnableTMVPFlag() == 0 )
+  {
+    //update all pics in the DPB such that they cannot be used for TMPV ref
+    TComList<TComPic*>::iterator  iterRefPic = m_cListPic.begin();  
+    while( iterRefPic != m_cListPic.end() )
+    {
+      TComPic *refPic = *iterRefPic;
+      if( ( refPic->getLayerId() == m_apcSlicePilot->getLayerId() ) && refPic->getReconMark() )
+      {
+        for(Int i = refPic->getNumAllocatedSlice()-1; i >= 0; i--)
+        {
+
+          TComSlice *refSlice = refPic->getSlice(i);
+          refSlice->setAvailableForTMVPRefFlag( false );
+        }
+      }
+      iterRefPic++;
+    }
+  }
+  m_apcSlicePilot->setAvailableForTMVPRefFlag( true );
+#endif
+
   // actual decoding starts here
     xActivateParameterSets();
@@ -1945 +1968 @@
       }
     }
-
+    
     if( m_layerId > 0 && !pcSlice->isIntra() && pcSlice->getEnableTMVPFlag() )
     {
@@ -1951 +1974 @@
 
       assert( refPic );
+#if R0226_SLICE_TMVP
+      assert ( refPic->getPicSym()->getSlice(0)->getAvailableForTMVPRefFlag() == true );
+#endif
 
       // It is a requirement of bitstream conformance when the collocated picture, used for temporal motion vector prediction, is an inter-layer reference picture, 

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

@@ -165 +165 @@
   Bool                    m_isLastNALWasEos;
 #endif
-
 #if SVC_EXTENSION
   static UInt             m_prevPOC;        // POC of the previous slice