transcode impl but broken

2 files changed, 22 insertions, 9 deletions

diff --git a/web/script/player/mediacaps.ts b/web/script/player/mediacaps.ts
index 037a84b..29cd64a 100644
--- a/web/script/player/mediacaps.ts
+++ b/web/script/player/mediacaps.ts
@@ -22,9 +22,9 @@ export async function test_media_capability(format: FormatInfo, container: Strea
     return r
 }
 async function test_media_capability_inner(format: FormatInfo, container: StreamContainer) {
-    if (format.codec.startsWith("S_") || format.codec.startsWith("V_") || format.codec.startsWith("D_")) {
+    if (format.codec.startsWith("S_") || format.codec.startsWith("D_")) {
         // TODO do we need to check this?
-        return format.codec == "V_TEXT/WEBVTT" || format.codec == "D_WEBVTT/SUBTITLES"
+        return format.codec == "S_TEXT/WEBVTT" || format.codec == "S_TEXT/UTF8" || format.codec == "D_WEBVTT/SUBTITLES"
     }
     let res;
     if (format.codec.startsWith("A_")) {
@@ -50,19 +50,20 @@ async function test_media_capability_inner(format: FormatInfo, container: Stream
             }
         })
     }
-    console.log(format, res);
     return res?.supported ?? false
 }
 
 export function track_to_content_type(format: FormatInfo, container: StreamContainer): string {
-    return `${CONTAINER_TO_MIME_TYPE[container]}; codecs="${MASTROSKA_CODEC_MAP[format.codec]}"`
+    let c = CONTAINER_TO_MIME_TYPE[container];
+    if (format.codec.startsWith("A_")) c = c.replace("video/", "audio/")
+    return `${c}; codecs="${MASTROSKA_CODEC_MAP[format.codec]}"`
 }
 
 const MASTROSKA_CODEC_MAP: { [key: string]: string } = {
     "V_VP9": "vp9",
     "V_VP8": "vp8",
     "V_AV1": "av1",
-    "V_MPEG4/ISO/AVC": "h264",
+    "V_MPEG4/ISO/AVC": "avc1.4d002a",
     "V_MPEGH/ISO/HEVC": "h265",
     "A_OPUS": "opus",
     "A_VORBIS": "vorbis",
diff --git a/web/script/player/track/mse.ts b/web/script/player/track/mse.ts
index 9fa5e42..199aa14 100644
--- a/web/script/player/track/mse.ts
+++ b/web/script/player/track/mse.ts
@@ -4,7 +4,7 @@
     Copyright (C) 2025 metamuffin <metamuffin.org>
 */
 import { OVar } from "../../jshelper/mod.ts";
-import { track_to_content_type } from "../mediacaps.ts";
+import { test_media_capability, track_to_content_type } from "../mediacaps.ts";
 import { BufferRange, Player } from "../player.ts";
 import { PlayerTrack, AppendRange, TARGET_BUFFER_DURATION, MIN_BUFFER_DURATION } from "./mod.ts";
 import { e } from "../../jshelper/src/element.ts";
@@ -49,7 +49,19 @@ export class MSEPlayerTrack extends PlayerTrack {
     }
     this.buffered.value = []
 
-    this.active_format.value = { usable_index: 0, format_index: 0, container: "webm", format: this.trackinfo.formats[0] }
+    console.log(this.trackinfo);
+
+    for (let i = 0; i < this.trackinfo.formats.length; i++) {
+      const format = this.trackinfo.formats[i];
+      for (const container of format.containers) {
+        if (container != "webm" && container != "mpeg4") continue;
+        if (await test_media_capability(format, container))
+          this.usable_formats.push({ container, format, format_index: i, usable_index: this.usable_formats.length })
+      }
+    }
+    if (!this.usable_formats.length)
+      return this.player.logger?.log("No availble format is supported by this device. The track can't be played back.")
+    this.active_format.value = this.usable_formats[0]
 
     const ct = track_to_content_type(this.active_format.value!.format, this.active_format.value!.container);
     this.source_buffer = this.player.media_source.addSourceBuffer(ct);
@@ -142,8 +154,8 @@ export class MSEPlayerTrack extends PlayerTrack {
       this.current_load = frag;
       // TODO why is appending so unreliable?! sometimes it does not add it
       this.source_buffer.changeType(track_to_content_type(this.active_format.value!.format, this.active_format.value!.container));
-      this.source_buffer.timestampOffset = 0 // TODO send if relative PTS //this.active_format.value !== undefined ? frag.start : 0
-      console.log(`append track ${this.track_index}`);
+      this.source_buffer.timestampOffset = this.active_format.value?.format.remux ? 0 : frag.start
+      console.log(`append track at ${this.source_buffer.timestampOffset} ${this.trackinfo.kind} ${this.track_index}`);
       this.source_buffer.appendBuffer(frag.buf);
     }
   }