@invintusmedia/tomp4 1.0.7 → 1.0.9

package/dist/tomp4.js

@@ -1,5 +1,5 @@
 /**
- * toMp4.js v1.0.7
+ * toMp4.js v1.0.9
  * Convert MPEG-TS and fMP4 to standard MP4
  * https://github.com/TVWIT/toMp4.js
  * MIT License
@@ -114,17 +114,21 @@
     // Clip audio to the REQUESTED time range (not from keyframe)
     // Audio doesn't need keyframe pre-roll
     const audioStartPts = startPts;
-    const audioEndPts = Math.min(endPts, lastFramePts);
+    const audioEndPts = Math.min(endPts, lastFramePts + 90000); // Include audio slightly past last video
     const clippedAudio = audioAUs.filter(au => au.pts >= audioStartPts && au.pts < audioEndPts);
     
-    // Normalize all timestamps so keyframe starts at 0
+    // Normalize video timestamps so keyframe starts at 0
     const offset = keyframePts;
     for (const au of clippedVideo) {
       au.pts -= offset;
       au.dts -= offset;
     }
+    
+    // Normalize audio timestamps so it starts at 0 (matching video playback start after preroll)
+    // Audio doesn't have preroll, so it should start at PTS 0 to sync with video after edit list
+    const audioOffset = audioStartPts;  // Use requested start, not keyframe
     for (const au of clippedAudio) {
-      au.pts -= offset;
+      au.pts -= audioOffset;
     }
     
     return {
@@ -752,7 +756,7 @@
   toMp4.isMpegTs = isMpegTs;
   toMp4.isFmp4 = isFmp4;
   toMp4.isStandardMp4 = isStandardMp4;
-  toMp4.version = '1.0.7';
+  toMp4.version = '1.0.9';
 
   return toMp4;
 });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@invintusmedia/tomp4",
-  "version": "1.0.7",
+  "version": "1.0.9",
   "description": "Convert MPEG-TS, fMP4, and HLS streams to MP4 with clipping support - pure JavaScript, zero dependencies",
   "main": "src/index.js",
   "module": "src/index.js",
@@ -20,8 +20,11 @@
   "scripts": {
     "build": "node build.js",
     "dev": "npx serve . -p 3000",
-    "test": "node tests/clip.test.js",
-    "release": "npm run build && git add -A && git commit -m \"v$(node -p \"require('./package.json').version\")\" && git tag v$(node -p \"require('./package.json').version\") && git push && git push --tags",
+    "test": "npm run test:clip && npm run test:mp4",
+    "test:clip": "node tests/clip.test.js",
+    "test:mp4": "node tests/mp4-parser.test.js",
+    "test:all": "npm run test",
+    "release": "npm test && npm run build && git add -A && git commit -m \"v$(node -p \"require('./package.json').version\")\" && git tag v$(node -p \"require('./package.json').version\") && git push && git push --tags",
     "release:patch": "npm version patch --no-git-tag-version && npm run release",
     "release:minor": "npm version minor --no-git-tag-version && npm run release",
     "release:major": "npm version major --no-git-tag-version && npm run release",

package/src/index.js

@@ -37,6 +37,8 @@ import { transcode, isWebCodecsSupported } from './transcode.js';
 import { TSMuxer } from './muxers/mpegts.js';
 import { MP4Muxer } from './muxers/mp4.js';
 import { TSParser } from './parsers/mpegts.js';
+import { MP4Parser } from './parsers/mp4.js';
+import { RemoteMp4 } from './remote/index.js';
 
 /**
  * Result object returned by toMp4()
@@ -315,8 +317,15 @@ toMp4.analyze = analyzeTsData;
 toMp4.transcode = transcode;
 toMp4.isWebCodecsSupported = isWebCodecsSupported;
 
+// Parsers
+toMp4.MP4Parser = MP4Parser;
+toMp4.TSParser = TSParser;
+
+// Remote MP4 (on-demand HLS from remote MP4)
+toMp4.RemoteMp4 = RemoteMp4;
+
 // Version (injected at build time for dist, read from package.json for ESM)
-toMp4.version = '1.0.7';
+toMp4.version = '1.0.9';
 
 // Export
 export { 
@@ -336,9 +345,14 @@ export {
   HlsVariant,
   // Transcoding (browser-only)
   transcode,
+  isWebCodecsSupported,
+  // Muxers
   TSMuxer,
   MP4Muxer,
+  // Parsers
   TSParser,
-  isWebCodecsSupported
+  MP4Parser,
+  // Remote MP4 (on-demand HLS)
+  RemoteMp4
 };
 export default toMp4;

package/src/muxers/mp4.js

@@ -513,15 +513,19 @@ export class MP4Muxer {
     if (this.parser.audioPts.length === 0) return null;
     
     const firstAudioPts = this.parser.audioPts[0];
+    
+    // When clipping with preroll, audio is normalized to start at PTS 0
+    // (matching video playback start after edit list), so no edit list needed
     if (firstAudioPts === 0) return null;
     
+    // For non-clipped content, handle any timestamp offset
     const mediaTime = Math.round(firstAudioPts * this.audioTimescale / 90000);
-    const duration = this.audioSampleSizes.length * this.audioSampleDuration;
+    const audioDuration = this.audioSampleSizes.length * this.audioSampleDuration;
     
     const elstData = new Uint8Array(16);
     const view = new DataView(elstData.buffer);
     view.setUint32(0, 1);
-    view.setUint32(4, Math.round(duration * this.videoTimescale / this.audioTimescale));
+    view.setUint32(4, Math.round(audioDuration * this.videoTimescale / this.audioTimescale));
     view.setInt32(8, mediaTime);
     view.setUint16(12, 1);
     view.setUint16(14, 0);
@@ -534,8 +538,8 @@ export class MP4Muxer {
     const data = new Uint8Array(80);
     const view = new DataView(data.buffer);
     view.setUint32(8, 257);
-    const audioDuration = this.audioSampleSizes.length * this.audioSampleDuration;
-    view.setUint32(16, Math.round(audioDuration * this.videoTimescale / this.audioTimescale));
+    // Use playback duration to match video track (for proper sync with preroll)
+    view.setUint32(16, this.calculatePlaybackDuration());
     view.setUint16(32, 0x0100);
     view.setUint32(36, 0x00010000); view.setUint32(52, 0x00010000); view.setUint32(68, 0x40000000);
     return createFullBox('tkhd', 0, 3, data);

package/src/muxers/mpegts.js

@@ -85,8 +85,9 @@ export class TSMuxer {
    * @param {Uint8Array} avccData - AVCC-formatted NAL units
    * @param {boolean} isKey - Is this a keyframe
    * @param {number} pts90k - Presentation timestamp in 90kHz ticks
+   * @param {number} [dts90k] - Decode timestamp in 90kHz ticks (defaults to pts90k)
    */
