From 9d782dc963ac211d4b9cb2e49356981c22e6c450 Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@pobox.com>
Date: Wed, 27 Oct 2021 12:58:33 -0700
Subject: [PATCH] webm opus

---
 ogv.html              |  6 +++---
 transcode-segment.php | 11 ++++++++++-
 update-vhs.sh         |  2 +-
 3 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/ogv.html b/ogv.html
index 369819f..084ffbd 100644
--- a/ogv.html
+++ b/ogv.html
@@ -75,7 +75,7 @@
             if (typeof MediaSource == 'function') {
                 let codecs = [
                     ['VP9-in-MP4', 'video/mp4; codecs="vp09.00.10.08"'],
-                    ['Opus-in-MP4', 'audio/mp4; codecs="opus"'],
+                    ['Opus-in-WebM', 'audio/webm; codecs="opus"'],
                     ['MP3', 'audio/mp3'],
                 ];
                 let yes = [];
@@ -115,7 +115,7 @@
         </script>
         <script src=ogvjs-1.8.4/ogv.js></script>
         <script src=video-js/alt/video.core.js></script>
-        <script src=videojs-http-streaming.es.js></script>
+        <script src=videojs-http-streaming.js></script>
         <script src=videojs-ogvjs.js></script>
         <script>
             var playerConfig = {
@@ -134,7 +134,7 @@
                 return (typeof MediaSource == 'function') && MediaSource.isTypeSupported(mime);
             }
             var vp9 = can('video/mp4; codecs="vp09.00.10.08"');
-            var opus = can('audio/mp4; codecs="opus"');
+            var opus = can('audio/webm; codecs="opus"');
             var aac = can('audio/mp4; codecs="mp4a.40.02');
             var mp3 = can('audio/mp3');
             //var mp3 = can('audio/mp4; codecs="mp4a.40.34"');
diff --git a/transcode-segment.php b/transcode-segment.php
index 546f5e7..ac94f48 100644
--- a/transcode-segment.php
+++ b/transcode-segment.php
@@ -32,7 +32,7 @@ class Audio {
             ],
         ],
         'opus' => [
-            'container' => 'mp4',
+            'container' => 'webm',
             'options' => [
                 '-acodec', 'libopus',
                 '-ar', 48000,
@@ -231,6 +231,13 @@ class Transcoder {
                 '-segment_list', $playlist,
                 '-y', $segment
             ];
+        } elseif ( $container == 'webm' ) {
+            $segmentOptions = [
+                '-f', 'segment',
+                '-segment_time', '10',
+                '-segment_list', $playlist,
+                '-y', $segment
+            ];
         } else {
             die( 'missing container in config' );
         }
@@ -304,6 +311,7 @@ foreach ( $infiles as $filename ) {
     $source = new SourceFile( $filename );
     $codec = new Transcoder( $source );
     $codec->audio('opus');
+    /*
     $codec->audio('mp3');
     $codec->audio('aac');
     foreach ( Video::FORMATS['vp9']['resolutions'] as $res => $format ) {
@@ -317,4 +325,5 @@ foreach ( $infiles as $filename ) {
             $codec->video('vp9', $res, 'pass2');
         }
     }
+    */
 }
diff --git a/update-vhs.sh b/update-vhs.sh
index 0785c38..a737603 100755
--- a/update-vhs.sh
+++ b/update-vhs.sh
@@ -1,2 +1,2 @@
-(cd ~/src/media/http-streaming && npm ci) && cp ~/src/media/http-streaming/dist/videojs-http-streaming.es.js .
+(cd ~/src/media/http-streaming && npm ci) && cp ~/src/media/http-streaming/dist/videojs-http-streaming.js .