jmuxer 2.0.7 → 2.1.1

package/src/util/mp4-generator.js

@@ -14,6 +14,8 @@ export class MP4 {
             esds: [],
             ftyp: [],
             hdlr: [],
+            hev1: [],
+            hvcC: [],
             mdat: [],
             mdhd: [],
             mdia: [],
@@ -179,9 +181,9 @@ export class MP4 {
             (timescale >> 16) & 0xFF,
             (timescale >> 8) & 0xFF,
             timescale & 0xFF, // timescale
-            (duration >> 24),
-            (duration >> 16) & 0xFF,
-            (duration >> 8) & 0xFF,
+            (duration >>> 24) & 0xFF,
+            (duration >>> 16) & 0xFF,
+            (duration >>> 8) & 0xFF,
             duration & 0xFF, // duration
             0x55, 0xc4, // 'und' language (undetermined)
             0x00, 0x00,
@@ -251,9 +253,9 @@ export class MP4 {
                 (timescale >> 16) & 0xFF,
                 (timescale >> 8) & 0xFF,
                 timescale & 0xFF, // timescale
-                (duration >> 24) & 0xFF,
-                (duration >> 16) & 0xFF,
-                (duration >> 8) & 0xFF,
+                (duration >>> 24) & 0xFF,
+                (duration >>> 16) & 0xFF,
+                (duration >>> 8) & 0xFF,
                 duration & 0xFF, // duration
                 0x00, 0x01, 0x00, 0x00, // 1.0 rate
                 0x01, 0x00, // 1.0 volume
@@ -375,6 +377,116 @@ export class MP4 {
             0x00, 0x2d, 0xc6, 0xc0])) // avgBitrate
         );
     }
