Merge main into release for tag v1.39.2

dev/convert.html

@@ -189,7 +189,7 @@
 			},
 			trim: {
 				//start: 0,
-				//end: 10
+				end: 10
 			},
 		});
 		console.log(conversion);

dev/demux.html

@@ -21,7 +21,11 @@
 		const sink = new Mediabunny.EncodedPacketSink(videoTrack);
 
 		for await (const packet of sink.packets()) {
-			console.log(packet.timestamp);
+			console.log(packet.type, packet.timestamp);
+
+			if (packet.timestamp >= 5) {
+				break;
+			}
 		}
 
 		/*

package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "mediabunny",
-  "version": "1.39.1",
+  "version": "1.39.2",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "mediabunny",
-      "version": "1.39.1",
+      "version": "1.39.2",
       "license": "MPL-2.0",
       "workspaces": [
         "packages/*"
@@ -7751,9 +7751,9 @@
       }
     },
     "node_modules/mediabunny": {
-      "version": "1.39.0",
+      "version": "1.39.1",
-      "resolved": "https://registry.npmjs.org/mediabunny/-/mediabunny-1.39.0.tgz",
+      "resolved": "https://registry.npmjs.org/mediabunny/-/mediabunny-1.39.1.tgz",
-      "integrity": "sha512-NDeht2Sf7kYfrUu7b/9AhVK4KdQhy6UeTF/EPNXW+PdpIYvSv36ZQ/SRBoFAJN2LRl6XrGb8JYY4MCnhsGQ2yg==",
+      "integrity": "sha512-gaQKDWtfLhgSN9tRj37lgznHf9MOvey7sbT6GdQA7mWl1kaE5R+P1lfl9CDsgtzongx12IG9X/y2vgZmTHzGDg==",
       "license": "MPL-2.0",
       "peer": true,
       "workspaces": [
@@ -12077,7 +12077,7 @@
     },
     "packages/aac-encoder": {
       "name": "@mediabunny/aac-encoder",
-      "version": "1.39.1",
+      "version": "1.39.2",
       "license": "MPL-2.0",
       "devDependencies": {
         "@types/emscripten": "^1.40.1"
@@ -12092,7 +12092,7 @@
     },
     "packages/ac3": {
       "name": "@mediabunny/ac3",
-      "version": "1.39.1",
+      "version": "1.39.2",
       "license": "MPL-2.0",
       "devDependencies": {
         "@types/emscripten": "^1.40.1"
@@ -12107,7 +12107,7 @@
     },
     "packages/flac-encoder": {
       "name": "@mediabunny/flac-encoder",
-      "version": "1.39.1",
+      "version": "1.39.2",
       "license": "MPL-2.0",
       "devDependencies": {
         "@types/emscripten": "^1.40.1"
@@ -12122,7 +12122,7 @@
     },
     "packages/mp3-encoder": {
       "name": "@mediabunny/mp3-encoder",
-      "version": "1.39.1",
+      "version": "1.39.2",
       "license": "MPL-2.0",
       "devDependencies": {
         "@types/emscripten": "^1.40.1"

package.json

@@ -1,7 +1,7 @@
 {
   "name": "mediabunny",
   "author": "Vanilagy",
-  "version": "1.39.1",
+  "version": "1.39.2",
   "description": "Pure TypeScript media toolkit for reading, writing, and converting media files, directly in the browser.",
   "type": "module",
   "workspaces": [

packages/aac-encoder/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@mediabunny/aac-encoder",
   "author": "Vanilagy",
-  "version": "1.39.1",
+  "version": "1.39.2",
   "description": "AAC encoder extension for Mediabunny, based on FFmpeg.",
   "main": "./dist/bundles/mediabunny-aac-encoder.mjs",
   "module": "./dist/bundles/mediabunny-aac-encoder.mjs",

packages/ac3/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@mediabunny/ac3",
   "author": "Vanilagy",
-  "version": "1.39.1",
+  "version": "1.39.2",
   "description": "AC-3 and E-AC-3 (Dolby Digital) decoder and encoder extension for Mediabunny, based on FFmpeg.",
   "main": "./dist/bundles/mediabunny-ac3.mjs",
   "module": "./dist/bundles/mediabunny-ac3.mjs",

packages/flac-encoder/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@mediabunny/flac-encoder",
   "author": "Vanilagy",
-  "version": "1.39.1",
+  "version": "1.39.2",
   "description": "FLAC encoder extension for Mediabunny, based on libFLAC.",
   "main": "./dist/bundles/mediabunny-flac-encoder.mjs",
   "module": "./dist/bundles/mediabunny-flac-encoder.mjs",

packages/mp3-encoder/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@mediabunny/mp3-encoder",
   "author": "Vanilagy",
-  "version": "1.39.1",
+  "version": "1.39.2",
   "description": "MP3 encoder extension for Mediabunny, based on LAME.",
   "main": "./dist/bundles/mediabunny-mp3-encoder.mjs",
   "module": "./dist/bundles/mediabunny-mp3-encoder.mjs",

src/input-format.ts

@@ -530,7 +530,7 @@ export class MpegTsInputFormat extends InputFormat {
 		} else if (bytes[0] === 0x47 && bytes[TS_PACKET_SIZE + 16] === 0x47) {
 			// MPEG-TS with Forward Error Correction
 			return true;
-		} else if (bytes[4] === 0x47 && bytes[4 + TS_PACKET_SIZE] === 0x47) {
+		} else if (bytes[4] === 0x47 && bytes[4 + TS_PACKET_SIZE + 4] === 0x47) {
 			// MPEG-2-TS (DVHS)
 			return true;
 		}

src/mpeg-ts/mpeg-ts-demuxer.ts

@@ -161,10 +161,10 @@ export class MpegTsDemuxer extends Demuxer {
 				// MPEG-TS with Forward Error Correction
 				this.packetOffset = 0;
 				this.packetStride = TS_PACKET_SIZE + 16;
-			} else if (startingBytes[4] === 0x47 && startingBytes[4 + TS_PACKET_SIZE] === 0x47) {
+			} else if (startingBytes[4] === 0x47 && startingBytes[4 + TS_PACKET_SIZE + 4] === 0x47) {
 				// MPEG-2-TS (DVHS)
 				this.packetOffset = 4;
-				this.packetStride = TS_PACKET_SIZE;
+				this.packetStride = TS_PACKET_SIZE + 4;
 			} else {
 				throw new Error('Unreachable.');
 			}

src/muxer.ts

@@ -46,12 +46,16 @@ export abstract class Muxer {
 
 	private trackTimestampInfo = new WeakMap<OutputTrack, {
 		maxTimestamp: number;
-		maxTimestampBeforeLastKeyPacket: number;
+		maxTimestampBeforeLastKeyPacket: number | null;
 	}>();
 
 	protected validateAndNormalizeTimestamp(track: OutputTrack, timestampInSeconds: number, isKeyPacket: boolean) {
 		timestampInSeconds += track.source._timestampOffset;
 
+		if (timestampInSeconds < 0) {
+			throw new Error(`Timestamps must be non-negative (got ${timestampInSeconds}s).`);
+		}
+
 		let timestampInfo = this.trackTimestampInfo.get(track);
 		if (!timestampInfo) {
 			if (!isKeyPacket) {
@@ -60,29 +64,28 @@ export abstract class Muxer {
 
 			timestampInfo = {
 				maxTimestamp: timestampInSeconds,
-				maxTimestampBeforeLastKeyPacket: timestampInSeconds,
+				maxTimestampBeforeLastKeyPacket: null,
 			};
 			this.trackTimestampInfo.set(track, timestampInfo);
-		}
+		} else {
+			if (isKeyPacket) {
+				timestampInfo.maxTimestampBeforeLastKeyPacket = timestampInfo.maxTimestamp;
+			}
 
-		if (timestampInSeconds < 0) {
+			if (
-			throw new Error(`Timestamps must be non-negative (got ${timestampInSeconds}s).`);
+				timestampInfo.maxTimestampBeforeLastKeyPacket !== null
-		}
+				&& timestampInSeconds < timestampInfo.maxTimestampBeforeLastKeyPacket
+			) {
+				throw new Error(
+					`Timestamps cannot be smaller than the largest timestamp of the previous GOP (a GOP begins with a`
+					+ ` key packet and ends right before the next key packet). Got ${timestampInSeconds}s, but largest`
+					+ ` timestamp is ${timestampInfo.maxTimestampBeforeLastKeyPacket}s.`,
+				);
+			}
 
-		if (isKeyPacket) {
+			timestampInfo.maxTimestamp = Math.max(timestampInfo.maxTimestamp, timestampInSeconds);
-			timestampInfo.maxTimestampBeforeLastKeyPacket = timestampInfo.maxTimestamp;
 		}
 
-		if (timestampInSeconds < timestampInfo.maxTimestampBeforeLastKeyPacket) {
-			throw new Error(
-				`Timestamps cannot be smaller than the largest timestamp of the previous GOP (a GOP begins with a key`
-				+ ` packet and ends right before the next key packet). Got ${timestampInSeconds}s, but largest`
-				+ ` timestamp is ${timestampInfo.maxTimestampBeforeLastKeyPacket}s.`,
-			);
-		}
-
-		timestampInfo.maxTimestamp = Math.max(timestampInfo.maxTimestamp, timestampInSeconds);
-
 		return timestampInSeconds;
 	}
 }