Merge e44465ed4822eb997dde63863629e47f5be61488 into 5f84a5b353132cec17bd14b0796dc11a3d0eb36d

assets/css/player.css

@@ -108,7 +108,7 @@ ul.vjs-menu-content::-webkit-scrollbar {
 }
 
 .vjs-quality-selector,
-.video-js .vjs-http-source-selector {
+.video-js .vjs-quality-menu-wrapper {
   order: 4;
 }
 
@@ -138,10 +138,6 @@ ul.vjs-menu-content::-webkit-scrollbar {
   display: none;
 }
 
-.video-js .vjs-icon-cog {
-  font-size: 18px;
-}
-
 .video-js .vjs-control-bar,
 .vjs-menu-button-popup .vjs-menu .vjs-menu-content {
   background-color: rgba(35, 35, 35, 0.75);
@@ -220,7 +216,7 @@ ul.vjs-menu-content::-webkit-scrollbar {
 }
 
 .player-dimensions.vjs-fluid {
-  padding-top: 82vh;
+  padding-top: 82vh !important;
 }
 
 video.video-js {

assets/css/quality-selector.css

@@ -1 +1 @@
-.vjs-quality-selector .vjs-menu-button{margin:0;padding:0;height:100%;width:100%}.vjs-quality-selector .vjs-icon-placeholder{font-family:'VideoJS';font-weight:normal;font-style:normal}.vjs-quality-selector .vjs-icon-placeholder:before{content:'\f110'}.vjs-quality-changing .vjs-big-play-button{display:none}.vjs-quality-changing .vjs-control-bar{display:-webkit-box;display:-webkit-flex;display:-ms-flexbox;display:flex;visibility:visible;opacity:1}
+.vjs-quality-selector .vjs-menu-button{margin:0;padding:0;height:100%;width:100%}.vjs-quality-selector .vjs-icon-placeholder{font-family:"VideoJS";font-weight:normal;font-style:normal}.video-js:not(.vjs-v8) .vjs-quality-selector .vjs-icon-placeholder::before{content:""}.vjs-v8 .vjs-quality-selector .vjs-icon-placeholder::before{content:""}.vjs-quality-changing .vjs-big-play-button{display:none}.vjs-quality-changing .vjs-control-bar{display:flex;visibility:visible;opacity:1}

assets/js/player.js

@@ -9,6 +9,7 @@ var options = {
     windowOpacity: ['0', '0.5', '1'],
     textOpacity: ['0.5', '1'],
     persistTextTrackSettings: true,
+    enableSourceset: false,
     controlBar: {
         children: [
             'playToggle',
@@ -22,6 +23,7 @@ var options = {
             'captionsButton',
             'audioTrackButton',
             'qualitySelector',
+            'QualityMenuButton',
             'playbackRateMenuButton',
             'fullscreenToggle'
         ]
@@ -45,7 +47,7 @@ embed_url = location.origin + '/embed/' + video_data.id + embed_url.search;
 
 var save_player_pos_key = 'save_player_pos';
 
-videojs.Vhs.xhr.beforeRequest = function(options) {
+videojs.Vhs.xhr.onRequest = function(options) {
     // set local if requested not videoplayback
     if (!options.uri.includes('videoplayback')) {
         if (!options.uri.includes('local=true'))
@@ -237,8 +239,9 @@ if (isMobile()) {
         operations_bar_element.append(share_element);
 
         if (!video_data.params.listen && video_data.params.quality === 'dash') {
-            var http_source_selector = document.getElementsByClassName('vjs-http-source-selector vjs-menu-button')[0];
+            var http_source_selector = document.getElementsByClassName('vjs-quality-menu-button vjs-menu-button')[0];
             operations_bar_element.append(http_source_selector);
+
         }
     });
 }
@@ -402,7 +405,6 @@ if (video_data.params.autoplay) {
 }
 
 if (!video_data.params.listen && video_data.params.quality === 'dash') {
-    player.httpSourceSelector();
 
     if (video_data.params.quality_dash !== 'auto') {
         player.ready(function () {
@@ -425,8 +427,8 @@ if (!video_data.params.listen && video_data.params.quality === 'dash') {
                                 break;
                         }
                 }
-                qualityLevels.forEach(function (level, index) {
+                player.qualityMenu({
-                    level.enabled = (index === targetQualityLevel);
+                    defaultResolution: qualityLevels[targetQualityLevel].height
                 });
             });
         });
@@ -779,7 +781,7 @@ addEventListener('keydown', function (e) {
 }());
 
 // Since videojs-share can sometimes be blocked, we defer it until last
-if (player.share) player.share(shareOptions);
+if (player.shareMenu) player.shareMenu();
 
 // show the preferred caption by default
 if (player_data.preferred_caption_found) {

src/invidious/routes/api/manifest.cr

@@ -86,7 +86,7 @@ module Invidious::Routes::API::Manifest
 
                 xml.element("Role", schemeIdUri: "urn:mpeg:dash:role:2011", value: is_default ? "main" : "alternate")
 
-                xml.element("Representation", id: fmt["itag"], codecs: codecs, bandwidth: bandwidth) do
+                xml.element("Representation", id: fmt["itag"].as_i + rand(100), codecs: codecs, bandwidth: bandwidth) do
                   xml.element("AudioChannelConfiguration", schemeIdUri: "urn:mpeg:dash:23003:3:audio_channel_configuration:2011",
                     value: "2")
                   xml.element("BaseURL") { xml.text url }

src/invidious/views/components/player_sources.ecr

@@ -1,7 +1,5 @@
 <link rel="stylesheet" href="/videojs/video.js/video-js.css?v=<%= ASSET_COMMIT %>">
-<link rel="stylesheet" href="/videojs/videojs-http-source-selector/videojs-http-source-selector.css?v=<%= ASSET_COMMIT %>">
 <link rel="stylesheet" href="/videojs/videojs-markers/videojs.markers.css?v=<%= ASSET_COMMIT %>">
-<link rel="stylesheet" href="/videojs/videojs-share/videojs-share.css?v=<%= ASSET_COMMIT %>">
 <link rel="stylesheet" href="/videojs/videojs-vtt-thumbnails/videojs-vtt-thumbnails.css?v=<%= ASSET_COMMIT %>">
 <link rel="stylesheet" href="/videojs/videojs-mobile-ui/videojs-mobile-ui.css?v=<%= ASSET_COMMIT %>">
 <link rel="stylesheet" href="/css/player.css?v=<%= ASSET_COMMIT %>">
@@ -9,9 +7,8 @@
 <script src="/videojs/video.js/video.js?v=<%= ASSET_COMMIT %>"></script>
 <script src="/videojs/videojs-mobile-ui/videojs-mobile-ui.js?v=<%= ASSET_COMMIT %>"></script>
 <script src="/videojs/videojs-contrib-quality-levels/videojs-contrib-quality-levels.js?v=<%= ASSET_COMMIT %>"></script>
-<script src="/videojs/videojs-http-source-selector/videojs-http-source-selector.js?v=<%= ASSET_COMMIT %>"></script>
+<script src="/videojs/videojs-contrib-quality-menu/videojs-contrib-quality-menu.js?v=<%= ASSET_COMMIT %>"></script>
 <script src="/videojs/videojs-markers/videojs-markers.js?v=<%= ASSET_COMMIT %>"></script>
-<script src="/videojs/videojs-share/videojs-share.js?v=<%= ASSET_COMMIT %>"></script>
 <script src="/videojs/videojs-vtt-thumbnails/videojs-vtt-thumbnails.js?v=<%= ASSET_COMMIT %>"></script>
 
 

src/invidious/views/licenses.ecr

@@ -107,20 +107,6 @@
             </td>
         </tr>
 
-        <tr>
-            <td>
-                <a href="/videojs/videojs-share/videojs-share.js?v=<%= ASSET_COMMIT %>">videojs-share.js</a>
-            </td>
-
-            <td>
-                <a href="http://www.jclark.com/xml/copying.txt">Expat</a>
-            </td>
-
-            <td>
-                <a href="https://github.com/mkhazov/videojs-share"><%= translate(locale, "source") %></a>
-            </td>
-        </tr>
-
         <tr>
             <td>
                 <a href="/videojs/videojs-vtt-thumbnails/videojs-vtt-thumbnails.js?v=<%= ASSET_COMMIT %>">videojs-vtt-thumbnails.js</a>

videojs-dependencies.yml

@@ -1,35 +1,31 @@
-# Due to a 'video append of' error (see #3011), we're stuck on 7.12.1.
+# find the checksum of latest version using npm view <package>
 video.js:
-  version: 7.12.1
+  version: 8.23.4
-  shasum: 1d12eeb1f52e3679e8e4c987d9b9eb37e2247fa2
+  shasum: 65876174dfcee1057102a03a847fdaa8cf346c66
 
 videojs-contrib-quality-levels:
-  version: 2.1.0
+  version: 4.1.0
-  shasum: 046e9e21ed01043f512b83a1916001d552457083
+  shasum: 44c2d2167114a5c8418548b10a25cb409d6cba51
 
-videojs-http-source-selector:
+videojs-contrib-quality-menu:
-  version: 1.1.6
+  version: 1.0.4
-  shasum: 073aadbea0106ba6c98d6b611094dbf8554ffa1f
+  shasum: 8379fcd1767ae042ba77e0c80d9463e458a39abd
 
 videojs-markers:
   version: 1.0.1
   shasum: d7f8d804253fd587813271f8db308a22b9f7df34
 
 videojs-mobile-ui:
-  version: 0.6.1
+  version: 1.1.3
-  shasum: 0e146c4c481cbee0729cb5e162e558b455562cd0
+  shasum: 43baeeafb371ea2ff63834764ca69b1362eddd53
 
 videojs-overlay:
-  version: 2.1.4
+  version: 4.0.0
-  shasum: 5a103b25374dbb753eb87960d8360c2e8f39cc05
+  shasum: aa450b3e6e0a86d9bfc61eff66bbdd9f6ed1f07d
-
-videojs-share:
-  version: 3.2.1
-  shasum: 0a3024b981387b9d21c058c829760a72c14b8ceb
 
 videojs-vr:
-  version: 1.8.0
+  version: 2.0.0
-  shasum: 7f2f07f760d8a329c615acd316e49da6ee8edd34
+  shasum: 3d86e3fececf7373cfb89b950ed6ab77ca783d2b
 
 videojs-vtt-thumbnails:
   version: 0.0.13