Changeset 1006 in SHVCSoftware

Timestamp:

27 Jan 2015, 19:44:15 (10 years ago)

Author:

seregin

Message:

port implementation of JCTVC-R0235 - Processing of bitstreams without an available base layer (rev 1005)

Location:

branches/SHM-upgrade/source

Files:

• App/TAppDecoder/TAppDecCfg.cpp (modified) (2 diffs)
• App/TAppDecoder/TAppDecTop.cpp (modified) (1 diff)
• App/TAppEncoder/TAppEncCfg.cpp (modified) (4 diffs)
• App/TAppEncoder/TAppEncCfg.h (modified) (1 diff)
• App/utils/BLRewrite (deleted)
• App/utils/ExtractAddLS (added)
• App/utils/ExtractAddLS/ExtractAddLS.c (added)
• App/utils/ExtractAddLS/ReadMe.txt (added)
• Lib/TLibCommon/TComSlice.cpp (modified) (2 diffs)
• Lib/TLibCommon/TComSlice.h (modified) (1 diff)
• Lib/TLibCommon/TypeDef.h (modified) (1 diff)
• Lib/TLibDecoder/TDecCAVLC.cpp (modified) (5 diffs)
• Lib/TLibDecoder/TDecTop.cpp (modified) (7 diffs)
• Lib/TLibDecoder/TDecTop.h (modified) (2 diffs)

branches/SHM-upgrade/source/App/TAppDecoder/TAppDecCfg.cpp

@@ -265 +265 @@
       }
       fclose (targetDecLayerIdSetFile);
+#if !R0235_SMALLEST_LAYER_ID  // LayerId=0 is not required anymore in some cases
       if ( m_targetDecLayerIdSet.size() > 0 && !isLayerIdZeroIncluded )
       {
@@ -270 +271 @@
         return false;
       }
+#endif
     }
     else

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

@@ -1212 +1212 @@
     return true;
   }
+#if R0235_SMALLEST_LAYER_ID
+  if (nalu->m_layerId == 0 && (nalu->m_nalUnitType == NAL_UNIT_VPS || nalu->m_nalUnitType == NAL_UNIT_SPS || nalu->m_nalUnitType == NAL_UNIT_PPS || nalu->m_nalUnitType == NAL_UNIT_EOS))
+  {
+    return true;
+  }
+#endif
   for (std::vector<Int>::iterator it = m_targetDecLayerIdSet.begin(); it != m_targetDecLayerIdSet.end(); it++)
   {

branches/SHM-upgrade/source/App/TAppEncoder/TAppEncCfg.cpp

@@ -2681 +2681 @@
 #if MULTIPLE_PTL_SUPPORT
     Int olsToLsIndex = (olsCtr >= (m_numLayerSets + m_numAddLayerSets)) ? m_outputLayerSetIdx[olsCtr - (m_numLayerSets + m_numAddLayerSets)] : olsCtr;
+#if R0235_SMALLEST_LAYER_ID
+    // This is a fix to allow setting of PTL for additional layer sets
+    if (olsCtr >= m_numLayerSets && olsCtr < (m_numLayerSets + m_numAddLayerSets))
+    {
+      scanStringToArrayNumEntries(cfg_listOfLayerPTLOfOlss[olsCtr], m_numLayerInIdList[olsToLsIndex], "List of PTL for each layers in OLS", m_listOfLayerPTLofOlss[olsCtr]);
+    }
+    else
+    {
+      scanStringToArray(cfg_listOfLayerPTLOfOlss[olsCtr], m_numLayerInIdList[olsToLsIndex], "List of PTL for each layers in OLS", m_listOfLayerPTLofOlss[olsCtr]);
+    }
+#else
     scanStringToArray( cfg_listOfLayerPTLOfOlss[olsCtr], m_numLayerInIdList[olsToLsIndex], "List of PTL for each layers in OLS", m_listOfLayerPTLofOlss[olsCtr] );
+#endif
     //For conformance checking
     //Conformance of a layer in an output operation point associated with an OLS in a bitstream to the Scalable Main profile is indicated as follows:
@@ -2688 +2700 @@
     //If OpTid of the output operation point is equal to vps_max_sub_layer_minus1, the conformance is indicated by general_profile_idc being equal to 7 or general_profile_compatibility_flag[ 7 ] being equal to 1
     //The following assert may be updated / upgraded to take care of general_profile_compatibility_flag.
+#if R0235_SMALLEST_LAYER_ID
+    if (m_numAddLayerSets == 0)
+    {
+#endif
     for ( Int ii = 1; ii < m_numLayerInIdList[olsToLsIndex]; ii++)
     {
@@ -2696 +2712 @@
                 (m_profileCompatibility[m_listOfLayerPTLofOlss[olsCtr][ii]] == m_profileList[m_listOfLayerPTLofOlss[olsCtr][ii - 1]]) );
       }
-    }   
+    }
+#if R0235_SMALLEST_LAYER_ID
+    }
+#endif
 #endif
   }
