Changeset 1006 in SHVCSoftware for branches/SHM-upgrade/source/App

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/App

Files:

• TAppDecoder/TAppDecCfg.cpp (modified) (2 diffs)
• TAppDecoder/TAppDecTop.cpp (modified) (1 diff)
• TAppEncoder/TAppEncCfg.cpp (modified) (4 diffs)
• TAppEncoder/TAppEncCfg.h (modified) (1 diff)
• utils/BLRewrite (deleted)
• utils/ExtractAddLS (added)
• utils/ExtractAddLS/ExtractAddLS.c (added)
• utils/ExtractAddLS/ReadMe.txt (added)

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);