Changeset 1005 in SHVCSoftware for branches/SHM-dev/source/App/utils

Timestamp:

26 Jan 2015, 17:11:15 (10 years ago)

Author:

nokia

Message:

Implementation of JCTVC-R0235 - Processing of bitstreams without an available base layer

Location:

branches/SHM-dev/source/App/utils/ExtractAddLS

Files:

• . (moved) (moved from branches/SHM-dev/source/App/utils/BLRewrite)
• BLRewrite.c (deleted)
• ExtractAddLS.c (copied) (copied from branches/SHM-dev/source/App/utils/BLRewrite/BLRewrite.c) (10 diffs)
• ReadMe.txt (modified) (1 diff)

branches/SHM-dev/source/App/utils/ExtractAddLS/ExtractAddLS.c

@@ -34 +34 @@
 #include <stdlib.h>
 #include <stdio.h>
+#include <string.h>
 
 
 enum NalUnitType
 {
-  NAL_UNIT_CODED_SLICE_TRAIL_N = 0,   // 0
-  NAL_UNIT_CODED_SLICE_TRAIL_R,   // 1
-
-  NAL_UNIT_CODED_SLICE_TSA_N,     // 2
-  NAL_UNIT_CODED_SLICE_TSA_R,       // 3
-
-  NAL_UNIT_CODED_SLICE_STSA_N,    // 4
-  NAL_UNIT_CODED_SLICE_STSA_R,    // 5
-
-  NAL_UNIT_CODED_SLICE_RADL_N,    // 6
-  NAL_UNIT_CODED_SLICE_RADL_R,      // 7
-
-  NAL_UNIT_CODED_SLICE_RASL_N,    // 8
-  NAL_UNIT_CODED_SLICE_RASL_R,      // 9
+  NAL_UNIT_CODED_SLICE_TRAIL_N = 0,
+  NAL_UNIT_CODED_SLICE_TRAIL_R,
+
+  NAL_UNIT_CODED_SLICE_TSA_N,
+  NAL_UNIT_CODED_SLICE_TSA_R,
+
+  NAL_UNIT_CODED_SLICE_STSA_N,
+  NAL_UNIT_CODED_SLICE_STSA_R,
+
+  NAL_UNIT_CODED_SLICE_RADL_N,
+  NAL_UNIT_CODED_SLICE_RADL_R,
+
+  NAL_UNIT_CODED_SLICE_RASL_N,
+  NAL_UNIT_CODED_SLICE_RASL_R,
 
   NAL_UNIT_RESERVED_VCL_N10,
@@ -60 +61 @@
   NAL_UNIT_RESERVED_VCL_R15,
 
-  NAL_UNIT_CODED_SLICE_BLA_W_LP,    // 16
-  NAL_UNIT_CODED_SLICE_BLA_W_RADL,  // 17
-  NAL_UNIT_CODED_SLICE_BLA_N_LP,  // 18
-  NAL_UNIT_CODED_SLICE_IDR_W_RADL,  // 19
-  NAL_UNIT_CODED_SLICE_IDR_N_LP,  // 20
-  NAL_UNIT_CODED_SLICE_CRA,       // 21
+  NAL_UNIT_CODED_SLICE_BLA_W_LP,
+  NAL_UNIT_CODED_SLICE_BLA_W_RADL,
+  NAL_UNIT_CODED_SLICE_BLA_N_LP,
+  NAL_UNIT_CODED_SLICE_IDR_W_RADL,
+  NAL_UNIT_CODED_SLICE_IDR_N_LP,
+  NAL_UNIT_CODED_SLICE_CRA,
   NAL_UNIT_RESERVED_IRAP_VCL22,
   NAL_UNIT_RESERVED_IRAP_VCL23,
@@ -78 +79 @@
   NAL_UNIT_RESERVED_VCL31,
 
-  NAL_UNIT_VPS,                   // 32
-  NAL_UNIT_SPS,                   // 33
-  NAL_UNIT_PPS,                   // 34
-  NAL_UNIT_ACCESS_UNIT_DELIMITER, // 35
-  NAL_UNIT_EOS,                   // 36
-  NAL_UNIT_EOB,                   // 37
-  NAL_UNIT_FILLER_DATA,           // 38
-  NAL_UNIT_PREFIX_SEI,              // 39
-  NAL_UNIT_SUFFIX_SEI,              // 40
+  NAL_UNIT_VPS,
+  NAL_UNIT_SPS,
+  NAL_UNIT_PPS,
+  NAL_UNIT_ACCESS_UNIT_DELIMITER,
+  NAL_UNIT_EOS,
+  NAL_UNIT_EOB,
+  NAL_UNIT_FILLER_DATA,
+  NAL_UNIT_PREFIX_SEI,
+  NAL_UNIT_SUFFIX_SEI,
   NAL_UNIT_RESERVED_NVCL41,
   NAL_UNIT_RESERVED_NVCL42,
@@ -113 +114 @@
 };
 
