chore(clean up): fixes onData callback and clean up

.eslintrc.json

@@ -7,8 +7,10 @@
   "globals": {
     "ENV": true
   },
+  "parser": "@babel/eslint-parser",
   "extends": "eslint:recommended",
   "parserOptions": {
+    "ecmaVersion": 2022,
     "sourceType": "module"
   },
   "rules": {

package.json

@@ -31,6 +31,7 @@
   "author": "Samir Das",
   "devDependencies": {
     "@babel/core": "^7.10.5",
+    "@babel/eslint-parser": "^7.25.1",
     "@babel/plugin-external-helpers": "^7.10.4",
     "@babel/preset-env": "^7.10.4",
     "@rollup/plugin-babel": "^5.2.1",

src/jmuxer.js

@@ -99,7 +99,7 @@ export default class JMuxer extends Event {
         this.isMSESupported = !!window.MediaSource;
         this.mediaSource = new window.MediaSource();
         this.url = URL.createObjectURL(this.mediaSource);
-        if(window.MediaSource === window.ManagedMediaSource) {
+        if (window.MediaSource === window.ManagedMediaSource) {
             try {
                 this.node.removeAttribute('src');
                 // ManagedMediaSource will not open without disableRemotePlayback set to false or source alternatives
@@ -163,7 +163,7 @@ export default class JMuxer extends Event {
             }
         }
         if (data.audio) {
-            slices = this.remuxController.aacParser.extractAAC(data.audio);
+            slices = AACParser.extractAAC(data.audio);
             if (slices.length > 0) {
                 chunks.audio = this.getAudioFrames(slices, duration);
                 remux = true;
@@ -415,8 +415,8 @@ export default class JMuxer extends Event {
         } else if (this.stream) {
             this.stream.push(data.payload);
         }
-        if (this.onData) {
-            this.onData(data.payload);
+        if (this.options.onData) {
+            this.options.onData(data.payload);
         }
         if (this.options.flushingTime === 0) {
             this.applyAndClearBuffer();

src/parsers/aac.js

@@ -1,6 +1,8 @@
 import * as debug from '../util/debug';
 
 export class AACParser {
+    static aacHeader;
+
     static get samplingRateMap() {
         return [96000, 88200, 64000, 48000, 44100, 32000, 24000, 22050, 16000, 12000, 11025, 8000, 7350];
     }
@@ -17,7 +19,7 @@ export class AACParser {
         return data[0] === 0xff && (data[1] & 0xf0) === 0xf0 && (data[1] & 0x06) === 0x00;
     }
 
-    extractAAC(buffer) {
+    static extractAAC(buffer) {
         let i = 0,
             length = buffer.byteLength,
             result = [],
@@ -29,8 +31,8 @@ export class AACParser {
             return result;
         }
         headerLength = AACParser.getHeaderLength(buffer);
-        if (!this.aacHeader) {
-            this.aacHeader = buffer.subarray(0, headerLength);
+        if (!AACParser.aacHeader) {
+            AACParser.aacHeader = buffer.subarray(0, headerLength);
         }
 
         while (i < length) {
@@ -52,7 +54,7 @@ export class AACParser {
             sampleIndex,
             channelCount,
             config = new Uint8Array(2),
-            headerData = this.aacHeader;
+            headerData = AACParser.aacHeader;
 
         if (!headerData) return;
 

src/util/nalu.js

@@ -1,5 +1,4 @@
 export class NALU {
-
     static get NDR() { return 1; }
     static get IDR() { return 5; }
     static get SEI() { return 6; }

test/parser.js

@@ -10,27 +10,26 @@ var aac = new Uint8Array([255, 241, 80, 128, 35, 159, 252, 33, 10, 84, 140, 49,
 
 describe('Parser tests --', function() {
 
-      it('Number of extracted h264 NAL unit should be 2', function() {
-         var result = H264Parser.extractNALu(h264);
-         assert.equal(result.length, 2);
-      });
-
-      it('AAC pattern should return true', function() {
-         assert.equal(AACParser.isAACPattern(aac), true); 
-      });
-
-      it('AAC header length should be 7 since CRC not present', function() {
-         assert.equal(AACParser.getHeaderLength(aac), 7); 
-      });
-
-      it('AAC frame length should be 284', function() {
-         assert.equal(AACParser.getFrameLength(aac), 284); 
-      });
+    it('Number of extracted h264 NAL unit should be 2', function() {
+        var result = H264Parser.extractNALu(h264);
+        assert.equal(result.length, 2);
+    });
+
+    it('AAC pattern should return true', function() {
+        assert.equal(AACParser.isAACPattern(aac), true); 
+    });
+
+    it('AAC header length should be 7 since CRC not present', function() {
+        assert.equal(AACParser.getHeaderLength(aac), 7); 
+    });
+
+    it('AAC frame length should be 284', function() {
+        assert.equal(AACParser.getFrameLength(aac), 284); 
+    });
 
-      it('Number of extracted AAC frames should be 1', function() {
-         const parser = new AACParser(new BaseRemuxer());
-         var result = parser.extractAAC(aac);
-         assert.equal(result.length, 1); 
-      });
+    it('Number of extracted AAC frames should be 1', function() {
+        var result = AACParser.extractAAC(aac);
+        assert.equal(result.length, 1); 
+    });
 });