Changeset 1078 in SHVCSoftware for branches/SHM-dev/source

Timestamp:

10 Mar 2015, 18:22:44 (10 years ago)

Author:

seregin

Message:

fix inference for sps_max_dec_pic_buffering_minus1

Location:

branches/SHM-dev/source/Lib

Files:

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

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

@@ -1732 +1732 @@
   Bool        m_extensionFlag;
   UInt        m_numScaledRefLayerOffsets;
+  Bool        m_multiLayerExtSpsFlag;
 #if R0042_PROFILE_INDICATION  
   Int         m_NumDirectRefLayers;
@@ -1910 +1911 @@
 
 #if SVC_EXTENSION
-  Void     setLayerId(UInt layerId)            { m_layerId = layerId; }
-  UInt     getLayerId()                        { return m_layerId;    }
-  Int      getExtensionFlag()                  { return m_extensionFlag;  }
-  Void     setExtensionFlag(Int n)             { m_extensionFlag = n;     }
+  Void     setLayerId(UInt layerId)                 { m_layerId = layerId;           }
+  UInt     getLayerId()                             { return m_layerId;              }
+  Int      getExtensionFlag()                       { return m_extensionFlag;        }
+  Void     setExtensionFlag(Int n)                  { m_extensionFlag = n;           }
+  Bool     getMultiLayerExtSpsFlag()                { return m_multiLayerExtSpsFlag; }
+  Void     setMultiLayerExtSpsFlag(Bool flag)       { m_multiLayerExtSpsFlag = flag; }
 #if R0042_PROFILE_INDICATION
   Int      getNumDirectRefLayers()                  { return  m_NumDirectRefLayers;  }

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

@@ -714 +714 @@
   }
 
-  Bool V1CompatibleSPSFlag = !( pcSPS->getLayerId() != 0 && uiTmp == 7 );
-
-  if( V1CompatibleSPSFlag )
+  pcSPS->setMultiLayerExtSpsFlag( pcSPS->getLayerId() != 0 && uiTmp == 7 );
+
+  if( !pcSPS->getMultiLayerExtSpsFlag() )
   {
 #endif
@@ -735 +735 @@
 
 #if SVC_EXTENSION
-  if( !V1CompatibleSPSFlag )
+  if( pcSPS->getMultiLayerExtSpsFlag() )
   {
     READ_FLAG( uiCode, "update_rep_format_flag" );
@@ -820 +820 @@
 
 #if SVC_EXTENSION
-  if( V1CompatibleSPSFlag )  
+  if( !pcSPS->getMultiLayerExtSpsFlag() )  
   {
 #endif
@@ -839 +839 @@
       for (i++; i <= pcSPS->getMaxTLayers()-1; i++)
       {
+#if SVC_EXTENSION
+        // When sps_max_dec_pic_buffering_minus1[ i ] is not present for i in the range of 0 to sps_max_sub_layers_minus1 - 1, inclusive,
+        // due to sps_sub_layer_ordering_info_present_flag being equal to 0, it is inferred to be equal to sps_max_dec_pic_buffering_minus1[ sps_max_sub_layers_minus1 ].
+        pcSPS->setMaxDecPicBuffering( pcSPS->getMaxDecPicBuffering(pcSPS->getMaxTLayers()-1), i );
+#else
         pcSPS->setMaxDecPicBuffering(pcSPS->getMaxDecPicBuffering(0), i);
+#endif
         pcSPS->setNumReorderPics(pcSPS->getNumReorderPics(0), i);
         pcSPS->setMaxLatencyIncrease(pcSPS->getMaxLatencyIncrease(0), i);
@@ -845 +851 @@
       break;
     }
+
+#if SVC_EXTENSION
+    if( i > 0 )
+    {
+      // When i is greater than 0, sps_max_dec_pic_buffering_minus1[ i ] shall be greater than or equal to sps_max_dec_pic_buffering_minus1[ i - 1 ]. 
+      assert( pcSPS->getMaxDecPicBuffering(i) >= pcSPS->getMaxDecPicBuffering(i-1) );
+    }
+#endif
+
   }
 #if SVC_EXTENSION
@@ -878 +893 @@
   {
 #if SVC_EXTENSION
-    if( !V1CompatibleSPSFlag )
+    if( pcSPS->getMultiLayerExtSpsFlag() )
     {
       READ_FLAG( uiCode, "sps_infer_scaling_list_flag" ); pcSPS->setInferScalingListFlag( uiCode );

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

@@ -664 +664 @@
       // to avoid compiler warning "array subscript is above array bounds"
       assert( i < MAX_TLAYER );
-#if LAYER_DECPICBUFF_PARAM && RESOLUTION_BASED_DPB
-      sps->setMaxDecPicBuffering( activeVPS->getMaxVpsLayerDecPicBuffMinus1( m_commonDecoderParams->getTargetOutputLayerSetIdx(), sps->getLayerId(), i) + 1, i);
-#else
-      sps->setMaxDecPicBuffering( activeVPS->getMaxVpsDecPicBufferingMinus1( m_commonDecoderParams->getTargetOutputLayerSetIdx(), activeVPS->getLayerIdcInOls( activeVPS->getOutputLayerSetIdx( m_commonDecoderParams->getTargetOutputLayerSetIdx() ), sps->getLayerId() ), i) + 1, i);
-#endif
+
+      // When sps_max_dec_pic_buffering_minus1[ i ] is not present for i in the range of 0 to sps_max_sub_layers_minus1, inclusive, 
+      // due to MultiLayerExtSpsFlag being equal to 1, for a layer that refers to the SPS and has nuh_layer_id equal to currLayerId, 
+      // the value of sps_max_dec_pic_buffering_minus1[ i ] is inferred to be equal to max_vps_dec_pic_buffering_minus1[ TargetOlsIdx ][ layerIdx ][ i ] of the active VPS, 
+      // where layerIdx is equal to the value such that LayerSetLayerIdList[ TargetDecLayerSetIdx ][ layerIdx ] is equal to currLayerId.
+      if( sps->getMultiLayerExtSpsFlag() )
+      {
+        sps->setMaxDecPicBuffering( activeVPS->getMaxVpsDecPicBufferingMinus1( m_commonDecoderParams->getTargetOutputLayerSetIdx(), activeVPS->getLayerIdcInOls( activeVPS->getOutputLayerSetIdx( m_commonDecoderParams->getTargetOutputLayerSetIdx() ), m_layerId ), i) + 1, i);
+      }
+
+      // The value of sps_max_dec_pic_buffering_minus1[ i ] shall be less than or equal to vps_max_dec_pic_buffering_minus1[ i ] for each value of i.
+      assert( sps->getMaxDecPicBuffering(i) <= activeVPS->getMaxDecPicBuffering(i) );      
     }