https://github.com/WWBN/AVideo/issues/8137

node_modules/mux.js/lib/m2ts/metadata-stream.js

@@ -12,80 +12,7 @@
 var
   Stream = require('../utils/stream'),
   StreamTypes = require('./stream-types'),
-  // return a percent-encoded representation of the specified byte range
-  // @see http://en.wikipedia.org/wiki/Percent-encoding
-  percentEncode = function(bytes, start, end) {
-    var i, result = '';
-    for (i = start; i < end; i++) {
-      result += '%' + ('00' + bytes[i].toString(16)).slice(-2);
-    }
-    return result;
-  },
-  // return the string representation of the specified byte range,
-  // interpreted as UTf-8.
-  parseUtf8 = function(bytes, start, end) {
-    return decodeURIComponent(percentEncode(bytes, start, end));
-  },
-  // return the string representation of the specified byte range,
-  // interpreted as ISO-8859-1.
-  parseIso88591 = function(bytes, start, end) {
-    return unescape(percentEncode(bytes, start, end)); // jshint ignore:line
-  },
-  parseSyncSafeInteger = function(data) {
-    return (data[0] << 21) |
-            (data[1] << 14) |
-            (data[2] << 7) |
-            (data[3]);
-  },
-  tagParsers = {
-    TXXX: function(tag) {
-      var i;
-      if (tag.data[0] !== 3) {
-        // ignore frames with unrecognized character encodings
-        return;
-      }
-
-      for (i = 1; i < tag.data.length; i++) {
-        if (tag.data[i] === 0) {
-          // parse the text fields
-          tag.description = parseUtf8(tag.data, 1, i);
-          // do not include the null terminator in the tag value
-          tag.value = parseUtf8(tag.data, i + 1, tag.data.length).replace(/\0*$/, '');
-          break;
-        }
-      }
-      tag.data = tag.value;
-    },
-    WXXX: function(tag) {
-      var i;
-      if (tag.data[0] !== 3) {
-        // ignore frames with unrecognized character encodings
-        return;
-      }
-
-      for (i = 1; i < tag.data.length; i++) {
-        if (tag.data[i] === 0) {
-          // parse the description and URL fields
-          tag.description = parseUtf8(tag.data, 1, i);
-          tag.url = parseUtf8(tag.data, i + 1, tag.data.length);
-          break;
-        }
-      }
-    },
-    PRIV: function(tag) {
-      var i;
-
-      for (i = 0; i < tag.data.length; i++) {
-        if (tag.data[i] === 0) {
-          // parse the description and URL fields
-          tag.owner = parseIso88591(tag.data, 0, i);
-          break;
-        }
-      }
-      tag.privateData = tag.data.subarray(i + 1);
-      tag.data = tag.privateData;
-    }
-  },
+  id3 = require('../tools/parse-id3'),
   MetadataStream;
 
 MetadataStream = function(options) {
@@ -153,7 +80,7 @@ MetadataStream = function(options) {
       // last four bytes of the ID3 header.
       // The most significant bit of each byte is dropped and the
       // results concatenated to recover the actual value.
-      tagSize = parseSyncSafeInteger(chunk.data.subarray(6, 10));
+      tagSize = id3.parseSyncSafeInteger(chunk.data.subarray(6, 10));
 
       // ID3 reports the tag size excluding the header but it's more
       // convenient for our comparisons to include it
@@ -184,23 +111,25 @@ MetadataStream = function(options) {
     if (tag.data[5] & 0x40) {
       // advance the frame start past the extended header
       frameStart += 4; // header size field
-      frameStart += parseSyncSafeInteger(tag.data.subarray(10, 14));
+      frameStart += id3.parseSyncSafeInteger(tag.data.subarray(10, 14));
 
       // clip any padding off the end
-      tagSize -= parseSyncSafeInteger(tag.data.subarray(16, 20));
+      tagSize -= id3.parseSyncSafeInteger(tag.data.subarray(16, 20));
     }
 
     // parse one or more ID3 frames
     // http://id3.org/id3v2.3.0#ID3v2_frame_overview
     do {
       // determine the number of bytes in this frame
-      frameSize = parseSyncSafeInteger(tag.data.subarray(frameStart + 4, frameStart + 8));
+      frameSize = id3.parseSyncSafeInteger(tag.data.subarray(frameStart + 4, frameStart + 8));
       if (frameSize < 1) {
         this.trigger('log', {
           level: 'warn',
-          message: 'Malformed ID3 frame encountered. Skipping metadata parsing.'
+          message: 'Malformed ID3 frame encountered. Skipping remaining metadata parsing.'
         });
-        return;
+        // If the frame is malformed, don't parse any further frames but allow previous valid parsed frames
+        // to be sent along.
+        break;
       }
       frameHeader = String.fromCharCode(tag.data[frameStart],
                                         tag.data[frameStart + 1],
@@ -213,34 +142,44 @@ MetadataStream = function(options) {
         data: tag.data.subarray(frameStart + 10, frameStart + frameSize + 10)
       };
       frame.key = frame.id;
-      if (tagParsers[frame.id]) {
-        tagParsers[frame.id](frame);
 
-        // handle the special PRIV frame used to indicate the start
-        // time for raw AAC data
-        if (frame.owner === 'com.apple.streaming.transportStreamTimestamp') {
-          var
-            d = frame.data,
-            size = ((d[3] & 0x01)  << 30) |
-                   (d[4]  << 22) |
-                   (d[5] << 14) |
-                   (d[6] << 6) |
-                   (d[7] >>> 2);
-
-          size *= 4;
-          size += d[7] & 0x03;
-          frame.timeStamp = size;
-          // in raw AAC, all subsequent data will be timestamped based
-          // on the value of this frame
-          // we couldn't have known the appropriate pts and dts before
-          // parsing this ID3 tag so set those values now
-          if (tag.pts === undefined && tag.dts === undefined) {
-            tag.pts = frame.timeStamp;
-            tag.dts = frame.timeStamp;
-          }
-          this.trigger('timestamp', frame);
-        }
+      // parse frame values
+      if (id3.frameParsers[frame.id]) {
+        // use frame specific parser
+        id3.frameParsers[frame.id](frame);
+      } else if (frame.id[0] === 'T') {
+        // use text frame generic parser
+        id3.frameParsers['T*'](frame);
+      } else if (frame.id[0] === 'W') {
+        // use URL link frame generic parser
+        id3.frameParsers['W*'](frame);
       }
+
+      // handle the special PRIV frame used to indicate the start
+      // time for raw AAC data
+      if (frame.owner === 'com.apple.streaming.transportStreamTimestamp') {
+        var
+          d = frame.data,
+          size = ((d[3] & 0x01)  << 30) |
+                  (d[4]  << 22) |
+                  (d[5] << 14) |
+                  (d[6] << 6) |
+                  (d[7] >>> 2);
+
+        size *= 4;
+        size += d[7] & 0x03;
+        frame.timeStamp = size;
+        // in raw AAC, all subsequent data will be timestamped based
+        // on the value of this frame
+        // we couldn't have known the appropriate pts and dts before
+        // parsing this ID3 tag so set those values now
+        if (tag.pts === undefined && tag.dts === undefined) {
+          tag.pts = frame.timeStamp;
+          tag.dts = frame.timeStamp;
+        }
+        this.trigger('timestamp', frame);
+      }
+
       tag.frames.push(frame);
 
       frameStart += 10; // advance past the frame header

node_modules/mux.js/lib/mp4/probe.js

@@ -12,13 +12,15 @@ var toUnsigned = require('../utils/bin').toUnsigned;
 var toHexString = require('../utils/bin').toHexString;
 var findBox = require('../mp4/find-box.js');
 var parseType = require('../mp4/parse-type.js');
+var emsg = require('../mp4/emsg.js');
 var parseTfhd = require('../tools/parse-tfhd.js');
 var parseTrun = require('../tools/parse-trun.js');
 var parseTfdt = require('../tools/parse-tfdt.js');
 var getUint64 = require('../utils/numbers.js').getUint64;
 var timescale, startTime, compositionStartTime, getVideoTrackIds, getTracks,
-  getTimescaleFromMediaHeader;
+  getTimescaleFromMediaHeader, getEmsgID3;
 var window = require('global/window');
+var parseId3Frames = require('../tools/parse-id3.js').parseId3Frames;
 
 
 /**
@@ -370,6 +372,29 @@ getTracks = function(init) {
   return tracks;
 };
 
+/**
+ * Returns an array of emsg ID3 data from the provided segmentData.
+ * An offset can also be provided as the Latest Arrival Time to calculate 
+ * the Event Start Time of v0 EMSG boxes. 
+ * See: https://dashif-documents.azurewebsites.net/Events/master/event.html#Inband-event-timing
+ * 
+ * @param {Uint8Array} segmentData the segment byte array.
+ * @param {number} offset the segment start time or Latest Arrival Time, 
+ * @return {Object[]} an array of ID3 parsed from EMSG boxes
+ */
+getEmsgID3 = function(segmentData, offset = 0) {
+  var emsgBoxes = findBox(segmentData, ['emsg']);
+  return emsgBoxes.map((data) => {
+    var parsedBox = emsg.parseEmsgBox(new Uint8Array(data));
+    var parsedId3Frames = parseId3Frames(parsedBox.message_data);
+    return {
+      cueTime: emsg.scaleTime(parsedBox.presentation_time, parsedBox.timescale, parsedBox.presentation_time_delta, offset),
+      duration: emsg.scaleTime(parsedBox.event_duration, parsedBox.timescale),
+      frames: parsedId3Frames
+    };
+  });
+};
+
 module.exports = {
   // export mp4 inspector's findBox and parseType for backwards compatibility
   findBox: findBox,
@@ -379,5 +404,6 @@ module.exports = {
   compositionStartTime: compositionStartTime,
   videoTrackIds: getVideoTrackIds,
   tracks: getTracks,
-  getTimescaleFromMediaHeader: getTimescaleFromMediaHeader
+  getTimescaleFromMediaHeader: getTimescaleFromMediaHeader,
+  getEmsgID3: getEmsgID3,
 };