+char *nalUnitNames[] =
+{
+  "NAL_UNIT_CODED_SLICE_TRAIL_N",
+  "NAL_UNIT_CODED_SLICE_TRAIL_R",
+
+  "NAL_UNIT_CODED_SLICE_TSA_N",
+  "NAL_UNIT_CODED_SLICE_TSA_R",
+
+  "NAL_UNIT_CODED_SLICE_STSA_N",
+  "NAL_UNIT_CODED_SLICE_STSA_R",
+
+  "NAL_UNIT_CODED_SLICE_RADL_N",
+  "NAL_UNIT_CODED_SLICE_RADL_R",
+
+  "NAL_UNIT_CODED_SLICE_RASL_N",
+  "NAL_UNIT_CODED_SLICE_RASL_R",
+
+  "NAL_UNIT_RESERVED_VCL_N10",
+  "NAL_UNIT_RESERVED_VCL_R11",
+  "NAL_UNIT_RESERVED_VCL_N12",
+  "NAL_UNIT_RESERVED_VCL_R13",
+  "NAL_UNIT_RESERVED_VCL_N14",
+  "NAL_UNIT_RESERVED_VCL_R15",
+
+  "NAL_UNIT_CODED_SLICE_BLA_W_LP",
+  "NAL_UNIT_CODED_SLICE_BLA_W_RADL",
+  "NAL_UNIT_CODED_SLICE_BLA_N_LP",
+  "NAL_UNIT_CODED_SLICE_IDR_W_RADL",
+  "NAL_UNIT_CODED_SLICE_IDR_N_LP",
+  "NAL_UNIT_CODED_SLICE_CRA",
+  "NAL_UNIT_RESERVED_IRAP_VCL22",
+  "NAL_UNIT_RESERVED_IRAP_VCL23",
+
+  "NAL_UNIT_RESERVED_VCL24",
+  "NAL_UNIT_RESERVED_VCL25",
+  "NAL_UNIT_RESERVED_VCL26",
+  "NAL_UNIT_RESERVED_VCL27",
+  "NAL_UNIT_RESERVED_VCL28",
+  "NAL_UNIT_RESERVED_VCL29",
+  "NAL_UNIT_RESERVED_VCL30",
+  "NAL_UNIT_RESERVED_VCL31",
+
+  "NAL_UNIT_VPS",
+  "NAL_UNIT_SPS",
+  "NAL_UNIT_PPS",
+  "NAL_UNIT_ACCESS_UNIT_DELIMITER",
+  "NAL_UNIT_EOS",
+  "NAL_UNIT_EOB",
+  "NAL_UNIT_FILLER_DATA",
+  "NAL_UNIT_PREFIX_SEI",
+  "NAL_UNIT_SUFFIX_SEI",
+  "NAL_UNIT_RESERVED_NVCL41",
+  "NAL_UNIT_RESERVED_NVCL42",
+  "NAL_UNIT_RESERVED_NVCL43",
+  "NAL_UNIT_RESERVED_NVCL44",
+  "NAL_UNIT_RESERVED_NVCL45",
+  "NAL_UNIT_RESERVED_NVCL46",
+  "NAL_UNIT_RESERVED_NVCL47",
+  "NAL_UNIT_UNSPECIFIED_48",
+  "NAL_UNIT_UNSPECIFIED_49",
+  "NAL_UNIT_UNSPECIFIED_50",
+  "NAL_UNIT_UNSPECIFIED_51",
+  "NAL_UNIT_UNSPECIFIED_52",
+  "NAL_UNIT_UNSPECIFIED_53",
+  "NAL_UNIT_UNSPECIFIED_54",
+  "NAL_UNIT_UNSPECIFIED_55",
+  "NAL_UNIT_UNSPECIFIED_56",
+  "NAL_UNIT_UNSPECIFIED_57",
+  "NAL_UNIT_UNSPECIFIED_58",
+  "NAL_UNIT_UNSPECIFIED_59",
+  "NAL_UNIT_UNSPECIFIED_60",
+  "NAL_UNIT_UNSPECIFIED_61",
+  "NAL_UNIT_UNSPECIFIED_62",
+  "NAL_UNIT_UNSPECIFIED_63"
+};
+
 typedef struct NalUnitHeader_s
 {
@@ -126 +203 @@
   int currByte;
   
-  while (1)
+  for (;;)
   {
     currByte = fgetc(inFile);
@@ -201 +278 @@
   int numStartCodeZeros;
   int nalIsSpsPpsEob;
+  int nalIsVpsSpsPpsEos;
   int removeNal;
-
-  if (argc < 4 || argc > 5)
-  {
-    fprintf(stderr, "Usage: BLRewrite <infile> <outfile> <assigned base layer ID> [<max temporal ID>]\n");
+  int layerIdListTarget[8];
+  int i;
+  int layerIdx;
+  int numLayerIds;
+  char nalName[32];
+
+  if (argc < 5 || argc > 10)
+  {
+    fprintf(stderr, "\n  Usage: ExtractAddLS <infile> <outfile> <max temporal ID> <list of layer IDs> \n\n");
+    fprintf(stderr, "  If only one layer ID is given, independent non-base layer rewriting process\n");
+    fprintf(stderr, "  is performed\n");
+    fprintf(stderr, "  If more than one layer ID is given, sub-bitstream extraction process for\n");
+    fprintf(stderr, "  additional layer sets is performed (Layer ID list should exactly match\n");
+    fprintf(stderr, "  an additional layer set defined in VPS)\n");
     exit(1);
   }
@@ -223 +311 @@
   }
 
-  assignedBaseLayerId = atoi(argv[3]);
-  if (assignedBaseLayerId < 1 || assignedBaseLayerId > 7)
-  {
-    fprintf(stderr, "Invalid assigned base layer ID (must be in range 1-7)\n");
+  tIdTarget = atoi(argv[3]);
+  if (tIdTarget < 0 || tIdTarget > 6)
+  {
+    fprintf(stderr, "Invalid maximum temporal ID (must be in range 0-6)\n");
     exit(1);
   }
 
-  if (argc == 5)
-  {
-    tIdTarget = atoi(argv[4]);
-    if (tIdTarget < 0 || tIdTarget > 6)
-    {
-      fprintf(stderr, "Invalid maximum temporal ID (must be in range 0-6)\n");
+  for (i = 4, layerIdx = 0; i < argc; i++, layerIdx++)
+  {
+    layerIdListTarget[layerIdx] = atoi(argv[i]);
+    if (layerIdListTarget[layerIdx] < 1 || layerIdListTarget[layerIdx] > 7)
+    {
+      fprintf(stderr, "Invalid layer ID (must be in range 1-7)\n");
       exit(1);
     }
   }
 
-  while (1)
+  numLayerIds = layerIdx;
+  assignedBaseLayerId = layerIdListTarget[0];
+
+  /* Iterate through all NAL units */
+  for (;;)
   {
     if (!findStartCodePrefix(inFile, &numStartCodeZeros))
@@ -251 +343 @@
     }
 
-    printf("NAL unit type: %i,  NUH layer ID: %i,  NUH Temporal ID: %i\n", nalu.nalUnitType, nalu.nuhLayerId, nalu.nuhTemporalIdPlus1 - 1);
-
-    nalIsSpsPpsEob = (nalu.nalUnitType == NAL_UNIT_SPS || nalu.nalUnitType == NAL_UNIT_PPS || nalu.nalUnitType == NAL_UNIT_EOB);
-
-    removeNal = (!nalIsSpsPpsEob && (nalu.nuhLayerId != assignedBaseLayerId))
-             || (nalIsSpsPpsEob && (nalu.nuhLayerId != 0) && (nalu.nuhLayerId != assignedBaseLayerId))
-             || (nalu.nalUnitType == NAL_UNIT_VPS)
-             || ((nalu.nuhTemporalIdPlus1 - 1) > tIdTarget);
+    if (numLayerIds == 1)
+    {
+      /* independent non-base layer rewriting process */
+
+      nalIsSpsPpsEob = (nalu.nalUnitType == NAL_UNIT_SPS || nalu.nalUnitType == NAL_UNIT_PPS || nalu.nalUnitType == NAL_UNIT_EOB);
+
+      removeNal = (!nalIsSpsPpsEob && (nalu.nuhLayerId != assignedBaseLayerId))
+                || (nalIsSpsPpsEob && (nalu.nuhLayerId != 0) && (nalu.nuhLayerId != assignedBaseLayerId))
+                || (nalu.nalUnitType == NAL_UNIT_VPS)
+                || ((nalu.nuhTemporalIdPlus1 - 1) > tIdTarget);
+
+      nalu.nuhLayerId = 0;
+    }
+    else /* numLayerIds > 1 */
+    {
+      /* sub-bitstream extraction process for additional layer sets */
+
+      int isTargetLayer = 0;
+
+      for (i = 0; i < numLayerIds; i++)
+      {
+        if (layerIdListTarget[i] == nalu.nuhLayerId)
+        {
+          isTargetLayer = 1;
+        }
+      }
+    
+      nalIsVpsSpsPpsEos = (nalu.nalUnitType == NAL_UNIT_VPS || nalu.nalUnitType == NAL_UNIT_SPS || nalu.nalUnitType == NAL_UNIT_PPS || nalu.nalUnitType == NAL_UNIT_EOS);
+
+      removeNal = (!(nalIsVpsSpsPpsEos || nalu.nalUnitType == NAL_UNIT_EOB) && !isTargetLayer)
+                || (nalIsVpsSpsPpsEos && (nalu.nuhLayerId != 0) && !isTargetLayer)
+                || ((nalu.nuhTemporalIdPlus1 - 1) > tIdTarget);
+    }
 
     if (!removeNal)
@@ -268 +385 @@
       long i;
 
-      nalu.nuhLayerId = 0;
+      printf("Keep  ");
+
       writeStartCodePrefixAndNUH(outFile, numStartCodeZeros, &nalu);
 
@@ -283 +401 @@
       fseek(inFile, naluBytesStartPos, SEEK_SET);
 
-      for (i = 0; i < numNaluBytes; i++)
+      i = 0;
+
+      if (numLayerIds > 1 && nalu.nalUnitType == NAL_UNIT_VPS)
+      {
+        /* sub-bitstream extraction process for additional layer sets */
+        int nalByte = fgetc(inFile);
+        nalByte = nalByte & ~(0x04);  /* vps_base_layer_available_flag in each VPS is set equal to 0 */
+        fputc(nalByte, outFile);
+        i++;
+      }
+
+      for (; i < numNaluBytes; i++)
       {
         fputc(fgetc(inFile), outFile);
       }
     }
+    else
+    {
+      printf("-     ");
+    }
+
+    strcpy(nalName, nalUnitNames[nalu.nalUnitType]);
+    for (i = strlen(nalName); i < 31; i++)
+    {
+      nalName[i] = ' ';
+    }
+    nalName[31] = '\0';
+
+    printf("%s  layer ID: %i  temporal ID: %i\n", nalName, nalu.nuhLayerId, nalu.nuhTemporalIdPlus1 - 1);
   }
 

branches/SHM-dev/source/App/utils/ExtractAddLS/ReadMe.txt

@@ -1 +1 @@
 
-This is a simple tool that extracts an independent non-base layer from a multi-layer bitstream, converts it to a base-layer bistream and writes it to a file. The tool is invoked as follows. 
+This a tool that either:
 
-  BLRewrite <infile> <outfile> <layer ID of the extracted layer>
+  1. Extracts an independent non-base layer from a multi-layer bitstream, converts it to a base-layer bistream and writes it to a file. The extraction processs is defined in chapter F.10.2 of the HEVC version 2 specification.
 
-The tool is based on the contribution JCTVC-Q0078 / JCTVC-R0042. Sub-bitstream extraction process done by the tool can be summarized as follows.
+or
 
-- NAL units with nal_unit_type not equal to SPS_NUT, PPS_NUT, EOS_NUT and EOB_NUT and with nuh_layer_id not equal to the assignedBaseLayerId are removed from outBitstream.
-- NAL units with nal_unit_type equal to SPS_NUT, PPS_NUT, EOS_NUT or EOB_NUT with nuh_layer_id not equal to 0 are removed from outBitstream.
-- For each NAL unit, the following applies:
-  – When nuh_layer_id is equal to assignedBaseLayerId, nuh_layer_id is set equal to 0.
+  2. Extracts an additional layer set sub-bitstream from multi-layer bitstream and writes it to a file. The extraction processs is defined in chapter F.10.3 of the HEVC version 2 specification.
 
-The resulting bitstream can be decoded with an HEVC/H.265 v1 compliant decoder as long as the extracted independent layer conform with v1 specification text. The tool removes VPS from the output bitstream so an HEVC/H.265 decoder should not expect it to be present.
+
+The tool is invoked as follows:
+
+  ExtractAddLS <infile> <outfile> <Max temporal ID> <layer IDs of the extracted layers>
+
+The process that is invoked is decided based on the number of IDs that are given in the layer ID list.  If only one layer ID is given, independent non-base layer rewriting process is invoked. If more than one layer ID is given, sub-bitstream extraction for additional layer sets is invoked.
+
+The result of independent non-base layer rewriting process can be decoded with an HEVC/H.265 v1 compliant decoder as long as the extracted independent layer conform with v1 specification text. The tool removes VPS from the output bitstream during rewriting so an HEVC/H.265 decoder should not expect it to be present.