@@ -5084 +5103 @@
 }
 #endif
+
+#if R0235_SMALLEST_LAYER_ID
+#if OUTPUT_LAYER_SETS_CONFIG
+Void TAppEncCfg::cfgStringToArrayNumEntries(Int **arr, string const cfgString, Int &numEntries, const char* logString)
+{
+  Char *tempChar = cfgString.empty() ? NULL : strdup(cfgString.c_str());
+  if (numEntries > 0)
+  {
+    Char *arrayEntry;
+    Int i = 0;
+    *arr = new Int[numEntries];
+
+    if (tempChar == NULL)
+    {
+      arrayEntry = NULL;
+    }
+    else
+    {
+      arrayEntry = strtok(tempChar, " ,");
+    }
+    while (arrayEntry != NULL)
+    {
+      if (i >= numEntries)
+      {
+        printf("%s: The number of entries specified is larger than the allowed number.\n", logString);
+        exit(EXIT_FAILURE);
+      }
+      *(*arr + i) = atoi(arrayEntry);
+      arrayEntry = strtok(NULL, " ,");
+      i++;
+    }
+    numEntries = i;
+    /*
+    if (i < numEntries)
+    {
+      printf("%s: Some entries are not specified.\n", logString);
+      exit(EXIT_FAILURE);
+    }
+    */
+  }
+  else
+  {
+    *arr = NULL;
+  }
+
+  if (tempChar)
+  {
+    free(tempChar);
+    tempChar = NULL;
+  }
+}
+
+Bool TAppEncCfg::scanStringToArrayNumEntries(string const cfgString, Int &numEntries, const char* logString, std::vector<Int> & returnVector)
+{
+  Int *tempArray = NULL;
+  numEntries = MAX_LAYERS;
+  // For all layer sets
+  cfgStringToArrayNumEntries(&tempArray, cfgString, numEntries, logString);
+  if (tempArray)
+  {
+    returnVector.empty();
+    for (Int i = 0; i < numEntries; i++)
+    {
+      returnVector.push_back(tempArray[i]);
+    }
+    delete[] tempArray; tempArray = NULL;
+    return true;
+  }
+  return false;
+}
+#endif
+#endif // R0235
 #endif //SVC_EXTENSION
 //! \}

branches/SHM-upgrade/source/App/TAppEncoder/TAppEncCfg.h

@@ -587 +587 @@
   Bool scanStringToArray(string const cfgString, Int const numEntries, const char* logString, std::vector<Int> &  returnVector);
   Void cfgStringToArray(Int **arr, string const cfgString, Int const numEntries, const char* logString);
+#if R0235_SMALLEST_LAYER_ID
+  Bool scanStringToArrayNumEntries(string const cfgString, Int &numEntries, const char* logString, Int * const returnArray);
+  Bool scanStringToArrayNumEntries(string const cfgString, Int &numEntries, const char* logString, std::vector<Int> &  returnVector);
+  Void cfgStringToArrayNumEntries(Int **arr, string const cfgString, Int &numEntries, const char* logString);
+#endif
 #else
   Void cfgStringToArray(Int **arr, string cfgString, Int numEntries, const char* logString);

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

@@ -901 +901 @@
  */
 #if NO_CLRAS_OUTPUT_FLAG
+#if R0235_SMALLEST_LAYER_ID
+Void TComSlice::decodingRefreshMarking( TComList<TComPic*>& rcListPic, Bool noClrasOutputFlag, UInt smallestLayerId )
+#else
 Void TComSlice::decodingRefreshMarking( TComList<TComPic*>& rcListPic, Bool noClrasOutputFlag )
