From 0e4269addc4eddb2cdf7a1394a6ebe393980d2cd Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@pobox.com>
Date: Sun, 2 Apr 2023 20:27:16 -0700
Subject: [PATCH] wip

---
 fmp4.html         |  5 ++++-
 make-fmp4.sh      | 34 ++++++++++++++++------------------
 meta-playlist.php |  1 +
 3 files changed, 21 insertions(+), 19 deletions(-)

diff --git a/fmp4.html b/fmp4.html
index 471044d..c7f2c08 100644
--- a/fmp4.html
+++ b/fmp4.html
@@ -50,7 +50,10 @@
             </li>
         </ul>
 
-        <script src="node_modules/video.js/dist/video.js"></script>
+        <!--<script src="node_modules/video.js/dist/video.js"></script>-->
+
+        <script src="video.js/dist/alt/video.core.js"></script>
+        <script src="http-streaming/dist/videojs-http-streaming.js"></script>
 
         <script type="text/javascript">
             let playerConfig = {
diff --git a/make-fmp4.sh b/make-fmp4.sh
index b57c062..4345fd4 100755
--- a/make-fmp4.sh
+++ b/make-fmp4.sh
@@ -22,35 +22,32 @@ INFILE=caminandes-llamigos.webm
 
 set -e
 
-if [ false ]
-then
-
 # Audio for HLS
-ffmpeg -i $INFILE -vn $AUDIO_MP3 -y fmp4.audio.mpeg.mp3
-ffmpeg -i $INFILE -vn $AUDIO_MP3 $AUDFLAGS -y fmp4.audio.mpeg.mp4
-ffmpeg -i $INFILE -vn $AUDIO_MP3 $AUDFLAGS -y fmp4.audio.mpeg.mov
-ffmpeg -i $INFILE -vn $AUDIO_AAC $AUDFLAGS  -y fmp4.audio.aac.mp4
-ffmpeg -i $INFILE -vn $AUDIO_OPUS $AUDFLAGS -y fmp4.audio.opus.mp4
+#ffmpeg -i $INFILE -vn $AUDIO_MP3 -y fmp4.audio.mpeg.mp3
+#ffmpeg -i $INFILE -vn $AUDIO_MP3 $AUDFLAGS -y fmp4.audio.mpeg.mp4
+#ffmpeg -i $INFILE -vn $AUDIO_MP3 $AUDFLAGS -y fmp4.audio.mpeg.mov
+#ffmpeg -i $INFILE -vn $AUDIO_AAC $AUDFLAGS  -y fmp4.audio.aac.mp4
+#ffmpeg -i $INFILE -vn $AUDIO_OPUS $AUDFLAGS -y fmp4.audio.opus.mp4
+ffmpeg -i $INFILE -vn $AUDIO_OPUS $AUDFLAGS -y fmp4.audio.alac.mp4
 
 # Video for HLS
 
-ffmpeg -i $INFILE -an $VIDEO_VP9 $MOVFLAGS -pass 1 -y fmp4.480p.vp9.mp4
-ffmpeg -i $INFILE -an $VIDEO_VP9 $MOVFLAGS -pass 2 -y fmp4.480p.vp9.mp4
+#ffmpeg -i $INFILE -an $VIDEO_VP9 $MOVFLAGS -pass 1 -y fmp4.480p.vp9.mp4
+#ffmpeg -i $INFILE -an $VIDEO_VP9 $MOVFLAGS -pass 2 -y fmp4.480p.vp9.mp4
 
-ffmpeg -i $INFILE -an $VIDEO_H264 $MOVFLAGS -pass 1 -y fmp4.480p.h264.mp4
-ffmpeg -i $INFILE -an $VIDEO_H264 $MOVFLAGS -pass 2 -y fmp4.480p.h264.mp4
+#ffmpeg -i $INFILE -an $VIDEO_H264 $MOVFLAGS -pass 1 -y fmp4.480p.h264.mp4
+#ffmpeg -i $INFILE -an $VIDEO_H264 $MOVFLAGS -pass 2 -y fmp4.480p.h264.mp4
 
-ffmpeg -i $INFILE -an $VIDEO_MPEG4 $MOVFLAGS -pass 1 -y fmp4.480p.mpeg4.mp4
-ffmpeg -i $INFILE -an $VIDEO_MPEG4 $MOVFLAGS -pass 2 -y fmp4.480p.mpeg4.mp4
+#ffmpeg -i $INFILE -an $VIDEO_MPEG4 $MOVFLAGS -pass 1 -y fmp4.480p.mpeg4.mp4
+#ffmpeg -i $INFILE -an $VIDEO_MPEG4 $MOVFLAGS -pass 2 -y fmp4.480p.mpeg4.mp4
 
-ffmpeg -i $INFILE -an $VIDEO_H263 $MOVFLAGS -y fmp4.288p.h263.3gp
+#ffmpeg -i $INFILE -an $VIDEO_H263 $MOVFLAGS -y fmp4.288p.h263.3gp
 
 # Note use duration, not keyframe interval, for fragments,
 # because all are keyframes!
-ffmpeg -i $INFILE -an $VIDEO_MJPEG $AUDFLAGS -y fmp4.120p.mjpeg.mp4
-ffmpeg -i $INFILE -an $VIDEO_MJPEG $AUDFLAGS -y fmp4.120p.mjpeg.mov
+#ffmpeg -i $INFILE -an $VIDEO_MJPEG $AUDFLAGS -y fmp4.120p.mjpeg.mp4
+#ffmpeg -i $INFILE -an $VIDEO_MJPEG $AUDFLAGS -y fmp4.120p.mjpeg.mov
 
-fi
 
 # Playlist processing
 php extract-playlist.php fmp4.audio.mpeg.mp3 > fmp4.audio.mpeg.mp3.m3u8
@@ -95,3 +92,4 @@ php meta-playlist.php --lie fmp4 audio.opus.mp4 $MPEG_TRACK 480p.vp9.mp4 120p.mj
 php meta-playlist.php --lie fmp4 audio.opus.mp4 $MPEG_TRACK 480p.vp9.mp4 120p.mjpeg.mov > fmp4.vp9-mjpeg.mov.lie.m3u8
 
 php meta-playlist.php fmp4 audio.opus.mp4 audio.mpeg.mov 480p.vp9.mp4 120p.mjpeg.mov > fmp4.vp9-mjpeg.mov-mp3.mov.m3u8
+php meta-playlist.php fmp4 audio.opus.mp4 audio.mpeg.mp4 480p.vp9.mp4 120p.mjpeg.mov > fmp4.vp9-mjpeg.mov-mp3.mp4.m3u8
diff --git a/meta-playlist.php b/meta-playlist.php
index 168dd25..db3ed43 100644
--- a/meta-playlist.php
+++ b/meta-playlist.php
@@ -20,6 +20,7 @@ $audioCodecs = [
     //'mpeg' => 'mp3', // doesn't seem to work
     'aac' => 'mp4a.40.2',
     'opus' => 'opus',
+    'alac' => 'alac',
 ];
 
 // @fixme use correct settings based on the file