diff --git a/fmp4-vp8.html b/fmp4-vp8.html new file mode 100644 index 0000000..381c4a8 --- /dev/null +++ b/fmp4-vp8.html @@ -0,0 +1,77 @@ + + + + + HLS VP9/fMP4 test + + + +

HLS VP9/fMP4 test

+ +

Caminandes - Llamigos

+ + + +

Native HLS

+ +

HLS with VP9 in mp4, JPEG in mp4, and Opus and AAC in mp4

+
+ +
+ +

Overridden HLS

+ +

HLS with VP8 in mp4, JPEG in mp4, and Opus and AAC in mp4

+
+ +
+ + + + + + + + diff --git a/make-fmp4.sh b/make-fmp4.sh index ac46805..239f696 100755 --- a/make-fmp4.sh +++ b/make-fmp4.sh @@ -19,6 +19,8 @@ AUDIO_OPUS="-acodec libopus -ac 2 -ar 48000 -ab 96k" AUDIO_VORBIS="-acodec libvorbis -ac 2 -ar 48000 -ab 128k" AUDIO_AAC="-ac 2 -ar 48000 -ab 128k" AUDIO_MP3="-acodec libmp3lame -ac 2 -ar 48000 -ab 128k" +AUDIO_ALAC="-acodec alac -ac 2 -ar 48000" +AUDIO_FLAC="-af aformat=sample_fmts=s16 -acodec flac -ac 2 -ar 48000 -strict -2" INFILE=caminandes-llamigos.webm @@ -32,6 +34,9 @@ ffmpeg -i $INFILE -vn $AUDIO_MP3 -y fmp4.audio.mpeg.mp3 #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_ALAC $AUDFLAGS -y fmp4.audio.alac.mp4 +ffmpeg -i $INFILE -vn $AUDIO_FLAC $AUDFLAGS -y fmp4.audio.flac.mp4 +#ffmpeg -i $INFILE -vn $AUDIO_ULAW $AUDFLAGS -y fmp4.audio.ulaw.mp4 # Video for HLS @@ -64,6 +69,10 @@ php extract-playlist.php fmp4.audio.mpeg.mp4 > fmp4.audio.mpeg.mp4.m3u8 php extract-playlist.php fmp4.audio.mpeg.mov > fmp4.audio.mpeg.mov.m3u8 php extract-playlist.php fmp4.audio.aac.mp4 > fmp4.audio.aac.mp4.m3u8 php extract-playlist.php fmp4.audio.opus.mp4 > fmp4.audio.opus.mp4.m3u8 +php extract-playlist.php fmp4.audio.alac.mp4 > fmp4.audio.alac.mp4.m3u8 +php extract-playlist.php fmp4.audio.flac.mp4 > fmp4.audio.flac.mp4.m3u8 +php extract-playlist.php fmp4.audio.ulaw.mp4 > fmp4.audio.ulaw.mp4.m3u8 + php extract-playlist.php fmp4.480p.vp9.mp4 > fmp4.480p.vp9.mp4.m3u8 php extract-playlist.php fmp4.480p.h264.mp4 > fmp4.480p.h264.mp4.m3u8 php extract-playlist.php fmp4.480p.mpeg4.mp4 > fmp4.480p.mpeg4.mp4.m3u8 @@ -102,3 +111,8 @@ php meta-playlist.php --lie fmp4 audio.opus.mp4 $MPEG_TRACK 480p.vp9.mp4 120p.mj 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 + +php meta-playlist.php fmp4 audio.opus.mp4 audio.alac.mp4 480p.vp9.mp4 120p.mjpeg.mov > fmp4.vp9-mjpeg.mov-alac.m3u8 +php meta-playlist.php fmp4 audio.opus.mp4 audio.flac.mp4 480p.vp9.mp4 120p.mjpeg.mov > fmp4.vp9-mjpeg.mov-flac.m3u8 + +php meta-playlist.php fmp4 audio.opus.mp4 audio.mpeg.mp3 audio.flac.mp4 480p.vp9.mp4 120p.mjpeg.mov > fmp4.vp9-mjpeg.mov-opus-mp3-flac.m3u8 diff --git a/meta-playlist.php b/meta-playlist.php index 25f00c0..5a7b43d 100644 --- a/meta-playlist.php +++ b/meta-playlist.php @@ -21,6 +21,9 @@ $audioCodecs = [ 'aac' => 'mp4a.40.2', 'opus' => 'opus', 'alac' => 'alac', + 'flac' => 'flac', + 'ulaw' => 'ulaw', + 'alaw' => 'alaw', ]; // @fixme use correct settings based on the file