-  addVideoSample(avccData, isKey, pts90k) {
+  addVideoSample(avccData, isKey, pts90k, dts90k = pts90k) {
     const nalUnits = [];
     
     // Add AUD (Access Unit Delimiter) at start of each access unit
@@ -102,20 +103,28 @@ export class TSMuxer {
     
     // Parse AVCC NALs and convert to Annex B
     let offset = 0;
-    while (offset < avccData.length - 4) {
+    let iterations = 0;
+    const maxIterations = 10000;
+    
+    while (offset + 4 <= avccData.length && iterations < maxIterations) {
+      iterations++;
       const len = (avccData[offset] << 24) | (avccData[offset + 1] << 16) | 
                   (avccData[offset + 2] << 8) | avccData[offset + 3];
       offset += 4;
-      if (len > 0 && offset + len <= avccData.length) {
-        nalUnits.push(new Uint8Array([0, 0, 0, 1]));
-        nalUnits.push(avccData.slice(offset, offset + len));
+      
+      // Safety: bail on invalid NAL length
+      if (len <= 0 || len > avccData.length - offset) {
+        break;
       }
+      
+      nalUnits.push(new Uint8Array([0, 0, 0, 1]));
+      nalUnits.push(avccData.slice(offset, offset + len));
       offset += len;
     }
     
-    // Build PES packet
+    // Build PES packet with both PTS and DTS
     const annexB = concat(nalUnits);
-    const pes = this._buildVideoPES(annexB, pts90k);
+    const pes = this._buildVideoPES(annexB, pts90k, dts90k);
     
     // Write PAT/PMT before keyframes
     if (isKey) {
@@ -130,8 +139,8 @@ export class TSMuxer {
       this._packetizePES(audioPes, 0x102, false, audio.pts, 'audio');
     }
     
-    // Packetize video PES into 188-byte TS packets
-    this._packetizePES(pes, 0x101, isKey, pts90k, 'video');
+    // Packetize video PES into 188-byte TS packets (use DTS for PCR)
+    this._packetizePES(pes, 0x101, isKey, dts90k, 'video');
   }
   
   /**
@@ -160,16 +169,32 @@ export class TSMuxer {
   
   // --- Private methods ---
   
-  _buildVideoPES(payload, pts90k) {
-    const pes = new Uint8Array(14 + payload.length);
+  _buildVideoPES(payload, pts90k, dts90k) {
+    // If PTS == DTS, only write PTS (saves 5 bytes per frame)
+    const hasDts = pts90k !== dts90k;
+    const headerLen = hasDts ? 10 : 5;
+    const pes = new Uint8Array(9 + headerLen + payload.length);
+    
     pes[0] = 0; pes[1] = 0; pes[2] = 1; // Start code
     pes[3] = 0xE0; // Stream ID (video)
     pes[4] = 0; pes[5] = 0; // Length = 0 (unbounded)
-    pes[6] = 0x80; // Flags
-    pes[7] = 0x80; // PTS present
-    pes[8] = 5; // Header length
-    this._writePTS(pes, 9, pts90k, 0x21);
-    pes.set(payload, 14);
+    pes[6] = 0x80; // Flags: data_alignment
+    
+    if (hasDts) {
+      // PTS + DTS present
+      pes[7] = 0xC0; // PTS_DTS_flags = 11
+      pes[8] = 10;   // Header length: 5 (PTS) + 5 (DTS)
+      this._writePTS(pes, 9, pts90k, 0x31);  // PTS marker = 0011
+      this._writePTS(pes, 14, dts90k, 0x11); // DTS marker = 0001
+      pes.set(payload, 19);
+    } else {
+      // PTS only
+      pes[7] = 0x80; // PTS_DTS_flags = 10
+      pes[8] = 5;    // Header length: 5 (PTS)
+      this._writePTS(pes, 9, pts90k, 0x21);  // PTS marker = 0010
+      pes.set(payload, 14);
+    }
+    
     return pes;
   }
   
@@ -220,14 +245,17 @@ export class TSMuxer {
         
         pkt[3] = 0x30 | (this.cc[cc] & 0x0F);
         pkt[4] = afLen;
-        pkt[5] = 0x50; // PCR + random_access
+        pkt[5] = 0x50; // PCR flag + random_access_indicator
+        
+        // PCR = 33-bit base (90kHz) + 6 reserved bits + 9-bit extension (27MHz)
+        // We only use the base, extension = 0
         const pcrBase = BigInt(pts90k);
         pkt[6] = Number((pcrBase >> 25n) & 0xFFn);
         pkt[7] = Number((pcrBase >> 17n) & 0xFFn);
         pkt[8] = Number((pcrBase >> 9n) & 0xFFn);
         pkt[9] = Number((pcrBase >> 1n) & 0xFFn);
-        pkt[10] = (Number(pcrBase & 1n) << 7) | 0x7E;
-        pkt[11] = 0;
+        pkt[10] = (Number(pcrBase & 1n) << 7) | 0x7E; // LSB of base + 6 reserved (111111) 
+        pkt[11] = 0; // 9-bit extension = 0
         
         pkt.set(pes.slice(offset, offset + payloadLen), 12);
         offset += payloadLen;