From da7652623b0ee0ef87c2a9b99d1c7a6095b14308 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89milien=20Devos?= <contact@emiliendevos.be>
Date: Fri, 8 Apr 2022 16:44:09 +0000
Subject: [PATCH] bump videojs to 7.12.1 related to #2848

---
 assets/js/player.js                  | 4 ++++
 src/invidious/routes/api/manifest.cr | 4 ++--
 videojs-dependencies.yml             | 8 +++-----
 3 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/assets/js/player.js b/assets/js/player.js
index 74cdd987..d540be90 100644
--- a/assets/js/player.js
+++ b/assets/js/player.js
@@ -49,6 +49,10 @@ videojs.Vhs.xhr.beforeRequest = function(options) {
 
 var player = videojs('player', options);
 
+player.reloadSourceOnError({
+    errorInterval: 10
+});
+
 /**
  * Function for add time argument to url
  * @param {String} url
diff --git a/src/invidious/routes/api/manifest.cr b/src/invidious/routes/api/manifest.cr
index ca429df5..23d11f65 100644
--- a/src/invidious/routes/api/manifest.cr
+++ b/src/invidious/routes/api/manifest.cr
@@ -56,7 +56,7 @@ module Invidious::Routes::API::Manifest
         xml.element("Period") do
           i = 0
 
-          {"audio/mp4", "audio/webm"}.each do |mime_type|
+          {"audio/mp4"}.each do |mime_type|
             mime_streams = audio_streams.select { |stream| stream["mimeType"].as_s.starts_with? mime_type }
             next if mime_streams.empty?
 
@@ -83,7 +83,7 @@ module Invidious::Routes::API::Manifest
 
           potential_heights = {4320, 2160, 1440, 1080, 720, 480, 360, 240, 144}
 
-          {"video/mp4", "video/webm"}.each do |mime_type|
+          {"video/mp4"}.each do |mime_type|
             mime_streams = video_streams.select { |stream| stream["mimeType"].as_s.starts_with? mime_type }
             next if mime_streams.empty?
 
diff --git a/videojs-dependencies.yml b/videojs-dependencies.yml
index 6de23d25..60b31033 100644
--- a/videojs-dependencies.yml
+++ b/videojs-dependencies.yml
@@ -1,9 +1,7 @@
-# Due to an firefox issue, we're stuck on 7.11.0. If you're hosting a private instance
-# and you're using a chromium based browser, feel free to bump this to the latest version
-# in order to get support for higher resolutions on more videos.
+# Due to a 'video append of' error see #3011, we're stuck on 7.12.1.
 video.js:
-  version: 7.11.0
-  shasum: e20747d890716085e7255a90d73c00f32324a224
+  version: 7.12.1
+  shasum: 1d12eeb1f52e3679e8e4c987d9b9eb37e2247fa2
 
 videojs-contrib-quality-levels:
   version: 2.1.0