Initial moq-transport-01 support (#73)

kixelated · Nov 3, 2023 · b5c545f · b5c545f
1 parent 5e7af61
commit b5c545f
Show file tree

Hide file tree

Showing 13 changed files with 423 additions and 144 deletions.
diff --git a/lib/contribute/broadcast.ts b/lib/contribute/broadcast.ts
@@ -134,9 +134,9 @@ export class Broadcast {
 		await subscriber.ack()
 
 		const stream = await subscriber.data({
-			sequence: 0,
-			priority: 0, // TODO Highest priority
-			expires: 0, // never expires
+			group: 0,
+			object: 0,
+			priority: 0,
 		})
 
 		const writer = stream.getWriter()
@@ -164,7 +164,8 @@ export class Broadcast {
 
 		// Create a new stream for each segment.
 		const stream = await subscriber.data({
-			sequence: 0,
+			group: 0,
+			object: 0,
 			priority: 0, // TODO
 			expires: 0, // Never expires
 		})
@@ -209,7 +210,8 @@ export class Broadcast {
 	async #serveSegment(subscriber: SubscribeRecv, segment: Segment) {
 		// Create a new stream for each segment.
 		const stream = await subscriber.data({
-			sequence: segment.id,
+			group: segment.id,
+			object: 0,
 			priority: 0, // TODO
 			expires: 30, // TODO configurable
 		})

diff --git a/lib/media/catalog/index.ts b/lib/media/catalog/index.ts
@@ -34,7 +34,11 @@ export class Catalog {
 
 			const { header, stream } = segment
 
-			if (header.sequence !== 0) {
+			if (header.group !== 0) {
+				throw new Error("TODO updates not supported")
+			}
+
+			if (header.object !== 0) {
 				throw new Error("TODO delta updates not supported")
 			}
 

diff --git a/lib/playback/mse/index.ts b/lib/playback/mse/index.ts
@@ -138,7 +138,11 @@ export default class Player {
 			track = this.#audio
 		}
 
-		const segment = new Segment(track.source, init, msg.header.sequence)
+		if (msg.header.object !== 0) {
+			throw new Error("multiple objects per group not supported")
+		}
+
+		const segment = new Segment(track.source, init, msg.header.group)
 		track.add(segment)
 
 		const container = new MP4.Parser()

diff --git a/lib/playback/webcodecs/worker.ts b/lib/playback/webcodecs/worker.ts
@@ -71,10 +71,14 @@ class Worker {
 
 		const timeline = msg.kind === "audio" ? this.#timeline.audio : this.#timeline.video
 
+		if (msg.header.object !== 0) {
+			throw new Error("multiple objects per group not supported")
+		}
+
 		// Add the segment to the timeline
 		const segments = timeline.segments.getWriter()
 		await segments.write({
-			sequence: msg.header.sequence,
+			sequence: msg.header.group,
 			frames: container.decode.readable,
 		})
 		segments.releaseLock()

diff --git a/lib/transport/client.ts b/lib/transport/client.ts
@@ -47,7 +47,7 @@ export class Client {
 		const setup = new Setup.Stream(reader, writer)
 
 		// Send the setup message.
-		await setup.send.client({ versions: [Setup.Version.KIXEL_00], role: this.config.role })
+		await setup.send.client({ versions: [Setup.Version.KIXEL_01], role: this.config.role })
 
 		// Receive the setup message.
 		// TODO verify the SETUP response.

diff --git a/lib/transport/connection.ts b/lib/transport/connection.ts
@@ -77,19 +77,10 @@ export class Connection {
 	}
 
 	async #recv(msg: Control.Message) {
-		switch (msg.kind) {
-			case Control.Msg.Announce:
-				return this.#subscriber.recvAnnounce(msg)
-			case Control.Msg.AnnounceOk:
-				return this.#publisher.recvAnnounceOk(msg)
-			case Control.Msg.AnnounceReset:
-				return this.#publisher.recvAnnounceReset(msg)
-			case Control.Msg.Subscribe:
-				return this.#publisher.recvSubscribe(msg)
-			case Control.Msg.SubscribeOk:
-				return this.#subscriber.recvSubscribeOk(msg)
-			case Control.Msg.SubscribeReset:
-				return this.#subscriber.recvSubscribeReset(msg)
+		if (Control.isPublisher(msg)) {
+			await this.#subscriber.recv(msg)
+		} else {
+			await this.#publisher.recv(msg)
 		}
 	}