jmuxer 2.0.2 → 2.0.5

package/src/parsers/h264.js

@@ -98,8 +98,30 @@ export class H264Parser {
             picWidthInMbsMinus1,
             picHeightInMapUnitsMinus1,
             frameMbsOnlyFlag,
-            scalingListCount;
-        decoder.readUByte();
+            scalingListCount,
+            fps = 0;
+        decoder.readUByte(); // skip NAL header
+
+        // rewrite NAL
+        let rbsp = [],
+            hdr_bytes = 1,
+            nal_bytes = data.byteLength;
+        for (let i = hdr_bytes; i < nal_bytes; i ++) {
+            if ((i + 2) < nal_bytes && decoder.readBits(24, false) === 0x000003) {
+                rbsp.push(decoder.readBits(8));
+                rbsp.push(decoder.readBits(8));
+                i += 2;
+
+                // emulation_prevention_three_byte
+                decoder.readBits(8);
+            }
+            else {
+                rbsp.push(decoder.readBits(8));
+            }
+        }
+        decoder.setData(new Uint8Array(rbsp));
+        // end of rewrite data
+
         profileIdc = decoder.readUByte(); // profile_idc
         profileCompat = decoder.readBits(5); // constraint_set[0-4]_flag, u(5)
         decoder.skipBits(3); // reserved_zero_3bits u(3),
@@ -191,7 +213,7 @@ export class H264Parser {
                         break;
                     }
                 }
-                if (sarRatio) {
+                if (sarRatio && sarRatio[0] > 0 && sarRatio[1] > 0) {
                     sarScale = sarRatio[0] / sarRatio[1];
                 }
             }
@@ -212,9 +234,14 @@ export class H264Parser {
                 let timeScale = decoder.readUInt();
                 let fixedFrameRate = decoder.readBoolean();
                 let frameDuration = timeScale / (2 * unitsInTick);
+
+                if (fixedFrameRate) {
+                    fps = frameDuration;
+                }
             }
         }
         return {
+            fps: fps > 0 ? fps : undefined,
             width: Math.ceil((((picWidthInMbsMinus1 + 1) * 16) - frameCropLeftOffset * 2 - frameCropRightOffset * 2) * sarScale),
             height: ((2 - frameMbsOnlyFlag) * (picHeightInMapUnitsMinus1 + 1) * 16) - ((frameMbsOnlyFlag ? 2 : 4) * (frameCropTopOffset + frameCropBottomOffset)),
         };
@@ -234,6 +261,7 @@ export class H264Parser {
     parseSPS(sps) {
         var config = H264Parser.readSPS(new Uint8Array(sps));
 
+        this.track.fps = config.fps;
         this.track.width = config.width;
         this.track.height = config.height;
         this.track.sps = [new Uint8Array(sps)];

package/src/remuxer/aac.js

@@ -102,4 +102,8 @@ export class AACRemuxer extends BaseRemuxer {
 
         return new Uint8Array(payload.buffer, 0, this.mp4track.len);
     }
+
+    getAacParser() {
+        return this.aac;
+    }
 }

package/src/remuxer/h264.js

@@ -16,6 +16,7 @@ export class H264Remuxer extends BaseRemuxer {
             fragmented: true,
             sps: '',
             pps: '',
+            fps: 30,
             width: 0,
             height: 0,
             timescale: timescale,
@@ -51,6 +52,7 @@ export class H264Remuxer extends BaseRemuxer {
                     size: size,
                     keyFrame: frame.keyFrame,
                     duration: frame.duration,
+                    compositionTimeOffset: frame.compositionTimeOffset
                 });
             }
         }
@@ -81,7 +83,7 @@ export class H264Remuxer extends BaseRemuxer {
             mp4Sample = {
                 size: sample.size,
                 duration: duration,
-                cts: 0,
+                cts: sample.compositionTimeOffset || 0,
                 flags: {
                     isLeading: 0,
                     isDependedOn: 0,
@@ -100,7 +102,7 @@ export class H264Remuxer extends BaseRemuxer {
         }
 
         if (!samples.length) return null;
-        
+
         return new Uint8Array(payload.buffer, 0, this.mp4track.len);
     }
 }

package/src/util/exp-golomb.js

@@ -10,6 +10,12 @@ export class ExpGolomb {
         this.bitLength = data.byteLength * 8;
     }
 
+    setData(data) {
+        this.data = data;
+        this.index = 0;
+        this.bitLength = data.byteLength * 8;
+    }
+
     get bitsAvailable() {
         return this.bitLength - this.index;
     }

package/test/parser.js

@@ -1,5 +1,6 @@
 //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';
 
@@ -25,9 +26,10 @@ describe('Parser tests --', function() {
       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);
+         const parser = new AACParser(new BaseRemuxer());
+         var result = parser.extractAAC(aac);
          assert.equal(result.length, 1); 
       });
 });