+#endif
 {
   if( !isIRAP() )
@@ -913 +917 @@
   // 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 R0235_SMALLEST_LAYER_ID
+  if (m_layerId == smallestLayerId && noClrasOutputFlag)
+#else
   if( m_layerId == 0 && noClrasOutputFlag )
+#endif
   {
     // mark all pictures for all layers as not used for reference

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

@@ -2536 +2536 @@
   Void      checkCRA(TComReferencePictureSet *pReferencePictureSet, Int& pocCRA, NalUnitType& associatedIRAPType, TComList<TComPic *>& rcListPic);
 #if NO_CLRAS_OUTPUT_FLAG
+#if R0235_SMALLEST_LAYER_ID
+  Void      decodingRefreshMarking( TComList<TComPic*>& rcListPic, Bool noClrasOutputFlag, UInt smallestLayerId = 0 );
+#else
   Void      decodingRefreshMarking( TComList<TComPic*>& rcListPic, Bool noClrasOutputFlag );
+#endif
   Void      decodingRefreshMarking(Int& pocCRA, Bool& bRefreshPending, TComList<TComPic*>& rcListPic, Bool noClrasOutputFlag);
 #else

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

@@ -81 +81 @@
 #define R0227_BR_PR_ADD_LAYER_SET        1      ///< JCTVC-R0227, Signalling of bit-rate and picture rate for additional layer set
 #define R0042_PROFILE_INDICATION         1      ///< JCTVC-R0042, Profile indication for additional layer sets
+#define R0235_SMALLEST_LAYER_ID          1      ///< JCTVC-R0235, SmallestLayerId semantics 
 
 #define Q0108_TSA_STSA                   1      ///< JCTVC-Q0108, Remove cross-layer alignment constraints of TSA and STSA pictures, enable to have different prediction structures in different layers

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

@@ -1525 +1525 @@
           for(Int kk = 0; kk < pcSlice->getVPS()->getNumLayersInIdList(layerSetIdxForOutputLayerSet); kk++)
           {
+#if R0235_SMALLEST_LAYER_ID
+            if( pcSlice->getVPS()->getNecessaryLayerFlag(ii, kk) && pcSlice->getLayerId() == pcSlice->getVPS()->getLayerSetLayerIdList(layerSetIdxForOutputLayerSet, kk) )
+#else
             if(pcSlice->getLayerId() == pcSlice->getVPS()->getLayerSetLayerIdList(layerSetIdxForOutputLayerSet, kk))
+#endif
             {
               chkAssert=1;
@@ -3218 +3222 @@
 #endif
       {
-        READ_CODE( numBitsForPtlIdx, uiCode, "profile_level_tier_idx[i]" ); 
+        READ_CODE( numBitsForPtlIdx, uiCode, "profile_tier_level_idx[i]" ); 
         vps->setProfileLevelTierIdx(i, j, uiCode );
 
@@ -3228 +3232 @@
         //If OpTid of the output operation point is equal to vps_max_sub_layer_minus1, the conformance is indicated by general_profile_idc being equal to 7 or general_profile_compatibility_flag[ 7 ] being equal to 1
         //The following assert may be updated / upgraded to take care of general_profile_compatibility_flag.
+#if R0235_SMALLEST_LAYER_ID
+        // The assertion below is not valid for independent non-base layers 
+        if (vps->getNumAddLayerSets() == 0)
+        {
+#endif
         if (j > 0 && vps->getLayerSetLayerIdList(layerSetIdxForOutputLayerSet, j) != 0 && vps->getLayerSetLayerIdList(layerSetIdxForOutputLayerSet, j - 1) != 0)
         {
@@ -3234 +3243 @@
                  vps->getPTL(vps->getProfileLevelTierIdx(i, j))->getGeneralPTL()->getProfileCompatibilityFlag(vps->getPTL(vps->getProfileLevelTierIdx(i, j - 1))->getGeneralPTL()->getProfileIdc())  );
         }
+#if R0235_SMALLEST_LAYER_ID
+        }
+#endif
 #endif
       }
@@ -3243 +3255 @@
       numBits++;
     }
-    READ_CODE( numBits, uiCode, "profile_level_tier_idx[i]" );     vps->setProfileLevelTierIdx(i, uiCode);
+    READ_CODE( numBits, uiCode, "profile_tier_level_idx[i]" );     vps->setProfileLevelTierIdx(i, uiCode);
 #endif
 #if P0300_ALT_OUTPUT_LAYER_FLAG

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

@@ -91 +91 @@
 #if SVC_EXTENSION 
   m_layerId = 0;
+#if R0235_SMALLEST_LAYER_ID
+  m_smallestLayerId = 0;
+#endif
 #if AVC_BASE
   m_pBLReconFile = NULL;
@@ -838 +841 @@
 #if OUTPUT_LAYER_SET_INDEX
   // Following check should go wherever the VPS is activated
+#if R0235_SMALLEST_LAYER_ID
+  if (!m_apcSlicePilot->getVPS()->getBaseLayerAvailableFlag())
+  {
+    assert(nalu.m_layerId != 0);
+    assert(m_apcSlicePilot->getVPS()->getNumAddLayerSets() > 0);
+    if (getCommonDecoderParams()->getTargetOutputLayerSetIdx() >= 0)
+    {
+      UInt layerIdx = m_apcSlicePilot->getVPS()->getOutputLayerSetIdx(getCommonDecoderParams()->getTargetOutputLayerSetIdx());
+      assert(layerIdx > m_apcSlicePilot->getVPS()->getVpsNumLayerSetsMinus1());
+    }
+  }
+  if (m_apcSlicePilot->getVPS()->getNumAddLayerSets() == 0)
+  {
+    checkValueOfTargetOutputLayerSetIdx(m_apcSlicePilot->getVPS());
+  }
+#else
   checkValueOfTargetOutputLayerSetIdx( m_apcSlicePilot->getVPS());
+#endif
 #endif
 #if RESOLUTION_BASED_DPB
@@ -969 +989 @@
 #if NO_OUTPUT_OF_PRIOR_PICS
 #if NO_CLRAS_OUTPUT_FLAG
+#if R0235_SMALLEST_LAYER_ID
+  if (m_layerId == m_smallestLayerId && m_apcSlicePilot->getRapPicFlag())
+#else
   if (m_layerId == 0 && m_apcSlicePilot->getRapPicFlag() )
+#endif
   {
     if (m_bFirstSliceInSequence)
@@ -1001 +1025 @@
   }
 
+#if R0235_SMALLEST_LAYER_ID
+  m_apcSlicePilot->decodingRefreshMarking( m_cListPic, m_noClrasOutputFlag, m_smallestLayerId );
+#else
   m_apcSlicePilot->decodingRefreshMarking( m_cListPic, m_noClrasOutputFlag );
+#endif
 #endif
 
@@ -2470 +2498 @@
         cListPic->clear();
       }
+#endif
+#if R0235_SMALLEST_LAYER_ID
+      xDeriveSmallestLayerId(m_parameterSetManagerDecoder.getPrefetchedVPS(0));
 #endif
       return false;
@@ -3116 +3147 @@
 Void TDecTop::xCheckLayerReset()
 {
+#if R0235_SMALLEST_LAYER_ID
+  if (m_apcSlicePilot->isIRAP() && m_layerId > m_smallestLayerId)
+#else
   if (m_apcSlicePilot->isIRAP() && m_layerId > 0)
+#endif
   {
     Bool layerResetFlag;
@@ -3200 +3235 @@
 #endif
 
+#if R0235_SMALLEST_LAYER_ID
+Void TDecTop::xDeriveSmallestLayerId(TComVPS* vps)
+{
+  UInt smallestLayerId;
+  UInt targetOlsIdx = getCommonDecoderParams()->getTargetOutputLayerSetIdx();
+  UInt targetDecLayerSetIdx = vps->getOutputLayerSetIdx(targetOlsIdx);
+  UInt lsIdx = targetDecLayerSetIdx;
+  UInt targetDecLayerIdList[MAX_LAYERS] = {0};
+
+  for (UInt i = 0, j = 0; i < vps->getNumLayersInIdList(lsIdx); i++)
+  {
+    if (vps->getNecessaryLayerFlag(targetOlsIdx, i))
+    {
+      targetDecLayerIdList[j++] = vps->getLayerSetLayerIdList(lsIdx, i);
+    }
+  }
+
+  if (targetDecLayerSetIdx <= vps->getVpsNumLayerSetsMinus1())
+  {
+    smallestLayerId = 0;
+  }
+  else if (vps->getNumLayersInIdList(targetDecLayerSetIdx) == 1)
+  {
+    smallestLayerId = 0;
+  }
+  else
+  {
+    smallestLayerId = targetDecLayerIdList[0];
+  }
+
+  for (UInt layer = 0; layer <= MAX_VPS_LAYER_ID_PLUS1 - 1; layer++)
+  {
+    m_ppcTDecTop[layer]->m_smallestLayerId = smallestLayerId;
+  }
+}
+#endif
+
 #endif //SVC_EXTENSION
 

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

@@ -133 +133 @@
   UInt                    m_numLayer;
   TDecTop**               m_ppcTDecTop;
+#if R0235_SMALLEST_LAYER_ID
+  UInt                    m_smallestLayerId;
+#endif
 #if P0297_VPS_POC_LSB_ALIGNED_FLAG
   Bool                    m_pocResettingFlag;
@@ -256 +259 @@
   Void      setLayerDec(TDecTop **p)    { m_ppcTDecTop = p; }
   TDecTop*  getLayerDec(UInt layer)     { return m_ppcTDecTop[layer]; }
+#if R0235_SMALLEST_LAYER_ID
+  Void      xDeriveSmallestLayerId(TComVPS* vps);
+#endif
 #if VPS_EXTN_DIRECT_REF_LAYERS
   TDecTop*  getRefLayerDec(UInt refLayerIdc);