Merge branch 'yt-dlp:master' into niconico_error

.github/workflows/signature-tests.yml

@@ -0,0 +1,41 @@
+name: Signature Tests
+on:
+  push:
+    paths:
+      - .github/workflows/signature-tests.yml
+      - test/test_youtube_signature.py
+      - yt_dlp/jsinterp.py
+  pull_request:
+    paths:
+      - .github/workflows/signature-tests.yml
+      - test/test_youtube_signature.py
+      - yt_dlp/jsinterp.py
+permissions:
+  contents: read
+
+concurrency:
+  group: signature-tests-${{ github.event.pull_request.number || github.ref }}
+  cancel-in-progress: ${{ github.event_name == 'pull_request' }}
+
+jobs:
+  tests:
+    name: Signature Tests
+    runs-on: ${{ matrix.os }}
+    strategy:
+      fail-fast: false
+      matrix:
+        os: [ubuntu-latest, windows-latest]
+        python-version: ['3.9', '3.10', '3.11', '3.12', '3.13', pypy-3.10, pypy-3.11]
+    steps:
+    - uses: actions/checkout@v4
+    - name: Set up Python ${{ matrix.python-version }}
+      uses: actions/setup-python@v5
+      with:
+        python-version: ${{ matrix.python-version }}
+    - name: Install test requirements
+      run: python3 ./devscripts/install_deps.py --only-optional --include test
+    - name: Run tests
+      timeout-minutes: 15
+      run: |
+        python3 -m yt_dlp -v || true  # Print debug head
+        python3 ./devscripts/run_tests.py test/test_youtube_signature.py

CONTRIBUTORS

@@ -781,3 +781,6 @@ maxbin123
 nullpos
 anlar
 eason1478
+ceandreasen
+chauhantirth
+helpimnotdrowning

Changelog.md

@@ -4,6 +4,29 @@ # Changelog
 # To create a release, dispatch the https://github.com/yt-dlp/yt-dlp/actions/workflows/release.yml workflow on master
 -->
 