+    
+    static hev1(track) {
+        let vps = [],
+            sps = [],
+            pps = [],
+            data,
+            len;
+
+        // assemble the VPSs
+        for (let i = 0; i < (track.vps?.length || 0); i++) {
+            data = track.vps[i];
+            len = data.byteLength;
+            vps.push((len >>> 8) & 0xFF, len & 0xFF);
+            vps = vps.concat(Array.prototype.slice.call(data));
+        }
+
+        // assemble the SPSs
+        for (let i = 0; i < (track.sps?.length || 0); i++) {
+            data = track.sps[i];
+            len = data.byteLength;
+            sps.push((len >>> 8) & 0xFF, len & 0xFF);
+            sps = sps.concat(Array.prototype.slice.call(data));
+        }
+
+        // assemble the PPSs
+        for (let i = 0; i < (track.pps?.length || 0); i++) {
+            data = track.pps[i];
+            len = data.byteLength;
+            pps.push((len >>> 8) & 0xFF, len & 0xFF);
+            pps = pps.concat(Array.prototype.slice.call(data));
+        }
+
+        let {
+            profile_space,
+            tier_flag,
+            profile_idc,
+            profile_compatibility_flags,
+            constraint_indicator_flags,
+            level_idc,
+            chroma_format_idc
+        } = track.hvcC;
+
+        const hvcc = MP4.box(MP4.types.hvcC, new Uint8Array([
+            0x01, // configurationVersion
+            (profile_space << 6) | (tier_flag << 5) | profile_idc,
+            (profile_compatibility_flags >> 24) & 0xFF,
+            (profile_compatibility_flags >> 16) & 0xFF,
+            (profile_compatibility_flags >> 8) & 0xFF,
+            profile_compatibility_flags & 0xFF,
+            ...constraint_indicator_flags,
+            level_idc,
+            0xF0, 0x00, // min_spatial_segmentation_idc = 0
+            0xFC | 0,   // parallelismType = 0
+            0xFC | chroma_format_idc, // chromaFormat (from SPS)
+            0xF8 | 0,   // bitDepthLumaMinus8 = 0 (8-bit)
+            0xF8 | 0,   // bitDepthChromaMinus8 = 0
+            0x00, 0x00, // avgFrameRate = 0
+            0x03,       // constantFrameRate = 0, numTemporalLayers = 0, lengthSizeMinusOne = 3 (AKA 4)
+            0x03,       // numOfArrays
+
+            0x20,       // array_completeness + NAL_unit_type (32 = VPS)
+            0x00, 0x01, // numNalus
+            ...vps,
+
+            0x21,       // NAL_unit_type (33 = SPS)
+            0x00, 0x01,
+            ...sps,
+
+            0x22,       // NAL_unit_type (34 = PPS)
+            0x00, 0x01,
+            ...pps
+        ]));
+
+        const width = track.width;
+        const height = track.height;
+
+        return MP4.box(MP4.types.hev1, new Uint8Array([
+            0x00, 0x00, 0x00, // reserved
+            0x00, 0x00, 0x00, // reserved
+            0x00, 0x01,       // data_reference_index
+            0x00, 0x00,       // pre_defined
+            0x00, 0x00,       // reserved
+            0x00, 0x00, 0x00, 0x00,
+            0x00, 0x00, 0x00, 0x00,
+            0x00, 0x00, 0x00, 0x00, // pre_defined
+            (width >> 8) & 0xFF, width & 0xff,
+            (height >> 8) & 0xFF, height & 0xff,
+            0x00, 0x48, 0x00, 0x00, // horizresolution
+            0x00, 0x48, 0x00, 0x00, // vertresolution
+            0x00, 0x00, 0x00, 0x00, // reserved
+            0x00, 0x01,             // frame_count
+            0x12,
+            0x62, 0x69, 0x6E, 0x65, // 'binelpro.ru'
+            0x6C, 0x70, 0x72, 0x6F,
+            0x2E, 0x72, 0x75, 0x00,
+            0x00, 0x00, 0x00, 0x00,
+            0x00, 0x00, 0x00, 0x00,
+            0x00, 0x00, 0x00, 0x00,
+            0x00, 0x00, 0x00, 0x00,
+            0x00, 0x00, 0x00,       // compressorname padding
+            0x00, 0x18,             // depth = 24
+            0x11, 0x11              // pre_defined = -1
+        ]),
+        hvcc,
+        MP4.box(MP4.types.btrt, new Uint8Array([
+            0x00, 0x1c, 0x9c, 0x80, // bufferSizeDB
+            0x00, 0x2d, 0xc6, 0xc0, // maxBitrate
+            0x00, 0x2d, 0xc6, 0xc0  // avgBitrate
+        ])));
+    }
 
     static esds(track) {
         var configlen = track.config.byteLength;
@@ -445,6 +557,9 @@ export class MP4 {
         if (track.type === 'audio') {
             return MP4.box(MP4.types.stsd, MP4.STSD, MP4.mp4a(track));
         } else {
+            if (track.codec.startsWith('hvc1')) {
+                return MP4.box(MP4.types.stsd, MP4.STSD, MP4.hev1(track));
+            }
             return MP4.box(MP4.types.stsd, MP4.STSD, MP4.avc1(track));
         }
     }
@@ -465,9 +580,9 @@ export class MP4 {
             (id >> 8) & 0xFF,
             id & 0xFF, // track_ID
             0x00, 0x00, 0x00, 0x00, // reserved
-            (duration >> 24),
-            (duration >> 16) & 0xFF,
-            (duration >> 8) & 0xFF,
+            (duration >>> 24) & 0xFF,
+            (duration >>> 16) & 0xFF,
+            (duration >>> 8) & 0xFF,
             duration & 0xFF, // duration
             0x00, 0x00, 0x00, 0x00,
             0x00, 0x00, 0x00, 0x00, // reserved

package/src/util/utils.js

@@ -22,3 +22,23 @@ export function secToTime(sec) {
     result += (minutes < 10 ? '0' + minutes : minutes) + ':' + (seconds < 10 ? '0' + seconds : seconds);
     return result;
 }
+
+export function reverseBits(n) {
+    var result = 0;
+    for (var i = 0; i < 32; i++)
+    {
+        // Shift result left to make room
+        result <<= 1;
+        // Add the least significant bit of n
+        result |= (n & 1);
+        // Shift n right to process the next bit
+        n >>>= 1;
+    }
+    // Ensure result is treated as unsigned 32-bit
+    return result >>> 0;
+}
+
+export function removeTrailingDotZero(input) {
+    // Use regex to strip all trailing ".0" sequences
+    return input.replace(/(?:\.0)+$/, '');
+}

package/.idea/codeStyles/Project.xml

@@ -1,13 +0,0 @@
-<component name="ProjectCodeStyleConfiguration">
-  <code_scheme name="Project" version="173">
-    <JSCodeStyleSettings version="0">
-      <option name="FORCE_SEMICOLON_STYLE" value="true" />
-      <option name="USE_DOUBLE_QUOTES" value="false" />
-      <option name="FORCE_QUOTE_STYlE" value="true" />
-    </JSCodeStyleSettings>
-    <codeStyleSettings language="JavaScript">
-      <option name="ALIGN_MULTILINE_PARAMETERS" value="false" />
-      <option name="ALIGN_MULTILINE_FOR" value="false" />
-    </codeStyleSettings>
-  </code_scheme>
-</component>

package/.idea/codeStyles/codeStyleConfig.xml

@@ -1,5 +0,0 @@
-<component name="ProjectCodeStyleConfiguration">
-  <state>
-    <option name="USE_PER_PROJECT_SETTINGS" value="true" />
-  </state>
-</component>

package/.idea/inspectionProfiles/Project_Default.xml

@@ -1,6 +0,0 @@
-<component name="InspectionProjectProfileManager">
-  <profile version="1.0">
-    <option name="myName" value="Project Default" />
-    <inspection_tool class="Eslint" enabled="true" level="WARNING" enabled_by_default="true" />
-  </profile>
-</component>

package/.idea/jmuxer.iml

@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" inherit-compiler-output="true">
-    <exclude-output />
-    <content url="file://$MODULE_DIR$" />
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-  </component>
-</module>

package/.idea/misc.xml

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ProjectRootManager">
-    <output url="file://$PROJECT_DIR$/out" />
-  </component>
-</project>

package/.idea/modules.xml

@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ProjectModuleManager">
-    <modules>
-      <module fileurl="file://$PROJECT_DIR$/.idea/jmuxer.iml" filepath="$PROJECT_DIR$/.idea/jmuxer.iml" />
-    </modules>
-  </component>
-</project>

package/.idea/vcs.xml

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="VcsDirectoryMappings">
-    <mapping directory="" vcs="Git" />
-  </component>
-</project>

package/karma.conf.js

@@ -1,77 +0,0 @@
-// Karma configuration
-// Generated on Fri Nov 03 2017 16:10:03 GMT+0600 (+06)
-
-module.exports = function(config) {
-  config.set({
-
-    // base path that will be used to resolve all patterns (eg. files, exclude)
-    basePath: '',
-
-
-    // frameworks to use
-    // available frameworks: https://npmjs.org/browse/keyword/karma-adapter
-    frameworks: ['mocha', 'chai'],
-
-    // list of files / patterns to load in the browser
-    files: [
-       'test/*.js'
-    ],
-
-    // list of files to exclude
-    exclude: [
-    ],
-
-    // preprocess matching files before serving them to the browser
-    // available preprocessors: https://npmjs.org/browse/keyword/karma-preprocessor
-    preprocessors: {
-        'test/*.js': ['rollup']
-    },
-
-    rollupPreprocessor: {
-        plugins: [
-            require('@rollup/plugin-babel')
-        ],
-        output: {
-            format: 'iife', // Helps prevent naming collisions.
-            name: 'JMuxer', // Required for 'iife' format.
-            sourcemap: 'inline', // Sensible for testing.
-        }
-    },
-
-    // test results reporter to use
-    // possible values: 'dots', 'progress'
-    // available reporters: https://npmjs.org/browse/keyword/karma-reporter
-    reporters: ['progress'],
-
-
-    // web server port
-    port: 9876,
-
-
-    // enable / disable colors in the output (reporters and logs)
-    colors: true,
-
-
-    // level of logging
-    // possible values: config.LOG_DISABLE || config.LOG_ERROR || config.LOG_WARN || config.LOG_INFO || config.LOG_DEBUG
-    logLevel: config.LOG_INFO,
-
-
-    // enable / disable watching file and executing tests whenever any file changes
-    autoWatch: false,
-
-
-    // start these browsers
-    // available browser launchers: https://npmjs.org/browse/keyword/karma-launcher
-    browsers: ['Chrome'],
-
-
-    // Continuous Integration mode
-    // if true, Karma captures browsers, runs the tests and exits
-    singleRun: true,
-
-    // Concurrency level
-    // how many browser should be started simultaneous
-    concurrency: Infinity
-  })
-}

package/src/util/nalu.js

@@ -1,72 +0,0 @@
-export class NALU {
-    static get NDR() { return 1; }
-    static get IDR() { return 5; }
-    static get SEI() { return 6; }
-    static get SPS() { return 7; }
-    static get PPS() { return 8; }
-    static get AUD() { return 9; }
-
-    static get TYPES() {
-        return {
-            [NALU.IDR]: 'IDR',
-            [NALU.SEI]: 'SEI',
-            [NALU.SPS]: 'SPS',
-            [NALU.PPS]: 'PPS',
-            [NALU.NDR]: 'NDR',
-            [NALU.AUD]: 'AUD',
-        };
-    }
-
-    static type(nalu) {
-        if (nalu.ntype in NALU.TYPES) {
-            return NALU.TYPES[nalu.ntype];
-        } else {
-            return 'UNKNOWN';
-        }
-    }
-
-    constructor(data) {
-        this.payload = data;
-        this.nri = (this.payload[0] & 0x60) >> 5; // nal_ref_idc
-        this.ntype = this.payload[0] & 0x1f;
-        this.isvcl = this.ntype == 1 || this.ntype == 5;
-        this.stype = ''; // slice_type
-        this.isfmb = false; // first_mb_in_slice
-    }
-
-    toString() {
-        return `${NALU.type(this)}: NRI: ${this.getNri()}`;
-    }
-
-    getNri() {
-        return this.nri;
-    }
-
-    type() {
-        return this.ntype;
-    }
-
-    isKeyframe() {
-        return this.ntype === NALU.IDR;
-    }
-    
-    getPayload() {
-        return this.payload;
-    }
-
-    getPayloadSize() {
-        return this.payload.byteLength;
-    }
-
-    getSize() {
-        return 4 + this.getPayloadSize();
-    }
-
-    getData() {
-        const result = new Uint8Array(this.getSize());
-        const view = new DataView(result.buffer);
-        view.setUint32(0, this.getSize() - 4);
-        result.set(this.getPayload(), 4);
-        return result;
-    }
-}

package/test/event.js

@@ -1,30 +0,0 @@
-//import { assert } from 'chai';
-import Event from '../src/util/event.js';
-
-var event = new Event('XYZ');
-
-var callback = function() {
-};
-
-describe('event tests --', function() {
-      
-      beforeEach(function(){
-         event.offAll();
-         event.on('topic1',callback);
-         event.on('topic1',callback);
-         event.on('topic2',callback);
-      });
-
-      it('listener count should be 2 for the topic1', function() {
-         assert.equal(event.listener.topic1.length, 2);
-      });
-
-      it('event dispatcher should be return true for a successful dispatcher', function() {
-         assert.equal(event.dispatch('topic1', true), true); 
-      });
-
-      it('listener count should be zero after removing all listeners', function() {
-         event.offAll();
-         assert.deepEqual(event.listener, {});
-      });
-});

package/test/parser.js

@@ -1,35 +0,0 @@
-//import { assert } from 'chai';
-
-import { BaseRemuxer } from '../src/remuxer/base.js';
-import { H264Parser } from '../src/parsers/h264.js';
-import { AACParser } from '../src/parsers/aac.js';
-
-var h264 = new Uint8Array([0, 0, 0, 1, 103, 66, 192, 30, 218, 2, 128, 191, 229, 192, 90, 128, 128, 131, 32, 0, 0, 3, 0, 32, 0, 0, 7, 129, 226, 197, 212, 0, 0, 0, 1, 113, 76, 122, 37, 218, 2, 128, 191, 229, 192, 90, 128, 128, 131, 32, 0, 0, 3, 0, 32, 0, 0, 70, 129, 126, 195, 202]);
-var aac = new Uint8Array([255, 241, 80, 128, 35, 159, 252, 33, 10, 84, 140, 49, 34, 72, 2, 57, 103, 72, 21, 128, 32, 144, 42, 44, 7, 107, 116, 93, 199, 51, 237, 104, 181, 31, 37, 29, 169, 190, 111, 167, 139, 124, 85, 72, 37, 148, 183, 228, 87, 188, 200, 76, 226, 83, 160, 18, 11, 69, 80, 4, 118, 229, 129, 250, 22, 242, 222, 49, 146, 29, 19, 237, 71, 235, 29, 127, 235, 134, 186, 14, 8, 67, 103, 141, 13, 32, 238, 184, 3, 232, 183, 8, 109, 150, 199, 97, 203, 164, 240, 233, 12, 216, 246, 220, 78, 25, 250, 33, 10, 84, 140, 49, 34, 72, 2, 57, 103, 72, 21, 128, 32, 144, 42, 44, 7, 107, 116, 93, 199, 51, 237, 104, 181, 31, 37, 29, 169, 190, 111, 167, 139, 124, 85, 72, 37, 148, 183, 228, 87, 188, 200, 76, 226, 83, 160, 18, 11, 69, 80, 4, 118, 229, 129, 250, 22, 242, 222, 49, 146, 29, 19, 237, 71, 235, 29, 127, 235, 134, 186, 14, 8, 67, 103, 141, 13, 32, 238, 184, 3, 232, 183, 8, 109, 150, 199, 97, 203, 164, 240, 233, 12, 216, 246, 220, 78, 25, 250, 33, 10, 84, 140, 49, 34, 72, 2, 57, 103, 72, 21, 128, 32, 144, 42, 44, 7, 107, 116, 93, 199, 51, 237, 104, 181, 31, 37, 29, 169, 190, 111, 167, 139, 124, 85, 72, 37, 148, 183, 228, 87, 188, 200, 76, 226, 83, 160, 18, 11, 69, 80, 4, 118, 229, 129, 250, 22, 242, 222, 49, 146, 29, 19, 237, 71, 235, 29, 127, 235, 134,33,44,66,34,23]);
-
-
-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 AAC frames should be 1', function() {
-        var result = AACParser.extractAAC(aac);
-        assert.equal(result.length, 1); 
-    });
-});
-

package/test/utils.js

@@ -1,19 +0,0 @@
-//import { assert } from 'chai';
-import { appendByteArray } from '../src/util/utils.js';
-
-var arr1 = new Uint8Array([1,2,3,4,5]);
-var arr2 = new Uint8Array([6,7,8]);
-
-describe('Utils tests --', function() {
-      
-      it('Appended array length must be 8', function() {
-         var result = appendByteArray(arr1, arr2);
-         assert.equal(result.byteLength, 8);
-      });
-
-      it('8th element value must be 8', function() {
-         var result = appendByteArray(arr1, arr2);
-         assert.equal(result[7], 8); 
-      });
-});
-