From e4af99fd178c39b584001fa1b7d6d62d88bc7a60 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jes=C3=BAs?= <heckyel@hyperbola.info>
Date: Sun, 29 Aug 2021 18:48:01 -0500
Subject: Revert "Add support for more qualities, merging video+audio using
 MSE"

This reverts commit d56df02e7b1eba86baf511289208295b1f6c5a50.
---
 youtube/templates/base.html  |  2 +-
 youtube/templates/watch.html | 12 ++++--------
 2 files changed, 5 insertions(+), 9 deletions(-)

(limited to 'youtube/templates')
diff --git a/youtube/templates/base.html b/youtube/templates/base.html
index 4ab722d..89c53c0 100644
--- a/youtube/templates/base.html
+++ b/youtube/templates/base.html
@@ -3,7 +3,7 @@
     <head>
         <meta charset="UTF-8"/>
         <meta name="viewport" content="width=device-width, initial-scale=1"/>
-        <meta http-equiv="Content-Security-Policy" content="default-src 'self' 'unsafe-inline' 'unsafe-eval'; media-src 'self' blob: https://*.googlevideo.com;  {{ "img-src 'self' https://*.googleusercontent.com https://*.ggpht.com https://*.ytimg.com;" if not settings.proxy_images else "" }}">
+        <meta http-equiv="Content-Security-Policy" content="default-src 'self' 'unsafe-inline' 'unsafe-eval'; media-src 'self' https://*.googlevideo.com; {{ "img-src 'self' https://*.googleusercontent.com https://*.ggpht.com https://*.ytimg.com;" if not settings.proxy_images else "" }}"/>
         <title>{{ page_title }}</title>
         <link title="YT Local" href="/youtube.com/opensearch.xml" rel="search" type="application/opensearchdescription+xml"/>
         <link href="/youtube.com/static/favicon.ico" type="image/x-icon" rel="icon"/>
diff --git a/youtube/templates/watch.html b/youtube/templates/watch.html
index 9d7a36c..2b19aeb 100644
--- a/youtube/templates/watch.html
+++ b/youtube/templates/watch.html
@@ -29,7 +29,7 @@
                 {% endif %}
             </span>
         </div>
-    {% elif (uni_sources.__len__() == 0 or live) and hls_formats.__len__() != 0 %}
+    {% elif (video_sources.__len__() == 0 or live) and hls_formats.__len__() != 0 %}
         <div class="live-url-choices">
             <span>Copy a url into your video player:</span>
             <ol>
@@ -41,9 +41,9 @@
     {% else %}
         <figure class="sc-video">
             <video id="js-video-player" playsinline controls>
-                {% if uni_sources %}
-                    <source src="{{ uni_sources[uni_idx]['url'] }}" type="{{ uni_sources[uni_idx]['type'] }}" data-res="{{ uni_sources[uni_idx]['quality'] }}">
-                {% endif %}
+                {% for video_source in video_sources %}
+                    <source src="{{ video_source['src'] }}" type="{{ video_source['type'] }}" data-res="{{ video_source['quality'] }}">
+                {% endfor %}
 
                 {% for source in subtitle_sources %}
                     {% if source['on'] %}
@@ -55,10 +55,6 @@
             </video>
         </figure>
 
-        {% if pair_sources and (not uni_sources or pair_sources[pair_idx][0]['quality'] != uni_sources[uni_idx]['quality']) %}
-            <script src="/youtube.com/static/js/av-merge.js"></script>
-        {% endif %}
-
         {% if time_start != 0 %}
             <script>
              document.getElementById('js-video-player').currentTime = {{ time_start|tojson }};
-- 
cgit v1.2.3

