Merge pull request #455 from jgoguen/master

Add separate quality entry for iOS compatibility

README.md

@@ -106,6 +106,10 @@ __Firefox:__ contributed by [nanocortex](https://github.com/nanocortex). You can
 
 [rithask](https://github.com/rithask) has created an iOS shortcut to send the URL to MeTube from Safari. Initially, you'll need to enter the server address and port, but after that, it will be saved and you can just run the shortcut from the share menu in Safari. The address should include the protocol (http/https) and the port, if it's not the default 80/443. For example: `https://metube.example.com` or `http://192.168.1.1:8081`. The shortcut can be found [here](https://www.icloud.com/shortcuts/f1548df15b734418a77a709103bc1dd5).
 
+## iOS Compatibility
+
+iOS has strict requirements for video files, requiring h264 or h265 video codec and aac audio codec in MP4 container. This can sometimes be a lower quality than the best quality available. To accommodate iOS requirements, when downloading a MP4 format you can choose "Best (iOS)" to get the best quality formats as compatible as possible with iOS requirements.
+
 ## Bookmarklet
 
 [kushfest](https://github.com/kushfest) has created a Chrome bookmarklet for sending the currently open webpage to MeTube. Please note that if you're on an HTTPS page, your MeTube instance must be behind an HTTPS reverse proxy (see below) for the bookmarklet to work.

app/dl_formats.py

@@ -35,16 +35,18 @@ def get_format(format: str, quality: str) -> str:
             return "bestaudio/best"
         # video {res} {vfmt} + audio {afmt} {res} {vfmt}
         vfmt, afmt = ("[ext=mp4]", "[ext=m4a]") if format == "mp4" else ("", "")
-        vres = f"[height<={quality}]" if quality != "best" else ""
+        vres = f"[height<={quality}]" if quality not in ("best", "best_ios") else ""
         vcombo = vres + vfmt
 
-        # iOS has strict requirements for video files, requiring h264 or h265
-        # video codec and aac audio codec in MP4 container. This format string
-        # attempts to get the fully compatible formats first, then the h264/h265
-        # video codec with any M4A audio codec (because audio is faster to
-        # convert if needed), and falls back to getting the best available MP4
-        # file.
-        return f"bestvideo[vcodec~='^((he|a)vc|h26[45])']{vres}+bestaudio[acodec=aac]/bestvideo[vcodec~='^((he|a)vc|h26[45])']{vres}+bestaudio{afmt}/bestvideo{vcombo}+bestaudio{afmt}/best{vcombo}"
+        if quality == "best_ios":
+            # iOS has strict requirements for video files, requiring h264 or h265
+            # video codec and aac audio codec in MP4 container. This format string
+            # attempts to get the fully compatible formats first, then the h264/h265
+            # video codec with any M4A audio codec (because audio is faster to
+            # convert if needed), and falls back to getting the best available MP4
+            # file.
+            return f"bestvideo[vcodec~='^((he|a)vc|h26[45])']{vres}+bestaudio[acodec=aac]/bestvideo[vcodec~='^((he|a)vc|h26[45])']{vres}+bestaudio{afmt}/bestvideo{vcombo}+bestaudio{afmt}/best{vcombo}"
+        return f"bestvideo{vcombo}+bestaudio{afmt}/best{vcombo}"
 
     raise Exception(f"Unkown format {format}")
 

ui/src/app/formats.ts

@@ -27,6 +27,7 @@ export const Formats: Format[] = [
     text: 'MP4',
     qualities: [
       { id: 'best', text: 'Best' },
+      { id: 'best_ios', text: 'Best (iOS)' },
       { id: '1440', text: '1440p' },
       { id: '1080', text: '1080p' },
       { id: '720', text: '720p' },
@@ -55,29 +56,21 @@ export const Formats: Format[] = [
   {
     id: 'opus',
     text: 'OPUS',
-    qualities: [
-      { id: 'best', text: 'Best' },
-    ],
+    qualities: [{ id: 'best', text: 'Best' }],
   },
   {
     id: 'wav',
     text: 'WAV',
-    qualities: [
-      { id: 'best', text: 'Best' },
-    ],
+    qualities: [{ id: 'best', text: 'Best' }],
   },
   {
     id: 'flac',
     text: 'FLAC',
-    qualities: [
-      { id: 'best', text: 'Best' },
-    ],
+    qualities: [{ id: 'best', text: 'Best' }],
   },
   {
     id: 'thumbnail',
     text: 'Thumbnail',
-    qualities: [
-      { id: 'best', text: 'Best' }
-    ],
+    qualities: [{ id: 'best', text: 'Best' }],
   },
 ];