+### 2025.06.30
+
+#### Core changes
+- **jsinterp**: [Fix `extract_object`](https://github.com/yt-dlp/yt-dlp/commit/958153a226214c86879e36211ac191bf78289578) ([#13580](https://github.com/yt-dlp/yt-dlp/issues/13580)) by [seproDev](https://github.com/seproDev)
+
+#### Extractor changes
+- **bilibilispacevideo**: [Extract hidden-mode collections as playlists](https://github.com/yt-dlp/yt-dlp/commit/99b85ac102047446e6adf5b62bfc3c8d80b53778) ([#13533](https://github.com/yt-dlp/yt-dlp/issues/13533)) by [c-basalt](https://github.com/c-basalt)
+- **hotstar**
+    - [Fix extractor](https://github.com/yt-dlp/yt-dlp/commit/b5bd057fe86550f3aa67f2fc8790d1c6a251c57b) ([#13530](https://github.com/yt-dlp/yt-dlp/issues/13530)) by [bashonly](https://github.com/bashonly), [chauhantirth](https://github.com/chauhantirth) (With fixes in [e9f1576](https://github.com/yt-dlp/yt-dlp/commit/e9f157669e24953a88d15ce22053649db7a8e81e) by [bashonly](https://github.com/bashonly))
+    - [Fix metadata extraction](https://github.com/yt-dlp/yt-dlp/commit/0a6b1044899f452cd10b6c7a6b00fa985a9a8b97) ([#13560](https://github.com/yt-dlp/yt-dlp/issues/13560)) by [bashonly](https://github.com/bashonly)
+    - [Raise for login required](https://github.com/yt-dlp/yt-dlp/commit/5e292baad62c749b6c340621ab2d0f904165ddfb) ([#10405](https://github.com/yt-dlp/yt-dlp/issues/10405)) by [bashonly](https://github.com/bashonly)
+    - series: [Fix extractor](https://github.com/yt-dlp/yt-dlp/commit/4bd9a7ade7e0508b9795b3e72a69eeb40788b62b) ([#13564](https://github.com/yt-dlp/yt-dlp/issues/13564)) by [bashonly](https://github.com/bashonly)
+- **jiocinema**: [Remove extractors](https://github.com/yt-dlp/yt-dlp/commit/7e2504f941a11ea2b0dba00de3f0295cdc253e79) ([#13565](https://github.com/yt-dlp/yt-dlp/issues/13565)) by [bashonly](https://github.com/bashonly)
+- **kick**: [Support subscriber-only content](https://github.com/yt-dlp/yt-dlp/commit/b16722ede83377f77ea8352dcd0a6ca8e83b8f0f) ([#13550](https://github.com/yt-dlp/yt-dlp/issues/13550)) by [helpimnotdrowning](https://github.com/helpimnotdrowning)
+- **niconico**: live: [Fix extractor and downloader](https://github.com/yt-dlp/yt-dlp/commit/06c1a8cdffe14050206683253726875144192ef5) ([#13158](https://github.com/yt-dlp/yt-dlp/issues/13158)) by [doe1080](https://github.com/doe1080)
+- **sauceplus**: [Add extractor](https://github.com/yt-dlp/yt-dlp/commit/35fc33fbc51c7f5392fb2300f65abf6cf107ef90) ([#13567](https://github.com/yt-dlp/yt-dlp/issues/13567)) by [bashonly](https://github.com/bashonly), [ceandreasen](https://github.com/ceandreasen)
+- **sproutvideo**: [Support browser impersonation](https://github.com/yt-dlp/yt-dlp/commit/11b9416e10cff7513167d76d6c47774fcdd3e26a) ([#13589](https://github.com/yt-dlp/yt-dlp/issues/13589)) by [bashonly](https://github.com/bashonly)
+- **youtube**: [Fix premium formats extraction](https://github.com/yt-dlp/yt-dlp/commit/2ba5391cd68ed4f2415c827d2cecbcbc75ace10b) ([#13586](https://github.com/yt-dlp/yt-dlp/issues/13586)) by [bashonly](https://github.com/bashonly)
+
+#### Misc. changes
+- **ci**: [Add signature tests](https://github.com/yt-dlp/yt-dlp/commit/1b883846347addeab12663fd74317fd544341a1c) ([#13582](https://github.com/yt-dlp/yt-dlp/issues/13582)) by [bashonly](https://github.com/bashonly)
+- **cleanup**: Miscellaneous: [b018784](https://github.com/yt-dlp/yt-dlp/commit/b0187844988e557c7e1e6bb1aabd4c1176768d86) by [bashonly](https://github.com/bashonly)
+
 ### 2025.06.25
 
 #### Extractor changes

README.md

@@ -1156,15 +1156,15 @@ # CONFIGURATION
     * `/etc/yt-dlp/config`
     * `/etc/yt-dlp/config.txt`
 
-E.g. with the following configuration file, yt-dlp will always extract the audio, not copy the mtime, use a proxy and save all videos under `YouTube` directory in your home directory:
+E.g. with the following configuration file, yt-dlp will always extract the audio, copy the mtime, use a proxy and save all videos under `YouTube` directory in your home directory:
 ```
 # Lines starting with # are comments
 
 # Always extract audio
 -x
 
-# Do not copy the mtime
+# Copy the mtime
---no-mtime
+--mtime
 
 # Use this proxy
 --proxy 127.0.0.1:3128
@@ -1799,6 +1799,7 @@ #### youtube
 * `skip`: One or more of `hls`, `dash` or `translated_subs` to skip extraction of the m3u8 manifests, dash manifests and [auto-translated subtitles](https://github.com/yt-dlp/yt-dlp/issues/4090#issuecomment-1158102032) respectively
 * `player_client`: Clients to extract video data from. The currently available clients are `web`, `web_safari`, `web_embedded`, `web_music`, `web_creator`, `mweb`, `ios`, `android`, `android_vr`, `tv`, `tv_simply` and `tv_embedded`. By default, `tv,ios,web` is used, or `tv,web` is used when authenticating with cookies. The `web_music` client is added for `music.youtube.com` URLs when logged-in cookies are used. The `web_embedded` client is added for age-restricted videos but only works if the video is embeddable. The `tv_embedded` and `web_creator` clients are added for age-restricted videos if account age-verification is required. Some clients, such as `web` and `web_music`, require a `po_token` for their formats to be downloadable. Some clients, such as `web_creator`, will only work with authentication. Not all clients support authentication via cookies. You can use `default` for the default clients, or you can use `all` for all clients (not recommended). You can prefix a client with `-` to exclude it, e.g. `youtube:player_client=default,-ios`
 * `player_skip`: Skip some network requests that are generally needed for robust extraction. One or more of `configs` (skip client configs), `webpage` (skip initial webpage), `js` (skip js player), `initial_data` (skip initial data/next ep request). While these options can help reduce the number of requests needed or avoid some rate-limiting, they could cause issues such as missing formats or metadata.  See [#860](https://github.com/yt-dlp/yt-dlp/pull/860) and [#12826](https://github.com/yt-dlp/yt-dlp/issues/12826) for more details
+* `webpage_skip`: Skip extraction of embedded webpage data. One or both of `player_response`, `initial_data`. These options are for testing purposes and don't skip any network requests
 * `player_params`: YouTube player parameters to use for player requests. Will overwrite any default ones set by yt-dlp.
 * `player_js_variant`: The player javascript variant to use for signature and nsig deciphering. The known variants are: `main`, `tce`, `tv`, `tv_es6`, `phone`, `tablet`. Only `main` is recommended as a possible workaround; the others are for debugging purposes. The default is to use what is prescribed by the site, and can be selected with `actual`
 * `comment_sort`: `top` or `new` (default) - choose comment sorting mode (on YouTube's side)
@@ -1900,6 +1901,10 @@ #### sonylivseries
 #### tver
 * `backend`: Backend API to use for extraction - one of `streaks` (default) or `brightcove` (deprecated)
 
+#### vimeo
+* `client`: Client to extract video data from. One of `android` (default), `ios` or `web`. The `ios` client only works with previously cached OAuth tokens. The `web` client only works when authenticated with credentials or account cookies
+* `original_format_policy`: Policy for when to try extracting original formats. One of `always`, `never`, or `auto`. The default `auto` policy tries to avoid exceeding the API rate-limit by only making an extra request when Vimeo publicizes the video's downloadability
+
 **Note**: These options may be changed/removed in the future without concern for backward compatibility
 
 <!-- MANPAGE: MOVE "INSTALLATION" SECTION HERE -->
@@ -2262,6 +2267,7 @@ ### Differences in default behavior
 * yt-dlp uses modern http client backends such as `requests`. Use `--compat-options prefer-legacy-http-handler` to prefer the legacy http handler (`urllib`) to be used for standard http requests.
 * The sub-modules `swfinterp`, `casefold` are removed.
 * Passing `--simulate` (or calling `extract_info` with `download=False`) no longer alters the default format selection. See [#9843](https://github.com/yt-dlp/yt-dlp/issues/9843) for details.
+* yt-dlp no longer applies the server modified time to downloaded files by default. Use `--mtime` or `--compat-options mtime-by-default` to revert this.
 
 For ease of use, a few more compat options are available:
 
@@ -2271,7 +2277,7 @@ ### Differences in default behavior
 * `--compat-options 2021`: Same as `--compat-options 2022,no-certifi,filename-sanitization`
 * `--compat-options 2022`: Same as `--compat-options 2023,playlist-match-filter,no-external-downloader-progress,prefer-legacy-http-handler,manifest-filesize-approx`
 * `--compat-options 2023`: Same as `--compat-options 2024,prefer-vp9-sort`
-* `--compat-options 2024`: Currently does nothing. Use this to enable all future compat options
+* `--compat-options 2024`: Same as `--compat-options mtime-by-default`. Use this to enable all future compat options
 
 The following compat options restore vulnerable behavior from before security patches:
 

devscripts/bash-completion.in

@@ -10,9 +10,13 @@ __yt_dlp()
     diropts="--cache-dir"
 
     if [[ ${prev} =~ ${fileopts} ]]; then
+        local IFS=$'\n'
+        type compopt &>/dev/null && compopt -o filenames
         COMPREPLY=( $(compgen -f -- ${cur}) )
         return 0
     elif [[ ${prev} =~ ${diropts} ]]; then
+        local IFS=$'\n'
+        type compopt &>/dev/null && compopt -o dirnames
         COMPREPLY=( $(compgen -d -- ${cur}) )
         return 0
     fi

devscripts/changelog_override.json

@@ -254,5 +254,13 @@
     {
         "action": "remove",
         "when": "d596824c2f8428362c072518856065070616e348"
+    },
+    {
+        "action": "remove",
+        "when": "7b81634fb1d15999757e7a9883daa6ef09ea785b"
+    },
+    {
+        "action": "remove",
+        "when": "500761e41acb96953a5064e951d41d190c287e46"
     }
 ]

pyproject.toml

@@ -75,7 +75,7 @@ dev = [
 ]
 static-analysis = [
     "autopep8~=2.0",
-    "ruff~=0.11.0",
+    "ruff~=0.12.0",
 ]
 test = [
     "pytest~=8.1",
@@ -210,10 +210,12 @@ ignore = [
     "TD001",   # invalid-todo-tag
     "TD002",   # missing-todo-author
     "TD003",   # missing-todo-link
+    "PLC0415", # import-outside-top-level
     "PLE0604", # invalid-all-object (false positives)
     "PLE0643", # potential-index-error (false positives)
     "PLW0603", # global-statement
     "PLW1510", # subprocess-run-without-check
+    "PLW1641", # eq-without-hash
     "PLW2901", # redefined-loop-name
     "RUF001",  # ambiguous-unicode-character-string
     "RUF012",  # mutable-class-default

supportedsites.md

@@ -575,9 +575,7 @@ # Supported sites
  - **HollywoodReporterPlaylist**
  - **Holodex**
  - **HotNewHipHop**: (**Currently broken**)
- - **hotstar**
+ - **hotstar**: JioHotstar
- - **hotstar:playlist**
- - **hotstar:season**
  - **hotstar:series**
  - **hrfernsehen**
  - **HRTi**: [*hrti*](## "netrc machine")
@@ -647,8 +645,6 @@ # Supported sites
  - **Jamendo**
  - **JamendoAlbum**
  - **JeuxVideo**: (**Currently broken**)
- - **jiocinema**: [*jiocinema*](## "netrc machine")
- - **jiocinema:series**: [*jiocinema*](## "netrc machine")
  - **jiosaavn:album**
  - **jiosaavn:artist**
  - **jiosaavn:playlist**
@@ -1299,6 +1295,7 @@ # Supported sites
  - **SampleFocus**
  - **Sangiin**: 参議院インターネット審議中継 (archive)
  - **Sapo**: SAPO Vídeos
+ - **SaucePlus**: Sauce+
  - **SBS**: sbs.com.au
  - **sbs.co.kr**
  - **sbs.co.kr:allvod_program**

test/test_InfoExtractor.py

@@ -36,6 +36,18 @@ def do_GET(self):
             self.send_header('Content-Type', 'text/html; charset=utf-8')
             self.end_headers()
             self.wfile.write(TEAPOT_RESPONSE_BODY.encode())
+        elif self.path == '/fake.m3u8':
+            self.send_response(200)
+            self.send_header('Content-Length', '1024')
+            self.end_headers()
+            self.wfile.write(1024 * b'\x00')
+        elif self.path == '/bipbop.m3u8':
+            with open('test/testdata/m3u8/bipbop_16x9.m3u8', 'rb') as f:
+                data = f.read()
+            self.send_response(200)
+            self.send_header('Content-Length', str(len(data)))
+            self.end_headers()
+            self.wfile.write(data)
         else:
             assert False
 
@@ -1947,6 +1959,37 @@ def test_search_nextjs_data(self):
         with self.assertWarns(DeprecationWarning):
             self.assertEqual(self.ie._search_nextjs_data('', None, default='{}'), {})
 
+    def test_search_nextjs_v13_data(self):
+        HTML = R'''
+            <script>(self.__next_f=self.__next_f||[]).push([0])</script>
+            <script>self.__next_f.push([2,"0:[\"$\",\"$L0\",null,{\"do_not_add_this\":\"fail\"}]\n"])</script>
+            <script>self.__next_f.push([1,"1:I[46975,[],\"HTTPAccessFallbackBoundary\"]\n2:I[32630,[\"8183\",\"static/chunks/8183-768193f6a9e33cdd.js\"]]\n"])</script>
+            <script nonce="abc123">self.__next_f.push([1,"e:[false,[\"$\",\"div\",null,{\"children\":[\"$\",\"$L18\",null,{\"foo\":\"bar\"}]}],false]\n    "])</script>
+            <script>self.__next_f.push([1,"2a:[[\"$\",\"div\",null,{\"className\":\"flex flex-col\",\"children\":[]}],[\"$\",\"$L16\",null,{\"meta\":{\"dateCreated\":1730489700,\"uuid\":\"40cac41d-8d29-4ef5-aa11-75047b9f0907\"}}]]\n"])</script>
+            <script>self.__next_f.push([1,"df:[\"$undefined\",[\"$\",\"div\",null,{\"children\":[\"$\",\"$L17\",null,{}],\"do_not_include_this_field\":\"fail\"}],[\"$\",\"div\",null,{\"children\":[[\"$\",\"$L19\",null,{\"duplicated_field_name\":{\"x\":1}}],[\"$\",\"$L20\",null,{\"duplicated_field_name\":{\"y\":2}}]]}],\"$undefined\"]\n"])</script>
+            <script>self.__next_f.push([3,"MzM6WyIkIiwiJEwzMiIsbnVsbCx7ImRlY29kZWQiOiJzdWNjZXNzIn1d"])</script>
+            '''
+        EXPECTED = {
+            '18': {
+                'foo': 'bar',
+            },
+            '16': {
+                'meta': {
+                    'dateCreated': 1730489700,
+                    'uuid': '40cac41d-8d29-4ef5-aa11-75047b9f0907',
+                },
+            },
+            '19': {
+                'duplicated_field_name': {'x': 1},
+            },
+            '20': {
+                'duplicated_field_name': {'y': 2},
+            },
+        }
+        self.assertEqual(self.ie._search_nextjs_v13_data(HTML, None), EXPECTED)
+        self.assertEqual(self.ie._search_nextjs_v13_data('', None, fatal=False), {})
+        self.assertEqual(self.ie._search_nextjs_v13_data(None, None, fatal=False), {})
+
     def test_search_nuxt_json(self):
         HTML_TMPL = '<script data-ssr="true" id="__NUXT_DATA__" type="application/json">[{}]</script>'
         VALID_DATA = '''
@@ -2079,5 +2122,45 @@ def test_search_nuxt_json(self):
                 self.ie._search_nuxt_json(HTML_TMPL.format(data), None, default=DEFAULT), DEFAULT)
 
 
+class TestInfoExtractorNetwork(unittest.TestCase):
+    def setUp(self, /):
+        self.httpd = http.server.HTTPServer(
+            ('127.0.0.1', 0), InfoExtractorTestRequestHandler)
+        self.port = http_server_port(self.httpd)
+
+        self.server_thread = threading.Thread(target=self.httpd.serve_forever)
+        self.server_thread.daemon = True
+        self.server_thread.start()
+
+        self.called = False
+
+        def require_warning(*args, **kwargs):
+            self.called = True
+
+        self.ydl = FakeYDL()
+        self.ydl.report_warning = require_warning
+        self.ie = DummyIE(self.ydl)
+
+    def tearDown(self, /):
+        self.ydl.close()
+        self.httpd.shutdown()
+        self.httpd.server_close()
+        self.server_thread.join(1)
+
+    def test_extract_m3u8_formats(self):
+        formats, subtitles = self.ie._extract_m3u8_formats_and_subtitles(
+            f'http://127.0.0.1:{self.port}/bipbop.m3u8', None, fatal=False)
+        self.assertFalse(self.called)
+        self.assertTrue(formats)
+        self.assertTrue(subtitles)
+
+    def test_extract_m3u8_formats_warning(self):
+        formats, subtitles = self.ie._extract_m3u8_formats_and_subtitles(
+            f'http://127.0.0.1:{self.port}/fake.m3u8', None, fatal=False)
+        self.assertTrue(self.called, 'Warning was not issued for binary m3u8 file')
+        self.assertFalse(formats)
+        self.assertFalse(subtitles)
+
+
 if __name__ == '__main__':
     unittest.main()

test/test_download.py

@@ -14,6 +14,7 @@
 
 from test.helper import (
     assertGreaterEqual,
+    assertLessEqual,
     expect_info_dict,
     expect_warnings,
     get_params,
@@ -121,10 +122,13 @@ def print_skipping(reason):
         params = get_params(test_case.get('params', {}))
         params['outtmpl'] = tname + '_' + params['outtmpl']
         if is_playlist and 'playlist' not in test_case:
-            params.setdefault('extract_flat', 'in_playlist')
+            params.setdefault('playlistend', max(
-            params.setdefault('playlistend', test_case.get(
+                test_case.get('playlist_mincount', -1),
-                'playlist_mincount', test_case.get('playlist_count', -2) + 1))
+                test_case.get('playlist_count', -2) + 1,
+                test_case.get('playlist_maxcount', -2) + 1))
             params.setdefault('skip_download', True)
+            if 'playlist_duration_sum' not in test_case:
+                params.setdefault('extract_flat', 'in_playlist')
 
         ydl = YoutubeDL(params, auto_init=False)
         ydl.add_default_info_extractors()
@@ -159,6 +163,7 @@ def try_rm_tcs_files(tcs=None):
                 try_rm(os.path.splitext(tc_filename)[0] + '.info.json')
         try_rm_tcs_files()
         try:
+            test_url = test_case['url']
             try_num = 1
             while True:
                 try:
@@ -166,7 +171,7 @@ def try_rm_tcs_files(tcs=None):
                     # for outside error handling, and returns the exit code
                     # instead of the result dict.
                     res_dict = ydl.extract_info(
-                        test_case['url'],
+                        test_url,
                         force_generic_extractor=params.get('force_generic_extractor', False))
                 except (DownloadError, ExtractorError) as err:
                     # Check if the exception is not a network related one
@@ -194,23 +199,23 @@ def try_rm_tcs_files(tcs=None):
                 self.assertTrue('entries' in res_dict)
                 expect_info_dict(self, res_dict, test_case.get('info_dict', {}))
 
+            num_entries = len(res_dict.get('entries', []))
             if 'playlist_mincount' in test_case:
+                mincount = test_case['playlist_mincount']
                 assertGreaterEqual(
-                    self,
+                    self, num_entries, mincount,
-                    len(res_dict['entries']),
+                    f'Expected at least {mincount} entries in playlist {test_url}, but got only {num_entries}')
-                    test_case['playlist_mincount'],
-                    'Expected at least %d in playlist %s, but got only %d' % (
-                        test_case['playlist_mincount'], test_case['url'],
-                        len(res_dict['entries'])))
             if 'playlist_count' in test_case:
+                count = test_case['playlist_count']
+                got = num_entries if num_entries <= count else 'more'
                 self.assertEqual(
-                    len(res_dict['entries']),
+                    num_entries, count,
-                    test_case['playlist_count'],
+                    f'Expected exactly {count} entries in playlist {test_url}, but got {got}')
-                    'Expected %d entries in playlist %s, but got %d.' % (
+            if 'playlist_maxcount' in test_case:
-                        test_case['playlist_count'],
+                maxcount = test_case['playlist_maxcount']
-                        test_case['url'],
+                assertLessEqual(
-                        len(res_dict['entries']),
+                    self, num_entries, maxcount,
-                    ))
+                    f'Expected at most {maxcount} entries in playlist {test_url}, but got more')
             if 'playlist_duration_sum' in test_case:
                 got_duration = sum(e['duration'] for e in res_dict['entries'])
                 self.assertEqual(

test/test_jsinterp.py

@@ -478,6 +478,10 @@ def test_extract_function_with_global_stack(self):
         func = jsi.extract_function('c', {'e': 10}, {'f': 100, 'g': 1000})
         self.assertEqual(func([1]), 1111)
 
+    def test_extract_object(self):
+        jsi = JSInterpreter('var a={};a.xy={};var xy;var zxy={};xy={z:function(){return "abc"}};')
+        self.assertTrue('z' in jsi.extract_object('xy', None))
+
     def test_increment_decrement(self):
         self._test('function f() { var x = 1; return ++x; }', 2)
         self._test('function f() { var x = 1; return x++; }', 1)
@@ -486,6 +490,57 @@ def test_increment_decrement(self):
         self._test('function f() { var a = "test--"; return a; }', 'test--')
         self._test('function f() { var b = 1; var a = "b--"; return a; }', 'b--')
 
+    def test_nested_function_scoping(self):
+        self._test(R'''
+            function f() {
+                var g = function() {
+                    var P = 2;
+                    return P;
+                };
+                var P = 1;
+                g();
+                return P;
+            }
+        ''', 1)
+        self._test(R'''
+            function f() {
+                var x = function() {
+                    for (var w = 1, M = []; w < 2; w++) switch (w) {
+                        case 1:
+                            M.push("a");
+                        case 2:
+                            M.push("b");
+                    }
+                    return M
+                };
+                var w = "c";
+                var M = "d";
+                var y = x();
+                y.push(w);
+                y.push(M);
+                return y;
+            }
+        ''', ['a', 'b', 'c', 'd'])
+        self._test(R'''
+            function f() {
+                var P, Q;
+                var z = 100;
+                var g = function() {
+                    var P, Q; P = 2; Q = 15;
+                    z = 0;
+                    return P+Q;
+                };
+                P = 1; Q = 10;
+                var x = g(), y = 3;
+                return P+Q+x+y+z;
+            }
+        ''', 31)
+
+    def test_undefined_varnames(self):
+        jsi = JSInterpreter('function f(){ var a; return [a, b]; }')
+        self._test(jsi, [JS_Undefined, JS_Undefined])
+        self.assertEqual(jsi._undefined_varnames, {'b'})
+
 
 if __name__ == '__main__':
     unittest.main()

test/test_networking.py

@@ -22,7 +22,6 @@
 import tempfile
 import threading
 import time
-import urllib.error
 import urllib.request
 import warnings
 import zlib
@@ -223,10 +222,7 @@ def do_GET(self):
                 if encoding == 'br' and brotli:
                     payload = brotli.compress(payload)
                 elif encoding == 'gzip':
-                    buf = io.BytesIO()
+                    payload = gzip.compress(payload, mtime=0)
-                    with gzip.GzipFile(fileobj=buf, mode='wb') as f:
-                        f.write(payload)
-                    payload = buf.getvalue()
                 elif encoding == 'deflate':
                     payload = zlib.compress(payload)
                 elif encoding == 'unsupported':
@@ -729,6 +725,17 @@ def test_keep_header_casing(self, handler):
 
             assert 'X-test-heaDer: test' in res
 
+    def test_partial_read_then_full_read(self, handler):
+        with handler() as rh:
+            for encoding in ('', 'gzip', 'deflate'):
+                res = validate_and_send(rh, Request(
+                    f'http://127.0.0.1:{self.http_port}/content-encoding',
+                    headers={'ytdl-encoding': encoding}))
+                assert res.headers.get('Content-Encoding') == encoding
+                assert res.read(6) == b'<html>'
+                assert res.read(0) == b''
+                assert res.read() == b'<video src="/vid.mp4" /></html>'
+
 
 @pytest.mark.parametrize('handler', ['Urllib', 'Requests', 'CurlCFFI'], indirect=True)
 class TestClientCertificate:

test/test_youtube_signature.py

@@ -133,6 +133,11 @@
         '2aq0aqSyOoJXtK73m-uME_jv7-pT15gOFC02RFkGMqWpzEICs69VdbwQ0LDp1v7j8xx92efCJlYFYb1sUkkBSPOlPmXgIARw8JQ0qOAOAA',
         'IAOAOq0QJ8wRAAgXmPlOPSBkkUs1bYFYlJCfe29xx8j7v1pDL0QwbdV96sCIEzpWqMGkFR20CFOg51Tp-7vj_E2u-m37KtXJoOySqa0',
     ),
+    (
+        'https://www.youtube.com/s/player/e12fbea4/player_ias.vflset/en_US/base.js',
+        'gN7a-hudCuAuPH6fByOk1_GNXN0yNMHShjZXS2VOgsEItAJz0tipeavEOmNdYN-wUtcEqD3bCXjc0iyKfAyZxCBGgIARwsSdQfJ2CJtt',
+        'JC2JfQdSswRAIgGBCxZyAfKyi0cjXCb3DqEctUw-NYdNmOEvaepit0zJAtIEsgOV2SXZjhSHMNy0NXNG_1kOyBf6HPuAuCduh-a',
+    ),
 ]
 
 _NSIG_TESTS = [
@@ -328,6 +333,50 @@
         'https://www.youtube.com/s/player/fc2a56a5/tv-player-ias.vflset/tv-player-ias.js',
         'qTKWg_Il804jd2kAC', 'OtUAm2W6gyzJjB9u',
     ),
+    (
+        'https://www.youtube.com/s/player/a74bf670/player_ias_tce.vflset/en_US/base.js',
+        'kM5r52fugSZRAKHfo3', 'hQP7k1hA22OrNTnq',
+    ),
+    (
+        'https://www.youtube.com/s/player/6275f73c/player_ias_tce.vflset/en_US/base.js',
+        'kM5r52fugSZRAKHfo3', '-I03XF0iyf6I_X0A',
+    ),
+    (
+        'https://www.youtube.com/s/player/20c72c18/player_ias_tce.vflset/en_US/base.js',
+        'kM5r52fugSZRAKHfo3', '-I03XF0iyf6I_X0A',
+    ),
+    (
+        'https://www.youtube.com/s/player/9fe2e06e/player_ias_tce.vflset/en_US/base.js',
+        'kM5r52fugSZRAKHfo3', '6r5ekNIiEMPutZy',
+    ),
+    (
+        'https://www.youtube.com/s/player/680f8c75/player_ias_tce.vflset/en_US/base.js',
+        'kM5r52fugSZRAKHfo3', '0ml9caTwpa55Jf',
+    ),
+    (
+        'https://www.youtube.com/s/player/14397202/player_ias_tce.vflset/en_US/base.js',
+        'kM5r52fugSZRAKHfo3', 'ozZFAN21okDdJTa',
+    ),
+    (
+        'https://www.youtube.com/s/player/5dcb2c1f/player_ias_tce.vflset/en_US/base.js',
+        'kM5r52fugSZRAKHfo3', 'p7iTbRZDYAF',
+    ),
+    (
+        'https://www.youtube.com/s/player/a10d7fcc/player_ias_tce.vflset/en_US/base.js',
+        'kM5r52fugSZRAKHfo3', '9Zue7DDHJSD',
+    ),
+    (
+        'https://www.youtube.com/s/player/8e20cb06/player_ias_tce.vflset/en_US/base.js',
+        'kM5r52fugSZRAKHfo3', '5-4tTneTROTpMzba',
+    ),
+    (
+        'https://www.youtube.com/s/player/e12fbea4/player_ias_tce.vflset/en_US/base.js',
+        'kM5r52fugSZRAKHfo3', 'XkeRfXIPOkSwfg',
+    ),
+    (
+        'https://www.youtube.com/s/player/ef259203/player_ias_tce.vflset/en_US/base.js',
+        'rPqBC01nJpqhhi2iA2U', 'hY7dbiKFT51UIA',
+    ),
 ]
 
 

yt_dlp/YoutubeDL.py

@@ -482,7 +482,8 @@ class YoutubeDL:
                        The following options do not work when used through the API:
                        filename, abort-on-error, multistreams, no-live-chat,
                        format-sort, no-clean-infojson, no-playlist-metafiles,
-                       no-keep-subs, no-attach-info-json, allow-unsafe-ext, prefer-vp9-sort.
+                       no-keep-subs, no-attach-info-json, allow-unsafe-ext, prefer-vp9-sort,
+                       mtime-by-default.
                        Refer __init__.py for their implementation
     progress_template: Dictionary of templates for progress outputs.
                        Allowed keys are 'download', 'postprocess',
@@ -2194,7 +2195,7 @@ def _filter(f):
             return op(actual_value, comparison_value)
         return _filter
 
-    def _check_formats(self, formats):
+    def _check_formats(self, formats, warning=True):
         for f in formats:
             working = f.get('__working')
             if working is not None:
@@ -2207,6 +2208,9 @@ def _check_formats(self, formats):
                 continue
             temp_file = tempfile.NamedTemporaryFile(suffix='.tmp', delete=False, dir=path or None)
             temp_file.close()
+            # If FragmentFD fails when testing a fragment, it will wrongly set a non-zero return code.
+            # Save the actual return code for later. See https://github.com/yt-dlp/yt-dlp/issues/13750
+            original_retcode = self._download_retcode
             try:
                 success, _ = self.dl(temp_file.name, f, test=True)
             except (DownloadError, OSError, ValueError, *network_exceptions):
@@ -2217,12 +2221,18 @@ def _check_formats(self, formats):
                         os.remove(temp_file.name)
                     except OSError:
                         self.report_warning(f'Unable to delete temporary file "{temp_file.name}"')
+            # Restore the actual return code
+            self._download_retcode = original_retcode
             f['__working'] = success
             if success:
                 f.pop('__needs_testing', None)
                 yield f
             else:
-                self.to_screen('[info] Unable to download format {}. Skipping...'.format(f['format_id']))
+                msg = f'Unable to download format {f["format_id"]}. Skipping...'
+                if warning:
+                    self.report_warning(msg)
+                else:
+                    self.to_screen(f'[info] {msg}')
 
     def _select_formats(self, formats, selector):
         return list(selector({
@@ -2948,7 +2958,7 @@ def is_wellformed(f):
                     )
 
         if self.params.get('check_formats') is True:
-            formats = LazyList(self._check_formats(formats[::-1]), reverse=True)
+            formats = LazyList(self._check_formats(formats[::-1], warning=False), reverse=True)
 
         if not formats or formats[0] is not info_dict:
             # only set the 'formats' fields if the original info_dict list them

yt_dlp/__init__.py

@@ -159,6 +159,12 @@ def set_default_compat(compat_name, opt_name, default=True, remove_compat=True):
     elif 'prefer-vp9-sort' in opts.compat_opts:
         opts.format_sort.extend(FormatSorter._prefer_vp9_sort)
 
+    if 'mtime-by-default' in opts.compat_opts:
+        if opts.updatetime is None:
+            opts.updatetime = True
+        else:
+            _unused_compat_opt('mtime-by-default')
+
     _video_multistreams_set = set_default_compat('multistreams', 'allow_multiple_video_streams', False, remove_compat=False)
     _audio_multistreams_set = set_default_compat('multistreams', 'allow_multiple_audio_streams', False, remove_compat=False)
     if _video_multistreams_set is False and _audio_multistreams_set is False:

yt_dlp/aes.py

@@ -435,7 +435,7 @@ def sub_bytes_inv(data):
 
 
 def rotate(data):
-    return data[1:] + [data[0]]
+    return [*data[1:], data[0]]
 
 
 def key_schedule_core(data, rcon_iteration):

yt_dlp/downloader/fragment.py

@@ -302,7 +302,7 @@ def _finish_frag_download(self, ctx, info_dict):
         elif to_file:
             self.try_rename(ctx['tmpfilename'], ctx['filename'])
             filetime = ctx.get('fragment_filetime')
-            if self.params.get('updatetime', True) and filetime:
+            if self.params.get('updatetime') and filetime:
                 with contextlib.suppress(Exception):
                     os.utime(ctx['filename'], (time.time(), filetime))
 

yt_dlp/downloader/hls.py

@@ -94,12 +94,19 @@ def real_download(self, filename, info_dict):
         can_download, message = self.can_download(s, info_dict, self.params.get('allow_unplayable_formats')), None
         if can_download:
             has_ffmpeg = FFmpegFD.available()
-            no_crypto = not Cryptodome.AES and '#EXT-X-KEY:METHOD=AES-128' in s
+            if not Cryptodome.AES and '#EXT-X-KEY:METHOD=AES-128' in s:
-            if no_crypto and has_ffmpeg:
+                # Even if pycryptodomex isn't available, force HlsFD for m3u8s that won't work with ffmpeg
-                can_download, message = False, 'The stream has AES-128 encryption and pycryptodomex is not available'
+                ffmpeg_can_dl = not traverse_obj(info_dict, ((
-            elif no_crypto:
+                    'extra_param_to_segment_url', 'extra_param_to_key_url',
-                message = ('The stream has AES-128 encryption and neither ffmpeg nor pycryptodomex are available; '
+                    'hls_media_playlist_data', ('hls_aes', ('uri', 'key', 'iv')),
-                           'Decryption will be performed natively, but will be extremely slow')
+                ), any))
+                message = 'The stream has AES-128 encryption and {} available'.format(
+                    'neither ffmpeg nor pycryptodomex are' if ffmpeg_can_dl and not has_ffmpeg else
+                    'pycryptodomex is not')
+                if has_ffmpeg and ffmpeg_can_dl:
+                    can_download = False
+                else:
+                    message += '; decryption will be performed natively, but will be extremely slow'
             elif info_dict.get('extractor_key') == 'Generic' and re.search(r'(?m)#EXT-X-MEDIA-SEQUENCE:(?!0$)', s):
                 install_ffmpeg = '' if has_ffmpeg else 'install ffmpeg and '
                 message = ('Live HLS streams are not supported by the native downloader. If this is a livestream, '

yt_dlp/downloader/http.py

@@ -348,7 +348,7 @@ def retry(e):
             self.try_rename(ctx.tmpfilename, ctx.filename)
 
             # Update file modification time
-            if self.params.get('updatetime', True):
+            if self.params.get('updatetime'):
                 info_dict['filetime'] = self.try_utime(ctx.filename, ctx.data.headers.get('last-modified', None))
 
             self._hook_progress({

yt_dlp/extractor/_extractors.py

@@ -201,7 +201,6 @@
     BanByeChannelIE,
     BanByeIE,
 )
-from .bandaichannel import BandaiChannelIE
 from .bandcamp import (
     BandcampAlbumIE,
     BandcampIE,
@@ -229,7 +228,6 @@
 from .beatport import BeatportIE
 from .beeg import BeegIE
 from .behindkink import BehindKinkIE
-from .bellmedia import BellMediaIE
 from .berufetv import BerufeTVIE
 from .bet import BetIE
 from .bfi import BFIPlayerIE
@@ -275,7 +273,10 @@
     BitChuteChannelIE,
     BitChuteIE,
 )
-from .blackboardcollaborate import BlackboardCollaborateIE
+from .blackboardcollaborate import (
+    BlackboardCollaborateIE,
+    BlackboardCollaborateLaunchIE,
+)
 from .bleacherreport import (
     BleacherReportCMSIE,
     BleacherReportIE,
@@ -309,6 +310,7 @@
     BrilliantpalaClassesIE,
     BrilliantpalaElearnIE,
 )
+from .btvplus import BTVPlusIE
 from .bundesliga import BundesligaIE
 from .bundestag import BundestagIE
 from .bunnycdn import BunnyCdnIE
@@ -446,7 +448,6 @@
     CSpanIE,
 )
 from .ctsnews import CtsNewsIE
-from .ctv import CTVIE
 from .ctvnews import CTVNewsIE
 from .cultureunplugged import CultureUnpluggedIE
 from .curiositystream import (
@@ -805,9 +806,7 @@
 from .hotnewhiphop import HotNewHipHopIE
 from .hotstar import (
     HotStarIE,
-    HotStarPlaylistIE,
     HotStarPrefixIE,
-    HotStarSeasonIE,
     HotStarSeriesIE,
 )
 from .hrefli import HrefLiRedirectIE
@@ -921,10 +920,6 @@
     ShugiinItvVodIE,
 )
 from .jeuxvideo import JeuxVideoIE
-from .jiocinema import (
-    JioCinemaIE,
-    JioCinemaSeriesIE,
-)
 from .jiosaavn import (
     JioSaavnAlbumIE,
     JioSaavnArtistIE,
@@ -934,7 +929,6 @@
     JioSaavnSongIE,
 )
 from .joj import JojIE
-from .joqrag import JoqrAgIE
 from .jove import JoveIE
 from .jstream import JStreamIE
 from .jtbc import (
@@ -1037,11 +1031,6 @@
     LikeeIE,
     LikeeUserIE,
 )
-from .limelight import (
-    LimelightChannelIE,
-    LimelightChannelListIE,
-    LimelightMediaIE,
-)
 from .linkedin import (
     LinkedInEventsIE,
     LinkedInIE,
@@ -1153,6 +1142,7 @@
     MindsIE,
 )
 from .minoto import MinotoIE
+from .mir24tv import Mir24TvIE
 from .mirrativ import (
     MirrativIE,
     MirrativUserIE,
@@ -1173,6 +1163,10 @@
     MixcloudPlaylistIE,
     MixcloudUserIE,
 )
+from .mixlr import (
+    MixlrIE,
+    MixlrRecoringIE,
+)
 from .mlb import (
     MLBIE,
     MLBTVIE,
@@ -1383,7 +1377,6 @@
 from .noice import NoicePodcastIE
 from .nonktube import NonkTubeIE
 from .noodlemagazine import NoodleMagazineIE
-from .noovo import NoovoIE
 from .nosnl import NOSNLArticleIE
 from .nova import (
     NovaEmbedIE,
@@ -1564,6 +1557,7 @@
     PlatziCourseIE,
     PlatziIE,
 )
+from .playerfm import PlayerFmIE
 from .playplustv import PlayPlusTVIE
 from .playsuisse import PlaySuisseIE
 from .playtvak import PlaytvakIE
@@ -1830,6 +1824,7 @@
 from .saitosan import SaitosanIE
 from .samplefocus import SampleFocusIE
 from .sapo import SapoIE
+from .sauceplus import SaucePlusIE
 from .sbs import SBSIE
 from .sbscokr import (
     SBSCoKrAllvodProgramIE,
@@ -2101,6 +2096,7 @@
     TheGuardianPodcastIE,
     TheGuardianPodcastPlaylistIE,
 )
+from .thehighwire import TheHighWireIE
 from .theholetv import TheHoleTvIE
 from .theintercept import TheInterceptIE
 from .theplatform import (
@@ -2289,6 +2285,7 @@
 )
 from .umg import UMGDeIE
 from .unistra import UnistraIE
+from .unitednations import UnitedNationsWebTvIE
 from .unity import UnityIE
 from .unsupported import (
     KnownDRMIE,

yt_dlp/extractor/aenetworks.py

@@ -111,11 +111,9 @@ class AENetworksIE(AENetworksBaseIE):
     IE_NAME = 'aenetworks'
     IE_DESC = 'A+E Networks: A&E, Lifetime, History.com, FYI Network and History Vault'
     _VALID_URL = AENetworksBaseIE._BASE_URL_REGEX + r'''(?P<id>
-        shows/[^/]+/season-\d+/episode-\d+|
+        shows/[^/?#]+/season-\d+/episode-\d+|
-        (?:
+        (?P<type>movie|special)s/[^/?#]+(?P<extra>/[^/?#]+)?|
-            (?:movie|special)s/[^/]+|
+        (?:shows/[^/?#]+/)?videos/[^/?#]+
-            (?:shows/[^/]+/)?videos
-        )/[^/?#&]+
     )'''
     _TESTS = [{
         'url': 'http://www.history.com/shows/mountain-men/season-1/episode-1',
@@ -128,7 +126,7 @@ class AENetworksIE(AENetworksBaseIE):
             'upload_date': '20120529',
             'uploader': 'AENE-NEW',
             'duration': 2592.0,
-            'thumbnail': r're:^https?://.*\.jpe?g$',
+            'thumbnail': r're:https?://.+/.+\.jpg',
             'chapters': 'count:5',
             'tags': 'count:14',
             'categories': ['Mountain Men'],
@@ -139,10 +137,7 @@ class AENetworksIE(AENetworksBaseIE):
             'series': 'Mountain Men',
             'age_limit': 0,
         },
-        'params': {
+        'params': {'skip_download': 'm3u8'},
-            # m3u8 download
-            'skip_download': True,
-        },
         'add_ie': ['ThePlatform'],
         'skip': 'Geo-restricted - This content is not available in your location.',
     }, {
@@ -156,7 +151,7 @@ class AENetworksIE(AENetworksBaseIE):
             'upload_date': '20160112',
             'uploader': 'AENE-NEW',
             'duration': 1277.695,
-            'thumbnail': r're:^https?://.*\.jpe?g$',
+            'thumbnail': r're:https?://.+/.+\.jpg',
             'chapters': 'count:4',
             'tags': 'count:23',
             'episode': 'Inlawful Entry',
@@ -166,10 +161,53 @@ class AENetworksIE(AENetworksBaseIE):
             'series': 'Duck Dynasty',
             'age_limit': 0,
         },
-        'params': {
+        'params': {'skip_download': 'm3u8'},
-            # m3u8 download
+        'add_ie': ['ThePlatform'],
-            'skip_download': True,
+    }, {
+        'url': 'https://play.mylifetime.com/movies/v-c-andrews-web-of-dreams',
+        'info_dict': {
+            'id': '1590627395981',
+            'ext': 'mp4',
+            'title': 'VC Andrews\' Web of Dreams',
+            'description': 'md5:2a8ba13ae64271c79eb65c0577d312ce',
+            'uploader': 'AENE-NEW',
+            'age_limit': 14,
+            'duration': 5253.665,
+            'thumbnail': r're:https?://.+/.+\.jpg',
+            'chapters': 'count:8',
+            'tags': ['lifetime', 'mylifetime', 'lifetime channel', "VC Andrews' Web of Dreams"],
+            'series': '',
+            'season': 'Season 0',
+            'season_number': 0,
+            'episode': 'VC Andrews\' Web of Dreams',
+            'episode_number': 0,
+            'timestamp': 1566489703.0,
+            'upload_date': '20190822',
         },
+        'params': {'skip_download': 'm3u8'},
+        'add_ie': ['ThePlatform'],
+    }, {
+        'url': 'https://www.aetv.com/specials/hunting-jonbenets-killer-the-untold-story',
+        'info_dict': {
+            'id': '1488235587551',
+            'ext': 'mp4',
+            'title': 'Hunting JonBenet\'s Killer: The Untold Story',
+            'description': 'md5:209869425ee392d74fe29201821e48b4',
+            'uploader': 'AENE-NEW',
+            'age_limit': 14,
+            'duration': 5003.903,
+            'thumbnail': r're:https?://.+/.+\.jpg',
+            'chapters': 'count:10',
+            'tags': 'count:11',
+            'series': '',
+            'season': 'Season 0',
+            'season_number': 0,
+            'episode': 'Hunting JonBenet\'s Killer: The Untold Story',
+            'episode_number': 0,
+            'timestamp': 1554987697.0,
+            'upload_date': '20190411',
+        },
+        'params': {'skip_download': 'm3u8'},
         'add_ie': ['ThePlatform'],
     }, {
         'url': 'http://www.fyi.tv/shows/tiny-house-nation/season-1/episode-8',
@@ -198,7 +236,9 @@ class AENetworksIE(AENetworksBaseIE):
     }]
 
     def _real_extract(self, url):
-        domain, canonical = self._match_valid_url(url).groups()
+        domain, canonical, url_type, extra = self._match_valid_url(url).group('domain', 'id', 'type', 'extra')
+        if url_type in ('movie', 'special') and not extra:
+            canonical += f'/full-{url_type}'
         return self._extract_aetn_info(domain, 'canonical', '/' + canonical, url)
 
 

yt_dlp/extractor/archiveorg.py

@@ -16,6 +16,7 @@
     dict_get,
     extract_attributes,
     get_element_by_id,
+    get_element_text_and_html_by_tag,
     int_or_none,
     join_nonempty,
     js_to_json,
@@ -72,6 +73,7 @@ class ArchiveOrgIE(InfoExtractor):
             'display_id': 'Cops-v2.mp4',
             'thumbnail': r're:https://archive\.org/download/.*\.jpg',
             'duration': 1091.96,
+            'track': 'Cops-v2',
         },
     }, {
         'url': 'http://archive.org/embed/XD300-23_68HighlightsAResearchCntAugHumanIntellect',
@@ -86,6 +88,7 @@ class ArchiveOrgIE(InfoExtractor):
             'thumbnail': r're:https://archive\.org/download/.*\.jpg',
             'duration': 59.77,
             'display_id': 'Commercial-JFK1960ElectionAdCampaignJingle.mpg',
+            'track': 'Commercial-JFK1960ElectionAdCampaignJingle',
         },
     }, {
         'url': 'https://archive.org/details/Election_Ads/Commercial-Nixon1960ElectionAdToughonDefense.mpg',
@@ -102,6 +105,7 @@ class ArchiveOrgIE(InfoExtractor):
             'duration': 59.51,
             'license': 'http://creativecommons.org/licenses/publicdomain/',
             'thumbnail': r're:https://archive\.org/download/.*\.jpg',
+            'track': 'Commercial-Nixon1960ElectionAdToughonDefense',
         },
     }, {
         'url': 'https://archive.org/details/gd1977-05-08.shure57.stevenson.29303.flac16',
@@ -182,6 +186,7 @@ class ArchiveOrgIE(InfoExtractor):
                     'duration': 130.46,
                     'thumbnail': 'https://archive.org/download/irelandthemakingofarepublic/irelandthemakingofarepublic.thumbs/irelandthemakingofarepublicreel1_01_000117.jpg',
                     'display_id': 'irelandthemakingofarepublicreel1_01.mov',
+                    'track': 'irelandthemakingofarepublicreel1 01',
                 },
             }, {
                 'md5': '67335ee3b23a0da930841981c1e79b02',
@@ -192,6 +197,7 @@ class ArchiveOrgIE(InfoExtractor):
                     'title': 'irelandthemakingofarepublicreel1_02.mov',
                     'display_id': 'irelandthemakingofarepublicreel1_02.mov',
                     'thumbnail': 'https://archive.org/download/irelandthemakingofarepublic/irelandthemakingofarepublic.thumbs/irelandthemakingofarepublicreel1_02_001374.jpg',
+                    'track': 'irelandthemakingofarepublicreel1 02',
                 },
             }, {
                 'md5': 'e470e86787893603f4a341a16c281eb5',
@@ -202,6 +208,7 @@ class ArchiveOrgIE(InfoExtractor):
                     'title': 'irelandthemakingofarepublicreel2.mov',
                     'thumbnail': 'https://archive.org/download/irelandthemakingofarepublic/irelandthemakingofarepublic.thumbs/irelandthemakingofarepublicreel2_001554.jpg',
                     'display_id': 'irelandthemakingofarepublicreel2.mov',
+                    'track': 'irelandthemakingofarepublicreel2',
                 },
             },
         ],
@@ -229,15 +236,8 @@ class ArchiveOrgIE(InfoExtractor):
 
     @staticmethod
     def _playlist_data(webpage):
-        element = re.findall(r'''(?xs)
+        element = get_element_text_and_html_by_tag('play-av', webpage)[1]
-            <input
+        return json.loads(extract_attributes(element)['playlist'])
-            (?:\s+[a-zA-Z0-9:._-]+(?:=[a-zA-Z0-9:._-]*|="[^"]*"|='[^']*'|))*?
-            \s+class=['"]?js-play8-playlist['"]?
-            (?:\s+[a-zA-Z0-9:._-]+(?:=[a-zA-Z0-9:._-]*|="[^"]*"|='[^']*'|))*?
-            \s*/>
-        ''', webpage)[0]
-
-        return json.loads(extract_attributes(element)['value'])
 
     def _real_extract(self, url):
         video_id = urllib.parse.unquote_plus(self._match_id(url))

yt_dlp/extractor/bandaichannel.py

@@ -1,33 +0,0 @@
-from .brightcove import BrightcoveNewBaseIE
-from ..utils import extract_attributes
-
-
-class BandaiChannelIE(BrightcoveNewBaseIE):
-    IE_NAME = 'bandaichannel'
-    _VALID_URL = r'https?://(?:www\.)?b-ch\.com/titles/(?P<id>\d+/\d+)'
-    _TESTS = [{
-        'url': 'https://www.b-ch.com/titles/514/001',
-        'md5': 'a0f2d787baa5729bed71108257f613a4',
-        'info_dict': {
-            'id': '6128044564001',
-            'ext': 'mp4',
-            'title': 'メタルファイターMIKU 第1話',
-            'timestamp': 1580354056,
-            'uploader_id': '5797077852001',
-            'upload_date': '20200130',
-            'duration': 1387.733,
-        },
-        'params': {
-            'skip_download': True,
-        },
-    }]
-
-    def _real_extract(self, url):
-        video_id = self._match_id(url)
-        webpage = self._download_webpage(url, video_id)
-        attrs = extract_attributes(self._search_regex(
-            r'(<video-js[^>]+\bid="bcplayer"[^>]*>)', webpage, 'player'))
-        bc = self._download_json(
-            'https://pbifcd.b-ch.com/v1/playbackinfo/ST/70/' + attrs['data-info'],
-            video_id, headers={'X-API-KEY': attrs['data-auth'].strip()})['bc']
-        return self._parse_brightcove_metadata(bc, bc['id'])

yt_dlp/extractor/bellmedia.py

@@ -1,91 +0,0 @@
-from .common import InfoExtractor
-
-
-class BellMediaIE(InfoExtractor):
-    _VALID_URL = r'''(?x)https?://(?:www\.)?
-        (?P<domain>
-            (?:
-                ctv|
-                tsn|
-                bnn(?:bloomberg)?|
-                thecomedynetwork|
-                discovery|
-                discoveryvelocity|
-                sciencechannel|
-                investigationdiscovery|
-                animalplanet|
-                bravo|
-                mtv|
-                space|
-                etalk|
-                marilyn
-            )\.ca|
-            (?:much|cp24)\.com
-        )/.*?(?:\b(?:vid(?:eoid)?|clipId)=|-vid|~|%7E|/(?:episode)?)(?P<id>[0-9]{6,})'''
-    _TESTS = [{
-        'url': 'https://www.bnnbloomberg.ca/video/david-cockfield-s-top-picks~1403070',
-        'md5': '3e5b8e38370741d5089da79161646635',
-        'info_dict': {
-            'id': '1403070',
-            'ext': 'flv',
-            'title': 'David Cockfield\'s Top Picks',
-            'description': 'md5:810f7f8c6a83ad5b48677c3f8e5bb2c3',
-            'upload_date': '20180525',
-            'timestamp': 1527288600,
-            'season_id': '73997',
-            'season': '2018',
-            'thumbnail': 'http://images2.9c9media.com/image_asset/2018_5_25_baf30cbd-b28d-4a18-9903-4bb8713b00f5_PNG_956x536.jpg',
-            'tags': [],
-            'categories': ['ETFs'],
-            'season_number': 8,
-            'duration': 272.038,
-            'series': 'Market Call Tonight',
-        },
-    }, {
-        'url': 'http://www.thecomedynetwork.ca/video/player?vid=923582',
-        'only_matching': True,
-    }, {
-        'url': 'http://www.tsn.ca/video/expectations-high-for-milos-raonic-at-us-open~939549',
-        'only_matching': True,
-    }, {
-        'url': 'http://www.bnn.ca/video/berman-s-call-part-two-viewer-questions~939654',
-        'only_matching': True,
-    }, {
-        'url': 'http://www.ctv.ca/YourMorning/Video/S1E6-Monday-August-29-2016-vid938009',
-        'only_matching': True,
-    }, {
-        'url': 'http://www.much.com/shows/atmidnight/episode948007/tuesday-september-13-2016',
-        'only_matching': True,
-    }, {
-        'url': 'http://www.much.com/shows/the-almost-impossible-gameshow/928979/episode-6',
-        'only_matching': True,
-    }, {
-        'url': 'http://www.ctv.ca/DCs-Legends-of-Tomorrow/Video/S2E11-Turncoat-vid1051430',
-        'only_matching': True,
-    }, {
-        'url': 'http://www.etalk.ca/video?videoid=663455',
-        'only_matching': True,
-    }, {
-        'url': 'https://www.cp24.com/video?clipId=1982548',
-        'only_matching': True,
-    }]
-    _DOMAINS = {
-        'thecomedynetwork': 'comedy',
-        'discoveryvelocity': 'discvel',
-        'sciencechannel': 'discsci',
-        'investigationdiscovery': 'invdisc',
-        'animalplanet': 'aniplan',
-        'etalk': 'ctv',
-        'bnnbloomberg': 'bnn',
-        'marilyn': 'ctv_marilyn',
-    }
-
-    def _real_extract(self, url):
-        domain, video_id = self._match_valid_url(url).groups()
-        domain = domain.split('.')[0]
-        return {
-            '_type': 'url_transparent',
-            'id': video_id,
-            'url': f'9c9media:{self._DOMAINS.get(domain, domain)}_web:{video_id}',
-            'ie_key': 'NineCNineMedia',
-        }

yt_dlp/extractor/bilibili.py

@@ -900,7 +900,9 @@ def _real_extract(self, url):
                 headers=headers))
 
         geo_blocked = traverse_obj(play_info, (
-            'raw', 'data', 'plugins', lambda _, v: v['name'] == 'AreaLimitPanel', 'config', 'is_block', {bool}, any))
+            ('result', ('raw', 'data')), 'plugins',
+            lambda _, v: v['name'] == 'AreaLimitPanel',
+            'config', 'is_block', {bool}, any))
         premium_only = play_info.get('code') == -10403
 
         video_info = traverse_obj(play_info, (('result', ('raw', 'data')), 'video_info', {dict}, any)) or {}
@@ -914,7 +916,7 @@ def _real_extract(self, url):
 
         if traverse_obj(play_info, ((
             ('result', 'play_check', 'play_detail'),  # 'PLAY_PREVIEW' vs 'PLAY_WHOLE'
-            ('raw', 'data', 'play_video_type'),  # 'preview' vs 'whole'
+            (('result', ('raw', 'data')), 'play_video_type'),  # 'preview' vs 'whole' vs 'none'
         ), any, {lambda x: x in ('PLAY_PREVIEW', 'preview')})):
             self.report_warning(
                 'Only preview format is available, '

yt_dlp/extractor/blackboardcollaborate.py

@@ -1,16 +1,27 @@
 from .common import InfoExtractor
-from ..utils import parse_iso8601
+from ..utils import (
+    UnsupportedError,
+    float_or_none,
+    int_or_none,
+    join_nonempty,
+    jwt_decode_hs256,
+    mimetype2ext,
+    parse_iso8601,
+    parse_qs,
+    url_or_none,
+)
+from ..utils.traversal import traverse_obj
 
 
 class BlackboardCollaborateIE(InfoExtractor):
     _VALID_URL = r'''(?x)
                         https?://
-                        (?P<region>[a-z-]+)\.bbcollab\.com/
+                        (?P<region>[a-z]+)(?:-lti)?\.bbcollab\.com/
                         (?:
                             collab/ui/session/playback/load|
                             recording
                         )/
-                        (?P<id>[^/]+)'''
+                        (?P<id>[^/?#]+)'''
     _TESTS = [
         {
             'url': 'https://us-lti.bbcollab.com/collab/ui/session/playback/load/0a633b6a88824deb8c918f470b22b256',
@@ -19,9 +30,55 @@ class BlackboardCollaborateIE(InfoExtractor):
                 'id': '0a633b6a88824deb8c918f470b22b256',
                 'title': 'HESI A2 Information Session - Thursday, May 6, 2021 - recording_1',
                 'ext': 'mp4',
-                'duration': 1896000,
+                'duration': 1896,
-                'timestamp': 1620331399,
+                'timestamp': 1620333295,
                 'upload_date': '20210506',
+                'subtitles': {
+                    'live_chat': 'mincount:1',
+                },
+            },
+        },
+        {
+            'url': 'https://eu.bbcollab.com/collab/ui/session/playback/load/4bde2dee104f40289a10f8e554270600',
+            'md5': '108db6a8f83dcb0c2a07793649581865',
+            'info_dict': {
+                'id': '4bde2dee104f40289a10f8e554270600',
+                'title': 'Meeting - Azerbaycanca erize formasi',
+                'ext': 'mp4',
+                'duration': 880,
+                'timestamp': 1671176868,
+                'upload_date': '20221216',
+            },
+        },
+        {
+            'url': 'https://eu.bbcollab.com/recording/f83be390ecff46c0bf7dccb9dddcf5f6',
+            'md5': 'e3b0b88ddf7847eae4b4c0e2d40b83a5',
+            'info_dict': {
+                'id': 'f83be390ecff46c0bf7dccb9dddcf5f6',
+                'title': 'Keynote lecture by Laura Carvalho - recording_1',
+                'ext': 'mp4',
+                'duration': 5506,
+                'timestamp': 1662721705,
+                'upload_date': '20220909',
+                'subtitles': {
+                    'live_chat': 'mincount:1',
+                },
+            },
+        },
+        {
+            'url': 'https://eu.bbcollab.com/recording/c3e1e7c9e83d4cd9981c93c74888d496',
+            'md5': 'fdb2d8c43d66fbc0b0b74ef5e604eb1f',
+            'info_dict': {
+                'id': 'c3e1e7c9e83d4cd9981c93c74888d496',
+                'title': 'International Ally User Group - recording_18',
+                'ext': 'mp4',
+                'duration': 3479,
+                'timestamp': 1721919621,
+                'upload_date': '20240725',
+                'subtitles': {
+                    'en': 'mincount:1',
+                    'live_chat': 'mincount:1',
+                },
             },
         },
         {
@@ -42,22 +99,81 @@ class BlackboardCollaborateIE(InfoExtractor):
         },
     ]
 
+    def _call_api(self, region, video_id, path=None, token=None, note=None, fatal=False):
+        # Ref: https://github.com/blackboard/BBDN-Collab-Postman-REST
+        return self._download_json(
+            join_nonempty(f'https://{region}.bbcollab.com/collab/api/csa/recordings', video_id, path, delim='/'),
+            video_id, note or 'Downloading JSON metadata', fatal=fatal,
+            headers={'Authorization': f'Bearer {token}'} if token else None)
+
     def _real_extract(self, url):
         mobj = self._match_valid_url(url)
         region = mobj.group('region')
         video_id = mobj.group('id')
-        info = self._download_json(
+        token = parse_qs(url).get('authToken', [None])[-1]
-            f'https://{region}.bbcollab.com/collab/api/csa/recordings/{video_id}/data', video_id)
+
-        duration = info.get('duration')
+        video_info = self._call_api(region, video_id, path='data/secure', token=token, note='Trying auth token')
-        title = info['name']
+        if video_info:
-        upload_date = info.get('created')
+            video_extra = self._call_api(region, video_id, token=token, note='Retrieving extra attributes')
-        streams = info['streams']
+        else:
-        formats = [{'format_id': k, 'url': url} for k, url in streams.items()]
+            video_info = self._call_api(region, video_id, path='data', note='Trying fallback', fatal=True)
+            video_extra = {}
+
+        formats = traverse_obj(video_info, ('extStreams', lambda _, v: url_or_none(v['streamUrl']), {
+            'url': 'streamUrl',
+            'ext': ('contentType', {mimetype2ext}),
+            'aspect_ratio': ('aspectRatio', {float_or_none}),
+        }))
+
+        if filesize := traverse_obj(video_extra, ('storageSize', {int_or_none})):
+            for fmt in formats:
+                fmt['filesize'] = filesize
+
+        subtitles = {}
+        for subs in traverse_obj(video_info, ('subtitles', lambda _, v: url_or_none(v['url']))):
+            subtitles.setdefault(subs.get('lang') or 'und', []).append({
+                'name': traverse_obj(subs, ('label', {str})),
+                'url': subs['url'],
+            })
+
+        for live_chat_url in traverse_obj(video_info, ('chats', ..., 'url', {url_or_none})):
+            subtitles.setdefault('live_chat', []).append({'url': live_chat_url})
 
         return {
-            'duration': duration,
+            **traverse_obj(video_info, {
+                'title': ('name', {str}),
+                'timestamp': ('created', {parse_iso8601}),
+                'duration': ('duration', {int_or_none(scale=1000)}),
+            }),
             'formats': formats,
             'id': video_id,
-            'timestamp': parse_iso8601(upload_date),
+            'subtitles': subtitles,
-            'title': title,
         }
+
+
+class BlackboardCollaborateLaunchIE(InfoExtractor):
+    _VALID_URL = r'https?://[a-z]+\.bbcollab\.com/launch/(?P<id>[^/?#]+)'
+
+    _TESTS = [
+        {
+            'url': 'https://au.bbcollab.com/launch/eyJhbGciOiJIUzI1NiJ9.eyJpc3MiOiJiYkNvbGxhYkFwaSIsInN1YiI6ImJiQ29sbGFiQXBpIiwiZXhwIjoxNzQwNDE2NDgzLCJpYXQiOjE3NDA0MTYxODMsInJlc291cmNlQWNjZXNzVGlja2V0Ijp7InJlc291cmNlSWQiOiI3MzI4YzRjZTNmM2U0ZTcwYmY3MTY3N2RkZTgzMzk2NSIsImNvbnN1bWVySWQiOiJhM2Q3NGM0Y2QyZGU0MGJmODFkMjFlODNlMmEzNzM5MCIsInR5cGUiOiJSRUNPUkRJTkciLCJyZXN0cmljdGlvbiI6eyJ0eXBlIjoiVElNRSIsImV4cGlyYXRpb25Ib3VycyI6MCwiZXhwaXJhdGlvbk1pbnV0ZXMiOjUsIm1heFJlcXVlc3RzIjotMX0sImRpc3Bvc2l0aW9uIjoiTEFVTkNIIiwibGF1bmNoVHlwZSI6bnVsbCwibGF1bmNoQ29tcG9uZW50IjpudWxsLCJsYXVuY2hQYXJhbUtleSI6bnVsbH19.xuELw4EafEwUMoYcCHidGn4Tw9O1QCbYHzYGJUl0kKk',
+            'only_matching': True,
+        },
+        {
+            'url': 'https://us.bbcollab.com/launch/eyJhbGciOiJIUzI1NiJ9.eyJpc3MiOiJiYkNvbGxhYkFwaSIsInN1YiI6ImJiQ29sbGFiQXBpIiwiZXhwIjoxNjk0NDgxOTc3LCJpYXQiOjE2OTQ0ODE2NzcsInJlc291cmNlQWNjZXNzVGlja2V0Ijp7InJlc291cmNlSWQiOiI3YWU0MTFhNTU3NjU0OWFiOTZlYjVmMTM1YmY3MWU5MCIsImNvbnN1bWVySWQiOiJBRUU2MEI4MDI2QzM3ODU2RjMwMzNEN0ZEOTQzMTFFNSIsInR5cGUiOiJSRUNPUkRJTkciLCJyZXN0cmljdGlvbiI6eyJ0eXBlIjoiVElNRSIsImV4cGlyYXRpb25Ib3VycyI6MCwiZXhwaXJhdGlvbk1pbnV0ZXMiOjUsIm1heFJlcXVlc3RzIjotMX0sImRpc3Bvc2l0aW9uIjoiTEFVTkNIIiwibGF1bmNoVHlwZSI6bnVsbCwibGF1bmNoQ29tcG9uZW50IjpudWxsLCJsYXVuY2hQYXJhbUtleSI6bnVsbH19.yOhRZNaIjXYoMYMpcTzgjZJCnIFaYf2cAzbco8OAxlY',
+            'only_matching': True,
+        },
+        {
+            'url': 'https://eu.bbcollab.com/launch/eyJhbGciOiJIUzI1NiJ9.eyJpc3MiOiJiYkNvbGxhYkFwaSIsInN1YiI6ImJiQ29sbGFiQXBpIiwiZXhwIjoxNzUyNjgyODYwLCJpYXQiOjE3NTI2ODI1NjAsInJlc291cmNlQWNjZXNzVGlja2V0Ijp7InJlc291cmNlSWQiOiI4MjQzYjFiODg2Nzk0NTZkYjkwN2NmNDZmZmE1MmFhZiIsImNvbnN1bWVySWQiOiI5ZTY4NzYwZWJiNzM0MzRiYWY3NTQyZjA1YmJkOTMzMCIsInR5cGUiOiJSRUNPUkRJTkciLCJyZXN0cmljdGlvbiI6eyJ0eXBlIjoiVElNRSIsImV4cGlyYXRpb25Ib3VycyI6MCwiZXhwaXJhdGlvbk1pbnV0ZXMiOjUsIm1heFJlcXVlc3RzIjotMX0sImRpc3Bvc2l0aW9uIjoiTEFVTkNIIiwibGF1bmNoVHlwZSI6bnVsbCwibGF1bmNoQ29tcG9uZW50IjpudWxsLCJsYXVuY2hQYXJhbUtleSI6bnVsbH19.Xj4ymojYLwZ1vKPKZ-KxjpqQvFXoJekjRaG0npngwWs',
+            'only_matching': True,
+        },
+    ]
+
+    def _real_extract(self, url):
+        token = self._match_id(url)
+        video_id = jwt_decode_hs256(token)['resourceAccessTicket']['resourceId']
+
+        redirect_url = self._request_webpage(url, video_id).url
+        if self.suitable(redirect_url):
+            raise UnsupportedError(redirect_url)
+        return self.url_result(redirect_url, BlackboardCollaborateIE, video_id)

yt_dlp/extractor/btvplus.py

@@ -0,0 +1,73 @@
+from .common import InfoExtractor
+from ..utils import (
+    bug_reports_message,
+    clean_html,
+    get_element_by_class,
+    js_to_json,
+    mimetype2ext,
+    strip_or_none,
+    url_or_none,
+    urljoin,
+)
+from ..utils.traversal import traverse_obj
+
+
+class BTVPlusIE(InfoExtractor):
+    _VALID_URL = r'https?://(?:www\.)?btvplus\.bg/produkt/(?:predavaniya|seriali|novini)/(?P<id>\d+)'
+    _TESTS = [{
+        'url': 'https://btvplus.bg/produkt/predavaniya/67271/btv-reporterite/btv-reporterite-12-07-2025-g',
+        'info_dict': {
+            'ext': 'mp4',
+            'id': '67271',
+            'title': 'bTV Репортерите - 12.07.2025 г.',
+            'thumbnail': 'https://cdn.btv.bg/media/images/940x529/Jul2025/2113606319.jpg',
+        },
+    }, {
+        'url': 'https://btvplus.bg/produkt/seriali/66942/sezon-2/plen-sezon-2-epizod-55',
+        'info_dict': {
+            'ext': 'mp4',
+            'id': '66942',
+            'title': 'Плен - сезон 2, епизод 55',
+            'thumbnail': 'https://cdn.btv.bg/media/images/940x529/Jun2025/2113595104.jpg',
+        },
+    }, {
+        'url': 'https://btvplus.bg/produkt/novini/67270/btv-novinite-centralna-emisija-12-07-2025',
+        'only_matching': True,
+    }]
+
+    def _real_extract(self, url):
+        video_id = self._match_id(url)
+        webpage = self._download_webpage(url, video_id)
+
+        player_url = self._search_regex(
+            r'var\s+videoUrl\s*=\s*[\'"]([^\'"]+)[\'"]',
+            webpage, 'player URL')
+
+        player_config = self._download_json(
+            urljoin('https://btvplus.bg', player_url), video_id)['config']
+
+        videojs_data = self._search_json(
+            r'videojs\(["\'][^"\']+["\'],', player_config, 'videojs data',
+            video_id, transform_source=js_to_json)
+        formats = []
+        subtitles = {}
+        for src in traverse_obj(videojs_data, ('sources', lambda _, v: url_or_none(v['src']))):
+            ext = mimetype2ext(src.get('type'))
+            if ext == 'm3u8':
+                fmts, subs = self._extract_m3u8_formats_and_subtitles(
+                    src['src'], video_id, 'mp4', m3u8_id='hls', fatal=False)
+                formats.extend(fmts)
+                self._merge_subtitles(subs, target=subtitles)
+            else:
+                self.report_warning(f'Unknown format type {ext}{bug_reports_message()}')
+
+        return {
+            'id': video_id,
+            'formats': formats,
+            'subtitles': subtitles,
+            'title': (
+                strip_or_none(self._og_search_title(webpage, default=None))
+                or clean_html(get_element_by_class('product-title', webpage))),
+            'thumbnail': self._og_search_thumbnail(webpage, default=None),
+            'description': self._og_search_description(webpage, default=None),
+        }

yt_dlp/extractor/common.py

@@ -1,5 +1,6 @@
 import base64
 import collections
+import contextlib
 import functools
 import getpass
 import http.client
@@ -1782,6 +1783,59 @@ def _search_nextjs_data(self, webpage, video_id, *, fatal=True, default=NO_DEFAU
             r'<script[^>]+id=[\'"]__NEXT_DATA__[\'"][^>]*>', webpage, 'next.js data',
             video_id, end_pattern='</script>', fatal=fatal, default=default, **kw)
 
+    def _search_nextjs_v13_data(self, webpage, video_id, fatal=True):
+        """Parses Next.js app router flight data that was introduced in Next.js v13"""
+        nextjs_data = {}
+        if not fatal and not isinstance(webpage, str):
+            return nextjs_data
+
+        def flatten(flight_data):
+            if not isinstance(flight_data, list):
+                return
+            if len(flight_data) == 4 and flight_data[0] == '$':
+                _, name, _, data = flight_data
+                if not isinstance(data, dict):
+                    return
+                children = data.pop('children', None)
+                if data and isinstance(name, str) and re.fullmatch(r'\$L[0-9a-f]+', name):
+                    # It is useful hydration JSON data
+                    nextjs_data[name[2:]] = data
+                flatten(children)
+                return
+            for f in flight_data:
+                flatten(f)
+
+        flight_text = ''
+        # The pattern for the surrounding JS/tag should be strict as it's a hardcoded string in the next.js source
+        # Ref: https://github.com/vercel/next.js/blob/5a4a08fdc/packages/next/src/server/app-render/use-flight-response.tsx#L189
+        for flight_segment in re.findall(r'<script\b[^>]*>self\.__next_f\.push\((\[.+?\])\)</script>', webpage):
+            segment = self._parse_json(flight_segment, video_id, fatal=fatal, errnote=None if fatal else False)
+            # Some earlier versions of next.js "optimized" away this array structure; this is unsupported
+            # Ref: https://github.com/vercel/next.js/commit/0123a9d5c9a9a77a86f135b7ae30b46ca986d761
+            if not isinstance(segment, list) or len(segment) != 2:
+                self.write_debug(
+                    f'{video_id}: Unsupported next.js flight data structure detected', only_once=True)
+                continue
+            # Only use the relevant payload type (1 == data)
+            # Ref: https://github.com/vercel/next.js/blob/5a4a08fdc/packages/next/src/server/app-render/use-flight-response.tsx#L11-L14
+            payload_type, chunk = segment
+            if payload_type == 1:
+                flight_text += chunk
+
+        for f in flight_text.splitlines():
+            prefix, _, body = f.lstrip().partition(':')
+            if not re.fullmatch(r'[0-9a-f]+', prefix):
+                continue
+            # The body still isn't guaranteed to be valid JSON, so parsing should always be non-fatal
+            if body.startswith('[') and body.endswith(']'):
+                flatten(self._parse_json(body, video_id, fatal=False, errnote=False))
+            elif body.startswith('{') and body.endswith('}'):
+                data = self._parse_json(body, video_id, fatal=False, errnote=False)
+                if data is not None:
+                    nextjs_data[prefix] = data
+
+        return nextjs_data
+
     def _search_nuxt_data(self, webpage, video_id, context_name='__NUXT__', *, fatal=True, traverse=('data', 0)):
         """Parses Nuxt.js metadata. This works as long as the function __NUXT__ invokes is a pure function"""
         rectx = re.escape(context_name)
@@ -2129,21 +2183,33 @@ def _extract_m3u8_formats_and_subtitles(
                     raise ExtractorError(errnote, video_id=video_id)
                 self.report_warning(f'{errnote}{bug_reports_message()}')
             return [], {}
-
+        if note is None:
-        res = self._download_webpage_handle(
+            note = 'Downloading m3u8 information'
-            m3u8_url, video_id,
+        if errnote is None:
-            note='Downloading m3u8 information' if note is None else note,
+            errnote = 'Failed to download m3u8 information'
-            errnote='Failed to download m3u8 information' if errnote is None else errnote,
+        response = self._request_webpage(
+            m3u8_url, video_id, note=note, errnote=errnote,
             fatal=fatal, data=data, headers=headers, query=query)
-
+        if response is False:
-        if res is False:
             return [], {}
 
-        m3u8_doc, urlh = res
+        with contextlib.closing(response):
-        m3u8_url = urlh.url
+            prefix = response.read(512)
+            if not prefix.startswith(b'#EXTM3U'):
+                msg = 'Response data has no m3u header'
+                if fatal:
+                    raise ExtractorError(msg, video_id=video_id)
+                self.report_warning(f'{msg}{bug_reports_message()}', video_id=video_id)
+                return [], {}
+
+            content = self._webpage_read_content(
+                response, m3u8_url, video_id, note=note, errnote=errnote,
+                fatal=fatal, prefix=prefix, data=data)
+        if content is False:
+            return [], {}
 
         return self._parse_m3u8_formats_and_subtitles(
-            m3u8_doc, m3u8_url, ext=ext, entry_protocol=entry_protocol,
+            content, response.url, ext=ext, entry_protocol=entry_protocol,
             preference=preference, quality=quality, m3u8_id=m3u8_id,
             note=note, errnote=errnote, fatal=fatal, live=live, data=data,
             headers=headers, query=query, video_id=video_id)

yt_dlp/extractor/ctv.py

@@ -1,49 +0,0 @@
-from .common import InfoExtractor
-
-
-class CTVIE(InfoExtractor):
-    _VALID_URL = r'https?://(?:www\.)?ctv\.ca/(?P<id>(?:show|movie)s/[^/]+/[^/?#&]+)'
-    _TESTS = [{
-        'url': 'https://www.ctv.ca/shows/your-morning/wednesday-december-23-2020-s5e88',
-        'info_dict': {
-            'id': '2102249',
-            'ext': 'flv',
-            'title': 'Wednesday, December 23, 2020',
-            'thumbnail': r're:^https?://.*\.jpg$',
-            'description': 'Your Morning delivers original perspectives and unique insights into the headlines of the day.',
-            'timestamp': 1608732000,
-            'upload_date': '20201223',
-            'series': 'Your Morning',
-            'season': '2020-2021',
-            'season_number': 5,
-            'episode_number': 88,
-            'tags': ['Your Morning'],
-            'categories': ['Talk Show'],
-            'duration': 7467.126,
-        },
-    }, {
-        'url': 'https://www.ctv.ca/movies/adam-sandlers-eight-crazy-nights/adam-sandlers-eight-crazy-nights',
-        'only_matching': True,
-    }]
-
-    def _real_extract(self, url):
-        display_id = self._match_id(url)
-        content = self._download_json(
-            'https://www.ctv.ca/space-graphql/graphql', display_id, query={
-                'query': '''{
-  resolvedPath(path: "/%s") {
-    lastSegment {
-      content {
-        ... on AxisContent {
-          axisId
-          videoPlayerDestCode
-        }
-      }
-    }
-  }
-}''' % display_id,  # noqa: UP031
-            })['data']['resolvedPath']['lastSegment']['content']
-        video_id = content['axisId']
-        return self.url_result(
-            '9c9media:{}:{}'.format(content['videoPlayerDestCode'], video_id),
-            'NineCNineMedia', video_id)

yt_dlp/extractor/dangalplay.py

@@ -11,8 +11,14 @@
 
 class DangalPlayBaseIE(InfoExtractor):
     _NETRC_MACHINE = 'dangalplay'
+    _REGION = 'IN'
     _OTV_USER_ID = None
-    _LOGIN_HINT = 'Pass credentials as -u "token" -p "USER_ID" where USER_ID is the `otv_user_id` in browser local storage'
+    _LOGIN_HINT = (
+        'Pass credentials as -u "token" -p "USER_ID" '
+        '(where USER_ID is the value of "otv_user_id" in your browser local storage). '
+        'Your login region can be optionally suffixed to the username as @REGION '
+        '(where REGION is the two-letter "region" code found in your browser local storage), '
+        'e.g.: -u "token@IN" -p "USER_ID"')
     _API_BASE = 'https://ottapi.dangalplay.com'
     _AUTH_TOKEN = 'jqeGWxRKK7FK5zEk3xCM'  # from https://www.dangalplay.com/main.48ad19e24eb46acccef3.js
     _SECRET_KEY = 'f53d31a4377e4ef31fa0'  # same as above
@@ -20,8 +26,12 @@ class DangalPlayBaseIE(InfoExtractor):
     def _perform_login(self, username, password):
         if self._OTV_USER_ID:
             return
-        if username != 'token' or not re.fullmatch(r'[\da-f]{32}', password):
+        mobj = re.fullmatch(r'token(?:@(?P<region>[A-Z]{2}))?', username)
+        if not mobj or not re.fullmatch(r'[\da-f]{32}', password):
             raise ExtractorError(self._LOGIN_HINT, expected=True)
+        if region := mobj.group('region'):
+            self._REGION = region
+        self.write_debug(f'Setting login region to "{self._REGION}"')
         self._OTV_USER_ID = password
 
     def _real_initialize(self):
@@ -52,7 +62,7 @@ def _call_api(self, path, display_id, note='Downloading JSON metadata', fatal=Tr
             f'{self._API_BASE}/{path}', display_id, note, fatal=fatal,
             headers={'Accept': 'application/json'}, query={
                 'auth_token': self._AUTH_TOKEN,
-                'region': 'IN',
+                'region': self._REGION,
                 **query,
             })
 
@@ -106,7 +116,7 @@ def _generate_api_data(self, data):
             'catalog_id': catalog_id,
             'content_id': content_id,
             'category': '',
-            'region': 'IN',
+            'region': self._REGION,
             'auth_token': self._AUTH_TOKEN,
             'id': self._OTV_USER_ID,
             'md5': hashlib.md5(unhashed.encode()).hexdigest(),
@@ -129,11 +139,14 @@ def _real_extract(self, url):
         except ExtractorError as e:
             if isinstance(e.cause, HTTPError) and e.cause.status == 422:
                 error_info = traverse_obj(e.cause.response.read().decode(), ({json.loads}, 'error', {dict})) or {}
-                if error_info.get('code') == '1016':
+                error_code = error_info.get('code')
+                if error_code == '1016':
                     self.raise_login_required(
                         f'Your token has expired or is invalid. {self._LOGIN_HINT}', method=None)
-                elif msg := error_info.get('message'):
+                elif error_code == '4028':
-                    raise ExtractorError(msg)
+                    self.raise_login_required(
+                        f'Your login region is unspecified or incorrect. {self._LOGIN_HINT}', method=None)
+                raise ExtractorError(join_nonempty(error_code, error_info.get('message'), delim=': '))
             raise
 
         m3u8_url = traverse_obj(details, (

yt_dlp/extractor/floatplane.py

@@ -17,8 +17,140 @@
 from ..utils.traversal import traverse_obj
 
 
-class FloatplaneIE(InfoExtractor):
+class FloatplaneBaseIE(InfoExtractor):
+    def _real_extract(self, url):
+        post_id = self._match_id(url)
+
+        post_data = self._download_json(
+            f'{self._BASE_URL}/api/v3/content/post', post_id, query={'id': post_id},
+            note='Downloading post data', errnote='Unable to download post data',
+            impersonate=self._IMPERSONATE_TARGET)
+
+        if not any(traverse_obj(post_data, ('metadata', ('hasVideo', 'hasAudio')))):
+            raise ExtractorError('Post does not contain a video or audio track', expected=True)
+
+        uploader_url = format_field(
+            post_data, [('creator', 'urlname')], f'{self._BASE_URL}/channel/%s/home') or None
+
+        common_info = {
+            'uploader_url': uploader_url,
+            'channel_url': urljoin(f'{uploader_url}/', traverse_obj(post_data, ('channel', 'urlname'))),
+            'availability': self._availability(needs_subscription=True),
+            **traverse_obj(post_data, {
+                'uploader': ('creator', 'title', {str}),
+                'uploader_id': ('creator', 'id', {str}),
+                'channel': ('channel', 'title', {str}),
+                'channel_id': ('channel', 'id', {str}),
+                'release_timestamp': ('releaseDate', {parse_iso8601}),
+            }),
+        }
+
+        items = []
+        for media in traverse_obj(post_data, (('videoAttachments', 'audioAttachments'), ...)):
+            media_id = media['id']
+            media_typ = media.get('type') or 'video'
+
+            metadata = self._download_json(
+                f'{self._BASE_URL}/api/v3/content/{media_typ}', media_id, query={'id': media_id},
+                note=f'Downloading {media_typ} metadata', impersonate=self._IMPERSONATE_TARGET)
+
+            stream = self._download_json(
+                f'{self._BASE_URL}/api/v2/cdn/delivery', media_id, query={
+                    'type': 'vod' if media_typ == 'video' else 'aod',
+                    'guid': metadata['guid'],
+                }, note=f'Downloading {media_typ} stream data',
+                impersonate=self._IMPERSONATE_TARGET)
+
+            path_template = traverse_obj(stream, ('resource', 'uri', {str}))
+
+            def format_path(params):
+                path = path_template
+                for i, val in (params or {}).items():
+                    path = path.replace(f'{{qualityLevelParams.{i}}}', val)
+                return path
+
+            formats = []
+            for quality in traverse_obj(stream, ('resource', 'data', 'qualityLevels', ...)):
+                url = urljoin(stream['cdn'], format_path(traverse_obj(
+                    stream, ('resource', 'data', 'qualityLevelParams', quality['name'], {dict}))))
+                format_id = traverse_obj(quality, ('name', {str}))
+                hls_aes = {}
+                m3u8_data = None
+
+                # If we need impersonation for the API, then we need it for HLS keys too: extract in advance
+                if self._IMPERSONATE_TARGET is not None:
+                    m3u8_data = self._download_webpage(
+                        url, media_id, fatal=False, impersonate=self._IMPERSONATE_TARGET, headers=self._HEADERS,
+                        note=join_nonempty('Downloading', format_id, 'm3u8 information', delim=' '),
+                        errnote=join_nonempty('Failed to download', format_id, 'm3u8 information', delim=' '))
+                    if not m3u8_data:
+                        continue
+
+                    key_url = self._search_regex(
+                        r'#EXT-X-KEY:METHOD=AES-128,URI="(https?://[^"]+)"',
+                        m3u8_data, 'HLS AES key URI', default=None)
+                    if key_url:
+                        urlh = self._request_webpage(
+                            key_url, media_id, fatal=False, impersonate=self._IMPERSONATE_TARGET, headers=self._HEADERS,
+                            note=join_nonempty('Downloading', format_id, 'HLS AES key', delim=' '),
+                            errnote=join_nonempty('Failed to download', format_id, 'HLS AES key', delim=' '))
+                        if urlh:
+                            hls_aes['key'] = urlh.read().hex()
+
+                formats.append({
+                    **traverse_obj(quality, {
+                        'format_note': ('label', {str}),
+                        'width': ('width', {int}),
+                        'height': ('height', {int}),
+                    }),
+                    **parse_codecs(quality.get('codecs')),
+                    'url': url,
+                    'ext': determine_ext(url.partition('/chunk.m3u8')[0], 'mp4'),
+                    'format_id': format_id,
+                    'hls_media_playlist_data': m3u8_data,
+                    'hls_aes': hls_aes or None,
+                })
+            items.append({
+                **common_info,
+                'id': media_id,
+                **traverse_obj(metadata, {
+                    'title': ('title', {str}),
+                    'duration': ('duration', {int_or_none}),
+                    'thumbnail': ('thumbnail', 'path', {url_or_none}),
+                }),
+                'formats': formats,
+            })
+
+        post_info = {
+            **common_info,
+            'id': post_id,
+            'display_id': post_id,
+            **traverse_obj(post_data, {
+                'title': ('title', {str}),
+                'description': ('text', {clean_html}),
+                'like_count': ('likes', {int_or_none}),
+                'dislike_count': ('dislikes', {int_or_none}),
+                'comment_count': ('comments', {int_or_none}),
+                'thumbnail': ('thumbnail', 'path', {url_or_none}),
+            }),
+            'http_headers': self._HEADERS,
+        }
+
+        if len(items) > 1:
+            return self.playlist_result(items, **post_info)
+
+        post_info.update(items[0])
+        return post_info
+
+
+class FloatplaneIE(FloatplaneBaseIE):
     _VALID_URL = r'https?://(?:(?:www|beta)\.)?floatplane\.com/post/(?P<id>\w+)'
+    _BASE_URL = 'https://www.floatplane.com'
+    _IMPERSONATE_TARGET = None
+    _HEADERS = {
+        'Origin': _BASE_URL,
+        'Referer': f'{_BASE_URL}/',
+    }
     _TESTS = [{
         'url': 'https://www.floatplane.com/post/2Yf3UedF7C',
         'info_dict': {
@@ -170,105 +302,9 @@ class FloatplaneIE(InfoExtractor):
     }]
 
     def _real_initialize(self):
-        if not self._get_cookies('https://www.floatplane.com').get('sails.sid'):
+        if not self._get_cookies(self._BASE_URL).get('sails.sid'):
             self.raise_login_required()
 
-    def _real_extract(self, url):
-        post_id = self._match_id(url)
-
-        post_data = self._download_json(
-            'https://www.floatplane.com/api/v3/content/post', post_id, query={'id': post_id},
-            note='Downloading post data', errnote='Unable to download post data')
-
-        if not any(traverse_obj(post_data, ('metadata', ('hasVideo', 'hasAudio')))):
-            raise ExtractorError('Post does not contain a video or audio track', expected=True)
-
-        uploader_url = format_field(
-            post_data, [('creator', 'urlname')], 'https://www.floatplane.com/channel/%s/home') or None
-
-        common_info = {
-            'uploader_url': uploader_url,
-            'channel_url': urljoin(f'{uploader_url}/', traverse_obj(post_data, ('channel', 'urlname'))),
-            'availability': self._availability(needs_subscription=True),
-            **traverse_obj(post_data, {
-                'uploader': ('creator', 'title', {str}),
-                'uploader_id': ('creator', 'id', {str}),
-                'channel': ('channel', 'title', {str}),
-                'channel_id': ('channel', 'id', {str}),
-                'release_timestamp': ('releaseDate', {parse_iso8601}),
-            }),
-        }
-
-        items = []
-        for media in traverse_obj(post_data, (('videoAttachments', 'audioAttachments'), ...)):
-            media_id = media['id']
-            media_typ = media.get('type') or 'video'
-
-            metadata = self._download_json(
-                f'https://www.floatplane.com/api/v3/content/{media_typ}', media_id, query={'id': media_id},
-                note=f'Downloading {media_typ} metadata')
-
-            stream = self._download_json(
-                'https://www.floatplane.com/api/v2/cdn/delivery', media_id, query={
-                    'type': 'vod' if media_typ == 'video' else 'aod',
-                    'guid': metadata['guid'],
-                }, note=f'Downloading {media_typ} stream data')
-
-            path_template = traverse_obj(stream, ('resource', 'uri', {str}))
-
-            def format_path(params):
-                path = path_template
-                for i, val in (params or {}).items():
-                    path = path.replace(f'{{qualityLevelParams.{i}}}', val)
-                return path
-
-            formats = []
-            for quality in traverse_obj(stream, ('resource', 'data', 'qualityLevels', ...)):
-                url = urljoin(stream['cdn'], format_path(traverse_obj(
-                    stream, ('resource', 'data', 'qualityLevelParams', quality['name'], {dict}))))
-                formats.append({
-                    **traverse_obj(quality, {
-                        'format_id': ('name', {str}),
-                        'format_note': ('label', {str}),
-                        'width': ('width', {int}),
-                        'height': ('height', {int}),
-                    }),
-                    **parse_codecs(quality.get('codecs')),
-                    'url': url,
-                    'ext': determine_ext(url.partition('/chunk.m3u8')[0], 'mp4'),
-                })
-
-            items.append({
-                **common_info,
-                'id': media_id,
-                **traverse_obj(metadata, {
-                    'title': ('title', {str}),
-                    'duration': ('duration', {int_or_none}),
-                    'thumbnail': ('thumbnail', 'path', {url_or_none}),
-                }),
-                'formats': formats,
-            })
-
-        post_info = {
-            **common_info,
-            'id': post_id,
-            'display_id': post_id,
-            **traverse_obj(post_data, {
-                'title': ('title', {str}),
-                'description': ('text', {clean_html}),
-                'like_count': ('likes', {int_or_none}),
-                'dislike_count': ('dislikes', {int_or_none}),
-                'comment_count': ('comments', {int_or_none}),
-                'thumbnail': ('thumbnail', 'path', {url_or_none}),
-            }),
-        }
-
-        if len(items) > 1:
-            return self.playlist_result(items, **post_info)
-
-        post_info.update(items[0])
-        return post_info
-
 
 class FloatplaneChannelIE(InfoExtractor):
     _VALID_URL = r'https?://(?:(?:www|beta)\.)?floatplane\.com/channel/(?P<id>[\w-]+)/home(?:/(?P<channel>[\w-]+))?'

yt_dlp/extractor/francetv.py

@@ -1,4 +1,3 @@
-import json
 import re
 import urllib.parse
 
@@ -19,7 +18,11 @@
     unsmuggle_url,
     url_or_none,
 )
-from ..utils.traversal import find_element, traverse_obj
+from ..utils.traversal import (
+    find_element,
+    get_first,
+    traverse_obj,
+)
 
 
 class FranceTVBaseInfoExtractor(InfoExtractor):
@@ -121,9 +124,10 @@ def _extract_video(self, video_id, hostname=None):
             elif code := traverse_obj(dinfo, ('code', {int})):
                 if code == 2009:
                     self.raise_geo_restricted(countries=self._GEO_COUNTRIES)
-                elif code in (2015, 2017):
+                elif code in (2015, 2017, 2019):
                     # 2015: L'accès à cette vidéo est impossible. (DRM-only)
                     # 2017: Cette vidéo n'est pas disponible depuis le site web mobile (b/c DRM)
+                    # 2019: L'accès à cette vidéo est incompatible avec votre configuration. (DRM-only)
                     drm_formats = True
                     continue
                 self.report_warning(
@@ -258,7 +262,7 @@ class FranceTVSiteIE(FranceTVBaseInfoExtractor):
     _TESTS = [{
         'url': 'https://www.france.tv/france-2/13h15-le-dimanche/140921-les-mysteres-de-jesus.html',
         'info_dict': {
-            'id': 'ec217ecc-0733-48cf-ac06-af1347b849d1',  # old: c5bda21d-2c6f-4470-8849-3d8327adb2ba'
+            'id': 'b2cf9fd8-e971-4757-8651-848f2772df61',  # old: ec217ecc-0733-48cf-ac06-af1347b849d1
             'ext': 'mp4',
             'title': '13h15, le dimanche... - Les mystères de Jésus',
             'timestamp': 1502623500,
@@ -269,7 +273,7 @@ class FranceTVSiteIE(FranceTVBaseInfoExtractor):
         'params': {
             'skip_download': True,
         },
-        'add_ie': [FranceTVIE.ie_key()],
+        'skip': 'Unfortunately, this video is no longer available',
     }, {
         # geo-restricted
         'url': 'https://www.france.tv/enfants/six-huit-ans/foot2rue/saison-1/3066387-duel-au-vieux-port.html',
@@ -287,7 +291,7 @@ class FranceTVSiteIE(FranceTVBaseInfoExtractor):
             'thumbnail': r're:^https?://.*\.jpg$',
             'duration': 1441,
         },
-        'skip': 'No longer available',
+        'skip': 'Unfortunately, this video is no longer available',
     }, {
         # geo-restricted livestream (workflow == 'token-akamai')
         'url': 'https://www.france.tv/france-4/direct.html',
@@ -308,6 +312,19 @@ class FranceTVSiteIE(FranceTVBaseInfoExtractor):
             'live_status': 'is_live',
         },
         'params': {'skip_download': 'livestream'},
+    }, {
+        # Not geo-restricted
+        'url': 'https://www.france.tv/france-2/la-maison-des-maternelles/5574051-nous-sommes-amis-et-nous-avons-fait-un-enfant-ensemble.html',
+        'info_dict': {
+            'id': 'b448bfe4-9fe7-11ee-97d8-2ba3426fa3df',
+            'ext': 'mp4',
+            'title': 'Nous sommes amis et nous avons fait un enfant ensemble - Émission du jeudi 21 décembre 2023',
+            'duration': 1065,
+            'thumbnail': r're:https?://.+/.+\.jpg',
+            'timestamp': 1703147921,
+            'upload_date': '20231221',
+        },
+        'params': {'skip_download': 'm3u8'},
     }, {
         # france3
         'url': 'https://www.france.tv/france-3/des-chiffres-et-des-lettres/139063-emission-du-mardi-9-mai-2017.html',
@@ -342,30 +359,16 @@ class FranceTVSiteIE(FranceTVBaseInfoExtractor):
         'only_matching': True,
     }]
 
-    # XXX: For parsing next.js v15+ data; see also yt_dlp.extractor.goplay
-    def _find_json(self, s):
-        return self._search_json(
-            r'\w+\s*:\s*', s, 'next js data', None, contains_pattern=r'\[(?s:.+)\]', default=None)
-
     def _real_extract(self, url):
         display_id = self._match_id(url)
         webpage = self._download_webpage(url, display_id)
+        nextjs_data = self._search_nextjs_v13_data(webpage, display_id)
 
-        nextjs_data = traverse_obj(
+        if get_first(nextjs_data, ('isLive', {bool})):
-            re.findall(r'<script[^>]*>\s*self\.__next_f\.push\(\s*(\[.+?\])\s*\);?\s*</script>', webpage),
-            (..., {json.loads}, ..., {self._find_json}, ..., 'children', ..., ..., 'children', ..., ..., 'children'))
-
-        if traverse_obj(nextjs_data, (..., ..., 'children', ..., 'isLive', {bool}, any)):
             # For livestreams we need the id of the stream instead of the currently airing episode id
-            video_id = traverse_obj(nextjs_data, (
+            video_id = get_first(nextjs_data, ('options', 'id', {str}))
-                ..., ..., 'children', ..., 'children', ..., 'children', ..., 'children', ..., ...,
-                'children', ..., ..., 'children', ..., ..., 'children', (..., (..., ...)),
-                'options', 'id', {str}, any))
         else:
-            video_id = traverse_obj(nextjs_data, (
+            video_id = get_first(nextjs_data, ('video', ('playerReplayId', 'siId'), {str}))
-                ..., ..., ..., 'children',
-                lambda _, v: v['video']['url'] == urllib.parse.urlparse(url).path,
-                'video', ('playerReplayId', 'siId'), {str}, any))
 
         if not video_id:
             raise ExtractorError('Unable to extract video ID')

yt_dlp/extractor/generic.py

@@ -1481,30 +1481,6 @@ class GenericIE(InfoExtractor):
             },
             'add_ie': ['SenateISVP'],
         },
-        {
-            # Limelight embeds (1 channel embed + 4 media embeds)
-            'url': 'http://www.sedona.com/FacilitatorTraining2017',
-            'info_dict': {
-                'id': 'FacilitatorTraining2017',
-                'title': 'Facilitator Training 2017',
-            },
-            'playlist_mincount': 5,
-        },
-        {
-            # Limelight embed (LimelightPlayerUtil.embed)
-            'url': 'https://tv5.ca/videos?v=xuu8qowr291ri',
-            'info_dict': {
-                'id': '95d035dc5c8a401588e9c0e6bd1e9c92',
-                'ext': 'mp4',
-                'title': '07448641',
-                'timestamp': 1499890639,
-                'upload_date': '20170712',
-            },
-            'params': {
-                'skip_download': True,
-            },
-            'add_ie': ['LimelightMedia'],
-        },
         {
             'url': 'http://kron4.com/2017/04/28/standoff-with-walnut-creek-murder-suspect-ends-with-arrest/',
             'info_dict': {

yt_dlp/extractor/goplay.py

@@ -5,16 +5,11 @@
 import hmac
 import json
 import os
-import re
 import urllib.parse
 
 from .common import InfoExtractor
-from ..utils import (
+from ..utils import ExtractorError, int_or_none
-    ExtractorError,
+from ..utils.traversal import get_first, traverse_obj
-    int_or_none,
-    remove_end,
-    traverse_obj,
-)
 
 
 class GoPlayIE(InfoExtractor):
@@ -27,10 +22,10 @@ class GoPlayIE(InfoExtractor):
         'info_dict': {
             'id': '2baa4560-87a0-421b-bffc-359914e3c387',
             'ext': 'mp4',
-            'title': 'S22 - Aflevering 1',
+            'title': 'De Slimste Mens ter Wereld - S22 - Aflevering 1',
             'description': r're:In aflevering 1 nemen Daan Alferink, Tess Elst en Xander De Rycke .{66}',
             'series': 'De Slimste Mens ter Wereld',
-            'episode': 'Episode 1',
+            'episode': 'Wordt aangekondigd',
             'season_number': 22,
             'episode_number': 1,
             'season': 'Season 22',
@@ -52,7 +47,7 @@ class GoPlayIE(InfoExtractor):
         'info_dict': {
             'id': 'ecb79672-92b9-4cd9-a0d7-e2f0250681ee',
             'ext': 'mp4',
-            'title': 'S11 - Aflevering 1',
+            'title': 'De Mol - S11 - Aflevering 1',
             'description': r're:Tien kandidaten beginnen aan hun verovering van Amerika en ontmoeten .{102}',
             'episode': 'Episode 1',
             'series': 'De Mol',
@@ -75,21 +70,13 @@ def _real_initialize(self):
         if not self._id_token:
             raise self.raise_login_required(method='password')
 
-    # XXX: For parsing next.js v15+ data; see also yt_dlp.extractor.francetv
-    def _find_json(self, s):
-        return self._search_json(
-            r'\w+\s*:\s*', s, 'next js data', None, contains_pattern=r'\[(?s:.+)\]', default=None)
-
     def _real_extract(self, url):
         display_id = self._match_id(url)
         webpage = self._download_webpage(url, display_id)
 
-        nextjs_data = traverse_obj(
+        nextjs_data = self._search_nextjs_v13_data(webpage, display_id)
-            re.findall(r'<script[^>]*>\s*self\.__next_f\.push\(\s*(\[.+?\])\s*\);?\s*</script>', webpage),
+        meta = get_first(nextjs_data, (
-            (..., {json.loads}, ..., {self._find_json}, ...))
+            lambda k, v: k in ('video', 'meta') and v['path'] == urllib.parse.urlparse(url).path))
-        meta = traverse_obj(nextjs_data, (
-            ..., ..., 'children', ..., ..., 'children',
-            lambda _, v: v['video']['path'] == urllib.parse.urlparse(url).path, 'video', any))
 
         video_id = meta['uuid']
         info_dict = traverse_obj(meta, {
@@ -98,19 +85,18 @@ def _real_extract(self, url):
         })
 
         if traverse_obj(meta, ('program', 'subtype')) != 'movie':
-            for season_data in traverse_obj(nextjs_data, (..., 'children', ..., 'playlists', ...)):
+            for season_data in traverse_obj(nextjs_data, (..., 'playlists', ..., {dict})):
-                episode_data = traverse_obj(
+                episode_data = traverse_obj(season_data, ('videos', lambda _, v: v['videoId'] == video_id, any))
-                    season_data, ('videos', lambda _, v: v['videoId'] == video_id, any))
                 if not episode_data:
                     continue
 
-                episode_title = traverse_obj(
+                season_number = traverse_obj(season_data, ('season', {int_or_none}))
-                    episode_data, 'contextualTitle', 'episodeTitle', expected_type=str)
                 info_dict.update({
-                    'title': episode_title or info_dict.get('title'),
+                    'episode': traverse_obj(episode_data, ('episodeTitle', {str})),
-                    'series': remove_end(info_dict.get('title'), f' - {episode_title}'),
-                    'season_number': traverse_obj(season_data, ('season', {int_or_none})),
                     'episode_number': traverse_obj(episode_data, ('episodeNumber', {int_or_none})),
+                    'season_number': season_number,
+                    'series': self._search_regex(
+                        fr'^(.+)? - S{season_number} - ', info_dict.get('title'), 'series', default=None),
                 })
                 break
 

yt_dlp/extractor/hotstar.py

@@ -1,3 +1,4 @@
+import functools
 import hashlib
 import hmac
 import json
@@ -9,77 +10,125 @@
 from ..networking.exceptions import HTTPError
 from ..utils import (
     ExtractorError,
+    OnDemandPagedList,
     determine_ext,
+    filter_dict,
     int_or_none,
     join_nonempty,
+    jwt_decode_hs256,
+    parse_iso8601,
     str_or_none,
-    traverse_obj,
     url_or_none,
 )
+from ..utils.traversal import require, traverse_obj
 
 
 class HotStarBaseIE(InfoExtractor):
+    _TOKEN_NAME = 'userUP'
     _BASE_URL = 'https://www.hotstar.com'
     _API_URL = 'https://api.hotstar.com'
+    _API_URL_V2 = 'https://apix.hotstar.com/v2'
     _AKAMAI_ENCRYPTION_KEY = b'\x05\xfc\x1a\x01\xca\xc9\x4b\xc4\x12\xfc\x53\x12\x07\x75\xf9\xee'
 
+    _FREE_HEADERS = {
+        'user-agent': 'Hotstar;in.startv.hotstar/25.06.30.0.11580 (Android/12)',
+        'x-hs-client': 'platform:android;app_id:in.startv.hotstar;app_version:25.06.30.0;os:Android;os_version:12;schema_version:0.0.1523',
+        'x-hs-platform': 'android',
+    }
+    _SUB_HEADERS = {
+        'user-agent': 'Disney+;in.startv.hotstar.dplus.tv/23.08.14.4.2915 (Android/13)',
+        'x-hs-client': 'platform:androidtv;app_id:in.startv.hotstar.dplus.tv;app_version:23.08.14.4;os:Android;os_version:13;schema_version:0.0.970',
+        'x-hs-platform': 'androidtv',
+    }
+
+    def _has_active_subscription(self, cookies, server_time):
+        expiry = traverse_obj(cookies, (
+            self._TOKEN_NAME, 'value', {jwt_decode_hs256}, 'sub', {json.loads},
+            'subscriptions', 'in', ..., 'expiry', {parse_iso8601}, all, {max})) or 0
+        return expiry > server_time
+
     def _call_api_v1(self, path, *args, **kwargs):
         return self._download_json(
             f'{self._API_URL}/o/v1/{path}', *args, **kwargs,
             headers={'x-country-code': 'IN', 'x-platform-code': 'PCTV'})
 
-    def _call_api_impl(self, path, video_id, query, st=None, cookies=None):
+    def _call_api_impl(self, path, video_id, query, cookies=None, st=None):
         st = int_or_none(st) or int(time.time())
         exp = st + 6000
         auth = f'st={st}~exp={exp}~acl=/*'
         auth += '~hmac=' + hmac.new(self._AKAMAI_ENCRYPTION_KEY, auth.encode(), hashlib.sha256).hexdigest()
-
-        if cookies and cookies.get('userUP'):
-            token = cookies.get('userUP').value
-        else:
-            token = self._download_json(
-                f'{self._API_URL}/um/v3/users',
-                video_id, note='Downloading token',
-                data=json.dumps({'device_ids': [{'id': str(uuid.uuid4()), 'type': 'device_id'}]}).encode(),
-                headers={
-                    'hotstarauth': auth,
-                    'x-hs-platform': 'PCTV',  # or 'web'
-                    'Content-Type': 'application/json',
-                })['user_identity']
-
         response = self._download_json(
-            f'{self._API_URL}/{path}', video_id, query=query,
+            f'{self._API_URL_V2}/{path}', video_id, query=query,
-            headers={
+            headers=filter_dict({
+                **(self._SUB_HEADERS if self._has_active_subscription(cookies, st) else self._FREE_HEADERS),
                 'hotstarauth': auth,
-                'x-hs-appversion': '6.72.2',
+                'x-hs-usertoken': traverse_obj(cookies, (self._TOKEN_NAME, 'value')),
-                'x-hs-platform': 'web',
+                'x-hs-device-id': traverse_obj(cookies, ('deviceId', 'value')) or str(uuid.uuid4()),
-                'x-hs-usertoken': token,
+                'content-type': 'application/json',
-            })
+            }))
 
-        if response['message'] != "Playback URL's fetched successfully":
+        if not traverse_obj(response, ('success', {dict})):
-            raise ExtractorError(
+            raise ExtractorError('API call was unsuccessful')
-                response['message'], expected=True)
+        return response['success']
-        return response['data']
 
-    def _call_api_v2(self, path, video_id, st=None, cookies=None):
+    def _call_api_v2(self, path, video_id, content_type, cookies=None, st=None):
-        return self._call_api_impl(
+        return self._call_api_impl(f'{path}', video_id, query={
-            f'{path}/content/{video_id}', video_id, st=st, cookies=cookies, query={
+            'content_id': video_id,
-                'desired-config': 'audio_channel:stereo|container:fmp4|dynamic_range:hdr|encryption:plain|ladder:tv|package:dash|resolution:fhd|subs-tag:HotstarVIP|video_codec:h265',
+            'filters': f'content_type={content_type}',
-                'device-id': cookies.get('device_id').value if cookies.get('device_id') else str(uuid.uuid4()),
+            'client_capabilities': json.dumps({
-                'os-name': 'Windows',
+                'package': ['dash', 'hls'],
-                'os-version': '10',
+                'container': ['fmp4', 'fmp4br', 'ts'],
-            })
+                'ads': ['non_ssai', 'ssai'],
+                'audio_channel': ['stereo', 'dolby51', 'atmos'],
+                'encryption': ['plain', 'widevine'],  # wv only so we can raise appropriate error
+                'video_codec': ['h264', 'h265'],
+                'video_codec_non_secure': ['h264', 'h265', 'vp9'],
+                'ladder': ['phone', 'tv', 'full'],
+                'resolution': ['hd', '4k'],
+                'true_resolution': ['hd', '4k'],
+                'dynamic_range': ['sdr', 'hdr'],
+            }, separators=(',', ':')),
+            'drm_parameters': json.dumps({
+                'widevine_security_level': ['SW_SECURE_DECODE', 'SW_SECURE_CRYPTO'],
+                'hdcp_version': ['HDCP_V2_2', 'HDCP_V2_1', 'HDCP_V2', 'HDCP_V1'],
+            }, separators=(',', ':')),
+        }, cookies=cookies, st=st)
 
-    def _playlist_entries(self, path, item_id, root=None, **kwargs):
+    @staticmethod
-        results = self._call_api_v1(path, item_id, **kwargs)['body']['results']
+    def _parse_metadata_v1(video_data):
-        for video in traverse_obj(results, (('assets', None), 'items', ...)):
+        return traverse_obj(video_data, {
-            if video.get('contentId'):
+            'id': ('contentId', {str}),
-                yield self.url_result(
+            'title': ('title', {str}),
-                    HotStarIE._video_url(video['contentId'], root=root), HotStarIE, video['contentId'])
+            'description': ('description', {str}),
+            'duration': ('duration', {int_or_none}),
+            'timestamp': (('broadcastDate', 'startDate'), {int_or_none}, any),
+            'release_year': ('year', {int_or_none}),
+            'channel': ('channelName', {str}),
+            'channel_id': ('channelId', {int}, {str_or_none}),
+            'series': ('showName', {str}),
+            'season': ('seasonName', {str}),
+            'season_number': ('seasonNo', {int_or_none}),
+            'season_id': ('seasonId', {int}, {str_or_none}),
+            'episode': ('title', {str}),
+            'episode_number': ('episodeNo', {int_or_none}),
+        })
+
+    def _fetch_page(self, path, item_id, name, query, root, page):
+        results = self._call_api_v1(
+            path, item_id, note=f'Downloading {name} page {page + 1} JSON', query={
+                **query,
+                'tao': page * self._PAGE_SIZE,
+                'tas': self._PAGE_SIZE,
+            })['body']['results']
+
+        for video in traverse_obj(results, (('assets', None), 'items', lambda _, v: v['contentId'])):
+            yield self.url_result(
+                HotStarIE._video_url(video['contentId'], root=root), HotStarIE, **self._parse_metadata_v1(video))
 
 
 class HotStarIE(HotStarBaseIE):
     IE_NAME = 'hotstar'
+    IE_DESC = 'JioHotstar'
     _VALID_URL = r'''(?x)
         https?://(?:www\.)?hotstar\.com(?:/in)?/(?!in/)
         (?:
@@ -114,15 +163,16 @@ class HotStarIE(HotStarBaseIE):
             'upload_date': '20190501',
             'duration': 1219,
             'channel': 'StarPlus',
-            'channel_id': '3',
+            'channel_id': '821',
             'series': 'Ek Bhram - Sarvagun Sampanna',
             'season': 'Chapter 1',
             'season_number': 1,
-            'season_id': '6771',
+            'season_id': '1260004607',
             'episode': 'Janhvi Targets Suman',
             'episode_number': 8,
         },
-    }, {
+        'params': {'skip_download': 'm3u8'},
+    }, {  # Metadata call gets HTTP Error 504 with tas=10000
         'url': 'https://www.hotstar.com/in/shows/anupama/1260022017/anupama-anuj-share-a-moment/1000282843',
         'info_dict': {
             'id': '1000282843',
@@ -134,14 +184,14 @@ class HotStarIE(HotStarBaseIE):
             'channel': 'StarPlus',
             'series': 'Anupama',
             'season_number': 1,
-            'season_id': '7399',
+            'season_id': '1260022018',
             'upload_date': '20230307',
             'episode': 'Anupama, Anuj Share a Moment',
             'episode_number': 853,
-            'duration': 1272,
+            'duration': 1266,
-            'channel_id': '3',
+            'channel_id': '821',
         },
-        'skip': 'HTTP Error 504: Gateway Time-out',  # XXX: Investigate 504 errors on some episodes
+        'params': {'skip_download': 'm3u8'},
     }, {
         'url': 'https://www.hotstar.com/in/shows/kana-kaanum-kaalangal/1260097087/back-to-school/1260097320',
         'info_dict': {
@@ -154,14 +204,15 @@ class HotStarIE(HotStarBaseIE):
             'channel': 'Hotstar Specials',
             'series': 'Kana Kaanum Kaalangal',
             'season_number': 1,
-            'season_id': '9441',
+            'season_id': '1260097089',
             'upload_date': '20220421',
             'episode': 'Back To School',
             'episode_number': 1,
             'duration': 1810,
-            'channel_id': '54',
+            'channel_id': '1260003991',
         },
-    }, {
+        'params': {'skip_download': 'm3u8'},
+    }, {  # Metadata call gets HTTP Error 504 with tas=10000
         'url': 'https://www.hotstar.com/in/clips/e3-sairat-kahani-pyaar-ki/1000262286',
         'info_dict': {
             'id': '1000262286',
@@ -173,6 +224,7 @@ class HotStarIE(HotStarBaseIE):
             'timestamp': 1622943900,
             'duration': 5395,
         },
+        'params': {'skip_download': 'm3u8'},
     }, {
         'url': 'https://www.hotstar.com/in/movies/premam/1000091195',
         'info_dict': {
@@ -180,12 +232,13 @@ class HotStarIE(HotStarBaseIE):
             'ext': 'mp4',
             'title': 'Premam',
             'release_year': 2015,
-            'description': 'md5:d833c654e4187b5e34757eafb5b72d7f',
+            'description': 'md5:096cd8aaae8dab56524823dc19dfa9f7',
             'timestamp': 1462149000,
             'upload_date': '20160502',
             'episode': 'Premam',
             'duration': 8994,
         },
+        'params': {'skip_download': 'm3u8'},
     }, {
         'url': 'https://www.hotstar.com/movies/radha-gopalam/1000057157',
         'only_matching': True,
@@ -208,6 +261,13 @@ class HotStarIE(HotStarBaseIE):
         None: 'content',
     }
 
+    _CONTENT_TYPE = {
+        'movie': 'MOVIE',
+        'episode': 'EPISODE',
+        'match': 'SPORT',
+        'content': 'CLIPS',
+    }
+
     _IGNORE_MAP = {
         'res': 'resolution',
         'vcodec': 'video_codec',
@@ -229,38 +289,50 @@ def _video_url(cls, video_id, video_type=None, *, slug='ignore_me', root=None):
 
     def _real_extract(self, url):
         video_id, video_type = self._match_valid_url(url).group('id', 'type')
-        video_type = self._TYPE.get(video_type, video_type)
+        video_type = self._TYPE[video_type]
         cookies = self._get_cookies(url)  # Cookies before any request
+        if not cookies or not cookies.get(self._TOKEN_NAME):
+            self.raise_login_required()
 
         video_data = traverse_obj(
-            self._call_api_v1(
+            self._call_api_v1(f'{video_type}/detail', video_id, fatal=False, query={
-                f'{video_type}/detail', video_id, fatal=False, query={'tas': 10000, 'contentId': video_id}),
+                'tas': 5,  # See https://github.com/yt-dlp/yt-dlp/issues/7946
-            ('body', 'results', 'item', {dict})) or {}
+                'contentId': video_id,
-        if not self.get_param('allow_unplayable_formats') and video_data.get('drmProtected'):
+            }), ('body', 'results', 'item', {dict})) or {}
+
+        if video_data.get('drmProtected'):
             self.report_drm(video_id)
 
-        # See https://github.com/yt-dlp/yt-dlp/issues/396
-        st = self._download_webpage_handle(f'{self._BASE_URL}/in', video_id)[1].headers.get('x-origin-date')
-
         geo_restricted = False
-        formats, subs = [], {}
+        formats, subs, has_drm = [], {}, False
         headers = {'Referer': f'{self._BASE_URL}/in'}
+        content_type = traverse_obj(video_data, ('contentType', {str})) or self._CONTENT_TYPE[video_type]
 
-        # change to v2 in the future
+        # See https://github.com/yt-dlp/yt-dlp/issues/396
-        playback_sets = self._call_api_v2('play/v1/playback', video_id, st=st, cookies=cookies)['playBackSets']
+        st = self._request_webpage(
-        for playback_set in playback_sets:
+            f'{self._BASE_URL}/in', video_id, 'Fetching server time').get_header('x-origin-date')
-            if not isinstance(playback_set, dict):
+        watch = self._call_api_v2('pages/watch', video_id, content_type, cookies, st)
-                continue
+        player_config = traverse_obj(watch, (
-            tags = str_or_none(playback_set.get('tagsCombination')) or ''
+            'page', 'spaces', 'player', 'widget_wrappers', lambda _, v: v['template'] == 'PlayerWidget',
+            'widget', 'data', 'player_config', {dict}, any, {require('player config')}))
+
+        for playback_set in traverse_obj(player_config, (
+            ('media_asset', 'media_asset_v2'),
+            ('primary', 'fallback'),
+            all, lambda _, v: url_or_none(v['content_url']),
+        )):
+            tags = str_or_none(playback_set.get('playback_tags')) or ''
             if any(f'{prefix}:{ignore}' in tags
                    for key, prefix in self._IGNORE_MAP.items()
                    for ignore in self._configuration_arg(key)):
                 continue
 
-            format_url = url_or_none(playback_set.get('playbackUrl'))
+            tag_dict = dict((*t.split(':', 1), None)[:2] for t in tags.split(';'))
-            if not format_url:
+            if tag_dict.get('encryption') not in ('plain', None):
+                has_drm = True
                 continue
-            format_url = re.sub(r'(?<=//staragvod)(\d)', r'web\1', format_url)
+
+            format_url = re.sub(r'(?<=//staragvod)(\d)', r'web\1', playback_set['content_url'])
             ext = determine_ext(format_url)
 
             current_formats, current_subs = [], {}
@@ -280,14 +352,12 @@ def _real_extract(self, url):
                         'height': int_or_none(playback_set.get('height')),
                     }]
             except ExtractorError as e:
-                if isinstance(e.cause, HTTPError) and e.cause.status == 403:
+                if isinstance(e.cause, HTTPError) and e.cause.status in (403, 474):
                     geo_restricted = True
+                else:
+                    self.write_debug(e)
                 continue
 
-            tag_dict = dict((*t.split(':', 1), None)[:2] for t in tags.split(';'))
-            if tag_dict.get('encryption') not in ('plain', None):
-                for f in current_formats:
-                    f['has_drm'] = True
             for f in current_formats:
                 for k, v in self._TAG_FIELDS.items():
                     if not f.get(k):
@@ -299,6 +369,11 @@ def _real_extract(self, url):
                         'stereo': 2,
                         'dolby51': 6,
                     }.get(tag_dict.get('audio_channel'))
+                    if (
+                        'Audio_Description' in f['format_id']
+                        or 'Audio Description' in (f.get('format_note') or '')
+                    ):
+                        f['source_preference'] = -99 + (f.get('source_preference') or -1)
                 f['format_note'] = join_nonempty(
                     tag_dict.get('ladder'),
                     tag_dict.get('audio_channel') if f.get('acodec') != 'none' else None,
@@ -308,29 +383,22 @@ def _real_extract(self, url):
             formats.extend(current_formats)
             subs = self._merge_subtitles(subs, current_subs)
 
-        if not formats and geo_restricted:
+        if not formats:
-            self.raise_geo_restricted(countries=['IN'], metadata_available=True)
+            if geo_restricted:
+                self.raise_geo_restricted(countries=['IN'], metadata_available=True)
+            elif has_drm:
+                self.report_drm(video_id)
+            elif not self._has_active_subscription(cookies, st):
+                self.raise_no_formats('Your account does not have access to this content', expected=True)
         self._remove_duplicate_formats(formats)
         for f in formats:
             f.setdefault('http_headers', {}).update(headers)
 
         return {
+            **self._parse_metadata_v1(video_data),
             'id': video_id,
-            'title': video_data.get('title'),
-            'description': video_data.get('description'),
-            'duration': int_or_none(video_data.get('duration')),
-            'timestamp': int_or_none(traverse_obj(video_data, 'broadcastDate', 'startDate')),
-            'release_year': int_or_none(video_data.get('year')),
             'formats': formats,
             'subtitles': subs,
-            'channel': video_data.get('channelName'),
-            'channel_id': str_or_none(video_data.get('channelId')),
-            'series': video_data.get('showName'),
-            'season': video_data.get('seasonName'),
-            'season_number': int_or_none(video_data.get('seasonNo')),
-            'season_id': str_or_none(video_data.get('seasonId')),
-            'episode': video_data.get('title'),
-            'episode_number': int_or_none(video_data.get('episodeNo')),
         }
 
 
@@ -371,64 +439,6 @@ def _real_extract(self, url):
         return self.url_result(HotStarIE._video_url(video_id, video_type), HotStarIE, video_id)
 
 
-class HotStarPlaylistIE(HotStarBaseIE):
-    IE_NAME = 'hotstar:playlist'
-    _VALID_URL = r'https?://(?:www\.)?hotstar\.com(?:/in)?/(?:tv|shows)(?:/[^/]+){2}/list/[^/]+/t-(?P<id>\w+)'
-    _TESTS = [{
-        'url': 'https://www.hotstar.com/tv/savdhaan-india/s-26/list/popular-clips/t-3_2_26',
-        'info_dict': {
-            'id': '3_2_26',
-        },
-        'playlist_mincount': 20,
-    }, {
-        'url': 'https://www.hotstar.com/shows/savdhaan-india/s-26/list/popular-clips/t-3_2_26',
-        'only_matching': True,
-    }, {
-        'url': 'https://www.hotstar.com/tv/savdhaan-india/s-26/list/extras/t-2480',
-        'only_matching': True,
-    }, {
-        'url': 'https://www.hotstar.com/in/tv/karthika-deepam/15457/list/popular-clips/t-3_2_1272',
-        'only_matching': True,
-    }]
-
-    def _real_extract(self, url):
-        id_ = self._match_id(url)
-        return self.playlist_result(
-            self._playlist_entries('tray/find', id_, query={'tas': 10000, 'uqId': id_}), id_)
-
-
-class HotStarSeasonIE(HotStarBaseIE):
-    IE_NAME = 'hotstar:season'
-    _VALID_URL = r'(?P<url>https?://(?:www\.)?hotstar\.com(?:/in)?/(?:tv|shows)/[^/]+/\w+)/seasons/[^/]+/ss-(?P<id>\w+)'
-    _TESTS = [{
-        'url': 'https://www.hotstar.com/tv/radhakrishn/1260000646/seasons/season-2/ss-8028',
-        'info_dict': {
-            'id': '8028',
-        },
-        'playlist_mincount': 35,
-    }, {
-        'url': 'https://www.hotstar.com/in/tv/ishqbaaz/9567/seasons/season-2/ss-4357',
-        'info_dict': {
-            'id': '4357',
-        },
-        'playlist_mincount': 30,
-    }, {
-        'url': 'https://www.hotstar.com/in/tv/bigg-boss/14714/seasons/season-4/ss-8208/',
-        'info_dict': {
-            'id': '8208',
-        },
-        'playlist_mincount': 19,
-    }, {
-        'url': 'https://www.hotstar.com/in/shows/bigg-boss/14714/seasons/season-4/ss-8208/',
-        'only_matching': True,
-    }]
-
-    def _real_extract(self, url):
-        url, season_id = self._match_valid_url(url).groups()
-        return self.playlist_result(self._playlist_entries(
-            'season/asset', season_id, url, query={'tao': 0, 'tas': 0, 'size': 10000, 'id': season_id}), season_id)
-
-
 class HotStarSeriesIE(HotStarBaseIE):
     IE_NAME = 'hotstar:series'
     _VALID_URL = r'(?P<url>https?://(?:www\.)?hotstar\.com(?:/in)?/(?:tv|shows)/[^/]+/(?P<id>\d+))/?(?:[#?]|$)'
@@ -443,25 +453,29 @@ class HotStarSeriesIE(HotStarBaseIE):
         'info_dict': {
             'id': '1260050431',
         },
-        'playlist_mincount': 43,
+        'playlist_mincount': 42,
     }, {
         'url': 'https://www.hotstar.com/in/tv/mahabharat/435/',
         'info_dict': {
             'id': '435',
         },
         'playlist_mincount': 267,
-    }, {
+    }, {  # HTTP Error 504 with tas=10000 (possibly because total size is over 1000 items?)
         'url': 'https://www.hotstar.com/in/shows/anupama/1260022017/',
         'info_dict': {
             'id': '1260022017',
         },
-        'playlist_mincount': 940,
+        'playlist_mincount': 1601,
     }]
+    _PAGE_SIZE = 100
 
     def _real_extract(self, url):
-        url, series_id = self._match_valid_url(url).groups()
+        url, series_id = self._match_valid_url(url).group('url', 'id')
-        id_ = self._call_api_v1(
+        eid = self._call_api_v1(
             'show/detail', series_id, query={'contentId': series_id})['body']['results']['item']['id']
 
-        return self.playlist_result(self._playlist_entries(
+        entries = OnDemandPagedList(functools.partial(
-            'tray/g/1/items', series_id, url, query={'tao': 0, 'tas': 10000, 'etid': 0, 'eid': id_}), series_id)
+            self._fetch_page, 'tray/g/1/items', series_id,
+            'series', {'etid': 0, 'eid': eid}, url), self._PAGE_SIZE)
+
+        return self.playlist_result(entries, series_id)

yt_dlp/extractor/jiocinema.py

@@ -1,408 +0,0 @@
-import base64
-import itertools
-import json
-import random
-import re
-import string
-import time
-
-from .common import InfoExtractor
-from ..utils import (
-    ExtractorError,
-    float_or_none,
-    int_or_none,
-    jwt_decode_hs256,
-    parse_age_limit,
-    try_call,
-    url_or_none,
-)
-from ..utils.traversal import traverse_obj
-
-
-class JioCinemaBaseIE(InfoExtractor):
-    _NETRC_MACHINE = 'jiocinema'
-    _GEO_BYPASS = False
-    _ACCESS_TOKEN = None
-    _REFRESH_TOKEN = None
-    _GUEST_TOKEN = None
-    _USER_ID = None
-    _DEVICE_ID = None
-    _API_HEADERS = {'Origin': 'https://www.jiocinema.com', 'Referer': 'https://www.jiocinema.com/'}
-    _APP_NAME = {'appName': 'RJIL_JioCinema'}
-    _APP_VERSION = {'appVersion': '5.0.0'}
-    _API_SIGNATURES = 'o668nxgzwff'
-    _METADATA_API_BASE = 'https://content-jiovoot.voot.com/psapi'
-    _ACCESS_HINT = 'the `accessToken` from your browser local storage'
-    _LOGIN_HINT = (
-        'Log in with "-u phone -p <PHONE_NUMBER>" to authenticate with OTP, '
-        f'or use "-u token -p <ACCESS_TOKEN>" to log in with {_ACCESS_HINT}. '
-        'If you have previously logged in with yt-dlp and your session '
-        'has been cached, you can use "-u device -p <DEVICE_ID>"')
-
-    def _cache_token(self, token_type):
-        assert token_type in ('access', 'refresh', 'all')
-        if token_type in ('access', 'all'):
-            self.cache.store(
-                JioCinemaBaseIE._NETRC_MACHINE, f'{JioCinemaBaseIE._DEVICE_ID}-access', JioCinemaBaseIE._ACCESS_TOKEN)
-        if token_type in ('refresh', 'all'):
-            self.cache.store(
-                JioCinemaBaseIE._NETRC_MACHINE, f'{JioCinemaBaseIE._DEVICE_ID}-refresh', JioCinemaBaseIE._REFRESH_TOKEN)
-
-    def _call_api(self, url, video_id, note='Downloading API JSON', headers={}, data={}):
-        return self._download_json(
-            url, video_id, note, data=json.dumps(data, separators=(',', ':')).encode(), headers={
-                'Content-Type': 'application/json',
-                'Accept': 'application/json',
-                **self._API_HEADERS,
-                **headers,
-            }, expected_status=(400, 403, 474))
-
-    def _call_auth_api(self, service, endpoint, note, headers={}, data={}):
-        return self._call_api(
-            f'https://auth-jiocinema.voot.com/{service}service/apis/v4/{endpoint}',
-            None, note=note, headers=headers, data=data)
-
-    def _refresh_token(self):
-        if not JioCinemaBaseIE._REFRESH_TOKEN or not JioCinemaBaseIE._DEVICE_ID:
-            raise ExtractorError('User token has expired', expected=True)
-        response = self._call_auth_api(
-            'token', 'refreshtoken', 'Refreshing token',
-            headers={'accesstoken': self._ACCESS_TOKEN}, data={
-                **self._APP_NAME,
-                'deviceId': self._DEVICE_ID,
-                'refreshToken': self._REFRESH_TOKEN,
-                **self._APP_VERSION,
-            })
-        refresh_token = response.get('refreshTokenId')
-        if refresh_token and refresh_token != JioCinemaBaseIE._REFRESH_TOKEN:
-            JioCinemaBaseIE._REFRESH_TOKEN = refresh_token
-            self._cache_token('refresh')
-        JioCinemaBaseIE._ACCESS_TOKEN = response['authToken']
-        self._cache_token('access')
-
-    def _fetch_guest_token(self):
-        JioCinemaBaseIE._DEVICE_ID = ''.join(random.choices(string.digits, k=10))
-        guest_token = self._call_auth_api(
-            'token', 'guest', 'Downloading guest token', data={
-                **self._APP_NAME,
-                'deviceType': 'phone',
-                'os': 'ios',
-                'deviceId': self._DEVICE_ID,
-                'freshLaunch': False,
-                'adId': self._DEVICE_ID,
-                **self._APP_VERSION,
-            })
-        self._GUEST_TOKEN = guest_token['authToken']
-        self._USER_ID = guest_token['userId']
-
-    def _call_login_api(self, endpoint, guest_token, data, note):
-        return self._call_auth_api(
-            'user', f'loginotp/{endpoint}', note, headers={
-                **self.geo_verification_headers(),
-                'accesstoken': self._GUEST_TOKEN,
-                **self._APP_NAME,
-                **traverse_obj(guest_token, 'data', {
-                    'deviceType': ('deviceType', {str}),
-                    'os': ('os', {str}),
-                })}, data=data)
-
-    def _is_token_expired(self, token):
-        return (try_call(lambda: jwt_decode_hs256(token)['exp']) or 0) <= int(time.time() - 180)
-
-    def _perform_login(self, username, password):
-        if self._ACCESS_TOKEN and not self._is_token_expired(self._ACCESS_TOKEN):
-            return
-
-        UUID_RE = r'[\da-f]{8}-(?:[\da-f]{4}-){3}[\da-f]{12}'
-
-        if username.lower() == 'token':
-            if try_call(lambda: jwt_decode_hs256(password)):
-                JioCinemaBaseIE._ACCESS_TOKEN = password
-                refresh_hint = 'the `refreshToken` UUID from your browser local storage'
-                refresh_token = self._configuration_arg('refresh_token', [''], ie_key=JioCinemaIE)[0]
-                if not refresh_token:
-                    self.to_screen(
-                        'To extend the life of your login session, in addition to your access token, '
-                        'you can pass --extractor-args "jiocinema:refresh_token=REFRESH_TOKEN" '
-                        f'where REFRESH_TOKEN is {refresh_hint}')
-                elif re.fullmatch(UUID_RE, refresh_token):
-                    JioCinemaBaseIE._REFRESH_TOKEN = refresh_token
-                else:
-                    self.report_warning(f'Invalid refresh_token value. Use {refresh_hint}')
-            else:
-                raise ExtractorError(
-                    f'The password given could not be decoded as a token; use {self._ACCESS_HINT}', expected=True)
-
-        elif username.lower() == 'device' and re.fullmatch(rf'(?:{UUID_RE}|\d+)', password):
-            JioCinemaBaseIE._REFRESH_TOKEN = self.cache.load(JioCinemaBaseIE._NETRC_MACHINE, f'{password}-refresh')
-            JioCinemaBaseIE._ACCESS_TOKEN = self.cache.load(JioCinemaBaseIE._NETRC_MACHINE, f'{password}-access')
-            if not JioCinemaBaseIE._REFRESH_TOKEN or not JioCinemaBaseIE._ACCESS_TOKEN:
-                raise ExtractorError(f'Failed to load cached tokens for device ID "{password}"', expected=True)
-
-        elif username.lower() == 'phone' and re.fullmatch(r'\+?\d+', password):
-            self._fetch_guest_token()
-            guest_token = jwt_decode_hs256(self._GUEST_TOKEN)
-            initial_data = {
-                'number': base64.b64encode(password.encode()).decode(),
-                **self._APP_VERSION,
-            }
-            response = self._call_login_api('send', guest_token, initial_data, 'Requesting OTP')
-            if not traverse_obj(response, ('OTPInfo', {dict})):
-                raise ExtractorError('There was a problem with the phone number login attempt')
-
-            is_iphone = guest_token.get('os') == 'ios'
-            response = self._call_login_api('verify', guest_token, {
-                'deviceInfo': {
-                    'consumptionDeviceName': 'iPhone' if is_iphone else 'Android',
-                    'info': {
-                        'platform': {'name': 'iPhone OS' if is_iphone else 'Android'},
-                        'androidId': self._DEVICE_ID,
-                        'type': 'iOS' if is_iphone else 'Android',
-                    },
-                },
-                **initial_data,
-                'otp': self._get_tfa_info('the one-time password sent to your phone'),
-            }, 'Submitting OTP')
-            if traverse_obj(response, 'code') == 1043:
-                raise ExtractorError('Wrong OTP', expected=True)
-            JioCinemaBaseIE._REFRESH_TOKEN = response['refreshToken']
-            JioCinemaBaseIE._ACCESS_TOKEN = response['authToken']
-
-        else:
-            raise ExtractorError(self._LOGIN_HINT, expected=True)
-
-        user_token = jwt_decode_hs256(JioCinemaBaseIE._ACCESS_TOKEN)['data']
-        JioCinemaBaseIE._USER_ID = user_token['userId']
-        JioCinemaBaseIE._DEVICE_ID = user_token['deviceId']
-        if JioCinemaBaseIE._REFRESH_TOKEN and username != 'device':
-            self._cache_token('all')
-            if self.get_param('cachedir') is not False:
-                self.to_screen(
-                    f'NOTE: For subsequent logins you can use "-u device -p {JioCinemaBaseIE._DEVICE_ID}"')
-        elif not JioCinemaBaseIE._REFRESH_TOKEN:
-            JioCinemaBaseIE._REFRESH_TOKEN = self.cache.load(
-                JioCinemaBaseIE._NETRC_MACHINE, f'{JioCinemaBaseIE._DEVICE_ID}-refresh')
-            if JioCinemaBaseIE._REFRESH_TOKEN:
-                self._cache_token('access')
-        self.to_screen(f'Logging in as device ID "{JioCinemaBaseIE._DEVICE_ID}"')
-        if self._is_token_expired(JioCinemaBaseIE._ACCESS_TOKEN):
-            self._refresh_token()
-
-
-class JioCinemaIE(JioCinemaBaseIE):
-    IE_NAME = 'jiocinema'
-    _VALID_URL = r'https?://(?:www\.)?jiocinema\.com/?(?:movies?/[^/?#]+/|tv-shows/(?:[^/?#]+/){3})(?P<id>\d{3,})'
-    _TESTS = [{
-        'url': 'https://www.jiocinema.com/tv-shows/agnisakshi-ek-samjhauta/1/pradeep-to-stop-the-wedding/3759931',
-        'info_dict': {
-            'id': '3759931',
-            'ext': 'mp4',
-            'title': 'Pradeep to stop the wedding?',
-            'description': 'md5:75f72d1d1a66976633345a3de6d672b1',
-            'episode': 'Pradeep to stop the wedding?',
-            'episode_number': 89,
-            'season': 'Agnisakshi…Ek Samjhauta-S1',
-            'season_number': 1,
-            'series': 'Agnisakshi Ek Samjhauta',
-            'duration': 1238.0,
-            'thumbnail': r're:https?://.+\.jpg',
-            'age_limit': 13,
-            'season_id': '3698031',
-            'upload_date': '20230606',
-            'timestamp': 1686009600,
-            'release_date': '20230607',
-            'genres': ['Drama'],
-        },
-        'params': {'skip_download': 'm3u8'},
-    }, {
-        'url': 'https://www.jiocinema.com/movies/bhediya/3754021/watch',
-        'info_dict': {
-            'id': '3754021',
-            'ext': 'mp4',
-            'title': 'Bhediya',
-            'description': 'md5:a6bf2900371ac2fc3f1447401a9f7bb0',
-            'episode': 'Bhediya',
-            'duration': 8500.0,
-            'thumbnail': r're:https?://.+\.jpg',
-            'age_limit': 13,
-            'upload_date': '20230525',
-            'timestamp': 1685026200,
-            'release_date': '20230524',
-            'genres': ['Comedy'],
-        },
-        'params': {'skip_download': 'm3u8'},
-    }]
-
-    def _extract_formats_and_subtitles(self, playback, video_id):
-        m3u8_url = traverse_obj(playback, (
-            'data', 'playbackUrls', lambda _, v: v['streamtype'] == 'hls', 'url', {url_or_none}, any))
-        if not m3u8_url:  # DRM-only content only serves dash urls
-            self.report_drm(video_id)
-        formats, subtitles = self._extract_m3u8_formats_and_subtitles(m3u8_url, video_id, m3u8_id='hls')
-        self._remove_duplicate_formats(formats)
-
-        return {
-            # '/_definst_/smil:vod/' m3u8 manifests claim to have 720p+ formats but max out at 480p
-            'formats': traverse_obj(formats, (
-                lambda _, v: '/_definst_/smil:vod/' not in v['url'] or v['height'] <= 480)),
-            'subtitles': subtitles,
-        }
-
-    def _real_extract(self, url):
-        video_id = self._match_id(url)
-        if not self._ACCESS_TOKEN and self._is_token_expired(self._GUEST_TOKEN):
-            self._fetch_guest_token()
-        elif self._ACCESS_TOKEN and self._is_token_expired(self._ACCESS_TOKEN):
-            self._refresh_token()
-
-        playback = self._call_api(
-            f'https://apis-jiovoot.voot.com/playbackjv/v3/{video_id}', video_id,
-            'Downloading playback JSON', headers={
-                **self.geo_verification_headers(),
-                'accesstoken': self._ACCESS_TOKEN or self._GUEST_TOKEN,
-                **self._APP_NAME,
-                'deviceid': self._DEVICE_ID,
-                'uniqueid': self._USER_ID,
-                'x-apisignatures': self._API_SIGNATURES,
-                'x-platform': 'androidweb',
-                'x-platform-token': 'web',
-            }, data={
-                '4k': False,
-                'ageGroup': '18+',
-                'appVersion': '3.4.0',
-                'bitrateProfile': 'xhdpi',
-                'capability': {
-                    'drmCapability': {
-                        'aesSupport': 'yes',
-                        'fairPlayDrmSupport': 'none',
-                        'playreadyDrmSupport': 'none',
-                        'widevineDRMSupport': 'none',
-                    },
-                    'frameRateCapability': [{
-                        'frameRateSupport': '30fps',
-                        'videoQuality': '1440p',
-                    }],
-                },
-                'continueWatchingRequired': False,
-                'dolby': False,
-                'downloadRequest': False,
-                'hevc': False,
-                'kidsSafe': False,
-                'manufacturer': 'Windows',
-                'model': 'Windows',
-                'multiAudioRequired': True,
-                'osVersion': '10',
-                'parentalPinValid': True,
-                'x-apisignatures': self._API_SIGNATURES,
-            })
-
-        status_code = traverse_obj(playback, ('code', {int}))
-        if status_code == 474:
-            self.raise_geo_restricted(countries=['IN'])
-        elif status_code == 1008:
-            error_msg = 'This content is only available for premium users'
-            if self._ACCESS_TOKEN:
-                raise ExtractorError(error_msg, expected=True)
-            self.raise_login_required(f'{error_msg}. {self._LOGIN_HINT}', method=None)
-        elif status_code == 400:
-            raise ExtractorError('The requested content is not available', expected=True)
-        elif status_code is not None and status_code != 200:
-            raise ExtractorError(
-                f'JioCinema says: {traverse_obj(playback, ("message", {str})) or status_code}')
-
-        metadata = self._download_json(
-            f'{self._METADATA_API_BASE}/voot/v1/voot-web/content/query/asset-details',
-            video_id, fatal=False, query={
-                'ids': f'include:{video_id}',
-                'responseType': 'common',
-                'devicePlatformType': 'desktop',
-            })
-
-        return {
-            'id': video_id,
-            'http_headers': self._API_HEADERS,
-            **self._extract_formats_and_subtitles(playback, video_id),
-            **traverse_obj(playback, ('data', {
-                # fallback metadata
-                'title': ('name', {str}),
-                'description': ('fullSynopsis', {str}),
-                'series': ('show', 'name', {str}, filter),
-                'season': ('tournamentName', {str}, {lambda x: x if x != 'Season 0' else None}),
-                'season_number': ('episode', 'season', {int_or_none}, filter),
-                'episode': ('fullTitle', {str}),
-                'episode_number': ('episode', 'episodeNo', {int_or_none}, filter),
-                'age_limit': ('ageNemonic', {parse_age_limit}),
-                'duration': ('totalDuration', {float_or_none}),
-                'thumbnail': ('images', {url_or_none}),
-            })),
-            **traverse_obj(metadata, ('result', 0, {
-                'title': ('fullTitle', {str}),
-                'description': ('fullSynopsis', {str}),
-                'series': ('showName', {str}, filter),
-                'season': ('seasonName', {str}, filter),
-                'season_number': ('season', {int_or_none}),
-                'season_id': ('seasonId', {str}, filter),
-                'episode': ('fullTitle', {str}),
-                'episode_number': ('episode', {int_or_none}),
-                'timestamp': ('uploadTime', {int_or_none}),
-                'release_date': ('telecastDate', {str}),
-                'age_limit': ('ageNemonic', {parse_age_limit}),
-                'duration': ('duration', {float_or_none}),
-                'genres': ('genres', ..., {str}),
-                'thumbnail': ('seo', 'ogImage', {url_or_none}),
-            })),
-        }
-
-
-class JioCinemaSeriesIE(JioCinemaBaseIE):
-    IE_NAME = 'jiocinema:series'
-    _VALID_URL = r'https?://(?:www\.)?jiocinema\.com/tv-shows/(?P<slug>[\w-]+)/(?P<id>\d{3,})'
-    _TESTS = [{
-        'url': 'https://www.jiocinema.com/tv-shows/naagin/3499917',
-        'info_dict': {
-            'id': '3499917',
-            'title': 'naagin',
-        },
-        'playlist_mincount': 120,
-    }, {
-        'url': 'https://www.jiocinema.com/tv-shows/mtv-splitsvilla-x5/3499820',
-        'info_dict': {
-            'id': '3499820',
-            'title': 'mtv-splitsvilla-x5',
-        },
-        'playlist_mincount': 310,
-    }]
-
-    def _entries(self, series_id):
-        seasons = traverse_obj(self._download_json(
-            f'{self._METADATA_API_BASE}/voot/v1/voot-web/view/show/{series_id}', series_id,
-            'Downloading series metadata JSON', query={'responseType': 'common'}), (
-            'trays', lambda _, v: v['trayId'] == 'season-by-show-multifilter',
-            'trayTabs', lambda _, v: v['id']))
-
-        for season_num, season in enumerate(seasons, start=1):
-            season_id = season['id']
-            label = season.get('label') or season_num
-            for page_num in itertools.count(1):
-                episodes = traverse_obj(self._download_json(
-                    f'{self._METADATA_API_BASE}/voot/v1/voot-web/content/generic/series-wise-episode',
-                    season_id, f'Downloading season {label} page {page_num} JSON', query={
-                        'sort': 'episode:asc',
-                        'id': season_id,
-                        'responseType': 'common',
-                        'page': page_num,
-                    }), ('result', lambda _, v: v['id'] and url_or_none(v['slug'])))
-                if not episodes:
-                    break
-                for episode in episodes:
-                    yield self.url_result(
-                        episode['slug'], JioCinemaIE, **traverse_obj(episode, {
-                            'video_id': 'id',
-                            'video_title': ('fullTitle', {str}),
-                            'season_number': ('season', {int_or_none}),
-                            'episode_number': ('episode', {int_or_none}),
-                        }))
-
-    def _real_extract(self, url):
-        slug, series_id = self._match_valid_url(url).group('slug', 'id')
-        return self.playlist_result(self._entries(series_id), series_id, slug)

yt_dlp/extractor/joqrag.py

@@ -1,112 +0,0 @@
-import datetime as dt
-import urllib.parse
-
-from .common import InfoExtractor
-from ..utils import (
-    clean_html,
-    datetime_from_str,
-    unified_timestamp,
-    urljoin,
-)
-
-
-class JoqrAgIE(InfoExtractor):
-    IE_DESC = '超!A&G+ 文化放送 (f.k.a. AGQR) Nippon Cultural Broadcasting, Inc. (JOQR)'
-    _VALID_URL = [r'https?://www\.uniqueradio\.jp/agplayer5/(?:player|inc-player-hls)\.php',
-                  r'https?://(?:www\.)?joqr\.co\.jp/ag/',
-                  r'https?://(?:www\.)?joqr\.co\.jp/qr/ag(?:daily|regular)program/?(?:$|[#?])']
-    _TESTS = [{
-        'url': 'https://www.uniqueradio.jp/agplayer5/player.php',
-        'info_dict': {
-            'id': 'live',
-            'title': str,
-            'channel': '超!A&G+',
-            'description': str,
-            'live_status': 'is_live',
-            'release_timestamp': int,
-        },
-        'params': {
-            'skip_download': True,
-            'ignore_no_formats_error': True,
-        },
-    }, {
-        'url': 'https://www.uniqueradio.jp/agplayer5/inc-player-hls.php',
-        'only_matching': True,
-    }, {
-        'url': 'https://www.joqr.co.jp/ag/article/103760/',
-        'only_matching': True,
-    }, {
-        'url': 'http://www.joqr.co.jp/qr/agdailyprogram/',
-        'only_matching': True,
-    }, {
-        'url': 'http://www.joqr.co.jp/qr/agregularprogram/',
-        'only_matching': True,
-    }]
-
-    def _extract_metadata(self, variable, html):
-        return clean_html(urllib.parse.unquote_plus(self._search_regex(
-            rf'var\s+{variable}\s*=\s*(["\'])(?P<value>(?:(?!\1).)+)\1',
-            html, 'metadata', group='value', default=''))) or None
-
-    def _extract_start_timestamp(self, video_id, is_live):
-        def extract_start_time_from(date_str):
-            dt_ = datetime_from_str(date_str) + dt.timedelta(hours=9)
-            date = dt_.strftime('%Y%m%d')
-            start_time = self._search_regex(
-                r'<h3[^>]+\bclass="dailyProgram-itemHeaderTime"[^>]*>[\s\d:]+–\s*(\d{1,2}:\d{1,2})',
-                self._download_webpage(
-                    f'https://www.joqr.co.jp/qr/agdailyprogram/?date={date}', video_id,
-                    note=f'Downloading program list of {date}', fatal=False,
-                    errnote=f'Failed to download program list of {date}') or '',
-                'start time', default=None)
-            if start_time:
-                return unified_timestamp(f'{dt_.strftime("%Y/%m/%d")} {start_time} +09:00')
-            return None
-
-        start_timestamp = extract_start_time_from('today')
-        if not start_timestamp:
-            return None
-
-        if not is_live or start_timestamp < datetime_from_str('now').timestamp():
-            return start_timestamp
-        else:
-            return extract_start_time_from('yesterday')
-
-    def _real_extract(self, url):
-        video_id = 'live'
-
-        metadata = self._download_webpage(
-            'https://www.uniqueradio.jp/aandg', video_id,
-            note='Downloading metadata', errnote='Failed to download metadata')
-        title = self._extract_metadata('Program_name', metadata)
-
-        if not title or title == '放送休止':
-            formats = []
-            live_status = 'is_upcoming'
-            release_timestamp = self._extract_start_timestamp(video_id, False)
-            msg = 'This stream is not currently live'
-            if release_timestamp:
-                msg += (' and will start at '
-                        + dt.datetime.fromtimestamp(release_timestamp).strftime('%Y-%m-%d %H:%M:%S'))
-            self.raise_no_formats(msg, expected=True)
-        else:
-            m3u8_path = self._search_regex(
-                r'<source\s[^>]*\bsrc="([^"]+)"',
-                self._download_webpage(
-                    'https://www.uniqueradio.jp/agplayer5/inc-player-hls.php', video_id,
-                    note='Downloading player data', errnote='Failed to download player data'),
-                'm3u8 url')
-            formats = self._extract_m3u8_formats(
-                urljoin('https://www.uniqueradio.jp/', m3u8_path), video_id)
-            live_status = 'is_live'
-            release_timestamp = self._extract_start_timestamp(video_id, True)
-
-        return {
-            'id': video_id,
-            'title': title,
-            'channel': '超!A&G+',
-            'description': self._extract_metadata('Program_text', metadata),
-            'formats': formats,
-            'live_status': live_status,
-            'release_timestamp': release_timestamp,
-        }

yt_dlp/extractor/kick.py

@@ -1,12 +1,12 @@
+import functools
+import urllib.parse
 
 from .common import InfoExtractor
-from ..networking import HEADRequest
 from ..utils import (
     UserNotLive,
     determine_ext,
     float_or_none,
     int_or_none,
-    merge_dicts,
     parse_iso8601,
     str_or_none,
     traverse_obj,
@@ -16,21 +16,17 @@
 
 
 class KickBaseIE(InfoExtractor):
-    def _real_initialize(self):
+    @functools.cached_property
-        self._request_webpage(
+    def _api_headers(self):
-            HEADRequest('https://kick.com/'), None, 'Setting up session', fatal=False, impersonate=True)
+        token = traverse_obj(
-        xsrf_token = self._get_cookies('https://kick.com/').get('XSRF-TOKEN')
+            self._get_cookies('https://kick.com/'),
-        if not xsrf_token:
+            ('session_token', 'value', {urllib.parse.unquote}))
-            self.write_debug('kick.com did not set XSRF-TOKEN cookie')
+        return {'Authorization': f'Bearer {token}'} if token else {}
-        KickBaseIE._API_HEADERS = {
-            'Authorization': f'Bearer {xsrf_token.value}',
-            'X-XSRF-TOKEN': xsrf_token.value,
-        } if xsrf_token else {}
 
     def _call_api(self, path, display_id, note='Downloading API JSON', headers={}, **kwargs):
         return self._download_json(
             f'https://kick.com/api/{path}', display_id, note=note,
-            headers=merge_dicts(headers, self._API_HEADERS), impersonate=True, **kwargs)
+            headers={**self._api_headers, **headers}, impersonate=True, **kwargs)
 
 
 class KickIE(KickBaseIE):

yt_dlp/extractor/limelight.py

@@ -1,358 +0,0 @@
-import re
-
-from .common import InfoExtractor
-from ..networking.exceptions import HTTPError
-from ..utils import (
-    ExtractorError,
-    determine_ext,
-    float_or_none,
-    int_or_none,
-    smuggle_url,
-    try_get,
-    unsmuggle_url,
-)
-
-
-class LimelightBaseIE(InfoExtractor):
-    _PLAYLIST_SERVICE_URL = 'http://production-ps.lvp.llnw.net/r/PlaylistService/%s/%s/%s'
-
-    @classmethod
-    def _extract_embed_urls(cls, url, webpage):
-        lm = {
-            'Media': 'media',
-            'Channel': 'channel',
-            'ChannelList': 'channel_list',
-        }
-
-        def smuggle(url):
-            return smuggle_url(url, {'source_url': url})
-
-        entries = []
-        for kind, video_id in re.findall(
-                r'LimelightPlayer\.doLoad(Media|Channel|ChannelList)\(["\'](?P<id>[a-z0-9]{32})',
-                webpage):
-            entries.append(cls.url_result(
-                smuggle(f'limelight:{lm[kind]}:{video_id}'),
-                f'Limelight{kind}', video_id))
-        for mobj in re.finditer(
-                # As per [1] class attribute should be exactly equal to
-                # LimelightEmbeddedPlayerFlash but numerous examples seen
-                # that don't exactly match it (e.g. [2]).
-                # 1. http://support.3playmedia.com/hc/en-us/articles/227732408-Limelight-Embedding-the-Captions-Plugin-with-the-Limelight-Player-on-Your-Webpage
-                # 2. http://www.sedona.com/FacilitatorTraining2017
-                r'''(?sx)
-                    <object[^>]+class=(["\'])(?:(?!\1).)*\bLimelightEmbeddedPlayerFlash\b(?:(?!\1).)*\1[^>]*>.*?
-                        <param[^>]+
-                            name=(["\'])flashVars\2[^>]+
-                            value=(["\'])(?:(?!\3).)*(?P<kind>media|channel(?:List)?)Id=(?P<id>[a-z0-9]{32})
-                ''', webpage):
-            kind, video_id = mobj.group('kind'), mobj.group('id')
-            entries.append(cls.url_result(
-                smuggle(f'limelight:{kind}:{video_id}'),
-                f'Limelight{kind.capitalize()}', video_id))
-        # http://support.3playmedia.com/hc/en-us/articles/115009517327-Limelight-Embedding-the-Audio-Description-Plugin-with-the-Limelight-Player-on-Your-Web-Page)
-        for video_id in re.findall(
-                r'(?s)LimelightPlayerUtil\.embed\s*\(\s*{.*?\bmediaId["\']\s*:\s*["\'](?P<id>[a-z0-9]{32})',
-                webpage):
-            entries.append(cls.url_result(
-                smuggle(f'limelight:media:{video_id}'),
-                LimelightMediaIE.ie_key(), video_id))
-        return entries
-
-    def _call_playlist_service(self, item_id, method, fatal=True, referer=None):
-        headers = {}
-        if referer:
-            headers['Referer'] = referer
-        try:
-            return self._download_json(
-                self._PLAYLIST_SERVICE_URL % (self._PLAYLIST_SERVICE_PATH, item_id, method),
-                item_id, f'Downloading PlaylistService {method} JSON',
-                fatal=fatal, headers=headers)
-        except ExtractorError as e:
-            if isinstance(e.cause, HTTPError) and e.cause.status == 403:
-                error = self._parse_json(e.cause.response.read().decode(), item_id)['detail']['contentAccessPermission']
-                if error == 'CountryDisabled':
-                    self.raise_geo_restricted()
-                raise ExtractorError(error, expected=True)
-            raise
-
-    def _extract(self, item_id, pc_method, mobile_method, referer=None):
-        pc = self._call_playlist_service(item_id, pc_method, referer=referer)
-        mobile = self._call_playlist_service(
-            item_id, mobile_method, fatal=False, referer=referer)
-        return pc, mobile
-
-    def _extract_info(self, pc, mobile, i, referer):
-        get_item = lambda x, y: try_get(x, lambda x: x[y][i], dict) or {}
-        pc_item = get_item(pc, 'playlistItems')
-        mobile_item = get_item(mobile, 'mediaList')
-        video_id = pc_item.get('mediaId') or mobile_item['mediaId']
-        title = pc_item.get('title') or mobile_item['title']
-
-        formats = []
-        urls = []
-        for stream in pc_item.get('streams', []):
-            stream_url = stream.get('url')
-            if not stream_url or stream_url in urls:
-                continue
-            if not self.get_param('allow_unplayable_formats') and stream.get('drmProtected'):
-                continue
-            urls.append(stream_url)
-            ext = determine_ext(stream_url)
-            if ext == 'f4m':
-                formats.extend(self._extract_f4m_formats(
-                    stream_url, video_id, f4m_id='hds', fatal=False))
-            else:
-                fmt = {
-                    'url': stream_url,
-                    'abr': float_or_none(stream.get('audioBitRate')),
-                    'fps': float_or_none(stream.get('videoFrameRate')),
-                    'ext': ext,
-                }
-                width = int_or_none(stream.get('videoWidthInPixels'))
-                height = int_or_none(stream.get('videoHeightInPixels'))
-                vbr = float_or_none(stream.get('videoBitRate'))
-                if width or height or vbr:
-                    fmt.update({
-                        'width': width,
-                        'height': height,
-                        'vbr': vbr,
-                    })
-                else:
-                    fmt['vcodec'] = 'none'
-                rtmp = re.search(r'^(?P<url>rtmpe?://(?P<host>[^/]+)/(?P<app>.+))/(?P<playpath>mp[34]:.+)$', stream_url)
-                if rtmp:
-                    format_id = 'rtmp'
-                    if stream.get('videoBitRate'):
-                        format_id += '-%d' % int_or_none(stream['videoBitRate'])
-                    http_format_id = format_id.replace('rtmp', 'http')
-
-                    CDN_HOSTS = (
-                        ('delvenetworks.com', 'cpl.delvenetworks.com'),
-                        ('video.llnw.net', 's2.content.video.llnw.net'),
-                    )
-                    for cdn_host, http_host in CDN_HOSTS:
-                        if cdn_host not in rtmp.group('host').lower():
-                            continue
-                        http_url = 'http://{}/{}'.format(http_host, rtmp.group('playpath')[4:])
-                        urls.append(http_url)
-                        if self._is_valid_url(http_url, video_id, http_format_id):
-                            http_fmt = fmt.copy()
-                            http_fmt.update({
-                                'url': http_url,
-                                'format_id': http_format_id,
-                            })
-                            formats.append(http_fmt)
-                            break
-
-                    fmt.update({
-                        'url': rtmp.group('url'),
-                        'play_path': rtmp.group('playpath'),
-                        'app': rtmp.group('app'),
-                        'ext': 'flv',
-                        'format_id': format_id,
-                    })
-                formats.append(fmt)
-
-        for mobile_url in mobile_item.get('mobileUrls', []):
-            media_url = mobile_url.get('mobileUrl')
-            format_id = mobile_url.get('targetMediaPlatform')
-            if not media_url or media_url in urls:
-                continue
-            if (format_id in ('Widevine', 'SmoothStreaming')
-                    and not self.get_param('allow_unplayable_formats', False)):
-                continue
-            urls.append(media_url)
-            ext = determine_ext(media_url)
-            if ext == 'm3u8':
-                formats.extend(self._extract_m3u8_formats(
-                    media_url, video_id, 'mp4', 'm3u8_native',
-                    m3u8_id=format_id, fatal=False))
-            elif ext == 'f4m':
-                formats.extend(self._extract_f4m_formats(
-                    stream_url, video_id, f4m_id=format_id, fatal=False))
-            else:
-                formats.append({
-                    'url': media_url,
-                    'format_id': format_id,
-                    'quality': -10,
-                    'ext': ext,
-                })
-
-        subtitles = {}
-        for flag in mobile_item.get('flags'):
-            if flag == 'ClosedCaptions':
-                closed_captions = self._call_playlist_service(
-                    video_id, 'getClosedCaptionsDetailsByMediaId',
-                    False, referer) or []
-                for cc in closed_captions:
-                    cc_url = cc.get('webvttFileUrl')
-                    if not cc_url:
-                        continue
-                    lang = cc.get('languageCode') or self._search_regex(r'/([a-z]{2})\.vtt', cc_url, 'lang', default='en')
-                    subtitles.setdefault(lang, []).append({
-                        'url': cc_url,
-                    })
-                break
-
-        get_meta = lambda x: pc_item.get(x) or mobile_item.get(x)
-
-        return {
-            'id': video_id,
-            'title': title,
-            'description': get_meta('description'),
-            'formats': formats,
-            'duration': float_or_none(get_meta('durationInMilliseconds'), 1000),
-            'thumbnail': get_meta('previewImageUrl') or get_meta('thumbnailImageUrl'),
-            'subtitles': subtitles,
-        }
-
-
-class LimelightMediaIE(LimelightBaseIE):
-    IE_NAME = 'limelight'
-    _VALID_URL = r'''(?x)
-                        (?:
-                            limelight:media:|
-                            https?://
-                                (?:
-                                    link\.videoplatform\.limelight\.com/media/|
-                                    assets\.delvenetworks\.com/player/loader\.swf
-                                )
-                                \?.*?\bmediaId=
-                        )
-                        (?P<id>[a-z0-9]{32})
-                    '''
-    _TESTS = [{
-        'url': 'http://link.videoplatform.limelight.com/media/?mediaId=3ffd040b522b4485b6d84effc750cd86',
-        'info_dict': {
-            'id': '3ffd040b522b4485b6d84effc750cd86',
-            'ext': 'mp4',
-            'title': 'HaP and the HB Prince Trailer',
-            'description': 'md5:8005b944181778e313d95c1237ddb640',
-            'thumbnail': r're:^https?://.*\.jpeg$',
-            'duration': 144.23,
-        },
-        'params': {
-            # m3u8 download
-            'skip_download': True,
-        },
-    }, {
-        # video with subtitles
-        'url': 'limelight:media:a3e00274d4564ec4a9b29b9466432335',
-        'md5': '2fa3bad9ac321e23860ca23bc2c69e3d',
-        'info_dict': {
-            'id': 'a3e00274d4564ec4a9b29b9466432335',
-            'ext': 'mp4',
-            'title': '3Play Media Overview Video',
-            'thumbnail': r're:^https?://.*\.jpeg$',
-            'duration': 78.101,
-            # TODO: extract all languages that were accessible via API
-            # 'subtitles': 'mincount:9',
-            'subtitles': 'mincount:1',
-        },
-    }, {
-        'url': 'https://assets.delvenetworks.com/player/loader.swf?mediaId=8018a574f08d416e95ceaccae4ba0452',
-        'only_matching': True,
-    }]
-    _PLAYLIST_SERVICE_PATH = 'media'
-
-    def _real_extract(self, url):
-        url, smuggled_data = unsmuggle_url(url, {})
-        video_id = self._match_id(url)
-        source_url = smuggled_data.get('source_url')
-        self._initialize_geo_bypass({
-            'countries': smuggled_data.get('geo_countries'),
-        })
-
-        pc, mobile = self._extract(
-            video_id, 'getPlaylistByMediaId',
-            'getMobilePlaylistByMediaId', source_url)
-
-        return self._extract_info(pc, mobile, 0, source_url)
-
-
-class LimelightChannelIE(LimelightBaseIE):
-    IE_NAME = 'limelight:channel'
-    _VALID_URL = r'''(?x)
-                        (?:
-                            limelight:channel:|
-                            https?://
-                                (?:
-                                    link\.videoplatform\.limelight\.com/media/|
-                                    assets\.delvenetworks\.com/player/loader\.swf
-                                )
-                                \?.*?\bchannelId=
-                        )
-                        (?P<id>[a-z0-9]{32})
-                    '''
-    _TESTS = [{
-        'url': 'http://link.videoplatform.limelight.com/media/?channelId=ab6a524c379342f9b23642917020c082',
-        'info_dict': {
-            'id': 'ab6a524c379342f9b23642917020c082',
-            'title': 'Javascript Sample Code',
-            'description': 'Javascript Sample Code - http://www.delvenetworks.com/sample-code/playerCode-demo.html',
-        },
-        'playlist_mincount': 3,
-    }, {
-        'url': 'http://assets.delvenetworks.com/player/loader.swf?channelId=ab6a524c379342f9b23642917020c082',
-        'only_matching': True,
-    }]
-    _PLAYLIST_SERVICE_PATH = 'channel'
-
-    def _real_extract(self, url):
-        url, smuggled_data = unsmuggle_url(url, {})
-        channel_id = self._match_id(url)
-        source_url = smuggled_data.get('source_url')
-
-        pc, mobile = self._extract(
-            channel_id, 'getPlaylistByChannelId',
-            'getMobilePlaylistWithNItemsByChannelId?begin=0&count=-1',
-            source_url)
-
-        entries = [
-            self._extract_info(pc, mobile, i, source_url)
-            for i in range(len(pc['playlistItems']))]
-
-        return self.playlist_result(
-            entries, channel_id, pc.get('title'), mobile.get('description'))
-
-
-class LimelightChannelListIE(LimelightBaseIE):
-    IE_NAME = 'limelight:channel_list'
-    _VALID_URL = r'''(?x)
-                        (?:
-                            limelight:channel_list:|
-                            https?://
-                                (?:
-                                    link\.videoplatform\.limelight\.com/media/|
-                                    assets\.delvenetworks\.com/player/loader\.swf
-                                )
-                                \?.*?\bchannelListId=
-                        )
-                        (?P<id>[a-z0-9]{32})
-                    '''
-    _TESTS = [{
-        'url': 'http://link.videoplatform.limelight.com/media/?channelListId=301b117890c4465c8179ede21fd92e2b',
-        'info_dict': {
-            'id': '301b117890c4465c8179ede21fd92e2b',
-            'title': 'Website - Hero Player',
-        },
-        'playlist_mincount': 2,
-    }, {
-        'url': 'https://assets.delvenetworks.com/player/loader.swf?channelListId=301b117890c4465c8179ede21fd92e2b',
-        'only_matching': True,
-    }]
-    _PLAYLIST_SERVICE_PATH = 'channel_list'
-
-    def _real_extract(self, url):
-        channel_list_id = self._match_id(url)
-
-        channel_list = self._call_playlist_service(
-            channel_list_id, 'getMobileChannelListById')
-
-        entries = [
-            self.url_result('limelight:channel:{}'.format(channel['id']), 'LimelightChannel')
-            for channel in channel_list['channelList']]
-
-        return self.playlist_result(
-            entries, channel_list_id, channel_list['title'])

yt_dlp/extractor/lrt.py

@@ -134,7 +134,7 @@ class LRTRadioIE(LRTBaseIE):
     def _real_extract(self, url):
         video_id, path = self._match_valid_url(url).group('id', 'path')
         media = self._download_json(
-            'https://www.lrt.lt/radioteka/api/media', video_id,
+            'https://www.lrt.lt/rest-api/media', video_id,
             query={'url': f'/mediateka/irasas/{video_id}/{path}'})
 
         return {

yt_dlp/extractor/mir24tv.py

@@ -0,0 +1,37 @@
+from .common import InfoExtractor
+from ..utils import parse_qs, url_or_none
+from ..utils.traversal import require, traverse_obj
+
+
+class Mir24TvIE(InfoExtractor):
+    IE_NAME = 'mir24.tv'
+    _VALID_URL = r'https?://(?:www\.)?mir24\.tv/news/(?P<id>[0-9]+)/[^/?#]+'
+    _TESTS = [{
+        'url': 'https://mir24.tv/news/16635210/dni-kultury-rossii-otkrylis-v-uzbekistane.-na-prazdnichnom-koncerte-vystupili-zvezdy-rossijskoj-estrada',
+        'info_dict': {
+            'id': '16635210',
+            'title': 'Дни культуры России открылись в Узбекистане. На праздничном концерте выступили звезды российской эстрады',
+            'ext': 'mp4',
+            'thumbnail': r're:https://images\.mir24\.tv/.+\.jpg',
+        },
+    }]
+
+    def _real_extract(self, url):
+        video_id = self._match_id(url)
+        webpage = self._download_webpage(url, video_id, impersonate=True)
+
+        iframe_url = self._search_regex(
+            r'<iframe\b[^>]+\bsrc=["\'](https?://mir24\.tv/players/[^"\']+)',
+            webpage, 'iframe URL')
+
+        m3u8_url = traverse_obj(iframe_url, (
+            {parse_qs}, 'source', -1, {self._proto_relative_url}, {url_or_none}, {require('m3u8 URL')}))
+        formats, subtitles = self._extract_m3u8_formats_and_subtitles(m3u8_url, video_id, 'mp4', m3u8_id='hls')
+
+        return {
+            'id': video_id,
+            'title': self._og_search_title(webpage, default=None) or self._html_extract_title(webpage),
+            'thumbnail': self._og_search_thumbnail(webpage, default=None),
+            'formats': formats,
+            'subtitles': subtitles,
+        }

yt_dlp/extractor/mixlr.py

@@ -0,0 +1,134 @@
+from .common import InfoExtractor
+from ..networking import HEADRequest
+from ..utils import int_or_none, parse_iso8601, url_or_none, urlhandle_detect_ext
+from ..utils.traversal import traverse_obj
+
+
+class MixlrIE(InfoExtractor):
+    _VALID_URL = r'https?://(?:www\.)?(?P<username>[\w-]+)\.mixlr\.com/events/(?P<id>\d+)'
+    _TESTS = [{
+        'url': 'https://suncity-104-9fm.mixlr.com/events/4387115',
+        'info_dict': {
+            'id': '4387115',
+            'ext': 'mp3',
+            'title': r're:SUNCITY 104.9FM\'s live audio \d{4}-\d{2}-\d{2} \d{2}:\d{2}',
+            'uploader': 'suncity-104-9fm',
+            'like_count': int,
+            'thumbnail': r're:https://imagecdn\.mixlr\.com/cdn-cgi/image/[^/?#]+/cd5b34d05fa2cee72d80477724a2f02e.png',
+            'timestamp': 1751943773,
+            'upload_date': '20250708',
+            'release_timestamp': 1751943764,
+            'release_date': '20250708',
+            'live_status': 'is_live',
+        },
+    }, {
+        'url': 'https://brcountdown.mixlr.com/events/4395480',
+        'info_dict': {
+            'id': '4395480',
+            'ext': 'aac',
+            'title': r're:Beats Revolution Countdown Episodio 461 \d{4}-\d{2}-\d{2} \d{2}:\d{2}',
+            'description': 'md5:5cacd089723f7add3f266bd588315bb3',
+            'uploader': 'brcountdown',
+            'like_count': int,
+            'thumbnail': r're:https://imagecdn\.mixlr\.com/cdn-cgi/image/[^/?#]+/c48727a59f690b87a55d47d123ba0d6d.jpg',
+            'timestamp': 1752354007,
+            'upload_date': '20250712',
+            'release_timestamp': 1752354000,
+            'release_date': '20250712',
+            'live_status': 'is_live',
+        },
+    }, {
+        'url': 'https://www.brcountdown.mixlr.com/events/4395480',
+        'only_matching': True,
+    }]
+
+    def _real_extract(self, url):
+        username, event_id = self._match_valid_url(url).group('username', 'id')
+
+        broadcast_info = self._download_json(
+            f'https://api.mixlr.com/v3/channels/{username}/events/{event_id}', event_id)
+
+        formats = []
+        format_url = traverse_obj(
+            broadcast_info, ('included', 0, 'attributes', 'progressive_stream_url', {url_or_none}))
+        if format_url:
+            urlh = self._request_webpage(
+                HEADRequest(format_url), event_id, fatal=False, note='Checking stream')
+            if urlh and urlh.status == 200:
+                ext = urlhandle_detect_ext(urlh)
+                if ext == 'octet-stream':
+                    self.report_warning(
+                        'The server did not return a valid file extension for the stream URL. '
+                        'Assuming an mp3 stream; postprocessing may fail if this is incorrect')
+                    ext = 'mp3'
+                formats.append({
+                    'url': format_url,
+                    'ext': ext,
+                    'vcodec': 'none',
+                })
+
+        release_timestamp = traverse_obj(
+            broadcast_info, ('data', 'attributes', 'starts_at', {str}))
+        if not formats and release_timestamp:
+            self.raise_no_formats(f'This event will start at {release_timestamp}', expected=True)
+
+        return {
+            'id': event_id,
+            'uploader': username,
+            'formats': formats,
+            'release_timestamp': parse_iso8601(release_timestamp),
+            **traverse_obj(broadcast_info, ('included', 0, 'attributes', {
+                'title': ('title', {str}),
+                'timestamp': ('started_at', {parse_iso8601}),
+                'concurrent_view_count': ('concurrent_view_count', {int_or_none}),
+                'like_count': ('heart_count', {int_or_none}),
+                'is_live': ('live', {bool}),
+            })),
+            **traverse_obj(broadcast_info, ('data', 'attributes', {
+                'title': ('title', {str}),
+                'description': ('description', {str}),
+                'timestamp': ('started_at', {parse_iso8601}),
+                'concurrent_view_count': ('concurrent_view_count', {int_or_none}),
+                'like_count': ('heart_count', {int_or_none}),
+                'thumbnail': ('artwork_url', {url_or_none}),
+                'uploader_id': ('broadcaster_id', {str}),
+            })),
+        }
+
+
+class MixlrRecoringIE(InfoExtractor):
+    _VALID_URL = r'https?://(?:www\.)?(?P<username>[\w-]+)\.mixlr\.com/recordings/(?P<id>\d+)'
+    _TESTS = [{
+        'url': 'https://biblewayng.mixlr.com/recordings/2375193',
+        'info_dict': {
+            'id': '2375193',
+            'ext': 'mp3',
+            'title': "God's Jewels and Their Resting Place Bro. Adeniji",
+            'description': 'Preached February 21, 2024 in the evening',
+            'uploader_id': '8659190',
+            'duration': 10968,
+            'thumbnail': r're:https://imagecdn\.mixlr\.com/cdn-cgi/image/[^/?#]+/ceca120ef707f642abeea6e29cd74238.jpg',
+            'timestamp': 1708544542,
+            'upload_date': '20240221',
+        },
+    }]
+
+    def _real_extract(self, url):
+        username, recording_id = self._match_valid_url(url).group('username', 'id')
+
+        recording_info = self._download_json(
+            f'https://api.mixlr.com/v3/channels/{username}/recordings/{recording_id}', recording_id)
+
+        return {
+            'id': recording_id,
+            **traverse_obj(recording_info, ('data', 'attributes', {
+                'ext': ('file_format', {str}),
+                'url': ('url', {url_or_none}),
+                'title': ('title', {str}),
+                'description': ('description', {str}),
+                'timestamp': ('created_at', {parse_iso8601}),
+                'duration': ('duration', {int_or_none}),
+                'thumbnail': ('artwork_url', {url_or_none}),
+                'uploader_id': ('user_id', {str}),
+            })),
+        }

yt_dlp/extractor/newspicks.py

@@ -1,53 +1,72 @@
-import re
-
 from .common import InfoExtractor
-from ..utils import ExtractorError
+from ..utils import (
+    clean_html,
+    parse_iso8601,
+    parse_qs,
+    url_or_none,
+)
+from ..utils.traversal import require, traverse_obj
 
 
 class NewsPicksIE(InfoExtractor):
-    _VALID_URL = r'https?://newspicks\.com/movie-series/(?P<channel_id>\d+)\?movieId=(?P<id>\d+)'
+    _VALID_URL = r'https?://newspicks\.com/movie-series/(?P<id>[^?/#]+)'
-
     _TESTS = [{
-        'url': 'https://newspicks.com/movie-series/11?movieId=1813',
+        'url': 'https://newspicks.com/movie-series/11/?movieId=1813',
         'info_dict': {
             'id': '1813',
-            'title': '日本の課題を破壊せよ【ゲスト：成田悠輔】',
-            'description': 'md5:09397aad46d6ded6487ff13f138acadf',
-            'channel': 'HORIE ONE',
-            'channel_id': '11',
-            'release_date': '20220117',
-            'thumbnail': r're:https://.+jpg',
             'ext': 'mp4',
+            'title': '日本の課題を破壊せよ【ゲスト：成田悠輔】',
+            'cast': 'count:4',
+            'description': 'md5:09397aad46d6ded6487ff13f138acadf',
+            'duration': 2940,
+            'release_date': '20220117',
+            'release_timestamp': 1642424400,
+            'series': 'HORIE ONE',
+            'series_id': '11',
+            'thumbnail': r're:https?://resources\.newspicks\.com/.+\.(?:jpe?g|png)',
+            'timestamp': 1642424420,
+            'upload_date': '20220117',
+        },
+    }, {
+        'url': 'https://newspicks.com/movie-series/158/?movieId=3932',
+        'info_dict': {
+            'id': '3932',
+            'ext': 'mp4',
+            'title': '【検証】専門家は、KADOKAWAをどう見るか',
+            'cast': 'count:3',
+            'description': 'md5:2c2d4bf77484a4333ec995d676f9a91d',
+            'duration': 1320,
+            'release_date': '20240622',
+            'release_timestamp': 1719088080,
+            'series': 'NPレポート',
+            'series_id': '158',
+            'thumbnail': r're:https?://resources\.newspicks\.com/.+\.(?:jpe?g|png)',
+            'timestamp': 1719086400,
+            'upload_date': '20240622',
         },
     }]
 
     def _real_extract(self, url):
-        video_id, channel_id = self._match_valid_url(url).group('id', 'channel_id')
+        series_id = self._match_id(url)
+        video_id = traverse_obj(parse_qs(url), ('movieId', -1, {str}, {require('movie ID')}))
         webpage = self._download_webpage(url, video_id)
-        entries = self._parse_html5_media_entries(
-            url, webpage.replace('movie-for-pc', 'movie'), video_id, 'hls')
-        if not entries:
-            raise ExtractorError('No HTML5 media elements found')
-        info = entries[0]
 
-        title = self._html_search_meta('og:title', webpage, fatal=False)
+        fragment = self._search_nextjs_data(webpage, video_id)['props']['pageProps']['fragment']
-        description = self._html_search_meta(
+        m3u8_url = traverse_obj(fragment, ('movie', 'movieUrl', {url_or_none}, {require('m3u8 URL')}))
-            ('og:description', 'twitter:title'), webpage, fatal=False)
+        formats, subtitles = self._extract_m3u8_formats_and_subtitles(m3u8_url, video_id, 'mp4')
-        channel = self._html_search_regex(
-            r'value="11".+?<div\s+class="title">(.+?)</div', webpage, 'channel name', fatal=False)
-        if not title or not channel:
-            title, channel = re.split(r'\s*|\s*', self._html_extract_title(webpage))
 
-        release_date = self._search_regex(
+        return {
-            r'<span\s+class="on-air-date">\s*(\d+)年(\d+)月(\d+)日\s*</span>',
-            webpage, 'release date', fatal=False, group=(1, 2, 3))
-
-        info.update({
             'id': video_id,
-            'title': title,
+            'formats': formats,
-            'description': description,
+            'series': traverse_obj(fragment, ('series', 'title', {str})),
-            'channel': channel,
+            'series_id': series_id,
-            'channel_id': channel_id,
+            'subtitles': subtitles,
-            'release_date': ('%04d%02d%02d' % tuple(map(int, release_date))) if release_date else None,
+            **traverse_obj(fragment, ('movie', {
-        })
+                'title': ('title', {str}),
-        return info
+                'cast': ('relatedUsers', ..., 'displayName', {str}, filter, all, filter),
+                'description': ('explanation', {clean_html}),
+                'release_timestamp': ('onAirStartDate', {parse_iso8601}),
+                'thumbnail': (('image', 'coverImageUrl'), {url_or_none}, any),
+                'timestamp': ('published', {parse_iso8601}),
+            })),
+        }

yt_dlp/extractor/nhk.py

@@ -8,6 +8,8 @@
     get_element_by_class,
     int_or_none,
     join_nonempty,
+    make_archive_id,
+    orderedSet,
     parse_duration,
     remove_end,
     traverse_obj,
@@ -16,6 +18,7 @@
     unified_timestamp,
     url_or_none,
     urljoin,
+    variadic,
 )
 
 
@@ -495,7 +498,7 @@ def _real_extract(self, url):
         chapters = None
         if chapter_durations and chapter_titles and len(chapter_durations) == len(chapter_titles):
             start_time = chapter_durations
-            end_time = chapter_durations[1:] + [duration]
+            end_time = [*chapter_durations[1:], duration]
             chapters = [{
                 'start_time': s,
                 'end_time': e,
@@ -591,102 +594,179 @@ class NhkRadiruIE(InfoExtractor):
     IE_DESC = 'NHK らじる (Radiru/Rajiru)'
     _VALID_URL = r'https?://www\.nhk\.or\.jp/radio/(?:player/ondemand|ondemand/detail)\.html\?p=(?P<site>[\da-zA-Z]+)_(?P<corner>[\da-zA-Z]+)(?:_(?P<headline>[\da-zA-Z]+))?'
     _TESTS = [{
-        'url': 'https://www.nhk.or.jp/radio/player/ondemand.html?p=0449_01_4003239',
+        'url': 'https://www.nhk.or.jp/radio/player/ondemand.html?p=LG96ZW5KZ4_01_4251382',
-        'skip': 'Episode expired on 2024-06-09',
+        'skip': 'Episode expires on 2025-07-14',
         'info_dict': {
-            'title': 'ジャズ・トゥナイト　ジャズ「Ｎｉｇｈｔ　ａｎｄ　Ｄａｙ」特集',
+            'title': 'クラシックの庭\u3000特集「ドボルザークを聴く」（１）交響曲を中心に',
-            'id': '0449_01_4003239',
+            'id': 'LG96ZW5KZ4_01_4251382',
             'ext': 'm4a',
-            'uploader': 'NHK FM 東京',
+            'description': 'md5:652d3c38a25b77959c716421eba1617a',
-            'description': 'md5:ad05f3c3f3f6e99b2e69f9b5e49551dc',
+            'uploader': 'NHK FM・東京',
-            'series': 'ジャズ・トゥナイト',
+            'channel': 'NHK FM・東京',
-            'channel': 'NHK FM 東京',
+            'duration': 6597.0,
-            'thumbnail': 'https://www.nhk.or.jp/prog/img/449/g449.jpg',
+            'thumbnail': 'https://www.nhk.jp/static/assets/images/radioseries/rs/LG96ZW5KZ4/LG96ZW5KZ4-eyecatch_a67c6e949325016c0724f2ed3eec8a2f.jpg',
-            'upload_date': '20240601',
+            'categories': ['音楽', 'クラシック・オペラ'],
-            'series_id': '0449_01',
+            'cast': ['田添菜穂子'],
-            'release_date': '20240601',
+            'series': 'クラシックの庭',
-            'timestamp': 1717257600,
+            'series_id': 'LG96ZW5KZ4',
-            'release_timestamp': 1717250400,
+            'episode': '特集「ドボルザークを聴く」(1)交響曲を中心に',
+            'episode_id': 'QP1Q2ZXZY3',
+            'timestamp': 1751871000,
+            'upload_date': '20250707',
+            'release_timestamp': 1751864403,
+            'release_date': '20250707',
         },
     }, {
         # playlist, airs every weekday so it should _hopefully_ be okay forever
-        'url': 'https://www.nhk.or.jp/radio/ondemand/detail.html?p=0458_01',
+        'url': 'https://www.nhk.or.jp/radio/ondemand/detail.html?p=Z9L1V2M24L_01',
         'info_dict': {
-            'id': '0458_01',
+            'id': 'Z9L1V2M24L_01',
             'title': 'ベストオブクラシック',
             'description': '世界中の上質な演奏会をじっくり堪能する本格派クラシック番組。',
-            'thumbnail': 'https://www.nhk.or.jp/prog/img/458/g458.jpg',
+            'thumbnail': 'https://www.nhk.jp/static/assets/images/radioseries/rs/Z9L1V2M24L/Z9L1V2M24L-eyecatch_83ed28b4782907998875965fee60a351.jpg',
-            'series_id': '0458_01',
+            'series_id': 'Z9L1V2M24L_01',
             'uploader': 'NHK FM',
             'channel': 'NHK FM',
             'series': 'ベストオブクラシック',
         },
         'playlist_mincount': 3,
-    }, {
-        # one with letters in the id
-        'url': 'https://www.nhk.or.jp/radio/player/ondemand.html?p=F683_01_3910688',
-        'note': 'Expires on 2025-03-31',
-        'info_dict': {
-            'id': 'F683_01_3910688',
-            'ext': 'm4a',
-            'title': '夏目漱石「文鳥」第1回',
-            'series': '【らじる文庫】夏目漱石「文鳥」（全4回）',
-            'series_id': 'F683_01',
-            'description': '朗読：浅井理アナウンサー',
-            'thumbnail': 'https://www.nhk.or.jp/radioondemand/json/F683/img/roudoku_05_rod_640.jpg',
-            'upload_date': '20240106',
-            'release_date': '20240106',
-            'uploader': 'NHK R1',
-            'release_timestamp': 1704511800,
-            'channel': 'NHK R1',
-            'timestamp': 1704512700,
-        },
-        'expected_warnings': ['Unable to download JSON metadata',
-                              'Failed to get extended metadata. API returned Error 1: Invalid parameters'],
     }, {
         # news
-        'url': 'https://www.nhk.or.jp/radio/player/ondemand.html?p=F261_01_4012173',
+        'url': 'https://www.nhk.or.jp/radio/player/ondemand.html?p=18439M2W42_02_4251212',
+        'skip': 'Expires on 2025-07-15',
         'info_dict': {
-            'id': 'F261_01_4012173',
+            'id': '18439M2W42_02_4251212',
             'ext': 'm4a',
-            'channel': 'NHKラジオ第1',
+            'title': 'マイあさ! 午前5時のNHKニュース 2025年7月8日',
             'uploader': 'NHKラジオ第1',
+            'channel': 'NHKラジオ第1',
+            'thumbnail': 'https://www.nhk.or.jp/radioondemand/json/18439M2W42/img/series_945_thumbnail.jpg',
             'series': 'NHKラジオニュース',
-            'title': '午前０時のNHKニュース',
+            'timestamp': 1751919420,
-            'thumbnail': 'https://www.nhk.or.jp/radioondemand/json/F261/img/RADIONEWS_640.jpg',
+            'upload_date': '20250707',
-            'release_timestamp': 1718290800,
+            'release_timestamp': 1751918400,
-            'release_date': '20240613',
+            'release_date': '20250707',
-            'timestamp': 1718291400,
-            'upload_date': '20240613',
         },
     }, {
         # fallback when extended metadata fails
-        'url': 'https://www.nhk.or.jp/radio/player/ondemand.html?p=2834_01_4009298',
+        'url': 'https://www.nhk.or.jp/radio/player/ondemand.html?p=J8792PY43V_20_4253945',
-        'skip': 'Expires on 2024-06-07',
+        'skip': 'Expires on 2025-09-01',
         'info_dict': {
-            'id': '2834_01_4009298',
+            'id': 'J8792PY43V_20_4253945',
-            'title': 'まち☆キラ！開成町特集',
             'ext': 'm4a',
-            'release_date': '20240531',
+            'title': '「後絶たない筋肉増強剤の使用」ワールドリポート',
-            'upload_date': '20240531',
+            'description': '大濱 敦（ソウル支局）',
-            'series': 'はま☆キラ！',
+            'uploader': 'NHK R1',
-            'thumbnail': 'https://www.nhk.or.jp/prog/img/2834/g2834.jpg',
+            'channel': 'NHK R1',
-            'channel': 'NHK R1,FM',
+            'thumbnail': 'https://www.nhk.or.jp/radioondemand/json/J8792PY43V/img/corner/box_31_thumbnail.jpg',
-            'description': '',
+            'series': 'マイあさ！ ワールドリポート',
-            'timestamp': 1717123800,
+            'series_id': 'J8792PY43V_20',
-            'uploader': 'NHK R1,FM',
+            'timestamp': 1751837100,
-            'release_timestamp': 1717120800,
+            'upload_date': '20250706',
-            'series_id': '2834_01',
+            'release_timestamp': 1751835600,
+            'release_date': '20250706',
+
         },
-        'expected_warnings': ['Failed to get extended metadata. API returned empty list.'],
+        'expected_warnings': ['Failed to download extended metadata: HTTP Error 404: Not Found'],
     }]
 
     _API_URL_TMPL = None
 
+    # The `_format_*` and `_make_*` functions are ported from: https://www.nhk.or.jp/radio/assets/js/timetable_detail_new.js
+
+    def _format_act_list(self, act_list):
+        role_groups = {}
+        for act in traverse_obj(act_list, (..., {dict})):
+            role = act.get('role')
+            if role not in role_groups:
+                role_groups[role] = []
+            role_groups[role].append(act)
+
+        formatted_roles = []
+        for role, acts in role_groups.items():
+            for i, act in enumerate(acts):
+                res = f'【{role}】' if i == 0 and role is not None else ''
+                if title := act.get('title'):
+                    res += f'{title}…'
+                formatted_roles.append(join_nonempty(res, act.get('name'), delim=''))
+        return join_nonempty(*formatted_roles, delim='，')
+
+    def _make_artists(self, track, key):
+        artists = []
+        for artist in traverse_obj(track, (key, ..., {dict})):
+            if res := join_nonempty(*traverse_obj(artist, ((
+                ('role', filter, {'{}…'.format}),
+                ('part', filter, {'（{}）'.format}),
+                ('name', filter),
+            ), {str})), delim=''):
+                artists.append(res)
+
+        return '、'.join(artists) or None
+
+    def _make_duration(self, track, key):
+        d = traverse_obj(track, (key, {parse_duration}))
+        if d is None:
+            return None
+        hours, remainder = divmod(d, 3600)
+        minutes, seconds = divmod(remainder, 60)
+        res = '（'
+        if hours > 0:
+            res += f'{int(hours)}時間'
+        if minutes > 0:
+            res += f'{int(minutes)}分'
+        res += f'{int(seconds):02}秒）'
+        return res
+
+    def _format_music_list(self, music_list):
+        tracks = []
+        for track in traverse_obj(music_list, (..., {dict})):
+            track_details = traverse_obj(track, ((
+                ('name', filter, {'「{}」'.format}),
+                ('lyricist', filter, {'{}:作詞'.format}),
+                ('composer', filter, {'{}:作曲'.format}),
+                ('arranger', filter, {'{}:編曲'.format}),
+            ), {str}))
+
+            track_details.append(self._make_artists(track, 'byArtist'))
+            track_details.append(self._make_duration(track, 'duration'))
+
+            if label := join_nonempty('label', 'code', delim=' ', from_dict=track):
+                track_details.append(f'＜{label}＞')
+            if location := traverse_obj(track, ('location', {str})):
+                track_details.append(f'～{location}～')
+            tracks.append(join_nonempty(*track_details, delim='\n'))
+        return '\n\n'.join(tracks)
+
+    def _format_description(self, response):
+        detailed_description = traverse_obj(response, ('detailedDescription', {dict})) or {}
+        return join_nonempty(
+            join_nonempty('epg80', 'epg200', delim='\n\n', from_dict=detailed_description),
+            traverse_obj(response, ('misc', 'actList', {self._format_act_list})),
+            traverse_obj(response, ('misc', 'musicList', {self._format_music_list})),
+            delim='\n\n')
+
+    def _get_thumbnails(self, data, keys, name=None, preference=-1):
+        thumbnails = []
+        for size, thumb in traverse_obj(data, (
+            *variadic(keys, (str, bytes, dict, set)), {dict.items},
+            lambda _, v: v[0] != 'copyright' and url_or_none(v[1]['url']),
+        )):
+            thumbnails.append({
+                'url': thumb['url'],
+                'width': int_or_none(thumb.get('width')),
+                'height': int_or_none(thumb.get('height')),
+                'preference': preference,
+                'id': join_nonempty(name, size),
+            })
+            preference -= 1
+        return thumbnails
+
     def _extract_extended_metadata(self, episode_id, aa_vinfo):
         service, _, area = traverse_obj(aa_vinfo, (2, {str}, {lambda x: (x or '').partition(',')}))
+        date_id = aa_vinfo[3]
+
         detail_url = try_call(
-            lambda: self._API_URL_TMPL.format(area=area, service=service, dateid=aa_vinfo[3]))
+            lambda: self._API_URL_TMPL.format(broadcastEventId=join_nonempty(service, area, date_id)))
         if not detail_url:
             return {}
 
@@ -699,36 +779,37 @@ def _extract_extended_metadata(self, episode_id, aa_vinfo):
         if error := traverse_obj(response, ('error', {dict})):
             self.report_warning(
                 'Failed to get extended metadata. API returned '
-                f'Error {join_nonempty("code", "message", from_dict=error, delim=": ")}')
+                f'Error {join_nonempty("statuscode", "message", from_dict=error, delim=": ")}')
             return {}
 
-        full_meta = traverse_obj(response, ('list', service, 0, {dict}))
+        station = traverse_obj(response, ('publishedOn', 'broadcastDisplayName', {str}))
-        if not full_meta:
-            self.report_warning('Failed to get extended metadata. API returned empty list.')
-            return {}
 
-        station = ' '.join(traverse_obj(full_meta, (('service', 'area'), 'name', {str}))) or None
+        thumbnails = []
-        thumbnails = [{
+        thumbnails.extend(self._get_thumbnails(response, ('about', 'eyecatch')))
-            'id': str(id_),
+        for num, dct in enumerate(traverse_obj(response, ('about', 'eyecatchList', ...))):
-            'preference': 1 if id_.startswith('thumbnail') else -2 if id_.startswith('logo') else -1,
+            thumbnails.extend(self._get_thumbnails(dct, None, join_nonempty('list', num), -2))
-            **traverse_obj(thumb, {
+        thumbnails.extend(
-                'url': 'url',
+            self._get_thumbnails(response, ('about', 'partOfSeries', 'eyecatch'), 'series', -3))
-                'width': ('width', {int_or_none}),
-                'height': ('height', {int_or_none}),
-            }),
-        } for id_, thumb in traverse_obj(full_meta, ('images', {dict.items}, lambda _, v: v[1]['url']))]
 
         return filter_dict({
+            'description': self._format_description(response),
+            'cast': traverse_obj(response, ('misc', 'actList', ..., 'name', {str})),
+            'thumbnails': thumbnails,
+            **traverse_obj(response, {
+                'title': ('name', {str}),
+                'timestamp': ('endDate', {unified_timestamp}),
+                'release_timestamp': ('startDate', {unified_timestamp}),
+                'duration': ('duration', {parse_duration}),
+            }),
+            **traverse_obj(response, ('identifierGroup', {
+                'series': ('radioSeriesName', {str}),
+                'series_id': ('radioSeriesId', {str}),
+                'episode': ('radioEpisodeName', {str}),
+                'episode_id': ('radioEpisodeId', {str}),
+                'categories': ('genre', ..., ['name1', 'name2'], {str}, all, {orderedSet}),
+            })),
             'channel': station,
             'uploader': station,
-            'description': join_nonempty(
-                'subtitle', 'content', 'act', 'music', delim='\n\n', from_dict=full_meta),
-            'thumbnails': thumbnails,
-            **traverse_obj(full_meta, {
-                'title': ('title', {str}),
-                'timestamp': ('end_time', {unified_timestamp}),
-                'release_timestamp': ('start_time', {unified_timestamp}),
-            }),
         })
 
     def _extract_episode_info(self, episode, programme_id, series_meta):
@@ -782,7 +863,9 @@ def _real_extract(self, url):
         site_id, corner_id, headline_id = self._match_valid_url(url).group('site', 'corner', 'headline')
         programme_id = f'{site_id}_{corner_id}'
 
-        if site_id == 'F261':  # XXX: News programmes use old API (for now?)
+        # XXX: News programmes use the old API
+        # Can't move this to NhkRadioNewsPageIE because news items still use the normal URL format
+        if site_id == '18439M2W42':
             meta = self._download_json(
                 'https://www.nhk.or.jp/s-media/news/news-site/list/v1/all.json', programme_id)['main']
             series_meta = traverse_obj(meta, {
@@ -843,8 +926,8 @@ class NhkRadioNewsPageIE(InfoExtractor):
         'url': 'https://www.nhk.or.jp/radionews/',
         'playlist_mincount': 5,
         'info_dict': {
-            'id': 'F261_01',
+            'id': '18439M2W42_01',
-            'thumbnail': 'https://www.nhk.or.jp/radioondemand/json/F261/img/RADIONEWS_640.jpg',
+            'thumbnail': 'https://www.nhk.or.jp/radioondemand/json/18439M2W42/img/series_945_thumbnail.jpg',
             'description': 'md5:bf2c5b397e44bc7eb26de98d8f15d79d',
             'channel': 'NHKラジオ第1',
             'uploader': 'NHKラジオ第1',
@@ -853,7 +936,7 @@ class NhkRadioNewsPageIE(InfoExtractor):
     }]
 
     def _real_extract(self, url):
-        return self.url_result('https://www.nhk.or.jp/radio/ondemand/detail.html?p=F261_01', NhkRadiruIE)
+        return self.url_result('https://www.nhk.or.jp/radio/ondemand/detail.html?p=18439M2W42_01', NhkRadiruIE)
 
 
 class NhkRadiruLiveIE(InfoExtractor):
@@ -863,11 +946,12 @@ class NhkRadiruLiveIE(InfoExtractor):
         # radio 1, no area specified
         'url': 'https://www.nhk.or.jp/radio/player/?ch=r1',
         'info_dict': {
-            'id': 'r1-tokyo',
+            'id': 'bs-r1-130',
-            'title': 're:^ＮＨＫネットラジオ第1 東京.+$',
+            'title': 're:^NHKラジオ第1・東京.+$',
             'ext': 'm4a',
-            'thumbnail': 'https://www.nhk.or.jp/common/img/media/r1-200x200.png',
+            'thumbnail': 'https://www.nhk.jp/assets/images/broadcastservice/bs/r1/r1-logo.svg',
             'live_status': 'is_live',
+            '_old_archive_ids': ['nhkradirulive r1-tokyo'],
         },
     }, {
         # radio 2, area specified
@@ -875,26 +959,28 @@ class NhkRadiruLiveIE(InfoExtractor):
         'url': 'https://www.nhk.or.jp/radio/player/?ch=r2',
         'params': {'extractor_args': {'nhkradirulive': {'area': ['fukuoka']}}},
         'info_dict': {
-            'id': 'r2-fukuoka',
+            'id': 'bs-r2-400',
-            'title': 're:^ＮＨＫネットラジオ第2 福岡.+$',
+            'title': 're:^NHKラジオ第2.+$',
             'ext': 'm4a',
-            'thumbnail': 'https://www.nhk.or.jp/common/img/media/r2-200x200.png',
+            'thumbnail': 'https://www.nhk.jp/assets/images/broadcastservice/bs/r2/r2-logo.svg',
             'live_status': 'is_live',
+            '_old_archive_ids': ['nhkradirulive r2-fukuoka'],
         },
     }, {
         # fm, area specified
         'url': 'https://www.nhk.or.jp/radio/player/?ch=fm',
         'params': {'extractor_args': {'nhkradirulive': {'area': ['sapporo']}}},
         'info_dict': {
-            'id': 'fm-sapporo',
+            'id': 'bs-r3-010',
-            'title': 're:^ＮＨＫネットラジオＦＭ 札幌.+$',
+            'title': 're:^NHK FM・札幌.+$',
             'ext': 'm4a',
-            'thumbnail': 'https://www.nhk.or.jp/common/img/media/fm-200x200.png',
+            'thumbnail': 'https://www.nhk.jp/assets/images/broadcastservice/bs/r3/r3-logo.svg',
             'live_status': 'is_live',
+            '_old_archive_ids': ['nhkradirulive fm-sapporo'],
         },
     }]
 
-    _NOA_STATION_IDS = {'r1': 'n1', 'r2': 'n2', 'fm': 'n3'}
+    _NOA_STATION_IDS = {'r1': 'r1', 'r2': 'r2', 'fm': 'r3'}
 
     def _real_extract(self, url):
         station = self._match_id(url)
@@ -911,12 +997,15 @@ def _real_extract(self, url):
         noa_info = self._download_json(
             f'https:{config.find(".//url_program_noa").text}'.format(area=data.find('areakey').text),
             station, note=f'Downloading {area} station metadata', fatal=False)
-        present_info = traverse_obj(noa_info, ('nowonair_list', self._NOA_STATION_IDS.get(station), 'present'))
+        broadcast_service = traverse_obj(noa_info, (self._NOA_STATION_IDS.get(station), 'publishedOn'))
 
         return {
-            'title': ' '.join(traverse_obj(present_info, (('service', 'area'), 'name', {str}))),
+            **traverse_obj(broadcast_service, {
-            'id': join_nonempty(station, area),
+                'title': ('broadcastDisplayName', {str}),
-            'thumbnails': traverse_obj(present_info, ('service', 'images', ..., {
+                'id': ('id', {str}),
+            }),
+            '_old_archive_ids': [make_archive_id(self, join_nonempty(station, area))],
+            'thumbnails': traverse_obj(broadcast_service, ('logo', ..., {
                 'url': 'url',
                 'width': ('width', {int_or_none}),
                 'height': ('height', {int_or_none}),

yt_dlp/extractor/ninegag.py

@@ -1,6 +1,5 @@
 from .common import InfoExtractor
 from ..utils import (
-    ExtractorError,
     determine_ext,
     int_or_none,
     traverse_obj,
@@ -61,10 +60,10 @@ def _real_extract(self, url):
         post = self._download_json(
             'https://9gag.com/v1/post', post_id, query={
                 'id': post_id,
-            })['data']['post']
+            }, impersonate=True)['data']['post']
 
         if post.get('type') != 'Animated':
-            raise ExtractorError(
+            self.raise_no_formats(
                 'The given url does not contain a video',
                 expected=True)
 

yt_dlp/extractor/ninenow.py

@@ -1,6 +1,3 @@
-import json
-import re
-
 from .brightcove import BrightcoveNewIE
 from .common import InfoExtractor
 from ..utils import (
@@ -11,7 +8,12 @@
     str_or_none,
     url_or_none,
 )
-from ..utils.traversal import require, traverse_obj, value
+from ..utils.traversal import (
+    get_first,
+    require,
+    traverse_obj,
+    value,
+)
 
 
 class NineNowIE(InfoExtractor):
@@ -101,20 +103,11 @@ class NineNowIE(InfoExtractor):
     }]
     BRIGHTCOVE_URL_TEMPLATE = 'http://players.brightcove.net/4460760524001/default_default/index.html?videoId={}'
 
-    # XXX: For parsing next.js v15+ data; see also yt_dlp.extractor.francetv and yt_dlp.extractor.goplay
-    def _find_json(self, s):
-        return self._search_json(
-            r'\w+\s*:\s*', s, 'next js data', None, contains_pattern=r'\[(?s:.+)\]', default=None)
-
     def _real_extract(self, url):
         display_id, video_type = self._match_valid_url(url).group('id', 'type')
         webpage = self._download_webpage(url, display_id)
 
-        common_data = traverse_obj(
+        common_data = get_first(self._search_nextjs_v13_data(webpage, display_id), ('payload', {dict}))
-            re.findall(r'<script[^>]*>\s*self\.__next_f\.push\(\s*(\[.+?\])\s*\);?\s*</script>', webpage),
-            (..., {json.loads}, ..., {self._find_json},
-             lambda _, v: v['payload'][video_type]['slug'] == display_id,
-             'payload', any, {require('video data')}))
 
         if traverse_obj(common_data, (video_type, 'video', 'drm', {bool})):
             self.report_drm(display_id)

yt_dlp/extractor/noovo.py

@@ -1,100 +0,0 @@
-from .brightcove import BrightcoveNewIE
-from .common import InfoExtractor
-from ..utils import (
-    int_or_none,
-    js_to_json,
-    smuggle_url,
-    try_get,
-)
-
-
-class NoovoIE(InfoExtractor):
-    _VALID_URL = r'https?://(?:[^/]+\.)?noovo\.ca/videos/(?P<id>[^/]+/[^/?#&]+)'
-    _TESTS = [{
-        # clip
-        'url': 'http://noovo.ca/videos/rpm-plus/chrysler-imperial',
-        'info_dict': {
-            'id': '5386045029001',
-            'ext': 'mp4',
-            'title': 'Chrysler Imperial',
-            'description': 'md5:de3c898d1eb810f3e6243e08c8b4a056',
-            'timestamp': 1491399228,
-            'upload_date': '20170405',
-            'uploader_id': '618566855001',
-            'series': 'RPM+',
-        },
-        'params': {
-            'skip_download': True,
-        },
-    }, {
-        # episode
-        'url': 'http://noovo.ca/videos/l-amour-est-dans-le-pre/episode-13-8',
-        'info_dict': {
-            'id': '5395865725001',
-            'title': 'Épisode 13 : Les retrouvailles',
-            'description': 'md5:888c3330f0c1b4476c5bc99a1c040473',
-            'ext': 'mp4',
-            'timestamp': 1492019320,
-            'upload_date': '20170412',
-            'uploader_id': '618566855001',
-            'series': "L'amour est dans le pré",
-            'season_number': 5,
-            'episode': 'Épisode 13',
-            'episode_number': 13,
-        },
-        'params': {
-            'skip_download': True,
-        },
-    }]
-    BRIGHTCOVE_URL_TEMPLATE = 'http://players.brightcove.net/618566855001/default_default/index.html?videoId=%s'
-
-    def _real_extract(self, url):
-        video_id = self._match_id(url)
-
-        webpage = self._download_webpage(url, video_id)
-
-        brightcove_id = self._search_regex(
-            r'data-video-id=["\'](\d+)', webpage, 'brightcove id')
-
-        data = self._parse_json(
-            self._search_regex(
-                r'(?s)dataLayer\.push\(\s*({.+?})\s*\);', webpage, 'data',
-                default='{}'),
-            video_id, transform_source=js_to_json, fatal=False)
-
-        title = try_get(
-            data, lambda x: x['video']['nom'],
-            str) or self._html_search_meta(
-            'dcterms.Title', webpage, 'title', fatal=True)
-
-        description = self._html_search_meta(
-            ('dcterms.Description', 'description'), webpage, 'description')
-
-        series = try_get(
-            data, lambda x: x['emission']['nom']) or self._search_regex(
-            r'<div[^>]+class="banner-card__subtitle h4"[^>]*>([^<]+)',
-            webpage, 'series', default=None)
-
-        season_el = try_get(data, lambda x: x['emission']['saison'], dict) or {}
-        season = try_get(season_el, lambda x: x['nom'], str)
-        season_number = int_or_none(try_get(season_el, lambda x: x['numero']))
-
-        episode_el = try_get(season_el, lambda x: x['episode'], dict) or {}
-        episode = try_get(episode_el, lambda x: x['nom'], str)
-        episode_number = int_or_none(try_get(episode_el, lambda x: x['numero']))
-
-        return {
-            '_type': 'url_transparent',
-            'ie_key': BrightcoveNewIE.ie_key(),
-            'url': smuggle_url(
-                self.BRIGHTCOVE_URL_TEMPLATE % brightcove_id,
-                {'geo_countries': ['CA']}),
-            'id': brightcove_id,
-            'title': title,
-            'description': description,
-            'series': series,
-            'season': season,
-            'season_number': season_number,
-            'episode': episode,
-            'episode_number': episode_number,
-        }

yt_dlp/extractor/playerfm.py

@@ -0,0 +1,70 @@
+from .common import InfoExtractor
+from ..utils import clean_html, clean_podcast_url, int_or_none, str_or_none, url_or_none
+from ..utils.traversal import traverse_obj
+
+
+class PlayerFmIE(InfoExtractor):
+    _VALID_URL = r'(?P<url>https?://(?:www\.)?player\.fm/(?:series/)?[\w-]+/(?P<id>[\w-]+))'
+    _TESTS = [{
+        'url': 'https://player.fm/series/chapo-trap-house/movie-mindset-33-casino-feat-felix',
+        'info_dict': {
+            'ext': 'mp3',
+            'id': '478606546',
+            'display_id': 'movie-mindset-33-casino-feat-felix',
+            'thumbnail': r're:^https://.*\.(jpg|png)',
+            'title': 'Movie Mindset 33 - Casino feat. Felix',
+            'creators': ['Chapo Trap House'],
+            'description': r're:The first episode of this season of Movie Mindset is free .+ we feel about it\.',
+            'duration': 6830,
+            'timestamp': 1745406000,
+            'upload_date': '20250423',
+        },
+    }, {
+        'url': 'https://player.fm/series/nbc-nightly-news-with-tom-llamas/thursday-april-17-2025',
+        'info_dict': {
+            'ext': 'mp3',
+            'id': '477635490',
+            'display_id': 'thursday-april-17-2025',
+            'title': 'Thursday, April 17, 2025',
+            'thumbnail': r're:^https://.*\.(jpg|png)',
+            'duration': 1143,
+            'description': 'md5:4890b8cf9a55a787561cd5d59dfcda82',
+            'creators': ['NBC News'],
+            'timestamp': 1744941374,
+            'upload_date': '20250418',
+        },
+    }, {
+        'url': 'https://player.fm/series/soccer-101/ep-109-its-kicking-off-how-have-the-rules-for-kickoff-changed-what-are-the-best-approaches-to-getting-the-game-underway-and-how-could-we-improve-on-the-present-system-ack3NzL3yibvs4pf',
+        'info_dict': {
+            'ext': 'mp3',
+            'id': '481418710',
+            'thumbnail': r're:^https://.*\.(jpg|png)',
+            'title': r're:#109 It\'s kicking off! How have the rules for kickoff changed, .+ the present system\?',
+            'creators': ['TSS'],
+            'duration': 1510,
+            'display_id': 'md5:b52ecacaefab891b59db69721bfd9b13',
+            'description': 'md5:52a39e36d08d8919527454f152ad3c25',
+            'timestamp': 1659102055,
+            'upload_date': '20220729',
+        },
+    }]
+
+    def _real_extract(self, url):
+        display_id, url = self._match_valid_url(url).group('id', 'url')
+        data = self._download_json(f'{url}.json', display_id)
+
+        return {
+            'display_id': display_id,
+            'vcodec': 'none',
+            **traverse_obj(data, {
+                'id': ('id', {int}, {str_or_none}),
+                'url': ('url', {clean_podcast_url}),
+                'title': ('title', {str}),
+                'description': ('description', {clean_html}),
+                'duration': ('duration', {int_or_none}),
+                'thumbnail': (('image', ('series', 'image')), 'url', {url_or_none}, any),
+                'filesize': ('size', {int_or_none}),
+                'timestamp': ('publishedAt', {int_or_none}),
+                'creators': ('series', 'author', {str}, filter, all, filter),
+            }),
+        }

yt_dlp/extractor/rai.py

@@ -81,7 +81,7 @@ def fix_cdata(s):
         # geo flag is a bit unreliable and not properly set all the time
         geoprotection = xpath_text(relinker, './geoprotection', default='N') == 'Y'
 
-        ext = determine_ext(media_url)
+        ext = determine_ext(media_url).lower()
         formats = []
 
         if ext == 'mp3':
@@ -108,7 +108,7 @@ def fix_cdata(s):
                 'format_id': join_nonempty('https', bitrate, delim='-'),
             })
         else:
-            raise ExtractorError('Unrecognized media file found')
+            raise ExtractorError(f'Unrecognized media extension "{ext}"')
 
         if (not formats and geoprotection is True) or '/video_no_available.mp4' in media_url:
             self.raise_geo_restricted(countries=self._GEO_COUNTRIES, metadata_available=True)
@@ -503,6 +503,28 @@ class RaiPlaySoundIE(RaiBaseIE):
             'upload_date': '20211201',
         },
         'params': {'skip_download': True},
+    }, {
+        # case-sensitivity test for uppercase extension
+        'url': 'https://www.raiplaysound.it/audio/2020/05/Storia--Lunita-dItalia-e-lunificazione-della-Germania-b4c16390-7f3f-4282-b353-d94897dacb7c.html',
+        'md5': 'c69ebd69282f0effd7ef67b7e2f6c7d8',
+        'info_dict': {
+            'id': 'b4c16390-7f3f-4282-b353-d94897dacb7c',
+            'ext': 'mp3',
+            'title': "Storia | 01 L'unità d'Italia e l'unificazione della Germania",
+            'alt_title': 'md5:ed4ed82585c52057b71b43994a59b705',
+            'description': 'md5:92818b6f31b2c150567d56b75db2ea7f',
+            'uploader': 'rai radio 3',
+            'duration': 2439.0,
+            'thumbnail': 'https://www.raiplaysound.it/dl/img/2023/09/07/1694084898279_Maturadio-LOGO-2048x1152.jpg',
+            'creators': ['rai radio 3'],
+            'series': 'Maturadio',
+            'season': 'Season 9',
+            'season_number': 9,
+            'episode': "01. L'unità d'Italia e l'unificazione della Germania",
+            'episode_number': 1,
+            'timestamp': 1590400740,
+            'upload_date': '20200525',
+        },
     }]
 
     def _real_extract(self, url):
@@ -765,7 +787,7 @@ class RaiCulturaIE(RaiNewsIE):  # XXX: Do not subclass from concrete IE
 
 
 class RaiSudtirolIE(RaiBaseIE):
-    _VALID_URL = r'https?://raisudtirol\.rai\.it/.+media=(?P<id>\w+)'
+    _VALID_URL = r'https?://rai(?:bz|sudtirol)\.rai\.it/.+media=(?P<id>\w+)'
     _TESTS = [{
         # mp4 file
         'url': 'https://raisudtirol.rai.it/la/index.php?media=Ptv1619729460',
@@ -791,6 +813,9 @@ class RaiSudtirolIE(RaiBaseIE):
             'formats': 'count:6',
         },
         'params': {'skip_download': True},
+    }, {
+        'url': 'https://raibz.rai.it/de/index.php?media=Ptv1751660400',
+        'only_matching': True,
     }]
 
     def _real_extract(self, url):

yt_dlp/extractor/sauceplus.py

@@ -0,0 +1,41 @@
+from .floatplane import FloatplaneBaseIE
+
+
+class SaucePlusIE(FloatplaneBaseIE):
+    IE_DESC = 'Sauce+'
+    _VALID_URL = r'https?://(?:(?:www|beta)\.)?sauceplus\.com/post/(?P<id>\w+)'
+    _BASE_URL = 'https://www.sauceplus.com'
+    _HEADERS = {
+        'Origin': _BASE_URL,
+        'Referer': f'{_BASE_URL}/',
+    }
+    _IMPERSONATE_TARGET = True
+    _TESTS = [{
+        'url': 'https://www.sauceplus.com/post/YbBwIa2A5g',
+        'info_dict': {
+            'id': 'eit4Ugu5TL',
+            'ext': 'mp4',
+            'display_id': 'YbBwIa2A5g',
+            'title': 'Scare the Coyote - Episode 3',
+            'description': '',
+            'thumbnail': r're:^https?://.*\.jpe?g$',
+            'duration': 2975,
+            'comment_count': int,
+            'like_count': int,
+            'dislike_count': int,
+            'release_date': '20250627',
+            'release_timestamp': 1750993500,
+            'uploader': 'Scare The Coyote',
+            'uploader_id': '683e0a3269688656a5a49a44',
+            'uploader_url': 'https://www.sauceplus.com/channel/ScareTheCoyote/home',
+            'channel': 'Scare The Coyote',
+            'channel_id': '683e0a326968866ceba49a45',
+            'channel_url': 'https://www.sauceplus.com/channel/ScareTheCoyote/home/main',
+            'availability': 'subscriber_only',
+        },
+        'params': {'skip_download': 'm3u8'},
+    }]
+
+    def _real_initialize(self):
+        if not self._get_cookies(self._BASE_URL).get('__Host-sp-sess'):
+            self.raise_login_required()

yt_dlp/extractor/soundcloud.py

@@ -242,7 +242,7 @@ def _extract_info_dict(self, info, full_title=None, secret_token=None, extract_f
                     format_urls.add(format_url)
                     formats.append({
                         'format_id': 'download',
-                        'ext': urlhandle_detect_ext(urlh, default='mp3'),
+                        'ext': urlhandle_detect_ext(urlh),
                         'filesize': int_or_none(urlh.headers.get('Content-Length')),
                         'url': format_url,
                         'quality': 10,

yt_dlp/extractor/sproutvideo.py

@@ -98,13 +98,10 @@ def _extract_embed_urls(cls, url, webpage):
     def _real_extract(self, url):
         url, smuggled_data = unsmuggle_url(url, {})
         video_id = self._match_id(url)
-        webpage = self._download_webpage(url, video_id, headers={
+        webpage = self._download_webpage(
-            **traverse_obj(smuggled_data, {'Referer': 'referer'}),
+            url, video_id, headers=traverse_obj(smuggled_data, {'Referer': 'referer'}), impersonate=True)
-            # yt-dlp's default Chrome user-agents are too old
-            'User-Agent': 'Mozilla/5.0 (Windows NT 10.0; rv:140.0) Gecko/20100101 Firefox/140.0',
-        })
         data = self._search_json(
-            r'var\s+(?:dat|playerInfo)\s*=\s*["\']', webpage, 'player info', video_id,
+            r'(?:var|const|let)\s+(?:dat|playerInfo)\s*=\s*["\']', webpage, 'player info', video_id,
             contains_pattern=r'[A-Za-z0-9+/=]+', end_pattern=r'["\'];',
             transform_source=lambda x: base64.b64decode(x).decode())
 

yt_dlp/extractor/tfo.py

@@ -6,6 +6,7 @@
 
 
 class TFOIE(InfoExtractor):
+    _WORKING = False
     _GEO_COUNTRIES = ['CA']
     _VALID_URL = r'https?://(?:www\.)?tfo\.org/(?:en|fr)/(?:[^/]+/){2}(?P<id>\d+)'
     _TEST = {

yt_dlp/extractor/thehighwire.py

@@ -0,0 +1,43 @@
+from .common import InfoExtractor
+from ..utils import (
+    clean_html,
+    extract_attributes,
+    url_or_none,
+)
+from ..utils.traversal import (
+    find_element,
+    require,
+    traverse_obj,
+)
+
+
+class TheHighWireIE(InfoExtractor):
+    _VALID_URL = r'https?://(?:www\.)?thehighwire\.com/ark-videos/(?P<id>[^/?#]+)'
+    _TESTS = [{
+        'url': 'https://thehighwire.com/ark-videos/the-deposition-of-stanley-plotkin/',
+        'info_dict': {
+            'id': 'the-deposition-of-stanley-plotkin',
+            'ext': 'mp4',
+            'title': 'THE DEPOSITION OF STANLEY PLOTKIN',
+            'description': 'md5:6d0be4f1181daaa10430fd8b945a5e54',
+            'thumbnail': r're:https?://static\.arkengine\.com/video/.+\.jpg',
+        },
+    }]
+
+    def _real_extract(self, url):
+        display_id = self._match_id(url)
+        webpage = self._download_webpage(url, display_id)
+
+        embed_url = traverse_obj(webpage, (
+            {find_element(cls='ark-video-embed', html=True)},
+            {extract_attributes}, 'src', {url_or_none}, {require('embed URL')}))
+        embed_page = self._download_webpage(embed_url, display_id)
+
+        return {
+            'id': display_id,
+            **traverse_obj(webpage, {
+                'title': ({find_element(cls='section-header')}, {clean_html}),
+                'description': ({find_element(cls='episode-description__copy')}, {clean_html}),
+            }),
+            **self._parse_html5_media_entries(embed_url, embed_page, display_id, m3u8_id='hls')[0],
+        }

yt_dlp/extractor/tv5unis.py

@@ -51,6 +51,7 @@ def _real_extract(self, url):
 
 
 class TV5UnisVideoIE(TV5UnisBaseIE):
+    _WORKING = False
     IE_NAME = 'tv5unis:video'
     _VALID_URL = r'https?://(?:www\.)?tv5unis\.ca/videos/[^/]+/(?P<id>\d+)'
     _TEST = {
@@ -71,6 +72,7 @@ def _gql_args(groups):
 
 
 class TV5UnisIE(TV5UnisBaseIE):
+    _WORKING = False
     IE_NAME = 'tv5unis'
     _VALID_URL = r'https?://(?:www\.)?tv5unis\.ca/videos/(?P<id>[^/]+)(?:/saisons/(?P<season_number>\d+)/episodes/(?P<episode_number>\d+))?/?(?:[?#&]|$)'
     _TESTS = [{

yt_dlp/extractor/twitch.py

@@ -6,6 +6,7 @@
 import urllib.parse
 
 from .common import InfoExtractor
+from ..networking.exceptions import HTTPError
 from ..utils import (
     ExtractorError,
     UserNotLive,
@@ -188,19 +189,39 @@ def _get_thumbnails(self, thumbnail):
         }] if thumbnail else None
 
     def _extract_twitch_m3u8_formats(self, path, video_id, token, signature, live_from_start=False):
-        formats = self._extract_m3u8_formats(
+        try:
-            f'{self._USHER_BASE}/{path}/{video_id}.m3u8', video_id, 'mp4', query={
+            formats = self._extract_m3u8_formats(
-                'allow_source': 'true',
+                f'{self._USHER_BASE}/{path}/{video_id}.m3u8', video_id, 'mp4', query={
-                'allow_audio_only': 'true',
+                    'allow_source': 'true',
-                'allow_spectre': 'true',
+                    'allow_audio_only': 'true',
-                'p': random.randint(1000000, 10000000),
+                    'allow_spectre': 'true',
-                'platform': 'web',
+                    'p': random.randint(1000000, 10000000),
-                'player': 'twitchweb',
+                    'platform': 'web',
-                'supported_codecs': 'av1,h265,h264',
+                    'player': 'twitchweb',
-                'playlist_include_framerate': 'true',
+                    'supported_codecs': 'av1,h265,h264',
-                'sig': signature,
+                    'playlist_include_framerate': 'true',
-                'token': token,
+                    'sig': signature,
-            })
+                    'token': token,
+                })
+        except ExtractorError as e:
+            if (
+                not isinstance(e.cause, HTTPError)
+                or e.cause.status != 403
+                or e.cause.response.get_header('content-type') != 'application/json'
+            ):
+                raise
+
+            error_info = traverse_obj(e.cause.response.read(), ({json.loads}, 0, {dict})) or {}
+            if error_info.get('error_code') in ('vod_manifest_restricted', 'unauthorized_entitlements'):
+                common_msg = 'access to this subscriber-only content'
+                if self._get_cookies('https://gql.twitch.tv').get('auth-token'):
+                    raise ExtractorError(f'Your account does not have {common_msg}', expected=True)
+                self.raise_login_required(f'You must be logged into an account that has {common_msg}')
+
+            if error_msg := join_nonempty('error_code', 'error', from_dict=error_info, delim=': '):
+                raise ExtractorError(error_msg, expected=True)
+            raise
+
         for fmt in formats:
             if fmt.get('vcodec') and fmt['vcodec'].startswith('av01'):
                 # mpegts does not yet have proper support for av1

yt_dlp/extractor/unitednations.py

@@ -0,0 +1,32 @@
+from .common import InfoExtractor
+from .kaltura import KalturaIE
+
+
+class UnitedNationsWebTvIE(InfoExtractor):
+    _VALID_URL = r'https?://webtv\.un\.org/(?:ar|zh|en|fr|ru|es)/asset/\w+/(?P<id>\w+)'
+    _TESTS = [{
+        'url': 'https://webtv.un.org/en/asset/k1o/k1o7stmi6p',
+        'md5': 'b2f8b3030063298ae841b4b7ddc01477',
+        'info_dict': {
+            'id': '1_o7stmi6p',
+            'ext': 'mp4',
+            'title': 'António Guterres (Secretary-General) on Israel and Iran - Security Council, 9939th meeting',
+            'thumbnail': 'http://cfvod.kaltura.com/p/2503451/sp/250345100/thumbnail/entry_id/1_o7stmi6p/version/100021',
+            'uploader_id': 'evgeniia.alisova@un.org',
+            'upload_date': '20250620',
+            'timestamp': 1750430976,
+            'duration': 234,
+            'view_count': int,
+        },
+    }]
+
+    def _real_extract(self, url):
+        video_id = self._match_id(url)
+        webpage = self._download_webpage(url, video_id)
+
+        partner_id = self._html_search_regex(
+            r'partnerId:\s*(\d+)', webpage, 'partner_id')
+        entry_id = self._html_search_regex(
+            r'const\s+kentryID\s*=\s*["\'](\w+)["\']', webpage, 'kentry_id')
+
+        return self.url_result(f'kaltura:{partner_id}:{entry_id}', KalturaIE)

yt_dlp/extractor/unsupported.py

@@ -53,6 +53,10 @@ class KnownDRMIE(UnsupportedInfoExtractor):
         r'(?:beta\.)?crunchyroll\.com',
         r'viki\.com',
         r'deezer\.com',
+        r'b-ch\.com',
+        r'ctv\.ca',
+        r'noovo\.ca',
+        r'tsn\.ca',
     )
 
     _TESTS = [{
@@ -168,6 +172,18 @@ class KnownDRMIE(UnsupportedInfoExtractor):
     }, {
         'url': 'http://www.deezer.com/playlist/176747451',
         'only_matching': True,
+    }, {
+        'url': 'https://www.b-ch.com/titles/8203/001',
+        'only_matching': True,
+    }, {
+        'url': 'https://www.ctv.ca/shows/masterchef-53506/the-audition-battles-s15e1',
+        'only_matching': True,
+    }, {
+        'url': 'https://www.noovo.ca/emissions/lamour-est-dans-le-pre/prets-pour-lamour-s10e1',
+        'only_matching': True,
+    }, {
+        'url': 'https://www.tsn.ca/video/relaxed-oilers-look-to-put-emotional-game-2-loss-in-the-rearview%7E3148747',
+        'only_matching': True,
     }]
 
     def _real_extract(self, url):

yt_dlp/extractor/vimeo.py

@@ -21,6 +21,7 @@
     js_to_json,
     jwt_decode_hs256,
     merge_dicts,
+    mimetype2ext,
     parse_filesize,
     parse_iso8601,
     parse_qs,
@@ -28,9 +29,11 @@
     smuggle_url,
     str_or_none,
     traverse_obj,
+    try_call,
     try_get,
     unified_timestamp,
     unsmuggle_url,
+    url_basename,
     url_or_none,
     urlencode_postdata,
     urlhandle_detect_ext,
@@ -45,14 +48,57 @@ class VimeoBaseInfoExtractor(InfoExtractor):
     _REFERER_HINT = (
         'Cannot download embed-only video without embedding URL. Please call yt-dlp '
         'with the URL of the page that embeds this video.')
-    _IOS_CLIENT_AUTH = 'MTMxNzViY2Y0NDE0YTQ5YzhjZTc0YmU0NjVjNDQxYzNkYWVjOWRlOTpHKzRvMmgzVUh4UkxjdU5FRW80cDNDbDhDWGR5dVJLNUJZZ055dHBHTTB4V1VzaG41bEx1a2hiN0NWYWNUcldSSW53dzRUdFRYZlJEZmFoTTArOTBUZkJHS3R4V2llYU04Qnl1bERSWWxUdXRidjNqR2J4SHFpVmtFSUcyRktuQw=='
+
-    _IOS_CLIENT_HEADERS = {
+    _DEFAULT_CLIENT = 'android'
+    _DEFAULT_AUTHED_CLIENT = 'web'
+    _CLIENT_HEADERS = {
         'Accept': 'application/vnd.vimeo.*+json; version=3.4.10',
         'Accept-Language': 'en',
-        'User-Agent': 'Vimeo/11.10.0 (com.vimeo; build:250424.164813.0; iOS 18.4.1) Alamofire/5.9.0 VimeoNetworking/5.0.0',
     }
-    _IOS_OAUTH_CACHE_KEY = 'oauth-token-ios'
+    _CLIENT_CONFIGS = {
-    _ios_oauth_token = None
+        'android': {
+            'CACHE_KEY': 'oauth-token-android',
+            'CACHE_ONLY': False,
+            'VIEWER_JWT': False,
+            'REQUIRES_AUTH': False,
+            'AUTH': 'NzRmYTg5YjgxMWExY2JiNzUwZDg1MjhkMTYzZjQ4YWYyOGEyZGJlMTp4OGx2NFd3QnNvY1lkamI2UVZsdjdDYlNwSDUrdm50YzdNNThvWDcwN1JrenJGZC9tR1lReUNlRjRSVklZeWhYZVpRS0tBcU9YYzRoTGY2Z1dlVkJFYkdJc0dMRHpoZWFZbU0reDRqZ1dkZ1diZmdIdGUrNUM5RVBySlM0VG1qcw==',
+            'USER_AGENT': 'com.vimeo.android.videoapp (OnePlus, ONEPLUS A6003, OnePlus, Android 14/34 Version 11.8.1) Kotlin VimeoNetworking/3.12.0',
+            'VIDEOS_FIELDS': (
+                'uri', 'name', 'description', 'type', 'link', 'player_embed_url', 'duration', 'width',
+                'language', 'height', 'embed', 'created_time', 'modified_time', 'release_time', 'content_rating',
+                'content_rating_class', 'rating_mod_locked', 'license', 'privacy', 'pictures', 'tags', 'stats',
+                'categories', 'uploader', 'metadata', 'user', 'files', 'download', 'app', 'play', 'status',
+                'resource_key', 'badge', 'upload', 'transcode', 'is_playable', 'has_audio',
+            ),
+        },
+        'ios': {
+            'CACHE_KEY': 'oauth-token-ios',
+            'CACHE_ONLY': True,
+            'VIEWER_JWT': False,
+            'REQUIRES_AUTH': False,
+            'AUTH': 'MTMxNzViY2Y0NDE0YTQ5YzhjZTc0YmU0NjVjNDQxYzNkYWVjOWRlOTpHKzRvMmgzVUh4UkxjdU5FRW80cDNDbDhDWGR5dVJLNUJZZ055dHBHTTB4V1VzaG41bEx1a2hiN0NWYWNUcldSSW53dzRUdFRYZlJEZmFoTTArOTBUZkJHS3R4V2llYU04Qnl1bERSWWxUdXRidjNqR2J4SHFpVmtFSUcyRktuQw==',
+            'USER_AGENT': 'Vimeo/11.10.0 (com.vimeo; build:250424.164813.0; iOS 18.4.1) Alamofire/5.9.0 VimeoNetworking/5.0.0',
+            'VIDEOS_FIELDS': (
+                'uri', 'name', 'description', 'type', 'link', 'player_embed_url', 'duration',
+                'width', 'language', 'height', 'embed', 'created_time', 'modified_time', 'release_time',
+                'content_rating', 'content_rating_class', 'rating_mod_locked', 'license', 'config_url',
+                'embed_player_config_url', 'privacy', 'pictures', 'tags', 'stats', 'categories', 'uploader',
+                'metadata', 'user', 'files', 'download', 'app', 'play', 'status', 'resource_key', 'badge',
+                'upload', 'transcode', 'is_playable', 'has_audio',
+            ),
+        },
+        'web': {
+            'VIEWER_JWT': True,
+            'REQUIRES_AUTH': True,
+            'USER_AGENT': None,
+            'VIDEOS_FIELDS': (
+                'config_url', 'created_time', 'description', 'license',
+                'metadata.connections.comments.total', 'metadata.connections.likes.total',
+                'release_time', 'stats.plays',
+            ),
+        },
+    }
+    _oauth_tokens = {}
     _viewer_info = None
 
     @staticmethod
@@ -80,7 +126,14 @@ def _fetch_viewer_info(self, display_id=None, fatal=True):
 
         return self._viewer_info
 
+    @property
+    def _is_logged_in(self):
+        return 'vimeo' in self._get_cookies('https://vimeo.com')
+
     def _perform_login(self, username, password):
+        if self._is_logged_in:
+            return
+
         viewer = self._fetch_viewer_info()
         data = {
             'action': 'login',
@@ -105,8 +158,8 @@ def _perform_login(self, username, password):
             raise ExtractorError('Unable to log in')
 
     def _real_initialize(self):
-        if self._LOGIN_REQUIRED and not self._get_cookies('https://vimeo.com').get('vuid'):
+        if self._LOGIN_REQUIRED and not self._is_logged_in:
-            self._raise_login_required()
+            self.raise_login_required()
 
     def _get_video_password(self):
         password = self.get_param('videopassword')
@@ -277,52 +330,95 @@ def _parse_config(self, config, video_id):
             '_format_sort_fields': ('quality', 'res', 'fps', 'hdr:12', 'source'),
         }
 
-    def _fetch_oauth_token(self):
+    def _fetch_oauth_token(self, client):
-        if not self._ios_oauth_token:
+        client_config = self._CLIENT_CONFIGS[client]
-            self._ios_oauth_token = self.cache.load(self._NETRC_MACHINE, self._IOS_OAUTH_CACHE_KEY)
 
-        if not self._ios_oauth_token:
+        if client_config['VIEWER_JWT']:
-            self._ios_oauth_token = self._download_json(
+            return f'jwt {self._fetch_viewer_info()["jwt"]}'
+
+        cache_key = client_config['CACHE_KEY']
+
+        if not self._oauth_tokens.get(cache_key):
+            self._oauth_tokens[cache_key] = self.cache.load(self._NETRC_MACHINE, cache_key)
+
+        if not self._oauth_tokens.get(cache_key):
+            if client_config['CACHE_ONLY']:
+                raise ExtractorError(
+                    f'The {client} client is unable to fetch new OAuth tokens '
+                    f'and is only intended for use with previously cached tokens', expected=True)
+
+            self._oauth_tokens[cache_key] = self._download_json(
                 'https://api.vimeo.com/oauth/authorize/client', None,
-                'Fetching OAuth token', 'Failed to fetch OAuth token',
+                f'Fetching {client} OAuth token', f'Failed to fetch {client} OAuth token',
                 headers={
-                    'Authorization': f'Basic {self._IOS_CLIENT_AUTH}',
+                    'Authorization': f'Basic {client_config["AUTH"]}',
-                    **self._IOS_CLIENT_HEADERS,
+                    'User-Agent': client_config['USER_AGENT'],
+                    **self._CLIENT_HEADERS,
                 }, data=urlencode_postdata({
                     'grant_type': 'client_credentials',
-                    'scope': 'private public create edit delete interact upload purchased stats',
+                    'scope': 'private public create edit delete interact upload purchased stats video_files',
                 }, quote_via=urllib.parse.quote))['access_token']
-            self.cache.store(self._NETRC_MACHINE, self._IOS_OAUTH_CACHE_KEY, self._ios_oauth_token)
+            self.cache.store(self._NETRC_MACHINE, cache_key, self._oauth_tokens[cache_key])
 
-        return self._ios_oauth_token
+        return f'Bearer {self._oauth_tokens[cache_key]}'
+
+    def _get_requested_client(self):
+        default_client = self._DEFAULT_AUTHED_CLIENT if self._is_logged_in else self._DEFAULT_CLIENT
+
+        client = self._configuration_arg('client', [default_client], ie_key=VimeoIE)[0]
+        if client not in self._CLIENT_CONFIGS:
+            raise ExtractorError(
+                f'Unsupported API client "{client}" requested. '
+                f'Supported clients are: {", ".join(self._CLIENT_CONFIGS)}', expected=True)
+
+        return client
+
+    def _call_videos_api(self, video_id, unlisted_hash=None, path=None, *, force_client=None, query=None, **kwargs):
+        client = force_client or self._get_requested_client()
+
+        client_config = self._CLIENT_CONFIGS[client]
+        if client_config['REQUIRES_AUTH'] and not self._is_logged_in:
+            self.raise_login_required(f'The {client} client requires authentication')
 
-    def _call_videos_api(self, video_id, unlisted_hash=None, **kwargs):
         return self._download_json(
-            join_nonempty(f'https://api.vimeo.com/videos/{video_id}', unlisted_hash, delim=':'),
+            join_nonempty(
-            video_id, 'Downloading API JSON', headers={
+                'https://api.vimeo.com/videos',
-                'Authorization': f'Bearer {self._fetch_oauth_token()}',
+                join_nonempty(video_id, unlisted_hash, delim=':'),
-                **self._IOS_CLIENT_HEADERS,
+                path, delim='/'),
-            }, query={
+            video_id, f'Downloading {client} API JSON', f'Unable to download {client} API JSON',
-                'fields': ','.join((
+            headers=filter_dict({
-                    'config_url', 'embed_player_config_url', 'player_embed_url', 'download', 'play',
+                'Authorization': self._fetch_oauth_token(client),
-                    'files', 'description', 'license', 'release_time', 'created_time', 'stats.plays',
+                'User-Agent': client_config['USER_AGENT'],
-                    'metadata.connections.comments.total', 'metadata.connections.likes.total')),
+                **self._CLIENT_HEADERS,
+            }), query={
+                'fields': ','.join(client_config['VIDEOS_FIELDS']),
+                **(query or {}),
             }, **kwargs)
 
-    def _extract_original_format(self, url, video_id, unlisted_hash=None, api_data=None):
+    def _extract_original_format(self, url, video_id, unlisted_hash=None):
         # Original/source formats are only available when logged in
-        if not self._get_cookies('https://vimeo.com/').get('vimeo'):
+        if not self._is_logged_in:
-            return
+            return None
 
-        query = {'action': 'load_download_config'}
+        policy = self._configuration_arg('original_format_policy', ['auto'], ie_key=VimeoIE)[0]
-        if unlisted_hash:
+        if policy == 'never':
-            query['unlisted_hash'] = unlisted_hash
+            return None
-        download_data = self._download_json(
+
-            url, video_id, 'Loading download config JSON', fatal=False,
+        try:
-            query=query, headers={'X-Requested-With': 'XMLHttpRequest'},
+            download_data = self._download_json(
-            expected_status=(403, 404)) or {}
+                url, video_id, 'Loading download config JSON', query=filter_dict({
-        source_file = download_data.get('source_file')
+                    'action': 'load_download_config',
-        download_url = try_get(source_file, lambda x: x['download_url'])
+                    'unlisted_hash': unlisted_hash,
+                }), headers={
+                    'Accept': 'application/json',
+                    'X-Requested-With': 'XMLHttpRequest',
+                })
+        except ExtractorError as error:
+            self.write_debug(f'Unable to load download config JSON: {error.cause}')
+            download_data = None
+
+        source_file = traverse_obj(download_data, ('source_file', {dict})) or {}
+        download_url = traverse_obj(source_file, ('download_url', {url_or_none}))
         if download_url and not source_file.get('is_cold') and not source_file.get('is_defrosting'):
             source_name = source_file.get('public_name', 'Original')
             if self._is_valid_url(download_url, video_id, f'{source_name} video'):
@@ -340,8 +436,27 @@ def _extract_original_format(self, url, video_id, unlisted_hash=None, api_data=N
                     'quality': 1,
                 }
 
-        original_response = api_data or self._call_videos_api(
+        # Most web client API requests are subject to rate-limiting (429) when logged-in.
-            video_id, unlisted_hash, fatal=False, expected_status=(403, 404))
+        # Requesting only the 'privacy' field is NOT rate-limited,
+        # so first we should check if video even has 'download' formats available
+        try:
+            privacy_info = self._call_videos_api(
+                video_id, unlisted_hash, force_client='web', query={'fields': 'privacy'})
+        except ExtractorError as error:
+            self.write_debug(f'Unable to download privacy info: {error.cause}')
+            return None
+
+        if not traverse_obj(privacy_info, ('privacy', 'download', {bool})):
+            msg = f'{video_id}: Vimeo says this video is not downloadable'
+            if policy != 'always':
+                self.write_debug(
+                    f'{msg}, so yt-dlp is not attempting to extract the original/source format. '
+                    f'To try anyways, use --extractor-args "vimeo:original_format_policy=always"')
+                return None
+            self.write_debug(f'{msg}; attempting to extract original/source format anyways')
+
+        original_response = self._call_videos_api(
+            video_id, unlisted_hash, force_client='web', query={'fields': 'download'}, fatal=False)
         for download_data in traverse_obj(original_response, ('download', ..., {dict})):
             download_url = download_data.get('link')
             if not download_url or download_data.get('quality') != 'source':
@@ -919,25 +1034,125 @@ def _verify_player_video_password(self, url, video_id, headers):
             raise ExtractorError('Wrong video password', expected=True)
         return checked
 
+    def _get_subtitles(self, video_id, unlisted_hash):
+        subs = {}
+        text_tracks = self._call_videos_api(
+            video_id, unlisted_hash, path='texttracks', query={
+                'include_transcript': 'true',
+                'fields': ','.join((
+                    'active', 'display_language', 'id', 'language', 'link', 'name', 'type', 'uri',
+                )),
+            }, fatal=False)
+        for tt in traverse_obj(text_tracks, ('data', lambda _, v: url_or_none(v['link']))):
+            subs.setdefault(tt.get('language'), []).append({
+                'url': tt['link'],
+                'ext': 'vtt',
+                'name': tt.get('display_language'),
+            })
+        return subs
+
+    def _parse_api_response(self, video, video_id, unlisted_hash=None):
+        formats, subtitles = [], {}
+        seen_urls = set()
+        duration = traverse_obj(video, ('duration', {int_or_none}))
+
+        for file in traverse_obj(video, (
+            (('play', (None, 'progressive')), 'files', 'download'), lambda _, v: url_or_none(v['link']),
+        )):
+            format_url = file['link']
+            if format_url in seen_urls:
+                continue
+            seen_urls.add(format_url)
+            quality = file.get('quality')
+            ext = determine_ext(format_url)
+            if quality == 'hls' or ext == 'm3u8':
+                fmts, subs = self._extract_m3u8_formats_and_subtitles(
+                    format_url, video_id, 'mp4', m3u8_id='hls', fatal=False)
+            elif quality == 'dash' or ext == 'mpd':
+                fmts, subs = self._extract_mpd_formats_and_subtitles(
+                    format_url, video_id, mpd_id='dash', fatal=False)
+                for fmt in fmts:
+                    fmt['format_id'] = join_nonempty(
+                        *fmt['format_id'].split('-', 2)[:2], int_or_none(fmt.get('tbr')))
+            else:
+                fmt = traverse_obj(file, {
+                    'ext': ('type', {mimetype2ext(default='mp4')}),
+                    'vcodec': ('codec', {str.lower}),
+                    'width': ('width', {int_or_none}),
+                    'height': ('height', {int_or_none}),
+                    'filesize': ('size', {int_or_none}),
+                    'fps': ('fps', {int_or_none}),
+                })
+                fmt.update({
+                    'url': format_url,
+                    'format_id': join_nonempty(
+                        'http', traverse_obj(file, 'public_name', 'rendition'), quality),
+                    'tbr': try_call(lambda: fmt['filesize'] * 8 / duration / 1024),
+                })
+                formats.append(fmt)
+                continue
+            formats.extend(fmts)
+            self._merge_subtitles(subs, target=subtitles)
+
+        if traverse_obj(video, ('metadata', 'connections', 'texttracks', 'total', {int})):
+            self._merge_subtitles(self.extract_subtitles(video_id, unlisted_hash), target=subtitles)
+
+        return {
+            **traverse_obj(video, {
+                'title': ('name', {str}),
+                'uploader': ('user', 'name', {str}),
+                'uploader_id': ('user', 'link', {url_basename}),
+                'uploader_url': ('user', 'link', {url_or_none}),
+                'release_timestamp': ('live', 'scheduled_start_time', {int_or_none}),
+                'thumbnails': ('pictures', 'sizes', lambda _, v: url_or_none(v['link']), {
+                    'url': 'link',
+                    'width': ('width', {int_or_none}),
+                    'height': ('height', {int_or_none}),
+                }),
+            }),
+            'id': video_id,
+            'duration': duration,
+            'formats': formats,
+            'subtitles': subtitles,
+            'live_status': {
+                'streaming': 'is_live',
+                'done': 'was_live',
+            }.get(traverse_obj(video, ('live', 'status', {str}))),
+        }
+
     def _extract_from_api(self, video_id, unlisted_hash=None):
         for retry in (False, True):
             try:
                 video = self._call_videos_api(video_id, unlisted_hash)
                 break
             except ExtractorError as e:
-                if (not retry and isinstance(e.cause, HTTPError) and e.cause.status == 400
+                if not isinstance(e.cause, HTTPError):
-                    and 'password' in traverse_obj(
+                    raise
-                        self._webpage_read_content(e.cause.response, e.cause.response.url, video_id, fatal=False),
+                response = traverse_obj(
-                        ({json.loads}, 'invalid_parameters', ..., 'field'),
+                    self._webpage_read_content(e.cause.response, e.cause.response.url, video_id, fatal=False),
-                )):
+                    ({json.loads}, {dict})) or {}
+                if (
+                    not retry and e.cause.status == 400
+                    and 'password' in traverse_obj(response, ('invalid_parameters', ..., 'field'))
+                ):
                     self._verify_video_password(video_id)
-                    continue
+                elif e.cause.status == 404 and response.get('error_code') == 5460:
-                raise
+                    self.raise_login_required(join_nonempty(
+                        traverse_obj(response, ('error', {str.strip})),
+                        'Authentication may be needed due to your location.',
+                        'If your IP address is located in Europe you could try using a VPN/proxy,',
+                        f'or else u{self._login_hint()[1:]}',
+                        delim=' '), method=None)
+                else:
+                    raise
+
+        if config_url := traverse_obj(video, ('config_url', {url_or_none})):
+            info = self._parse_config(self._download_json(config_url, video_id), video_id)
+        else:
+            info = self._parse_api_response(video, video_id, unlisted_hash)
 
-        info = self._parse_config(self._download_json(
-            video['config_url'], video_id), video_id)
         source_format = self._extract_original_format(
-            f'https://vimeo.com/{video_id}', video_id, unlisted_hash, api_data=video)
+            f'https://vimeo.com/{video_id}', video_id, unlisted_hash)
         if source_format:
             info['formats'].append(source_format)
 

yt_dlp/extractor/youtube/_base.py

@@ -1,5 +1,6 @@
 import calendar
 import copy
+import dataclasses
 import datetime as dt
 import enum
 import functools
@@ -38,6 +39,60 @@ class _PoTokenContext(enum.Enum):
     SUBS = 'subs'
 
 
+class StreamingProtocol(enum.Enum):
+    HTTPS = 'https'
+    DASH = 'dash'
+    HLS = 'hls'
+
+
+@dataclasses.dataclass
+class BasePoTokenPolicy:
+    required: bool = False
+    # Try to fetch a PO Token even if it is not required.
+    recommended: bool = False
+    not_required_for_premium: bool = False
+
+
+@dataclasses.dataclass
+class GvsPoTokenPolicy(BasePoTokenPolicy):
+    not_required_with_player_token: bool = False
+
+
+@dataclasses.dataclass
+class PlayerPoTokenPolicy(BasePoTokenPolicy):
+    pass
+
+
+@dataclasses.dataclass
+class SubsPoTokenPolicy(BasePoTokenPolicy):
+    pass
+
+
+WEB_PO_TOKEN_POLICIES = {
+    'GVS_PO_TOKEN_POLICY': {
+        StreamingProtocol.HTTPS: GvsPoTokenPolicy(
+            required=True,
+            recommended=True,
+            not_required_for_premium=True,
+            not_required_with_player_token=False,
+        ),
+        StreamingProtocol.DASH: GvsPoTokenPolicy(
+            required=True,
+            recommended=True,
+            not_required_for_premium=True,
+            not_required_with_player_token=False,
+        ),
+        StreamingProtocol.HLS: GvsPoTokenPolicy(
+            required=False,
+            recommended=True,
+        ),
+    },
+    'PLAYER_PO_TOKEN_POLICY': PlayerPoTokenPolicy(required=False),
+    # In rollout, currently detected via experiment
+    # Premium users DO require a PO Token for subtitles
+    'SUBS_PO_TOKEN_POLICY': SubsPoTokenPolicy(required=False),
+}
+
 # any clients starting with _ cannot be explicitly requested by the user
 INNERTUBE_CLIENTS = {
     'web': {
@@ -48,8 +103,9 @@ class _PoTokenContext(enum.Enum):
             },
         },
         'INNERTUBE_CONTEXT_CLIENT_NAME': 1,
-        'PO_TOKEN_REQUIRED_CONTEXTS': [_PoTokenContext.GVS],
         'SUPPORTS_COOKIES': True,
+        **WEB_PO_TOKEN_POLICIES,
+        'PLAYER_PARAMS': '8AEB',
     },
     # Safari UA returns pre-merged video+audio 144p/240p/360p/720p/1080p HLS formats
     'web_safari': {
@@ -61,8 +117,9 @@ class _PoTokenContext(enum.Enum):
             },
         },
         'INNERTUBE_CONTEXT_CLIENT_NAME': 1,
-        'PO_TOKEN_REQUIRED_CONTEXTS': [_PoTokenContext.GVS],
         'SUPPORTS_COOKIES': True,
+        **WEB_PO_TOKEN_POLICIES,
+        'PLAYER_PARAMS': '8AEB',
     },
     'web_embedded': {
         'INNERTUBE_CONTEXT': {
@@ -83,7 +140,24 @@ class _PoTokenContext(enum.Enum):
             },
         },
         'INNERTUBE_CONTEXT_CLIENT_NAME': 67,
-        'PO_TOKEN_REQUIRED_CONTEXTS': [_PoTokenContext.GVS],
+        'GVS_PO_TOKEN_POLICY': {
+            StreamingProtocol.HTTPS: GvsPoTokenPolicy(
+                required=True,
+                recommended=True,
+                not_required_for_premium=True,
+                not_required_with_player_token=False,
+            ),
+            StreamingProtocol.DASH: GvsPoTokenPolicy(
+                required=True,
+                recommended=True,
+                not_required_for_premium=True,
+                not_required_with_player_token=False,
+            ),
+            StreamingProtocol.HLS: GvsPoTokenPolicy(
+                required=False,
+                recommended=True,
+            ),
+        },
         'SUPPORTS_COOKIES': True,
     },
     # This client now requires sign-in for every video
@@ -95,7 +169,24 @@ class _PoTokenContext(enum.Enum):
             },
         },
         'INNERTUBE_CONTEXT_CLIENT_NAME': 62,
-        'PO_TOKEN_REQUIRED_CONTEXTS': [_PoTokenContext.GVS],
+        'GVS_PO_TOKEN_POLICY': {
+            StreamingProtocol.HTTPS: GvsPoTokenPolicy(
+                required=True,
+                recommended=True,
+                not_required_for_premium=True,
+                not_required_with_player_token=False,
+            ),
+            StreamingProtocol.DASH: GvsPoTokenPolicy(
+                required=True,
+                recommended=True,
+                not_required_for_premium=True,
+                not_required_with_player_token=False,
+            ),
+            StreamingProtocol.HLS: GvsPoTokenPolicy(
+                required=False,
+                recommended=True,
+            ),
+        },
         'REQUIRE_AUTH': True,
         'SUPPORTS_COOKIES': True,
     },
@@ -112,7 +203,24 @@ class _PoTokenContext(enum.Enum):
         },
         'INNERTUBE_CONTEXT_CLIENT_NAME': 3,
         'REQUIRE_JS_PLAYER': False,
-        'PO_TOKEN_REQUIRED_CONTEXTS': [_PoTokenContext.GVS],
+        'GVS_PO_TOKEN_POLICY': {
+            StreamingProtocol.HTTPS: GvsPoTokenPolicy(
+                required=True,
+                recommended=True,
+                not_required_with_player_token=True,
+            ),
+            StreamingProtocol.DASH: GvsPoTokenPolicy(
+                required=True,
+                recommended=True,
+                not_required_with_player_token=True,
+            ),
+            StreamingProtocol.HLS: GvsPoTokenPolicy(
+                required=False,
+                recommended=True,
+                not_required_with_player_token=True,
+            ),
+        },
+        'PLAYER_PO_TOKEN_POLICY': PlayerPoTokenPolicy(required=False, recommended=True),
     },
     # YouTube Kids videos aren't returned on this client for some reason
     'android_vr': {
@@ -146,7 +254,21 @@ class _PoTokenContext(enum.Enum):
             },
         },
         'INNERTUBE_CONTEXT_CLIENT_NAME': 5,
-        'PO_TOKEN_REQUIRED_CONTEXTS': [_PoTokenContext.GVS],
+        'GVS_PO_TOKEN_POLICY': {
+            StreamingProtocol.HTTPS: GvsPoTokenPolicy(
+                required=True,
+                recommended=True,
+                not_required_with_player_token=True,
+            ),
+            # HLS Livestreams require POT 30 seconds in
+            # TODO: Rolling out
+            StreamingProtocol.HLS: GvsPoTokenPolicy(
+                required=False,
+                recommended=True,
+                not_required_with_player_token=True,
+            ),
+        },
+        'PLAYER_PO_TOKEN_POLICY': PlayerPoTokenPolicy(required=False, recommended=True),
         'REQUIRE_JS_PLAYER': False,
     },
     # mweb has 'ultralow' formats
@@ -161,7 +283,24 @@ class _PoTokenContext(enum.Enum):
             },
         },
         'INNERTUBE_CONTEXT_CLIENT_NAME': 2,
-        'PO_TOKEN_REQUIRED_CONTEXTS': [_PoTokenContext.GVS],
+        'GVS_PO_TOKEN_POLICY': {
+            StreamingProtocol.HTTPS: GvsPoTokenPolicy(
+                required=True,
+                recommended=True,
+                not_required_for_premium=True,
+                not_required_with_player_token=False,
+            ),
+            StreamingProtocol.DASH: GvsPoTokenPolicy(
+                required=True,
+                recommended=True,
+                not_required_for_premium=True,
+                not_required_with_player_token=False,
+            ),
+            StreamingProtocol.HLS: GvsPoTokenPolicy(
+                required=False,
+                recommended=True,
+            ),
+        },
         'SUPPORTS_COOKIES': True,
     },
     'tv': {
@@ -174,6 +313,7 @@ class _PoTokenContext(enum.Enum):
         },
         'INNERTUBE_CONTEXT_CLIENT_NAME': 7,
         'SUPPORTS_COOKIES': True,
+        'PLAYER_PARAMS': '8AEB',
     },
     'tv_simply': {
         'INNERTUBE_CONTEXT': {
@@ -224,7 +364,11 @@ def build_innertube_clients():
     for client, ytcfg in tuple(INNERTUBE_CLIENTS.items()):
         ytcfg.setdefault('INNERTUBE_HOST', 'www.youtube.com')
         ytcfg.setdefault('REQUIRE_JS_PLAYER', True)
-        ytcfg.setdefault('PO_TOKEN_REQUIRED_CONTEXTS', [])
+        ytcfg.setdefault('GVS_PO_TOKEN_POLICY', {})
+        for protocol in StreamingProtocol:
+            ytcfg['GVS_PO_TOKEN_POLICY'].setdefault(protocol, GvsPoTokenPolicy())
+        ytcfg.setdefault('PLAYER_PO_TOKEN_POLICY', PlayerPoTokenPolicy())
+        ytcfg.setdefault('SUBS_PO_TOKEN_POLICY', SubsPoTokenPolicy())
         ytcfg.setdefault('REQUIRE_AUTH', False)
         ytcfg.setdefault('SUPPORTS_COOKIES', False)
         ytcfg.setdefault('PLAYER_PARAMS', None)

yt_dlp/extractor/youtube/_tab.py

@@ -317,17 +317,31 @@ def _extract_lockup_view_model(self, view_model):
         content_id = view_model.get('contentId')
         if not content_id:
             return
+
         content_type = view_model.get('contentType')
-        if content_type not in ('LOCKUP_CONTENT_TYPE_PLAYLIST', 'LOCKUP_CONTENT_TYPE_PODCAST'):
+        if content_type == 'LOCKUP_CONTENT_TYPE_VIDEO':
+            ie = YoutubeIE
+            url = f'https://www.youtube.com/watch?v={content_id}'
+            thumb_keys = (None,)
+        elif content_type in ('LOCKUP_CONTENT_TYPE_PLAYLIST', 'LOCKUP_CONTENT_TYPE_PODCAST'):
+            ie = YoutubeTabIE
+            url = f'https://www.youtube.com/playlist?list={content_id}'
+            thumb_keys = ('collectionThumbnailViewModel', 'primaryThumbnail')
+        else:
             self.report_warning(
-                f'Unsupported lockup view model content type "{content_type}"{bug_reports_message()}', only_once=True)
+                f'Unsupported lockup view model content type "{content_type}"{bug_reports_message()}',
+                only_once=True)
             return
+
         return self.url_result(
-            f'https://www.youtube.com/playlist?list={content_id}', ie=YoutubeTabIE, video_id=content_id,
+            url, ie, content_id,
             title=traverse_obj(view_model, (
                 'metadata', 'lockupMetadataViewModel', 'title', 'content', {str})),
             thumbnails=self._extract_thumbnails(view_model, (
-                'contentImage', 'collectionThumbnailViewModel', 'primaryThumbnail', 'thumbnailViewModel', 'image'), final_key='sources'))
+                'contentImage', *thumb_keys, 'thumbnailViewModel', 'image'), final_key='sources'),
+            duration=traverse_obj(view_model, (
+                'contentImage', 'thumbnailViewModel', 'overlays', ..., 'thumbnailOverlayBadgeViewModel',
+                'thumbnailBadges', ..., 'thumbnailBadgeViewModel', 'text', {parse_duration}, any)))
 
     def _rich_entries(self, rich_grid_renderer):
         if lockup_view_model := traverse_obj(rich_grid_renderer, ('content', 'lockupViewModel', {dict})):

yt_dlp/extractor/youtube/_video.py

@@ -18,6 +18,9 @@
 from ._base import (
     INNERTUBE_CLIENTS,
     BadgeType,
+    GvsPoTokenPolicy,
+    PlayerPoTokenPolicy,
+    StreamingProtocol,
     YoutubeBaseInfoExtractor,
     _PoTokenContext,
     _split_innertube_client,
@@ -26,7 +29,7 @@
 from .pot._director import initialize_pot_director
 from .pot.provider import PoTokenContext, PoTokenRequest
 from ..openload import PhantomJSwrapper
-from ...jsinterp import JSInterpreter
+from ...jsinterp import JSInterpreter, LocalNameSpace
 from ...networking.exceptions import HTTPError
 from ...utils import (
     NO_DEFAULT,
@@ -71,9 +74,11 @@
 from ...utils.networking import clean_headers, clean_proxies, select_proxy
 
 STREAMING_DATA_CLIENT_NAME = '__yt_dlp_client'
-STREAMING_DATA_INITIAL_PO_TOKEN = '__yt_dlp_po_token'
 STREAMING_DATA_FETCH_SUBS_PO_TOKEN = '__yt_dlp_fetch_subs_po_token'
+STREAMING_DATA_FETCH_GVS_PO_TOKEN = '__yt_dlp_fetch_gvs_po_token'
+STREAMING_DATA_PLAYER_TOKEN_PROVIDED = '__yt_dlp_player_token_provided'
 STREAMING_DATA_INNERTUBE_CONTEXT = '__yt_dlp_innertube_context'
+STREAMING_DATA_IS_PREMIUM_SUBSCRIBER = '__yt_dlp_is_premium_subscriber'
 
 PO_TOKEN_GUIDE_URL = 'https://github.com/yt-dlp/yt-dlp/wiki/PO-Token-Guide'
 
@@ -253,6 +258,8 @@ class YoutubeIE(YoutubeBaseInfoExtractor):
     _SUBTITLE_FORMATS = ('json3', 'srv1', 'srv2', 'srv3', 'ttml', 'srt', 'vtt')
     _DEFAULT_CLIENTS = ('tv', 'ios', 'web')
     _DEFAULT_AUTHED_CLIENTS = ('tv', 'web')
+    # Premium does not require POT (except for subtitles)
+    _DEFAULT_PREMIUM_CLIENTS = ('tv', 'web')
 
     _GEO_BYPASS = False
 
@@ -1801,6 +1808,8 @@ class YoutubeIE(YoutubeBaseInfoExtractor):
         'tablet': 'player-plasma-ias-tablet-en_US.vflset/base.js',
     }
     _INVERSE_PLAYER_JS_VARIANT_MAP = {v: k for k, v in _PLAYER_JS_VARIANT_MAP.items()}
+    _NSIG_FUNC_CACHE_ID = 'nsig func'
+    _DUMMY_STRING = 'dlp_wins'
 
     @classmethod
     def suitable(cls, url):
@@ -1831,7 +1840,8 @@ def refetch_manifest(format_id, delay):
             if time.time() <= start_time + delay:
                 return
 
-            _, _, prs, player_url = self._download_player_responses(url, smuggled_data, video_id, webpage_url)
+            _, _, _, _, prs, player_url = self._initial_extract(
+                url, smuggled_data, webpage_url, 'web', video_id)
             video_details = traverse_obj(prs, (..., 'videoDetails'), expected_type=dict)
             microformats = traverse_obj(
                 prs, (..., 'microformat', 'playerMicroformatRenderer'),
@@ -2204,7 +2214,7 @@ def _decrypt_nsig(self, s, video_id, player_url):
             self.to_screen(f'Extracted nsig function from {player_id}:\n{func_code[1]}\n')
 
         try:
-            extract_nsig = self._cached(self._extract_n_function_from_code, 'nsig func', player_url)
+            extract_nsig = self._cached(self._extract_n_function_from_code, self._NSIG_FUNC_CACHE_ID, player_url)
             ret = extract_nsig(jsi, func_code)(s)
         except JSInterpreter.Exception as e:
             try:
@@ -2312,16 +2322,18 @@ def _interpret_player_js_global_var(self, jscode, player_url):
 
         jsi = JSInterpreter(varcode)
         interpret_global_var = self._cached(jsi.interpret_expression, 'js global list', player_url)
-        return varname, interpret_global_var(varvalue, {}, allow_recursion=10)
+        return varname, interpret_global_var(varvalue, LocalNameSpace(), allow_recursion=10)
 
     def _fixup_n_function_code(self, argnames, nsig_code, jscode, player_url):
+        # Fixup global array
         varname, global_list = self._interpret_player_js_global_var(jscode, player_url)
         if varname and global_list:
             nsig_code = f'var {varname}={json.dumps(global_list)}; {nsig_code}'
         else:
-            varname = 'dlp_wins'
+            varname = self._DUMMY_STRING
             global_list = []
 
+        # Fixup typeof check
         undefined_idx = global_list.index('undefined') if 'undefined' in global_list else r'\d+'
         fixed_code = re.sub(
             fr'''(?x)
@@ -2334,6 +2346,32 @@ def _fixup_n_function_code(self, argnames, nsig_code, jscode, player_url):
             self.write_debug(join_nonempty(
                 'No typeof statement found in nsig function code',
                 player_url and f'        player = {player_url}', delim='\n'), only_once=True)
+
+        # Fixup global funcs
+        jsi = JSInterpreter(fixed_code)
+        cache_id = (self._NSIG_FUNC_CACHE_ID, player_url)
+        try:
+            self._cached(
+                self._extract_n_function_from_code, *cache_id)(jsi, (argnames, fixed_code))(self._DUMMY_STRING)
+        except JSInterpreter.Exception:
+            self._player_cache.pop(cache_id, None)
+
+        global_funcnames = jsi._undefined_varnames
+        debug_names = []
+        jsi = JSInterpreter(jscode)
+        for func_name in global_funcnames:
+            try:
+                func_args, func_code = jsi.extract_function_code(func_name)
+                fixed_code = f'var {func_name} = function({", ".join(func_args)}) {{ {func_code} }}; {fixed_code}'
+                debug_names.append(func_name)
+            except Exception:
+                self.report_warning(join_nonempty(
+                    f'Unable to extract global nsig function {func_name} from player JS',
+                    player_url and f'        player = {player_url}', delim='\n'), only_once=True)
+
+        if debug_names:
+            self.write_debug(f'Extracted global nsig functions: {", ".join(debug_names)}')
+
         return argnames, fixed_code
 
     def _extract_n_function_code(self, video_id, player_url):
@@ -2347,7 +2385,7 @@ def _extract_n_function_code(self, video_id, player_url):
 
         func_name = self._extract_n_function_name(jscode, player_url=player_url)
 
-        # XXX: Workaround for the global array variable and lack of `typeof` implementation
+        # XXX: Work around (a) global array variable, (b) `typeof` short-circuit, (c) global functions
         func_code = self._fixup_n_function_code(*jsi.extract_function_code(func_name), jscode, player_url)
 
         return jsi, player_id, func_code
@@ -2820,10 +2858,6 @@ def _generate_player_context(cls, sts=None):
             context['signatureTimestamp'] = sts
         return {
             'playbackContext': {
-                'adPlaybackContext': {
-                    'pyv': True,
-                    'adType': 'AD_TYPE_INSTREAM',
-                },
                 'contentPlaybackContext': context,
             },
             **cls._get_checkok_params(),
@@ -2865,7 +2899,7 @@ def _get_config_po_token(self, client: str, context: _PoTokenContext):
                     only_once=True)
                 continue
 
-    def fetch_po_token(self, client='web', context=_PoTokenContext.GVS, ytcfg=None, visitor_data=None,
+    def fetch_po_token(self, client='web', context: _PoTokenContext = _PoTokenContext.GVS, ytcfg=None, visitor_data=None,
                        data_sync_id=None, session_index=None, player_url=None, video_id=None, webpage=None,
                        required=False, **kwargs):
         """
@@ -2950,7 +2984,6 @@ def _fetch_po_token(self, client, **kwargs):
             fetch_pot_policy == 'never'
             or (
                 fetch_pot_policy == 'auto'
-                and _PoTokenContext(context) not in self._get_default_ytcfg(client)['PO_TOKEN_REQUIRED_CONTEXTS']
                 and not kwargs.get('required', False)
             )
         ):
@@ -3009,19 +3042,19 @@ def _is_agegated(player_response):
     def _is_unplayable(player_response):
         return traverse_obj(player_response, ('playabilityStatus', 'status')) == 'UNPLAYABLE'
 
-    def _extract_player_response(self, client, video_id, master_ytcfg, player_ytcfg, player_url, initial_pr, visitor_data, data_sync_id, po_token):
+    def _extract_player_response(self, client, video_id, webpage_ytcfg, player_ytcfg, player_url, initial_pr, visitor_data, data_sync_id, po_token):
         headers = self.generate_api_headers(
             ytcfg=player_ytcfg,
             default_client=client,
             visitor_data=visitor_data,
-            session_index=self._extract_session_index(master_ytcfg, player_ytcfg),
+            session_index=self._extract_session_index(webpage_ytcfg, player_ytcfg),
             delegated_session_id=(
                 self._parse_data_sync_id(data_sync_id)[0]
-                or self._extract_delegated_session_id(master_ytcfg, initial_pr, player_ytcfg)
+                or self._extract_delegated_session_id(webpage_ytcfg, initial_pr, player_ytcfg)
             ),
             user_session_id=(
                 self._parse_data_sync_id(data_sync_id)[1]
-                or self._extract_user_session_id(master_ytcfg, initial_pr, player_ytcfg)
+                or self._extract_user_session_id(webpage_ytcfg, initial_pr, player_ytcfg)
             ),
         )
 
@@ -3037,7 +3070,7 @@ def _extract_player_response(self, client, video_id, master_ytcfg, player_ytcfg,
         if po_token:
             yt_query['serviceIntegrityDimensions'] = {'poToken': po_token}
 
-        sts = self._extract_signature_timestamp(video_id, player_url, master_ytcfg, fatal=False) if player_url else None
+        sts = self._extract_signature_timestamp(video_id, player_url, webpage_ytcfg, fatal=False) if player_url else None
         yt_query.update(self._generate_player_context(sts))
         return self._extract_response(
             item_id=video_id, ep='player', query=yt_query,
@@ -3046,10 +3079,14 @@ def _extract_player_response(self, client, video_id, master_ytcfg, player_ytcfg,
             note='Downloading {} player API JSON'.format(client.replace('_', ' ').strip()),
         ) or None
 
-    def _get_requested_clients(self, url, smuggled_data):
+    def _get_requested_clients(self, url, smuggled_data, is_premium_subscriber):
         requested_clients = []
         excluded_clients = []
-        default_clients = self._DEFAULT_AUTHED_CLIENTS if self.is_authenticated else self._DEFAULT_CLIENTS
+        default_clients = (
+            self._DEFAULT_PREMIUM_CLIENTS if is_premium_subscriber
+            else self._DEFAULT_AUTHED_CLIENTS if self.is_authenticated
+            else self._DEFAULT_CLIENTS
+        )
         allowed_clients = sorted(
             (client for client in INNERTUBE_CLIENTS if client[:1] != '_'),
             key=lambda client: INNERTUBE_CLIENTS[client]['priority'], reverse=True)
@@ -3091,11 +3128,12 @@ def _invalid_player_response(self, pr, video_id):
         if (pr_id := traverse_obj(pr, ('videoDetails', 'videoId'))) != video_id:
             return pr_id
 
-    def _extract_player_responses(self, clients, video_id, webpage, master_ytcfg, smuggled_data):
+    def _extract_player_responses(self, clients, video_id, webpage, webpage_client, webpage_ytcfg, is_premium_subscriber):
         initial_pr = None
         if webpage:
             initial_pr = self._search_json(
-                self._YT_INITIAL_PLAYER_RESPONSE_RE, webpage, 'initial player response', video_id, fatal=False)
+                self._YT_INITIAL_PLAYER_RESPONSE_RE, webpage,
+                f'{webpage_client} client initial player response', video_id, fatal=False)
 
         prs = []
         deprioritized_prs = []
@@ -3126,11 +3164,11 @@ def append_client(*client_names):
         while clients:
             deprioritize_pr = False
             client, base_client, variant = _split_innertube_client(clients.pop())
-            player_ytcfg = master_ytcfg if client == 'web' else {}
+            player_ytcfg = webpage_ytcfg if client == webpage_client else {}
-            if 'configs' not in self._configuration_arg('player_skip') and client != 'web':
+            if 'configs' not in self._configuration_arg('player_skip') and client != webpage_client:
                 player_ytcfg = self._download_ytcfg(client, video_id) or player_ytcfg
 
-            player_url = player_url or self._extract_player_url(master_ytcfg, player_ytcfg, webpage=webpage)
+            player_url = player_url or self._extract_player_url(webpage_ytcfg, player_ytcfg, webpage=webpage)
             require_js_player = self._get_default_ytcfg(client).get('REQUIRE_JS_PLAYER')
             if 'js' in self._configuration_arg('player_skip'):
                 require_js_player = False
@@ -3140,10 +3178,12 @@ def append_client(*client_names):
                 player_url = self._download_player_url(video_id)
                 tried_iframe_fallback = True
 
-            pr = initial_pr if client == 'web' else None
+            pr = None
+            if client == webpage_client and 'player_response' not in self._configuration_arg('webpage_skip'):
+                pr = initial_pr
 
-            visitor_data = visitor_data or self._extract_visitor_data(master_ytcfg, initial_pr, player_ytcfg)
+            visitor_data = visitor_data or self._extract_visitor_data(webpage_ytcfg, initial_pr, player_ytcfg)
-            data_sync_id = data_sync_id or self._extract_data_sync_id(master_ytcfg, initial_pr, player_ytcfg)
+            data_sync_id = data_sync_id or self._extract_data_sync_id(webpage_ytcfg, initial_pr, player_ytcfg)
 
             fetch_po_token_args = {
                 'client': client,
@@ -3152,53 +3192,26 @@ def append_client(*client_names):
                 'data_sync_id': data_sync_id if self.is_authenticated else None,
                 'player_url': player_url if require_js_player else None,
                 'webpage': webpage,
-                'session_index': self._extract_session_index(master_ytcfg, player_ytcfg),
+                'session_index': self._extract_session_index(webpage_ytcfg, player_ytcfg),
                 'ytcfg': player_ytcfg or self._get_default_ytcfg(client),
             }
 
             # Don't need a player PO token for WEB if using player response from webpage
+            player_pot_policy: PlayerPoTokenPolicy = self._get_default_ytcfg(client)['PLAYER_PO_TOKEN_POLICY']
             player_po_token = None if pr else self.fetch_po_token(
-                context=_PoTokenContext.PLAYER, **fetch_po_token_args)
+                context=_PoTokenContext.PLAYER, **fetch_po_token_args,
+                required=player_pot_policy.required or player_pot_policy.recommended)
 
-            gvs_po_token = self.fetch_po_token(
+            fetch_gvs_po_token_func = functools.partial(
-                context=_PoTokenContext.GVS, **fetch_po_token_args)
+                self.fetch_po_token, context=_PoTokenContext.GVS, **fetch_po_token_args)
 
             fetch_subs_po_token_func = functools.partial(
-                self.fetch_po_token,
+                self.fetch_po_token, context=_PoTokenContext.SUBS, **fetch_po_token_args)
-                context=_PoTokenContext.SUBS,
-                **fetch_po_token_args,
-            )
-
-            required_pot_contexts = self._get_default_ytcfg(client)['PO_TOKEN_REQUIRED_CONTEXTS']
-
-            if (
-                not player_po_token
-                and _PoTokenContext.PLAYER in required_pot_contexts
-            ):
-                # TODO: may need to skip player response request. Unsure yet..
-                self.report_warning(
-                    f'No Player PO Token provided for {client} client, '
-                    f'which may be required for working {client} formats. This client will be deprioritized'
-                    f'You can manually pass a Player PO Token for this client with --extractor-args "youtube:po_token={client}.player+XXX". '
-                    f'For more information, refer to {PO_TOKEN_GUIDE_URL} .', only_once=True)
-                deprioritize_pr = True
-
-            if (
-                not gvs_po_token
-                and _PoTokenContext.GVS in required_pot_contexts
-                and 'missing_pot' in self._configuration_arg('formats')
-            ):
-                # note: warning with help message is provided later during format processing
-                self.report_warning(
-                    f'No GVS PO Token provided for {client} client, '
-                    f'which may be required for working {client} formats. This client will be deprioritized',
-                    only_once=True)
-                deprioritize_pr = True
 
             try:
                 pr = pr or self._extract_player_response(
                     client, video_id,
-                    master_ytcfg=player_ytcfg or master_ytcfg,
+                    webpage_ytcfg=player_ytcfg or webpage_ytcfg,
                     player_ytcfg=player_ytcfg,
                     player_url=player_url,
                     initial_pr=initial_pr,
@@ -3216,12 +3229,16 @@ def append_client(*client_names):
                 innertube_context = traverse_obj(player_ytcfg or self._get_default_ytcfg(client), 'INNERTUBE_CONTEXT')
                 sd = pr.setdefault('streamingData', {})
                 sd[STREAMING_DATA_CLIENT_NAME] = client
-                sd[STREAMING_DATA_INITIAL_PO_TOKEN] = gvs_po_token
+                sd[STREAMING_DATA_FETCH_GVS_PO_TOKEN] = fetch_gvs_po_token_func
+                sd[STREAMING_DATA_PLAYER_TOKEN_PROVIDED] = bool(player_po_token)
                 sd[STREAMING_DATA_INNERTUBE_CONTEXT] = innertube_context
                 sd[STREAMING_DATA_FETCH_SUBS_PO_TOKEN] = fetch_subs_po_token_func
+                sd[STREAMING_DATA_IS_PREMIUM_SUBSCRIBER] = is_premium_subscriber
                 for f in traverse_obj(sd, (('formats', 'adaptiveFormats'), ..., {dict})):
                     f[STREAMING_DATA_CLIENT_NAME] = client
-                    f[STREAMING_DATA_INITIAL_PO_TOKEN] = gvs_po_token
+                    f[STREAMING_DATA_FETCH_GVS_PO_TOKEN] = fetch_gvs_po_token_func
+                    f[STREAMING_DATA_IS_PREMIUM_SUBSCRIBER] = is_premium_subscriber
+                    f[STREAMING_DATA_PLAYER_TOKEN_PROVIDED] = bool(player_po_token)
                 if deprioritize_pr:
                     deprioritized_prs.append(pr)
                 else:
@@ -3247,6 +3264,10 @@ def append_client(*client_names):
                 # web_creator may work around age-verification for all videos but requires PO token
                 append_client('tv_embedded', 'web_creator')
 
+            status = traverse_obj(pr, ('playabilityStatus', 'status', {str}))
+            if status not in ('OK', 'LIVE_STREAM_OFFLINE', 'AGE_CHECK_REQUIRED', 'AGE_VERIFICATION_REQUIRED'):
+                self.write_debug(f'{video_id}: {client} player response playability status: {status}')
+
         prs.extend(deprioritized_prs)
 
         if skipped_clients:
@@ -3327,6 +3348,15 @@ def build_fragments(f):
                 }),
             } for range_start in range(0, f['filesize'], CHUNK_SIZE))
 
+        def gvs_pot_required(policy, is_premium_subscriber, has_player_token):
+            return (
+                policy.required
+                and not (policy.not_required_with_player_token and has_player_token)
+                and not (policy.not_required_for_premium and is_premium_subscriber))
+
+        # save pots per client to avoid fetching again
+        gvs_pots = {}
+
         for fmt in streaming_formats:
             client_name = fmt[STREAMING_DATA_CLIENT_NAME]
             if fmt.get('targetDurationSec'):
@@ -3386,7 +3416,7 @@ def build_fragments(f):
                 encrypted_sig = try_get(sc, lambda x: x['s'][0])
                 if not all((sc, fmt_url, player_url, encrypted_sig)):
                     msg = f'Some {client_name} client https formats have been skipped as they are missing a url. '
-                    if client_name == 'web':
+                    if client_name in ('web', 'web_safari'):
                         msg += 'YouTube is forcing SABR streaming for this client. '
                     else:
                         msg += (
@@ -3446,18 +3476,25 @@ def build_fragments(f):
                 self.report_warning(
                     'Some formats are possibly damaged. They will be deprioritized', video_id, only_once=True)
 
-            po_token = fmt.get(STREAMING_DATA_INITIAL_PO_TOKEN)
+            fetch_po_token_func = fmt[STREAMING_DATA_FETCH_GVS_PO_TOKEN]
+            pot_policy: GvsPoTokenPolicy = self._get_default_ytcfg(client_name)['GVS_PO_TOKEN_POLICY'][StreamingProtocol.HTTPS]
+
+            require_po_token = (
+                itag not in ['18']
+                and gvs_pot_required(
+                    pot_policy, fmt[STREAMING_DATA_IS_PREMIUM_SUBSCRIBER],
+                    fmt[STREAMING_DATA_PLAYER_TOKEN_PROVIDED]))
+
+            po_token = (
+                gvs_pots.get(client_name)
+                or fetch_po_token_func(required=require_po_token or pot_policy.recommended))
 
             if po_token:
                 fmt_url = update_url_query(fmt_url, {'pot': po_token})
+                if client_name not in gvs_pots:
+                    gvs_pots[client_name] = po_token
 
-            # Clients that require PO Token return videoplayback URLs that may return 403
+            if not po_token and require_po_token and 'missing_pot' not in self._configuration_arg('formats'):
-            require_po_token = (
-                not po_token
-                and _PoTokenContext.GVS in self._get_default_ytcfg(client_name)['PO_TOKEN_REQUIRED_CONTEXTS']
-                and itag not in ['18'])  # these formats do not require PO Token
-
-            if require_po_token and 'missing_pot' not in self._configuration_arg('formats'):
                 self._report_pot_format_skipped(video_id, client_name, 'https')
                 continue
 
@@ -3472,7 +3509,7 @@ def build_fragments(f):
                     name, fmt.get('isDrc') and 'DRC',
                     try_get(fmt, lambda x: x['projectionType'].replace('RECTANGULAR', '').lower()),
                     try_get(fmt, lambda x: x['spatialAudioType'].replace('SPATIAL_AUDIO_TYPE_', '').lower()),
-                    is_damaged and 'DAMAGED', require_po_token and 'MISSING POT',
+                    is_damaged and 'DAMAGED', require_po_token and not po_token and 'MISSING POT',
                     (self.get_param('verbose') or all_formats) and short_client_name(client_name),
                     delim=', '),
                 # Format 22 is likely to be damaged. See https://github.com/yt-dlp/yt-dlp/issues/3372
@@ -3535,7 +3572,7 @@ def build_fragments(f):
         elif skip_bad_formats and live_status == 'is_live' and needs_live_processing != 'is_live':
             skip_manifests.add('dash')
 
-        def process_manifest_format(f, proto, client_name, itag, po_token):
+        def process_manifest_format(f, proto, client_name, itag, missing_pot):
             key = (proto, f.get('language'))
             if not all_formats and key in itags[itag]:
                 return False
@@ -3543,20 +3580,11 @@ def process_manifest_format(f, proto, client_name, itag, po_token):
             if f.get('source_preference') is None:
                 f['source_preference'] = -1
 
-            # Clients that require PO Token return videoplayback URLs that may return 403
+            if missing_pot:
-            # hls does not currently require PO Token
-            if (
-                not po_token
-                and _PoTokenContext.GVS in self._get_default_ytcfg(client_name)['PO_TOKEN_REQUIRED_CONTEXTS']
-                and proto != 'hls'
-            ):
-                if 'missing_pot' not in self._configuration_arg('formats'):
-                    self._report_pot_format_skipped(video_id, client_name, proto)
-                    return False
                 f['format_note'] = join_nonempty(f.get('format_note'), 'MISSING POT', delim=' ')
                 f['source_preference'] -= 20
 
-            # XXX: Check if IOS HLS formats are affected by player PO token enforcement; temporary
+            # XXX: Check if IOS HLS formats are affected by PO token enforcement; temporary
             # See https://github.com/yt-dlp/yt-dlp/issues/13511
             if proto == 'hls' and client_name == 'ios':
                 f['__needs_testing'] = True
@@ -3595,39 +3623,62 @@ def process_manifest_format(f, proto, client_name, itag, po_token):
         subtitles = {}
         for sd in streaming_data:
             client_name = sd[STREAMING_DATA_CLIENT_NAME]
-            po_token = sd.get(STREAMING_DATA_INITIAL_PO_TOKEN)
+            fetch_pot_func = sd[STREAMING_DATA_FETCH_GVS_PO_TOKEN]
+            is_premium_subscriber = sd[STREAMING_DATA_IS_PREMIUM_SUBSCRIBER]
+            has_player_token = sd[STREAMING_DATA_PLAYER_TOKEN_PROVIDED]
+
             hls_manifest_url = 'hls' not in skip_manifests and sd.get('hlsManifestUrl')
             if hls_manifest_url:
+                pot_policy: GvsPoTokenPolicy = self._get_default_ytcfg(
+                    client_name)['GVS_PO_TOKEN_POLICY'][StreamingProtocol.HLS]
+                require_po_token = gvs_pot_required(pot_policy, is_premium_subscriber, has_player_token)
+                po_token = gvs_pots.get(client_name, fetch_pot_func(required=require_po_token or pot_policy.recommended))
                 if po_token:
                     hls_manifest_url = hls_manifest_url.rstrip('/') + f'/pot/{po_token}'
-                fmts, subs = self._extract_m3u8_formats_and_subtitles(
+                    if client_name not in gvs_pots:
-                    hls_manifest_url, video_id, 'mp4', fatal=False, live=live_status == 'is_live')
+                        gvs_pots[client_name] = po_token
-                for sub in traverse_obj(subs, (..., ..., {dict})):
+                if require_po_token and not po_token and 'missing_pot' not in self._configuration_arg('formats'):
-                    # HLS subs (m3u8) do not need a PO token; save client name for debugging
+                    self._report_pot_format_skipped(video_id, client_name, 'hls')
-                    sub[STREAMING_DATA_CLIENT_NAME] = client_name
+                else:
-                subtitles = self._merge_subtitles(subs, subtitles)
+                    fmts, subs = self._extract_m3u8_formats_and_subtitles(
-                for f in fmts:
+                        hls_manifest_url, video_id, 'mp4', fatal=False, live=live_status == 'is_live')
-                    if process_manifest_format(f, 'hls', client_name, self._search_regex(
+                    for sub in traverse_obj(subs, (..., ..., {dict})):
-                            r'/itag/(\d+)', f['url'], 'itag', default=None), po_token):
+                        # TODO: If HLS video requires a PO Token, do the subs also require pot?
-                        yield f
+                        # Save client name for debugging
+                        sub[STREAMING_DATA_CLIENT_NAME] = client_name
+                    subtitles = self._merge_subtitles(subs, subtitles)
+                    for f in fmts:
+                        if process_manifest_format(f, 'hls', client_name, self._search_regex(
+                                r'/itag/(\d+)', f['url'], 'itag', default=None), require_po_token and not po_token):
+                            yield f
 
             dash_manifest_url = 'dash' not in skip_manifests and sd.get('dashManifestUrl')
             if dash_manifest_url:
+                pot_policy: GvsPoTokenPolicy = self._get_default_ytcfg(
+                    client_name)['GVS_PO_TOKEN_POLICY'][StreamingProtocol.DASH]
+                require_po_token = gvs_pot_required(pot_policy, is_premium_subscriber, has_player_token)
+                po_token = gvs_pots.get(client_name, fetch_pot_func(required=require_po_token or pot_policy.recommended))
                 if po_token:
                     dash_manifest_url = dash_manifest_url.rstrip('/') + f'/pot/{po_token}'
-                formats, subs = self._extract_mpd_formats_and_subtitles(dash_manifest_url, video_id, fatal=False)
+                    if client_name not in gvs_pots:
-                for sub in traverse_obj(subs, (..., ..., {dict})):
+                        gvs_pots[client_name] = po_token
-                    # TODO: Investigate if DASH subs ever need a PO token; save client name for debugging
+                if require_po_token and not po_token and 'missing_pot' not in self._configuration_arg('formats'):
-                    sub[STREAMING_DATA_CLIENT_NAME] = client_name
+                    self._report_pot_format_skipped(video_id, client_name, 'dash')
-                subtitles = self._merge_subtitles(subs, subtitles)  # Prioritize HLS subs over DASH
+                else:
-                for f in formats:
+                    formats, subs = self._extract_mpd_formats_and_subtitles(dash_manifest_url, video_id, fatal=False)
-                    if process_manifest_format(f, 'dash', client_name, f['format_id'], po_token):
+                    for sub in traverse_obj(subs, (..., ..., {dict})):
-                        f['filesize'] = int_or_none(self._search_regex(
+                        # TODO: If DASH video requires a PO Token, do the subs also require pot?
-                            r'/clen/(\d+)', f.get('fragment_base_url') or f['url'], 'file size', default=None))
+                        # Save client name for debugging
-                        if needs_live_processing:
+                        sub[STREAMING_DATA_CLIENT_NAME] = client_name
-                            f['is_from_start'] = True
+                    subtitles = self._merge_subtitles(subs, subtitles)  # Prioritize HLS subs over DASH
+                    for f in formats:
+                        if process_manifest_format(f, 'dash', client_name, f['format_id'], require_po_token and not po_token):
+                            f['filesize'] = int_or_none(self._search_regex(
+                                r'/clen/(\d+)', f.get('fragment_base_url') or f['url'], 'file size', default=None))
+                            if needs_live_processing:
+                                f['is_from_start'] = True
 
-                        yield f
+                            yield f
         yield subtitles
 
     def _extract_storyboard(self, player_responses, duration):
@@ -3668,22 +3719,22 @@ def _extract_storyboard(self, player_responses, duration):
                 } for j in range(math.ceil(fragment_count))],
             }
 
-    def _download_player_responses(self, url, smuggled_data, video_id, webpage_url):
+    def _download_initial_webpage(self, webpage_url, webpage_client, video_id):
         webpage = None
-        if 'webpage' not in self._configuration_arg('player_skip'):
+        if webpage_url and 'webpage' not in self._configuration_arg('player_skip'):
             query = {'bpctr': '9999999999', 'has_verified': '1'}
-            pp = self._configuration_arg('player_params', [None], casesense=True)[0]
+            pp = (
+                self._configuration_arg('player_params', [None], casesense=True)[0]
+                or traverse_obj(INNERTUBE_CLIENTS, (webpage_client, 'PLAYER_PARAMS', {str}))
+            )
             if pp:
                 query['pp'] = pp
-            webpage = self._download_webpage_with_retries(webpage_url, video_id, query=query)
+            webpage = self._download_webpage_with_retries(
-
+                webpage_url, video_id, query=query,
-        master_ytcfg = self.extract_ytcfg(video_id, webpage) or self._get_default_ytcfg()
+                headers=traverse_obj(self._get_default_ytcfg(webpage_client), {
-
+                    'User-Agent': ('INNERTUBE_CONTEXT', 'client', 'userAgent', {str}),
-        player_responses, player_url = self._extract_player_responses(
+                }))
-            self._get_requested_clients(url, smuggled_data),
+        return webpage
-            video_id, webpage, master_ytcfg, smuggled_data)
-
-        return webpage, master_ytcfg, player_responses, player_url
 
     def _list_formats(self, video_id, microformats, video_details, player_responses, player_url, duration=None):
         live_broadcast_details = traverse_obj(microformats, (..., 'liveBroadcastDetails'))
@@ -3708,14 +3759,60 @@ def _list_formats(self, video_id, microformats, video_details, player_responses,
 
         return live_broadcast_details, live_status, streaming_data, formats, subtitles
 
+    def _download_initial_data(self, video_id, webpage, webpage_client, webpage_ytcfg):
+        initial_data = None
+        if webpage and 'initial_data' not in self._configuration_arg('webpage_skip'):
+            initial_data = self.extract_yt_initial_data(video_id, webpage, fatal=False)
+            if not traverse_obj(initial_data, 'contents'):
+                self.report_warning('Incomplete data received in embedded initial data; re-fetching using API.')
+                initial_data = None
+        if not initial_data and 'initial_data' not in self._configuration_arg('player_skip'):
+            query = {'videoId': video_id}
+            query.update(self._get_checkok_params())
+            initial_data = self._extract_response(
+                item_id=video_id, ep='next', fatal=False,
+                ytcfg=webpage_ytcfg, query=query, check_get_keys='contents',
+                note='Downloading initial data API JSON', default_client=webpage_client)
+        return initial_data
+
+    def _is_premium_subscriber(self, initial_data):
+        if not self.is_authenticated or not initial_data:
+            return False
+
+        tlr = traverse_obj(
+            initial_data, ('topbar', 'desktopTopbarRenderer', 'logo', 'topbarLogoRenderer'))
+        return (
+            traverse_obj(tlr, ('iconImage', 'iconType')) == 'YOUTUBE_PREMIUM_LOGO'
+            or 'premium' in (self._get_text(tlr, 'tooltipText') or '').lower()
+        )
+
+    def _initial_extract(self, url, smuggled_data, webpage_url, webpage_client, video_id):
+        # This function is also used by live-from-start refresh
+        webpage = self._download_initial_webpage(webpage_url, webpage_client, video_id)
+        webpage_ytcfg = self.extract_ytcfg(video_id, webpage) or self._get_default_ytcfg(webpage_client)
+
+        initial_data = self._download_initial_data(video_id, webpage, webpage_client, webpage_ytcfg)
+
+        is_premium_subscriber = self._is_premium_subscriber(initial_data)
+        if is_premium_subscriber:
+            self.write_debug('Detected YouTube Premium subscription')
+
+        player_responses, player_url = self._extract_player_responses(
+            self._get_requested_clients(url, smuggled_data, is_premium_subscriber),
+            video_id, webpage, webpage_client, webpage_ytcfg, is_premium_subscriber)
+
+        return webpage, webpage_ytcfg, initial_data, is_premium_subscriber, player_responses, player_url
+
     def _real_extract(self, url):
         url, smuggled_data = unsmuggle_url(url, {})
         video_id = self._match_id(url)
 
         base_url = self.http_scheme() + '//www.youtube.com/'
         webpage_url = base_url + 'watch?v=' + video_id
+        webpage_client = 'web'
 
-        webpage, master_ytcfg, player_responses, player_url = self._download_player_responses(url, smuggled_data, video_id, webpage_url)
+        webpage, webpage_ytcfg, initial_data, is_premium_subscriber, player_responses, player_url = self._initial_extract(
+            url, smuggled_data, webpage_url, webpage_client, video_id)
 
         playability_statuses = traverse_obj(
             player_responses, (..., 'playabilityStatus'), expected_type=dict)
@@ -3952,7 +4049,9 @@ def get_lang_code(track):
         def process_language(container, base_url, lang_code, sub_name, client_name, query):
             lang_subs = container.setdefault(lang_code, [])
             for fmt in self._SUBTITLE_FORMATS:
-                query = {**query, 'fmt': fmt}
+                # xosf=1 results in undesirable text position data for vtt, json3 & srv* subtitles
+                # See: https://github.com/yt-dlp/yt-dlp/issues/13654
+                query = {**query, 'fmt': fmt, 'xosf': []}
                 lang_subs.append({
                     'ext': fmt,
                     'url': urljoin('https://www.youtube.com', update_url_query(base_url, query)),
@@ -3988,7 +4087,7 @@ def process_language(container, base_url, lang_code, sub_name, client_name, quer
             pctr = pr['captions']['playerCaptionsTracklistRenderer']
             client_name = pr['streamingData'][STREAMING_DATA_CLIENT_NAME]
             innertube_client_name = pr['streamingData'][STREAMING_DATA_INNERTUBE_CONTEXT]['client']['clientName']
-            required_contexts = self._get_default_ytcfg(client_name)['PO_TOKEN_REQUIRED_CONTEXTS']
+            pot_policy: GvsPoTokenPolicy = self._get_default_ytcfg(client_name)['SUBS_PO_TOKEN_POLICY']
             fetch_subs_po_token_func = pr['streamingData'][STREAMING_DATA_FETCH_SUBS_PO_TOKEN]
 
             pot_params = {}
@@ -4001,11 +4100,11 @@ def process_language(container, base_url, lang_code, sub_name, client_name, quer
                 requires_pot = (
                     # We can detect the experiment for now
                     any(e in traverse_obj(qs, ('exp', ...)) for e in ('xpe', 'xpv'))
-                    or _PoTokenContext.SUBS in required_contexts)
+                    or (pot_policy.required and not (pot_policy.not_required_for_premium and is_premium_subscriber)))
 
                 if not already_fetched_pot:
                     already_fetched_pot = True
-                    if subs_po_token := fetch_subs_po_token_func(required=requires_pot):
+                    if subs_po_token := fetch_subs_po_token_func(required=requires_pot or pot_policy.recommended):
                         pot_params.update({
                             'pot': subs_po_token,
                             'potc': '1',
@@ -4108,21 +4207,6 @@ def process_language(container, base_url, lang_code, sub_name, client_name, quer
                     'release_year': int_or_none(release_year),
                 })
 
-        initial_data = None
-        if webpage:
-            initial_data = self.extract_yt_initial_data(video_id, webpage, fatal=False)
-            if not traverse_obj(initial_data, 'contents'):
-                self.report_warning('Incomplete data received in embedded initial data; re-fetching using API.')
-                initial_data = None
-        if not initial_data and 'initial_data' not in self._configuration_arg('player_skip'):
-            query = {'videoId': video_id}
-            query.update(self._get_checkok_params())
-            initial_data = self._extract_response(
-                item_id=video_id, ep='next', fatal=False,
-                ytcfg=master_ytcfg, query=query, check_get_keys='contents',
-                headers=self.generate_api_headers(ytcfg=master_ytcfg),
-                note='Downloading initial data API JSON')
-
         COMMENTS_SECTION_IDS = ('comment-item-section', 'engagement-panel-comments-section')
         info['comment_count'] = traverse_obj(initial_data, (
             'contents', 'twoColumnWatchNextResults', 'results', 'results', 'contents', ..., 'itemSectionRenderer',
@@ -4321,7 +4405,7 @@ def process_language(container, base_url, lang_code, sub_name, client_name, quer
                     self._has_badge(badges, BadgeType.AVAILABILITY_UNLISTED)
                     or get_first(microformats, 'isUnlisted', expected_type=bool))))
 
-        info['__post_extractor'] = self.extract_comments(master_ytcfg, video_id, contents, webpage)
+        info['__post_extractor'] = self.extract_comments(webpage_ytcfg, video_id, contents, webpage)
 
         self.mark_watched(video_id, player_responses)
 

yt_dlp/jsinterp.py

@@ -222,6 +222,14 @@ def __setitem__(self, key, value):
     def __delitem__(self, key):
         raise NotImplementedError('Deleting is not supported')
 
+    def set_local(self, key, value):
+        self.maps[0][key] = value
+
+    def get_local(self, key):
+        if key in self.maps[0]:
+            return self.maps[0][key]
+        return JS_Undefined
+
 
 class Debugger:
     import sys
@@ -271,6 +279,7 @@ class JSInterpreter:
     def __init__(self, code, objects=None):
         self.code, self._functions = code, {}
         self._objects = {} if objects is None else objects
+        self._undefined_varnames = set()
 
     class Exception(ExtractorError):  # noqa: A001
         def __init__(self, msg, expr=None, *args, **kwargs):
@@ -381,7 +390,7 @@ def _dump(self, obj, namespace):
             return self._named_object(namespace, obj)
 
     @Debugger.wrap_interpreter
-    def interpret_statement(self, stmt, local_vars, allow_recursion=100):
+    def interpret_statement(self, stmt, local_vars, allow_recursion=100, _is_var_declaration=False):
         if allow_recursion < 0:
             raise self.Exception('Recursion limit reached')
         allow_recursion -= 1
@@ -401,6 +410,7 @@ def interpret_statement(self, stmt, local_vars, allow_recursion=100):
             if m.group('throw'):
                 raise JS_Throw(self.interpret_expression(expr, local_vars, allow_recursion))
             should_return = not m.group('var')
+            _is_var_declaration = _is_var_declaration or bool(m.group('var'))
         if not expr:
             return None, should_return
 
@@ -585,7 +595,8 @@ def dict_item(key, val):
         sub_expressions = list(self._separate(expr))
         if len(sub_expressions) > 1:
             for sub_expr in sub_expressions:
-                ret, should_abort = self.interpret_statement(sub_expr, local_vars, allow_recursion)
+                ret, should_abort = self.interpret_statement(
+                    sub_expr, local_vars, allow_recursion, _is_var_declaration=_is_var_declaration)
                 if should_abort:
                     return ret, True
             return ret, False
@@ -599,8 +610,12 @@ def dict_item(key, val):
             left_val = local_vars.get(m.group('out'))
 
             if not m.group('index'):
-                local_vars[m.group('out')] = self._operator(
+                eval_result = self._operator(
                     m.group('op'), left_val, m.group('expr'), expr, local_vars, allow_recursion)
+                if _is_var_declaration:
+                    local_vars.set_local(m.group('out'), eval_result)
+                else:
+                    local_vars[m.group('out')] = eval_result
                 return local_vars[m.group('out')], should_return
             elif left_val in (None, JS_Undefined):
                 raise self.Exception(f'Cannot index undefined variable {m.group("out")}', expr)
@@ -654,7 +669,19 @@ def dict_item(key, val):
             return float('NaN'), should_return
 
         elif m and m.group('return'):
-            return local_vars.get(m.group('name'), JS_Undefined), should_return
+            var = m.group('name')
+            # Declared variables
+            if _is_var_declaration:
+                ret = local_vars.get_local(var)
+                # Register varname in local namespace
+                # Set value as JS_Undefined or its pre-existing value
+                local_vars.set_local(var, ret)
+            else:
+                ret = local_vars.get(var, NO_DEFAULT)
+                if ret is NO_DEFAULT:
+                    ret = JS_Undefined
+                    self._undefined_varnames.add(var)
+            return ret, should_return
 
         with contextlib.suppress(ValueError):
             return json.loads(js_to_json(expr, strict=True)), should_return
@@ -857,7 +884,7 @@ def extract_object(self, objname, *global_stack):
         obj = {}
         obj_m = re.search(
             r'''(?x)
-                (?<!\.)%s\s*=\s*{\s*
+                (?<![a-zA-Z$0-9.])%s\s*=\s*{\s*
                     (?P<fields>(%s\s*:\s*function\s*\(.*?\)\s*{.*?}(?:,\s*)?)*)
                 }\s*;
             ''' % (re.escape(objname), _FUNC_NAME_RE),

yt_dlp/networking/_requests.py

@@ -140,6 +140,12 @@ def __init__(self, res: requests.models.Response):
 
     def read(self, amt: int | None = None):
         try:
+            # Work around issue with `.read(amt)` then `.read()`
+            # See: https://github.com/urllib3/urllib3/issues/3636
+            if amt is None:
+                # Python 3.9 preallocates the whole read buffer, read in chunks
+                read_chunk = functools.partial(self.fp.read, 1 << 20, decode_content=True)
+                return b''.join(iter(read_chunk, b''))
             # Interact with urllib3 response directly.
             return self.fp.read(amt, decode_content=True)
 

yt_dlp/options.py

@@ -529,14 +529,14 @@ def _preset_alias_callback(option, opt_str, value, parser):
                 'no-attach-info-json', 'embed-thumbnail-atomicparsley', 'no-external-downloader-progress',
                 'embed-metadata', 'seperate-video-versions', 'no-clean-infojson', 'no-keep-subs', 'no-certifi',
                 'no-youtube-channel-redirect', 'no-youtube-unavailable-videos', 'no-youtube-prefer-utc-upload-date',
-                'prefer-legacy-http-handler', 'manifest-filesize-approx', 'allow-unsafe-ext', 'prefer-vp9-sort',
+                'prefer-legacy-http-handler', 'manifest-filesize-approx', 'allow-unsafe-ext', 'prefer-vp9-sort', 'mtime-by-default',
             }, 'aliases': {
                 'youtube-dl': ['all', '-multistreams', '-playlist-match-filter', '-manifest-filesize-approx', '-allow-unsafe-ext', '-prefer-vp9-sort'],
                 'youtube-dlc': ['all', '-no-youtube-channel-redirect', '-no-live-chat', '-playlist-match-filter', '-manifest-filesize-approx', '-allow-unsafe-ext', '-prefer-vp9-sort'],
                 '2021': ['2022', 'no-certifi', 'filename-sanitization'],
                 '2022': ['2023', 'no-external-downloader-progress', 'playlist-match-filter', 'prefer-legacy-http-handler', 'manifest-filesize-approx'],
                 '2023': ['2024', 'prefer-vp9-sort'],
-                '2024': [],
+                '2024': ['mtime-by-default'],
             },
         }, help=(
             'Options that can help keep compatibility with youtube-dl or youtube-dlc '
@@ -1466,12 +1466,12 @@ def _preset_alias_callback(option, opt_str, value, parser):
         help='Do not use .part files - write directly into output file')
     filesystem.add_option(
         '--mtime',
-        action='store_true', dest='updatetime', default=True,
+        action='store_true', dest='updatetime', default=None,
-        help='Use the Last-modified header to set the file modification time (default)')
+        help='Use the Last-modified header to set the file modification time')
     filesystem.add_option(
         '--no-mtime',
         action='store_false', dest='updatetime',
-        help='Do not use the Last-modified header to set the file modification time')
+        help='Do not use the Last-modified header to set the file modification time (default)')
     filesystem.add_option(
         '--write-description',
         action='store_true', dest='writedescription', default=False,

yt_dlp/utils/_utils.py

@@ -2961,6 +2961,7 @@ def mimetype2ext(mt, default=NO_DEFAULT):
         'audio/x-matroska': 'mka',
         'audio/x-mpegurl': 'm3u',
         'aacp': 'aac',
+        'flac': 'flac',
         'midi': 'mid',
         'ogg': 'ogg',
         'wav': 'wav',
@@ -3105,21 +3106,15 @@ def get_compatible_ext(*, vcodecs, acodecs, vexts, aexts, preferences=None):
 def urlhandle_detect_ext(url_handle, default=NO_DEFAULT):
     getheader = url_handle.headers.get
 
-    cd = getheader('Content-Disposition')
+    if cd := getheader('Content-Disposition'):
-    if cd:
+        if m := re.match(r'attachment;\s*filename="(?P<filename>[^"]+)"', cd):
-        m = re.match(r'attachment;\s*filename="(?P<filename>[^"]+)"', cd)
+            if ext := determine_ext(m.group('filename'), default_ext=None):
-        if m:
+                return ext
-            e = determine_ext(m.group('filename'), default_ext=None)
-            if e:
-                return e
 
-    meta_ext = getheader('x-amz-meta-name')
+    return (
-    if meta_ext:
+        determine_ext(getheader('x-amz-meta-name'), default_ext=None)
-        e = meta_ext.rpartition('.')[2]
+        or getheader('x-amz-meta-file-type')
-        if e:
+        or mimetype2ext(getheader('Content-Type'), default=default))
-            return e
-
-    return mimetype2ext(getheader('Content-Type'), default=default)
 
 
 def encode_data_uri(data, mime_type):

yt_dlp/version.py

@@ -1,8 +1,8 @@
 # Autogenerated by devscripts/update-version.py
 
-__version__ = '2025.06.25'
+__version__ = '2025.06.30'
 
-RELEASE_GIT_HEAD = '1838a1ce5d4ade80770ba9162eaffc9a1607dc70'
+RELEASE_GIT_HEAD = 'b0187844988e557c7e1e6bb1aabd4c1176768d86'
 
 VARIANT = None
 
@@ -12,4 +12,4 @@
 
 ORIGIN = 'yt-dlp/yt-dlp'
 
-_pkg_version = '2025.06.25'
+_pkg_version = '2025.06.30'