brooke/hls-test
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

wip

Browse source
This commit is contained in:
Brooke Vibber 2021-10-22 17:49:46 -07:00
parent f7a7059e39
commit 37d9ae43f9
2 changed files with 7 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
ogv.html
View file

@ -15,7 +15,6 @@
<h2>Caminandes - Llamigos</h2> <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> <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> <video id=hls1 controls width=640 height=360>
<source type=application/vnd.apple.mpegurl src=llamigos-vp9-mp3-opus.m3u8> <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>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> <li>Very old Firefox/Chrome: play native WebM VP8/Vorbis</li>
</ul> </ul>
-->
<!-- <!--
<p>HLS with VP9 video and Opus, AAC, and MP3 audio. Flag WebM fallback.</p> <p>HLS with VP9 video and Opus, AAC, and MP3 audio. Flag WebM fallback.</p>
@ -49,6 +47,7 @@
</ul> </ul>
--> -->
<!--
<p>HLS with VP9 video and AAC audio. Flag WebM fallback.</p> <p>HLS with VP9 video and AAC audio. Flag WebM fallback.</p>
<video id=hls1 controls width=640 height=360> <video id=hls1 controls width=640 height=360>
<source type=application/vnd.apple.mpegurl src=llamigos-vp9-aac.m3u8> <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>Older iOS and desktop Safari without VP9: ogv.js VP8/Vorbis</li>
<li>Very old Firefox/Chrome: native WebM VP8/Vorbis</li> <li>Very old Firefox/Chrome: native WebM VP8/Vorbis</li>
</ul> </ul>
-->
<script> <script>
if (hls1.canPlayType('application/vnd.apple.mpegurl')) { if (hls1.canPlayType('application/vnd.apple.mpegurl')) {
@ -134,12 +134,13 @@
} }
var vp9 = can('video/mp4; codecs="vp09.00.10.08"'); var vp9 = can('video/mp4; codecs="vp09.00.10.08"');
var opus = can('audio/mp4; codecs="opus"'); var opus = can('audio/mp4; codecs="opus"');
var aac = can('audio/mp4; codecs="mp4a.40.02') var aac = can('audio/mp4; codecs="mp4a.40.02');
//var mp3 = can('audio/mp3'); var mp3 = can('audio/mp3');
var mp3 = can('audio/mp4; codecs="mp4a.40.34"'); //var mp3 = can('audio/mp4; codecs="mp4a.40.34"');
//var mse = vp9 && (opus || mp3); //var mse = vp9 && (opus || mp3);
//var mse = vp9 && mp3; //var mse = vp9 && mp3;
var mse = vp9 && aac; //var mse = vp9 && aac;
var mse = vp9 && opus;
if (mse) { if (mse) {
// enable streaming plugin // enable streaming plugin
playerConfig.html5.vhs = { playerConfig.html5.vhs = {

2
transcode-segment.php
View file

@ -311,12 +311,10 @@ foreach ( $infiles as $filename ) {
$codec->video('vp9', $res, 'fast'); $codec->video('vp9', $res, 'fast');
} }
} }
/*
foreach ( Video::FORMATS['vp9']['resolutions'] as $res => $format ) { foreach ( Video::FORMATS['vp9']['resolutions'] as $res => $format ) {
if ( $format['width'] <= $source->width && $format['height'] <= $source->height ) { if ( $format['width'] <= $source->width && $format['height'] <= $source->height ) {
$codec->video('vp9', $res, 'pass1'); $codec->video('vp9', $res, 'pass1');
$codec->video('vp9', $res, 'pass2'); $codec->video('vp9', $res, 'pass2');
} }
} }
*/
} }