Added new itags, adjusted tests accordingly. (#865)

pytube/itags.py

@@ -2,7 +2,7 @@
 """This module contains a lookup table of YouTube's itag values."""
 from typing import Dict
 
-ITAGS = {
+PROGRESSIVE_VIDEO = {
     5: ("240p", "64kbps"),
     6: ("270p", "64kbps"),
     13: ("144p", None),
@@ -35,93 +35,91 @@ ITAGS = {
     102: ("720p", "192kbps"),
     132: ("240p", "48kbps"),
     151: ("720p", "24kbps"),
+    300: ("720p", "128kbps"),
+    301: ("1080p", "128kbps"),
+}
+
+DASH_VIDEO = {
     # DASH Video
-    133: ("240p", None),
-    134: ("360p", None),
-    135: ("480p", None),
-    136: ("720p", None),
-    137: ("1080p", None),
-    138: ("2160p", None),
-    160: ("144p", None),
-    167: ("360p", None),
-    168: ("480p", None),
-    169: ("720p", None),
-    170: ("1080p", None),
-    212: ("480p", None),
-    218: ("480p", None),
-    219: ("480p", None),
-    242: ("240p", None),
-    243: ("360p", None),
-    244: ("480p", None),
-    245: ("480p", None),
-    246: ("480p", None),
-    247: ("720p", None),
-    248: ("1080p", None),
-    264: ("1440p", None),
-    266: ("2160p", None),
-    271: ("1440p", None),
-    272: ("2160p", None),
-    278: ("144p", None),
-    298: ("720p", None),
-    299: ("1080p", None),
-    302: ("720p", None),
-    303: ("1080p", None),
-    308: ("1440p", None),
-    313: ("2160p", None),
-    315: ("2160p", None),
-    330: ("144p", None),
-    331: ("240p", None),
-    332: ("360p", None),
-    333: ("480p", None),
-    334: ("720p", None),
-    335: ("1080p", None),
-    336: ("1440p", None),
-    337: ("2160p", None),
+    133: ("240p", None),  # MP4
+    134: ("360p", None),  # MP4
+    135: ("480p", None),  # MP4
+    136: ("720p", None),  # MP4
+    137: ("1080p", None),  # MP4
+    138: ("2160p", None),  # MP4
+    160: ("144p", None),  # MP4
+    167: ("360p", None),  # WEBM
+    168: ("480p", None),  # WEBM
+    169: ("720p", None),  # WEBM
+    170: ("1080p", None),  # WEBM
+    212: ("480p", None),  # MP4
+    218: ("480p", None),  # WEBM
+    219: ("480p", None),  # WEBM
+    242: ("240p", None),  # WEBM
+    243: ("360p", None),  # WEBM
+    244: ("480p", None),  # WEBM
+    245: ("480p", None),  # WEBM
+    246: ("480p", None),  # WEBM
+    247: ("720p", None),  # WEBM
+    248: ("1080p", None),  # WEBM
+    264: ("1440p", None),  # MP4
+    266: ("2160p", None),  # MP4
+    271: ("1440p", None),  # WEBM
+    272: ("4320p", None),  # WEBM
+    278: ("144p", None),  # WEBM
+    298: ("720p", None),  # MP4
+    299: ("1080p", None),  # MP4
+    302: ("720p", None),  # WEBM
+    303: ("1080p", None),  # WEBM
+    308: ("1440p", None),  # WEBM
+    313: ("2160p", None),  # WEBM
+    315: ("2160p", None),  # WEBM
+    330: ("144p", None),  # WEBM
+    331: ("240p", None),  # WEBM
+    332: ("360p", None),  # WEBM
+    333: ("480p", None),  # WEBM
+    334: ("720p", None),  # WEBM
+    335: ("1080p", None),  # WEBM
+    336: ("1440p", None),  # WEBM
+    337: ("2160p", None),  # WEBM
+    394: ("144p", None),  # MP4
+    395: ("240p", None),  # MP4
+    396: ("360p", None),  # MP4
+    397: ("480p", None),  # MP4
+    398: ("720p", None),  # MP4
+    399: ("1080p", None),  # MP4
+    400: ("1440p", None),  # MP4
+    401: ("2160p", None),  # MP4
+    402: ("4320p", None),  # MP4
+    571: ("4320p", None),  # MP4
+}
+
+DASH_AUDIO = {
     # DASH Audio
-    139: (None, "48kbps"),
-    140: (None, "128kbps"),
-    141: (None, "256kbps"),
-    171: (None, "128kbps"),
-    172: (None, "256kbps"),
-    249: (None, "50kbps"),
-    250: (None, "70kbps"),
-    251: (None, "160kbps"),
-    256: (None, None),
-    258: (None, None),
-    325: (None, None),
-    328: (None, None),
+    139: (None, "48kbps"),  # MP4
+    140: (None, "128kbps"),  # MP4
+    141: (None, "256kbps"),  # MP4
+    171: (None, "128kbps"),  # WEBM
+    172: (None, "256kbps"),  # WEBM
+    249: (None, "50kbps"),  # WEBM
+    250: (None, "70kbps"),  # WEBM
+    251: (None, "160kbps"),  # WEBM
+    256: (None, "192kbps"),  # MP4
+    258: (None, "384kbps"),  # MP4
+    325: (None, None),  # MP4
+    328: (None, None),  # MP4
+}
+
+ITAGS = {
+    **PROGRESSIVE_VIDEO,
+    **DASH_VIDEO,
+    **DASH_AUDIO,
 }
 
 HDR = [330, 331, 332, 333, 334, 335, 336, 337]
-_60FPS = [298, 299, 302, 303, 308, 315] + HDR
+_60FPS = [272, 298, 299, 302, 303, 308, 315, 398, 399, 400, 401, 402, 571] + HDR
 _3D = [82, 83, 84, 85, 100, 101, 102]
 LIVE = [91, 92, 93, 94, 95, 96, 132, 151]
-DASH_MP4_VIDEO = [133, 134, 135, 136, 137, 138, 160, 212, 264, 266, 298, 299]
-DASH_MP4_AUDIO = [139, 140, 141, 256, 258, 325, 328]
-DASH_WEBM_VIDEO = [
-    167,
-    168,
-    169,
-    170,
-    218,
-    219,
-    278,
-    242,
-    243,
-    244,
-    245,
-    246,
-    247,
-    248,
-    271,
-    272,
-    302,
-    303,
-    308,
-    313,
-    315,
-]
-DASH_WEBM_AUDIO = [171, 172, 249, 250, 251]
 
 
 def get_format_profile(itag: int) -> Dict:
@@ -142,8 +140,8 @@ def get_format_profile(itag: int) -> Dict:
         "is_3d": itag in _3D,
         "is_hdr": itag in HDR,
         "fps": 60 if itag in _60FPS else 30,
-        "is_dash": itag in DASH_MP4_VIDEO
-        or itag in DASH_MP4_AUDIO
-        or itag in DASH_WEBM_VIDEO
-        or itag in DASH_WEBM_AUDIO,
+        "is_dash": (
+            itag in DASH_AUDIO
+            or itag in DASH_VIDEO
+        ),
     }

tests/test_query.py

@@ -7,9 +7,9 @@ import pytest
     ("test_input", "expected"),
     [
         ({"progressive": True}, [18, 22]),
-        ({"resolution": "720p"}, [22, 136, 247]),
-        ({"res": "720p"}, [22, 136, 247]),
-        ({"fps": 30, "resolution": "480p"}, [135, 244]),
+        ({"resolution": "720p"}, [22, 136, 247, 398]),
+        ({"res": "720p"}, [22, 136, 247, 398]),
+        ({"fps": 30, "resolution": "480p"}, [135, 244, 397]),
         ({"mime_type": "audio/mp4"}, [140]),
         ({"type": "audio"}, [140, 249, 250, 251]),
         ({"subtype": "3gpp"}, []),
@@ -19,7 +19,7 @@ import pytest
         ({"video_codec": "vp9"}, [248, 247, 244, 243, 242, 278]),
         ({"only_audio": True}, [140, 249, 250, 251]),
         ({"only_video": True, "video_codec": "avc1.4d4015"}, [133]),
-        ({"adaptive": True, "resolution": "1080p"}, [137, 248]),
+        ({"adaptive": True, "resolution": "1080p"}, [137, 248, 399]),
         ({"custom_filter_functions": [lambda s: s.itag == 18]}, [18]),
     ],
 )
@@ -86,7 +86,7 @@ def test_order_by_non_numerical(cipher_signature):
         .order_by("mime_type")
         .desc()
     ]
-    assert mime_types == ["video/webm", "video/mp4", "video/mp4"]
+    assert mime_types == ["video/webm", "video/mp4", "video/mp4", "video/mp4"]
 
 
 def test_order_by_ascending(cipher_signature):
@@ -110,7 +110,7 @@ def test_order_by_non_numerical_ascending(cipher_signature):
         .order_by("mime_type")
         .asc()
     ]
-    assert mime_types == ["video/mp4", "video/mp4", "video/webm"]
+    assert mime_types == ["video/mp4", "video/mp4", "video/mp4", "video/webm"]
 
 
 def test_order_by_with_none_values(cipher_signature):
@@ -144,7 +144,7 @@ def test_get_highest_resolution(cipher_signature):
 def test_filter_is_dash(cipher_signature):
     streams = cipher_signature.streams.filter(is_dash=False)
     itags = [s.itag for s in streams]
-    assert itags == [18, 22, 399, 398, 397, 396, 395, 394]
+    assert itags == [18, 22]
 
 
 def test_get_audio_only(cipher_signature):