Changeset 669 in SHVCSoftware for branches/SHM-6-dev

Timestamp:

11 Apr 2014, 20:14:16 (11 years ago)

Author:

seregin

Message:

fix picture marking for the NoClrasOutputFlag

Location:

branches/SHM-6-dev/source/Lib

Files:

• TLibCommon/TComSlice.cpp (modified) (1 diff)
• TLibCommon/TComSlice.h (modified) (1 diff)
• TLibCommon/TypeDef.h (modified) (1 diff)
• TLibDecoder/TDecTop.cpp (modified) (2 diffs)
• TLibDecoder/TDecTop.h (modified) (1 diff)

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

@@ -1015 +1015 @@
  */
 #if NO_CLRAS_OUTPUT_FLAG
+Void TComSlice::decodingRefreshMarking( TComList<TComPic*>& rcListPic, Bool noClrasOutputFlag )
+{
+  if( !isIRAP() )
+  {
+    return;
+  }
+
+  // When the current picture is an IRAP picture with nuh_layer_id equal to 0 and NoClrasOutputFlag is equal to 1, 
+  // all reference pictures with any value of nuh_layer_id currently in the DPB (if any) are marked as "unused for reference".
+  if( m_layerId == 0 && noClrasOutputFlag )
+  {
+    Int pocCurr = getPOC();
+    TComPic* rpcPic;
+
+    // mark all pictures for all layers as not used for reference
+    TComList<TComPic*>::iterator        iterPic       = rcListPic.begin();
+    while( iterPic != rcListPic.end() )
+    {
+      if( rpcPic->getPOC() != pocCurr )
+      {
+        rpcPic->getSlice(0)->setReferenced(false);
+      }
+    }
+  }
+
+  // When the current picture is an IRAP picture with NoRaslOutputFlag equal to 1, 
+  // all reference pictures with nuh_layer_id equal to currPicLayerId currently in the DPB (if any) are marked as "unused for reference".
+  if( m_noRaslOutputFlag )
+  {
+    Int pocCurr = getPOC();
+    TComPic* rpcPic;
+
+    // mark all pictures of a current layer as not used for reference
+    TComList<TComPic*>::iterator        iterPic       = rcListPic.begin();
+    while( iterPic != rcListPic.end() )
+    {
+      if( rpcPic->getPOC() != pocCurr && rpcPic->getLayerId() == m_layerId )
+      {
+        rpcPic->getSlice(0)->setReferenced(false);
+      }
+    }
+  }
+}
+
 Void TComSlice::decodingRefreshMarking(Int& pocCRA, Bool& bRefreshPending, TComList<TComPic*>& rcListPic, Bool noClrasOutputFlag)
 #else

branches/SHM-6-dev/source/Lib/TLibCommon/TComSlice.h

@@ -2135 +2135 @@
   Void      checkCRA(TComReferencePictureSet *pReferencePictureSet, Int& pocCRA, NalUnitType& associatedIRAPType, TComList<TComPic *>& rcListPic);
 #if NO_CLRAS_OUTPUT_FLAG
+  Void      decodingRefreshMarking( TComList<TComPic*>& rcListPic, Bool noClrasOutputFlag );
   Void      decodingRefreshMarking(Int& pocCRA, Bool& bRefreshPending, TComList<TComPic*>& rcListPic, Bool noClrasOutputFlag);
 #else

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

@@ -272 +272 @@
 #define HARMONIZE_GOP_FIRST_FIELD_COUPLE  1
 #define FIX_FIELD_DEPTH                 1
-#if !SVC_EXTENSION
 #define EFFICIENT_FIELD_IRAP            1
-#endif
 #define ALLOW_RECOVERY_POINT_AS_RAP     1
 #define BUGFIX_INTRAPERIOD 1

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

@@ -89 +89 @@
   m_layerInitializedFlag       = false;
   m_firstPicInLayerDecodedFlag = false;  
-  m_bRefreshPending            = false;
 #endif
 #if RESOLUTION_BASED_DPB
@@ -1023 +1022 @@
   }
 
-  m_apcSlicePilot->decodingRefreshMarking(m_pocCRA, m_bRefreshPending, m_cListPic, getNoClrasOutputFlag());
+  m_apcSlicePilot->decodingRefreshMarking( m_cListPic, m_noClrasOutputFlag );
 #endif
 

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

@@ -146 +146 @@
   Bool                    m_layerInitializedFlag;
   Bool                    m_firstPicInLayerDecodedFlag;
-  Bool                    m_bRefreshPending;
 #endif
 #if RESOLUTION_BASED_DPB