From 37d9ae43f92985818d2b3daaf1eba283a53aa4c1 Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@pobox.com>
Date: Fri, 22 Oct 2021 17:49:46 -0700
Subject: [PATCH] wip

---
 ogv.html              | 13 +++++++------
 transcode-segment.php |  2 --
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/ogv.html b/ogv.html
index eef12ca..ab8a053 100644
--- a/ogv.html
+++ b/ogv.html
@@ -15,7 +15,6 @@
 
         <h2>Caminandes - Llamigos</h2>
 
-        <!--
         <p>HLS with VP9-in-MP4 video and Opus-in-MP4 and MP3 audio. Flat WebM fallback with ogv.js loader.</p>
         <video id=hls1 controls width=640 height=360>
             <source type=application/vnd.apple.mpegurl src=llamigos-vp9-mp3-opus.m3u8>
@@ -30,7 +29,6 @@
             <li>Older iOS and desktop Safari without VP9: play via ogv.js with WebM VP8/Vorbis (?)</li>
             <li>Very old Firefox/Chrome: play native WebM VP8/Vorbis</li>
         </ul>
-        -->
 
         <!--
         <p>HLS with VP9 video and Opus, AAC, and MP3 audio. Flag WebM fallback.</p>
@@ -49,6 +47,7 @@
         </ul>
         -->
 
+        <!--
         <p>HLS with VP9 video and AAC audio. Flag WebM fallback.</p>
         <video id=hls1 controls width=640 height=360>
             <source type=application/vnd.apple.mpegurl src=llamigos-vp9-aac.m3u8>
@@ -63,6 +62,7 @@
             <li>Older iOS and desktop Safari without VP9: ogv.js VP8/Vorbis</li>
             <li>Very old Firefox/Chrome: native WebM VP8/Vorbis</li>
         </ul>
+        -->
 
         <script>
             if (hls1.canPlayType('application/vnd.apple.mpegurl')) {
@@ -134,12 +134,13 @@
             }
             var vp9 = can('video/mp4; codecs="vp09.00.10.08"');
             var opus = can('audio/mp4; 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"');
+            var aac = can('audio/mp4; codecs="mp4a.40.02');
+            var mp3 = can('audio/mp3');
+            //var mp3 = can('audio/mp4; codecs="mp4a.40.34"');
             //var mse = vp9 && (opus || mp3);
             //var mse = vp9 && mp3;
-            var mse = vp9 && aac;
+            //var mse = vp9 && aac;
+            var mse = vp9 && opus;
             if (mse) {
                 // enable streaming plugin
                 playerConfig.html5.vhs = {
diff --git a/transcode-segment.php b/transcode-segment.php
index b070dc6..546f5e7 100644
--- a/transcode-segment.php
+++ b/transcode-segment.php
@@ -311,12 +311,10 @@ foreach ( $infiles as $filename ) {
             $codec->video('vp9', $res, 'fast');
         }
     }
-    /*
     foreach ( Video::FORMATS['vp9']['resolutions'] as $res => $format ) {
         if ( $format['width'] <= $source->width && $format['height'] <= $source->height ) {
             $codec->video('vp9', $res, 'pass1');
             $codec->video('vp9', $res, 'pass2');
         }
     }
-    */
 }