diff --git a/.github/ISSUE_TEMPLATE/1_broken_site.md b/.github/ISSUE_TEMPLATE/1_broken_site.md
index e5405c235..febbd2344 100644
--- a/.github/ISSUE_TEMPLATE/1_broken_site.md
+++ b/.github/ISSUE_TEMPLATE/1_broken_site.md
@@ -18,7 +18,7 @@ title: ''
 
 <!--
 Carefully read and work through this check list in order to prevent the most common mistakes and misuse of youtube-dl:
-- First of, make sure you are using the latest version of youtube-dl. Run `youtube-dl --version` and ensure your version is 2021.12.17. If it's not, see https://yt-dl.org/update on how to update. Issues with outdated version will be REJECTED.
+- First of, make sure you are using the latest version of youtube-dl. Run `youtube-dl --version` and ensure your version is 2021.04.07. If it's not, see https://yt-dl.org/update on how to update. Issues with outdated version will be REJECTED.
 - Make sure that all provided video/audio/playlist URLs (if any) are alive and playable in a browser.
 - Make sure that all URLs and arguments with special characters are properly quoted or escaped as explained in http://yt-dl.org/escape.
 - Search the bugtracker for similar issues: http://yt-dl.org/search-issues. DO NOT post duplicates.
@@ -26,7 +26,7 @@ Carefully read and work through this check list in order to prevent the most com
 -->
 
 - [ ] I'm reporting a broken site support
-- [ ] I've verified that I'm running youtube-dl version **2021.12.17**
+- [ ] I've verified that I'm running youtube-dl version **2021.04.07**
 - [ ] I've checked that all provided URLs are alive and playable in a browser
 - [ ] I've checked that all URLs and arguments with special characters are properly quoted or escaped
 - [ ] I've searched the bugtracker for similar issues including closed ones
@@ -41,7 +41,7 @@ Add the `-v` flag to your command line you run youtube-dl with (`youtube-dl -v <
  [debug] User config: []
  [debug] Command-line args: [u'-v', u'http://www.youtube.com/watch?v=BaW_jenozKcj']
  [debug] Encodings: locale cp1251, fs mbcs, out cp866, pref cp1251
- [debug] youtube-dl version 2021.12.17
+ [debug] youtube-dl version 2021.04.07
  [debug] Python version 2.7.11 - Windows-2003Server-5.2.3790-SP2
  [debug] exe versions: ffmpeg N-75573-g1d0487f, ffprobe N-75573-g1d0487f, rtmpdump 2.4
  [debug] Proxy map: {}
diff --git a/.github/ISSUE_TEMPLATE/2_site_support_request.md b/.github/ISSUE_TEMPLATE/2_site_support_request.md
index 33b01ce7f..d7296d0a9 100644
--- a/.github/ISSUE_TEMPLATE/2_site_support_request.md
+++ b/.github/ISSUE_TEMPLATE/2_site_support_request.md
@@ -19,7 +19,7 @@ labels: 'site-support-request'
 
 <!--
 Carefully read and work through this check list in order to prevent the most common mistakes and misuse of youtube-dl:
-- First of, make sure you are using the latest version of youtube-dl. Run `youtube-dl --version` and ensure your version is 2021.12.17. If it's not, see https://yt-dl.org/update on how to update. Issues with outdated version will be REJECTED.
+- First of, make sure you are using the latest version of youtube-dl. Run `youtube-dl --version` and ensure your version is 2021.04.07. If it's not, see https://yt-dl.org/update on how to update. Issues with outdated version will be REJECTED.
 - Make sure that all provided video/audio/playlist URLs (if any) are alive and playable in a browser.
 - Make sure that site you are requesting is not dedicated to copyright infringement, see https://yt-dl.org/copyright-infringement. youtube-dl does not support such sites. In order for site support request to be accepted all provided example URLs should not violate any copyrights.
 - Search the bugtracker for similar site support requests: http://yt-dl.org/search-issues. DO NOT post duplicates.
@@ -27,7 +27,7 @@ Carefully read and work through this check list in order to prevent the most com
 -->
 
 - [ ] I'm reporting a new site support request
-- [ ] I've verified that I'm running youtube-dl version **2021.12.17**
+- [ ] I've verified that I'm running youtube-dl version **2021.04.07**
 - [ ] I've checked that all provided URLs are alive and playable in a browser
 - [ ] I've checked that none of provided URLs violate any copyrights
 - [ ] I've searched the bugtracker for similar site support requests including closed ones
diff --git a/.github/ISSUE_TEMPLATE/3_site_feature_request.md b/.github/ISSUE_TEMPLATE/3_site_feature_request.md
index 285610cc7..92e616a1a 100644
--- a/.github/ISSUE_TEMPLATE/3_site_feature_request.md
+++ b/.github/ISSUE_TEMPLATE/3_site_feature_request.md
@@ -18,13 +18,13 @@ title: ''
 
 <!--
 Carefully read and work through this check list in order to prevent the most common mistakes and misuse of youtube-dl:
-- First of, make sure you are using the latest version of youtube-dl. Run `youtube-dl --version` and ensure your version is 2021.12.17. If it's not, see https://yt-dl.org/update on how to update. Issues with outdated version will be REJECTED.
+- First of, make sure you are using the latest version of youtube-dl. Run `youtube-dl --version` and ensure your version is 2021.04.07. If it's not, see https://yt-dl.org/update on how to update. Issues with outdated version will be REJECTED.
 - Search the bugtracker for similar site feature requests: http://yt-dl.org/search-issues. DO NOT post duplicates.
 - Finally, put x into all relevant boxes (like this [x])
 -->
 
 - [ ] I'm reporting a site feature request
-- [ ] I've verified that I'm running youtube-dl version **2021.12.17**
+- [ ] I've verified that I'm running youtube-dl version **2021.04.07**
 - [ ] I've searched the bugtracker for similar site feature requests including closed ones
 
 
diff --git a/.github/ISSUE_TEMPLATE/4_bug_report.md b/.github/ISSUE_TEMPLATE/4_bug_report.md
index af73525fb..b55739f6c 100644
--- a/.github/ISSUE_TEMPLATE/4_bug_report.md
+++ b/.github/ISSUE_TEMPLATE/4_bug_report.md
@@ -18,7 +18,7 @@ title: ''
 
 <!--
 Carefully read and work through this check list in order to prevent the most common mistakes and misuse of youtube-dl:
-- First of, make sure you are using the latest version of youtube-dl. Run `youtube-dl --version` and ensure your version is 2021.12.17. If it's not, see https://yt-dl.org/update on how to update. Issues with outdated version will be REJECTED.
+- First of, make sure you are using the latest version of youtube-dl. Run `youtube-dl --version` and ensure your version is 2021.04.07. If it's not, see https://yt-dl.org/update on how to update. Issues with outdated version will be REJECTED.
 - Make sure that all provided video/audio/playlist URLs (if any) are alive and playable in a browser.
 - Make sure that all URLs and arguments with special characters are properly quoted or escaped as explained in http://yt-dl.org/escape.
 - Search the bugtracker for similar issues: http://yt-dl.org/search-issues. DO NOT post duplicates.
@@ -27,7 +27,7 @@ Carefully read and work through this check list in order to prevent the most com
 -->
 
 - [ ] I'm reporting a broken site support issue
-- [ ] I've verified that I'm running youtube-dl version **2021.12.17**
+- [ ] I've verified that I'm running youtube-dl version **2021.04.07**
 - [ ] I've checked that all provided URLs are alive and playable in a browser
 - [ ] I've checked that all URLs and arguments with special characters are properly quoted or escaped
 - [ ] I've searched the bugtracker for similar bug reports including closed ones
@@ -43,7 +43,7 @@ Add the `-v` flag to your command line you run youtube-dl with (`youtube-dl -v <
  [debug] User config: []
  [debug] Command-line args: [u'-v', u'http://www.youtube.com/watch?v=BaW_jenozKcj']
  [debug] Encodings: locale cp1251, fs mbcs, out cp866, pref cp1251
- [debug] youtube-dl version 2021.12.17
+ [debug] youtube-dl version 2021.04.07
  [debug] Python version 2.7.11 - Windows-2003Server-5.2.3790-SP2
  [debug] exe versions: ffmpeg N-75573-g1d0487f, ffprobe N-75573-g1d0487f, rtmpdump 2.4
  [debug] Proxy map: {}
diff --git a/.github/ISSUE_TEMPLATE/5_feature_request.md b/.github/ISSUE_TEMPLATE/5_feature_request.md
index 42c878b83..dbdb8356a 100644
--- a/.github/ISSUE_TEMPLATE/5_feature_request.md
+++ b/.github/ISSUE_TEMPLATE/5_feature_request.md
@@ -19,13 +19,13 @@ labels: 'request'
 
 <!--
 Carefully read and work through this check list in order to prevent the most common mistakes and misuse of youtube-dl:
-- First of, make sure you are using the latest version of youtube-dl. Run `youtube-dl --version` and ensure your version is 2021.12.17. If it's not, see https://yt-dl.org/update on how to update. Issues with outdated version will be REJECTED.
+- First of, make sure you are using the latest version of youtube-dl. Run `youtube-dl --version` and ensure your version is 2021.04.07. If it's not, see https://yt-dl.org/update on how to update. Issues with outdated version will be REJECTED.
 - Search the bugtracker for similar feature requests: http://yt-dl.org/search-issues. DO NOT post duplicates.
 - Finally, put x into all relevant boxes (like this [x])
 -->
 
 - [ ] I'm reporting a feature request
-- [ ] I've verified that I'm running youtube-dl version **2021.12.17**
+- [ ] I've verified that I'm running youtube-dl version **2021.04.07**
 - [ ] I've searched the bugtracker for similar feature requests including closed ones
 
 
diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml
deleted file mode 100644
index 3ba13e0ce..000000000
--- a/.github/ISSUE_TEMPLATE/config.yml
+++ /dev/null
@@ -1 +0,0 @@
-blank_issues_enabled: false
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 8234e0ccb..a9dc47a71 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -1,482 +1,74 @@
 name: CI
-
-env:
-  all-cpython-versions: 2.6, 2.7, 3.2, 3.3, 3.4, 3.5, 3.6, 3.7, 3.8, 3.9, 3.10, 3.11, 3.12
-  main-cpython-versions: 2.7, 3.2, 3.5, 3.9, 3.11
-  pypy-versions: pypy-2.7, pypy-3.6, pypy-3.7
-  cpython-versions: main
-  test-set: core
-  # Python beta version to be built using pyenv before setup-python support
-  # Must also be included in all-cpython-versions 
-  next: 3.13
-
-on:
-  push:
-    # push inputs aren't known to GitHub
-    inputs:
-      cpython-versions:
-        type: string
-        default: all
-      test-set:
-        type: string
-        default: core
-  pull_request:
-    # pull_request inputs aren't known to GitHub
-    inputs:
-      cpython-versions:
-        type: string
-        default: main
-      test-set:
-        type: string
-        default: both
-  workflow_dispatch:
-    inputs:
-      cpython-versions:
-        type: choice
-        description: CPython versions (main = 2.7, 3.2, 3.5, 3.9, 3.11)
-        options:
-          - all
-          - main
-        required: true
-        default: main
-      test-set:
-        type: choice
-        description: core, download
-        options:
-          - both
-          - core
-          - download
-        required: true
-        default: both
-
-permissions:
-  contents: read
-
+on: [push, pull_request]
 jobs:
-  select:
-    name: Select tests from inputs
-    runs-on: ubuntu-latest
-    outputs:
-      cpython-versions: ${{ steps.run.outputs.cpython-versions }}
-      test-set: ${{ steps.run.outputs.test-set }}
-      own-pip-versions: ${{ steps.run.outputs.own-pip-versions }}
-    steps:
-    # push and pull_request inputs aren't known to GitHub (pt3)
-    - name: Set push defaults
-      if: ${{ github.event_name == 'push' }}
-      env:
-        cpython-versions: all
-        test-set: core
-      run: |
-        echo "cpython-versions=${{env.cpython-versions}}" >> "$GITHUB_ENV"
-        echo "test_set=${{env.test_set}}" >> "$GITHUB_ENV"
-    - name: Get pull_request inputs
-      if: ${{ github.event_name == 'pull_request' }}
-      env:
-        cpython-versions: main
-        test-set: both
-      run: |
-        echo "cpython-versions=${{env.cpython-versions}}" >> "$GITHUB_ENV"
-        echo "test_set=${{env.test_set}}" >> "$GITHUB_ENV"
-    - name: Make version array
-      id: run
-      run: |
-        # Make a JSON Array from comma/space-separated string (no extra escaping)
-        json_list() { \
-          ret=""; IFS="${IFS},"; set -- $*; \
-          for a in "$@"; do \
-            ret=$(printf '%s"%s"' "${ret}${ret:+, }" "$a"); \
-          done; \
-          printf '[%s]' "$ret"; }
-        tests="${{ inputs.test-set || env.test-set }}"
-        [ $tests = both ] && tests="core download"
-        printf 'test-set=%s\n' "$(json_list $tests)" >> "$GITHUB_OUTPUT"
-        versions="${{ inputs.cpython-versions || env.cpython-versions }}"
-        if [ "$versions" = all ]; then \
-          versions="${{ env.all-cpython-versions }}"; else \
-          versions="${{ env.main-cpython-versions }}"; \
-        fi
-        printf 'cpython-versions=%s\n' \
-          "$(json_list ${versions}${versions:+, }${{ env.pypy-versions }})" >> "$GITHUB_OUTPUT"
-        # versions with a special get-pip.py in a per-version subdirectory
-        printf 'own-pip-versions=%s\n' \
-          "$(json_list 2.6, 2.7, 3.2, 3.3, 3.4, 3.5, 3.6)" >> "$GITHUB_OUTPUT"
-
   tests:
-    name: Run tests
-    needs: select
-    permissions:
-      contents: read
-      packages: write
+    name: Tests
     runs-on: ${{ matrix.os }}
-    env:
-      PIP: python -m pip
-      PIP_DISABLE_PIP_VERSION_CHECK: true
-      PIP_NO_PYTHON_VERSION_WARNING: true
     strategy:
       fail-fast: true
       matrix:
-        os: [ubuntu-22.04]
-        python-version: ${{ fromJSON(needs.select.outputs.cpython-versions) }}
+        os: [ubuntu-18.04]
+        # TODO: python 2.6
+        python-version: [2.7, 3.3, 3.4, 3.5, 3.6, 3.7, 3.8, 3.9, pypy-2.7, pypy-3.6, pypy-3.7]
         python-impl: [cpython]
-        ytdl-test-set: ${{ fromJSON(needs.select.outputs.test-set) }}
+        ytdl-test-set: [core, download]
         run-tests-ext: [sh]
         include:
-        - os: windows-2019
-          python-version: 3.4
+        # python 3.2 is only available on windows via setup-python
+        - os: windows-latest
+          python-version: 3.2
           python-impl: cpython
-          ytdl-test-set: ${{ contains(needs.select.outputs.test-set, 'core') && 'core' || 'nocore' }}
+          ytdl-test-set: core
           run-tests-ext: bat
-        - os: windows-2019
-          python-version: 3.4
+        - os: windows-latest
+          python-version: 3.2
           python-impl: cpython
-          ytdl-test-set: ${{ contains(needs.select.outputs.test-set, 'download') && 'download'  || 'nodownload' }}
+          ytdl-test-set: download
           run-tests-ext: bat
         # jython
-        - os: ubuntu-22.04
-          python-version: 2.7
+        - os: ubuntu-18.04
           python-impl: jython
-          ytdl-test-set: ${{ contains(needs.select.outputs.test-set, 'core') && 'core' || 'nocore' }}
+          ytdl-test-set: core
           run-tests-ext: sh
-        - os: ubuntu-22.04
-          python-version: 2.7
+        - os: ubuntu-18.04
           python-impl: jython
-          ytdl-test-set: ${{ contains(needs.select.outputs.test-set, 'download') && 'download'  || 'nodownload' }}
+          ytdl-test-set: download
           run-tests-ext: sh
     steps:
-    - name: Prepare Linux
-      if: ${{ startswith(matrix.os, 'ubuntu') }}
-      shell: bash
-      run: |
-        # apt in runner, if needed, may not be up-to-date
-        sudo apt-get update
-    - name: Checkout
-      uses: actions/checkout@v3
-    #-------- Python 3 -----
-    - name: Set up supported Python ${{ matrix.python-version }}
-      id: setup-python
-      if: ${{ matrix.python-impl == 'cpython' && matrix.python-version != '2.6' && matrix.python-version != '2.7' && matrix.python-version != env.next }}
-      # wrap broken actions/setup-python@v4
-      # NB may run apt-get install in Linux
-      uses: ytdl-org/setup-python@v1
-      env:
-        # Temporary (?) workaround for Python 3.5 failures - May 2024
-        PIP_TRUSTED_HOST: "pypi.python.org pypi.org files.pythonhosted.org"
+    - uses: actions/checkout@v2
+    - name: Set up Python ${{ matrix.python-version }}
+      uses: actions/setup-python@v2
+      if: ${{ matrix.python-impl == 'cpython' }}
       with:
         python-version: ${{ matrix.python-version }}
-        cache-build: true
-        allow-build: info
-    - name: Locate supported Python ${{ matrix.python-version }}
-      if: ${{ env.pythonLocation }}
-      shell: bash
-      run: |
-        echo "PYTHONHOME=${pythonLocation}" >> "$GITHUB_ENV"
-        export expected="${{ steps.setup-python.outputs.python-path }}"
-        dirname() { printf '%s\n' \
-            'import os, sys' \
-            'print(os.path.dirname(sys.argv[1]))' \
-            | ${expected} - "$1"; }
-        expd="$(dirname "$expected")"
-        export python="$(command -v python)"
-        [ "$expd" = "$(dirname "$python")" ] || echo "PATH=$expd:${PATH}" >> "$GITHUB_ENV"
-        [ -x "$python" ] || printf '%s\n' \
-            'import os' \
-            'exp = os.environ["expected"]' \
-            'python = os.environ["python"]' \
-            'exps = os.path.split(exp)' \
-            'if python and (os.path.dirname(python) == exp[0]):' \
-            '    exit(0)' \
-            'exps[1] = "python" + os.path.splitext(exps[1])[1]' \
-            'python = os.path.join(*exps)' \
-            'try:' \
-            '    os.symlink(exp, python)' \
-            'except AttributeError:' \
-            '    os.rename(exp, python)' \
-            | ${expected} -
-        printf '%s\n' \
-            'import sys' \
-            'print(sys.path)' \
-            | ${expected} -
-    #-------- Python next (was 3.12) -
-    - name: Set up CPython 3.next environment
-      if: ${{ matrix.python-impl == 'cpython' && matrix.python-version == env.next }}
-      shell: bash
-      run: |
-        PYENV_ROOT=$HOME/.local/share/pyenv
-        echo "PYENV_ROOT=${PYENV_ROOT}" >> "$GITHUB_ENV"
-    - name: Cache Python 3.next 
-      id: cachenext
-      if: ${{ matrix.python-impl == 'cpython' && matrix.python-version == env.next }}
-      uses: actions/cache@v3
-      with:
-        key: python-${{ env.next }}
-        path: |
-          ${{ env.PYENV_ROOT }}
-    - name: Build and set up Python 3.next
-      if: ${{ matrix.python-impl == 'cpython' && matrix.python-version == env.next && ! steps.cachenext.outputs.cache-hit }}
-      # dl and build locally
-      shell: bash
-      run: |
-        # Install build environment
-        sudo apt-get install -y build-essential llvm libssl-dev tk-dev  \
-                      libncursesw5-dev libreadline-dev libsqlite3-dev   \
-                      libffi-dev xz-utils zlib1g-dev libbz2-dev liblzma-dev
-        # Download PyEnv from its GitHub repository.
-        export PYENV_ROOT=${{ env.PYENV_ROOT }}
-        export PATH=$PYENV_ROOT/bin:$PATH
-        git clone "https://github.com/pyenv/pyenv.git" "$PYENV_ROOT"
-        pyenv install ${{ env.next }}
-    - name: Locate Python 3.next
-      if: ${{ matrix.python-impl == 'cpython' && matrix.python-version == env.next }}
-      shell: bash
-      run: |
-        PYTHONHOME="$(echo "${{ env.PYENV_ROOT }}/versions/${{ env.next }}."*)"
-        test -n "$PYTHONHOME"
-        echo "PYTHONHOME=$PYTHONHOME" >> "$GITHUB_ENV"
-        echo "PATH=${PYTHONHOME}/bin:$PATH" >> "$GITHUB_ENV"
-    #-------- Python 2.7 --
-    - name: Set up Python 2.7
-      if: ${{ matrix.python-impl == 'cpython' && matrix.python-version == '2.7' }}
-      # install 2.7
-      shell: bash
-      run: |
-        # Ubuntu 22.04 no longer has python-is-python2: fetch it
-        curl -L "http://launchpadlibrarian.net/474693132/python-is-python2_2.7.17-4_all.deb" -o python-is-python2.deb
-        sudo apt-get install -y python2
-        sudo dpkg --force-breaks -i python-is-python2.deb
-        echo "PYTHONHOME=/usr" >> "$GITHUB_ENV"
-    #-------- Python 2.6 --
-    - name: Set up Python 2.6 environment
-      if: ${{ matrix.python-impl == 'cpython' && matrix.python-version == '2.6' }}
-      shell: bash
-      run: |
-        openssl_name=openssl-1.0.2u
-        echo "openssl_name=${openssl_name}" >> "$GITHUB_ENV"
-        openssl_dir=$HOME/.local/opt/$openssl_name
-        echo "openssl_dir=${openssl_dir}" >> "$GITHUB_ENV"
-        PYENV_ROOT=$HOME/.local/share/pyenv
-        echo "PYENV_ROOT=${PYENV_ROOT}" >> "$GITHUB_ENV"
-        sudo apt-get install -y openssl ca-certificates
-    - name: Cache Python 2.6
-      id: cache26
-      if: ${{ matrix.python-version == '2.6' }}
-      uses: actions/cache@v3
-      with:
-        key: python-2.6.9
-        path: |
-          ${{ env.openssl_dir }}
-          ${{ env.PYENV_ROOT }}
-    - name: Build and set up Python 2.6
-      if: ${{ matrix.python-impl == 'cpython' && matrix.python-version == '2.6' && ! steps.cache26.outputs.cache-hit }}
-      # dl and build locally
-      shell: bash
-      run: |
-        # Install build environment
-        sudo apt-get install -y build-essential llvm libssl-dev tk-dev  \
-                      libncursesw5-dev libreadline-dev libsqlite3-dev   \
-                      libffi-dev xz-utils zlib1g-dev libbz2-dev liblzma-dev
-        # Download and install OpenSSL 1.0.2, back in time
-        openssl_name=${{ env.openssl_name }}
-        openssl_targz=${openssl_name}.tar.gz
-        openssl_dir=${{ env.openssl_dir }}
-        openssl_inc=$openssl_dir/include
-        openssl_lib=$openssl_dir/lib
-        openssl_ssl=$openssl_dir/ssl
-        curl -L "https://www.openssl.org/source/$openssl_targz" -o $openssl_targz
-        tar -xf $openssl_targz
-        ( cd $openssl_name; \
-          ./config --prefix=$openssl_dir --openssldir=${openssl_dir}/ssl \
-            --libdir=lib -Wl,-rpath=${openssl_dir}/lib shared zlib-dynamic && \
-          make && \
-          make install )
-        rm -rf $openssl_name
-        rmdir $openssl_ssl/certs && ln -s /etc/ssl/certs $openssl_ssl/certs
-        # Download PyEnv from its GitHub repository.
-        export PYENV_ROOT=${{ env.PYENV_ROOT }}
-        export PATH=$PYENV_ROOT/bin:$PATH
-        git clone "https://github.com/pyenv/pyenv.git" "$PYENV_ROOT"
-        # Prevent pyenv build trying (and failing) to update pip
-        export GET_PIP=get-pip-2.6.py
-        echo 'import sys; sys.exit(0)' > ${GET_PIP}
-        GET_PIP=$(realpath $GET_PIP)
-        # Build and install Python
-        export CFLAGS="-I$openssl_inc"
-        export LDFLAGS="-L$openssl_lib"
-        export LD_LIBRARY_PATH="$openssl_lib"
-        pyenv install 2.6.9
-    - name: Locate Python 2.6
-      if: ${{ matrix.python-impl == 'cpython' && matrix.python-version == '2.6' }}
-      shell: bash
-      run: |
-        PYTHONHOME="${{ env.PYENV_ROOT }}/versions/2.6.9"
-        echo "PYTHONHOME=$PYTHONHOME" >> "$GITHUB_ENV"
-        echo "PATH=${PYTHONHOME}/bin:$PATH" >> "$GITHUB_ENV"
-        echo "LD_LIBRARY_PATH=${{ env.openssl_dir }}/lib${LD_LIBRARY_PATH:+:}${LD_LIBRARY_PATH}" >> "$GITHUB_ENV"
-    #-------- Jython ------
     - name: Set up Java 8
       if: ${{ matrix.python-impl == 'jython' }}
-      uses: actions/setup-java@v3
+      uses: actions/setup-java@v1
       with:
         java-version: 8
-        distribution: 'zulu'
-    - name: Setup Jython environment
-      if: ${{ matrix.python-impl == 'jython' }}
-      shell: bash
-      run: |
-        echo "JYTHON_ROOT=${HOME}/jython" >> "$GITHUB_ENV"
-        echo "PIP=pip" >> "$GITHUB_ENV"
-    - name: Cache Jython
-      id: cachejy
-      if: ${{ matrix.python-impl == 'jython' && matrix.python-version == '2.7' }}
-      uses: actions/cache@v3
-      with:
-        # 2.7.3 now available, may solve SNI issue
-        key: jython-2.7.1
-        path: |
-          ${{ env.JYTHON_ROOT }}
     - name: Install Jython
-      if: ${{ matrix.python-impl == 'jython' && matrix.python-version == '2.7' && ! steps.cachejy.outputs.cache-hit }}
-      shell: bash
+      if: ${{ matrix.python-impl == 'jython' }}
       run: |
-        JYTHON_ROOT="${{ env.JYTHON_ROOT }}"
-        curl -L "https://repo1.maven.org/maven2/org/python/jython-installer/2.7.1/jython-installer-2.7.1.jar" -o jython-installer.jar
-        java -jar jython-installer.jar -s -d "${JYTHON_ROOT}"
-        echo "${JYTHON_ROOT}/bin" >> "$GITHUB_PATH"
-    - name: Set up cached Jython
-      if: ${{ steps.cachejy.outputs.cache-hit }}
-      shell: bash
-      run: |
-        JYTHON_ROOT="${{ env.JYTHON_ROOT }}"
-        echo "${JYTHON_ROOT}/bin" >> $GITHUB_PATH
-    - name: Install supporting Python 2.7 if possible
-      if: ${{ steps.cachejy.outputs.cache-hit }}
-      shell: bash
-      run: |
-        sudo apt-get install -y python2.7 || true
-    #-------- pip ---------
-    - name: Set up supported Python ${{ matrix.python-version }} pip
-      if: ${{ (matrix.python-version != '3.2' && steps.setup-python.outputs.python-path) || matrix.python-version == '2.7' }}
-      # This step may run in either Linux or Windows
-      shell: bash
-      run: |
-        echo "$PATH"
-        echo "$PYTHONHOME"
-        # curl is available on both Windows and Linux, -L follows redirects, -O gets name
-        python -m ensurepip || python -m pip --version || { \
-          get_pip="${{ contains(needs.select.outputs.own-pip-versions, matrix.python-version) && format('{0}/', matrix.python-version) || '' }}"; \
-          curl -L -O "https://bootstrap.pypa.io/pip/${get_pip}get-pip.py"; \
-          python get-pip.py; }
-    - name: Set up Python 2.6 pip
-      if: ${{ matrix.python-version == '2.6' }}
-      shell: bash
-      run: |
-        python -m pip --version || { \
-          curl -L -O "https://bootstrap.pypa.io/pip/2.6/get-pip.py"; \
-          curl -L -O "https://files.pythonhosted.org/packages/ac/95/a05b56bb975efa78d3557efa36acaf9cf5d2fd0ee0062060493687432e03/pip-9.0.3-py2.py3-none-any.whl"; \
-          python get-pip.py --no-setuptools --no-wheel pip-9.0.3-py2.py3-none-any.whl; }
-        # work-around to invoke pip module on 2.6: https://bugs.python.org/issue2751
-        echo "PIP=python -m pip.__main__" >> "$GITHUB_ENV"
-    - name: Set up other Python ${{ matrix.python-version }} pip
-      if: ${{ matrix.python-version == '3.2' && steps.setup-python.outputs.python-path }}
-      shell: bash
-      run: |
-        python -m pip --version || { \
-          curl -L -O "https://bootstrap.pypa.io/pip/3.2/get-pip.py"; \
-          curl -L -O "https://files.pythonhosted.org/packages/b2/d0/cd115fe345dd6f07ec1c780020a7dfe74966fceeb171e0f20d1d4905b0b7/pip-7.1.2-py2.py3-none-any.whl"; \
-          python get-pip.py --no-setuptools --no-wheel pip-7.1.2-py2.py3-none-any.whl; }
-    #-------- unittest ----
-    - name: Upgrade Unittest for Python 2.6
-      if: ${{ matrix.python-version == '2.6' }}
-      shell: bash
-      run: |
-        # Work around deprecation of support for non-SNI clients at PyPI CDN (see https://status.python.org/incidents/hzmjhqsdjqgb)
-        $PIP -qq show unittest2 || { \
-          for u in "65/26/32b8464df2a97e6dd1b656ed26b2c194606c16fe163c695a992b36c11cdf/six-1.13.0-py2.py3-none-any.whl" \
-              "f2/94/3af39d34be01a24a6e65433d19e107099374224905f1e0cc6bbe1fd22a2f/argparse-1.4.0-py2.py3-none-any.whl" \
-              "c7/a3/c5da2a44c85bfbb6eebcfc1dde24933f8704441b98fdde6528f4831757a6/linecache2-1.0.0-py2.py3-none-any.whl" \
-              "17/0a/6ac05a3723017a967193456a2efa0aa9ac4b51456891af1e2353bb9de21e/traceback2-1.4.0-py2.py3-none-any.whl" \
-              "72/20/7f0f433060a962200b7272b8c12ba90ef5b903e218174301d0abfd523813/unittest2-1.1.0-py2.py3-none-any.whl"; do \
-            curl -L -O "https://files.pythonhosted.org/packages/${u}"; \
-            $PIP install ${u##*/}; \
-          done; }
-        # make tests use unittest2
-        for test in ./test/test_*.py ./test/helper.py; do
-          sed -r -i -e '/^import unittest$/s/test/test2 as unittest/' "$test"
-        done
-    #-------- nose --------
-    - name: Install nose for Python ${{ matrix.python-version }}
-      if: ${{ (matrix.python-version != '3.2' && steps.setup-python.outputs.python-path) || (matrix.python-impl == 'cpython' && (matrix.python-version == '2.7' || matrix.python-version == env.next)) }}
-      shell: bash
-      run: |
-        echo "$PATH"
-        echo "$PYTHONHOME"
-        # Use PyNose for recent Pythons instead of Nose
-        py3ver="${{ matrix.python-version }}"
-        py3ver=${py3ver#3.}
-        [ "$py3ver" != "${{ matrix.python-version }}" ] && py3ver=${py3ver%.*} || py3ver=0
-        [ "$py3ver" -ge 9 ] && nose=pynose || nose=nose
-        $PIP -qq show $nose || $PIP install $nose
-    - name: Install nose for other Python 2
-      if: ${{ matrix.python-impl == 'jython' || (matrix.python-impl == 'cpython' && matrix.python-version == '2.6') }}
-      shell: bash
-      run: |
-        # Work around deprecation of support for non-SNI clients at PyPI CDN (see https://status.python.org/incidents/hzmjhqsdjqgb)
-        $PIP -qq show nose || { \
-          curl -L -O "https://files.pythonhosted.org/packages/99/4f/13fb671119e65c4dce97c60e67d3fd9e6f7f809f2b307e2611f4701205cb/nose-1.3.7-py2-none-any.whl"; \
-          $PIP install nose-1.3.7-py2-none-any.whl; }
-    - name: Install nose for other Python 3
-      if: ${{ matrix.python-version == '3.2' && steps.setup-python.outputs.python-path }}
-      shell: bash
-      run: |
-        $PIP -qq show nose || { \
-          curl -L -O "https://files.pythonhosted.org/packages/15/d8/dd071918c040f50fa1cf80da16423af51ff8ce4a0f2399b7bf8de45ac3d9/nose-1.3.7-py3-none-any.whl"; \
-          $PIP install nose-1.3.7-py3-none-any.whl; }
-    - name: Set up nosetest test
-      if: ${{ contains(needs.select.outputs.test-set, matrix.ytdl-test-set ) }}
-      shell: bash
-      run: |
-        # set PYTHON_VER
-        PYTHON_VER=${{ matrix.python-version }}
-        [ "${PYTHON_VER#*-}" != "$PYTHON_VER" ] || PYTHON_VER="${{ matrix.python-impl }}-${PYTHON_VER}"
-        echo "PYTHON_VER=$PYTHON_VER" >> "$GITHUB_ENV"
-        echo "PYTHON_IMPL=${{ matrix.python-impl }}" >> "$GITHUB_ENV"
-        # define a test to validate the Python version used by nosetests
-        printf '%s\n' \
-          'from __future__ import unicode_literals' \
-          'import sys, os, platform' \
-          'try:' \
-          '    import unittest2 as unittest' \
-          'except ImportError:' \
-          '    import unittest' \
-          'class TestPython(unittest.TestCase):' \
-          '    def setUp(self):' \
-          '        self.ver = os.environ["PYTHON_VER"].split("-")' \
-          '    def test_python_ver(self):' \
-          '        self.assertEqual(["%d" % v for v in sys.version_info[:2]], self.ver[-1].split(".")[:2])' \
-          '        self.assertTrue(sys.version.startswith(self.ver[-1]))' \
-          '        self.assertIn(self.ver[0], ",".join((sys.version, platform.python_implementation())).lower())' \
-          '    def test_python_impl(self):' \
-          '        self.assertIn(platform.python_implementation().lower(), (os.environ["PYTHON_IMPL"], self.ver[0]))' \
-          > test/test_python.py
-    #-------- TESTS -------
+        wget http://search.maven.org/remotecontent?filepath=org/python/jython-installer/2.7.1/jython-installer-2.7.1.jar -O jython-installer.jar
+        java -jar jython-installer.jar -s -d "$HOME/jython"
+        echo "$HOME/jython/bin" >> $GITHUB_PATH
+    - name: Install nose
+      run: pip install nose
     - name: Run tests
-      if: ${{ contains(needs.select.outputs.test-set, matrix.ytdl-test-set ) }}
       continue-on-error: ${{ matrix.ytdl-test-set == 'download' || matrix.python-impl == 'jython' }}
       env:
         YTDL_TEST_SET: ${{ matrix.ytdl-test-set }}
-      run: |
-        ./devscripts/run_tests.${{ matrix.run-tests-ext }}
+      run: ./devscripts/run_tests.${{ matrix.run-tests-ext }}
   flake8:
     name: Linter
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v2
     - name: Set up Python
-      uses: actions/setup-python@v4
+      uses: actions/setup-python@v2
       with:
         python-version: 3.9
     - name: Install flake8
       run: pip install flake8
     - name: Run flake8
       run: flake8 .
-
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index ff40cef78..58ab3a4b8 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -150,7 +150,7 @@ After you have ensured this site is distributing its content legally, you can fo
                 # TODO more properties (see youtube_dl/extractor/common.py)
             }
     ```
-5. Add an import in [`youtube_dl/extractor/extractors.py`](https://github.com/ytdl-org/youtube-dl/blob/master/youtube_dl/extractor/extractors.py). This makes the extractor available for use, as long as the class ends with `IE`.
+5. Add an import in [`youtube_dl/extractor/extractors.py`](https://github.com/ytdl-org/youtube-dl/blob/master/youtube_dl/extractor/extractors.py).
 6. Run `python test/test_download.py TestDownload.test_YourExtractor`. This *should fail* at first, but you can continually re-run it until you're done. If you decide to add more than one test, then rename ``_TEST`` to ``_TESTS`` and make it into a list of dictionaries. The tests will then be named `TestDownload.test_YourExtractor`, `TestDownload.test_YourExtractor_1`, `TestDownload.test_YourExtractor_2`, etc. Note that tests with `only_matching` key in test's dict are not counted in.
 7. Have a look at [`youtube_dl/extractor/common.py`](https://github.com/ytdl-org/youtube-dl/blob/master/youtube_dl/extractor/common.py) for possible helper methods and a [detailed description of what your extractor should and may return](https://github.com/ytdl-org/youtube-dl/blob/7f41a598b3fba1bcab2817de64a08941200aa3c8/youtube_dl/extractor/common.py#L94-L303). Add tests and code for as many as you want.
 8. Make sure your code follows [youtube-dl coding conventions](#youtube-dl-coding-conventions) and check the code with [flake8](https://flake8.pycqa.org/en/latest/index.html#quickstart):
diff --git a/ChangeLog b/ChangeLog
index 658864282..22b4fa67d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,115 +1,3 @@
-version 2021.12.17
-
-Core
-* [postprocessor/ffmpeg] Show ffmpeg output on error (#22680, #29336)
-
-Extractors
-* [youtube] Update signature function patterns (#30363, #30366)
-* [peertube] Only call description endpoint if necessary (#29383)
-* [periscope] Pass referer to HLS requests (#29419)
-- [liveleak] Remove extractor (#17625, #24222, #29331)
-+ [pornhub] Add support for pornhubthbh7ap3u.onion
-* [pornhub] Detect geo restriction
-* [pornhub] Dismiss tbr extracted from download URLs (#28927)
-* [curiositystream:collection] Extend _VALID_URL (#26326, #29117)
-* [youtube] Make get_video_info processing more robust (#29333)
-* [youtube] Workaround for get_video_info request (#29333)
-* [bilibili] Strip uploader name (#29202)
-* [youtube] Update invidious instance list (#29281)
-* [umg:de] Update GraphQL API URL (#29304)
-* [nrk] Switch psapi URL to https (#29344)
-+ [egghead] Add support for app.egghead.io (#28404, #29303)
-* [appleconnect] Fix extraction (#29208)
-+ [orf:tvthek] Add support for MPD formats (#28672, #29236)
-
-
-version 2021.06.06
-
-Extractors
-* [facebook] Improve login required detection
-* [youporn] Fix formats and view count extraction (#29216)
-* [orf:tvthek] Fix thumbnails extraction (#29217)
-* [formula1] Fix extraction (#29206)
-* [ard] Relax URL regular expression and fix video ids (#22724, #29091)
-+ [ustream] Detect https embeds (#29133)
-* [ted] Prefer own formats over external sources (#29142)
-* [twitch:clips] Improve extraction (#29149)
-+ [twitch:clips] Add access token query to download URLs (#29136)
-* [youtube] Fix get_video_info request (#29086, #29165)
-* [vimeo] Fix vimeo pro embed extraction (#29126)
-* [redbulltv] Fix embed data extraction (#28770)
-* [shahid] Relax URL regular expression (#28772, #28930)
-
-
-version 2021.05.16
-
-Core
-* [options] Fix thumbnail option group name (#29042)
-* [YoutubeDL] Improve extract_info doc (#28946)
-
-Extractors
-+ [playstuff] Add support for play.stuff.co.nz (#28901, #28931)
-* [eroprofile] Fix extraction (#23200, #23626, #29008)
-+ [vivo] Add support for vivo.st (#29009)
-+ [generic] Add support for og:audio (#28311, #29015)
-* [phoenix] Fix extraction (#29057)
-+ [generic] Add support for sibnet embeds
-+ [vk] Add support for sibnet embeds (#9500)
-+ [generic] Add Referer header for direct videojs download URLs (#2879,
-  #20217, #29053)
-* [orf:radio] Switch download URLs to HTTPS (#29012, #29046)
-- [blinkx] Remove extractor (#28941)
-* [medaltv] Relax URL regular expression (#28884)
-+ [funimation] Add support for optional lang code in URLs (#28950)
-+ [gdcvault] Add support for HTML5 videos
-* [dispeak] Improve FLV extraction (#13513, #28970)
-* [kaltura] Improve iframe extraction (#28969)
-* [kaltura] Make embed code alternatives actually work
-* [cda] Improve extraction (#28709, #28937)
-* [twitter] Improve formats extraction from vmap URL (#28909)
-* [xtube] Fix formats extraction (#28870)
-* [svtplay] Improve extraction (#28507, #28876)
-* [tv2dk] Fix extraction (#28888)
-
-
-version 2021.04.26
-
-Extractors
-+ [xfileshare] Add support for wolfstream.tv (#28858)
-* [francetvinfo] Improve video id extraction (#28792)
-* [medaltv] Fix extraction (#28807)
-* [tver] Redirect all downloads to Brightcove (#28849)
-* [go] Improve video id extraction (#25207, #25216, #26058)
-* [youtube] Fix lazy extractors (#28780)
-+ [bbc] Extract description and timestamp from __INITIAL_DATA__ (#28774)
-* [cbsnews] Fix extraction for python <3.6 (#23359)
-
-
-version 2021.04.17
-
-Core
-+ [utils] Add support for experimental HTTP response status code
-  308 Permanent Redirect (#27877, #28768)
-
-Extractors
-+ [lbry] Add support for HLS videos (#27877, #28768)
-* [youtube] Fix stretched ratio calculation
-* [youtube] Improve stretch extraction (#28769)
-* [youtube:tab] Improve grid extraction (#28725)
-+ [youtube:tab] Detect series playlist on playlists page (#28723)
-+ [youtube] Add more invidious instances (#28706)
-* [pluralsight] Extend anti-throttling timeout (#28712)
-* [youtube] Improve URL to extractor routing (#27572, #28335, #28742)
-+ [maoritv] Add support for maoritelevision.com (#24552)
-+ [youtube:tab] Pass innertube context and x-goog-visitor-id header along with
-  continuation requests (#28702)
-* [mtv] Fix Viacom A/B Testing Video Player extraction (#28703)
-+ [pornhub] Extract DASH and HLS formats from get_media end point (#28698)
-* [cbssports] Fix extraction (#28682)
-* [jamendo] Fix track extraction (#28686)
-* [curiositystream] Fix format extraction (#26845, #28668)
-
-
 version 2021.04.07
 
 Core
diff --git a/README.md b/README.md
index 47e686f84..94c34d89a 100644
--- a/README.md
+++ b/README.md
@@ -33,7 +33,7 @@ Windows users can [download an .exe file](https://yt-dl.org/latest/youtube-dl.ex
 You can also use pip:
 
     sudo -H pip install --upgrade youtube-dl
-
+    
 This command will update youtube-dl if you have already installed it. See the [pypi page](https://pypi.python.org/pypi/youtube_dl) for more information.
 
 macOS users can install youtube-dl with [Homebrew](https://brew.sh/):
@@ -287,7 +287,7 @@ Alternatively, refer to the [developer instructions](#developer-instructions) fo
     --no-cache-dir                       Disable filesystem caching
     --rm-cache-dir                       Delete all filesystem cache files
 
-## Thumbnail Options:
+## Thumbnail images:
     --write-thumbnail                    Write thumbnail image to disk
     --write-all-thumbnails               Write all thumbnail image formats to
                                          disk
@@ -563,7 +563,7 @@ The basic usage is not to set any template arguments when downloading a single f
  - `is_live` (boolean): Whether this video is a live stream or a fixed-length video
  - `start_time` (numeric): Time in seconds where the reproduction should start, as specified in the URL
  - `end_time` (numeric): Time in seconds where the reproduction should end, as specified in the URL
- - `format` (string): A human-readable description of the format
+ - `format` (string): A human-readable description of the format 
  - `format_id` (string): Format code specified by `--format`
  - `format_note` (string): Additional info about the format
  - `width` (numeric): Width of the video
@@ -632,7 +632,7 @@ To use percent literals in an output template use `%%`. To output to stdout use
 
 The current default template is `%(title)s-%(id)s.%(ext)s`.
 
-In some cases, you don't want special characters such as 中, spaces, or &, such as when transferring the downloaded filename to a Windows system or the filename through an 8bit-unsafe channel. In these cases, add the `--restrict-filenames` flag to get a shorter title.
+In some cases, you don't want special characters such as 中, spaces, or &, such as when transferring the downloaded filename to a Windows system or the filename through an 8bit-unsafe channel. In these cases, add the `--restrict-filenames` flag to get a shorter title:
 
 #### Output template and Windows batch files
 
@@ -675,7 +675,7 @@ The general syntax for format selection is `--format FORMAT` or shorter `-f FORM
 
 **tl;dr:** [navigate me to examples](#format-selection-examples).
 
-The simplest case is requesting a specific format, for example with `-f 22` you can download the format with format code equal to 22. You can get the list of available format codes for particular video using `--list-formats` or `-F`. Note that these format codes are extractor specific.
+The simplest case is requesting a specific format, for example with `-f 22` you can download the format with format code equal to 22. You can get the list of available format codes for particular video using `--list-formats` or `-F`. Note that these format codes are extractor specific. 
 
 You can also use a file extension (currently `3gp`, `aac`, `flv`, `m4a`, `mp3`, `mp4`, `ogg`, `wav`, `webm` are supported) to download the best quality format of a particular file extension served as a single file, e.g. `-f webm` will download the best quality format with the `webm` extension served as a single file.
 
@@ -760,7 +760,7 @@ Videos can be filtered by their upload date using the options `--date`, `--dateb
 
  - Absolute dates: Dates in the format `YYYYMMDD`.
  - Relative dates: Dates in the format `(now|today)[+-][0-9](day|week|month|year)(s)?`
-
+ 
 Examples:
 
 ```bash
@@ -893,7 +893,7 @@ Since June 2012 ([#342](https://github.com/ytdl-org/youtube-dl/issues/342)) yout
 
 ### The exe throws an error due to missing `MSVCR100.dll`
 
-To run the exe you need to install first the [Microsoft Visual C++ 2010 Service Pack 1 Redistributable Package (x86)](https://download.microsoft.com/download/1/6/5/165255E7-1014-4D0A-B094-B6A430A6BFFC/vcredist_x86.exe).
+To run the exe you need to install first the [Microsoft Visual C++ 2010 Redistributable Package (x86)](https://www.microsoft.com/en-US/download/details.aspx?id=5555).
 
 ### On Windows, how should I set up ffmpeg and youtube-dl? Where should I put the exe files?
 
@@ -918,7 +918,7 @@ Either prepend `https://www.youtube.com/watch?v=` or separate the ID from the op
 
 Use the `--cookies` option, for example `--cookies /path/to/cookies/file.txt`.
 
-In order to extract cookies from browser use any conforming browser extension for exporting cookies. For example, [Get cookies.txt LOCALLY](https://chrome.google.com/webstore/detail/get-cookiestxt-locally/cclelndahbckbenkjhflpdbgdldlbecc) (for Chrome) or [cookies.txt](https://addons.mozilla.org/en-US/firefox/addon/cookies-txt/) (for Firefox).
+In order to extract cookies from browser use any conforming browser extension for exporting cookies. For example, [Get cookies.txt](https://chrome.google.com/webstore/detail/get-cookiestxt/bgaddhkoddajcdgocldbbfleckgcbcid/) (for Chrome) or [cookies.txt](https://addons.mozilla.org/en-US/firefox/addon/cookies-txt/) (for Firefox).
 
 Note that the cookies file must be in Mozilla/Netscape format and the first line of the cookies file must be either `# HTTP Cookie File` or `# Netscape HTTP Cookie File`. Make sure you have correct [newline format](https://en.wikipedia.org/wiki/Newline) in the cookies file and convert newlines if necessary to correspond with your OS, namely `CRLF` (`\r\n`) for Windows and `LF` (`\n`) for Unix and Unix-like systems (Linux, macOS, etc.). `HTTP Error 400: Bad Request` when using `--cookies` is a good sign of invalid newline format.
 
@@ -1000,8 +1000,6 @@ To run the test, simply invoke your favorite test runner, or execute a test file
     python test/test_download.py
     nosetests
 
-For Python versions 3.6 and later, you can use [pynose](https://pypi.org/project/pynose/) to implement `nosetests`. The original [nose](https://pypi.org/project/nose/) has not been upgraded for 3.10 and later.
-
 See item 6 of [new extractor tutorial](#adding-support-for-a-new-site) for how to run extractor specific test cases.
 
 If you want to create a build of youtube-dl yourself, you'll need
@@ -1071,11 +1069,9 @@ After you have ensured this site is distributing its content legally, you can fo
             }
     ```
 5. Add an import in [`youtube_dl/extractor/extractors.py`](https://github.com/ytdl-org/youtube-dl/blob/master/youtube_dl/extractor/extractors.py).
-6. Run `python test/test_download.py TestDownload.test_YourExtractor`. This *should fail* at first, but you can continually re-run it until you're done. If you decide to add more than one test (actually, test case) then rename ``_TEST`` to ``_TESTS`` and make it into a list of dictionaries. The tests will then be named `TestDownload.test_YourExtractor`, `TestDownload.test_YourExtractor_1`, `TestDownload.test_YourExtractor_2`, etc. Note:
-    * the test names use the extractor class name **without the trailing `IE`**
-    * tests with `only_matching` key in test's dict are not counted.
-8. Have a look at [`youtube_dl/extractor/common.py`](https://github.com/ytdl-org/youtube-dl/blob/master/youtube_dl/extractor/common.py) for possible helper methods and a [detailed description of what your extractor should and may return](https://github.com/ytdl-org/youtube-dl/blob/7f41a598b3fba1bcab2817de64a08941200aa3c8/youtube_dl/extractor/common.py#L94-L303). Add tests and code for as many as you want.
-9. Make sure your code follows [youtube-dl coding conventions](#youtube-dl-coding-conventions) and check the code with [flake8](https://flake8.pycqa.org/en/latest/index.html#quickstart):
+6. Run `python test/test_download.py TestDownload.test_YourExtractor`. This *should fail* at first, but you can continually re-run it until you're done. If you decide to add more than one test, then rename ``_TEST`` to ``_TESTS`` and make it into a list of dictionaries. The tests will then be named `TestDownload.test_YourExtractor`, `TestDownload.test_YourExtractor_1`, `TestDownload.test_YourExtractor_2`, etc. Note that tests with `only_matching` key in test's dict are not counted in.
+7. Have a look at [`youtube_dl/extractor/common.py`](https://github.com/ytdl-org/youtube-dl/blob/master/youtube_dl/extractor/common.py) for possible helper methods and a [detailed description of what your extractor should and may return](https://github.com/ytdl-org/youtube-dl/blob/7f41a598b3fba1bcab2817de64a08941200aa3c8/youtube_dl/extractor/common.py#L94-L303). Add tests and code for as many as you want.
+8. Make sure your code follows [youtube-dl coding conventions](#youtube-dl-coding-conventions) and check the code with [flake8](https://flake8.pycqa.org/en/latest/index.html#quickstart):
 
         $ flake8 youtube_dl/extractor/yourextractor.py
 
@@ -1093,7 +1089,7 @@ In any case, thank you very much for your contributions!
 
 ## youtube-dl coding conventions
 
-This section introduces guidelines for writing idiomatic, robust and future-proof extractor code.
+This section introduces a guide lines for writing idiomatic, robust and future-proof extractor code.
 
 Extractors are very fragile by nature since they depend on the layout of the source data provided by 3rd party media hosters out of your control and this layout tends to change. As an extractor implementer your task is not only to write code that will extract media links and metadata correctly but also to minimize dependency on the source's layout and even to make the code foresee potential future changes and be ready for that. This is important because it will allow the extractor not to break on minor layout changes thus keeping old youtube-dl versions working. Even though this breakage issue is easily fixed by emitting a new version of youtube-dl with a fix incorporated, all the previous versions become broken in all repositories and distros' packages that may not be so prompt in fetching the update from us. Needless to say, some non rolling release distros may never receive an update at all.
 
@@ -1116,7 +1112,7 @@ Say you have some source dictionary `meta` that you've fetched as JSON with HTTP
 ```python
 meta = self._download_json(url, video_id)
 ```
-
+    
 Assume at this point `meta`'s layout is:
 
 ```python
@@ -1160,7 +1156,7 @@ description = self._search_regex(
 ```
 
 On failure this code will silently continue the extraction with `description` set to `None`. That is useful for metafields that may or may not be present.
-
+ 
 ### Provide fallbacks
 
 When extracting metadata try to do so from multiple sources. For example if `title` is present in several places, try extracting from at least some of them. This makes it more future-proof in case some of the sources become unavailable.
@@ -1208,7 +1204,7 @@ r'(id|ID)=(?P<id>\d+)'
 #### Make regular expressions relaxed and flexible
 
 When using regular expressions try to write them fuzzy, relaxed and flexible, skipping insignificant parts that are more likely to change, allowing both single and double quotes for quoted values and so on.
-
+ 
 ##### Example
 
 Say you need to extract `title` from the following HTML code:
@@ -1232,7 +1228,7 @@ title = self._search_regex(
     webpage, 'title', group='title')
 ```
 
-Note how you tolerate potential changes in the `style` attribute's value or switch from using double quotes to single for `class` attribute:
+Note how you tolerate potential changes in the `style` attribute's value or switch from using double quotes to single for `class` attribute: 
 
 The code definitely should not look like:
 
@@ -1333,114 +1329,27 @@ Wrap all extracted numeric data into safe functions from [`youtube_dl/utils.py`]
 
 Use `url_or_none` for safe URL processing.
 
-Use `traverse_obj` for safe metadata extraction from parsed JSON.
+Use `try_get` for safe metadata extraction from parsed JSON.
 
-Use `unified_strdate` for uniform `upload_date` or any `YYYYMMDD` meta field extraction, `unified_timestamp` for uniform `timestamp` extraction, `parse_filesize` for `filesize` extraction, `parse_count` for count meta fields extraction, `parse_resolution`, `parse_duration` for `duration` extraction, `parse_age_limit` for `age_limit` extraction.
+Use `unified_strdate` for uniform `upload_date` or any `YYYYMMDD` meta field extraction, `unified_timestamp` for uniform `timestamp` extraction, `parse_filesize` for `filesize` extraction, `parse_count` for count meta fields extraction, `parse_resolution`, `parse_duration` for `duration` extraction, `parse_age_limit` for `age_limit` extraction. 
 
 Explore [`youtube_dl/utils.py`](https://github.com/ytdl-org/youtube-dl/blob/master/youtube_dl/utils.py) for more useful convenience functions.
 
 #### More examples
 
 ##### Safely extract optional description from parsed JSON
-
-When processing complex JSON, as often returned by site API requests or stashed in web pages for "hydration", you can use the `traverse_obj()` utility function to handle multiple fallback values and to ensure the expected type of metadata items. The function's docstring defines how the function works: also review usage in the codebase for more examples.
-
-In this example, a text `description`, or `None`, is pulled from the `.result.video[0].summary` member of the parsed JSON `response`, if available.
-
-```python
-description = traverse_obj(response, ('result', 'video', 0, 'summary', T(compat_str)))
-```
-`T(...)` is a shorthand for a set literal; if you hate people who still run Python 2.6, `T(type_or_transformation)` could be written as a set literal `{type_or_transformation}`.
-
-Some extractors use the older and less capable `try_get()` function in the same way.
-
 ```python
 description = try_get(response, lambda x: x['result']['video'][0]['summary'], compat_str)
 ```
 
 ##### Safely extract more optional metadata
-
-In this example, various optional metadata values are extracted from the `.result.video[0]` member of the parsed JSON `response`, which is expected to be a JS object, parsed into a `dict`, with no crash if that isn't so, or if any of the target values are missing or invalid.
-
 ```python
-video = traverse_obj(response, ('result', 'video', 0, T(dict))) or {}
-# formerly:
-# video = try_get(response, lambda x: x['result']['video'][0], dict) or {}
+video = try_get(response, lambda x: x['result']['video'][0], dict) or {}
 description = video.get('summary')
 duration = float_or_none(video.get('durationMs'), scale=1000)
 view_count = int_or_none(video.get('views'))
 ```
 
-#### Safely extract nested lists
-
-Suppose you've extracted JSON like this into a Python data structure named `media_json` using, say, the `_download_json()` or `_parse_json()` methods of `InfoExtractor`:
-```json
-{
-    "title": "Example video",
-    "comment": "try extracting this",
-    "media": [{
-        "type": "bad",
-        "size": 320,
-        "url": "https://some.cdn.site/bad.mp4"
-    }, {
-        "type": "streaming",
-        "url": "https://some.cdn.site/hls.m3u8"
-    }, {
-        "type": "super",
-        "size": 1280,
-        "url": "https://some.cdn.site/good.webm"
-    }],
-    "moreStuff": "more values",
-    ...
-}
-```
-
-Then extractor code like this can collect the various fields of the JSON:
-```python
-...
-from ..utils import (
-    determine_ext,
-    int_or_none,
-    T,
-    traverse_obj,
-    txt_or_none,
-    url_or_none,
-)
-...
-        ...
-        info_dict = {}
-        # extract title and description if valid and not empty
-        info_dict.update(traverse_obj(media_json, {
-            'title': ('title', T(txt_or_none)),
-            'description': ('comment', T(txt_or_none)),
-        }))
-
-        # extract any recognisable media formats
-        fmts = []
-        # traverse into "media" list, extract `dict`s with desired keys
-        for fmt in traverse_obj(media_json, ('media', Ellipsis, {
-                'format_id': ('type', T(txt_or_none)),
-                'url': ('url', T(url_or_none)),
-                'width': ('size', T(int_or_none)), })):
-            # bad `fmt` values were `None` and removed
-            if 'url' not in fmt:
-                continue
-            fmt_url = fmt['url']  # known to be valid URL
-            ext = determine_ext(fmt_url)
-            if ext == 'm3u8':
-                fmts.extend(self._extract_m3u8_formats(fmt_url, video_id, 'mp4', fatal=False))
-            else:
-                fmt['ext'] = ext
-                fmts.append(fmt)
-
-        # sort, raise if no formats
-        self._sort_formats(fmts)
-
-        info_dict['formats'] = fmts
-        ...
-```
-The extractor raises an exception rather than random crashes if the JSON structure changes so that no formats are found.
-
 # EMBEDDING YOUTUBE-DL
 
 youtube-dl makes the best effort to be a good command-line program, and thus should be callable from any programming language. If you encounter any problems parsing its output, feel free to [create a report](https://github.com/ytdl-org/youtube-dl/issues/new).
@@ -1497,11 +1406,7 @@ with youtube_dl.YoutubeDL(ydl_opts) as ydl:
 
 # BUGS
 
-Bugs and suggestions should be reported in the issue tracker: <https://github.com/ytdl-org/youtube-dl/issues> (<https://yt-dl.org/bug> is an alias for this). Unless you were prompted to or there is another pertinent reason (e.g. GitHub fails to accept the bug report), please do not send bug reports via personal email. For discussions, join us in the IRC channel [#youtube-dl](irc://chat.freenode.net/#youtube-dl) on freenode ([webchat](https://webchat.freenode.net/?randomnick=1&channels=youtube-dl)).
-
-## Opening a bug report or suggestion
-
-Be sure to follow instructions provided **below** and **in the issue tracker**. Complete the appropriate issue template fully. Consider whether your problem is covered by an existing issue: if so, follow the discussion there. Avoid commenting on existing duplicate issues as such comments do not add to the discussion of the issue and are liable to be treated as spam.
+Bugs and suggestions should be reported at: <https://github.com/ytdl-org/youtube-dl/issues>. Unless you were prompted to or there is another pertinent reason (e.g. GitHub fails to accept the bug report), please do not send bug reports via personal email. For discussions, join us in the IRC channel [#youtube-dl](irc://chat.freenode.net/#youtube-dl) on freenode ([webchat](https://webchat.freenode.net/?randomnick=1&channels=youtube-dl)).
 
 **Please include the full output of youtube-dl when run with `-v`**, i.e. **add** `-v` flag to **your command line**, copy the **whole** output and post it in the issue body wrapped in \`\`\` for better formatting. It should look similar to this:
 ```
@@ -1521,17 +1426,17 @@ $ youtube-dl -v <your command line>
 
 The output (including the first lines) contains important debugging information. Issues without the full output are often not reproducible and therefore do not get solved in short order, if ever.
 
-Finally please review your issue to avoid various common mistakes (you can and should use this as a checklist) listed below.
+Please re-read your issue once again to avoid a couple of common mistakes (you can and should use this as a checklist):
 
 ### Is the description of the issue itself sufficient?
 
-We often get issue reports that are hard to understand. To avoid subsequent clarifications, and to assist participants who are not native English speakers, please elaborate on what feature you are requesting, or what bug you want to be fixed.
+We often get issue reports that we cannot really decipher. While in most cases we eventually get the required information after asking back multiple times, this poses an unnecessary drain on our resources. Many contributors, including myself, are also not native speakers, so we may misread some parts.
 
-Make sure that it's obvious
+So please elaborate on what feature you are requesting, or what bug you want to be fixed. Make sure that it's obvious
 
 - What the problem is
 - How it could be fixed
-- How your proposed solution would look
+- How your proposed solution would look like
 
 If your report is shorter than two lines, it is almost certainly missing some of these, which makes it hard for us to respond to it. We're often too polite to close the issue outright, but the missing info makes misinterpretation likely. As a committer myself, I often get frustrated by these issues, since the only possible way for me to move forward on them is to ask for clarification over and over.
 
@@ -1541,14 +1446,14 @@ If your server has multiple IPs or you suspect censorship, adding `--call-home`
 
 **Site support requests must contain an example URL**. An example URL is a URL you might want to download, like `https://www.youtube.com/watch?v=BaW_jenozKc`. There should be an obvious video present. Except under very special circumstances, the main page of a video service (e.g. `https://www.youtube.com/`) is *not* an example URL.
 
-###  Is the issue already documented?
-
-Make sure that someone has not already opened the issue you're trying to open. Search at the top of the window or browse the [GitHub Issues](https://github.com/ytdl-org/youtube-dl/search?type=Issues) of this repository. Initially, at least, use the search term `-label:duplicate` to focus on active issues. If there is an issue, feel free to write something along the lines of "This affects me as well, with version 2015.01.01. Here is some more information on the issue: ...". While some issues may be old, a new post into them often spurs rapid activity.
-
 ###  Are you using the latest version?
 
 Before reporting any issue, type `youtube-dl -U`. This should report that you're up-to-date. About 20% of the reports we receive are already fixed, but people are using outdated versions. This goes for feature requests as well.
 
+###  Is the issue already documented?
+
+Make sure that someone has not already opened the issue you're trying to open. Search at the top of the window or browse the [GitHub Issues](https://github.com/ytdl-org/youtube-dl/search?type=Issues) of this repository. If there is an issue, feel free to write something along the lines of "This affects me as well, with version 2015.01.01. Here is some more information on the issue: ...". While some issues may be old, a new post into them often spurs rapid activity.
+
 ###  Why are existing options not enough?
 
 Before requesting a new feature, please have a quick peek at [the list of supported options](https://github.com/ytdl-org/youtube-dl/blob/master/README.md#options). Many feature requests are for features that actually exist already! Please, absolutely do show off your work in the issue report and detail how the existing similar options do *not* solve your problem.
diff --git a/devscripts/__init__.py b/devscripts/__init__.py
deleted file mode 100644
index 750dbdca7..000000000
--- a/devscripts/__init__.py
+++ /dev/null
@@ -1 +0,0 @@
-# Empty file needed to make devscripts.utils properly importable from outside
diff --git a/devscripts/bash-completion.py b/devscripts/bash-completion.py
index 7db396a77..3d1391334 100755
--- a/devscripts/bash-completion.py
+++ b/devscripts/bash-completion.py
@@ -5,12 +5,8 @@ import os
 from os.path import dirname as dirn
 import sys
 
-sys.path.insert(0, dirn(dirn(os.path.abspath(__file__))))
-
+sys.path.insert(0, dirn(dirn((os.path.abspath(__file__)))))
 import youtube_dl
-from youtube_dl.compat import compat_open as open
-
-from utils import read_file
 
 BASH_COMPLETION_FILE = "youtube-dl.bash-completion"
 BASH_COMPLETION_TEMPLATE = "devscripts/bash-completion.in"
@@ -22,8 +18,9 @@ def build_completion(opt_parser):
         for option in group.option_list:
             # for every long flag
             opts_flag.append(option.get_opt_string())
-    template = read_file(BASH_COMPLETION_TEMPLATE)
-    with open(BASH_COMPLETION_FILE, "w", encoding='utf-8') as f:
+    with open(BASH_COMPLETION_TEMPLATE) as f:
+        template = f.read()
+    with open(BASH_COMPLETION_FILE, "w") as f:
         # just using the special char
         filled_template = template.replace("{{flags}}", " ".join(opts_flag))
         f.write(filled_template)
diff --git a/devscripts/cli_to_api.py b/devscripts/cli_to_api.py
deleted file mode 100755
index 9fb1d2ba8..000000000
--- a/devscripts/cli_to_api.py
+++ /dev/null
@@ -1,83 +0,0 @@
-#!/usr/bin/env python
-# coding: utf-8
-
-from __future__ import unicode_literals
-
-"""
-This script displays the API parameters corresponding to a yt-dl command line
-
-Example:
-$ ./cli_to_api.py -f best
-{u'format': 'best'}
-$
-"""
-
-# Allow direct execution
-import os
-import sys
-sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
-
-import youtube_dl
-from types import MethodType
-
-
-def cli_to_api(*opts):
-    YDL = youtube_dl.YoutubeDL
-
-    # to extract the parsed options, break out of YoutubeDL instantiation
-
-    # return options via this Exception
-    class ParseYTDLResult(Exception):
-        def __init__(self, result):
-            super(ParseYTDLResult, self).__init__('result')
-            self.opts = result
-
-    # replacement constructor that raises ParseYTDLResult
-    def ytdl_init(ydl, ydl_opts):
-        super(YDL, ydl).__init__(ydl_opts)
-        raise ParseYTDLResult(ydl_opts)
-
-    # patch in the constructor
-    YDL.__init__ = MethodType(ytdl_init, YDL)
-
-    # core parser
-    def parsed_options(argv):
-        try:
-            youtube_dl._real_main(list(argv))
-        except ParseYTDLResult as result:
-            return result.opts
-
-    # from https://github.com/yt-dlp/yt-dlp/issues/5859#issuecomment-1363938900
-    default = parsed_options([])
-
-    def neq_opt(a, b):
-        if a == b:
-            return False
-        if a is None and repr(type(object)).endswith(".utils.DateRange'>"):
-            return '0001-01-01 - 9999-12-31' != '{0}'.format(b)
-        return a != b
-
-    diff = dict((k, v) for k, v in parsed_options(opts).items() if neq_opt(default[k], v))
-    if 'postprocessors' in diff:
-        diff['postprocessors'] = [pp for pp in diff['postprocessors'] if pp not in default['postprocessors']]
-    return diff
-
-
-def main():
-    from pprint import PrettyPrinter
-
-    pprint = PrettyPrinter()
-    super_format = pprint.format
-
-    def format(object, context, maxlevels, level):
-        if repr(type(object)).endswith(".utils.DateRange'>"):
-            return '{0}: {1}>'.format(repr(object)[:-2], object), True, False
-        return super_format(object, context, maxlevels, level)
-
-    pprint.format = format
-
-    pprint.pprint(cli_to_api(*sys.argv))
-
-
-if __name__ == '__main__':
-    main()
diff --git a/devscripts/create-github-release.py b/devscripts/create-github-release.py
index 320bcfc27..2ddfa1096 100644
--- a/devscripts/create-github-release.py
+++ b/devscripts/create-github-release.py
@@ -1,6 +1,7 @@
 #!/usr/bin/env python
 from __future__ import unicode_literals
 
+import io
 import json
 import mimetypes
 import netrc
@@ -9,9 +10,7 @@ import os
 import re
 import sys
 
-dirn = os.path.dirname
-
-sys.path.insert(0, dirn(dirn(os.path.abspath(__file__))))
+sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
 
 from youtube_dl.compat import (
     compat_basestring,
@@ -23,7 +22,6 @@ from youtube_dl.utils import (
     make_HTTPS_handler,
     sanitized_Request,
 )
-from utils import read_file
 
 
 class GitHubReleaser(object):
@@ -91,7 +89,8 @@ def main():
 
     changelog_file, version, build_path = args
 
-    changelog = read_file(changelog_file)
+    with io.open(changelog_file, encoding='utf-8') as inf:
+        changelog = inf.read()
 
     mobj = re.search(r'(?s)version %s\n{2}(.+?)\n{3}' % version, changelog)
     body = mobj.group(1) if mobj else ''
diff --git a/devscripts/fish-completion.py b/devscripts/fish-completion.py
index ef8a39e0b..51d19dd33 100755
--- a/devscripts/fish-completion.py
+++ b/devscripts/fish-completion.py
@@ -6,13 +6,10 @@ import os
 from os.path import dirname as dirn
 import sys
 
-sys.path.insert(0, dirn(dirn(os.path.abspath(__file__))))
-
+sys.path.insert(0, dirn(dirn((os.path.abspath(__file__)))))
 import youtube_dl
 from youtube_dl.utils import shell_quote
 
-from utils import read_file, write_file
-
 FISH_COMPLETION_FILE = 'youtube-dl.fish'
 FISH_COMPLETION_TEMPLATE = 'devscripts/fish-completion.in'
 
@@ -41,9 +38,11 @@ def build_completion(opt_parser):
             complete_cmd.extend(EXTRA_ARGS.get(long_option, []))
             commands.append(shell_quote(complete_cmd))
 
-    template = read_file(FISH_COMPLETION_TEMPLATE)
+    with open(FISH_COMPLETION_TEMPLATE) as f:
+        template = f.read()
     filled_template = template.replace('{{commands}}', '\n'.join(commands))
-    write_file(FISH_COMPLETION_FILE, filled_template)
+    with open(FISH_COMPLETION_FILE, 'w') as f:
+        f.write(filled_template)
 
 
 parser = youtube_dl.parseOpts()[0]
diff --git a/devscripts/gh-pages/add-version.py b/devscripts/gh-pages/add-version.py
index b84908f85..867ea0048 100755
--- a/devscripts/gh-pages/add-version.py
+++ b/devscripts/gh-pages/add-version.py
@@ -6,21 +6,16 @@ import sys
 import hashlib
 import os.path
 
-dirn = os.path.dirname
-
-sys.path.insert(0, dirn(dirn(dirn(os.path.abspath(__file__)))))
-
-from devscripts.utils import read_file, write_file
-from youtube_dl.compat import compat_open as open
 
 if len(sys.argv) <= 1:
     print('Specify the version number as parameter')
     sys.exit()
 version = sys.argv[1]
 
-write_file('update/LATEST_VERSION', version)
+with open('update/LATEST_VERSION', 'w') as f:
+    f.write(version)
 
-versions_info = json.loads(read_file('update/versions.json'))
+versions_info = json.load(open('update/versions.json'))
 if 'signature' in versions_info:
     del versions_info['signature']
 
@@ -44,5 +39,5 @@ for key, filename in filenames.items():
 versions_info['versions'][version] = new_version
 versions_info['latest'] = version
 
-with open('update/versions.json', 'w', encoding='utf-8') as jsonf:
-    json.dumps(versions_info, jsonf, indent=4, sort_keys=True)
+with open('update/versions.json', 'w') as jsonf:
+    json.dump(versions_info, jsonf, indent=4, sort_keys=True)
diff --git a/devscripts/gh-pages/generate-download.py b/devscripts/gh-pages/generate-download.py
index 3e38e9299..a873d32ee 100755
--- a/devscripts/gh-pages/generate-download.py
+++ b/devscripts/gh-pages/generate-download.py
@@ -2,21 +2,14 @@
 from __future__ import unicode_literals
 
 import json
-import os.path
-import sys
 
-dirn = os.path.dirname
-
-sys.path.insert(0, dirn(dirn((os.path.abspath(__file__)))))
-
-from utils import read_file, write_file
-
-versions_info = json.loads(read_file('update/versions.json'))
+versions_info = json.load(open('update/versions.json'))
 version = versions_info['latest']
 version_dict = versions_info['versions'][version]
 
 # Read template page
-template = read_file('download.html.in')
+with open('download.html.in', 'r', encoding='utf-8') as tmplf:
+    template = tmplf.read()
 
 template = template.replace('@PROGRAM_VERSION@', version)
 template = template.replace('@PROGRAM_URL@', version_dict['bin'][0])
@@ -25,5 +18,5 @@ template = template.replace('@EXE_URL@', version_dict['exe'][0])
 template = template.replace('@EXE_SHA256SUM@', version_dict['exe'][1])
 template = template.replace('@TAR_URL@', version_dict['tar'][0])
 template = template.replace('@TAR_SHA256SUM@', version_dict['tar'][1])
-
-write_file('download.html', template)
+with open('download.html', 'w', encoding='utf-8') as dlf:
+    dlf.write(template)
diff --git a/devscripts/gh-pages/update-copyright.py b/devscripts/gh-pages/update-copyright.py
index 444595c48..61487f925 100755
--- a/devscripts/gh-pages/update-copyright.py
+++ b/devscripts/gh-pages/update-copyright.py
@@ -5,22 +5,17 @@ from __future__ import with_statement, unicode_literals
 
 import datetime
 import glob
+import io  # For Python 2 compatibility
 import os
 import re
-import sys
 
-dirn = os.path.dirname
-
-sys.path.insert(0, dirn(dirn(dirn(os.path.abspath(__file__)))))
-
-from devscripts.utils import read_file, write_file
-from youtube_dl import compat_str
-
-year = compat_str(datetime.datetime.now().year)
+year = str(datetime.datetime.now().year)
 for fn in glob.glob('*.html*'):
-    content = read_file(fn)
+    with io.open(fn, encoding='utf-8') as f:
+        content = f.read()
     newc = re.sub(r'(?P<copyright>Copyright © 2011-)(?P<year>[0-9]{4})', 'Copyright © 2011-' + year, content)
     if content != newc:
         tmpFn = fn + '.part'
-        write_file(tmpFn, newc)
+        with io.open(tmpFn, 'wt', encoding='utf-8') as outf:
+            outf.write(newc)
         os.rename(tmpFn, fn)
diff --git a/devscripts/gh-pages/update-feed.py b/devscripts/gh-pages/update-feed.py
index 13a367d34..506a62377 100755
--- a/devscripts/gh-pages/update-feed.py
+++ b/devscripts/gh-pages/update-feed.py
@@ -2,16 +2,10 @@
 from __future__ import unicode_literals
 
 import datetime
+import io
 import json
-import os.path
 import textwrap
-import sys
 
-dirn = os.path.dirname
-
-sys.path.insert(0, dirn(dirn(os.path.abspath(__file__))))
-
-from utils import write_file
 
 atom_template = textwrap.dedent("""\
     <?xml version="1.0" encoding="utf-8"?>
@@ -78,4 +72,5 @@ for v in versions:
 entries_str = textwrap.indent(''.join(entries), '\t')
 atom_template = atom_template.replace('@ENTRIES@', entries_str)
 
-write_file('update/releases.atom', atom_template)
+with io.open('update/releases.atom', 'w', encoding='utf-8') as atom_file:
+    atom_file.write(atom_template)
diff --git a/devscripts/gh-pages/update-sites.py b/devscripts/gh-pages/update-sites.py
index 06a8a474c..531c93c70 100755
--- a/devscripts/gh-pages/update-sites.py
+++ b/devscripts/gh-pages/update-sites.py
@@ -5,17 +5,15 @@ import sys
 import os
 import textwrap
 
-dirn = os.path.dirname
-
 # We must be able to import youtube_dl
-sys.path.insert(0, dirn(dirn(dirn(os.path.abspath(__file__)))))
+sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.dirname(os.path.abspath(__file__)))))
 
 import youtube_dl
-from devscripts.utils import read_file, write_file
 
 
 def main():
-    template = read_file('supportedsites.html.in')
+    with open('supportedsites.html.in', 'r', encoding='utf-8') as tmplf:
+        template = tmplf.read()
 
     ie_htmls = []
     for ie in youtube_dl.list_extractors(age_limit=None):
@@ -31,7 +29,8 @@ def main():
 
     template = template.replace('@SITES@', textwrap.indent('\n'.join(ie_htmls), '\t'))
 
-    write_file('supportedsites.html', template)
+    with open('supportedsites.html', 'w', encoding='utf-8') as sitesf:
+        sitesf.write(template)
 
 
 if __name__ == '__main__':
diff --git a/devscripts/make_contributing.py b/devscripts/make_contributing.py
index 5a9eb194f..226d1a5d6 100755
--- a/devscripts/make_contributing.py
+++ b/devscripts/make_contributing.py
@@ -1,11 +1,10 @@
 #!/usr/bin/env python
 from __future__ import unicode_literals
 
+import io
 import optparse
 import re
 
-from utils import read_file, write_file
-
 
 def main():
     parser = optparse.OptionParser(usage='%prog INFILE OUTFILE')
@@ -15,7 +14,8 @@ def main():
 
     infile, outfile = args
 
-    readme = read_file(infile)
+    with io.open(infile, encoding='utf-8') as inf:
+        readme = inf.read()
 
     bug_text = re.search(
         r'(?s)#\s*BUGS\s*[^\n]*\s*(.*?)#\s*COPYRIGHT', readme).group(1)
@@ -25,7 +25,8 @@ def main():
 
     out = bug_text + dev_text
 
-    write_file(outfile, out)
+    with io.open(outfile, 'w', encoding='utf-8') as outf:
+        outf.write(out)
 
 
 if __name__ == '__main__':
diff --git a/devscripts/make_issue_template.py b/devscripts/make_issue_template.py
index 65fa8169f..b7ad23d83 100644
--- a/devscripts/make_issue_template.py
+++ b/devscripts/make_issue_template.py
@@ -1,11 +1,8 @@
 #!/usr/bin/env python
 from __future__ import unicode_literals
 
+import io
 import optparse
-import os.path
-import sys
-
-from utils import read_file, read_version, write_file
 
 
 def main():
@@ -16,11 +13,17 @@ def main():
 
     infile, outfile = args
 
-    issue_template_tmpl = read_file(infile)
+    with io.open(infile, encoding='utf-8') as inf:
+        issue_template_tmpl = inf.read()
 
-    out = issue_template_tmpl % {'version': read_version()}
+    # Get the version from youtube_dl/version.py without importing the package
+    exec(compile(open('youtube_dl/version.py').read(),
+                 'youtube_dl/version.py', 'exec'))
 
-    write_file(outfile, out)
+    out = issue_template_tmpl % {'version': locals()['__version__']}
+
+    with io.open(outfile, 'w', encoding='utf-8') as outf:
+        outf.write(out)
 
 if __name__ == '__main__':
     main()
diff --git a/devscripts/make_lazy_extractors.py b/devscripts/make_lazy_extractors.py
index 5b8b123a4..878ae72b1 100644
--- a/devscripts/make_lazy_extractors.py
+++ b/devscripts/make_lazy_extractors.py
@@ -1,49 +1,28 @@
 from __future__ import unicode_literals, print_function
 
 from inspect import getsource
+import io
 import os
 from os.path import dirname as dirn
-import re
 import sys
 
 print('WARNING: Lazy loading extractors is an experimental feature that may not always work', file=sys.stderr)
 
-sys.path.insert(0, dirn(dirn(os.path.abspath(__file__))))
+sys.path.insert(0, dirn(dirn((os.path.abspath(__file__)))))
 
 lazy_extractors_filename = sys.argv[1]
 if os.path.exists(lazy_extractors_filename):
     os.remove(lazy_extractors_filename)
-# Py2: may be confused by leftover lazy_extractors.pyc
-if sys.version_info[0] < 3:
-    for c in ('c', 'o'):
-        try:
-            os.remove(lazy_extractors_filename + 'c')
-        except OSError:
-            pass
-
-from devscripts.utils import read_file, write_file
-from youtube_dl.compat import compat_register_utf8
-
-compat_register_utf8()
 
 from youtube_dl.extractor import _ALL_CLASSES
 from youtube_dl.extractor.common import InfoExtractor, SearchInfoExtractor
 
-module_template = read_file('devscripts/lazy_load_template.py')
-
-
-def get_source(m):
-    return re.sub(r'(?m)^\s*#.*\n', '', getsource(m))
-
+with open('devscripts/lazy_load_template.py', 'rt') as f:
+    module_template = f.read()
 
 module_contents = [
-    module_template,
-    get_source(InfoExtractor.suitable),
-    get_source(InfoExtractor._match_valid_url) + '\n',
-    'class LazyLoadSearchExtractor(LazyLoadExtractor):\n    pass\n',
-    # needed for suitable() methods of Youtube extractor (see #28780)
-    'from youtube_dl.utils import parse_qs, variadic\n',
-]
+    module_template + '\n' + getsource(InfoExtractor.suitable) + '\n',
+    'class LazyLoadSearchExtractor(LazyLoadExtractor):\n    pass\n']
 
 ie_template = '''
 class {name}({bases}):
@@ -75,7 +54,7 @@ def build_lazy_ie(ie, name):
         valid_url=valid_url,
         module=ie.__module__)
     if ie.suitable.__func__ is not InfoExtractor.suitable.__func__:
-        s += '\n' + get_source(ie.suitable)
+        s += '\n' + getsource(ie.suitable)
     if hasattr(ie, '_make_valid_url'):
         # search extractors
         s += make_valid_template.format(valid_url=ie._make_valid_url())
@@ -115,17 +94,7 @@ for ie in ordered_cls:
 module_contents.append(
     '_ALL_CLASSES = [{0}]'.format(', '.join(names)))
 
-module_src = '\n'.join(module_contents)
+module_src = '\n'.join(module_contents) + '\n'
 
-write_file(lazy_extractors_filename, module_src + '\n')
-
-# work around JVM byte code module limit in Jython
-if sys.platform.startswith('java') and sys.version_info[:2] == (2, 7):
-    import subprocess
-    from youtube_dl.compat import compat_subprocess_get_DEVNULL
-    # if Python 2.7 is available, use it to compile the module for Jython
-    try:
-        # if Python 2.7 is available, use it to compile the module for Jython
-        subprocess.check_call(['python2.7', '-m', 'py_compile', lazy_extractors_filename], stdout=compat_subprocess_get_DEVNULL())
-    except Exception:
-        pass
+with io.open(lazy_extractors_filename, 'wt', encoding='utf-8') as f:
+    f.write(module_src)
diff --git a/devscripts/make_readme.py b/devscripts/make_readme.py
index 7a5b04dcc..8fbce0796 100755
--- a/devscripts/make_readme.py
+++ b/devscripts/make_readme.py
@@ -1,14 +1,8 @@
 from __future__ import unicode_literals
 
-import os.path
-import re
+import io
 import sys
-dirn = os.path.dirname
-
-sys.path.insert(0, dirn(dirn(os.path.abspath(__file__))))
-
-from utils import read_file
-from youtube_dl.compat import compat_open as open
+import re
 
 README_FILE = 'README.md'
 helptext = sys.stdin.read()
@@ -16,7 +10,8 @@ helptext = sys.stdin.read()
 if isinstance(helptext, bytes):
     helptext = helptext.decode('utf-8')
 
-oldreadme = read_file(README_FILE)
+with io.open(README_FILE, encoding='utf-8') as f:
+    oldreadme = f.read()
 
 header = oldreadme[:oldreadme.index('# OPTIONS')]
 footer = oldreadme[oldreadme.index('# CONFIGURATION'):]
@@ -25,7 +20,7 @@ options = helptext[helptext.index('  General Options:') + 19:]
 options = re.sub(r'(?m)^  (\w.+)$', r'## \1', options)
 options = '# OPTIONS\n' + options + '\n'
 
-with open(README_FILE, 'w', encoding='utf-8') as f:
+with io.open(README_FILE, 'w', encoding='utf-8') as f:
     f.write(header)
     f.write(options)
     f.write(footer)
diff --git a/devscripts/make_supportedsites.py b/devscripts/make_supportedsites.py
index c424d18d7..764795bc5 100644
--- a/devscripts/make_supportedsites.py
+++ b/devscripts/make_supportedsites.py
@@ -1,19 +1,17 @@
 #!/usr/bin/env python
 from __future__ import unicode_literals
 
+import io
 import optparse
-import os.path
+import os
 import sys
 
+
 # Import youtube_dl
-dirn = os.path.dirname
-
-sys.path.insert(0, dirn(dirn(os.path.abspath(__file__))))
-
+ROOT_DIR = os.path.join(os.path.dirname(__file__), '..')
+sys.path.insert(0, ROOT_DIR)
 import youtube_dl
 
-from utils import write_file
-
 
 def main():
     parser = optparse.OptionParser(usage='%prog OUTFILE.md')
@@ -40,7 +38,8 @@ def main():
         ' - ' + md + '\n'
         for md in gen_ies_md(ies))
 
-    write_file(outfile, out)
+    with io.open(outfile, 'w', encoding='utf-8') as outf:
+        outf.write(out)
 
 
 if __name__ == '__main__':
diff --git a/devscripts/prepare_manpage.py b/devscripts/prepare_manpage.py
index 0090ada3e..76bf873e1 100644
--- a/devscripts/prepare_manpage.py
+++ b/devscripts/prepare_manpage.py
@@ -1,13 +1,13 @@
 from __future__ import unicode_literals
 
+import io
 import optparse
 import os.path
 import re
 
-from utils import read_file, write_file
-
 ROOT_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
 README_FILE = os.path.join(ROOT_DIR, 'README.md')
+
 PREFIX = r'''%YOUTUBE-DL(1)
 
 # NAME
@@ -29,7 +29,8 @@ def main():
 
     outfile, = args
 
-    readme = read_file(README_FILE)
+    with io.open(README_FILE, encoding='utf-8') as f:
+        readme = f.read()
 
     readme = re.sub(r'(?s)^.*?(?=# DESCRIPTION)', '', readme)
     readme = re.sub(r'\s+youtube-dl \[OPTIONS\] URL \[URL\.\.\.\]', '', readme)
@@ -37,7 +38,8 @@ def main():
 
     readme = filter_options(readme)
 
-    write_file(outfile, readme)
+    with io.open(outfile, 'w', encoding='utf-8') as outf:
+        outf.write(readme)
 
 
 def filter_options(readme):
diff --git a/devscripts/utils.py b/devscripts/utils.py
deleted file mode 100644
index 2d072d2e0..000000000
--- a/devscripts/utils.py
+++ /dev/null
@@ -1,62 +0,0 @@
-# coding: utf-8
-from __future__ import unicode_literals
-
-import argparse
-import functools
-import os.path
-import subprocess
-import sys
-
-dirn = os.path.dirname
-
-sys.path.insert(0, dirn(dirn(os.path.abspath(__file__))))
-
-from youtube_dl.compat import (
-    compat_kwargs,
-    compat_open as open,
-)
-
-
-def read_file(fname):
-    with open(fname, encoding='utf-8') as f:
-        return f.read()
-
-
-def write_file(fname, content, mode='w'):
-    with open(fname, mode, encoding='utf-8') as f:
-        return f.write(content)
-
-
-def read_version(fname='youtube_dl/version.py'):
-    """Get the version without importing the package"""
-    exec(compile(read_file(fname), fname, 'exec'))
-    return locals()['__version__']
-
-
-def get_filename_args(has_infile=False, default_outfile=None):
-    parser = argparse.ArgumentParser()
-    if has_infile:
-        parser.add_argument('infile', help='Input file')
-    kwargs = {'nargs': '?', 'default': default_outfile} if default_outfile else {}
-    kwargs['help'] = 'Output file'
-    parser.add_argument('outfile', **compat_kwargs(kwargs))
-
-    opts = parser.parse_args()
-    if has_infile:
-        return opts.infile, opts.outfile
-    return opts.outfile
-
-
-def compose_functions(*functions):
-    return lambda x: functools.reduce(lambda y, f: f(y), functions, x)
-
-
-def run_process(*args, **kwargs):
-    kwargs.setdefault('text', True)
-    kwargs.setdefault('check', True)
-    kwargs.setdefault('capture_output', True)
-    if kwargs['text']:
-        kwargs.setdefault('encoding', 'utf-8')
-        kwargs.setdefault('errors', 'replace')
-        kwargs = compat_kwargs(kwargs)
-    return subprocess.run(args, **kwargs)
diff --git a/devscripts/zsh-completion.py b/devscripts/zsh-completion.py
index ebd552fcb..60aaf76cc 100755
--- a/devscripts/zsh-completion.py
+++ b/devscripts/zsh-completion.py
@@ -7,8 +7,6 @@ import sys
 
 sys.path.insert(0, dirn(dirn((os.path.abspath(__file__)))))
 import youtube_dl
-from utils import read_file, write_file
-
 
 ZSH_COMPLETION_FILE = "youtube-dl.zsh"
 ZSH_COMPLETION_TEMPLATE = "devscripts/zsh-completion.in"
@@ -36,13 +34,15 @@ def build_completion(opt_parser):
 
     flags = [opt.get_opt_string() for opt in opts]
 
-    template = read_file(ZSH_COMPLETION_TEMPLATE)
+    with open(ZSH_COMPLETION_TEMPLATE) as f:
+        template = f.read()
 
     template = template.replace("{{fileopts}}", "|".join(fileopts))
     template = template.replace("{{diropts}}", "|".join(diropts))
     template = template.replace("{{flags}}", " ".join(flags))
 
-    write_file(ZSH_COMPLETION_FILE, template)
+    with open(ZSH_COMPLETION_FILE, "w") as f:
+        f.write(template)
 
 
 parser = youtube_dl.parseOpts()[0]
diff --git a/docs/supportedsites.md b/docs/supportedsites.md
index ae2a6b8b0..ff9177a2c 100644
--- a/docs/supportedsites.md
+++ b/docs/supportedsites.md
@@ -3,7 +3,6 @@
  - **20min**
  - **220.ro**
  - **23video**
- - **247sports**
  - **24video**
  - **3qsdn**: 3Q SDN
  - **3sat**
@@ -119,6 +118,7 @@
  - **BitChuteChannel**
  - **BleacherReport**
  - **BleacherReportCMS**
+ - **blinkx**
  - **Bloomberg**
  - **BokeCC**
  - **BongaCams**
@@ -160,8 +160,7 @@
  - **cbsnews**: CBS News
  - **cbsnews:embed**
  - **cbsnews:livevideo**: CBS News Live Videos
- - **cbssports**
- - **cbssports:embed**
+ - **CBSSports**
  - **CCMA**
  - **CCTV**: 央视网
  - **CDA**
@@ -472,6 +471,8 @@
  - **LinuxAcademy**
  - **LiTV**
  - **LiveJournal**
+ - **LiveLeak**
+ - **LiveLeakEmbed**
  - **livestream**
  - **livestream:original**
  - **LnkGo**
@@ -489,7 +490,6 @@
  - **mangomolo:live**
  - **mangomolo:video**
  - **ManyVids**
- - **MaoriTV**
  - **Markiza**
  - **MarkizaPage**
  - **massengeschmack.tv**
@@ -710,7 +710,6 @@
  - **play.fm**
  - **player.sky.it**
  - **PlayPlusTV**
- - **PlayStuff**
  - **PlaysTV**
  - **Playtvak**: Playtvak.cz, iDNES.cz and Lidovky.cz
  - **Playvid**
@@ -1160,7 +1159,7 @@
  - **WWE**
  - **XBef**
  - **XboxClips**
- - **XFileShare**: XFileShare based sites: Aparat, ClipWatching, GoUnlimited, GoVid, HolaVid, Streamty, TheVideoBee, Uqload, VidBom, vidlo, VidLocker, VidShare, VUp, WolfStream, XVideoSharing
+ - **XFileShare**: XFileShare based sites: Aparat, ClipWatching, GoUnlimited, GoVid, HolaVid, Streamty, TheVideoBee, Uqload, VidBom, vidlo, VidLocker, VidShare, VUp, XVideoSharing
  - **XHamster**
  - **XHamsterEmbed**
  - **XHamsterUser**
diff --git a/test/helper.py b/test/helper.py
index 6f2129eff..e62aab11e 100644
--- a/test/helper.py
+++ b/test/helper.py
@@ -1,24 +1,22 @@
 from __future__ import unicode_literals
 
 import errno
+import io
 import hashlib
 import json
 import os.path
 import re
+import types
 import ssl
 import sys
-import types
-import unittest
 
 import youtube_dl.extractor
 from youtube_dl import YoutubeDL
 from youtube_dl.compat import (
-    compat_open as open,
     compat_os_name,
     compat_str,
 )
 from youtube_dl.utils import (
-    IDENTITY,
     preferredencoding,
     write_string,
 )
@@ -29,10 +27,10 @@ def get_params(override=None):
                                    "parameters.json")
     LOCAL_PARAMETERS_FILE = os.path.join(os.path.dirname(os.path.abspath(__file__)),
                                          "local_parameters.json")
-    with open(PARAMETERS_FILE, encoding='utf-8') as pf:
+    with io.open(PARAMETERS_FILE, encoding='utf-8') as pf:
         parameters = json.load(pf)
     if os.path.exists(LOCAL_PARAMETERS_FILE):
-        with open(LOCAL_PARAMETERS_FILE, encoding='utf-8') as pf:
+        with io.open(LOCAL_PARAMETERS_FILE, encoding='utf-8') as pf:
             parameters.update(json.load(pf))
     if override:
         parameters.update(override)
@@ -74,8 +72,7 @@ class FakeYDL(YoutubeDL):
     def to_screen(self, s, skip_eol=None):
         print(s)
 
-    def trouble(self, *args, **kwargs):
-        s = args[0] if len(args) > 0 else kwargs.get('message', 'Missing message')
+    def trouble(self, s, tb=None):
         raise Exception(s)
 
     def download(self, x):
@@ -92,17 +89,6 @@ class FakeYDL(YoutubeDL):
         self.report_warning = types.MethodType(report_warning, self)
 
 
-class FakeLogger(object):
-    def debug(self, msg):
-        pass
-
-    def warning(self, msg):
-        pass
-
-    def error(self, msg):
-        pass
-
-
 def gettestcases(include_onlymatching=False):
     for ie in youtube_dl.extractor.gen_extractors():
         for tc in ie.get_testcases(include_onlymatching):
@@ -142,12 +128,6 @@ def expect_value(self, got, expected, field):
         self.assertTrue(
             contains_str in got,
             'field %s (value: %r) should contain %r' % (field, got, contains_str))
-    elif isinstance(expected, compat_str) and re.match(r'lambda \w+:', expected):
-        fn = eval(expected)
-        suite = expected.split(':', 1)[1].strip()
-        self.assertTrue(
-            fn(got),
-            'Expected field %s to meet condition %s, but value %r failed ' % (field, suite, got))
     elif isinstance(expected, type):
         self.assertTrue(
             isinstance(got, expected),
@@ -157,7 +137,7 @@ def expect_value(self, got, expected, field):
     elif isinstance(expected, list) and isinstance(got, list):
         self.assertEqual(
             len(expected), len(got),
-            'Expected a list of length %d, but got a list of length %d for field %s' % (
+            'Expect a list of length %d, but got a list of length %d for field %s' % (
                 len(expected), len(got), field))
         for index, (item_got, item_expected) in enumerate(zip(got, expected)):
             type_got = type(item_got)
@@ -181,18 +161,18 @@ def expect_value(self, got, expected, field):
             op, _, expected_num = expected.partition(':')
             expected_num = int(expected_num)
             if op == 'mincount':
-                assert_func = self.assertGreaterEqual
+                assert_func = assertGreaterEqual
                 msg_tmpl = 'Expected %d items in field %s, but only got %d'
             elif op == 'maxcount':
-                assert_func = self.assertLessEqual
+                assert_func = assertLessEqual
                 msg_tmpl = 'Expected maximum %d items in field %s, but got %d'
             elif op == 'count':
-                assert_func = self.assertEqual
+                assert_func = assertEqual
                 msg_tmpl = 'Expected exactly %d items in field %s, but got %d'
             else:
                 assert False
             assert_func(
-                len(got), expected_num,
+                self, len(got), expected_num,
                 msg_tmpl % (expected_num, field, len(got)))
             return
         self.assertEqual(
@@ -262,6 +242,27 @@ def assertRegexpMatches(self, text, regexp, msg=None):
             self.assertTrue(m, msg)
 
 
+def assertGreaterEqual(self, got, expected, msg=None):
+    if not (got >= expected):
+        if msg is None:
+            msg = '%r not greater than or equal to %r' % (got, expected)
+        self.assertTrue(got >= expected, msg)
+
+
+def assertLessEqual(self, got, expected, msg=None):
+    if not (got <= expected):
+        if msg is None:
+            msg = '%r not less than or equal to %r' % (got, expected)
+        self.assertTrue(got <= expected, msg)
+
+
+def assertEqual(self, got, expected, msg=None):
+    if not (got == expected):
+        if msg is None:
+            msg = '%r not equal to %r' % (got, expected)
+        self.assertTrue(got == expected, msg)
+
+
 def expect_warnings(ydl, warnings_re):
     real_warning = ydl.report_warning
 
@@ -279,7 +280,3 @@ def http_server_port(httpd):
     else:
         sock = httpd.socket
     return sock.getsockname()[1]
-
-
-def expectedFailureIf(cond):
-    return unittest.expectedFailure if cond else IDENTITY
diff --git a/test/parameters.json b/test/parameters.json
index 864c9d130..65fd54428 100644
--- a/test/parameters.json
+++ b/test/parameters.json
@@ -18,6 +18,7 @@
     "noprogress": false, 
     "outtmpl": "%(id)s.%(ext)s", 
     "password": null, 
+    "playlistend": -1, 
     "playliststart": 1, 
     "prefer_free_formats": false, 
     "quiet": false, 
diff --git a/test/test_InfoExtractor.py b/test/test_InfoExtractor.py
index 09100a1d6..dd69a681b 100644
--- a/test/test_InfoExtractor.py
+++ b/test/test_InfoExtractor.py
@@ -3,36 +3,18 @@
 from __future__ import unicode_literals
 
 # Allow direct execution
+import io
 import os
 import sys
 import unittest
-
 sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
 
-import threading
-
-from test.helper import (
-    expect_dict,
-    expect_value,
-    FakeYDL,
-    http_server_port,
-)
-from youtube_dl.compat import (
-    compat_etree_fromstring,
-    compat_http_server,
-    compat_open as open,
-)
+from test.helper import FakeYDL, expect_dict, expect_value, http_server_port
+from youtube_dl.compat import compat_etree_fromstring, compat_http_server
 from youtube_dl.extractor.common import InfoExtractor
-from youtube_dl.extractor import (
-    get_info_extractor,
-    YoutubeIE,
-)
-from youtube_dl.utils import (
-    encode_data_uri,
-    ExtractorError,
-    RegexNotFoundError,
-    strip_jsonp,
-)
+from youtube_dl.extractor import YoutubeIE, get_info_extractor
+from youtube_dl.utils import encode_data_uri, strip_jsonp, ExtractorError, RegexNotFoundError
+import threading
 
 
 TEAPOT_RESPONSE_STATUS = 418
@@ -53,13 +35,13 @@ class InfoExtractorTestRequestHandler(compat_http_server.BaseHTTPRequestHandler)
             assert False
 
 
-class DummyIE(InfoExtractor):
+class TestIE(InfoExtractor):
     pass
 
 
 class TestInfoExtractor(unittest.TestCase):
     def setUp(self):
-        self.ie = DummyIE(FakeYDL())
+        self.ie = TestIE(FakeYDL())
 
     def test_ie_key(self):
         self.assertEqual(get_info_extractor(YoutubeIE.ie_key()), YoutubeIE)
@@ -80,7 +62,6 @@ class TestInfoExtractor(unittest.TestCase):
             <meta name="og:test1" content='foo > < bar'/>
             <meta name="og:test2" content="foo >//< bar"/>
             <meta property=og-test3 content='Ill-formatted opengraph'/>
-            <meta property=og:test4 content=unquoted-value/>
             '''
         self.assertEqual(ie._og_search_title(html), 'Foo')
         self.assertEqual(ie._og_search_description(html), 'Some video\'s description ')
@@ -93,7 +74,6 @@ class TestInfoExtractor(unittest.TestCase):
         self.assertEqual(ie._og_search_property(('test0', 'test1'), html), 'foo > < bar')
         self.assertRaises(RegexNotFoundError, ie._og_search_property, 'test0', html, None, fatal=True)
         self.assertRaises(RegexNotFoundError, ie._og_search_property, ('test0', 'test00'), html, None, fatal=True)
-        self.assertEqual(ie._og_search_property('test4', html), 'unquoted-value')
 
     def test_html_search_meta(self):
         ie = self.ie
@@ -118,74 +98,6 @@ class TestInfoExtractor(unittest.TestCase):
         self.assertRaises(RegexNotFoundError, ie._html_search_meta, 'z', html, None, fatal=True)
         self.assertRaises(RegexNotFoundError, ie._html_search_meta, ('z', 'x'), html, None, fatal=True)
 
-    def test_search_nextjs_data(self):
-        html = '''
-<!DOCTYPE html>
-<html>
-<head>
-  <meta http-equiv="content-type" content=
-  "text/html; charset=utf-8">
-  <meta name="viewport" content="width=device-width">
-  <title>Test _search_nextjs_data()</title>
-</head>
-<body>
-  <div id="__next">
-    <div style="background-color:#17171E" class="FU" dir="ltr">
-      <div class="sc-93de261d-0 dyzzYE">
-        <div>
-          <header class="HD"></header>
-          <main class="MN">
-            <div style="height:0" class="HT0">
-              <div style="width:NaN%" data-testid=
-              "stream-container" class="WDN"></div>
-            </div>
-          </main>
-        </div>
-        <footer class="sc-6e5faf91-0 dEGaHS"></footer>
-      </div>
-    </div>
-  </div>
-  <script id="__NEXT_DATA__" type="application/json">
-  {"props":{"pageProps":{"video":{"id":"testid"}}}}
-  </script>
-</body>
-</html>
-'''
-        search = self.ie._search_nextjs_data(html, 'testID')
-        self.assertEqual(search['props']['pageProps']['video']['id'], 'testid')
-        search = self.ie._search_nextjs_data(
-            'no next.js data here, move along', 'testID', default={'status': 0})
-        self.assertEqual(search['status'], 0)
-
-    def test_search_nuxt_data(self):
-        html = '''
-<!DOCTYPE html>
-<html>
-<head>
-  <meta http-equiv="content-type" content=
-  "text/html; charset=utf-8">
-  <title>Nuxt.js Test Page</title>
-  <meta name="viewport" content=
-  "width=device-width, initial-scale=1">
-  <meta data-hid="robots" name="robots" content="all">
-</head>
-<body class="BD">
-  <div id="__layout">
-    <h1 class="H1">Example heading</h1>
-    <div class="IN">
-      <p>Decoy text</p>
-    </div>
-  </div>
-  <script>
-  window.__NUXT__=(function(a,b,c,d,e,f,g,h){return {decoy:" default",data:[{track:{id:f,title:g}}]}}(null,null,"c",null,null,"testid","Nuxt.js title",null));
-  </script>
-  <script src="/_nuxt/a12345b.js" defer="defer"></script>
-</body>
-</html>
-'''
-        search = self.ie._search_nuxt_data(html, 'testID')
-        self.assertEqual(search['track']['id'], 'testid')
-
     def test_search_json_ld_realworld(self):
         # https://github.com/ytdl-org/youtube-dl/issues/23306
         expect_dict(
@@ -434,24 +346,6 @@ class TestInfoExtractor(unittest.TestCase):
                 }],
             })
 
-        # from https://0000.studio/
-        # with type attribute but without extension in URL
-        expect_dict(
-            self,
-            self.ie._parse_html5_media_entries(
-                'https://0000.studio',
-                r'''
-                <video src="https://d1ggyt9m8pwf3g.cloudfront.net/protected/ap-northeast-1:1864af40-28d5-492b-b739-b32314b1a527/archive/clip/838db6a7-8973-4cd6-840d-8517e4093c92"
-                    controls="controls" type="video/mp4" preload="metadata" autoplay="autoplay" playsinline class="object-contain">
-                </video>
-                ''', None)[0],
-            {
-                'formats': [{
-                    'url': 'https://d1ggyt9m8pwf3g.cloudfront.net/protected/ap-northeast-1:1864af40-28d5-492b-b739-b32314b1a527/archive/clip/838db6a7-8973-4cd6-840d-8517e4093c92',
-                    'ext': 'mp4',
-                }],
-            })
-
     def test_extract_jwplayer_data_realworld(self):
         # from http://www.suffolk.edu/sjc/
         expect_dict(
@@ -905,8 +799,8 @@ jwplayer("mediaplayer").setup({"abouttext":"Visit Indie DB","aboutlink":"http:\/
         ]
 
         for m3u8_file, m3u8_url, expected_formats in _TEST_CASES:
-            with open('./test/testdata/m3u8/%s.m3u8' % m3u8_file,
-                      mode='r', encoding='utf-8') as f:
+            with io.open('./test/testdata/m3u8/%s.m3u8' % m3u8_file,
+                         mode='r', encoding='utf-8') as f:
                 formats = self.ie._parse_m3u8_formats(
                     f.read(), m3u8_url, ext='mp4')
                 self.ie._sort_formats(formats)
@@ -996,8 +890,7 @@ jwplayer("mediaplayer").setup({"abouttext":"Visit Indie DB","aboutlink":"http:\/
                     'tbr': 5997.485,
                     'width': 1920,
                     'height': 1080,
-                }],
-                {},
+                }]
             ), (
                 # https://github.com/ytdl-org/youtube-dl/pull/14844
                 'urls_only',
@@ -1080,8 +973,7 @@ jwplayer("mediaplayer").setup({"abouttext":"Visit Indie DB","aboutlink":"http:\/
                     'tbr': 4400,
                     'width': 1920,
                     'height': 1080,
-                }],
-                {},
+                }]
             ), (
                 # https://github.com/ytdl-org/youtube-dl/issues/20346
                 # Media considered unfragmented even though it contains
@@ -1127,185 +1019,18 @@ jwplayer("mediaplayer").setup({"abouttext":"Visit Indie DB","aboutlink":"http:\/
                     'width': 360,
                     'height': 360,
                     'fps': 30,
-                }],
-                {},
-            ), (
-                # https://github.com/ytdl-org/youtube-dl/issues/30235
-                # Bento4 generated test mpd
-                # mp4dash --mpd-name=manifest.mpd --no-split --use-segment-list mediafiles
-                'url_and_range',
-                'http://unknown/manifest.mpd',  # mpd_url
-                'http://unknown/',  # mpd_base_url
-                [{
-                    'manifest_url': 'http://unknown/manifest.mpd',
-                    'fragment_base_url': 'http://unknown/',
-                    'ext': 'm4a',
-                    'format_id': 'audio-und-mp4a.40.2',
-                    'format_note': 'DASH audio',
-                    'container': 'm4a_dash',
-                    'protocol': 'http_dash_segments',
-                    'acodec': 'mp4a.40.2',
-                    'vcodec': 'none',
-                    'tbr': 98.808,
-                }, {
-                    'manifest_url': 'http://unknown/manifest.mpd',
-                    'fragment_base_url': 'http://unknown/',
-                    'ext': 'mp4',
-                    'format_id': 'video-avc1',
-                    'format_note': 'DASH video',
-                    'container': 'mp4_dash',
-                    'protocol': 'http_dash_segments',
-                    'acodec': 'none',
-                    'vcodec': 'avc1.4D401E',
-                    'tbr': 699.597,
-                    'width': 768,
-                    'height': 432
-                }],
-                {},
-            ), (
-                # https://github.com/ytdl-org/youtube-dl/issues/27575
-                # GPAC generated test mpd
-                # MP4Box -dash 10000 -single-file -out manifest.mpd mediafiles
-                'range_only',
-                'http://unknown/manifest.mpd',  # mpd_url
-                'http://unknown/',  # mpd_base_url
-                [{
-                    'manifest_url': 'http://unknown/manifest.mpd',
-                    'fragment_base_url': 'http://unknown/audio_dashinit.mp4',
-                    'ext': 'm4a',
-                    'format_id': '2',
-                    'format_note': 'DASH audio',
-                    'container': 'm4a_dash',
-                    'protocol': 'http_dash_segments',
-                    'acodec': 'mp4a.40.2',
-                    'vcodec': 'none',
-                    'tbr': 98.096,
-                }, {
-                    'manifest_url': 'http://unknown/manifest.mpd',
-                    'fragment_base_url': 'http://unknown/video_dashinit.mp4',
-                    'ext': 'mp4',
-                    'format_id': '1',
-                    'format_note': 'DASH video',
-                    'container': 'mp4_dash',
-                    'protocol': 'http_dash_segments',
-                    'acodec': 'none',
-                    'vcodec': 'avc1.4D401E',
-                    'tbr': 526.987,
-                    'width': 768,
-                    'height': 432
-                }],
-                {},
-            ), (
-                'subtitles',
-                'https://sdn-global-streaming-cache-3qsdn.akamaized.net/stream/3144/files/17/07/672975/3144-kZT4LWMQw6Rh7Kpd.ism/manifest.mpd',
-                'https://sdn-global-streaming-cache-3qsdn.akamaized.net/stream/3144/files/17/07/672975/3144-kZT4LWMQw6Rh7Kpd.ism/',
-                [{
-                    'format_id': 'audio=128001',
-                    'manifest_url': 'https://sdn-global-streaming-cache-3qsdn.akamaized.net/stream/3144/files/17/07/672975/3144-kZT4LWMQw6Rh7Kpd.ism/manifest.mpd',
-                    'ext': 'm4a',
-                    'tbr': 128.001,
-                    'asr': 48000,
-                    'format_note': 'DASH audio',
-                    'container': 'm4a_dash',
-                    'vcodec': 'none',
-                    'acodec': 'mp4a.40.2',
-                    'url': 'https://sdn-global-streaming-cache-3qsdn.akamaized.net/stream/3144/files/17/07/672975/3144-kZT4LWMQw6Rh7Kpd.ism/manifest.mpd',
-                    'fragment_base_url': 'https://sdn-global-streaming-cache-3qsdn.akamaized.net/stream/3144/files/17/07/672975/3144-kZT4LWMQw6Rh7Kpd.ism/dash/',
-                    'protocol': 'http_dash_segments',
-                }, {
-                    'format_id': 'video=100000',
-                    'manifest_url': 'https://sdn-global-streaming-cache-3qsdn.akamaized.net/stream/3144/files/17/07/672975/3144-kZT4LWMQw6Rh7Kpd.ism/manifest.mpd',
-                    'ext': 'mp4',
-                    'width': 336,
-                    'height': 144,
-                    'tbr': 100,
-                    'format_note': 'DASH video',
-                    'container': 'mp4_dash',
-                    'vcodec': 'avc1.4D401F',
-                    'acodec': 'none',
-                    'url': 'https://sdn-global-streaming-cache-3qsdn.akamaized.net/stream/3144/files/17/07/672975/3144-kZT4LWMQw6Rh7Kpd.ism/manifest.mpd',
-                    'fragment_base_url': 'https://sdn-global-streaming-cache-3qsdn.akamaized.net/stream/3144/files/17/07/672975/3144-kZT4LWMQw6Rh7Kpd.ism/dash/',
-                    'protocol': 'http_dash_segments',
-                }, {
-                    'format_id': 'video=326000',
-                    'manifest_url': 'https://sdn-global-streaming-cache-3qsdn.akamaized.net/stream/3144/files/17/07/672975/3144-kZT4LWMQw6Rh7Kpd.ism/manifest.mpd',
-                    'ext': 'mp4',
-                    'width': 562,
-                    'height': 240,
-                    'tbr': 326,
-                    'format_note': 'DASH video',
-                    'container': 'mp4_dash',
-                    'vcodec': 'avc1.4D401F',
-                    'acodec': 'none',
-                    'url': 'https://sdn-global-streaming-cache-3qsdn.akamaized.net/stream/3144/files/17/07/672975/3144-kZT4LWMQw6Rh7Kpd.ism/manifest.mpd',
-                    'fragment_base_url': 'https://sdn-global-streaming-cache-3qsdn.akamaized.net/stream/3144/files/17/07/672975/3144-kZT4LWMQw6Rh7Kpd.ism/dash/',
-                    'protocol': 'http_dash_segments',
-                }, {
-                    'format_id': 'video=698000',
-                    'manifest_url': 'https://sdn-global-streaming-cache-3qsdn.akamaized.net/stream/3144/files/17/07/672975/3144-kZT4LWMQw6Rh7Kpd.ism/manifest.mpd',
-                    'ext': 'mp4',
-                    'width': 844,
-                    'height': 360,
-                    'tbr': 698,
-                    'format_note': 'DASH video',
-                    'container': 'mp4_dash',
-                    'vcodec': 'avc1.4D401F',
-                    'acodec': 'none',
-                    'url': 'https://sdn-global-streaming-cache-3qsdn.akamaized.net/stream/3144/files/17/07/672975/3144-kZT4LWMQw6Rh7Kpd.ism/manifest.mpd',
-                    'fragment_base_url': 'https://sdn-global-streaming-cache-3qsdn.akamaized.net/stream/3144/files/17/07/672975/3144-kZT4LWMQw6Rh7Kpd.ism/dash/',
-                    'protocol': 'http_dash_segments',
-                }, {
-                    'format_id': 'video=1493000',
-                    'manifest_url': 'https://sdn-global-streaming-cache-3qsdn.akamaized.net/stream/3144/files/17/07/672975/3144-kZT4LWMQw6Rh7Kpd.ism/manifest.mpd',
-                    'ext': 'mp4',
-                    'width': 1126,
-                    'height': 480,
-                    'tbr': 1493,
-                    'format_note': 'DASH video',
-                    'container': 'mp4_dash',
-                    'vcodec': 'avc1.4D401F',
-                    'acodec': 'none',
-                    'url': 'https://sdn-global-streaming-cache-3qsdn.akamaized.net/stream/3144/files/17/07/672975/3144-kZT4LWMQw6Rh7Kpd.ism/manifest.mpd',
-                    'fragment_base_url': 'https://sdn-global-streaming-cache-3qsdn.akamaized.net/stream/3144/files/17/07/672975/3144-kZT4LWMQw6Rh7Kpd.ism/dash/',
-                    'protocol': 'http_dash_segments',
-                }, {
-                    'format_id': 'video=4482000',
-                    'manifest_url': 'https://sdn-global-streaming-cache-3qsdn.akamaized.net/stream/3144/files/17/07/672975/3144-kZT4LWMQw6Rh7Kpd.ism/manifest.mpd',
-                    'ext': 'mp4',
-                    'width': 1688,
-                    'height': 720,
-                    'tbr': 4482,
-                    'format_note': 'DASH video',
-                    'container': 'mp4_dash',
-                    'vcodec': 'avc1.4D401F',
-                    'acodec': 'none',
-                    'url': 'https://sdn-global-streaming-cache-3qsdn.akamaized.net/stream/3144/files/17/07/672975/3144-kZT4LWMQw6Rh7Kpd.ism/manifest.mpd',
-                    'fragment_base_url': 'https://sdn-global-streaming-cache-3qsdn.akamaized.net/stream/3144/files/17/07/672975/3144-kZT4LWMQw6Rh7Kpd.ism/dash/',
-                    'protocol': 'http_dash_segments',
-                }],
-                {
-                    'en': [
-                        {
-                            'ext': 'mp4',
-                            'manifest_url': 'https://sdn-global-streaming-cache-3qsdn.akamaized.net/stream/3144/files/17/07/672975/3144-kZT4LWMQw6Rh7Kpd.ism/manifest.mpd',
-                            'url': 'https://sdn-global-streaming-cache-3qsdn.akamaized.net/stream/3144/files/17/07/672975/3144-kZT4LWMQw6Rh7Kpd.ism/manifest.mpd',
-                            'fragment_base_url': 'https://sdn-global-streaming-cache-3qsdn.akamaized.net/stream/3144/files/17/07/672975/3144-kZT4LWMQw6Rh7Kpd.ism/dash/',
-                            'protocol': 'http_dash_segments',
-                        }
-                    ]
-                },
+                }]
             )
         ]
 
-        for mpd_file, mpd_url, mpd_base_url, expected_formats, expected_subtitles in _TEST_CASES:
-            with open('./test/testdata/mpd/%s.mpd' % mpd_file,
-                      mode='r', encoding='utf-8') as f:
-                formats, subtitles = self.ie._parse_mpd_formats_and_subtitles(
+        for mpd_file, mpd_url, mpd_base_url, expected_formats in _TEST_CASES:
+            with io.open('./test/testdata/mpd/%s.mpd' % mpd_file,
+                         mode='r', encoding='utf-8') as f:
+                formats = self.ie._parse_mpd_formats(
                     compat_etree_fromstring(f.read().encode('utf-8')),
                     mpd_base_url=mpd_base_url, mpd_url=mpd_url)
                 self.ie._sort_formats(formats)
                 expect_value(self, formats, expected_formats, None)
-                expect_value(self, subtitles, expected_subtitles, None)
 
     def test_parse_f4m_formats(self):
         _TEST_CASES = [
@@ -1326,8 +1051,8 @@ jwplayer("mediaplayer").setup({"abouttext":"Visit Indie DB","aboutlink":"http:\/
         ]
 
         for f4m_file, f4m_url, expected_formats in _TEST_CASES:
-            with open('./test/testdata/f4m/%s.f4m' % f4m_file,
-                      mode='r', encoding='utf-8') as f:
+            with io.open('./test/testdata/f4m/%s.f4m' % f4m_file,
+                         mode='r', encoding='utf-8') as f:
                 formats = self.ie._parse_f4m_formats(
                     compat_etree_fromstring(f.read().encode('utf-8')),
                     f4m_url, None)
@@ -1374,8 +1099,8 @@ jwplayer("mediaplayer").setup({"abouttext":"Visit Indie DB","aboutlink":"http:\/
         ]
 
         for xspf_file, xspf_url, expected_entries in _TEST_CASES:
-            with open('./test/testdata/xspf/%s.xspf' % xspf_file,
-                      mode='r', encoding='utf-8') as f:
+            with io.open('./test/testdata/xspf/%s.xspf' % xspf_file,
+                         mode='r', encoding='utf-8') as f:
                 entries = self.ie._parse_xspf(
                     compat_etree_fromstring(f.read().encode('utf-8')),
                     xspf_file, xspf_url=xspf_url, xspf_base_url=xspf_url)
diff --git a/test/test_YoutubeDL.py b/test/test_YoutubeDL.py
index d994682b2..a35effe0e 100644
--- a/test/test_YoutubeDL.py
+++ b/test/test_YoutubeDL.py
@@ -10,31 +10,14 @@ import unittest
 sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
 
 import copy
-import json
 
-from test.helper import (
-    FakeYDL,
-    assertRegexpMatches,
-    try_rm,
-)
+from test.helper import FakeYDL, assertRegexpMatches
 from youtube_dl import YoutubeDL
-from youtube_dl.compat import (
-    compat_http_cookiejar_Cookie,
-    compat_http_cookies_SimpleCookie,
-    compat_kwargs,
-    compat_open as open,
-    compat_str,
-    compat_urllib_error,
-)
-
+from youtube_dl.compat import compat_str, compat_urllib_error
 from youtube_dl.extractor import YoutubeIE
 from youtube_dl.extractor.common import InfoExtractor
 from youtube_dl.postprocessor.common import PostProcessor
-from youtube_dl.utils import (
-    ExtractorError,
-    match_filter_func,
-    traverse_obj,
-)
+from youtube_dl.utils import ExtractorError, match_filter_func
 
 TEST_URL = 'http://localhost/sample.mp4'
 
@@ -46,14 +29,11 @@ class YDL(FakeYDL):
         self.msgs = []
 
     def process_info(self, info_dict):
-        self.downloaded_info_dicts.append(info_dict.copy())
+        self.downloaded_info_dicts.append(info_dict)
 
     def to_screen(self, msg):
         self.msgs.append(msg)
 
-    def dl(self, *args, **kwargs):
-        assert False, 'Downloader must not be invoked for test_YoutubeDL'
-
 
 def _make_result(formats, **kwargs):
     res = {
@@ -62,9 +42,8 @@ def _make_result(formats, **kwargs):
         'title': 'testttitle',
         'extractor': 'testex',
         'extractor_key': 'TestEx',
-        'webpage_url': 'http://example.com/watch?v=shenanigans',
     }
-    res.update(**compat_kwargs(kwargs))
+    res.update(**kwargs)
     return res
 
 
@@ -702,12 +681,12 @@ class TestYoutubeDL(unittest.TestCase):
 
         class SimplePP(PostProcessor):
             def run(self, info):
-                with open(audiofile, 'w') as f:
+                with open(audiofile, 'wt') as f:
                     f.write('EXAMPLE')
                 return [info['filepath']], info
 
         def run_pp(params, PP):
-            with open(filename, 'w') as f:
+            with open(filename, 'wt') as f:
                 f.write('EXAMPLE')
             ydl = YoutubeDL(params)
             ydl.add_post_processor(PP())
@@ -726,7 +705,7 @@ class TestYoutubeDL(unittest.TestCase):
 
         class ModifierPP(PostProcessor):
             def run(self, info):
-                with open(info['filepath'], 'w') as f:
+                with open(info['filepath'], 'wt') as f:
                     f.write('MODIFIED')
                 return [], info
 
@@ -951,11 +930,17 @@ class TestYoutubeDL(unittest.TestCase):
     # Test case for https://github.com/ytdl-org/youtube-dl/issues/27064
     def test_ignoreerrors_for_playlist_with_url_transparent_iterable_entries(self):
 
-        ydl = YDL({
+        class _YDL(YDL):
+            def __init__(self, *args, **kwargs):
+                super(_YDL, self).__init__(*args, **kwargs)
+
+            def trouble(self, s, tb=None):
+                pass
+
+        ydl = _YDL({
             'format': 'extra',
             'ignoreerrors': True,
         })
-        ydl.trouble = lambda *_, **__: None
 
         class VideoIE(InfoExtractor):
             _VALID_URL = r'video:(?P<id>\d+)'
@@ -1012,180 +997,6 @@ class TestYoutubeDL(unittest.TestCase):
         self.assertEqual(downloaded['extractor'], 'Video')
         self.assertEqual(downloaded['extractor_key'], 'Video')
 
-    def test_default_times(self):
-        """Test addition of missing upload/release/_date from /release_/timestamp"""
-        info = {
-            'id': '1234',
-            'url': TEST_URL,
-            'title': 'Title',
-            'ext': 'mp4',
-            'timestamp': 1631352900,
-            'release_timestamp': 1632995931,
-        }
-
-        params = {'simulate': True, }
-        ydl = FakeYDL(params)
-        out_info = ydl.process_ie_result(info)
-        self.assertTrue(isinstance(out_info['upload_date'], compat_str))
-        self.assertEqual(out_info['upload_date'], '20210911')
-        self.assertTrue(isinstance(out_info['release_date'], compat_str))
-        self.assertEqual(out_info['release_date'], '20210930')
-
-
-class TestYoutubeDLCookies(unittest.TestCase):
-
-    @staticmethod
-    def encode_cookie(cookie):
-        if not isinstance(cookie, dict):
-            cookie = vars(cookie)
-        for name, value in cookie.items():
-            yield name, compat_str(value)
-
-    @classmethod
-    def comparable_cookies(cls, cookies):
-        # Work around cookiejar cookies not being unicode strings
-        return sorted(map(tuple, map(sorted, map(cls.encode_cookie, cookies))))
-
-    def assertSameCookies(self, c1, c2, msg=None):
-        return self.assertEqual(
-            *map(self.comparable_cookies, (c1, c2)),
-            msg=msg)
-
-    def assertSameCookieStrings(self, c1, c2, msg=None):
-        return self.assertSameCookies(
-            *map(lambda c: compat_http_cookies_SimpleCookie(c).values(), (c1, c2)),
-            msg=msg)
-
-    def test_header_cookies(self):
-
-        ydl = FakeYDL()
-        ydl.report_warning = lambda *_, **__: None
-
-        def cookie(name, value, version=None, domain='', path='', secure=False, expires=None):
-            return compat_http_cookiejar_Cookie(
-                version or 0, name, value, None, False,
-                domain, bool(domain), bool(domain), path, bool(path),
-                secure, expires, False, None, None, rest={})
-
-        test_url, test_domain = (t % ('yt.dl',) for t in ('https://%s/test', '.%s'))
-
-        def test(encoded_cookies, cookies, headers=False, round_trip=None, error_re=None):
-            def _test():
-                ydl.cookiejar.clear()
-                ydl._load_cookies(encoded_cookies, autoscope=headers)
-                if headers:
-                    ydl._apply_header_cookies(test_url)
-                data = {'url': test_url}
-                ydl._calc_headers(data)
-                self.assertSameCookies(
-                    cookies, ydl.cookiejar,
-                    'Extracted cookiejar.Cookie is not the same')
-                if not headers:
-                    self.assertSameCookieStrings(
-                        data.get('cookies'), round_trip or encoded_cookies,
-                        msg='Cookie is not the same as round trip')
-                ydl.__dict__['_YoutubeDL__header_cookies'] = []
-
-            try:
-                _test()
-            except AssertionError:
-                raise
-            except Exception as e:
-                if not error_re:
-                    raise
-                assertRegexpMatches(self, e.args[0], error_re.join(('.*',) * 2))
-
-        test('test=value; Domain=' + test_domain, [cookie('test', 'value', domain=test_domain)])
-        test('test=value', [cookie('test', 'value')], error_re='Unscoped cookies are not allowed')
-        test('cookie1=value1; Domain={0}; Path=/test; cookie2=value2; Domain={0}; Path=/'.format(test_domain), [
-            cookie('cookie1', 'value1', domain=test_domain, path='/test'),
-            cookie('cookie2', 'value2', domain=test_domain, path='/')])
-        cookie_kw = compat_kwargs(
-            {'domain': test_domain, 'path': '/test', 'secure': True, 'expires': '9999999999', })
-        test('test=value; Domain={domain}; Path={path}; Secure; Expires={expires}'.format(**cookie_kw), [
-            cookie('test', 'value', **cookie_kw)])
-        test('test="value; "; path=/test; domain=' + test_domain, [
-            cookie('test', 'value; ', domain=test_domain, path='/test')],
-            round_trip='test="value\\073 "; Domain={0}; Path=/test'.format(test_domain))
-        test('name=; Domain=' + test_domain, [cookie('name', '', domain=test_domain)],
-             round_trip='name=""; Domain=' + test_domain)
-        test('test=value', [cookie('test', 'value', domain=test_domain)], headers=True)
-        test('cookie1=value; Domain={0}; cookie2=value'.format(test_domain), [],
-             headers=True, error_re='Invalid syntax')
-        ydl.report_warning = ydl.report_error
-        test('test=value', [], headers=True, error_re='Passing cookies as a header is a potential security risk')
-
-    def test_infojson_cookies(self):
-        TEST_FILE = 'test_infojson_cookies.info.json'
-        TEST_URL = 'https://example.com/example.mp4'
-        COOKIES = 'a=b; Domain=.example.com; c=d; Domain=.example.com'
-        COOKIE_HEADER = {'Cookie': 'a=b; c=d'}
-
-        ydl = FakeYDL()
-        ydl.process_info = lambda x: ydl._write_info_json('test', x, TEST_FILE)
-
-        def make_info(info_header_cookies=False, fmts_header_cookies=False, cookies_field=False):
-            fmt = {'url': TEST_URL}
-            if fmts_header_cookies:
-                fmt['http_headers'] = COOKIE_HEADER
-            if cookies_field:
-                fmt['cookies'] = COOKIES
-            return _make_result([fmt], http_headers=COOKIE_HEADER if info_header_cookies else None)
-
-        def test(initial_info, note):
-
-            def failure_msg(why):
-                return ' when '.join((why, note))
-
-            result = {}
-            result['processed'] = ydl.process_ie_result(initial_info)
-            self.assertTrue(ydl.cookiejar.get_cookies_for_url(TEST_URL),
-                            msg=failure_msg('No cookies set in cookiejar after initial process'))
-            ydl.cookiejar.clear()
-            with open(TEST_FILE) as infojson:
-                result['loaded'] = ydl.sanitize_info(json.load(infojson), True)
-            result['final'] = ydl.process_ie_result(result['loaded'].copy(), download=False)
-            self.assertTrue(ydl.cookiejar.get_cookies_for_url(TEST_URL),
-                            msg=failure_msg('No cookies set in cookiejar after final process'))
-            ydl.cookiejar.clear()
-            for key in ('processed', 'loaded', 'final'):
-                info = result[key]
-                self.assertIsNone(
-                    traverse_obj(info, ((None, ('formats', 0)), 'http_headers', 'Cookie'), casesense=False, get_all=False),
-                    msg=failure_msg('Cookie header not removed in {0} result'.format(key)))
-                self.assertSameCookieStrings(
-                    traverse_obj(info, ((None, ('formats', 0)), 'cookies'), get_all=False), COOKIES,
-                    msg=failure_msg('No cookies field found in {0} result'.format(key)))
-
-        test({'url': TEST_URL, 'http_headers': COOKIE_HEADER, 'id': '1', 'title': 'x'}, 'no formats field')
-        test(make_info(info_header_cookies=True), 'info_dict header cokies')
-        test(make_info(fmts_header_cookies=True), 'format header cookies')
-        test(make_info(info_header_cookies=True, fmts_header_cookies=True), 'info_dict and format header cookies')
-        test(make_info(info_header_cookies=True, fmts_header_cookies=True, cookies_field=True), 'all cookies fields')
-        test(make_info(cookies_field=True), 'cookies format field')
-        test({'url': TEST_URL, 'cookies': COOKIES, 'id': '1', 'title': 'x'}, 'info_dict cookies field only')
-
-        try_rm(TEST_FILE)
-
-    def test_add_headers_cookie(self):
-        def check_for_cookie_header(result):
-            return traverse_obj(result, ((None, ('formats', 0)), 'http_headers', 'Cookie'), casesense=False, get_all=False)
-
-        ydl = FakeYDL({'http_headers': {'Cookie': 'a=b'}})
-        ydl._apply_header_cookies(_make_result([])['webpage_url'])  # Scope to input webpage URL: .example.com
-
-        fmt = {'url': 'https://example.com/video.mp4'}
-        result = ydl.process_ie_result(_make_result([fmt]), download=False)
-        self.assertIsNone(check_for_cookie_header(result), msg='http_headers cookies in result info_dict')
-        self.assertEqual(result.get('cookies'), 'a=b; Domain=.example.com', msg='No cookies were set in cookies field')
-        self.assertIn('a=b', ydl.cookiejar.get_cookie_header(fmt['url']), msg='No cookies were set in cookiejar')
-
-        fmt = {'url': 'https://wrong.com/video.mp4'}
-        result = ydl.process_ie_result(_make_result([fmt]), download=False)
-        self.assertIsNone(check_for_cookie_header(result), msg='http_headers cookies for wrong domain')
-        self.assertFalse(result.get('cookies'), msg='Cookies set in cookies field for wrong domain')
-        self.assertFalse(ydl.cookiejar.get_cookie_header(fmt['url']), msg='Cookies set in cookiejar for wrong domain')
-
 
 if __name__ == '__main__':
     unittest.main()
diff --git a/test/test_YoutubeDLCookieJar.py b/test/test_YoutubeDLCookieJar.py
index 4f9dd71ae..05f48bd74 100644
--- a/test/test_YoutubeDLCookieJar.py
+++ b/test/test_YoutubeDLCookieJar.py
@@ -46,20 +46,6 @@ class TestYoutubeDLCookieJar(unittest.TestCase):
         # will be ignored
         self.assertFalse(cookiejar._cookies)
 
-    def test_get_cookie_header(self):
-        cookiejar = YoutubeDLCookieJar('./test/testdata/cookies/httponly_cookies.txt')
-        cookiejar.load(ignore_discard=True, ignore_expires=True)
-        header = cookiejar.get_cookie_header('https://www.foobar.foobar')
-        self.assertIn('HTTPONLY_COOKIE', header)
-
-    def test_get_cookies_for_url(self):
-        cookiejar = YoutubeDLCookieJar('./test/testdata/cookies/session_cookies.txt')
-        cookiejar.load(ignore_discard=True, ignore_expires=True)
-        cookies = cookiejar.get_cookies_for_url('https://www.foobar.foobar/')
-        self.assertEqual(len(cookies), 2)
-        cookies = cookiejar.get_cookies_for_url('https://foobar.foobar/')
-        self.assertFalse(cookies)
-
 
 if __name__ == '__main__':
     unittest.main()
diff --git a/test/test_aes.py b/test/test_aes.py
index 0f181466b..cc89fb6ab 100644
--- a/test/test_aes.py
+++ b/test/test_aes.py
@@ -8,7 +8,7 @@ import sys
 import unittest
 sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
 
-from youtube_dl.aes import aes_decrypt, aes_encrypt, aes_cbc_decrypt, aes_cbc_encrypt, aes_decrypt_text, aes_ecb_encrypt
+from youtube_dl.aes import aes_decrypt, aes_encrypt, aes_cbc_decrypt, aes_cbc_encrypt, aes_decrypt_text
 from youtube_dl.utils import bytes_to_intlist, intlist_to_bytes
 import base64
 
@@ -58,13 +58,6 @@ class TestAES(unittest.TestCase):
         decrypted = (aes_decrypt_text(encrypted, password, 32))
         self.assertEqual(decrypted, self.secret_msg)
 
-    def test_ecb_encrypt(self):
-        data = bytes_to_intlist(self.secret_msg)
-        encrypted = intlist_to_bytes(aes_ecb_encrypt(data, self.key))
-        self.assertEqual(
-            encrypted,
-            b'\xaa\x86]\x81\x97>\x02\x92\x9d\x1bR[[L/u\xd3&\xd1(h\xde{\x81\x94\xba\x02\xae\xbd\xa6\xd0:')
-
 
 if __name__ == '__main__':
     unittest.main()
diff --git a/test/test_age_restriction.py b/test/test_age_restriction.py
index db98494ab..6f5513faa 100644
--- a/test/test_age_restriction.py
+++ b/test/test_age_restriction.py
@@ -11,7 +11,6 @@ from test.helper import try_rm
 
 
 from youtube_dl import YoutubeDL
-from youtube_dl.utils import DownloadError
 
 
 def _download_restricted(url, filename, age):
@@ -27,10 +26,7 @@ def _download_restricted(url, filename, age):
     ydl.add_default_info_extractors()
     json_filename = os.path.splitext(filename)[0] + '.info.json'
     try_rm(json_filename)
-    try:
-        ydl.download([url])
-    except DownloadError:
-        try_rm(json_filename)
+    ydl.download([url])
     res = os.path.exists(json_filename)
     try_rm(json_filename)
     return res
@@ -42,12 +38,12 @@ class TestAgeRestriction(unittest.TestCase):
         self.assertFalse(_download_restricted(url, filename, age))
 
     def test_youtube(self):
-        self._assert_restricted('HtVdAasjOgU', 'HtVdAasjOgU.mp4', 10)
+        self._assert_restricted('07FYdnEawAQ', '07FYdnEawAQ.mp4', 10)
 
     def test_youporn(self):
         self._assert_restricted(
-            'https://www.youporn.com/watch/16715086/sex-ed-in-detention-18-asmr/',
-            '16715086.mp4', 2, old_age=25)
+            'http://www.youporn.com/watch/505835/sex-ed-is-it-safe-to-masturbate-daily/',
+            '505835.mp4', 2, old_age=25)
 
 
 if __name__ == '__main__':
diff --git a/test/test_all_urls.py b/test/test_all_urls.py
index 26df356b4..df6d81b5d 100644
--- a/test/test_all_urls.py
+++ b/test/test_all_urls.py
@@ -66,9 +66,18 @@ class TestAllURLsMatching(unittest.TestCase):
         self.assertMatch('https://www.youtube.com/feed/watch_later', ['youtube:tab'])
         self.assertMatch('https://www.youtube.com/feed/subscriptions', ['youtube:tab'])
 
-    def test_youtube_search_matching(self):
-        self.assertMatch('http://www.youtube.com/results?search_query=making+mustard', ['youtube:search_url'])
-        self.assertMatch('https://www.youtube.com/results?baz=bar&search_query=youtube-dl+test+video&filters=video&lclk=video', ['youtube:search_url'])
+    # def test_youtube_search_matching(self):
+    #     self.assertMatch('http://www.youtube.com/results?search_query=making+mustard', ['youtube:search_url'])
+    #     self.assertMatch('https://www.youtube.com/results?baz=bar&search_query=youtube-dl+test+video&filters=video&lclk=video', ['youtube:search_url'])
+
+    def test_youtube_extract(self):
+        assertExtractId = lambda url, id: self.assertEqual(YoutubeIE.extract_id(url), id)
+        assertExtractId('http://www.youtube.com/watch?&v=BaW_jenozKc', 'BaW_jenozKc')
+        assertExtractId('https://www.youtube.com/watch?&v=BaW_jenozKc', 'BaW_jenozKc')
+        assertExtractId('https://www.youtube.com/watch?feature=player_embedded&v=BaW_jenozKc', 'BaW_jenozKc')
+        assertExtractId('https://www.youtube.com/watch_popup?v=BaW_jenozKc', 'BaW_jenozKc')
+        assertExtractId('http://www.youtube.com/watch?v=BaW_jenozKcsharePLED17F32AD9753930', 'BaW_jenozKc')
+        assertExtractId('BaW_jenozKc', 'BaW_jenozKc')
 
     def test_facebook_matching(self):
         self.assertTrue(FacebookIE.suitable('https://www.facebook.com/Shiniknoh#!/photo.php?v=10153317450565268'))
diff --git a/test/test_cache.py b/test/test_cache.py
index 0431f4f15..a16160142 100644
--- a/test/test_cache.py
+++ b/test/test_cache.py
@@ -3,18 +3,17 @@
 
 from __future__ import unicode_literals
 
+import shutil
+
 # Allow direct execution
 import os
 import sys
 import unittest
 sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
 
-import shutil
 
 from test.helper import FakeYDL
 from youtube_dl.cache import Cache
-from youtube_dl.utils import version_tuple
-from youtube_dl.version import __version__
 
 
 def _is_empty(d):
@@ -55,29 +54,6 @@ class TestCache(unittest.TestCase):
         self.assertFalse(os.path.exists(self.test_dir))
         self.assertEqual(c.load('test_cache', 'k.'), None)
 
-    def test_cache_validation(self):
-        ydl = FakeYDL({
-            'cachedir': self.test_dir,
-        })
-        c = Cache(ydl)
-        obj = {'x': 1, 'y': ['ä', '\\a', True]}
-        c.store('test_cache', 'k.', obj)
-        self.assertEqual(c.load('test_cache', 'k.', min_ver='1970.01.01'), obj)
-        new_version = '.'.join(('%0.2d' % ((v + 1) if i == 0 else v, )) for i, v in enumerate(version_tuple(__version__)))
-        self.assertIs(c.load('test_cache', 'k.', min_ver=new_version), None)
-
-    def test_cache_clear(self):
-        ydl = FakeYDL({
-            'cachedir': self.test_dir,
-        })
-        c = Cache(ydl)
-        c.store('test_cache', 'k.', 'kay')
-        c.store('test_cache', 'l.', 'ell')
-        self.assertEqual(c.load('test_cache', 'k.'), 'kay')
-        c.clear('test_cache', 'k.')
-        self.assertEqual(c.load('test_cache', 'k.'), None)
-        self.assertEqual(c.load('test_cache', 'l.'), 'ell')
-
 
 if __name__ == '__main__':
     unittest.main()
diff --git a/test/test_compat.py b/test/test_compat.py
index b83c8cb41..86ff389fd 100644
--- a/test/test_compat.py
+++ b/test/test_compat.py
@@ -11,7 +11,6 @@ sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
 
 
 from youtube_dl.compat import (
-    compat_casefold,
     compat_getenv,
     compat_setenv,
     compat_etree_Element,
@@ -23,7 +22,6 @@ from youtube_dl.compat import (
     compat_urllib_parse_unquote,
     compat_urllib_parse_unquote_plus,
     compat_urllib_parse_urlencode,
-    compat_urllib_request,
 )
 
 
@@ -49,11 +47,10 @@ class TestCompat(unittest.TestCase):
 
     def test_all_present(self):
         import youtube_dl.compat
-        all_names = sorted(
-            youtube_dl.compat.__all__ + youtube_dl.compat.legacy)
-        present_names = set(map(compat_str, filter(
+        all_names = youtube_dl.compat.__all__
+        present_names = set(filter(
             lambda c: '_' in c and not c.startswith('_'),
-            dir(youtube_dl.compat)))) - set(['unicode_literals'])
+            dir(youtube_dl.compat))) - set(['unicode_literals'])
         self.assertEqual(all_names, sorted(present_names))
 
     def test_compat_urllib_parse_unquote(self):
@@ -121,34 +118,9 @@ class TestCompat(unittest.TestCase):
 <smil xmlns="http://www.w3.org/2001/SMIL20/Language"></smil>'''
         compat_etree_fromstring(xml)
 
-    def test_compat_struct_unpack(self):
+    def test_struct_unpack(self):
         self.assertEqual(compat_struct_unpack('!B', b'\x00'), (0,))
 
-    def test_compat_casefold(self):
-        if hasattr(compat_str, 'casefold'):
-            # don't bother to test str.casefold() (again)
-            return
-        # thanks https://bugs.python.org/file24232/casefolding.patch
-        self.assertEqual(compat_casefold('hello'), 'hello')
-        self.assertEqual(compat_casefold('hELlo'), 'hello')
-        self.assertEqual(compat_casefold('ß'), 'ss')
-        self.assertEqual(compat_casefold('fi'), 'fi')
-        self.assertEqual(compat_casefold('\u03a3'), '\u03c3')
-        self.assertEqual(compat_casefold('A\u0345\u03a3'), 'a\u03b9\u03c3')
-
-    def test_compat_urllib_request_Request(self):
-        self.assertEqual(
-            compat_urllib_request.Request('http://127.0.0.1', method='PUT').get_method(),
-            'PUT')
-
-        class PUTrequest(compat_urllib_request.Request):
-            def get_method(self):
-                return 'PUT'
-
-        self.assertEqual(
-            PUTrequest('http://127.0.0.1').get_method(),
-            'PUT')
-
 
 if __name__ == '__main__':
     unittest.main()
diff --git a/test/test_download.py b/test/test_download.py
index f7d6a23bc..ebe820dfc 100644
--- a/test/test_download.py
+++ b/test/test_download.py
@@ -9,6 +9,7 @@ import unittest
 sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
 
 from test.helper import (
+    assertGreaterEqual,
     expect_warnings,
     get_params,
     gettestcases,
@@ -19,35 +20,26 @@ from test.helper import (
 
 
 import hashlib
+import io
 import json
 import socket
 
 import youtube_dl.YoutubeDL
 from youtube_dl.compat import (
     compat_http_client,
-    compat_HTTPError,
-    compat_open as open,
     compat_urllib_error,
+    compat_HTTPError,
 )
 from youtube_dl.utils import (
     DownloadError,
     ExtractorError,
-    error_to_compat_str,
     format_bytes,
-    IDENTITY,
-    preferredencoding,
     UnavailableVideoError,
 )
 from youtube_dl.extractor import get_info_extractor
 
 RETRIES = 3
 
-# Some unittest APIs require actual str
-if not isinstance('TEST', str):
-    _encode_str = lambda s: s.encode(preferredencoding())
-else:
-    _encode_str = IDENTITY
-
 
 class YoutubeDL(youtube_dl.YoutubeDL):
     def __init__(self, *args, **kwargs):
@@ -108,31 +100,27 @@ def generator(test_case, tname):
 
         def print_skipping(reason):
             print('Skipping %s: %s' % (test_case['name'], reason))
-            self.skipTest(_encode_str(reason))
-
         if not ie.working():
             print_skipping('IE marked as not _WORKING')
+            return
 
         for tc in test_cases:
             info_dict = tc.get('info_dict', {})
             if not (info_dict.get('id') and info_dict.get('ext')):
-                raise Exception('Test definition (%s) requires both \'id\' and \'ext\' keys present to define the output file' % (tname, ))
+                raise Exception('Test definition incorrect. The output file cannot be known. Are both \'id\' and \'ext\' keys present?')
 
         if 'skip' in test_case:
             print_skipping(test_case['skip'])
-
+            return
         for other_ie in other_ies:
             if not other_ie.working():
                 print_skipping('test depends on %sIE, marked as not WORKING' % other_ie.ie_key())
+                return
 
         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',
-                              test_case['playlist_maxcount'] + 1
-                              if test_case.get('playlist_maxcount')
-                              else test_case.get('playlist_mincount'))
             params.setdefault('skip_download', True)
 
         ydl = YoutubeDL(params, auto_init=False)
@@ -158,7 +146,6 @@ def generator(test_case, tname):
                 try_rm(tc_filename)
                 try_rm(tc_filename + '.part')
                 try_rm(os.path.splitext(tc_filename)[0] + '.info.json')
-
         try_rm_tcs_files()
         try:
             try_num = 1
@@ -173,9 +160,7 @@ def generator(test_case, tname):
                 except (DownloadError, ExtractorError) as err:
                     # Check if the exception is not a network related one
                     if not err.exc_info[0] in (compat_urllib_error.URLError, socket.timeout, UnavailableVideoError, compat_http_client.BadStatusLine) or (err.exc_info[0] == compat_HTTPError and err.exc_info[1].code == 503):
-                        msg = getattr(err, 'msg', error_to_compat_str(err))
-                        err.msg = '%s (%s)' % (msg, tname, )
-                        raise err
+                        raise
 
                     if try_num == RETRIES:
                         report_warning('%s failed due to network errors, skipping...' % tname)
@@ -193,19 +178,13 @@ def generator(test_case, tname):
                 expect_info_dict(self, res_dict, test_case.get('info_dict', {}))
 
             if 'playlist_mincount' in test_case:
-                self.assertGreaterEqual(
+                assertGreaterEqual(
+                    self,
                     len(res_dict['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_maxcount' in test_case:
-                self.assertLessEqual(
-                    len(res_dict['entries']),
-                    test_case['playlist_maxcount'],
-                    'Expected at most %d in playlist %s, but got %d' % (
-                        test_case['playlist_maxcount'], test_case['url'],
-                        len(res_dict['entries'])))
             if 'playlist_count' in test_case:
                 self.assertEqual(
                     len(res_dict['entries']),
@@ -230,15 +209,7 @@ def generator(test_case, tname):
                 # First, check test cases' data against extracted data alone
                 expect_info_dict(self, tc_res_dict, tc.get('info_dict', {}))
                 # Now, check downloaded file consistency
-                # support test-case with volatile ID, signalled by regexp value
-                if tc.get('info_dict', {}).get('id', '').startswith('re:'):
-                    test_id = tc['info_dict']['id']
-                    tc['info_dict']['id'] = tc_res_dict['id']
-                else:
-                    test_id = None
                 tc_filename = get_tc_filename(tc)
-                if test_id:
-                    tc['info_dict']['id'] = test_id
                 if not test_case.get('params', {}).get('skip_download', False):
                     self.assertTrue(os.path.exists(tc_filename), msg='Missing file ' + tc_filename)
                     self.assertTrue(tc_filename in finished_hook_called)
@@ -247,8 +218,8 @@ def generator(test_case, tname):
                         if params.get('test'):
                             expected_minsize = max(expected_minsize, 10000)
                         got_fsize = os.path.getsize(tc_filename)
-                        self.assertGreaterEqual(
-                            got_fsize, expected_minsize,
+                        assertGreaterEqual(
+                            self, got_fsize, expected_minsize,
                             'Expected %s to be at least %s, but it\'s only %s ' %
                             (tc_filename, format_bytes(expected_minsize),
                                 format_bytes(got_fsize)))
@@ -261,7 +232,7 @@ def generator(test_case, tname):
                 self.assertTrue(
                     os.path.exists(info_json_fn),
                     'Missing info file %s' % info_json_fn)
-                with open(info_json_fn, encoding='utf-8') as infof:
+                with io.open(info_json_fn, encoding='utf-8') as infof:
                     info_dict = json.load(infof)
                 expect_info_dict(self, info_dict, tc.get('info_dict', {}))
         finally:
diff --git a/test/test_downloader_external.py b/test/test_downloader_external.py
deleted file mode 100644
index 4491bd9de..000000000
--- a/test/test_downloader_external.py
+++ /dev/null
@@ -1,272 +0,0 @@
-#!/usr/bin/env python
-# coding: utf-8
-from __future__ import unicode_literals
-
-# Allow direct execution
-import os
-import re
-import sys
-import subprocess
-import unittest
-sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
-
-from test.helper import (
-    FakeLogger,
-    FakeYDL,
-    http_server_port,
-    try_rm,
-)
-from youtube_dl import YoutubeDL
-from youtube_dl.compat import (
-    compat_contextlib_suppress,
-    compat_http_cookiejar_Cookie,
-    compat_http_server,
-    compat_kwargs,
-)
-from youtube_dl.utils import (
-    encodeFilename,
-    join_nonempty,
-)
-from youtube_dl.downloader.external import (
-    Aria2cFD,
-    Aria2pFD,
-    AxelFD,
-    CurlFD,
-    FFmpegFD,
-    HttpieFD,
-    WgetFD,
-)
-from youtube_dl.postprocessor import (
-    FFmpegPostProcessor,
-)
-import threading
-
-TEST_SIZE = 10 * 1024
-
-TEST_COOKIE = {
-    'version': 0,
-    'name': 'test',
-    'value': 'ytdlp',
-    'port': None,
-    'port_specified': False,
-    'domain': '.example.com',
-    'domain_specified': True,
-    'domain_initial_dot': False,
-    'path': '/',
-    'path_specified': True,
-    'secure': False,
-    'expires': None,
-    'discard': False,
-    'comment': None,
-    'comment_url': None,
-    'rest': {},
-}
-
-TEST_COOKIE_VALUE = join_nonempty('name', 'value', delim='=', from_dict=TEST_COOKIE)
-
-TEST_INFO = {'url': 'http://www.example.com/'}
-
-
-def cookiejar_Cookie(**cookie_args):
-    return compat_http_cookiejar_Cookie(**compat_kwargs(cookie_args))
-
-
-def ifExternalFDAvailable(externalFD):
-    return unittest.skipUnless(externalFD.available(),
-                               externalFD.get_basename() + ' not found')
-
-
-class HTTPTestRequestHandler(compat_http_server.BaseHTTPRequestHandler):
-    def log_message(self, format, *args):
-        pass
-
-    def send_content_range(self, total=None):
-        range_header = self.headers.get('Range')
-        start = end = None
-        if range_header:
-            mobj = re.match(r'bytes=(\d+)-(\d+)', range_header)
-            if mobj:
-                start, end = (int(mobj.group(i)) for i in (1, 2))
-        valid_range = start is not None and end is not None
-        if valid_range:
-            content_range = 'bytes %d-%d' % (start, end)
-            if total:
-                content_range += '/%d' % total
-            self.send_header('Content-Range', content_range)
-        return (end - start + 1) if valid_range else total
-
-    def serve(self, range=True, content_length=True):
-        self.send_response(200)
-        self.send_header('Content-Type', 'video/mp4')
-        size = TEST_SIZE
-        if range:
-            size = self.send_content_range(TEST_SIZE)
-        if content_length:
-            self.send_header('Content-Length', size)
-        self.end_headers()
-        self.wfile.write(b'#' * size)
-
-    def do_GET(self):
-        if self.path == '/regular':
-            self.serve()
-        elif self.path == '/no-content-length':
-            self.serve(content_length=False)
-        elif self.path == '/no-range':
-            self.serve(range=False)
-        elif self.path == '/no-range-no-content-length':
-            self.serve(range=False, content_length=False)
-        else:
-            assert False, 'unrecognised server path'
-
-
-@ifExternalFDAvailable(Aria2pFD)
-class TestAria2pFD(unittest.TestCase):
-    def setUp(self):
-        self.httpd = compat_http_server.HTTPServer(
-            ('127.0.0.1', 0), HTTPTestRequestHandler)
-        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()
-
-    def download(self, params, ep):
-        with subprocess.Popen(
-            ['aria2c', '--enable-rpc'],
-            stdout=subprocess.DEVNULL,
-            stderr=subprocess.DEVNULL
-        ) as process:
-            if not process.poll():
-                filename = 'testfile.mp4'
-                params['logger'] = FakeLogger()
-                params['outtmpl'] = filename
-                ydl = YoutubeDL(params)
-                try_rm(encodeFilename(filename))
-                self.assertEqual(ydl.download(['http://127.0.0.1:%d/%s' % (self.port, ep)]), 0)
-                self.assertEqual(os.path.getsize(encodeFilename(filename)), TEST_SIZE)
-                try_rm(encodeFilename(filename))
-            process.kill()
-
-    def download_all(self, params):
-        for ep in ('regular', 'no-content-length', 'no-range', 'no-range-no-content-length'):
-            self.download(params, ep)
-
-    def test_regular(self):
-        self.download_all({'external_downloader': 'aria2p'})
-
-    def test_chunked(self):
-        self.download_all({
-            'external_downloader': 'aria2p',
-            'http_chunk_size': 1000,
-        })
-
-
-@ifExternalFDAvailable(HttpieFD)
-class TestHttpieFD(unittest.TestCase):
-    def test_make_cmd(self):
-        with FakeYDL() as ydl:
-            downloader = HttpieFD(ydl, {})
-            self.assertEqual(
-                downloader._make_cmd('test', TEST_INFO),
-                ['http', '--download', '--output', 'test', 'http://www.example.com/'])
-
-            # Test cookie header is added
-            ydl.cookiejar.set_cookie(cookiejar_Cookie(**TEST_COOKIE))
-            self.assertEqual(
-                downloader._make_cmd('test', TEST_INFO),
-                ['http', '--download', '--output', 'test',
-                 'http://www.example.com/', 'Cookie:' + TEST_COOKIE_VALUE])
-
-
-@ifExternalFDAvailable(AxelFD)
-class TestAxelFD(unittest.TestCase):
-    def test_make_cmd(self):
-        with FakeYDL() as ydl:
-            downloader = AxelFD(ydl, {})
-            self.assertEqual(
-                downloader._make_cmd('test', TEST_INFO),
-                ['axel', '-o', 'test', '--', 'http://www.example.com/'])
-
-            # Test cookie header is added
-            ydl.cookiejar.set_cookie(cookiejar_Cookie(**TEST_COOKIE))
-            self.assertEqual(
-                downloader._make_cmd('test', TEST_INFO),
-                ['axel', '-o', 'test', '-H', 'Cookie: ' + TEST_COOKIE_VALUE,
-                 '--max-redirect=0', '--', 'http://www.example.com/'])
-
-
-@ifExternalFDAvailable(WgetFD)
-class TestWgetFD(unittest.TestCase):
-    def test_make_cmd(self):
-        with FakeYDL() as ydl:
-            downloader = WgetFD(ydl, {})
-            self.assertNotIn('--load-cookies', downloader._make_cmd('test', TEST_INFO))
-            # Test cookiejar tempfile arg is added
-            ydl.cookiejar.set_cookie(cookiejar_Cookie(**TEST_COOKIE))
-            self.assertIn('--load-cookies', downloader._make_cmd('test', TEST_INFO))
-
-
-@ifExternalFDAvailable(CurlFD)
-class TestCurlFD(unittest.TestCase):
-    def test_make_cmd(self):
-        with FakeYDL() as ydl:
-            downloader = CurlFD(ydl, {})
-            self.assertNotIn('--cookie', downloader._make_cmd('test', TEST_INFO))
-            # Test cookie header is added
-            ydl.cookiejar.set_cookie(cookiejar_Cookie(**TEST_COOKIE))
-            self.assertIn('--cookie', downloader._make_cmd('test', TEST_INFO))
-            self.assertIn(TEST_COOKIE_VALUE, downloader._make_cmd('test', TEST_INFO))
-
-
-@ifExternalFDAvailable(Aria2cFD)
-class TestAria2cFD(unittest.TestCase):
-    def test_make_cmd(self):
-        with FakeYDL() as ydl:
-            downloader = Aria2cFD(ydl, {})
-            downloader._make_cmd('test', TEST_INFO)
-            self.assertFalse(hasattr(downloader, '_cookies_tempfile'))
-
-            # Test cookiejar tempfile arg is added
-            ydl.cookiejar.set_cookie(cookiejar_Cookie(**TEST_COOKIE))
-            cmd = downloader._make_cmd('test', TEST_INFO)
-            self.assertIn('--load-cookies=%s' % downloader._cookies_tempfile, cmd)
-
-
-# Handle delegated availability
-def ifFFmpegFDAvailable(externalFD):
-    # raise SkipTest, or set False!
-    avail = ifExternalFDAvailable(externalFD) and False
-    with compat_contextlib_suppress(Exception):
-        avail = FFmpegPostProcessor(downloader=None).available
-    return unittest.skipUnless(
-        avail, externalFD.get_basename() + ' not found')
-
-
-@ifFFmpegFDAvailable(FFmpegFD)
-class TestFFmpegFD(unittest.TestCase):
-    _args = []
-
-    def _test_cmd(self, args):
-        self._args = args
-
-    def test_make_cmd(self):
-        with FakeYDL() as ydl:
-            downloader = FFmpegFD(ydl, {})
-            downloader._debug_cmd = self._test_cmd
-            info_dict = TEST_INFO.copy()
-            info_dict['ext'] = 'mp4'
-
-            downloader._call_downloader('test', info_dict)
-            self.assertEqual(self._args, [
-                'ffmpeg', '-y', '-i', 'http://www.example.com/',
-                '-c', 'copy', '-f', 'mp4', 'file:test'])
-
-            # Test cookies arg is added
-            ydl.cookiejar.set_cookie(cookiejar_Cookie(**TEST_COOKIE))
-            downloader._call_downloader('test', info_dict)
-            self.assertEqual(self._args, [
-                'ffmpeg', '-y', '-cookies', TEST_COOKIE_VALUE + '; path=/; domain=.example.com;\r\n',
-                '-i', 'http://www.example.com/', '-c', 'copy', '-f', 'mp4', 'file:test'])
-
-
-if __name__ == '__main__':
-    unittest.main()
diff --git a/test/test_downloader_http.py b/test/test_downloader_http.py
index 6af86ae48..750472281 100644
--- a/test/test_downloader_http.py
+++ b/test/test_downloader_http.py
@@ -9,11 +9,7 @@ import sys
 import unittest
 sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
 
-from test.helper import (
-    FakeLogger,
-    http_server_port,
-    try_rm,
-)
+from test.helper import http_server_port, try_rm
 from youtube_dl import YoutubeDL
 from youtube_dl.compat import compat_http_server
 from youtube_dl.downloader.http import HttpFD
@@ -70,6 +66,17 @@ class HTTPTestRequestHandler(compat_http_server.BaseHTTPRequestHandler):
             assert False
 
 
+class FakeLogger(object):
+    def debug(self, msg):
+        pass
+
+    def warning(self, msg):
+        pass
+
+    def error(self, msg):
+        pass
+
+
 class TestHttpFD(unittest.TestCase):
     def setUp(self):
         self.httpd = compat_http_server.HTTPServer(
@@ -88,7 +95,7 @@ class TestHttpFD(unittest.TestCase):
         self.assertTrue(downloader.real_download(filename, {
             'url': 'http://127.0.0.1:%d/%s' % (self.port, ep),
         }))
-        self.assertEqual(os.path.getsize(encodeFilename(filename)), TEST_SIZE, ep)
+        self.assertEqual(os.path.getsize(encodeFilename(filename)), TEST_SIZE)
         try_rm(encodeFilename(filename))
 
     def download_all(self, params):
diff --git a/test/test_execution.py b/test/test_execution.py
index 9daaafa6c..11661bb68 100644
--- a/test/test_execution.py
+++ b/test/test_execution.py
@@ -8,55 +8,37 @@ import unittest
 import sys
 import os
 import subprocess
+sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
+
+from youtube_dl.utils import encodeArgument
 
 rootDir = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
 
-sys.path.insert(0, rootDir)
 
-from youtube_dl.compat import compat_register_utf8, compat_subprocess_get_DEVNULL
-from youtube_dl.utils import encodeArgument
-
-compat_register_utf8()
-
-
-_DEV_NULL = compat_subprocess_get_DEVNULL()
+try:
+    _DEV_NULL = subprocess.DEVNULL
+except AttributeError:
+    _DEV_NULL = open(os.devnull, 'wb')
 
 
 class TestExecution(unittest.TestCase):
-    def setUp(self):
-        self.module = 'youtube_dl'
-        if sys.version_info < (2, 7):
-            self.module += '.__main__'
-
     def test_import(self):
         subprocess.check_call([sys.executable, '-c', 'import youtube_dl'], cwd=rootDir)
 
     def test_module_exec(self):
-        subprocess.check_call([sys.executable, '-m', self.module, '--version'], cwd=rootDir, stdout=_DEV_NULL)
+        if sys.version_info >= (2, 7):  # Python 2.6 doesn't support package execution
+            subprocess.check_call([sys.executable, '-m', 'youtube_dl', '--version'], cwd=rootDir, stdout=_DEV_NULL)
 
     def test_main_exec(self):
-        subprocess.check_call([sys.executable, os.path.normpath('youtube_dl/__main__.py'), '--version'], cwd=rootDir, stdout=_DEV_NULL)
+        subprocess.check_call([sys.executable, 'youtube_dl/__main__.py', '--version'], cwd=rootDir, stdout=_DEV_NULL)
 
     def test_cmdline_umlauts(self):
-        os.environ['PYTHONIOENCODING'] = 'utf-8'
         p = subprocess.Popen(
-            [sys.executable, '-m', self.module, encodeArgument('ä'), '--version'],
+            [sys.executable, 'youtube_dl/__main__.py', encodeArgument('ä'), '--version'],
             cwd=rootDir, stdout=_DEV_NULL, stderr=subprocess.PIPE)
         _, stderr = p.communicate()
         self.assertFalse(stderr)
 
-    def test_lazy_extractors(self):
-        lazy_extractors = os.path.normpath('youtube_dl/extractor/lazy_extractors.py')
-        try:
-            subprocess.check_call([sys.executable, os.path.normpath('devscripts/make_lazy_extractors.py'), lazy_extractors], cwd=rootDir, stdout=_DEV_NULL)
-            subprocess.check_call([sys.executable, os.path.normpath('test/test_all_urls.py')], cwd=rootDir, stdout=_DEV_NULL)
-        finally:
-            for x in ('', 'c') if sys.version_info[0] < 3 else ('',):
-                try:
-                    os.remove(lazy_extractors + x)
-                except OSError:
-                    pass
-
 
 if __name__ == '__main__':
     unittest.main()
diff --git a/test/test_http.py b/test/test_http.py
index 485c4c6fc..3ee0a5dda 100644
--- a/test/test_http.py
+++ b/test/test_http.py
@@ -8,163 +8,30 @@ import sys
 import unittest
 sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
 
-import contextlib
-import gzip
-import io
-import ssl
-import tempfile
-import threading
-import zlib
-
-# avoid deprecated alias assertRaisesRegexp
-if hasattr(unittest.TestCase, 'assertRaisesRegex'):
-    unittest.TestCase.assertRaisesRegexp = unittest.TestCase.assertRaisesRegex
-
-try:
-    import brotli
-except ImportError:
-    brotli = None
-try:
-    from urllib.request import pathname2url
-except ImportError:
-    from urllib import pathname2url
-
-from youtube_dl.compat import (
-    compat_http_cookiejar_Cookie,
-    compat_http_server,
-    compat_str as str,
-    compat_urllib_error,
-    compat_urllib_HTTPError,
-    compat_urllib_parse,
-    compat_urllib_request,
-)
-
-from youtube_dl.utils import (
-    sanitized_Request,
-    update_Request,
-    urlencode_postdata,
-)
-
-from test.helper import (
-    expectedFailureIf,
-    FakeYDL,
-    FakeLogger,
-    http_server_port,
-)
+from test.helper import http_server_port
 from youtube_dl import YoutubeDL
+from youtube_dl.compat import compat_http_server, compat_urllib_request
+import ssl
+import threading
 
 TEST_DIR = os.path.dirname(os.path.abspath(__file__))
 
 
 class HTTPTestRequestHandler(compat_http_server.BaseHTTPRequestHandler):
-    protocol_version = 'HTTP/1.1'
-
-    # work-around old/new -style class inheritance
-    def super(self, meth_name, *args, **kwargs):
-        from types import MethodType
-        try:
-            super()
-            fn = lambda s, m, *a, **k: getattr(super(), m)(*a, **k)
-        except TypeError:
-            fn = lambda s, m, *a, **k: getattr(compat_http_server.BaseHTTPRequestHandler, m)(s, *a, **k)
-        self.super = MethodType(fn, self)
-        return self.super(meth_name, *args, **kwargs)
-
     def log_message(self, format, *args):
         pass
 
-    def _headers(self):
-        payload = str(self.headers).encode('utf-8')
-        self.send_response(200)
-        self.send_header('Content-Type', 'application/json')
-        self.send_header('Content-Length', str(len(payload)))
-        self.end_headers()
-        self.wfile.write(payload)
-
-    def _redirect(self):
-        self.send_response(int(self.path[len('/redirect_'):]))
-        self.send_header('Location', '/method')
-        self.send_header('Content-Length', '0')
-        self.end_headers()
-
-    def _method(self, method, payload=None):
-        self.send_response(200)
-        self.send_header('Content-Length', str(len(payload or '')))
-        self.send_header('Method', method)
-        self.end_headers()
-        if payload:
-            self.wfile.write(payload)
-
-    def _status(self, status):
-        payload = '<html>{0} NOT FOUND</html>'.format(status).encode('utf-8')
-        self.send_response(int(status))
-        self.send_header('Content-Type', 'text/html; charset=utf-8')
-        self.send_header('Content-Length', str(len(payload)))
-        self.end_headers()
-        self.wfile.write(payload)
-
-    def _read_data(self):
-        if 'Content-Length' in self.headers:
-            return self.rfile.read(int(self.headers['Content-Length']))
-
-    def _test_url(self, path, host='127.0.0.1', scheme='http', port=None):
-        return '{0}://{1}:{2}/{3}'.format(
-            scheme, host,
-            port if port is not None
-            else http_server_port(self.server), path)
-
-    def do_POST(self):
-        data = self._read_data()
-        if self.path.startswith('/redirect_'):
-            self._redirect()
-        elif self.path.startswith('/method'):
-            self._method('POST', data)
-        elif self.path.startswith('/headers'):
-            self._headers()
-        else:
-            self._status(404)
-
-    def do_HEAD(self):
-        if self.path.startswith('/redirect_'):
-            self._redirect()
-        elif self.path.startswith('/method'):
-            self._method('HEAD')
-        else:
-            self._status(404)
-
-    def do_PUT(self):
-        data = self._read_data()
-        if self.path.startswith('/redirect_'):
-            self._redirect()
-        elif self.path.startswith('/method'):
-            self._method('PUT', data)
-        else:
-            self._status(404)
-
     def do_GET(self):
-
-        def respond(payload=b'<html><video src="/vid.mp4" /></html>',
-                    payload_type='text/html; charset=utf-8',
-                    payload_encoding=None,
-                    resp_code=200):
-            self.send_response(resp_code)
-            self.send_header('Content-Type', payload_type)
-            if payload_encoding:
-                self.send_header('Content-Encoding', payload_encoding)
-            self.send_header('Content-Length', str(len(payload)))  # required for persistent connections
-            self.end_headers()
-            self.wfile.write(payload)
-
-        def gzip_compress(p):
-            buf = io.BytesIO()
-            with contextlib.closing(gzip.GzipFile(fileobj=buf, mode='wb')) as f:
-                f.write(p)
-            return buf.getvalue()
-
         if self.path == '/video.html':
-            respond()
+            self.send_response(200)
+            self.send_header('Content-Type', 'text/html; charset=utf-8')
+            self.end_headers()
+            self.wfile.write(b'<html><video src="/vid.mp4" /></html>')
         elif self.path == '/vid.mp4':
-            respond(b'\x00\x00\x00\x00\x20\x66\x74[video]', 'video/mp4')
+            self.send_response(200)
+            self.send_header('Content-Type', 'video/mp4')
+            self.end_headers()
+            self.wfile.write(b'\x00\x00\x00\x00\x20\x66\x74[video]')
         elif self.path == '/302':
             if sys.version_info[0] == 3:
                 # XXX: Python 3 http server does not allow non-ASCII header values
@@ -172,336 +39,71 @@ class HTTPTestRequestHandler(compat_http_server.BaseHTTPRequestHandler):
                 self.end_headers()
                 return
 
-            new_url = self._test_url('中文.html')
+            new_url = 'http://127.0.0.1:%d/中文.html' % http_server_port(self.server)
             self.send_response(302)
             self.send_header(b'Location', new_url.encode('utf-8'))
             self.end_headers()
         elif self.path == '/%E4%B8%AD%E6%96%87.html':
-            respond()
-        elif self.path == '/%c7%9f':
-            respond()
-        elif self.path == '/redirect_dotsegments':
-            self.send_response(301)
-            # redirect to /headers but with dot segments before
-            self.send_header('Location', '/a/b/./../../headers')
-            self.send_header('Content-Length', '0')
+            self.send_response(200)
+            self.send_header('Content-Type', 'text/html; charset=utf-8')
             self.end_headers()
-        elif self.path.startswith('/redirect_'):
-            self._redirect()
-        elif self.path.startswith('/method'):
-            self._method('GET')
-        elif self.path.startswith('/headers'):
-            self._headers()
-        elif self.path.startswith('/308-to-headers'):
-            self.send_response(308)
-            self.send_header('Location', '/headers')
-            self.send_header('Content-Length', '0')
-            self.end_headers()
-        elif self.path == '/trailing_garbage':
-            payload = b'<html><video src="/vid.mp4" /></html>'
-            compressed = gzip_compress(payload) + b'trailing garbage'
-            respond(compressed, payload_encoding='gzip')
-        elif self.path == '/302-non-ascii-redirect':
-            new_url = self._test_url('中文.html')
-            # actually respond with permanent redirect
-            self.send_response(301)
-            self.send_header('Location', new_url)
-            self.send_header('Content-Length', '0')
-            self.end_headers()
-        elif self.path == '/content-encoding':
-            encodings = self.headers.get('ytdl-encoding', '')
-            payload = b'<html><video src="/vid.mp4" /></html>'
-            for encoding in filter(None, (e.strip() for e in encodings.split(','))):
-                if encoding == 'br' and brotli:
-                    payload = brotli.compress(payload)
-                elif encoding == 'gzip':
-                    payload = gzip_compress(payload)
-                elif encoding == 'deflate':
-                    payload = zlib.compress(payload)
-                elif encoding == 'unsupported':
-                    payload = b'raw'
-                    break
-                else:
-                    self._status(415)
-                    return
-            respond(payload, payload_encoding=encodings)
-
+            self.wfile.write(b'<html><video src="/vid.mp4" /></html>')
         else:
-            self._status(404)
+            assert False
 
-    def send_header(self, keyword, value):
-        """
-        Forcibly allow HTTP server to send non percent-encoded non-ASCII characters in headers.
-        This is against what is defined in RFC 3986: but we need to test that we support this
-        since some sites incorrectly do this.
-        """
-        if keyword.lower() == 'connection':
-            return self.super('send_header', keyword, value)
 
-        if not hasattr(self, '_headers_buffer'):
-            self._headers_buffer = []
+class FakeLogger(object):
+    def debug(self, msg):
+        pass
 
-        self._headers_buffer.append('{0}: {1}\r\n'.format(keyword, value).encode('utf-8'))
+    def warning(self, msg):
+        pass
 
-    def end_headers(self):
-        if hasattr(self, '_headers_buffer'):
-            self.wfile.write(b''.join(self._headers_buffer))
-            self._headers_buffer = []
-        self.super('end_headers')
+    def error(self, msg):
+        pass
 
 
 class TestHTTP(unittest.TestCase):
-    # when does it make sense to check the SSL certificate?
-    _check_cert = (
-        sys.version_info >= (3, 2)
-        or (sys.version_info[0] == 2 and sys.version_info[1:] >= (7, 19)))
-
     def setUp(self):
-        # HTTP server
-        self.http_httpd = compat_http_server.HTTPServer(
+        self.httpd = compat_http_server.HTTPServer(
             ('127.0.0.1', 0), HTTPTestRequestHandler)
-        self.http_port = http_server_port(self.http_httpd)
-
-        self.http_server_thread = threading.Thread(target=self.http_httpd.serve_forever)
-        self.http_server_thread.daemon = True
-        self.http_server_thread.start()
-
-        try:
-            from http.server import ThreadingHTTPServer
-        except ImportError:
-            try:
-                from socketserver import ThreadingMixIn
-            except ImportError:
-                from SocketServer import ThreadingMixIn
-
-            class ThreadingHTTPServer(ThreadingMixIn, compat_http_server.HTTPServer):
-                pass
-
-        # HTTPS server
-        certfn = os.path.join(TEST_DIR, 'testcert.pem')
-        self.https_httpd = ThreadingHTTPServer(
-            ('127.0.0.1', 0), HTTPTestRequestHandler)
-        try:
-            sslctx = ssl.SSLContext(ssl.PROTOCOL_SSLv23)
-            sslctx.verify_mode = ssl.CERT_NONE
-            sslctx.check_hostname = False
-            sslctx.load_cert_chain(certfn, None)
-            self.https_httpd.socket = sslctx.wrap_socket(
-                self.https_httpd.socket, server_side=True)
-        except AttributeError:
-            self.https_httpd.socket = ssl.wrap_socket(
-                self.https_httpd.socket, certfile=certfn, server_side=True)
-
-        self.https_port = http_server_port(self.https_httpd)
-        self.https_server_thread = threading.Thread(target=self.https_httpd.serve_forever)
-        self.https_server_thread.daemon = True
-        self.https_server_thread.start()
-
-    def tearDown(self):
-
-        def closer(svr):
-            def _closer():
-                svr.shutdown()
-                svr.server_close()
-            return _closer
-
-        shutdown_thread = threading.Thread(target=closer(self.http_httpd))
-        shutdown_thread.start()
-        self.http_server_thread.join(2.0)
-
-        shutdown_thread = threading.Thread(target=closer(self.https_httpd))
-        shutdown_thread.start()
-        self.https_server_thread.join(2.0)
-
-    def _test_url(self, path, host='127.0.0.1', scheme='http', port=None):
-        return '{0}://{1}:{2}/{3}'.format(
-            scheme, host,
-            port if port is not None
-            else self.https_port if scheme == 'https'
-            else self.http_port, path)
-
-    @unittest.skipUnless(_check_cert, 'No support for certificate check in SSL')
-    def test_nocheckcertificate(self):
-        with FakeYDL({'logger': FakeLogger()}) as ydl:
-            with self.assertRaises(compat_urllib_error.URLError):
-                ydl.urlopen(sanitized_Request(self._test_url('headers', scheme='https')))
-
-        with FakeYDL({'logger': FakeLogger(), 'nocheckcertificate': True}) as ydl:
-            r = ydl.urlopen(sanitized_Request(self._test_url('headers', scheme='https')))
-            self.assertEqual(r.getcode(), 200)
-            r.close()
-
-    def test_percent_encode(self):
-        with FakeYDL() as ydl:
-            # Unicode characters should be encoded with uppercase percent-encoding
-            res = ydl.urlopen(sanitized_Request(self._test_url('中文.html')))
-            self.assertEqual(res.getcode(), 200)
-            res.close()
-            # don't normalize existing percent encodings
-            res = ydl.urlopen(sanitized_Request(self._test_url('%c7%9f')))
-            self.assertEqual(res.getcode(), 200)
-            res.close()
+        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()
 
     def test_unicode_path_redirection(self):
-        with FakeYDL() as ydl:
-            r = ydl.urlopen(sanitized_Request(self._test_url('302-non-ascii-redirect')))
-            self.assertEqual(r.url, self._test_url('%E4%B8%AD%E6%96%87.html'))
-            r.close()
+        # XXX: Python 3 http server does not allow non-ASCII header values
+        if sys.version_info[0] == 3:
+            return
 
-    def test_redirect(self):
-        with FakeYDL() as ydl:
-            def do_req(redirect_status, method, check_no_content=False):
-                data = b'testdata' if method in ('POST', 'PUT') else None
-                res = ydl.urlopen(sanitized_Request(
-                    self._test_url('redirect_{0}'.format(redirect_status)),
-                    method=method, data=data))
-                if check_no_content:
-                    self.assertNotIn('Content-Type', res.headers)
-                return res.read().decode('utf-8'), res.headers.get('method', '')
-            # A 303 must either use GET or HEAD for subsequent request
-            self.assertEqual(do_req(303, 'POST'), ('', 'GET'))
-            self.assertEqual(do_req(303, 'HEAD'), ('', 'HEAD'))
+        ydl = YoutubeDL({'logger': FakeLogger()})
+        r = ydl.extract_info('http://127.0.0.1:%d/302' % self.port)
+        self.assertEqual(r['entries'][0]['url'], 'http://127.0.0.1:%d/vid.mp4' % self.port)
 
-            self.assertEqual(do_req(303, 'PUT'), ('', 'GET'))
 
-            # 301 and 302 turn POST only into a GET, with no Content-Type
-            self.assertEqual(do_req(301, 'POST', True), ('', 'GET'))
-            self.assertEqual(do_req(301, 'HEAD'), ('', 'HEAD'))
-            self.assertEqual(do_req(302, 'POST', True), ('', 'GET'))
-            self.assertEqual(do_req(302, 'HEAD'), ('', 'HEAD'))
+class TestHTTPS(unittest.TestCase):
+    def setUp(self):
+        certfn = os.path.join(TEST_DIR, 'testcert.pem')
+        self.httpd = compat_http_server.HTTPServer(
+            ('127.0.0.1', 0), HTTPTestRequestHandler)
+        self.httpd.socket = ssl.wrap_socket(
+            self.httpd.socket, certfile=certfn, server_side=True)
+        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.assertEqual(do_req(301, 'PUT'), ('testdata', 'PUT'))
-            self.assertEqual(do_req(302, 'PUT'), ('testdata', 'PUT'))
+    def test_nocheckcertificate(self):
+        if sys.version_info >= (2, 7, 9):  # No certificate checking anyways
+            ydl = YoutubeDL({'logger': FakeLogger()})
+            self.assertRaises(
+                Exception,
+                ydl.extract_info, 'https://127.0.0.1:%d/video.html' % self.port)
 
-            # 307 and 308 should not change method
-            for m in ('POST', 'PUT'):
-                self.assertEqual(do_req(307, m), ('testdata', m))
-                self.assertEqual(do_req(308, m), ('testdata', m))
-
-            self.assertEqual(do_req(307, 'HEAD'), ('', 'HEAD'))
-            self.assertEqual(do_req(308, 'HEAD'), ('', 'HEAD'))
-
-            # These should not redirect and instead raise an HTTPError
-            for code in (300, 304, 305, 306):
-                with self.assertRaises(compat_urllib_HTTPError):
-                    do_req(code, 'GET')
-
-    # Jython 2.7.1 times out for some reason
-    @expectedFailureIf(sys.platform.startswith('java') and sys.version_info < (2, 7, 2))
-    def test_content_type(self):
-        # https://github.com/yt-dlp/yt-dlp/commit/379a4f161d4ad3e40932dcf5aca6e6fb9715ab28
-        with FakeYDL({'nocheckcertificate': True}) as ydl:
-            # method should be auto-detected as POST
-            r = sanitized_Request(self._test_url('headers', scheme='https'), data=urlencode_postdata({'test': 'test'}))
-
-            headers = ydl.urlopen(r).read().decode('utf-8')
-            self.assertIn('Content-Type: application/x-www-form-urlencoded', headers)
-
-            # test http
-            r = sanitized_Request(self._test_url('headers'), data=urlencode_postdata({'test': 'test'}))
-            headers = ydl.urlopen(r).read().decode('utf-8')
-            self.assertIn('Content-Type: application/x-www-form-urlencoded', headers)
-
-    def test_update_req(self):
-        req = sanitized_Request('http://example.com')
-        assert req.data is None
-        assert req.get_method() == 'GET'
-        assert not req.has_header('Content-Type')
-        # Test that zero-byte payloads will be sent
-        req = update_Request(req, data=b'')
-        assert req.data == b''
-        assert req.get_method() == 'POST'
-        # yt-dl expects data to be encoded and Content-Type to be added by sender
-        # assert req.get_header('Content-Type') == 'application/x-www-form-urlencoded'
-
-    def test_cookiejar(self):
-        with FakeYDL() as ydl:
-            ydl.cookiejar.set_cookie(compat_http_cookiejar_Cookie(
-                0, 'test', 'ytdl', None, False, '127.0.0.1', True,
-                False, '/headers', True, False, None, False, None, None, {}))
-            data = ydl.urlopen(sanitized_Request(
-                self._test_url('headers'))).read().decode('utf-8')
-            self.assertIn('Cookie: test=ytdl', data)
-
-    def test_passed_cookie_header(self):
-        # We should accept a Cookie header being passed as in normal headers and handle it appropriately.
-        with FakeYDL() as ydl:
-            # Specified Cookie header should be used
-            res = ydl.urlopen(sanitized_Request(
-                self._test_url('headers'), headers={'Cookie': 'test=test'})).read().decode('utf-8')
-            self.assertIn('Cookie: test=test', res)
-
-            # Specified Cookie header should be removed on any redirect
-            res = ydl.urlopen(sanitized_Request(
-                self._test_url('308-to-headers'), headers={'Cookie': 'test=test'})).read().decode('utf-8')
-            self.assertNotIn('Cookie: test=test', res)
-
-            # Specified Cookie header should override global cookiejar for that request
-            ydl.cookiejar.set_cookie(compat_http_cookiejar_Cookie(
-                0, 'test', 'ytdlp', None, False, '127.0.0.1', True,
-                False, '/headers', True, False, None, False, None, None, {}))
-            data = ydl.urlopen(sanitized_Request(
-                self._test_url('headers'), headers={'Cookie': 'test=test'})).read().decode('utf-8')
-            self.assertNotIn('Cookie: test=ytdlp', data)
-            self.assertIn('Cookie: test=test', data)
-
-    def test_no_compression_compat_header(self):
-        with FakeYDL() as ydl:
-            data = ydl.urlopen(
-                sanitized_Request(
-                    self._test_url('headers'),
-                    headers={'Youtubedl-no-compression': True})).read()
-            self.assertIn(b'Accept-Encoding: identity', data)
-            self.assertNotIn(b'youtubedl-no-compression', data.lower())
-
-    def test_gzip_trailing_garbage(self):
-        # https://github.com/ytdl-org/youtube-dl/commit/aa3e950764337ef9800c936f4de89b31c00dfcf5
-        # https://github.com/ytdl-org/youtube-dl/commit/6f2ec15cee79d35dba065677cad9da7491ec6e6f
-        with FakeYDL() as ydl:
-            data = ydl.urlopen(sanitized_Request(self._test_url('trailing_garbage'))).read().decode('utf-8')
-            self.assertEqual(data, '<html><video src="/vid.mp4" /></html>')
-
-    def __test_compression(self, encoding):
-        with FakeYDL() as ydl:
-            res = ydl.urlopen(
-                sanitized_Request(
-                    self._test_url('content-encoding'),
-                    headers={'ytdl-encoding': encoding}))
-            # decoded encodings are removed: only check for valid decompressed data
-            self.assertEqual(res.read(), b'<html><video src="/vid.mp4" /></html>')
-
-    @unittest.skipUnless(brotli, 'brotli support is not installed')
-    def test_brotli(self):
-        self.__test_compression('br')
-
-    def test_deflate(self):
-        self.__test_compression('deflate')
-
-    def test_gzip(self):
-        self.__test_compression('gzip')
-
-    def test_multiple_encodings(self):
-        # https://www.rfc-editor.org/rfc/rfc9110.html#section-8.4
-        for pair in ('gzip,deflate', 'deflate, gzip', 'gzip, gzip', 'deflate, deflate'):
-            self.__test_compression(pair)
-
-    def test_unsupported_encoding(self):
-        # it should return the raw content
-        with FakeYDL() as ydl:
-            res = ydl.urlopen(
-                sanitized_Request(
-                    self._test_url('content-encoding'),
-                    headers={'ytdl-encoding': 'unsupported'}))
-            self.assertEqual(res.headers.get('Content-Encoding'), 'unsupported')
-            self.assertEqual(res.read(), b'raw')
-
-    def test_remove_dot_segments(self):
-        with FakeYDL() as ydl:
-            res = ydl.urlopen(sanitized_Request(self._test_url('a/b/./../../headers')))
-            self.assertEqual(compat_urllib_parse.urlparse(res.geturl()).path, '/headers')
-
-            res = ydl.urlopen(sanitized_Request(self._test_url('redirect_dotsegments')))
-            self.assertEqual(compat_urllib_parse.urlparse(res.geturl()).path, '/headers')
+        ydl = YoutubeDL({'logger': FakeLogger(), 'nocheckcertificate': True})
+        r = ydl.extract_info('https://127.0.0.1:%d/video.html' % self.port)
+        self.assertEqual(r['entries'][0]['url'], 'https://127.0.0.1:%d/vid.mp4' % self.port)
 
 
 def _build_proxy_handler(name):
@@ -515,7 +117,7 @@ def _build_proxy_handler(name):
             self.send_response(200)
             self.send_header('Content-Type', 'text/plain; charset=utf-8')
             self.end_headers()
-            self.wfile.write('{0}: {1}'.format(self.proxy_name, self.path).encode('utf-8'))
+            self.wfile.write('{self.proxy_name}: {self.path}'.format(self=self).encode('utf-8'))
     return HTTPTestRequestHandler
 
 
@@ -535,30 +137,10 @@ class TestProxy(unittest.TestCase):
         self.geo_proxy_thread.daemon = True
         self.geo_proxy_thread.start()
 
-    def tearDown(self):
-
-        def closer(svr):
-            def _closer():
-                svr.shutdown()
-                svr.server_close()
-            return _closer
-
-        shutdown_thread = threading.Thread(target=closer(self.proxy))
-        shutdown_thread.start()
-        self.proxy_thread.join(2.0)
-
-        shutdown_thread = threading.Thread(target=closer(self.geo_proxy))
-        shutdown_thread.start()
-        self.geo_proxy_thread.join(2.0)
-
-    def _test_proxy(self, host='127.0.0.1', port=None):
-        return '{0}:{1}'.format(
-            host, port if port is not None else self.port)
-
     def test_proxy(self):
-        geo_proxy = self._test_proxy(port=self.geo_port)
+        geo_proxy = '127.0.0.1:{0}'.format(self.geo_port)
         ydl = YoutubeDL({
-            'proxy': self._test_proxy(),
+            'proxy': '127.0.0.1:{0}'.format(self.port),
             'geo_verification_proxy': geo_proxy,
         })
         url = 'http://foo.com/bar'
@@ -572,7 +154,7 @@ class TestProxy(unittest.TestCase):
 
     def test_proxy_with_idn(self):
         ydl = YoutubeDL({
-            'proxy': self._test_proxy(),
+            'proxy': '127.0.0.1:{0}'.format(self.port),
         })
         url = 'http://中文.tw/'
         response = ydl.urlopen(url).read().decode('utf-8')
@@ -580,25 +162,5 @@ class TestProxy(unittest.TestCase):
         self.assertEqual(response, 'normal: http://xn--fiq228c.tw/')
 
 
-class TestFileURL(unittest.TestCase):
-    # See https://github.com/ytdl-org/youtube-dl/issues/8227
-    def test_file_urls(self):
-        tf = tempfile.NamedTemporaryFile(delete=False)
-        tf.write(b'foobar')
-        tf.close()
-        url = compat_urllib_parse.urljoin('file://', pathname2url(tf.name))
-        with FakeYDL() as ydl:
-            self.assertRaisesRegexp(
-                compat_urllib_error.URLError, 'file:// scheme is explicitly disabled in youtube-dl for security reasons', ydl.urlopen, url)
-        # not yet implemented
-        """
-        with FakeYDL({'enable_file_urls': True}) as ydl:
-            res = ydl.urlopen(url)
-            self.assertEqual(res.read(), b'foobar')
-            res.close()
-        """
-        os.unlink(tf.name)
-
-
 if __name__ == '__main__':
     unittest.main()
diff --git a/test/test_jsinterp.py b/test/test_jsinterp.py
index 479cb43a0..c24b8ca74 100644
--- a/test/test_jsinterp.py
+++ b/test/test_jsinterp.py
@@ -1,5 +1,4 @@
 #!/usr/bin/env python
-# coding: utf-8
 
 from __future__ import unicode_literals
 
@@ -7,650 +6,111 @@ from __future__ import unicode_literals
 import os
 import sys
 import unittest
-
 sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
 
-import math
-import re
-import time
-
-from youtube_dl.compat import compat_str as str
-from youtube_dl.jsinterp import JS_Undefined, JSInterpreter
-
-NaN = object()
+from youtube_dl.jsinterp import JSInterpreter
 
 
 class TestJSInterpreter(unittest.TestCase):
-    def _test(self, jsi_or_code, expected, func='f', args=()):
-        if isinstance(jsi_or_code, str):
-            jsi_or_code = JSInterpreter(jsi_or_code)
-        got = jsi_or_code.call_function(func, *args)
-        if expected is NaN:
-            self.assertTrue(math.isnan(got), '{0} is not NaN'.format(got))
-        else:
-            self.assertEqual(got, expected)
-
     def test_basic(self):
-        jsi = JSInterpreter('function f(){;}')
-        self.assertEqual(repr(jsi.extract_function('f')), 'F<f>')
-        self._test(jsi, None)
+        jsi = JSInterpreter('function x(){;}')
+        self.assertEqual(jsi.call_function('x'), None)
 
-        self._test('function f(){return 42;}', 42)
-        self._test('function f(){42}', None)
-        self._test('var f = function(){return 42;}', 42)
+        jsi = JSInterpreter('function x3(){return 42;}')
+        self.assertEqual(jsi.call_function('x3'), 42)
 
-    def test_add(self):
-        self._test('function f(){return 42 + 7;}', 49)
-        self._test('function f(){return 42 + undefined;}', NaN)
-        self._test('function f(){return 42 + null;}', 42)
-        self._test('function f(){return 1 + "";}', '1')
-        self._test('function f(){return 42 + "7";}', '427')
-        self._test('function f(){return false + true;}', 1)
-        self._test('function f(){return "false" + true;}', 'falsetrue')
-        self._test('function f(){return '
-                   '1 + "2" + [3,4] + {k: 56} + null + undefined + Infinity;}',
-                   '123,4[object Object]nullundefinedInfinity')
-
-    def test_sub(self):
-        self._test('function f(){return 42 - 7;}', 35)
-        self._test('function f(){return 42 - undefined;}', NaN)
-        self._test('function f(){return 42 - null;}', 42)
-        self._test('function f(){return 42 - "7";}', 35)
-        self._test('function f(){return 42 - "spam";}', NaN)
-
-    def test_mul(self):
-        self._test('function f(){return 42 * 7;}', 294)
-        self._test('function f(){return 42 * undefined;}', NaN)
-        self._test('function f(){return 42 * null;}', 0)
-        self._test('function f(){return 42 * "7";}', 294)
-        self._test('function f(){return 42 * "eggs";}', NaN)
-
-    def test_div(self):
-        jsi = JSInterpreter('function f(a, b){return a / b;}')
-        self._test(jsi, NaN, args=(0, 0))
-        self._test(jsi, NaN, args=(JS_Undefined, 1))
-        self._test(jsi, float('inf'), args=(2, 0))
-        self._test(jsi, 0, args=(0, 3))
-        self._test(jsi, 6, args=(42, 7))
-        self._test(jsi, 0, args=(42, float('inf')))
-        self._test(jsi, 6, args=("42", 7))
-        self._test(jsi, NaN, args=("spam", 7))
-
-    def test_mod(self):
-        self._test('function f(){return 42 % 7;}', 0)
-        self._test('function f(){return 42 % 0;}', NaN)
-        self._test('function f(){return 42 % undefined;}', NaN)
-        self._test('function f(){return 42 % "7";}', 0)
-        self._test('function f(){return 42 % "beans";}', NaN)
-
-    def test_exp(self):
-        self._test('function f(){return 42 ** 2;}', 1764)
-        self._test('function f(){return 42 ** undefined;}', NaN)
-        self._test('function f(){return 42 ** null;}', 1)
-        self._test('function f(){return undefined ** 0;}', 1)
-        self._test('function f(){return undefined ** 42;}', NaN)
-        self._test('function f(){return 42 ** "2";}', 1764)
-        self._test('function f(){return 42 ** "spam";}', NaN)
+        jsi = JSInterpreter('var x5 = function(){return 42;}')
+        self.assertEqual(jsi.call_function('x5'), 42)
 
     def test_calc(self):
-        self._test('function f(a){return 2*a+1;}', 7, args=[3])
+        jsi = JSInterpreter('function x4(a){return 2*a+1;}')
+        self.assertEqual(jsi.call_function('x4', 3), 7)
 
     def test_empty_return(self):
-        self._test('function f(){return; y()}', None)
+        jsi = JSInterpreter('function f(){return; y()}')
+        self.assertEqual(jsi.call_function('f'), None)
 
     def test_morespace(self):
-        self._test('function f (a) { return 2 * a + 1 ; }', 7, args=[3])
-        self._test('function f () { x =  2  ; return x; }', 2)
+        jsi = JSInterpreter('function x (a) { return 2 * a + 1 ; }')
+        self.assertEqual(jsi.call_function('x', 3), 7)
+
+        jsi = JSInterpreter('function f () { x =  2  ; return x; }')
+        self.assertEqual(jsi.call_function('f'), 2)
 
     def test_strange_chars(self):
-        self._test('function $_xY1 ($_axY1) { var $_axY2 = $_axY1 + 1; return $_axY2; }',
-                   21, args=[20], func='$_xY1')
+        jsi = JSInterpreter('function $_xY1 ($_axY1) { var $_axY2 = $_axY1 + 1; return $_axY2; }')
+        self.assertEqual(jsi.call_function('$_xY1', 20), 21)
 
     def test_operators(self):
-        self._test('function f(){return 1 << 5;}', 32)
-        self._test('function f(){return 2 ** 5}', 32)
-        self._test('function f(){return 19 & 21;}', 17)
-        self._test('function f(){return 11 >> 2;}', 2)
-        self._test('function f(){return []? 2+3: 4;}', 5)
-        # equality
-        self._test('function f(){return 1 == 1}', True)
-        self._test('function f(){return 1 == 1.0}', True)
-        self._test('function f(){return 1 == "1"}', True)
-        self._test('function f(){return 1 == 2}', False)
-        self._test('function f(){return 1 != "1"}', False)
-        self._test('function f(){return 1 != 2}', True)
-        self._test('function f(){var x = {a: 1}; var y = x; return x == y}', True)
-        self._test('function f(){var x = {a: 1}; return x == {a: 1}}', False)
-        self._test('function f(){return NaN == NaN}', False)
-        self._test('function f(){return null == undefined}', True)
-        self._test('function f(){return "spam, eggs" == "spam, eggs"}', True)
-        # strict equality
-        self._test('function f(){return 1 === 1}', True)
-        self._test('function f(){return 1 === 1.0}', True)
-        self._test('function f(){return 1 === "1"}', False)
-        self._test('function f(){return 1 === 2}', False)
-        self._test('function f(){var x = {a: 1}; var y = x; return x === y}', True)
-        self._test('function f(){var x = {a: 1}; return x === {a: 1}}', False)
-        self._test('function f(){return NaN === NaN}', False)
-        self._test('function f(){return null === undefined}', False)
-        self._test('function f(){return null === null}', True)
-        self._test('function f(){return undefined === undefined}', True)
-        self._test('function f(){return "uninterned" === "uninterned"}', True)
-        self._test('function f(){return 1 === 1}', True)
-        self._test('function f(){return 1 === "1"}', False)
-        self._test('function f(){return 1 !== 1}', False)
-        self._test('function f(){return 1 !== "1"}', True)
-        # expressions
-        self._test('function f(){return 0 && 1 || 2;}', 2)
-        self._test('function f(){return 0 ?? 42;}', 0)
-        self._test('function f(){return "life, the universe and everything" < 42;}', False)
-        # https://github.com/ytdl-org/youtube-dl/issues/32815
-        self._test('function f(){return 0  - 7 * - 6;}', 42)
+        jsi = JSInterpreter('function f(){return 1 << 5;}')
+        self.assertEqual(jsi.call_function('f'), 32)
 
-    def test_bitwise_operators_typecast(self):
-        # madness
-        self._test('function f(){return null << 5}', 0)
-        self._test('function f(){return undefined >> 5}', 0)
-        self._test('function f(){return 42 << NaN}', 42)
-        self._test('function f(){return 42 << Infinity}', 42)
-        self._test('function f(){return 0.0 << null}', 0)
-        self._test('function f(){return NaN << 42}', 0)
-        self._test('function f(){return "21.9" << 1}', 42)
-        self._test('function f(){return true << "5";}', 32)
-        self._test('function f(){return true << true;}', 2)
-        self._test('function f(){return "19" & "21.9";}', 17)
-        self._test('function f(){return "19" & false;}', 0)
-        self._test('function f(){return "11.0" >> "2.1";}', 2)
-        self._test('function f(){return 5 ^ 9;}', 12)
-        self._test('function f(){return 0.0 << NaN}', 0)
-        self._test('function f(){return null << undefined}', 0)
-        self._test('function f(){return 21 << 4294967297}', 42)
+        jsi = JSInterpreter('function f(){return 19 & 21;}')
+        self.assertEqual(jsi.call_function('f'), 17)
+
+        jsi = JSInterpreter('function f(){return 11 >> 2;}')
+        self.assertEqual(jsi.call_function('f'), 2)
 
     def test_array_access(self):
-        self._test('function f(){var x = [1,2,3]; x[0] = 4; x[0] = 5; x[2.0] = 7; return x;}', [5, 2, 7])
+        jsi = JSInterpreter('function f(){var x = [1,2,3]; x[0] = 4; x[0] = 5; x[2] = 7; return x;}')
+        self.assertEqual(jsi.call_function('f'), [5, 2, 7])
 
     def test_parens(self):
-        self._test('function f(){return (1) + (2) * ((( (( (((((3)))))) )) ));}', 7)
-        self._test('function f(){return (1 + 2) * 3;}', 9)
+        jsi = JSInterpreter('function f(){return (1) + (2) * ((( (( (((((3)))))) )) ));}')
+        self.assertEqual(jsi.call_function('f'), 7)
 
-    def test_quotes(self):
-        self._test(r'function f(){return "a\"\\("}', r'a"\(')
+        jsi = JSInterpreter('function f(){return (1 + 2) * 3;}')
+        self.assertEqual(jsi.call_function('f'), 9)
 
     def test_assignments(self):
-        self._test('function f(){var x = 20; x = 30 + 1; return x;}', 31)
-        self._test('function f(){var x = 20; x += 30 + 1; return x;}', 51)
-        self._test('function f(){var x = 20; x -= 30 + 1; return x;}', -11)
-        self._test('function f(){var x = 2; var y = ["a", "b"]; y[x%y["length"]]="z"; return y}', ['z', 'b'])
+        jsi = JSInterpreter('function f(){var x = 20; x = 30 + 1; return x;}')
+        self.assertEqual(jsi.call_function('f'), 31)
+
+        jsi = JSInterpreter('function f(){var x = 20; x += 30 + 1; return x;}')
+        self.assertEqual(jsi.call_function('f'), 51)
+
+        jsi = JSInterpreter('function f(){var x = 20; x -= 30 + 1; return x;}')
+        self.assertEqual(jsi.call_function('f'), -11)
 
     def test_comments(self):
-        self._test('''
-            function f() {
-                var x = /* 1 + */ 2;
-                var y = /* 30
-                * 40 */ 50;
-                return x + y;
-            }
-        ''', 52)
+        'Skipping: Not yet fully implemented'
+        return
+        jsi = JSInterpreter('''
+        function x() {
+            var x = /* 1 + */ 2;
+            var y = /* 30
+            * 40 */ 50;
+            return x + y;
+        }
+        ''')
+        self.assertEqual(jsi.call_function('x'), 52)
 
-        self._test('''
-            function f() {
-                var x = "/*";
-                var y = 1 /* comment */ + 2;
-                return y;
-            }
-        ''', 3)
-
-        self._test('''
-            function f() {
-                var x = ( /* 1 + */ 2 +
-                          /* 30 * 40 */
-                          50);
-                return x;
-            }
-        ''', 52)
+        jsi = JSInterpreter('''
+        function f() {
+            var x = "/*";
+            var y = 1 /* comment */ + 2;
+            return y;
+        }
+        ''')
+        self.assertEqual(jsi.call_function('f'), 3)
 
     def test_precedence(self):
-        self._test('''
-            function f() {
-                var a = [10, 20, 30, 40, 50];
-                var b = 6;
-                a[0]=a[b%a.length];
-                return a;
-            }
-        ''', [20, 20, 30, 40, 50])
-
-    def test_builtins(self):
-        self._test('function f() { return NaN }', NaN)
-
-    def test_Date(self):
-        self._test('function f() { return new Date("Wednesday 31 December 1969 18:01:26 MDT") - 0; }', 86000)
-
-        jsi = JSInterpreter('function f(dt) { return new Date(dt) - 0; }')
-        # date format m/d/y
-        self._test(jsi, 86000, args=['12/31/1969 18:01:26 MDT'])
-        # epoch 0
-        self._test(jsi, 0, args=['1 January 1970 00:00:00 UTC'])
-        # undefined
-        self._test(jsi, NaN, args=[JS_Undefined])
-        # y,m,d, ... - may fail with older dates lacking DST data
-        jsi = JSInterpreter(
-            'function f() { return new Date(%s); }'
-            % ('2024, 5, 29, 2, 52, 12, 42',))
-        self._test(jsi, (
-            1719625932042                           # UK value
-            + (
-                + 3600                              # back to GMT
-                + (time.altzone if time.daylight    # host's DST
-                   else time.timezone)
-            ) * 1000))
-        # no arg
-        self.assertAlmostEqual(JSInterpreter(
-            'function f() { return new Date() - 0; }').call_function('f'),
-            time.time() * 1000, delta=100)
-        # Date.now()
-        self.assertAlmostEqual(JSInterpreter(
-            'function f() { return Date.now(); }').call_function('f'),
-            time.time() * 1000, delta=100)
-        # Date.parse()
-        jsi = JSInterpreter('function f(dt) { return Date.parse(dt); }')
-        self._test(jsi, 0, args=['1 January 1970 00:00:00 UTC'])
-        # Date.UTC()
-        jsi = JSInterpreter('function f() { return Date.UTC(%s); }'
-                            % ('1970, 0, 1, 0, 0, 0, 0',))
-        self._test(jsi, 0)
+        jsi = JSInterpreter('''
+        function x() {
+            var a = [10, 20, 30, 40, 50];
+            var b = 6;
+            a[0]=a[b%a.length];
+            return a;
+        }''')
+        self.assertEqual(jsi.call_function('x'), [20, 20, 30, 40, 50])
 
     def test_call(self):
         jsi = JSInterpreter('''
         function x() { return 2; }
-        function y(a) { return x() + (a?a:0); }
+        function y(a) { return x() + a; }
         function z() { return y(3); }
         ''')
-        self._test(jsi, 5, func='z')
-        self._test(jsi, 2, func='y')
-
-    def test_if(self):
-        self._test('''
-            function f() {
-            let a = 9;
-            if (0==0) {a++}
-            return a
-            }
-        ''', 10)
-
-        self._test('''
-            function f() {
-            if (0==0) {return 10}
-            }
-        ''', 10)
-
-        self._test('''
-            function f() {
-            if (0!=0) {return 1}
-            else {return 10}
-            }
-        ''', 10)
-
-    def test_elseif(self):
-        self._test('''
-            function f() {
-                if (0!=0) {return 1}
-                else if (1==0) {return 2}
-                else {return 10}
-            }
-        ''', 10)
-
-    def test_for_loop(self):
-        self._test('function f() { a=0; for (i=0; i-10; i++) {a++} return a }', 10)
-
-    def test_while_loop(self):
-        self._test('function f() { a=0; while (a<10) {a++} return a }', 10)
-
-    def test_switch(self):
-        jsi = JSInterpreter('''
-            function f(x) { switch(x){
-                case 1:x+=1;
-                case 2:x+=2;
-                case 3:x+=3;break;
-                case 4:x+=4;
-                default:x=0;
-            } return x }
-        ''')
-        self._test(jsi, 7, args=[1])
-        self._test(jsi, 6, args=[3])
-        self._test(jsi, 0, args=[5])
-
-    def test_switch_default(self):
-        jsi = JSInterpreter('''
-            function f(x) { switch(x){
-                case 2: x+=2;
-                default: x-=1;
-                case 5:
-                case 6: x+=6;
-                case 0: break;
-                case 1: x+=1;
-            } return x }
-        ''')
-        self._test(jsi, 2, args=[1])
-        self._test(jsi, 11, args=[5])
-        self._test(jsi, 14, args=[9])
-
-    def test_try(self):
-        self._test('function f() { try{return 10} catch(e){return 5} }', 10)
-
-    def test_catch(self):
-        self._test('function f() { try{throw 10} catch(e){return 5} }', 5)
-
-    def test_finally(self):
-        self._test('function f() { try{throw 10} finally {return 42} }', 42)
-        self._test('function f() { try{throw 10} catch(e){return 5} finally {return 42} }', 42)
-
-    def test_nested_try(self):
-        self._test('''
-            function f() {try {
-                try{throw 10} finally {throw 42}
-            } catch(e){return 5} }
-        ''', 5)
-
-    def test_for_loop_continue(self):
-        self._test('function f() { a=0; for (i=0; i-10; i++) { continue; a++ } return a }', 0)
-
-    def test_for_loop_break(self):
-        self._test('function f() { a=0; for (i=0; i-10; i++) { break; a++ } return a }', 0)
-
-    def test_for_loop_try(self):
-        self._test('''
-            function f() {
-                for (i=0; i-10; i++) { try { if (i == 5) throw i} catch {return 10} finally {break} };
-                return 42 }
-        ''', 42)
-
-    def test_literal_list(self):
-        self._test('function f() { return [1, 2, "asdf", [5, 6, 7]][3] }', [5, 6, 7])
-
-    def test_comma(self):
-        self._test('function f() { a=5; a -= 1, a+=3; return a }', 7)
-        self._test('function f() { a=5; return (a -= 1, a+=3, a); }', 7)
-        self._test('function f() { return (l=[0,1,2,3], function(a, b){return a+b})((l[1], l[2]), l[3]) }', 5)
-
-    def test_not(self):
-        self._test('function f() { return ! undefined; }', True)
-        self._test('function f() { return !0; }', True)
-        self._test('function f() { return !!0; }', False)
-        self._test('function f() { return ![]; }', False)
-        self._test('function f() { return !0 !== false; }', True)
-
-    def test_void(self):
-        self._test('function f() { return void 42; }', JS_Undefined)
-
-    def test_typeof(self):
-        self._test('function f() { return typeof undefined; }', 'undefined')
-        self._test('function f() { return typeof NaN; }', 'number')
-        self._test('function f() { return typeof Infinity; }', 'number')
-        self._test('function f() { return typeof true; }', 'boolean')
-        self._test('function f() { return typeof null; }', 'object')
-        self._test('function f() { return typeof "a string"; }', 'string')
-        self._test('function f() { return typeof 42; }', 'number')
-        self._test('function f() { return typeof 42.42; }', 'number')
-        self._test('function f() { var g = function(){}; return typeof g; }', 'function')
-        self._test('function f() { return typeof {key: "value"}; }', 'object')
-        # not yet implemented: Symbol, BigInt
-
-    def test_return_function(self):
-        jsi = JSInterpreter('''
-        function x() { return [1, function(){return 1}][1] }
-        ''')
-        self.assertEqual(jsi.call_function('x')([]), 1)
-
-    def test_null(self):
-        self._test('function f() { return null; }', None)
-        self._test('function f() { return [null > 0, null < 0, null == 0, null === 0]; }',
-                   [False, False, False, False])
-        self._test('function f() { return [null >= 0, null <= 0]; }', [True, True])
-
-    def test_undefined(self):
-        self._test('function f() { return undefined === undefined; }', True)
-        self._test('function f() { return undefined; }', JS_Undefined)
-        self._test('function f() { return undefined ?? 42; }', 42)
-        self._test('function f() { let v; return v; }', JS_Undefined)
-        self._test('function f() { let v; return v**0; }', 1)
-        self._test('function f() { let v; return [v>42, v<=42, v&&42, 42&&v]; }',
-                   [False, False, JS_Undefined, JS_Undefined])
-
-        self._test('''
-            function f() { return [
-                undefined === undefined,
-                undefined == undefined,
-                undefined == null
-            ]; }
-        ''', [True] * 3)
-        self._test('''
-            function f() { return [
-                undefined < undefined,
-                undefined > undefined,
-                undefined === 0,
-                undefined == 0,
-                undefined < 0,
-                undefined > 0,
-                undefined >= 0,
-                undefined <= 0,
-                undefined > null,
-                undefined < null,
-                undefined === null
-            ]; }
-        ''', [False] * 11)
-
-        jsi = JSInterpreter('''
-            function x() { let v; return [42+v, v+42, v**42, 42**v, 0**v]; }
-        ''')
-        for y in jsi.call_function('x'):
-            self.assertTrue(math.isnan(y))
-
-    def test_object(self):
-        self._test('function f() { return {}; }', {})
-        self._test('function f() { let a = {m1: 42, m2: 0 }; return [a["m1"], a.m2]; }', [42, 0])
-        self._test('function f() { let a; return a?.qq; }', JS_Undefined)
-        self._test('function f() { let a = {m1: 42, m2: 0 }; return a?.qq; }', JS_Undefined)
-
-    def test_indexing(self):
-        self._test('function f() { return [1, 2, 3, 4][3]}', 4)
-        self._test('function f() { return [1, [2, [3, [4]]]][1][1][1][0]}', 4)
-        self._test('function f() { var o = {1: 2, 3: 4}; return o[3]}', 4)
-        self._test('function f() { var o = {1: 2, 3: 4}; return o["3"]}', 4)
-        self._test('function f() { return [1, [2, {3: [4]}]][1][1]["3"][0]}', 4)
-        self._test('function f() { return [1, 2, 3, 4].length}', 4)
-        self._test('function f() { var o = {1: 2, 3: 4}; return o.length}', JS_Undefined)
-        self._test('function f() { var o = {1: 2, 3: 4}; o["length"] = 42; return o.length}', 42)
-
-    def test_regex(self):
-        self._test('function f() { let a=/,,[/,913,/](,)}/; }', None)
-        self._test('function f() { let a=/,,[/,913,/](,)}/; return a.source;  }', ',,[/,913,/](,)}')
-
-        jsi = JSInterpreter('''
-            function x() { let a=/,,[/,913,/](,)}/; "".replace(a, ""); return a; }
-        ''')
-        attrs = set(('findall', 'finditer', 'match', 'scanner', 'search',
-                     'split', 'sub', 'subn'))
-        if sys.version_info >= (2, 7):
-            # documented for 2.6 but may not be found
-            attrs.update(('flags', 'groupindex', 'groups', 'pattern'))
-        self.assertSetEqual(set(dir(jsi.call_function('x'))) & attrs, attrs)
-
-        jsi = JSInterpreter('''
-            function x() { let a=/,,[/,913,/](,)}/i; return a; }
-        ''')
-        self.assertEqual(jsi.call_function('x').flags & ~re.U, re.I)
-
-        jsi = JSInterpreter(r'function f() { let a=/,][}",],()}(\[)/; return a; }')
-        self.assertEqual(jsi.call_function('f').pattern, r',][}",],()}(\[)')
-
-        jsi = JSInterpreter(r'function f() { let a=[/[)\\]/]; return a[0]; }')
-        self.assertEqual(jsi.call_function('f').pattern, r'[)\\]')
-
-    def test_replace(self):
-        self._test('function f() { let a="data-name".replace("data-", ""); return a }',
-                   'name')
-        self._test('function f() { let a="data-name".replace(new RegExp("^.+-"), ""); return a; }',
-                   'name')
-        self._test('function f() { let a="data-name".replace(/^.+-/, ""); return a; }',
-                   'name')
-        self._test('function f() { let a="data-name".replace(/a/g, "o"); return a; }',
-                   'doto-nome')
-        self._test('function f() { let a="data-name".replaceAll("a", "o"); return a; }',
-                   'doto-nome')
-
-    def test_char_code_at(self):
-        jsi = JSInterpreter('function f(i){return "test".charCodeAt(i)}')
-        self._test(jsi, 116, args=[0])
-        self._test(jsi, 101, args=[1])
-        self._test(jsi, 115, args=[2])
-        self._test(jsi, 116, args=[3])
-        self._test(jsi, None, args=[4])
-        self._test(jsi, 116, args=['not_a_number'])
-
-    def test_bitwise_operators_overflow(self):
-        self._test('function f(){return -524999584 << 5}', 379882496)
-        self._test('function f(){return 1236566549 << 5}', 915423904)
-
-    def test_negative(self):
-        self._test('function f(){return 2    *    -2.0    ;}', -4)
-        self._test('function f(){return 2    -    - -2    ;}', 0)
-        self._test('function f(){return 2    -    - - -2  ;}', 4)
-        self._test('function f(){return 2    -    + + - -2;}', 0)
-        self._test('function f(){return 2    +    - + - -2;}', 0)
-
-    def test_32066(self):
-        self._test(
-            "function f(){return Math.pow(3, 5) + new Date('1970-01-01T08:01:42.000+08:00') / 1000 * -239 - -24205;}",
-            70)
-
-    @unittest.skip('Not yet working')
-    def test_packed(self):
-        self._test(
-            '''function f(p,a,c,k,e,d){while(c--)if(k[c])p=p.replace(new RegExp('\\b'+c.toString(a)+'\\b','g'),k[c]);return p}''',
-            '''h 7=g("1j");7.7h({7g:[{33:"w://7f-7e-7d-7c.v.7b/7a/79/78/77/76.74?t=73&s=2s&e=72&f=2t&71=70.0.0.1&6z=6y&6x=6w"}],6v:"w://32.v.u/6u.31",16:"r%",15:"r%",6t:"6s",6r:"",6q:"l",6p:"l",6o:"6n",6m:\'6l\',6k:"6j",9:[{33:"/2u?b=6i&n=50&6h=w://32.v.u/6g.31",6f:"6e"}],1y:{6d:1,6c:\'#6b\',6a:\'#69\',68:"67",66:30,65:r,},"64":{63:"%62 2m%m%61%5z%5y%5x.u%5w%5v%5u.2y%22 2k%m%1o%22 5t%m%1o%22 5s%m%1o%22 2j%m%5r%22 16%m%5q%22 15%m%5p%22 5o%2z%5n%5m%2z",5l:"w://v.u/d/1k/5k.2y",5j:[]},\'5i\':{"5h":"5g"},5f:"5e",5d:"w://v.u",5c:{},5b:l,1x:[0.25,0.50,0.75,1,1.25,1.5,2]});h 1m,1n,5a;h 59=0,58=0;h 7=g("1j");h 2x=0,57=0,56=0;$.55({54:{\'53-52\':\'2i-51\'}});7.j(\'4z\',6(x){c(5>0&&x.1l>=5&&1n!=1){1n=1;$(\'q.4y\').4x(\'4w\')}});7.j(\'13\',6(x){2x=x.1l});7.j(\'2g\',6(x){2w(x)});7.j(\'4v\',6(){$(\'q.2v\').4u()});6 2w(x){$(\'q.2v\').4t();c(1m)19;1m=1;17=0;c(4s.4r===l){17=1}$.4q(\'/2u?b=4p&2l=1k&4o=2t-4n-4m-2s-4l&4k=&4j=&4i=&17=\'+17,6(2r){$(\'#4h\').4g(2r)});$(\'.3-8-4f-4e:4d("4c")\').2h(6(e){2q();g().4b(0);g().4a(l)});6 2q(){h $14=$("<q />").2p({1l:"49",16:"r%",15:"r%",48:0,2n:0,2o:47,46:"45(10%, 10%, 10%, 0.4)","44-43":"42"});$("<41 />").2p({16:"60%",15:"60%",2o:40,"3z-2n":"3y"}).3x({\'2m\':\'/?b=3w&2l=1k\',\'2k\':\'0\',\'2j\':\'2i\'}).2f($14);$14.2h(6(){$(3v).3u();g().2g()});$14.2f($(\'#1j\'))}g().13(0);}6 3t(){h 9=7.1b(2e);2d.2c(9);c(9.n>1){1r(i=0;i<9.n;i++){c(9[i].1a==2e){2d.2c(\'!!=\'+i);7.1p(i)}}}}7.j(\'3s\',6(){g().1h("/2a/3r.29","3q 10 28",6(){g().13(g().27()+10)},"2b");$("q[26=2b]").23().21(\'.3-20-1z\');g().1h("/2a/3p.29","3o 10 28",6(){h 12=g().27()-10;c(12<0)12=0;g().13(12)},"24");$("q[26=24]").23().21(\'.3-20-1z\');});6 1i(){}7.j(\'3n\',6(){1i()});7.j(\'3m\',6(){1i()});7.j("k",6(y){h 9=7.1b();c(9.n<2)19;$(\'.3-8-3l-3k\').3j(6(){$(\'#3-8-a-k\').1e(\'3-8-a-z\');$(\'.3-a-k\').p(\'o-1f\',\'11\')});7.1h("/3i/3h.3g","3f 3e",6(){$(\'.3-1w\').3d(\'3-8-1v\');$(\'.3-8-1y, .3-8-1x\').p(\'o-1g\',\'11\');c($(\'.3-1w\').3c(\'3-8-1v\')){$(\'.3-a-k\').p(\'o-1g\',\'l\');$(\'.3-a-k\').p(\'o-1f\',\'l\');$(\'.3-8-a\').1e(\'3-8-a-z\');$(\'.3-8-a:1u\').3b(\'3-8-a-z\')}3a{$(\'.3-a-k\').p(\'o-1g\',\'11\');$(\'.3-a-k\').p(\'o-1f\',\'11\');$(\'.3-8-a:1u\').1e(\'3-8-a-z\')}},"39");7.j("38",6(y){1d.37(\'1c\',y.9[y.36].1a)});c(1d.1t(\'1c\')){35("1s(1d.1t(\'1c\'));",34)}});h 18;6 1s(1q){h 9=7.1b();c(9.n>1){1r(i=0;i<9.n;i++){c(9[i].1a==1q){c(i==18){19}18=i;7.1p(i)}}}}',36,270,'|||jw|||function|player|settings|tracks|submenu||if||||jwplayer|var||on|audioTracks|true|3D|length|aria|attr|div|100|||sx|filemoon|https||event|active||false|tt|seek|dd|height|width|adb|current_audio|return|name|getAudioTracks|default_audio|localStorage|removeClass|expanded|checked|addButton|callMeMaybe|vplayer|0fxcyc2ajhp1|position|vvplay|vvad|220|setCurrentAudioTrack|audio_name|for|audio_set|getItem|last|open|controls|playbackRates|captions|rewind|icon|insertAfter||detach|ff00||button|getPosition|sec|png|player8|ff11|log|console|track_name|appendTo|play|click|no|scrolling|frameborder|file_code|src|top|zIndex|css|showCCform|data|1662367683|383371|dl|video_ad|doPlay|prevt|mp4|3E||jpg|thumbs|file|300|setTimeout|currentTrack|setItem|audioTrackChanged|dualSound|else|addClass|hasClass|toggleClass|Track|Audio|svg|dualy|images|mousedown|buttons|topbar|playAttemptFailed|beforePlay|Rewind|fr|Forward|ff|ready|set_audio_track|remove|this|upload_srt|prop|50px|margin|1000001|iframe|center|align|text|rgba|background|1000000|left|absolute|pause|setCurrentCaptions|Upload|contains|item|content|html|fviews|referer|prem|embed|3e57249ef633e0d03bf76ceb8d8a4b65|216|83|hash|view|get|TokenZir|window|hide|show|complete|slow|fadeIn|video_ad_fadein|time||cache|Cache|Content|headers|ajaxSetup|v2done|tott|vastdone2|vastdone1|vvbefore|playbackRateControls|cast|aboutlink|FileMoon|abouttext|UHD|1870|qualityLabels|sites|GNOME_POWER|link|2Fiframe|3C|allowfullscreen|22360|22640|22no|marginheight|marginwidth|2FGNOME_POWER|2F0fxcyc2ajhp1|2Fe|2Ffilemoon|2F|3A||22https|3Ciframe|code|sharing|fontOpacity|backgroundOpacity|Tahoma|fontFamily|303030|backgroundColor|FFFFFF|color|userFontScale|thumbnails|kind|0fxcyc2ajhp10000|url|get_slides|start|startparam|none|preload|html5|primary|hlshtml|androidhls|duration|uniform|stretching|0fxcyc2ajhp1_xt|image|2048|sp|6871|asn|127|srv|43200|_g3XlBcu2lmD9oDexD2NLWSmah2Nu3XcDrl93m9PwXY|m3u8||master|0fxcyc2ajhp1_x|00076|01|hls2|to|s01|delivery|storage|moon|sources|setup'''.split('|'))
-
-    def test_join(self):
-        test_input = list('test')
-        tests = [
-            'function f(a, b){return a.join(b)}',
-            'function f(a, b){return Array.prototype.join.call(a, b)}',
-            'function f(a, b){return Array.prototype.join.apply(a, [b])}',
-        ]
-        for test in tests:
-            jsi = JSInterpreter(test)
-            self._test(jsi, 'test', args=[test_input, ''])
-            self._test(jsi, 't-e-s-t', args=[test_input, '-'])
-            self._test(jsi, '', args=[[], '-'])
-
-        self._test('function f(){return '
-                   '[1, 1.0, "abc", {a: 1}, null, undefined, Infinity, NaN].join()}',
-                   '1,1,abc,[object Object],,,Infinity,NaN')
-        self._test('function f(){return '
-                   '[1, 1.0, "abc", {a: 1}, null, undefined, Infinity, NaN].join("~")}',
-                   '1~1~abc~[object Object]~~~Infinity~NaN')
-
-    def test_split(self):
-        test_result = list('test')
-        tests = [
-            'function f(a, b){return a.split(b)}',
-            'function f(a, b){return a["split"](b)}',
-            'function f(a, b){let x = ["split"]; return a[x[0]](b)}',
-            'function f(a, b){return String.prototype.split.call(a, b)}',
-            'function f(a, b){return String.prototype.split.apply(a, [b])}',
-        ]
-        for test in tests:
-            jsi = JSInterpreter(test)
-            self._test(jsi, test_result, args=['test', ''])
-            self._test(jsi, test_result, args=['t-e-s-t', '-'])
-            self._test(jsi, [''], args=['', '-'])
-            self._test(jsi, [], args=['', ''])
-        # RegExp split
-        self._test('function f(){return "test".split(/(?:)/)}',
-                   ['t', 'e', 's', 't'])
-        self._test('function f(){return "t-e-s-t".split(/[es-]+/)}',
-                   ['t', 't'])
-        # from MDN: surrogate pairs aren't handled: case 1 fails
-        # self._test('function f(){return "😄😄".split(/(?:)/)}',
-        #            ['\ud83d', '\ude04', '\ud83d', '\ude04'])
-        # case 2 beats Py3.2: it gets the case 1 result
-        if sys.version_info >= (2, 6) and not ((3, 0) <= sys.version_info < (3, 3)):
-            self._test('function f(){return "😄😄".split(/(?:)/u)}',
-                       ['😄', '😄'])
-
-    def test_slice(self):
-        self._test('function f(){return [0, 1, 2, 3, 4, 5, 6, 7, 8].slice()}', [0, 1, 2, 3, 4, 5, 6, 7, 8])
-        self._test('function f(){return [0, 1, 2, 3, 4, 5, 6, 7, 8].slice(0)}', [0, 1, 2, 3, 4, 5, 6, 7, 8])
-        self._test('function f(){return [0, 1, 2, 3, 4, 5, 6, 7, 8].slice(5)}', [5, 6, 7, 8])
-        self._test('function f(){return [0, 1, 2, 3, 4, 5, 6, 7, 8].slice(99)}', [])
-        self._test('function f(){return [0, 1, 2, 3, 4, 5, 6, 7, 8].slice(-2)}', [7, 8])
-        self._test('function f(){return [0, 1, 2, 3, 4, 5, 6, 7, 8].slice(-99)}', [0, 1, 2, 3, 4, 5, 6, 7, 8])
-        self._test('function f(){return [0, 1, 2, 3, 4, 5, 6, 7, 8].slice(0, 0)}', [])
-        self._test('function f(){return [0, 1, 2, 3, 4, 5, 6, 7, 8].slice(1, 0)}', [])
-        self._test('function f(){return [0, 1, 2, 3, 4, 5, 6, 7, 8].slice(0, 1)}', [0])
-        self._test('function f(){return [0, 1, 2, 3, 4, 5, 6, 7, 8].slice(3, 6)}', [3, 4, 5])
-        self._test('function f(){return [0, 1, 2, 3, 4, 5, 6, 7, 8].slice(1, -1)}', [1, 2, 3, 4, 5, 6, 7])
-        self._test('function f(){return [0, 1, 2, 3, 4, 5, 6, 7, 8].slice(-1, 1)}', [])
-        self._test('function f(){return [0, 1, 2, 3, 4, 5, 6, 7, 8].slice(-3, -1)}', [6, 7])
-        self._test('function f(){return "012345678".slice()}', '012345678')
-        self._test('function f(){return "012345678".slice(0)}', '012345678')
-        self._test('function f(){return "012345678".slice(5)}', '5678')
-        self._test('function f(){return "012345678".slice(99)}', '')
-        self._test('function f(){return "012345678".slice(-2)}', '78')
-        self._test('function f(){return "012345678".slice(-99)}', '012345678')
-        self._test('function f(){return "012345678".slice(0, 0)}', '')
-        self._test('function f(){return "012345678".slice(1, 0)}', '')
-        self._test('function f(){return "012345678".slice(0, 1)}', '0')
-        self._test('function f(){return "012345678".slice(3, 6)}', '345')
-        self._test('function f(){return "012345678".slice(1, -1)}', '1234567')
-        self._test('function f(){return "012345678".slice(-1, 1)}', '')
-        self._test('function f(){return "012345678".slice(-3, -1)}', '67')
-
-    def test_splice(self):
-        self._test('function f(){var T = ["0", "1", "2"]; T["splice"](2, 1, "0")[0]; return T }', ['0', '1', '0'])
-
-    def test_pop(self):
-        # pop
-        self._test('function f(){var a = [0, 1, 2, 3, 4, 5, 6, 7, 8]; return [a.pop(), a]}',
-                   [8, [0, 1, 2, 3, 4, 5, 6, 7]])
-        self._test('function f(){return [].pop()}', JS_Undefined)
-        # push
-        self._test('function f(){var a = [0, 1, 2]; return [a.push(3, 4), a]}',
-                   [5, [0, 1, 2, 3, 4]])
-        self._test('function f(){var a = [0, 1, 2]; return [a.push(), a]}',
-                   [3, [0, 1, 2]])
-
-    def test_shift(self):
-        # shift
-        self._test('function f(){var a = [0, 1, 2, 3, 4, 5, 6, 7, 8]; return [a.shift(), a]}',
-                   [0, [1, 2, 3, 4, 5, 6, 7, 8]])
-        self._test('function f(){return [].shift()}', JS_Undefined)
-        # unshift
-        self._test('function f(){var a = [0, 1, 2]; return [a.unshift(3, 4), a]}',
-                   [5, [3, 4, 0, 1, 2]])
-        self._test('function f(){var a = [0, 1, 2]; return [a.unshift(), a]}',
-                   [3, [0, 1, 2]])
-
-    def test_forEach(self):
-        self._test('function f(){var ret = []; var l = [4, 2]; '
-                   'var log = function(e,i,a){ret.push([e,i,a]);}; '
-                   'l.forEach(log); '
-                   'return [ret.length, ret[0][0], ret[1][1], ret[0][2]]}',
-                   [2, 4, 1, [4, 2]])
-        self._test('function f(){var ret = []; var l = [4, 2]; '
-                   'var log = function(e,i,a){this.push([e,i,a]);}; '
-                   'l.forEach(log, ret); '
-                   'return [ret.length, ret[0][0], ret[1][1], ret[0][2]]}',
-                   [2, 4, 1, [4, 2]])
-
-    def test_extract_function(self):
-        jsi = JSInterpreter('function a(b) { return b + 1; }')
-        func = jsi.extract_function('a')
-        self.assertEqual(func([2]), 3)
-
-    def test_extract_function_with_global_stack(self):
-        jsi = JSInterpreter('function c(d) { return d + e + f + g; }')
-        func = jsi.extract_function('c', {'e': 10}, {'f': 100, 'g': 1000})
-        self.assertEqual(func([1]), 1111)
+        self.assertEqual(jsi.call_function('z'), 5)
 
 
 if __name__ == '__main__':
diff --git a/test/test_subtitles.py b/test/test_subtitles.py
index e005c78fc..550e0ca00 100644
--- a/test/test_subtitles.py
+++ b/test/test_subtitles.py
@@ -38,9 +38,6 @@ class BaseTestSubtitles(unittest.TestCase):
         self.DL = FakeYDL()
         self.ie = self.IE()
         self.DL.add_info_extractor(self.ie)
-        if not self.IE.working():
-            print('Skipping: %s marked as not _WORKING' % self.IE.ie_key())
-            self.skipTest('IE marked as not _WORKING')
 
     def getInfoDict(self):
         info_dict = self.DL.extract_info(self.url, download=False)
@@ -59,21 +56,6 @@ class BaseTestSubtitles(unittest.TestCase):
 
 
 class TestYoutubeSubtitles(BaseTestSubtitles):
-    # Available subtitles for QRS8MkLhQmM:
-    # Language formats
-    # ru       vtt, ttml, srv3, srv2, srv1, json3
-    # fr       vtt, ttml, srv3, srv2, srv1, json3
-    # en       vtt, ttml, srv3, srv2, srv1, json3
-    # nl       vtt, ttml, srv3, srv2, srv1, json3
-    # de       vtt, ttml, srv3, srv2, srv1, json3
-    # ko       vtt, ttml, srv3, srv2, srv1, json3
-    # it       vtt, ttml, srv3, srv2, srv1, json3
-    # zh-Hant  vtt, ttml, srv3, srv2, srv1, json3
-    # hi       vtt, ttml, srv3, srv2, srv1, json3
-    # pt-BR    vtt, ttml, srv3, srv2, srv1, json3
-    # es-MX    vtt, ttml, srv3, srv2, srv1, json3
-    # ja       vtt, ttml, srv3, srv2, srv1, json3
-    # pl       vtt, ttml, srv3, srv2, srv1, json3
     url = 'QRS8MkLhQmM'
     IE = YoutubeIE
 
@@ -82,60 +64,41 @@ class TestYoutubeSubtitles(BaseTestSubtitles):
         self.DL.params['allsubtitles'] = True
         subtitles = self.getSubtitles()
         self.assertEqual(len(subtitles.keys()), 13)
-        self.assertEqual(md5(subtitles['en']), 'ae1bd34126571a77aabd4d276b28044d')
-        self.assertEqual(md5(subtitles['it']), '0e0b667ba68411d88fd1c5f4f4eab2f9')
+        self.assertEqual(md5(subtitles['en']), '3cb210999d3e021bd6c7f0ea751eab06')
+        self.assertEqual(md5(subtitles['it']), '6d752b98c31f1cf8d597050c7a2cb4b5')
         for lang in ['fr', 'de']:
             self.assertTrue(subtitles.get(lang) is not None, 'Subtitles for \'%s\' not extracted' % lang)
 
-    def _test_subtitles_format(self, fmt, md5_hash, lang='en'):
-        self.DL.params['writesubtitles'] = True
-        self.DL.params['subtitlesformat'] = fmt
-        subtitles = self.getSubtitles()
-        self.assertEqual(md5(subtitles[lang]), md5_hash)
-
     def test_youtube_subtitles_ttml_format(self):
-        self._test_subtitles_format('ttml', 'c97ddf1217390906fa9fbd34901f3da2')
+        self.DL.params['writesubtitles'] = True
+        self.DL.params['subtitlesformat'] = 'ttml'
+        subtitles = self.getSubtitles()
+        self.assertEqual(md5(subtitles['en']), 'e306f8c42842f723447d9f63ad65df54')
 
     def test_youtube_subtitles_vtt_format(self):
-        self._test_subtitles_format('vtt', 'ae1bd34126571a77aabd4d276b28044d')
-
-    def test_youtube_subtitles_json3_format(self):
-        self._test_subtitles_format('json3', '688dd1ce0981683867e7fe6fde2a224b')
-
-    def _test_automatic_captions(self, url, lang):
-        self.url = url
-        self.DL.params['writeautomaticsub'] = True
-        self.DL.params['subtitleslangs'] = [lang]
+        self.DL.params['writesubtitles'] = True
+        self.DL.params['subtitlesformat'] = 'vtt'
         subtitles = self.getSubtitles()
-        self.assertTrue(subtitles[lang] is not None)
+        self.assertEqual(md5(subtitles['en']), '3cb210999d3e021bd6c7f0ea751eab06')
 
     def test_youtube_automatic_captions(self):
-        # Available automatic captions for 8YoUxe5ncPo:
-        # Language formats (all in vtt, ttml, srv3, srv2, srv1, json3)
-        # gu, zh-Hans, zh-Hant, gd, ga, gl, lb, la, lo, tt, tr,
-        # lv, lt, tk, th, tg, te, fil, haw, yi, ceb, yo, de, da,
-        # el, eo, en, eu, et, es, ru, rw, ro, bn, be, bg, uk, jv,
-        # bs, ja, or, xh, co, ca, cy, cs, ps, pt, pa, vi, pl, hy,
-        # hr, ht, hu, hmn, hi, ha, mg, uz, ml, mn, mi, mk, ur,
-        # mt, ms, mr, ug, ta, my, af, sw, is, am,
-        #                                         *it*, iw, sv, ar,
-        # su, zu, az, id, ig, nl, no, ne, ny, fr, ku, fy, fa, fi,
-        # ka, kk, sr, sq, ko, kn, km, st, sk, si, so, sn, sm, sl,
-        # ky, sd
-        # ...
-        self._test_automatic_captions('8YoUxe5ncPo', 'it')
+        self.url = '8YoUxe5ncPo'
+        self.DL.params['writeautomaticsub'] = True
+        self.DL.params['subtitleslangs'] = ['it']
+        subtitles = self.getSubtitles()
+        self.assertTrue(subtitles['it'] is not None)
 
-    @unittest.skip('ASR subs all in all supported langs now')
     def test_youtube_translated_subtitles(self):
-        # This video has a subtitles track, which can be translated (#4555)
-        self._test_automatic_captions('Ky9eprVWzlI', 'it')
+        # This video has a subtitles track, which can be translated
+        self.url = 'Ky9eprVWzlI'
+        self.DL.params['writeautomaticsub'] = True
+        self.DL.params['subtitleslangs'] = ['it']
+        subtitles = self.getSubtitles()
+        self.assertTrue(subtitles['it'] is not None)
 
     def test_youtube_nosubtitles(self):
         self.DL.expect_warning('video doesn\'t have subtitles')
-        # Available automatic captions for 8YoUxe5ncPo:
-        # ...
-        # 8YoUxe5ncPo has no subtitles
-        self.url = '8YoUxe5ncPo'
+        self.url = 'n5BB19UTcdA'
         self.DL.params['writesubtitles'] = True
         self.DL.params['allsubtitles'] = True
         subtitles = self.getSubtitles()
@@ -165,7 +128,6 @@ class TestDailymotionSubtitles(BaseTestSubtitles):
         self.assertFalse(subtitles)
 
 
-@unittest.skip('IE broken')
 class TestTedSubtitles(BaseTestSubtitles):
     url = 'http://www.ted.com/talks/dan_dennett_on_our_consciousness.html'
     IE = TEDIE
@@ -190,19 +152,18 @@ class TestVimeoSubtitles(BaseTestSubtitles):
         self.DL.params['allsubtitles'] = True
         subtitles = self.getSubtitles()
         self.assertEqual(set(subtitles.keys()), set(['de', 'en', 'es', 'fr']))
-        self.assertEqual(md5(subtitles['en']), '386cbc9320b94e25cb364b97935e5dd1')
-        self.assertEqual(md5(subtitles['fr']), 'c9b69eef35bc6641c0d4da8a04f9dfac')
+        self.assertEqual(md5(subtitles['en']), '8062383cf4dec168fc40a088aa6d5888')
+        self.assertEqual(md5(subtitles['fr']), 'b6191146a6c5d3a452244d853fde6dc8')
 
     def test_nosubtitles(self):
         self.DL.expect_warning('video doesn\'t have subtitles')
-        self.url = 'http://vimeo.com/68093876'
+        self.url = 'http://vimeo.com/56015672'
         self.DL.params['writesubtitles'] = True
         self.DL.params['allsubtitles'] = True
         subtitles = self.getSubtitles()
         self.assertFalse(subtitles)
 
 
-@unittest.skip('IE broken')
 class TestWallaSubtitles(BaseTestSubtitles):
     url = 'http://vod.walla.co.il/movie/2705958/the-yes-men'
     IE = WallaIE
@@ -224,7 +185,6 @@ class TestWallaSubtitles(BaseTestSubtitles):
         self.assertFalse(subtitles)
 
 
-@unittest.skip('IE broken')
 class TestCeskaTelevizeSubtitles(BaseTestSubtitles):
     url = 'http://www.ceskatelevize.cz/ivysilani/10600540290-u6-uzasny-svet-techniky'
     IE = CeskaTelevizeIE
@@ -246,7 +206,6 @@ class TestCeskaTelevizeSubtitles(BaseTestSubtitles):
         self.assertFalse(subtitles)
 
 
-@unittest.skip('IE broken')
 class TestLyndaSubtitles(BaseTestSubtitles):
     url = 'http://www.lynda.com/Bootstrap-tutorials/Using-exercise-files/110885/114408-4.html'
     IE = LyndaIE
@@ -259,7 +218,6 @@ class TestLyndaSubtitles(BaseTestSubtitles):
         self.assertEqual(md5(subtitles['en']), '09bbe67222259bed60deaa26997d73a7')
 
 
-@unittest.skip('IE broken')
 class TestNPOSubtitles(BaseTestSubtitles):
     url = 'http://www.npo.nl/nos-journaal/28-08-2014/POW_00722860'
     IE = NPOIE
@@ -272,7 +230,6 @@ class TestNPOSubtitles(BaseTestSubtitles):
         self.assertEqual(md5(subtitles['nl']), 'fc6435027572b63fb4ab143abd5ad3f4')
 
 
-@unittest.skip('IE broken')
 class TestMTVSubtitles(BaseTestSubtitles):
     url = 'http://www.cc.com/video-clips/p63lk0/adam-devine-s-house-party-chasing-white-swans'
     IE = ComedyCentralIE
@@ -295,10 +252,9 @@ class TestNRKSubtitles(BaseTestSubtitles):
     def test_allsubtitles(self):
         self.DL.params['writesubtitles'] = True
         self.DL.params['allsubtitles'] = True
-        self.DL.params['format'] = 'best/bestvideo'
         subtitles = self.getSubtitles()
-        self.assertEqual(set(subtitles.keys()), set(['nb-ttv']))
-        self.assertEqual(md5(subtitles['nb-ttv']), '67e06ff02d0deaf975e68f6cb8f6a149')
+        self.assertEqual(set(subtitles.keys()), set(['no']))
+        self.assertEqual(md5(subtitles['no']), '544fa917d3197fcbee64634559221cc2')
 
 
 class TestRaiPlaySubtitles(BaseTestSubtitles):
@@ -321,7 +277,6 @@ class TestRaiPlaySubtitles(BaseTestSubtitles):
         self.assertEqual(md5(subtitles['it']), '4b3264186fbb103508abe5311cfcb9cd')
 
 
-@unittest.skip('IE broken - DRM only')
 class TestVikiSubtitles(BaseTestSubtitles):
     url = 'http://www.viki.com/videos/1060846v-punch-episode-18'
     IE = VikiIE
@@ -348,7 +303,6 @@ class TestThePlatformSubtitles(BaseTestSubtitles):
         self.assertEqual(md5(subtitles['en']), '97e7670cbae3c4d26ae8bcc7fdd78d4b')
 
 
-@unittest.skip('IE broken')
 class TestThePlatformFeedSubtitles(BaseTestSubtitles):
     url = 'http://feed.theplatform.com/f/7wvmTC/msnbc_video-p-test?form=json&pretty=true&range=-40&byGuid=n_hardball_5biden_140207'
     IE = ThePlatformFeedIE
@@ -384,7 +338,7 @@ class TestDemocracynowSubtitles(BaseTestSubtitles):
         self.DL.params['allsubtitles'] = True
         subtitles = self.getSubtitles()
         self.assertEqual(set(subtitles.keys()), set(['en']))
-        self.assertEqual(md5(subtitles['en']), 'a3cc4c0b5eadd74d9974f1c1f5101045')
+        self.assertEqual(md5(subtitles['en']), 'acaca989e24a9e45a6719c9b3d60815c')
 
     def test_subtitles_in_page(self):
         self.url = 'http://www.democracynow.org/2015/7/3/this_flag_comes_down_today_bree'
@@ -392,7 +346,7 @@ class TestDemocracynowSubtitles(BaseTestSubtitles):
         self.DL.params['allsubtitles'] = True
         subtitles = self.getSubtitles()
         self.assertEqual(set(subtitles.keys()), set(['en']))
-        self.assertEqual(md5(subtitles['en']), 'a3cc4c0b5eadd74d9974f1c1f5101045')
+        self.assertEqual(md5(subtitles['en']), 'acaca989e24a9e45a6719c9b3d60815c')
 
 
 if __name__ == '__main__':
diff --git a/test/test_swfinterp.py b/test/test_swfinterp.py
index 7c282ee00..9f18055e6 100644
--- a/test/test_swfinterp.py
+++ b/test/test_swfinterp.py
@@ -5,18 +5,16 @@ from __future__ import unicode_literals
 import os
 import sys
 import unittest
+sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
 
-dirn = os.path.dirname
-
-sys.path.insert(0, dirn(dirn(os.path.abspath(__file__))))
 
 import errno
+import io
 import json
 import re
 import subprocess
 
 from youtube_dl.swfinterp import SWFInterpreter
-from youtube_dl.compat import compat_open as open
 
 
 TEST_DIR = os.path.join(
@@ -45,7 +43,7 @@ def _make_testfunc(testfile):
                     '-static-link-runtime-shared-libraries', as_file])
             except OSError as ose:
                 if ose.errno == errno.ENOENT:
-                    self.skipTest('mxmlc not found!')
+                    print('mxmlc not found! Skipping test.')
                     return
                 raise
 
@@ -53,7 +51,7 @@ def _make_testfunc(testfile):
             swf_content = swf_f.read()
         swfi = SWFInterpreter(swf_content)
 
-        with open(as_file, 'r', encoding='utf-8') as as_f:
+        with io.open(as_file, 'r', encoding='utf-8') as as_f:
             as_content = as_f.read()
 
         def _find_spec(key):
diff --git a/test/test_traversal.py b/test/test_traversal.py
deleted file mode 100644
index 00a428edb..000000000
--- a/test/test_traversal.py
+++ /dev/null
@@ -1,509 +0,0 @@
-#!/usr/bin/env python
-# coding: utf-8
-from __future__ import unicode_literals
-
-# Allow direct execution
-import os
-import sys
-import unittest
-sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
-
-
-import re
-
-from youtube_dl.traversal import (
-    dict_get,
-    get_first,
-    T,
-    traverse_obj,
-)
-from youtube_dl.compat import (
-    compat_etree_fromstring,
-    compat_http_cookies,
-    compat_str,
-)
-from youtube_dl.utils import (
-    int_or_none,
-    str_or_none,
-)
-
-_TEST_DATA = {
-    100: 100,
-    1.2: 1.2,
-    'str': 'str',
-    'None': None,
-    '...': Ellipsis,
-    'urls': [
-        {'index': 0, 'url': 'https://www.example.com/0'},
-        {'index': 1, 'url': 'https://www.example.com/1'},
-    ],
-    'data': (
-        {'index': 2},
-        {'index': 3},
-    ),
-    'dict': {},
-}
-
-
-if sys.version_info < (3, 0):
-    class _TestCase(unittest.TestCase):
-
-        def assertCountEqual(self, *args, **kwargs):
-            return self.assertItemsEqual(*args, **kwargs)
-else:
-    _TestCase = unittest.TestCase
-
-
-class TestTraversal(_TestCase):
-    def assertMaybeCountEqual(self, *args, **kwargs):
-        if sys.version_info < (3, 7):
-            # random dict order
-            return self.assertCountEqual(*args, **kwargs)
-        else:
-            return self.assertEqual(*args, **kwargs)
-
-    def test_traverse_obj(self):
-        # instant compat
-        str = compat_str
-
-        # define a pukka Iterable
-        def iter_range(stop):
-            for from_ in range(stop):
-                yield from_
-
-        # Test base functionality
-        self.assertEqual(traverse_obj(_TEST_DATA, ('str',)), 'str',
-                         msg='allow tuple path')
-        self.assertEqual(traverse_obj(_TEST_DATA, ['str']), 'str',
-                         msg='allow list path')
-        self.assertEqual(traverse_obj(_TEST_DATA, (value for value in ("str",))), 'str',
-                         msg='allow iterable path')
-        self.assertEqual(traverse_obj(_TEST_DATA, 'str'), 'str',
-                         msg='single items should be treated as a path')
-        self.assertEqual(traverse_obj(_TEST_DATA, None), _TEST_DATA)
-        self.assertEqual(traverse_obj(_TEST_DATA, 100), 100)
-        self.assertEqual(traverse_obj(_TEST_DATA, 1.2), 1.2)
-
-        # Test Ellipsis behavior
-        self.assertCountEqual(traverse_obj(_TEST_DATA, Ellipsis),
-                              (item for item in _TEST_DATA.values() if item not in (None, {})),
-                              msg='`...` should give all non-discarded values')
-        self.assertCountEqual(traverse_obj(_TEST_DATA, ('urls', 0, Ellipsis)), _TEST_DATA['urls'][0].values(),
-                              msg='`...` selection for dicts should select all values')
-        self.assertEqual(traverse_obj(_TEST_DATA, (Ellipsis, Ellipsis, 'url')),
-                         ['https://www.example.com/0', 'https://www.example.com/1'],
-                         msg='nested `...` queries should work')
-        self.assertCountEqual(traverse_obj(_TEST_DATA, (Ellipsis, Ellipsis, 'index')), iter_range(4),
-                              msg='`...` query result should be flattened')
-        self.assertEqual(traverse_obj(iter(range(4)), Ellipsis), list(range(4)),
-                         msg='`...` should accept iterables')
-
-        # Test function as key
-        self.assertEqual(traverse_obj(_TEST_DATA, lambda x, y: x == 'urls' and isinstance(y, list)),
-                         [_TEST_DATA['urls']],
-                         msg='function as query key should perform a filter based on (key, value)')
-        self.assertCountEqual(traverse_obj(_TEST_DATA, lambda _, x: isinstance(x[0], str)), set(('str',)),
-                              msg='exceptions in the query function should be caught')
-        self.assertEqual(traverse_obj(iter(range(4)), lambda _, x: x % 2 == 0), [0, 2],
-                         msg='function key should accept iterables')
-        if __debug__:
-            with self.assertRaises(Exception, msg='Wrong function signature should raise in debug'):
-                traverse_obj(_TEST_DATA, lambda a: Ellipsis)
-            with self.assertRaises(Exception, msg='Wrong function signature should raise in debug'):
-                traverse_obj(_TEST_DATA, lambda a, b, c: Ellipsis)
-
-        # Test set as key (transformation/type, like `expected_type`)
-        self.assertEqual(traverse_obj(_TEST_DATA, (Ellipsis, T(str.upper), )), ['STR'],
-                         msg='Function in set should be a transformation')
-        self.assertEqual(traverse_obj(_TEST_DATA, ('fail', T(lambda _: 'const'))), 'const',
-                         msg='Function in set should always be called')
-        self.assertEqual(traverse_obj(_TEST_DATA, (Ellipsis, T(str))), ['str'],
-                         msg='Type in set should be a type filter')
-        self.assertMaybeCountEqual(traverse_obj(_TEST_DATA, (Ellipsis, T(str, int))), [100, 'str'],
-                                   msg='Multiple types in set should be a type filter')
-        self.assertEqual(traverse_obj(_TEST_DATA, T(dict)), _TEST_DATA,
-                         msg='A single set should be wrapped into a path')
-        self.assertEqual(traverse_obj(_TEST_DATA, (Ellipsis, T(str.upper))), ['STR'],
-                         msg='Transformation function should not raise')
-        self.assertMaybeCountEqual(traverse_obj(_TEST_DATA, (Ellipsis, T(str_or_none))),
-                                   [item for item in map(str_or_none, _TEST_DATA.values()) if item is not None],
-                                   msg='Function in set should be a transformation')
-        if __debug__:
-            with self.assertRaises(Exception, msg='Sets with length != 1 should raise in debug'):
-                traverse_obj(_TEST_DATA, set())
-            with self.assertRaises(Exception, msg='Sets with length != 1 should raise in debug'):
-                traverse_obj(_TEST_DATA, set((str.upper, str)))
-
-        # Test `slice` as a key
-        _SLICE_DATA = [0, 1, 2, 3, 4]
-        self.assertEqual(traverse_obj(_TEST_DATA, ('dict', slice(1))), None,
-                         msg='slice on a dictionary should not throw')
-        self.assertEqual(traverse_obj(_SLICE_DATA, slice(1)), _SLICE_DATA[:1],
-                         msg='slice key should apply slice to sequence')
-        self.assertEqual(traverse_obj(_SLICE_DATA, slice(1, 2)), _SLICE_DATA[1:2],
-                         msg='slice key should apply slice to sequence')
-        self.assertEqual(traverse_obj(_SLICE_DATA, slice(1, 4, 2)), _SLICE_DATA[1:4:2],
-                         msg='slice key should apply slice to sequence')
-
-        # Test alternative paths
-        self.assertEqual(traverse_obj(_TEST_DATA, 'fail', 'str'), 'str',
-                         msg='multiple `paths` should be treated as alternative paths')
-        self.assertEqual(traverse_obj(_TEST_DATA, 'str', 100), 'str',
-                         msg='alternatives should exit early')
-        self.assertEqual(traverse_obj(_TEST_DATA, 'fail', 'fail'), None,
-                         msg='alternatives should return `default` if exhausted')
-        self.assertEqual(traverse_obj(_TEST_DATA, (Ellipsis, 'fail'), 100), 100,
-                         msg='alternatives should track their own branching return')
-        self.assertEqual(traverse_obj(_TEST_DATA, ('dict', Ellipsis), ('data', Ellipsis)), list(_TEST_DATA['data']),
-                         msg='alternatives on empty objects should search further')
-
-        # Test branch and path nesting
-        self.assertEqual(traverse_obj(_TEST_DATA, ('urls', (3, 0), 'url')), ['https://www.example.com/0'],
-                         msg='tuple as key should be treated as branches')
-        self.assertEqual(traverse_obj(_TEST_DATA, ('urls', [3, 0], 'url')), ['https://www.example.com/0'],
-                         msg='list as key should be treated as branches')
-        self.assertEqual(traverse_obj(_TEST_DATA, ('urls', ((1, 'fail'), (0, 'url')))), ['https://www.example.com/0'],
-                         msg='double nesting in path should be treated as paths')
-        self.assertEqual(traverse_obj(['0', [1, 2]], [(0, 1), 0]), [1],
-                         msg='do not fail early on branching')
-        self.assertCountEqual(traverse_obj(_TEST_DATA, ('urls', ((1, ('fail', 'url')), (0, 'url')))),
-                              ['https://www.example.com/0', 'https://www.example.com/1'],
-                              msg='triple nesting in path should be treated as branches')
-        self.assertEqual(traverse_obj(_TEST_DATA, ('urls', ('fail', (Ellipsis, 'url')))),
-                         ['https://www.example.com/0', 'https://www.example.com/1'],
-                         msg='ellipsis as branch path start gets flattened')
-
-        # Test dictionary as key
-        self.assertEqual(traverse_obj(_TEST_DATA, {0: 100, 1: 1.2}), {0: 100, 1: 1.2},
-                         msg='dict key should result in a dict with the same keys')
-        self.assertEqual(traverse_obj(_TEST_DATA, {0: ('urls', 0, 'url')}),
-                         {0: 'https://www.example.com/0'},
-                         msg='dict key should allow paths')
-        self.assertEqual(traverse_obj(_TEST_DATA, {0: ('urls', (3, 0), 'url')}),
-                         {0: ['https://www.example.com/0']},
-                         msg='tuple in dict path should be treated as branches')
-        self.assertEqual(traverse_obj(_TEST_DATA, {0: ('urls', ((1, 'fail'), (0, 'url')))}),
-                         {0: ['https://www.example.com/0']},
-                         msg='double nesting in dict path should be treated as paths')
-        self.assertEqual(traverse_obj(_TEST_DATA, {0: ('urls', ((1, ('fail', 'url')), (0, 'url')))}),
-                         {0: ['https://www.example.com/1', 'https://www.example.com/0']},
-                         msg='triple nesting in dict path should be treated as branches')
-        self.assertEqual(traverse_obj(_TEST_DATA, {0: 'fail'}), {},
-                         msg='remove `None` values when top level dict key fails')
-        self.assertEqual(traverse_obj(_TEST_DATA, {0: 'fail'}, default=Ellipsis), {0: Ellipsis},
-                         msg='use `default` if key fails and `default`')
-        self.assertEqual(traverse_obj(_TEST_DATA, {0: 'dict'}), {},
-                         msg='remove empty values when dict key')
-        self.assertEqual(traverse_obj(_TEST_DATA, {0: 'dict'}, default=Ellipsis), {0: Ellipsis},
-                         msg='use `default` when dict key and a default')
-        self.assertEqual(traverse_obj(_TEST_DATA, {0: {0: 'fail'}}), {},
-                         msg='remove empty values when nested dict key fails')
-        self.assertEqual(traverse_obj(None, {0: 'fail'}), {},
-                         msg='default to dict if pruned')
-        self.assertEqual(traverse_obj(None, {0: 'fail'}, default=Ellipsis), {0: Ellipsis},
-                         msg='default to dict if pruned and default is given')
-        self.assertEqual(traverse_obj(_TEST_DATA, {0: {0: 'fail'}}, default=Ellipsis), {0: {0: Ellipsis}},
-                         msg='use nested `default` when nested dict key fails and `default`')
-        self.assertEqual(traverse_obj(_TEST_DATA, {0: ('dict', Ellipsis)}), {},
-                         msg='remove key if branch in dict key not successful')
-
-        # Testing default parameter behavior
-        _DEFAULT_DATA = {'None': None, 'int': 0, 'list': []}
-        self.assertEqual(traverse_obj(_DEFAULT_DATA, 'fail'), None,
-                         msg='default value should be `None`')
-        self.assertEqual(traverse_obj(_DEFAULT_DATA, 'fail', 'fail', default=Ellipsis), Ellipsis,
-                         msg='chained fails should result in default')
-        self.assertEqual(traverse_obj(_DEFAULT_DATA, 'None', 'int'), 0,
-                         msg='should not short cirquit on `None`')
-        self.assertEqual(traverse_obj(_DEFAULT_DATA, 'fail', default=1), 1,
-                         msg='invalid dict key should result in `default`')
-        self.assertEqual(traverse_obj(_DEFAULT_DATA, 'None', default=1), 1,
-                         msg='`None` is a deliberate sentinel and should become `default`')
-        self.assertEqual(traverse_obj(_DEFAULT_DATA, ('list', 10)), None,
-                         msg='`IndexError` should result in `default`')
-        self.assertEqual(traverse_obj(_DEFAULT_DATA, (Ellipsis, 'fail'), default=1), 1,
-                         msg='if branched but not successful return `default` if defined, not `[]`')
-        self.assertEqual(traverse_obj(_DEFAULT_DATA, (Ellipsis, 'fail'), default=None), None,
-                         msg='if branched but not successful return `default` even if `default` is `None`')
-        self.assertEqual(traverse_obj(_DEFAULT_DATA, (Ellipsis, 'fail')), [],
-                         msg='if branched but not successful return `[]`, not `default`')
-        self.assertEqual(traverse_obj(_DEFAULT_DATA, ('list', Ellipsis)), [],
-                         msg='if branched but object is empty return `[]`, not `default`')
-        self.assertEqual(traverse_obj(None, Ellipsis), [],
-                         msg='if branched but object is `None` return `[]`, not `default`')
-        self.assertEqual(traverse_obj({0: None}, (0, Ellipsis)), [],
-                         msg='if branched but state is `None` return `[]`, not `default`')
-
-        branching_paths = [
-            ('fail', Ellipsis),
-            (Ellipsis, 'fail'),
-            100 * ('fail',) + (Ellipsis,),
-            (Ellipsis,) + 100 * ('fail',),
-        ]
-        for branching_path in branching_paths:
-            self.assertEqual(traverse_obj({}, branching_path), [],
-                             msg='if branched but state is `None`, return `[]` (not `default`)')
-            self.assertEqual(traverse_obj({}, 'fail', branching_path), [],
-                             msg='if branching in last alternative and previous did not match, return `[]` (not `default`)')
-            self.assertEqual(traverse_obj({0: 'x'}, 0, branching_path), 'x',
-                             msg='if branching in last alternative and previous did match, return single value')
-            self.assertEqual(traverse_obj({0: 'x'}, branching_path, 0), 'x',
-                             msg='if branching in first alternative and non-branching path does match, return single value')
-            self.assertEqual(traverse_obj({}, branching_path, 'fail'), None,
-                             msg='if branching in first alternative and non-branching path does not match, return `default`')
-
-        # Testing expected_type behavior
-        _EXPECTED_TYPE_DATA = {'str': 'str', 'int': 0}
-        self.assertEqual(traverse_obj(_EXPECTED_TYPE_DATA, 'str', expected_type=str),
-                         'str', msg='accept matching `expected_type` type')
-        self.assertEqual(traverse_obj(_EXPECTED_TYPE_DATA, 'str', expected_type=int),
-                         None, msg='reject non-matching `expected_type` type')
-        self.assertEqual(traverse_obj(_EXPECTED_TYPE_DATA, 'int', expected_type=lambda x: str(x)),
-                         '0', msg='transform type using type function')
-        self.assertEqual(traverse_obj(_EXPECTED_TYPE_DATA, 'str', expected_type=lambda _: 1 / 0),
-                         None, msg='wrap expected_type function in try_call')
-        self.assertEqual(traverse_obj(_EXPECTED_TYPE_DATA, Ellipsis, expected_type=str),
-                         ['str'], msg='eliminate items that expected_type fails on')
-        self.assertEqual(traverse_obj(_TEST_DATA, {0: 100, 1: 1.2}, expected_type=int),
-                         {0: 100}, msg='type as expected_type should filter dict values')
-        self.assertEqual(traverse_obj(_TEST_DATA, {0: 100, 1: 1.2, 2: 'None'}, expected_type=str_or_none),
-                         {0: '100', 1: '1.2'}, msg='function as expected_type should transform dict values')
-        self.assertEqual(traverse_obj(_TEST_DATA, ({0: 1.2}, 0, set((int_or_none,))), expected_type=int),
-                         1, msg='expected_type should not filter non-final dict values')
-        self.assertEqual(traverse_obj(_TEST_DATA, {0: {0: 100, 1: 'str'}}, expected_type=int),
-                         {0: {0: 100}}, msg='expected_type should transform deep dict values')
-        self.assertEqual(traverse_obj(_TEST_DATA, [({0: '...'}, {0: '...'})], expected_type=type(Ellipsis)),
-                         [{0: Ellipsis}, {0: Ellipsis}], msg='expected_type should transform branched dict values')
-        self.assertEqual(traverse_obj({1: {3: 4}}, [(1, 2), 3], expected_type=int),
-                         [4], msg='expected_type regression for type matching in tuple branching')
-        self.assertEqual(traverse_obj(_TEST_DATA, ['data', Ellipsis], expected_type=int),
-                         [], msg='expected_type regression for type matching in dict result')
-
-        # Test get_all behavior
-        _GET_ALL_DATA = {'key': [0, 1, 2]}
-        self.assertEqual(traverse_obj(_GET_ALL_DATA, ('key', Ellipsis), get_all=False), 0,
-                         msg='if not `get_all`, return only first matching value')
-        self.assertEqual(traverse_obj(_GET_ALL_DATA, Ellipsis, get_all=False), [0, 1, 2],
-                         msg='do not overflatten if not `get_all`')
-
-        # Test casesense behavior
-        _CASESENSE_DATA = {
-            'KeY': 'value0',
-            0: {
-                'KeY': 'value1',
-                0: {'KeY': 'value2'},
-            },
-            # FULLWIDTH LATIN CAPITAL LETTER K
-            '\uff2bey': 'value3',
-        }
-        self.assertEqual(traverse_obj(_CASESENSE_DATA, 'key'), None,
-                         msg='dict keys should be case sensitive unless `casesense`')
-        self.assertEqual(traverse_obj(_CASESENSE_DATA, 'keY',
-                                      casesense=False), 'value0',
-                         msg='allow non matching key case if `casesense`')
-        self.assertEqual(traverse_obj(_CASESENSE_DATA, '\uff4bey',  # FULLWIDTH LATIN SMALL LETTER K
-                                      casesense=False), 'value3',
-                         msg='allow non matching Unicode key case if `casesense`')
-        self.assertEqual(traverse_obj(_CASESENSE_DATA, (0, ('keY',)),
-                                      casesense=False), ['value1'],
-                         msg='allow non matching key case in branch if `casesense`')
-        self.assertEqual(traverse_obj(_CASESENSE_DATA, (0, ((0, 'keY'),)),
-                                      casesense=False), ['value2'],
-                         msg='allow non matching key case in branch path if `casesense`')
-
-        # Test traverse_string behavior
-        _TRAVERSE_STRING_DATA = {'str': 'str', 1.2: 1.2}
-        self.assertEqual(traverse_obj(_TRAVERSE_STRING_DATA, ('str', 0)), None,
-                         msg='do not traverse into string if not `traverse_string`')
-        self.assertEqual(traverse_obj(_TRAVERSE_STRING_DATA, ('str', 0),
-                                      _traverse_string=True), 's',
-                         msg='traverse into string if `traverse_string`')
-        self.assertEqual(traverse_obj(_TRAVERSE_STRING_DATA, (1.2, 1),
-                                      _traverse_string=True), '.',
-                         msg='traverse into converted data if `traverse_string`')
-        self.assertEqual(traverse_obj(_TRAVERSE_STRING_DATA, ('str', Ellipsis),
-                                      _traverse_string=True), 'str',
-                         msg='`...` should result in string (same value) if `traverse_string`')
-        self.assertEqual(traverse_obj(_TRAVERSE_STRING_DATA, ('str', slice(0, None, 2)),
-                                      _traverse_string=True), 'sr',
-                         msg='`slice` should result in string if `traverse_string`')
-        self.assertEqual(traverse_obj(_TRAVERSE_STRING_DATA, ('str', lambda i, v: i or v == 's'),
-                                      _traverse_string=True), 'str',
-                         msg='function should result in string if `traverse_string`')
-        self.assertEqual(traverse_obj(_TRAVERSE_STRING_DATA, ('str', (0, 2)),
-                                      _traverse_string=True), ['s', 'r'],
-                         msg='branching should result in list if `traverse_string`')
-        self.assertEqual(traverse_obj({}, (0, Ellipsis), _traverse_string=True), [],
-                         msg='branching should result in list if `traverse_string`')
-        self.assertEqual(traverse_obj({}, (0, lambda x, y: True), _traverse_string=True), [],
-                         msg='branching should result in list if `traverse_string`')
-        self.assertEqual(traverse_obj({}, (0, slice(1)), _traverse_string=True), [],
-                         msg='branching should result in list if `traverse_string`')
-
-        # Test re.Match as input obj
-        mobj = re.match(r'^0(12)(?P<group>3)(4)?$', '0123')
-        self.assertEqual(traverse_obj(mobj, Ellipsis), [x for x in mobj.groups() if x is not None],
-                         msg='`...` on a `re.Match` should give its `groups()`')
-        self.assertEqual(traverse_obj(mobj, lambda k, _: k in (0, 2)), ['0123', '3'],
-                         msg='function on a `re.Match` should give groupno, value starting at 0')
-        self.assertEqual(traverse_obj(mobj, 'group'), '3',
-                         msg='str key on a `re.Match` should give group with that name')
-        self.assertEqual(traverse_obj(mobj, 2), '3',
-                         msg='int key on a `re.Match` should give group with that name')
-        self.assertEqual(traverse_obj(mobj, 'gRoUp', casesense=False), '3',
-                         msg='str key on a `re.Match` should respect casesense')
-        self.assertEqual(traverse_obj(mobj, 'fail'), None,
-                         msg='failing str key on a `re.Match` should return `default`')
-        self.assertEqual(traverse_obj(mobj, 'gRoUpS', casesense=False), None,
-                         msg='failing str key on a `re.Match` should return `default`')
-        self.assertEqual(traverse_obj(mobj, 8), None,
-                         msg='failing int key on a `re.Match` should return `default`')
-        self.assertEqual(traverse_obj(mobj, lambda k, _: k in (0, 'group')), ['0123', '3'],
-                         msg='function on a `re.Match` should give group name as well')
-
-        # Test xml.etree.ElementTree.Element as input obj
-        etree = compat_etree_fromstring('''<?xml version="1.0"?>
-        <data>
-            <country name="Liechtenstein">
-                <rank>1</rank>
-                <year>2008</year>
-                <gdppc>141100</gdppc>
-                <neighbor name="Austria" direction="E"/>
-                <neighbor name="Switzerland" direction="W"/>
-            </country>
-            <country name="Singapore">
-                <rank>4</rank>
-                <year>2011</year>
-                <gdppc>59900</gdppc>
-                <neighbor name="Malaysia" direction="N"/>
-            </country>
-            <country name="Panama">
-                <rank>68</rank>
-                <year>2011</year>
-                <gdppc>13600</gdppc>
-                <neighbor name="Costa Rica" direction="W"/>
-                <neighbor name="Colombia" direction="E"/>
-            </country>
-        </data>''')
-        self.assertEqual(traverse_obj(etree, ''), etree,
-                         msg='empty str key should return the element itself')
-        self.assertEqual(traverse_obj(etree, 'country'), list(etree),
-                         msg='str key should return all children with that tag name')
-        self.assertEqual(traverse_obj(etree, Ellipsis), list(etree),
-                         msg='`...` as key should return all children')
-        self.assertEqual(traverse_obj(etree, lambda _, x: x[0].text == '4'), [etree[1]],
-                         msg='function as key should get element as value')
-        self.assertEqual(traverse_obj(etree, lambda i, _: i == 1), [etree[1]],
-                         msg='function as key should get index as key')
-        self.assertEqual(traverse_obj(etree, 0), etree[0],
-                         msg='int key should return the nth child')
-        self.assertEqual(traverse_obj(etree, './/neighbor/@name'),
-                         ['Austria', 'Switzerland', 'Malaysia', 'Costa Rica', 'Colombia'],
-                         msg='`@<attribute>` at end of path should give that attribute')
-        self.assertEqual(traverse_obj(etree, '//neighbor/@fail'), [None, None, None, None, None],
-                         msg='`@<nonexistent>` at end of path should give `None`')
-        self.assertEqual(traverse_obj(etree, ('//neighbor/@', 2)), {'name': 'Malaysia', 'direction': 'N'},
-                         msg='`@` should give the full attribute dict')
-        self.assertEqual(traverse_obj(etree, '//year/text()'), ['2008', '2011', '2011'],
-                         msg='`text()` at end of path should give the inner text')
-        self.assertEqual(traverse_obj(etree, '//*[@direction]/@direction'), ['E', 'W', 'N', 'W', 'E'],
-                         msg='full python xpath features should be supported')
-        self.assertEqual(traverse_obj(etree, (0, '@name')), 'Liechtenstein',
-                         msg='special transformations should act on current element')
-        self.assertEqual(traverse_obj(etree, ('country', 0, Ellipsis, 'text()', T(int_or_none))), [1, 2008, 141100],
-                         msg='special transformations should act on current element')
-
-    def test_traversal_unbranching(self):
-        self.assertEqual(traverse_obj(_TEST_DATA, [(100, 1.2), all]), [100, 1.2],
-                         msg='`all` should give all results as list')
-        self.assertEqual(traverse_obj(_TEST_DATA, [(100, 1.2), any]), 100,
-                         msg='`any` should give the first result')
-        self.assertEqual(traverse_obj(_TEST_DATA, [100, all]), [100],
-                         msg='`all` should give list if non branching')
-        self.assertEqual(traverse_obj(_TEST_DATA, [100, any]), 100,
-                         msg='`any` should give single item if non branching')
-        self.assertEqual(traverse_obj(_TEST_DATA, [('dict', 'None', 100), all]), [100],
-                         msg='`all` should filter `None` and empty dict')
-        self.assertEqual(traverse_obj(_TEST_DATA, [('dict', 'None', 100), any]), 100,
-                         msg='`any` should filter `None` and empty dict')
-        self.assertEqual(traverse_obj(_TEST_DATA, [{
-            'all': [('dict', 'None', 100, 1.2), all],
-            'any': [('dict', 'None', 100, 1.2), any],
-        }]), {'all': [100, 1.2], 'any': 100},
-            msg='`all`/`any` should apply to each dict path separately')
-        self.assertEqual(traverse_obj(_TEST_DATA, [{
-            'all': [('dict', 'None', 100, 1.2), all],
-            'any': [('dict', 'None', 100, 1.2), any],
-        }], get_all=False), {'all': [100, 1.2], 'any': 100},
-            msg='`all`/`any` should apply to dict regardless of `get_all`')
-        self.assertIs(traverse_obj(_TEST_DATA, [('dict', 'None', 100, 1.2), all, T(float)]), None,
-                      msg='`all` should reset branching status')
-        self.assertIs(traverse_obj(_TEST_DATA, [('dict', 'None', 100, 1.2), any, T(float)]), None,
-                      msg='`any` should reset branching status')
-        self.assertEqual(traverse_obj(_TEST_DATA, [('dict', 'None', 100, 1.2), all, Ellipsis, T(float)]), [1.2],
-                         msg='`all` should allow further branching')
-        self.assertEqual(traverse_obj(_TEST_DATA, [('dict', 'None', 'urls', 'data'), any, Ellipsis, 'index']), [0, 1],
-                         msg='`any` should allow further branching')
-
-    def test_traversal_morsel(self):
-        values = {
-            'expires': 'a',
-            'path': 'b',
-            'comment': 'c',
-            'domain': 'd',
-            'max-age': 'e',
-            'secure': 'f',
-            'httponly': 'g',
-            'version': 'h',
-            'samesite': 'i',
-        }
-        # SameSite added in Py3.8, breaks .update for 3.5-3.7
-        if sys.version_info < (3, 8):
-            del values['samesite']
-        morsel = compat_http_cookies.Morsel()
-        morsel.set(str('item_key'), 'item_value', 'coded_value')
-        morsel.update(values)
-        values['key'] = str('item_key')
-        values['value'] = 'item_value'
-        values = dict((str(k), v) for k, v in values.items())
-        # make test pass even without ordered dict
-        value_set = set(values.values())
-
-        for key, value in values.items():
-            self.assertEqual(traverse_obj(morsel, key), value,
-                             msg='Morsel should provide access to all values')
-        self.assertEqual(set(traverse_obj(morsel, Ellipsis)), value_set,
-                         msg='`...` should yield all values')
-        self.assertEqual(set(traverse_obj(morsel, lambda k, v: True)), value_set,
-                         msg='function key should yield all values')
-        self.assertIs(traverse_obj(morsel, [(None,), any]), morsel,
-                      msg='Morsel should not be implicitly changed to dict on usage')
-
-    def test_get_first(self):
-        self.assertEqual(get_first([{'a': None}, {'a': 'spam'}], 'a'), 'spam')
-
-    def test_dict_get(self):
-        FALSE_VALUES = {
-            'none': None,
-            'false': False,
-            'zero': 0,
-            'empty_string': '',
-            'empty_list': [],
-        }
-        d = FALSE_VALUES.copy()
-        d['a'] = 42
-        self.assertEqual(dict_get(d, 'a'), 42)
-        self.assertEqual(dict_get(d, 'b'), None)
-        self.assertEqual(dict_get(d, 'b', 42), 42)
-        self.assertEqual(dict_get(d, ('a', )), 42)
-        self.assertEqual(dict_get(d, ('b', 'a', )), 42)
-        self.assertEqual(dict_get(d, ('b', 'c', 'a', 'd', )), 42)
-        self.assertEqual(dict_get(d, ('b', 'c', )), None)
-        self.assertEqual(dict_get(d, ('b', 'c', ), 42), 42)
-        for key, false_value in FALSE_VALUES.items():
-            self.assertEqual(dict_get(d, ('b', 'c', key, )), None)
-            self.assertEqual(dict_get(d, ('b', 'c', key, ), skip_false_values=False), false_value)
-
-
-if __name__ == '__main__':
-    unittest.main()
diff --git a/test/test_unicode_literals.py b/test/test_unicode_literals.py
index 0c83f2a0c..6c1b7ec91 100644
--- a/test/test_unicode_literals.py
+++ b/test/test_unicode_literals.py
@@ -2,21 +2,19 @@ from __future__ import unicode_literals
 
 # Allow direct execution
 import os
-import re
 import sys
 import unittest
+sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
 
-dirn = os.path.dirname
+import io
+import re
 
-rootDir = dirn(dirn(os.path.abspath(__file__)))
-
-sys.path.insert(0, rootDir)
+rootDir = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
 
 IGNORED_FILES = [
     'setup.py',  # http://bugs.python.org/issue13943
     'conf.py',
     'buildserver.py',
-    'get-pip.py',
 ]
 
 IGNORED_DIRS = [
@@ -25,7 +23,6 @@ IGNORED_DIRS = [
 ]
 
 from test.helper import assertRegexpMatches
-from youtube_dl.compat import compat_open as open
 
 
 class TestUnicodeLiterals(unittest.TestCase):
@@ -43,7 +40,7 @@ class TestUnicodeLiterals(unittest.TestCase):
                     continue
 
                 fn = os.path.join(dirpath, basename)
-                with open(fn, encoding='utf-8') as inf:
+                with io.open(fn, encoding='utf-8') as inf:
                     code = inf.read()
 
                 if "'" not in code and '"' not in code:
diff --git a/test/test_utils.py b/test/test_utils.py
index 2947cce7e..259c4763e 100644
--- a/test/test_utils.py
+++ b/test/test_utils.py
@@ -12,16 +12,13 @@ sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
 
 # Various small unit tests
 import io
-import itertools
 import json
-import types
 import xml.etree.ElementTree
 
 from youtube_dl.utils import (
-    _UnsafeExtensionError,
     age_restricted,
     args_to_str,
-    base_url,
+    encode_base_n,
     caesar,
     clean_html,
     clean_podcast_url,
@@ -29,12 +26,11 @@ from youtube_dl.utils import (
     DateRange,
     detect_exe_version,
     determine_ext,
-    encode_base_n,
+    dict_get,
     encode_compat_str,
     encodeFilename,
     escape_rfc3986,
     escape_url,
-    expand_path,
     extract_attributes,
     ExtractorError,
     find_xpath_attr,
@@ -48,11 +44,8 @@ from youtube_dl.utils import (
     int_or_none,
     intlist_to_bytes,
     is_html,
-    join_nonempty,
     js_to_json,
-    LazyList,
     limit_length,
-    lowercase_escape,
     merge_dicts,
     mimetype2ext,
     month_by_name,
@@ -61,26 +54,24 @@ from youtube_dl.utils import (
     OnDemandPagedList,
     orderedSet,
     parse_age_limit,
-    parse_bitrate,
     parse_duration,
     parse_filesize,
-    parse_codecs,
     parse_count,
     parse_iso8601,
     parse_resolution,
-    parse_qs,
+    parse_bitrate,
     pkcs1pad,
-    prepend_extension,
     read_batch_urls,
-    remove_start,
-    remove_end,
-    remove_quotes,
-    replace_extension,
-    rot47,
     sanitize_filename,
     sanitize_path,
     sanitize_url,
-    sanitized_Request,
+    expand_path,
+    prepend_extension,
+    replace_extension,
+    remove_start,
+    remove_end,
+    remove_quotes,
+    rot47,
     shell_quote,
     smuggle_url,
     str_to_int,
@@ -88,19 +79,19 @@ from youtube_dl.utils import (
     strip_or_none,
     subtitles_filename,
     timeconvert,
-    try_call,
     unescapeHTML,
     unified_strdate,
     unified_timestamp,
     unsmuggle_url,
     uppercase_escape,
+    lowercase_escape,
     url_basename,
     url_or_none,
+    base_url,
     urljoin,
     urlencode_postdata,
     urshift,
     update_url_query,
-    variadic,
     version_tuple,
     xpath_with_ns,
     xpath_element,
@@ -113,7 +104,7 @@ from youtube_dl.utils import (
     cli_option,
     cli_valueless_option,
     cli_bool_option,
-    YoutubeDLHandler,
+    parse_codecs,
 )
 from youtube_dl.compat import (
     compat_chr,
@@ -121,13 +112,12 @@ from youtube_dl.compat import (
     compat_getenv,
     compat_os_name,
     compat_setenv,
-    compat_str,
     compat_urlparse,
+    compat_parse_qs,
 )
 
 
 class TestUtil(unittest.TestCase):
-
     def test_timeconvert(self):
         self.assertTrue(timeconvert('') is None)
         self.assertTrue(timeconvert('bougrg') is None)
@@ -246,19 +236,6 @@ class TestUtil(unittest.TestCase):
         self.assertEqual(sanitize_url('httpss://foo.bar'), 'https://foo.bar')
         self.assertEqual(sanitize_url('rmtps://foo.bar'), 'rtmps://foo.bar')
         self.assertEqual(sanitize_url('https://foo.bar'), 'https://foo.bar')
-        self.assertEqual(sanitize_url('foo bar'), 'foo bar')
-
-    def test_sanitized_Request(self):
-        self.assertFalse(sanitized_Request('http://foo.bar').has_header('Authorization'))
-        self.assertFalse(sanitized_Request('http://:foo.bar').has_header('Authorization'))
-        self.assertEqual(sanitized_Request('http://@foo.bar').get_header('Authorization'),
-                         'Basic Og==')
-        self.assertEqual(sanitized_Request('http://:pass@foo.bar').get_header('Authorization'),
-                         'Basic OnBhc3M=')
-        self.assertEqual(sanitized_Request('http://user:@foo.bar').get_header('Authorization'),
-                         'Basic dXNlcjo=')
-        self.assertEqual(sanitized_Request('http://user:pass@foo.bar').get_header('Authorization'),
-                         'Basic dXNlcjpwYXNz')
 
     def test_expand_path(self):
         def env(var):
@@ -272,27 +249,6 @@ class TestUtil(unittest.TestCase):
             expand_path('~/%s' % env('YOUTUBE_DL_EXPATH_PATH')),
             '%s/expanded' % compat_getenv('HOME'))
 
-    _uncommon_extensions = [
-        ('exe', 'abc.exe.ext'),
-        ('de', 'abc.de.ext'),
-        ('../.mp4', None),
-        ('..\\.mp4', None),
-    ]
-
-    def assertUnsafeExtension(self, ext=None):
-        assert_raises = self.assertRaises(_UnsafeExtensionError)
-        assert_raises.ext = ext
-        orig_exit = assert_raises.__exit__
-
-        def my_exit(self_, exc_type, exc_val, exc_tb):
-            did_raise = orig_exit(exc_type, exc_val, exc_tb)
-            if did_raise and assert_raises.ext is not None:
-                self.assertEqual(assert_raises.ext, assert_raises.exception.extension, 'Unsafe extension  not as unexpected')
-            return did_raise
-
-        assert_raises.__exit__ = types.MethodType(my_exit, assert_raises)
-        return assert_raises
-
     def test_prepend_extension(self):
         self.assertEqual(prepend_extension('abc.ext', 'temp'), 'abc.temp.ext')
         self.assertEqual(prepend_extension('abc.ext', 'temp', 'ext'), 'abc.temp.ext')
@@ -301,19 +257,6 @@ class TestUtil(unittest.TestCase):
         self.assertEqual(prepend_extension('.abc', 'temp'), '.abc.temp')
         self.assertEqual(prepend_extension('.abc.ext', 'temp'), '.abc.temp.ext')
 
-        # Test uncommon extensions
-        self.assertEqual(prepend_extension('abc.ext', 'bin'), 'abc.bin.ext')
-        for ext, result in self._uncommon_extensions:
-            with self.assertUnsafeExtension(ext):
-                prepend_extension('abc', ext)
-            if result:
-                self.assertEqual(prepend_extension('abc.ext', ext, 'ext'), result)
-            else:
-                with self.assertUnsafeExtension(ext):
-                    prepend_extension('abc.ext', ext, 'ext')
-            with self.assertUnsafeExtension(ext):
-                prepend_extension('abc.unexpected_ext', ext, 'ext')
-
     def test_replace_extension(self):
         self.assertEqual(replace_extension('abc.ext', 'temp'), 'abc.temp')
         self.assertEqual(replace_extension('abc.ext', 'temp', 'ext'), 'abc.temp')
@@ -322,16 +265,6 @@ class TestUtil(unittest.TestCase):
         self.assertEqual(replace_extension('.abc', 'temp'), '.abc.temp')
         self.assertEqual(replace_extension('.abc.ext', 'temp'), '.abc.temp')
 
-        # Test uncommon extensions
-        self.assertEqual(replace_extension('abc.ext', 'bin'), 'abc.unknown_video')
-        for ext, _ in self._uncommon_extensions:
-            with self.assertUnsafeExtension(ext):
-                replace_extension('abc', ext)
-            with self.assertUnsafeExtension(ext):
-                replace_extension('abc.ext', ext, 'ext')
-            with self.assertUnsafeExtension(ext):
-                replace_extension('abc.unexpected_ext', ext, 'ext')
-
     def test_subtitles_filename(self):
         self.assertEqual(subtitles_filename('abc.ext', 'en', 'vtt'), 'abc.en.vtt')
         self.assertEqual(subtitles_filename('abc.ext', 'en', 'vtt', 'ext'), 'abc.en.vtt')
@@ -437,9 +370,6 @@ class TestUtil(unittest.TestCase):
         self.assertEqual(unified_timestamp('Sep 11, 2013 | 5:49 AM'), 1378878540)
         self.assertEqual(unified_timestamp('December 15, 2017 at 7:49 am'), 1513324140)
         self.assertEqual(unified_timestamp('2018-03-14T08:32:43.1493874+00:00'), 1521016363)
-        self.assertEqual(unified_timestamp('December 31 1969 20:00:01 EDT'), 1)
-        self.assertEqual(unified_timestamp('Wednesday 31 December 1969 18:01:26 MDT'), 86)
-        self.assertEqual(unified_timestamp('12/31/1969 20:01:18 EDT', False), 78)
 
     def test_determine_ext(self):
         self.assertEqual(determine_ext('http://example.com/foo/bar.mp4/?download'), 'mp4')
@@ -561,14 +491,11 @@ class TestUtil(unittest.TestCase):
         self.assertEqual(float_or_none(set()), None)
 
     def test_int_or_none(self):
-        self.assertEqual(int_or_none(42), 42)
         self.assertEqual(int_or_none('42'), 42)
         self.assertEqual(int_or_none(''), None)
         self.assertEqual(int_or_none(None), None)
         self.assertEqual(int_or_none([]), None)
         self.assertEqual(int_or_none(set()), None)
-        self.assertEqual(int_or_none('42', base=8), 34)
-        self.assertRaises(TypeError, int_or_none(42, base=8))
 
     def test_str_to_int(self):
         self.assertEqual(str_to_int('123,456'), 123456)
@@ -735,36 +662,38 @@ class TestUtil(unittest.TestCase):
         self.assertTrue(isinstance(data, bytes))
 
     def test_update_url_query(self):
-        self.assertEqual(parse_qs(update_url_query(
+        def query_dict(url):
+            return compat_parse_qs(compat_urlparse.urlparse(url).query)
+        self.assertEqual(query_dict(update_url_query(
             'http://example.com/path', {'quality': ['HD'], 'format': ['mp4']})),
-            parse_qs('http://example.com/path?quality=HD&format=mp4'))
-        self.assertEqual(parse_qs(update_url_query(
+            query_dict('http://example.com/path?quality=HD&format=mp4'))
+        self.assertEqual(query_dict(update_url_query(
             'http://example.com/path', {'system': ['LINUX', 'WINDOWS']})),
-            parse_qs('http://example.com/path?system=LINUX&system=WINDOWS'))
-        self.assertEqual(parse_qs(update_url_query(
+            query_dict('http://example.com/path?system=LINUX&system=WINDOWS'))
+        self.assertEqual(query_dict(update_url_query(
             'http://example.com/path', {'fields': 'id,formats,subtitles'})),
-            parse_qs('http://example.com/path?fields=id,formats,subtitles'))
-        self.assertEqual(parse_qs(update_url_query(
+            query_dict('http://example.com/path?fields=id,formats,subtitles'))
+        self.assertEqual(query_dict(update_url_query(
             'http://example.com/path', {'fields': ('id,formats,subtitles', 'thumbnails')})),
-            parse_qs('http://example.com/path?fields=id,formats,subtitles&fields=thumbnails'))
-        self.assertEqual(parse_qs(update_url_query(
+            query_dict('http://example.com/path?fields=id,formats,subtitles&fields=thumbnails'))
+        self.assertEqual(query_dict(update_url_query(
             'http://example.com/path?manifest=f4m', {'manifest': []})),
-            parse_qs('http://example.com/path'))
-        self.assertEqual(parse_qs(update_url_query(
+            query_dict('http://example.com/path'))
+        self.assertEqual(query_dict(update_url_query(
             'http://example.com/path?system=LINUX&system=WINDOWS', {'system': 'LINUX'})),
-            parse_qs('http://example.com/path?system=LINUX'))
-        self.assertEqual(parse_qs(update_url_query(
+            query_dict('http://example.com/path?system=LINUX'))
+        self.assertEqual(query_dict(update_url_query(
             'http://example.com/path', {'fields': b'id,formats,subtitles'})),
-            parse_qs('http://example.com/path?fields=id,formats,subtitles'))
-        self.assertEqual(parse_qs(update_url_query(
+            query_dict('http://example.com/path?fields=id,formats,subtitles'))
+        self.assertEqual(query_dict(update_url_query(
             'http://example.com/path', {'width': 1080, 'height': 720})),
-            parse_qs('http://example.com/path?width=1080&height=720'))
-        self.assertEqual(parse_qs(update_url_query(
+            query_dict('http://example.com/path?width=1080&height=720'))
+        self.assertEqual(query_dict(update_url_query(
             'http://example.com/path', {'bitrate': 5020.43})),
-            parse_qs('http://example.com/path?bitrate=5020.43'))
-        self.assertEqual(parse_qs(update_url_query(
+            query_dict('http://example.com/path?bitrate=5020.43'))
+        self.assertEqual(query_dict(update_url_query(
             'http://example.com/path', {'test': '第二行тест'})),
-            parse_qs('http://example.com/path?test=%E7%AC%AC%E4%BA%8C%E8%A1%8C%D1%82%D0%B5%D1%81%D1%82'))
+            query_dict('http://example.com/path?test=%E7%AC%AC%E4%BA%8C%E8%A1%8C%D1%82%D0%B5%D1%81%D1%82'))
 
     def test_multipart_encode(self):
         self.assertEqual(
@@ -776,6 +705,28 @@ class TestUtil(unittest.TestCase):
         self.assertRaises(
             ValueError, multipart_encode, {b'field': b'value'}, boundary='value')
 
+    def test_dict_get(self):
+        FALSE_VALUES = {
+            'none': None,
+            'false': False,
+            'zero': 0,
+            'empty_string': '',
+            'empty_list': [],
+        }
+        d = FALSE_VALUES.copy()
+        d['a'] = 42
+        self.assertEqual(dict_get(d, 'a'), 42)
+        self.assertEqual(dict_get(d, 'b'), None)
+        self.assertEqual(dict_get(d, 'b', 42), 42)
+        self.assertEqual(dict_get(d, ('a', )), 42)
+        self.assertEqual(dict_get(d, ('b', 'a', )), 42)
+        self.assertEqual(dict_get(d, ('b', 'c', 'a', 'd', )), 42)
+        self.assertEqual(dict_get(d, ('b', 'c', )), None)
+        self.assertEqual(dict_get(d, ('b', 'c', ), 42), 42)
+        for key, false_value in FALSE_VALUES.items():
+            self.assertEqual(dict_get(d, ('b', 'c', key, )), None)
+            self.assertEqual(dict_get(d, ('b', 'c', key, ), skip_false_values=False), false_value)
+
     def test_merge_dicts(self):
         self.assertEqual(merge_dicts({'a': 1}, {'b': 2}), {'a': 1, 'b': 2})
         self.assertEqual(merge_dicts({'a': 1}, {'a': 2}), {'a': 1})
@@ -934,111 +885,6 @@ class TestUtil(unittest.TestCase):
         )
         self.assertEqual(escape_url('http://vimeo.com/56015672#at=0'), 'http://vimeo.com/56015672#at=0')
 
-    def test_remove_dot_segments(self):
-
-        def remove_dot_segments(p):
-            q = '' if p.startswith('/') else '/'
-            p = 'http://example.com' + q + p
-            p = compat_urlparse.urlsplit(YoutubeDLHandler._fix_path(p)).path
-            return p[1:] if q else p
-
-        self.assertEqual(remove_dot_segments('/a/b/c/./../../g'), '/a/g')
-        self.assertEqual(remove_dot_segments('mid/content=5/../6'), 'mid/6')
-        self.assertEqual(remove_dot_segments('/ad/../cd'), '/cd')
-        self.assertEqual(remove_dot_segments('/ad/../cd/'), '/cd/')
-        self.assertEqual(remove_dot_segments('/..'), '/')
-        self.assertEqual(remove_dot_segments('/./'), '/')
-        self.assertEqual(remove_dot_segments('/./a'), '/a')
-        self.assertEqual(remove_dot_segments('/abc/./.././d/././e/.././f/./../../ghi'), '/ghi')
-        self.assertEqual(remove_dot_segments('/'), '/')
-        self.assertEqual(remove_dot_segments('/t'), '/t')
-        self.assertEqual(remove_dot_segments('t'), 't')
-        self.assertEqual(remove_dot_segments(''), '')
-        self.assertEqual(remove_dot_segments('/../a/b/c'), '/a/b/c')
-        self.assertEqual(remove_dot_segments('../a'), 'a')
-        self.assertEqual(remove_dot_segments('./a'), 'a')
-        self.assertEqual(remove_dot_segments('.'), '')
-        self.assertEqual(remove_dot_segments('////'), '////')
-
-    def test_js_to_json_vars_strings(self):
-        self.assertDictEqual(
-            json.loads(js_to_json(
-                '''{
-                    'null': a,
-                    'nullStr': b,
-                    'true': c,
-                    'trueStr': d,
-                    'false': e,
-                    'falseStr': f,
-                    'unresolvedVar': g,
-                }''',
-                {
-                    'a': 'null',
-                    'b': '"null"',
-                    'c': 'true',
-                    'd': '"true"',
-                    'e': 'false',
-                    'f': '"false"',
-                    'g': 'var',
-                }
-            )),
-            {
-                'null': None,
-                'nullStr': 'null',
-                'true': True,
-                'trueStr': 'true',
-                'false': False,
-                'falseStr': 'false',
-                'unresolvedVar': 'var'
-            }
-        )
-
-        self.assertDictEqual(
-            json.loads(js_to_json(
-                '''{
-                    'int': a,
-                    'intStr': b,
-                    'float': c,
-                    'floatStr': d,
-                }''',
-                {
-                    'a': '123',
-                    'b': '"123"',
-                    'c': '1.23',
-                    'd': '"1.23"',
-                }
-            )),
-            {
-                'int': 123,
-                'intStr': '123',
-                'float': 1.23,
-                'floatStr': '1.23',
-            }
-        )
-
-        self.assertDictEqual(
-            json.loads(js_to_json(
-                '''{
-                    'object': a,
-                    'objectStr': b,
-                    'array': c,
-                    'arrayStr': d,
-                }''',
-                {
-                    'a': '{}',
-                    'b': '"{}"',
-                    'c': '[]',
-                    'd': '"[]"',
-                }
-            )),
-            {
-                'object': {},
-                'objectStr': '{}',
-                'array': [],
-                'arrayStr': '[]',
-            }
-        )
-
     def test_js_to_json_realworld(self):
         inp = '''{
             'clip':{'provider':'pseudo'}
@@ -1109,10 +955,10 @@ class TestUtil(unittest.TestCase):
             !42: 42
         }''')
         self.assertEqual(json.loads(on), {
-            'a': True,
-            'b': False,
-            'c': False,
-            'd': True,
+            'a': 0,
+            'b': 1,
+            'c': 0,
+            'd': 42.42,
             'e': [],
             'f': "abc",
             'g': "",
@@ -1182,26 +1028,10 @@ class TestUtil(unittest.TestCase):
         on = js_to_json('{ "040": "040" }')
         self.assertEqual(json.loads(on), {'040': '040'})
 
-        on = js_to_json('[1,//{},\n2]')
-        self.assertEqual(json.loads(on), [1, 2])
-
-        on = js_to_json(r'"\^\$\#"')
-        self.assertEqual(json.loads(on), R'^$#', msg='Unnecessary escapes should be stripped')
-
-        on = js_to_json('\'"\\""\'')
-        self.assertEqual(json.loads(on), '"""', msg='Unnecessary quote escape should be escaped')
-
     def test_js_to_json_malformed(self):
         self.assertEqual(js_to_json('42a1'), '42"a1"')
         self.assertEqual(js_to_json('42a-1'), '42"a"-1')
 
-    def test_js_to_json_template_literal(self):
-        self.assertEqual(js_to_json('`Hello ${name}`', {'name': '"world"'}), '"Hello world"')
-        self.assertEqual(js_to_json('`${name}${name}`', {'name': '"X"'}), '"XX"')
-        self.assertEqual(js_to_json('`${name}${name}`', {'name': '5'}), '"55"')
-        self.assertEqual(js_to_json('`${name}"${name}"`', {'name': '5'}), '"5\\"5\\""')
-        self.assertEqual(js_to_json('`${name}`', {}), '"name"')
-
     def test_extract_attributes(self):
         self.assertEqual(extract_attributes('<e x="y">'), {'x': 'y'})
         self.assertEqual(extract_attributes("<e x='y'>"), {'x': 'y'})
@@ -1645,84 +1475,6 @@ Line 1
         self.assertEqual(clean_podcast_url('https://www.podtrac.com/pts/redirect.mp3/chtbl.com/track/5899E/traffic.megaphone.fm/HSW7835899191.mp3'), 'https://traffic.megaphone.fm/HSW7835899191.mp3')
         self.assertEqual(clean_podcast_url('https://play.podtrac.com/npr-344098539/edge1.pod.npr.org/anon.npr-podcasts/podcast/npr/waitwait/2020/10/20201003_waitwait_wwdtmpodcast201003-015621a5-f035-4eca-a9a1-7c118d90bc3c.mp3'), 'https://edge1.pod.npr.org/anon.npr-podcasts/podcast/npr/waitwait/2020/10/20201003_waitwait_wwdtmpodcast201003-015621a5-f035-4eca-a9a1-7c118d90bc3c.mp3')
 
-    def test_LazyList(self):
-        it = list(range(10))
-
-        self.assertEqual(list(LazyList(it)), it)
-        self.assertEqual(LazyList(it).exhaust(), it)
-        self.assertEqual(LazyList(it)[5], it[5])
-
-        self.assertEqual(LazyList(it)[5:], it[5:])
-        self.assertEqual(LazyList(it)[:5], it[:5])
-        self.assertEqual(LazyList(it)[::2], it[::2])
-        self.assertEqual(LazyList(it)[1::2], it[1::2])
-        self.assertEqual(LazyList(it)[5::-1], it[5::-1])
-        self.assertEqual(LazyList(it)[6:2:-2], it[6:2:-2])
-        self.assertEqual(LazyList(it)[::-1], it[::-1])
-
-        self.assertTrue(LazyList(it))
-        self.assertFalse(LazyList(range(0)))
-        self.assertEqual(len(LazyList(it)), len(it))
-        self.assertEqual(repr(LazyList(it)), repr(it))
-        self.assertEqual(compat_str(LazyList(it)), compat_str(it))
-
-        self.assertEqual(list(LazyList(it, reverse=True)), it[::-1])
-        self.assertEqual(list(reversed(LazyList(it))[::-1]), it)
-        self.assertEqual(list(reversed(LazyList(it))[1:3:7]), it[::-1][1:3:7])
-
-    def test_LazyList_laziness(self):
-
-        def test(ll, idx, val, cache):
-            self.assertEqual(ll[idx], val)
-            self.assertEqual(ll._cache, list(cache))
-
-        ll = LazyList(range(10))
-        test(ll, 0, 0, range(1))
-        test(ll, 5, 5, range(6))
-        test(ll, -3, 7, range(10))
-
-        ll = LazyList(range(10), reverse=True)
-        test(ll, -1, 0, range(1))
-        test(ll, 3, 6, range(10))
-
-        ll = LazyList(itertools.count())
-        test(ll, 10, 10, range(11))
-        ll = reversed(ll)
-        test(ll, -15, 14, range(15))
-
-    def test_try_call(self):
-        def total(*x, **kwargs):
-            return sum(x) + sum(kwargs.values())
-
-        self.assertEqual(try_call(None), None,
-                         msg='not a fn should give None')
-        self.assertEqual(try_call(lambda: 1), 1,
-                         msg='int fn with no expected_type should give int')
-        self.assertEqual(try_call(lambda: 1, expected_type=int), 1,
-                         msg='int fn with expected_type int should give int')
-        self.assertEqual(try_call(lambda: 1, expected_type=dict), None,
-                         msg='int fn with wrong expected_type should give None')
-        self.assertEqual(try_call(total, args=(0, 1, 0, ), expected_type=int), 1,
-                         msg='fn should accept arglist')
-        self.assertEqual(try_call(total, kwargs={'a': 0, 'b': 1, 'c': 0}, expected_type=int), 1,
-                         msg='fn should accept kwargs')
-        self.assertEqual(try_call(lambda: 1, expected_type=dict), None,
-                         msg='int fn with no expected_type should give None')
-        self.assertEqual(try_call(lambda x: {}, total, args=(42, ), expected_type=int), 42,
-                         msg='expect first int result with expected_type int')
-
-    def test_variadic(self):
-        self.assertEqual(variadic(None), (None, ))
-        self.assertEqual(variadic('spam'), ('spam', ))
-        self.assertEqual(variadic('spam', allowed_types=dict), 'spam')
-        self.assertEqual(variadic('spam', allowed_types=[dict]), 'spam')
-
-    def test_join_nonempty(self):
-        self.assertEqual(join_nonempty('a', 'b'), 'a-b')
-        self.assertEqual(join_nonempty(
-            'a', 'b', 'c', 'd',
-            from_dict={'a': 'c', 'c': [], 'b': 'd', 'd': None}), 'c-d')
-
 
 if __name__ == '__main__':
     unittest.main()
diff --git a/test/test_write_annotations.py b/test/test_write_annotations.py
index 68e0a391d..41abdfe3b 100644
--- a/test/test_write_annotations.py
+++ b/test/test_write_annotations.py
@@ -11,11 +11,12 @@ sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
 from test.helper import get_params, try_rm
 
 
+import io
+
 import xml.etree.ElementTree
 
 import youtube_dl.YoutubeDL
 import youtube_dl.extractor
-from youtube_dl.compat import compat_open as open
 
 
 class YoutubeDL(youtube_dl.YoutubeDL):
@@ -50,7 +51,7 @@ class TestAnnotations(unittest.TestCase):
         ydl.download([TEST_ID])
         self.assertTrue(os.path.exists(ANNOTATIONS_FILE))
         annoxml = None
-        with open(ANNOTATIONS_FILE, 'r', encoding='utf-8') as annof:
+        with io.open(ANNOTATIONS_FILE, 'r', encoding='utf-8') as annof:
             annoxml = xml.etree.ElementTree.parse(annof)
         self.assertTrue(annoxml is not None, 'Failed to parse annotations XML')
         root = annoxml.getroot()
diff --git a/test/test_youtube_lists.py b/test/test_youtube_lists.py
index e0e8891ba..cf2fdf14f 100644
--- a/test/test_youtube_lists.py
+++ b/test/test_youtube_lists.py
@@ -1,5 +1,4 @@
 #!/usr/bin/env python
-# -*- coding: utf-8 -*-
 from __future__ import unicode_literals
 
 # Allow direct execution
@@ -10,10 +9,11 @@ sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
 
 from test.helper import FakeYDL
 
+
 from youtube_dl.extractor import (
-    YoutubeIE,
     YoutubePlaylistIE,
     YoutubeTabIE,
+    YoutubeIE,
 )
 
 
@@ -25,23 +25,38 @@ class TestYoutubeLists(unittest.TestCase):
     def test_youtube_playlist_noplaylist(self):
         dl = FakeYDL()
         dl.params['noplaylist'] = True
-        dl.params['format'] = 'best'
         ie = YoutubePlaylistIE(dl)
         result = ie.extract('https://www.youtube.com/watch?v=FXxLjLQi3Fg&list=PLwiyx1dc3P2JR9N8gQaQN_BCvlSlap7re')
         self.assertEqual(result['_type'], 'url')
-        result = dl.extract_info(result['url'], download=False, ie_key=result.get('ie_key'), process=False)
         self.assertEqual(YoutubeIE().extract_id(result['url']), 'FXxLjLQi3Fg')
 
+    def test_youtube_course(self):
+        dl = FakeYDL()
+        ie = YoutubePlaylistIE(dl)
+        # TODO find a > 100 (paginating?) videos course
+        result = ie.extract('https://www.youtube.com/course?list=ECUl4u3cNGP61MdtwGTqZA0MreSaDybji8')
+        entries = list(result['entries'])
+        self.assertEqual(YoutubeIE().extract_id(entries[0]['url']), 'j9WZyLZCBzs')
+        self.assertEqual(len(entries), 25)
+        self.assertEqual(YoutubeIE().extract_id(entries[-1]['url']), 'rYefUsYuEp0')
+
     def test_youtube_mix(self):
         dl = FakeYDL()
-        dl.params['format'] = 'best'
-        ie = YoutubeTabIE(dl)
-        result = dl.extract_info('https://www.youtube.com/watch?v=tyITL_exICo&list=RDCLAK5uy_kLWIr9gv1XLlPbaDS965-Db4TrBoUTxQ8',
-                                 download=False, ie_key=ie.ie_key(), process=True)
-        entries = (result or {}).get('entries', [{'id': 'not_found', }])
-        self.assertTrue(len(entries) >= 25)
+        ie = YoutubePlaylistIE(dl)
+        result = ie.extract('https://www.youtube.com/watch?v=W01L70IGBgE&index=2&list=RDOQpdSVF_k_w')
+        entries = result['entries']
+        self.assertTrue(len(entries) >= 50)
         original_video = entries[0]
-        self.assertEqual(original_video['id'], 'tyITL_exICo')
+        self.assertEqual(original_video['id'], 'OQpdSVF_k_w')
+
+    def test_youtube_toptracks(self):
+        print('Skipping: The playlist page gives error 500')
+        return
+        dl = FakeYDL()
+        ie = YoutubePlaylistIE(dl)
+        result = ie.extract('https://www.youtube.com/playlist?list=MCUS')
+        entries = result['entries']
+        self.assertEqual(len(entries), 100)
 
     def test_youtube_flat_playlist_extraction(self):
         dl = FakeYDL()
@@ -52,7 +67,7 @@ class TestYoutubeLists(unittest.TestCase):
         entries = list(result['entries'])
         self.assertTrue(len(entries) == 1)
         video = entries[0]
-        self.assertEqual(video['_type'], 'url')
+        self.assertEqual(video['_type'], 'url_transparent')
         self.assertEqual(video['ie_key'], 'Youtube')
         self.assertEqual(video['id'], 'BaW_jenozKc')
         self.assertEqual(video['url'], 'BaW_jenozKc')
diff --git a/test/test_youtube_misc.py b/test/test_youtube_misc.py
deleted file mode 100644
index e18e71101..000000000
--- a/test/test_youtube_misc.py
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/usr/bin/env python
-from __future__ import unicode_literals
-
-# Allow direct execution
-import os
-import sys
-import unittest
-sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
-
-
-from youtube_dl.extractor import YoutubeIE
-
-
-class TestYoutubeMisc(unittest.TestCase):
-    def test_youtube_extract(self):
-        assertExtractId = lambda url, id: self.assertEqual(YoutubeIE.extract_id(url), id)
-        assertExtractId('http://www.youtube.com/watch?&v=BaW_jenozKc', 'BaW_jenozKc')
-        assertExtractId('https://www.youtube.com/watch?&v=BaW_jenozKc', 'BaW_jenozKc')
-        assertExtractId('https://www.youtube.com/watch?feature=player_embedded&v=BaW_jenozKc', 'BaW_jenozKc')
-        assertExtractId('https://www.youtube.com/watch_popup?v=BaW_jenozKc', 'BaW_jenozKc')
-        assertExtractId('http://www.youtube.com/watch?v=BaW_jenozKcsharePLED17F32AD9753930', 'BaW_jenozKc')
-        assertExtractId('BaW_jenozKc', 'BaW_jenozKc')
-
-
-if __name__ == '__main__':
-    unittest.main()
diff --git a/test/test_youtube_signature.py b/test/test_youtube_signature.py
index 98221b9c2..627d4cb92 100644
--- a/test/test_youtube_signature.py
+++ b/test/test_youtube_signature.py
@@ -1,5 +1,4 @@
 #!/usr/bin/env python
-# coding: utf-8
 
 from __future__ import unicode_literals
 
@@ -9,21 +8,15 @@ import sys
 import unittest
 sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
 
+import io
 import re
 import string
 
-from youtube_dl.compat import (
-    compat_contextlib_suppress,
-    compat_open as open,
-    compat_str,
-    compat_urlretrieve,
-)
-
 from test.helper import FakeYDL
 from youtube_dl.extractor import YoutubeIE
-from youtube_dl.jsinterp import JSInterpreter
+from youtube_dl.compat import compat_str, compat_urlretrieve
 
-_SIG_TESTS = [
+_TESTS = [
     (
         'https://s.ytimg.com/yts/jsbin/html5player-vflHOr_nV.js',
         86,
@@ -52,318 +45,34 @@ _SIG_TESTS = [
     (
         'https://s.ytimg.com/yts/jsbin/html5player-en_US-vflBb0OQx.js',
         84,
-        '123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQ0STUVWXYZ!"#$%&\'()*+,@./:;<=>',
+        '123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQ0STUVWXYZ!"#$%&\'()*+,@./:;<=>'
     ),
     (
         'https://s.ytimg.com/yts/jsbin/html5player-en_US-vfl9FYC6l.js',
         83,
-        '123456789abcdefghijklmnopqr0tuvwxyzABCDETGHIJKLMNOPQRS>UVWXYZ!"#$%&\'()*+,-./:;<=F',
+        '123456789abcdefghijklmnopqr0tuvwxyzABCDETGHIJKLMNOPQRS>UVWXYZ!"#$%&\'()*+,-./:;<=F'
     ),
     (
         'https://s.ytimg.com/yts/jsbin/html5player-en_US-vflCGk6yw/html5player.js',
         '4646B5181C6C3020DF1D9C7FCFEA.AD80ABF70C39BD369CCCAE780AFBB98FA6B6CB42766249D9488C288',
-        '82C8849D94266724DC6B6AF89BBFA087EACCD963.B93C07FBA084ACAEFCF7C9D1FD0203C6C1815B6B',
+        '82C8849D94266724DC6B6AF89BBFA087EACCD963.B93C07FBA084ACAEFCF7C9D1FD0203C6C1815B6B'
     ),
     (
         'https://s.ytimg.com/yts/jsbin/html5player-en_US-vflKjOTVq/html5player.js',
         '312AA52209E3623129A412D56A40F11CB0AF14AE.3EE09501CB14E3BCDC3B2AE808BF3F1D14E7FBF12',
         '112AA5220913623229A412D56A40F11CB0AF14AE.3EE0950FCB14EEBCDC3B2AE808BF331D14E7FBF3',
-    ),
-    (
-        'https://www.youtube.com/s/player/6ed0d907/player_ias.vflset/en_US/base.js',
-        '2aq0aqSyOoJXtK73m-uME_jv7-pT15gOFC02RFkGMqWpzEICs69VdbwQ0LDp1v7j8xx92efCJlYFYb1sUkkBSPOlPmXgIARw8JQ0qOAOAA',
-        'AOq0QJ8wRAIgXmPlOPSBkkUs1bYFYlJCfe29xx8j7v1pDL2QwbdV96sCIEzpWqMGkFR20CFOg51Tp-7vj_EMu-m37KtXJoOySqa0',
-    ),
-    (
-        'https://www.youtube.com/s/player/3bb1f723/player_ias.vflset/en_US/base.js',
-        '2aq0aqSyOoJXtK73m-uME_jv7-pT15gOFC02RFkGMqWpzEICs69VdbwQ0LDp1v7j8xx92efCJlYFYb1sUkkBSPOlPmXgIARw8JQ0qOAOAA',
-        'MyOSJXtKI3m-uME_jv7-pT12gOFC02RFkGoqWpzE0Cs69VdbwQ0LDp1v7j8xx92efCJlYFYb1sUkkBSPOlPmXgIARw8JQ0qOAOAA',
-    ),
-    (
-        'https://www.youtube.com/s/player/2f1832d2/player_ias.vflset/en_US/base.js',
-        '2aq0aqSyOoJXtK73m-uME_jv7-pT15gOFC02RFkGMqWpzEICs69VdbwQ0LDp1v7j8xx92efCJlYFYb1sUkkBSPOlPmXgIARw8JQ0qOAOAA',
-        '0QJ8wRAIgXmPlOPSBkkUs1bYFYlJCfe29xxAj7v1pDL0QwbdV96sCIEzpWqMGkFR20CFOg51Tp-7vj_EMu-m37KtXJ2OySqa0q',
-    ),
-    (
-        'https://www.youtube.com/s/player/643afba4/tv-player-ias.vflset/tv-player-ias.js',
-        '2aq0aqSyOoJXtK73m-uME_jv7-pT15gOFC02RFkGMqWpzEICs69VdbwQ0LDp1v7j8xx92efCJlYFYb1sUkkBSPOlPmXgIARw8JQ0qOAOAA',
-        'AAOAOq0QJ8wRAIgXmPlOPSBkkUs1bYFYlJCfe29xx8j7vgpDL0QwbdV06sCIEzpWqMGkFR20CFOS21Tp-7vj_EMu-m37KtXJoOy1',
-    ),
-    (
-        'https://www.youtube.com/s/player/363db69b/player_ias.vflset/en_US/base.js',
-        '2aq0aqSyOoJXtK73m-uME_jv7-pT15gOFC02RFkGMqWpzEICs69VdbwQ0LDp1v7j8xx92efCJlYFYb1sUkkBSPOlPmXgIARw8JQ0qOAOAA',
-        '0aqSyOoJXtK73m-uME_jv7-pT15gOFC02RFkGMqWpz2ICs6EVdbwQ0LDp1v7j8xx92efCJlYFYb1sUkkBSPOlPmXgIARw8JQ0qOAOAA',
-    ),
-    (
-        'https://www.youtube.com/s/player/363db69b/player_ias_tce.vflset/en_US/base.js',
-        '2aq0aqSyOoJXtK73m-uME_jv7-pT15gOFC02RFkGMqWpzEICs69VdbwQ0LDp1v7j8xx92efCJlYFYb1sUkkBSPOlPmXgIARw8JQ0qOAOAA',
-        '0aqSyOoJXtK73m-uME_jv7-pT15gOFC02RFkGMqWpz2ICs6EVdbwQ0LDp1v7j8xx92efCJlYFYb1sUkkBSPOlPmXgIARw8JQ0qOAOAA',
-    ),
-    (
-        'https://www.youtube.com/s/player/4fcd6e4a/player_ias.vflset/en_US/base.js',
-        '2aq0aqSyOoJXtK73m-uME_jv7-pT15gOFC02RFkGMqWpzEICs69VdbwQ0LDp1v7j8xx92efCJlYFYb1sUkkBSPOlPmXgIARw8JQ0qOAOAA',
-        'wAOAOq0QJ8ARAIgXmPlOPSBkkUs1bYFYlJCfe29xx8q7v1pDL0QwbdV96sCIEzpWqMGkFR20CFOg51Tp-7vj_EMu-m37KtXJoOySqa0',
-    ),
-    (
-        'https://www.youtube.com/s/player/4fcd6e4a/player_ias_tce.vflset/en_US/base.js',
-        '2aq0aqSyOoJXtK73m-uME_jv7-pT15gOFC02RFkGMqWpzEICs69VdbwQ0LDp1v7j8xx92efCJlYFYb1sUkkBSPOlPmXgIARw8JQ0qOAOAA',
-        'wAOAOq0QJ8ARAIgXmPlOPSBkkUs1bYFYlJCfe29xx8q7v1pDL0QwbdV96sCIEzpWqMGkFR20CFOg51Tp-7vj_EMu-m37KtXJoOySqa0',
-    ),
-    (
-        'https://www.youtube.com/s/player/20830619/player_ias.vflset/en_US/base.js',
-        '2aq0aqSyOoJXtK73m-uME_jv7-pT15gOFC02RFkGMqWpzEICs69VdbwQ0LDp1v7j8xx92efCJlYFYb1sUkkBSPOlPmXgIARw8JQ0qOAOAA',
-        '7AOq0QJ8wRAIgXmPlOPSBkkAs1bYFYlJCfe29xx8jOv1pDL0Q2bdV96sCIEzpWqMGkFR20CFOg51Tp-7vj_EMu-m37KtXJoOySqa0qaw',
-    ),
-    (
-        'https://www.youtube.com/s/player/20830619/player_ias_tce.vflset/en_US/base.js',
-        '2aq0aqSyOoJXtK73m-uME_jv7-pT15gOFC02RFkGMqWpzEICs69VdbwQ0LDp1v7j8xx92efCJlYFYb1sUkkBSPOlPmXgIARw8JQ0qOAOAA',
-        '7AOq0QJ8wRAIgXmPlOPSBkkAs1bYFYlJCfe29xx8jOv1pDL0Q2bdV96sCIEzpWqMGkFR20CFOg51Tp-7vj_EMu-m37KtXJoOySqa0qaw',
-    ),
-    (
-        'https://www.youtube.com/s/player/20830619/player-plasma-ias-phone-en_US.vflset/base.js',
-        '2aq0aqSyOoJXtK73m-uME_jv7-pT15gOFC02RFkGMqWpzEICs69VdbwQ0LDp1v7j8xx92efCJlYFYb1sUkkBSPOlPmXgIARw8JQ0qOAOAA',
-        '7AOq0QJ8wRAIgXmPlOPSBkkAs1bYFYlJCfe29xx8jOv1pDL0Q2bdV96sCIEzpWqMGkFR20CFOg51Tp-7vj_EMu-m37KtXJoOySqa0qaw',
-    ),
-    (
-        'https://www.youtube.com/s/player/20830619/player-plasma-ias-tablet-en_US.vflset/base.js',
-        '2aq0aqSyOoJXtK73m-uME_jv7-pT15gOFC02RFkGMqWpzEICs69VdbwQ0LDp1v7j8xx92efCJlYFYb1sUkkBSPOlPmXgIARw8JQ0qOAOAA',
-        '7AOq0QJ8wRAIgXmPlOPSBkkAs1bYFYlJCfe29xx8jOv1pDL0Q2bdV96sCIEzpWqMGkFR20CFOg51Tp-7vj_EMu-m37KtXJoOySqa0qaw',
-    ),
-    (
-        'https://www.youtube.com/s/player/8a8ac953/player_ias_tce.vflset/en_US/base.js',
-        '2aq0aqSyOoJXtK73m-uME_jv7-pT15gOFC02RFkGMqWpzEICs69VdbwQ0LDp1v7j8xx92efCJlYFYb1sUkkBSPOlPmXgIARw8JQ0qOAOAA',
-        'IAOAOq0QJ8wRAAgXmPlOPSBkkUs1bYFYlJCfe29xx8j7v1pDL0QwbdV96sCIEzpWqMGkFR20CFOg51Tp-7vj_E2u-m37KtXJoOySqa0',
-    ),
-    (
-        'https://www.youtube.com/s/player/8a8ac953/tv-player-es6.vflset/tv-player-es6.js',
-        '2aq0aqSyOoJXtK73m-uME_jv7-pT15gOFC02RFkGMqWpzEICs69VdbwQ0LDp1v7j8xx92efCJlYFYb1sUkkBSPOlPmXgIARw8JQ0qOAOAA',
-        'IAOAOq0QJ8wRAAgXmPlOPSBkkUs1bYFYlJCfe29xx8j7v1pDL0QwbdV96sCIEzpWqMGkFR20CFOg51Tp-7vj_E2u-m37KtXJoOySqa0',
-    ),
-]
-
-_NSIG_TESTS = [
-    (
-        'https://www.youtube.com/s/player/7862ca1f/player_ias.vflset/en_US/base.js',
-        'X_LCxVDjAavgE5t', 'yxJ1dM6iz5ogUg',
-    ),
-    (
-        'https://www.youtube.com/s/player/9216d1f7/player_ias.vflset/en_US/base.js',
-        'SLp9F5bwjAdhE9F-', 'gWnb9IK2DJ8Q1w',
-    ),
-    (
-        'https://www.youtube.com/s/player/f8cb7a3b/player_ias.vflset/en_US/base.js',
-        'oBo2h5euWy6osrUt', 'ivXHpm7qJjJN',
-    ),
-    (
-        'https://www.youtube.com/s/player/2dfe380c/player_ias.vflset/en_US/base.js',
-        'oBo2h5euWy6osrUt', '3DIBbn3qdQ',
-    ),
-    (
-        'https://www.youtube.com/s/player/f1ca6900/player_ias.vflset/en_US/base.js',
-        'cu3wyu6LQn2hse', 'jvxetvmlI9AN9Q',
-    ),
-    (
-        'https://www.youtube.com/s/player/8040e515/player_ias.vflset/en_US/base.js',
-        'wvOFaY-yjgDuIEg5', 'HkfBFDHmgw4rsw',
-    ),
-    (
-        'https://www.youtube.com/s/player/e06dea74/player_ias.vflset/en_US/base.js',
-        'AiuodmaDDYw8d3y4bf', 'ankd8eza2T6Qmw',
-    ),
-    (
-        'https://www.youtube.com/s/player/5dd88d1d/player-plasma-ias-phone-en_US.vflset/base.js',
-        'kSxKFLeqzv_ZyHSAt', 'n8gS8oRlHOxPFA',
-    ),
-    (
-        'https://www.youtube.com/s/player/324f67b9/player_ias.vflset/en_US/base.js',
-        'xdftNy7dh9QGnhW', '22qLGxrmX8F1rA',
-    ),
-    (
-        'https://www.youtube.com/s/player/4c3f79c5/player_ias.vflset/en_US/base.js',
-        'TDCstCG66tEAO5pR9o', 'dbxNtZ14c-yWyw',
-    ),
-    (
-        'https://www.youtube.com/s/player/c81bbb4a/player_ias.vflset/en_US/base.js',
-        'gre3EcLurNY2vqp94', 'Z9DfGxWP115WTg',
-    ),
-    (
-        'https://www.youtube.com/s/player/1f7d5369/player_ias.vflset/en_US/base.js',
-        'batNX7sYqIJdkJ', 'IhOkL_zxbkOZBw',
-    ),
-    (
-        'https://www.youtube.com/s/player/009f1d77/player_ias.vflset/en_US/base.js',
-        '5dwFHw8aFWQUQtffRq', 'audescmLUzI3jw',
-    ),
-    (
-        'https://www.youtube.com/s/player/dc0c6770/player_ias.vflset/en_US/base.js',
-        '5EHDMgYLV6HPGk_Mu-kk', 'n9lUJLHbxUI0GQ',
-    ),
-    (
-        'https://www.youtube.com/s/player/c2199353/player_ias.vflset/en_US/base.js',
-        '5EHDMgYLV6HPGk_Mu-kk', 'AD5rgS85EkrE7',
-    ),
-    (
-        'https://www.youtube.com/s/player/113ca41c/player_ias.vflset/en_US/base.js',
-        'cgYl-tlYkhjT7A', 'hI7BBr2zUgcmMg',
-    ),
-    (
-        'https://www.youtube.com/s/player/c57c113c/player_ias.vflset/en_US/base.js',
-        'M92UUMHa8PdvPd3wyM', '3hPqLJsiNZx7yA',
-    ),
-    (
-        'https://www.youtube.com/s/player/5a3b6271/player_ias.vflset/en_US/base.js',
-        'B2j7f_UPT4rfje85Lu_e', 'm5DmNymaGQ5RdQ',
-    ),
-    (
-        'https://www.youtube.com/s/player/7a062b77/player_ias.vflset/en_US/base.js',
-        'NRcE3y3mVtm_cV-W', 'VbsCYUATvqlt5w',
-    ),
-    (
-        'https://www.youtube.com/s/player/dac945fd/player_ias.vflset/en_US/base.js',
-        'o8BkRxXhuYsBCWi6RplPdP', '3Lx32v_hmzTm6A',
-    ),
-    (
-        'https://www.youtube.com/s/player/6f20102c/player_ias.vflset/en_US/base.js',
-        'lE8DhoDmKqnmJJ', 'pJTTX6XyJP2BYw',
-    ),
-    (
-        'https://www.youtube.com/s/player/cfa9e7cb/player_ias.vflset/en_US/base.js',
-        'aCi3iElgd2kq0bxVbQ', 'QX1y8jGb2IbZ0w',
-    ),
-    (
-        'https://www.youtube.com/s/player/8c7583ff/player_ias.vflset/en_US/base.js',
-        '1wWCVpRR96eAmMI87L', 'KSkWAVv1ZQxC3A',
-    ),
-    (
-        'https://www.youtube.com/s/player/b7910ca8/player_ias.vflset/en_US/base.js',
-        '_hXMCwMt9qE310D', 'LoZMgkkofRMCZQ',
-    ),
-    (
-        'https://www.youtube.com/s/player/590f65a6/player_ias.vflset/en_US/base.js',
-        '1tm7-g_A9zsI8_Lay_', 'xI4Vem4Put_rOg',
-    ),
-    (
-        'https://www.youtube.com/s/player/b22ef6e7/player_ias.vflset/en_US/base.js',
-        'b6HcntHGkvBLk_FRf', 'kNPW6A7FyP2l8A',
-    ),
-    (
-        'https://www.youtube.com/s/player/3400486c/player_ias.vflset/en_US/base.js',
-        'lL46g3XifCKUZn1Xfw', 'z767lhet6V2Skl',
-    ),
-    (
-        'https://www.youtube.com/s/player/5604538d/player_ias.vflset/en_US/base.js',
-        '7X-he4jjvMx7BCX', 'sViSydX8IHtdWA',
-    ),
-    (
-        'https://www.youtube.com/s/player/20dfca59/player_ias.vflset/en_US/base.js',
-        '-fLCxedkAk4LUTK2', 'O8kfRq1y1eyHGw',
-    ),
-    (
-        'https://www.youtube.com/s/player/b12cc44b/player_ias.vflset/en_US/base.js',
-        'keLa5R2U00sR9SQK', 'N1OGyujjEwMnLw',
-    ),
-    (
-        'https://www.youtube.com/s/player/3bb1f723/player_ias.vflset/en_US/base.js',
-        'gK15nzVyaXE9RsMP3z', 'ZFFWFLPWx9DEgQ',
-    ),
-    (
-        'https://www.youtube.com/s/player/f8f53e1a/player_ias.vflset/en_US/base.js',
-        'VTQOUOv0mCIeJ7i8kZB', 'kcfD8wy0sNLyNQ',
-    ),
-    (
-        'https://www.youtube.com/s/player/2f1832d2/player_ias.vflset/en_US/base.js',
-        'YWt1qdbe8SAfkoPHW5d', 'RrRjWQOJmBiP',
-    ),
-    (
-        'https://www.youtube.com/s/player/9c6dfc4a/player_ias.vflset/en_US/base.js',
-        'jbu7ylIosQHyJyJV', 'uwI0ESiynAmhNg',
-    ),
-    (
-        'https://www.youtube.com/s/player/f6e09c70/player_ias.vflset/en_US/base.js',
-        'W9HJZKktxuYoDTqW', 'jHbbkcaxm54',
-    ),
-    (
-        'https://www.youtube.com/s/player/f6e09c70/player_ias_tce.vflset/en_US/base.js',
-        'W9HJZKktxuYoDTqW', 'jHbbkcaxm54',
-    ),
-    (
-        'https://www.youtube.com/s/player/e7567ecf/player_ias_tce.vflset/en_US/base.js',
-        'Sy4aDGc0VpYRR9ew_', '5UPOT1VhoZxNLQ',
-    ),
-    (
-        'https://www.youtube.com/s/player/d50f54ef/player_ias_tce.vflset/en_US/base.js',
-        'Ha7507LzRmH3Utygtj', 'XFTb2HoeOE5MHg',
-    ),
-    (
-        'https://www.youtube.com/s/player/074a8365/player_ias_tce.vflset/en_US/base.js',
-        'Ha7507LzRmH3Utygtj', 'ufTsrE0IVYrkl8v',
-    ),
-    (
-        'https://www.youtube.com/s/player/643afba4/player_ias.vflset/en_US/base.js',
-        'N5uAlLqm0eg1GyHO', 'dCBQOejdq5s-ww',
-    ),
-    (
-        'https://www.youtube.com/s/player/69f581a5/tv-player-ias.vflset/tv-player-ias.js',
-        '-qIP447rVlTTwaZjY', 'KNcGOksBAvwqQg',
-    ),
-    (
-        'https://www.youtube.com/s/player/643afba4/tv-player-ias.vflset/tv-player-ias.js',
-        'ir9-V6cdbCiyKxhr', '2PL7ZDYAALMfmA',
-    ),
-    (
-        'https://www.youtube.com/s/player/643afba4/player_ias.vflset/en_US/base.js',
-        'ir9-V6cdbCiyKxhr', '2PL7ZDYAALMfmA',
-    ),
-    (
-        'https://www.youtube.com/s/player/363db69b/player_ias.vflset/en_US/base.js',
-        'eWYu5d5YeY_4LyEDc', 'XJQqf-N7Xra3gg',
-    ),
-    (
-        'https://www.youtube.com/s/player/4fcd6e4a/player_ias.vflset/en_US/base.js',
-        'o_L251jm8yhZkWtBW', 'lXoxI3XvToqn6A',
-    ),
-    (
-        'https://www.youtube.com/s/player/4fcd6e4a/tv-player-ias.vflset/tv-player-ias.js',
-        'o_L251jm8yhZkWtBW', 'lXoxI3XvToqn6A',
-    ),
-    (
-        'https://www.youtube.com/s/player/20830619/tv-player-ias.vflset/tv-player-ias.js',
-        'ir9-V6cdbCiyKxhr', '9YE85kNjZiS4',
-    ),
-    (
-        'https://www.youtube.com/s/player/20830619/player-plasma-ias-phone-en_US.vflset/base.js',
-        'ir9-V6cdbCiyKxhr', '9YE85kNjZiS4',
-    ),
-    (
-        'https://www.youtube.com/s/player/20830619/player-plasma-ias-tablet-en_US.vflset/base.js',
-        'ir9-V6cdbCiyKxhr', '9YE85kNjZiS4',
-    ),
-    (
-        'https://www.youtube.com/s/player/8a8ac953/player_ias_tce.vflset/en_US/base.js',
-        'MiBYeXx_vRREbiCCmh', 'RtZYMVvmkE0JE',
-    ),
-    (
-        'https://www.youtube.com/s/player/8a8ac953/tv-player-es6.vflset/tv-player-es6.js',
-        'MiBYeXx_vRREbiCCmh', 'RtZYMVvmkE0JE',
-    ),
-    (
-        'https://www.youtube.com/s/player/aa3fc80b/player_ias.vflset/en_US/base.js',
-        '0qY9dal2uzOnOGwa-48hha', 'VSh1KDfQMk-eag',
-    ),
+    )
 ]
 
 
 class TestPlayerInfo(unittest.TestCase):
     def test_youtube_extract_player_info(self):
         PLAYER_URLS = (
-            ('https://www.youtube.com/s/player/4c3f79c5/player_ias.vflset/en_US/base.js', '4c3f79c5'),
             ('https://www.youtube.com/s/player/64dddad9/player_ias.vflset/en_US/base.js', '64dddad9'),
             ('https://www.youtube.com/s/player/64dddad9/player_ias.vflset/fr_FR/base.js', '64dddad9'),
             ('https://www.youtube.com/s/player/64dddad9/player-plasma-ias-phone-en_US.vflset/base.js', '64dddad9'),
             ('https://www.youtube.com/s/player/64dddad9/player-plasma-ias-phone-de_DE.vflset/base.js', '64dddad9'),
             ('https://www.youtube.com/s/player/64dddad9/player-plasma-ias-tablet-en_US.vflset/base.js', '64dddad9'),
-            ('https://www.youtube.com/s/player/e7567ecf/player_ias_tce.vflset/en_US/base.js', 'e7567ecf'),
-            ('https://www.youtube.com/s/player/643afba4/tv-player-ias.vflset/tv-player-ias.js', '643afba4'),
             # obsolete
             ('https://www.youtube.com/yts/jsbin/player_ias-vfle4-e03/en_US/base.js', 'vfle4-e03'),
             ('https://www.youtube.com/yts/jsbin/player_ias-vfl49f_g4/en_US/base.js', 'vfl49f_g4'),
@@ -373,74 +82,48 @@ class TestPlayerInfo(unittest.TestCase):
             ('https://s.ytimg.com/yts/jsbin/html5player-en_US-vflXGBaUN.js', 'vflXGBaUN'),
             ('https://s.ytimg.com/yts/jsbin/html5player-en_US-vflKjOTVq/html5player.js', 'vflKjOTVq'),
         )
-        ie = YoutubeIE(FakeYDL({'cachedir': False}))
         for player_url, expected_player_id in PLAYER_URLS:
-            player_id = ie._extract_player_info(player_url)
+            player_id = YoutubeIE._extract_player_info(player_url)
             self.assertEqual(player_id, expected_player_id)
 
 
 class TestSignature(unittest.TestCase):
     def setUp(self):
         TEST_DIR = os.path.dirname(os.path.abspath(__file__))
-        self.TESTDATA_DIR = os.path.join(TEST_DIR, 'testdata/sigs')
+        self.TESTDATA_DIR = os.path.join(TEST_DIR, 'testdata')
         if not os.path.exists(self.TESTDATA_DIR):
             os.mkdir(self.TESTDATA_DIR)
 
-    def tearDown(self):
-        with compat_contextlib_suppress(OSError):
-            for f in os.listdir(self.TESTDATA_DIR):
-                os.remove(f)
+
+def make_tfunc(url, sig_input, expected_sig):
+    m = re.match(r'.*-([a-zA-Z0-9_-]+)(?:/watch_as3|/html5player)?\.[a-z]+$', url)
+    assert m, '%r should follow URL format' % url
+    test_id = m.group(1)
+
+    def test_func(self):
+        basename = 'player-%s.js' % test_id
+        fn = os.path.join(self.TESTDATA_DIR, basename)
+
+        if not os.path.exists(fn):
+            compat_urlretrieve(url, fn)
+
+        ydl = FakeYDL()
+        ie = YoutubeIE(ydl)
+        with io.open(fn, encoding='utf-8') as testf:
+            jscode = testf.read()
+        func = ie._parse_sig_js(jscode)
+        src_sig = (
+            compat_str(string.printable[:sig_input])
+            if isinstance(sig_input, int) else sig_input)
+        got_sig = func(src_sig)
+        self.assertEqual(got_sig, expected_sig)
+
+    test_func.__name__ = str('test_signature_js_' + test_id)
+    setattr(TestSignature, test_func.__name__, test_func)
 
 
-def t_factory(name, sig_func, url_pattern):
-    def make_tfunc(url, sig_input, expected_sig):
-        m = url_pattern.match(url)
-        assert m, '{0!r} should follow URL format'.format(url)
-        test_id = re.sub(r'[/.-]', '_', m.group('id') or m.group('compat_id'))
-
-        def test_func(self):
-            basename = 'player-{0}.js'.format(test_id)
-            fn = os.path.join(self.TESTDATA_DIR, basename)
-
-            if not os.path.exists(fn):
-                compat_urlretrieve(url, fn)
-            with open(fn, encoding='utf-8') as testf:
-                jscode = testf.read()
-            self.assertEqual(sig_func(jscode, sig_input), expected_sig)
-
-        test_func.__name__ = str('test_{0}_js_{1}'.format(name, test_id))
-        setattr(TestSignature, test_func.__name__, test_func)
-    return make_tfunc
-
-
-def signature(jscode, sig_input):
-    func = YoutubeIE(FakeYDL({'cachedir': False}))._parse_sig_js(jscode)
-    src_sig = (
-        compat_str(string.printable[:sig_input])
-        if isinstance(sig_input, int) else sig_input)
-    return func(src_sig)
-
-
-def n_sig(jscode, sig_input):
-    ie = YoutubeIE(FakeYDL({'cachedir': False}))
-    jsi = JSInterpreter(jscode)
-    jsi, _, func_code = ie._extract_n_function_code_jsi(sig_input, jsi)
-    return ie._extract_n_function_from_code(jsi, func_code)(sig_input)
-
-
-make_sig_test = t_factory(
-    'signature', signature,
-    re.compile(r'''(?x)
-        .+/(?P<h5>html5)?player(?(h5)(?:-en_US)?-|/)(?P<id>[a-zA-Z0-9/._-]+)
-        (?(h5)/(?:watch_as3|html5player))?\.js$
-    '''))
-for test_spec in _SIG_TESTS:
-    make_sig_test(*test_spec)
-
-make_nsig_test = t_factory(
-    'nsig', n_sig, re.compile(r'.+/player/(?P<id>[a-zA-Z0-9_/.-]+)\.js$'))
-for test_spec in _NSIG_TESTS:
-    make_nsig_test(*test_spec)
+for test_spec in _TESTS:
+    make_tfunc(*test_spec)
 
 
 if __name__ == '__main__':
diff --git a/test/testdata/mpd/range_only.mpd b/test/testdata/mpd/range_only.mpd
deleted file mode 100644
index e0c2152d1..000000000
--- a/test/testdata/mpd/range_only.mpd
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0"?>
-<!-- MPD file Generated with GPAC version 1.0.1-revrelease at 2021-11-27T20:53:11.690Z -->
-<MPD xmlns="urn:mpeg:dash:schema:mpd:2011" minBufferTime="PT1.500S" type="static" mediaPresentationDuration="PT0H0M30.196S" maxSegmentDuration="PT0H0M10.027S" profiles="urn:mpeg:dash:profile:full:2011">
- <ProgramInformation moreInformationURL="http://gpac.io">
-  <Title>manifest.mpd generated by GPAC</Title>
- </ProgramInformation>
-
- <Period duration="PT0H0M30.196S">
-  <AdaptationSet segmentAlignment="true" maxWidth="768" maxHeight="432" maxFrameRate="30000/1001" par="16:9" lang="und" startWithSAP="1">
-   <Representation id="1" mimeType="video/mp4" codecs="avc1.4D401E" width="768" height="432" frameRate="30000/1001" sar="1:1" bandwidth="526987">
-    <BaseURL>video_dashinit.mp4</BaseURL>
-    <SegmentList timescale="90000" duration="900000">
-     <Initialization range="0-881"/>
-     <SegmentURL mediaRange="882-876094" indexRange="882-925"/>
-     <SegmentURL mediaRange="876095-1466732" indexRange="876095-876138"/>
-     <SegmentURL mediaRange="1466733-1953615" indexRange="1466733-1466776"/>
-     <SegmentURL mediaRange="1953616-1994211" indexRange="1953616-1953659"/>
-    </SegmentList>
-   </Representation>
-  </AdaptationSet>
-  <AdaptationSet segmentAlignment="true" lang="und" startWithSAP="1">
-   <Representation id="2" mimeType="audio/mp4" codecs="mp4a.40.2" audioSamplingRate="48000" bandwidth="98096">
-    <AudioChannelConfiguration schemeIdUri="urn:mpeg:dash:23003:3:audio_channel_configuration:2011" value="2"/>
-    <BaseURL>audio_dashinit.mp4</BaseURL>
-    <SegmentList timescale="48000" duration="480000">
-     <Initialization range="0-752"/>
-     <SegmentURL mediaRange="753-124129" indexRange="753-796"/>
-     <SegmentURL mediaRange="124130-250544" indexRange="124130-124173"/>
-     <SegmentURL mediaRange="250545-374929" indexRange="250545-250588"/>
-    </SegmentList>
-   </Representation>
-  </AdaptationSet>
- </Period>
-</MPD>
-
diff --git a/test/testdata/mpd/subtitles.mpd b/test/testdata/mpd/subtitles.mpd
deleted file mode 100644
index 6f948adba..000000000
--- a/test/testdata/mpd/subtitles.mpd
+++ /dev/null
@@ -1,351 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Created with Unified Streaming Platform (version=1.10.18-20255) -->
-<MPD
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xmlns="urn:mpeg:dash:schema:mpd:2011"
-  xsi:schemaLocation="urn:mpeg:dash:schema:mpd:2011 http://standards.iso.org/ittf/PubliclyAvailableStandards/MPEG-DASH_schema_files/DASH-MPD.xsd"
-  type="static"
-  mediaPresentationDuration="PT14M48S"
-  maxSegmentDuration="PT1M"
-  minBufferTime="PT10S"
-  profiles="urn:mpeg:dash:profile:isoff-live:2011">
-  <Period
-    id="1"
-    duration="PT14M48S">
-    <BaseURL>dash/</BaseURL>
-    <AdaptationSet
-      id="1"
-      group="1"
-      contentType="audio"
-      segmentAlignment="true"
-      audioSamplingRate="48000"
-      mimeType="audio/mp4"
-      codecs="mp4a.40.2"
-      startWithSAP="1">
-      <AudioChannelConfiguration
-        schemeIdUri="urn:mpeg:dash:23003:3:audio_channel_configuration:2011"
-        value="2" />
-      <Role schemeIdUri="urn:mpeg:dash:role:2011" value="main" />
-      <SegmentTemplate
-        timescale="48000"
-        initialization="3144-kZT4LWMQw6Rh7Kpd-$RepresentationID$.dash"
-        media="3144-kZT4LWMQw6Rh7Kpd-$RepresentationID$-$Time$.dash">
-        <SegmentTimeline>
-          <S t="0" d="96256" r="2" />
-          <S d="95232" />
-          <S d="96256" r="2" />
-          <S d="95232" />
-          <S d="96256" r="2" />
-          <S d="95232" />
-          <S d="96256" r="2" />
-          <S d="95232" />
-          <S d="96256" r="2" />
-          <S d="95232" />
-          <S d="96256" r="2" />
-          <S d="95232" />
-          <S d="96256" r="2" />
-          <S d="95232" />
-          <S d="96256" r="2" />
-          <S d="95232" />
-          <S d="96256" r="2" />
-          <S d="95232" />
-          <S d="96256" r="2" />
-          <S d="95232" />
-          <S d="96256" r="2" />
-          <S d="95232" />
-          <S d="96256" r="2" />
-          <S d="95232" />
-          <S d="96256" r="2" />
-          <S d="95232" />
-          <S d="96256" r="2" />
-          <S d="95232" />
-          <S d="96256" r="2" />
-          <S d="95232" />
-          <S d="96256" r="2" />
-          <S d="95232" />
-          <S d="96256" r="2" />
-          <S d="95232" />
-          <S d="96256" r="2" />
-          <S d="95232" />
-          <S d="96256" r="2" />
-          <S d="95232" />
-          <S d="96256" r="2" />
-          <S d="95232" />
-          <S d="96256" r="2" />
-          <S d="95232" />
-          <S d="96256" r="2" />
-          <S d="95232" />
-          <S d="96256" r="2" />
-          <S d="95232" />
-          <S d="96256" r="2" />
-          <S d="95232" />
-          <S d="96256" r="2" />
-          <S d="95232" />
-          <S d="96256" r="2" />
-          <S d="95232" />
-          <S d="96256" r="2" />
-          <S d="95232" />
-          <S d="96256" r="2" />
-          <S d="95232" />
-          <S d="96256" r="2" />
-          <S d="95232" />
-          <S d="96256" r="2" />
-          <S d="95232" />
-          <S d="96256" r="2" />
-          <S d="95232" />
-          <S d="96256" r="2" />
-          <S d="95232" />
-          <S d="96256" r="2" />
-          <S d="95232" />
-          <S d="96256" r="2" />
-          <S d="95232" />
-          <S d="96256" r="2" />
-          <S d="95232" />
-          <S d="96256" r="2" />
-          <S d="95232" />
-          <S d="96256" r="2" />
-          <S d="95232" />
-          <S d="96256" r="2" />
-          <S d="95232" />
-          <S d="96256" r="2" />
-          <S d="95232" />
-          <S d="96256" r="2" />
-          <S d="95232" />
-          <S d="96256" r="2" />
-          <S d="95232" />
-          <S d="96256" r="2" />
-          <S d="95232" />
-          <S d="96256" r="2" />
-          <S d="95232" />
-          <S d="96256" r="2" />
-          <S d="95232" />
-          <S d="96256" r="2" />
-          <S d="95232" />
-          <S d="96256" r="2" />
-          <S d="95232" />
-          <S d="96256" r="2" />
-          <S d="95232" />
-          <S d="96256" r="2" />
-          <S d="95232" />
-          <S d="96256" r="2" />
-          <S d="95232" />
-          <S d="96256" r="2" />
-          <S d="95232" />
-          <S d="96256" r="2" />
-          <S d="95232" />
-          <S d="96256" r="2" />
-          <S d="95232" />
-          <S d="96256" r="2" />
-          <S d="95232" />
-          <S d="96256" r="2" />
-          <S d="95232" />
-          <S d="96256" r="2" />
-          <S d="95232" />
-          <S d="96256" r="2" />
-          <S d="95232" />
-          <S d="96256" r="2" />
-          <S d="95232" />
-          <S d="96256" r="2" />
-          <S d="95232" />
-          <S d="96256" r="2" />
-          <S d="95232" />
-          <S d="96256" r="2" />
-          <S d="95232" />
-          <S d="96256" r="2" />
-          <S d="95232" />
-          <S d="96256" r="2" />
-          <S d="95232" />
-          <S d="96256" r="2" />
-          <S d="95232" />
-          <S d="96256" r="2" />
-          <S d="95232" />
-          <S d="96256" r="2" />
-          <S d="95232" />
-          <S d="96256" r="2" />
-          <S d="95232" />
-          <S d="96256" r="2" />
-          <S d="95232" />
-          <S d="96256" r="2" />
-          <S d="95232" />
-          <S d="96256" r="2" />
-          <S d="95232" />
-          <S d="96256" r="2" />
-          <S d="95232" />
-          <S d="96256" r="2" />
-          <S d="95232" />
-          <S d="96256" r="2" />
-          <S d="95232" />
-          <S d="96256" r="2" />
-          <S d="95232" />
-          <S d="96256" r="2" />
-          <S d="95232" />
-          <S d="96256" r="2" />
-          <S d="95232" />
-          <S d="96256" r="2" />
-          <S d="95232" />
-          <S d="96256" r="2" />
-          <S d="95232" />
-          <S d="96256" r="2" />
-          <S d="95232" />
-          <S d="96256" r="2" />
-          <S d="95232" />
-          <S d="96256" r="2" />
-          <S d="95232" />
-          <S d="96256" r="2" />
-          <S d="95232" />
-          <S d="96256" r="2" />
-          <S d="95232" />
-          <S d="96256" r="2" />
-          <S d="95232" />
-          <S d="96256" r="2" />
-          <S d="95232" />
-          <S d="96256" r="2" />
-          <S d="95232" />
-          <S d="96256" r="2" />
-          <S d="95232" />
-          <S d="96256" r="2" />
-          <S d="95232" />
-          <S d="96256" r="2" />
-          <S d="95232" />
-          <S d="96256" r="2" />
-          <S d="95232" />
-          <S d="96256" r="2" />
-          <S d="95232" />
-          <S d="96256" r="2" />
-          <S d="95232" />
-          <S d="96256" r="2" />
-          <S d="95232" />
-          <S d="96256" r="2" />
-          <S d="95232" />
-          <S d="96256" r="2" />
-          <S d="95232" />
-          <S d="96256" r="2" />
-          <S d="95232" />
-          <S d="96256" r="2" />
-          <S d="95232" />
-          <S d="96256" r="2" />
-          <S d="95232" />
-          <S d="96256" r="2" />
-          <S d="95232" />
-          <S d="96256" r="2" />
-          <S d="95232" />
-          <S d="96256" r="2" />
-          <S d="95232" />
-          <S d="96256" r="2" />
-          <S d="95232" />
-          <S d="96256" r="2" />
-          <S d="95232" />
-          <S d="96256" r="2" />
-          <S d="95232" />
-          <S d="96256" r="2" />
-          <S d="95232" />
-          <S d="96256" r="2" />
-          <S d="95232" />
-          <S d="96256" r="2" />
-          <S d="95232" />
-          <S d="96256" r="2" />
-          <S d="95232" />
-          <S d="96256" r="2" />
-          <S d="95232" />
-          <S d="96256" r="2" />
-          <S d="95232" />
-          <S d="96256" r="2" />
-          <S d="95232" />
-          <S d="96256" r="2" />
-          <S d="95232" />
-          <S d="3584" />
-        </SegmentTimeline>
-      </SegmentTemplate>
-      <Representation
-        id="audio=128001"
-        bandwidth="128001">
-      </Representation>
-    </AdaptationSet>
-    <AdaptationSet
-      id="2"
-      group="3"
-      contentType="text"
-      lang="en"
-      mimeType="application/mp4"
-      codecs="stpp"
-      startWithSAP="1">
-      <Role schemeIdUri="urn:mpeg:dash:role:2011" value="subtitle" />
-      <SegmentTemplate
-        timescale="1000"
-        initialization="3144-kZT4LWMQw6Rh7Kpd-$RepresentationID$.dash"
-        media="3144-kZT4LWMQw6Rh7Kpd-$RepresentationID$-$Time$.dash">
-        <SegmentTimeline>
-          <S t="0" d="60000" r="9" />
-          <S d="24000" />
-        </SegmentTimeline>
-      </SegmentTemplate>
-      <Representation
-        id="textstream_eng=1000"
-        bandwidth="1000">
-      </Representation>
-    </AdaptationSet>
-    <AdaptationSet
-      id="3"
-      group="2"
-      contentType="video"
-      par="960:409"
-      minBandwidth="100000"
-      maxBandwidth="4482000"
-      maxWidth="1689"
-      maxHeight="720"
-      segmentAlignment="true"
-      mimeType="video/mp4"
-      codecs="avc1.4D401F"
-      startWithSAP="1">
-      <Role schemeIdUri="urn:mpeg:dash:role:2011" value="main" />
-      <SegmentTemplate
-        timescale="12288"
-        initialization="3144-kZT4LWMQw6Rh7Kpd-$RepresentationID$.dash"
-        media="3144-kZT4LWMQw6Rh7Kpd-$RepresentationID$-$Time$.dash">
-        <SegmentTimeline>
-          <S t="0" d="24576" r="443" />
-        </SegmentTimeline>
-      </SegmentTemplate>
-      <Representation
-        id="video=100000"
-        bandwidth="100000"
-        width="336"
-        height="144"
-        sar="2880:2863"
-        scanType="progressive">
-      </Representation>
-      <Representation
-        id="video=326000"
-        bandwidth="326000"
-        width="562"
-        height="240"
-        sar="115200:114929"
-        scanType="progressive">
-      </Representation>
-      <Representation
-        id="video=698000"
-        bandwidth="698000"
-        width="844"
-        height="360"
-        sar="86400:86299"
-        scanType="progressive">
-      </Representation>
-      <Representation
-        id="video=1493000"
-        bandwidth="1493000"
-        width="1126"
-        height="480"
-        sar="230400:230267"
-        scanType="progressive">
-      </Representation>
-      <Representation
-        id="video=4482000"
-        bandwidth="4482000"
-        width="1688"
-        height="720"
-        sar="86400:86299"
-        scanType="progressive">
-      </Representation>
-    </AdaptationSet>
-  </Period>
-</MPD>
diff --git a/test/testdata/mpd/url_and_range.mpd b/test/testdata/mpd/url_and_range.mpd
deleted file mode 100644
index b8c68aad2..000000000
--- a/test/testdata/mpd/url_and_range.mpd
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" ?>
-<MPD xmlns="urn:mpeg:dash:schema:mpd:2011" profiles="urn:mpeg:dash:profile:isoff-live:2011" minBufferTime="PT10.01S" mediaPresentationDuration="PT30.097S" type="static">
-  <!-- Created with Bento4 mp4-dash.py, VERSION=2.0.0-639 -->
-  <Period>
-    <!-- Video -->
-    <AdaptationSet mimeType="video/mp4" segmentAlignment="true" startWithSAP="1" maxWidth="768" maxHeight="432">
-      <Representation id="video-avc1" codecs="avc1.4D401E" width="768" height="432" scanType="progressive" frameRate="30000/1001" bandwidth="699597">
-        <SegmentList timescale="1000" duration="10010">
-          <Initialization sourceURL="video-frag.mp4" range="36-746"/>
-          <SegmentURL media="video-frag.mp4" mediaRange="747-876117"/>
-          <SegmentURL media="video-frag.mp4" mediaRange="876118-1466913"/>
-          <SegmentURL media="video-frag.mp4" mediaRange="1466914-1953954"/>
-          <SegmentURL media="video-frag.mp4" mediaRange="1953955-1994652"/>
-        </SegmentList>
-      </Representation>
-    </AdaptationSet>
-    <!-- Audio -->
-    <AdaptationSet mimeType="audio/mp4" startWithSAP="1" segmentAlignment="true">
-      <Representation id="audio-und-mp4a.40.2" codecs="mp4a.40.2" bandwidth="98808" audioSamplingRate="48000">
-        <AudioChannelConfiguration schemeIdUri="urn:mpeg:mpegB:cicp:ChannelConfiguration" value="2"/>
-        <SegmentList timescale="1000" duration="10010">
-          <Initialization sourceURL="audio-frag.mp4" range="32-623"/>
-          <SegmentURL media="audio-frag.mp4" mediaRange="624-124199"/>
-          <SegmentURL media="audio-frag.mp4" mediaRange="124200-250303"/>
-          <SegmentURL media="audio-frag.mp4" mediaRange="250304-374365"/>
-          <SegmentURL media="audio-frag.mp4" mediaRange="374366-374836"/>
-        </SegmentList>
-      </Representation>
-    </AdaptationSet>
-  </Period>
-</MPD>
-
diff --git a/youtube_dl/YoutubeDL.py b/youtube_dl/YoutubeDL.py
index 8367b6e53..8f65c6499 100755
--- a/youtube_dl/YoutubeDL.py
+++ b/youtube_dl/YoutubeDL.py
@@ -4,10 +4,11 @@
 from __future__ import absolute_import, unicode_literals
 
 import collections
+import contextlib
 import copy
 import datetime
 import errno
-import functools
+import fileinput
 import io
 import itertools
 import json
@@ -25,39 +26,25 @@ import tokenize
 import traceback
 import random
 
-try:
-    from ssl import OPENSSL_VERSION
-except ImportError:
-    # Must be Python 2.6, should be built against 1.0.2
-    OPENSSL_VERSION = 'OpenSSL 1.0.2(?)'
 from string import ascii_letters
 
 from .compat import (
     compat_basestring,
-    compat_collections_chain_map as ChainMap,
-    compat_filter as filter,
+    compat_cookiejar,
     compat_get_terminal_size,
     compat_http_client,
-    compat_http_cookiejar_Cookie,
-    compat_http_cookies_SimpleCookie,
-    compat_integer_types,
     compat_kwargs,
-    compat_map as map,
     compat_numeric_types,
-    compat_open as open,
     compat_os_name,
     compat_str,
     compat_tokenize_tokenize,
     compat_urllib_error,
-    compat_urllib_parse,
     compat_urllib_request,
     compat_urllib_request_DataHandler,
 )
 from .utils import (
-    _UnsafeExtensionError,
     age_restricted,
     args_to_str,
-    bug_reports_message,
     ContentTooShortError,
     date_from_str,
     DateRange,
@@ -75,9 +62,7 @@ from .utils import (
     GeoRestrictedError,
     int_or_none,
     ISO3166Utils,
-    join_nonempty,
     locked_file,
-    LazyList,
     make_HTTPS_handler,
     MaxDownloadsReached,
     orderedSet,
@@ -88,7 +73,6 @@ from .utils import (
     PostProcessingError,
     preferredencoding,
     prepend_extension,
-    process_communicate_or_kill,
     register_socks_protocols,
     render_table,
     replace_extension,
@@ -100,7 +84,6 @@ from .utils import (
     std_headers,
     str_or_none,
     subtitles_filename,
-    traverse_obj,
     UnavailableVideoError,
     url_basename,
     version_tuple,
@@ -110,7 +93,6 @@ from .utils import (
     YoutubeDLCookieProcessor,
     YoutubeDLHandler,
     YoutubeDLRedirectHandler,
-    ytdl_is_updateable,
 )
 from .cache import Cache
 from .extractor import get_info_extractor, gen_extractor_classes, _LAZY_LOADER
@@ -131,20 +113,6 @@ if compat_os_name == 'nt':
     import ctypes
 
 
-def _catch_unsafe_file_extension(func):
-    @functools.wraps(func)
-    def wrapper(self, *args, **kwargs):
-        try:
-            return func(self, *args, **kwargs)
-        except _UnsafeExtensionError as error:
-            self.report_error(
-                '{0} found; to avoid damaging your system, this value is disallowed.'
-                ' If you believe this is an error{1}'.format(
-                    error_to_compat_str(error), bug_reports_message(',')))
-
-    return wrapper
-
-
 class YoutubeDL(object):
     """YoutubeDL class.
 
@@ -394,9 +362,6 @@ class YoutubeDL(object):
         self.params.update(params)
         self.cache = Cache(self)
 
-        self._header_cookies = []
-        self._load_cookies_from_headers(self.params.get('http_headers'))
-
         def check_deprecated(param, option, suggestion):
             if self.params.get(param) is not None:
                 self.report_warning(
@@ -540,14 +505,10 @@ class YoutubeDL(object):
         """Print message to stdout if not in quiet mode."""
         return self.to_stdout(message, skip_eol, check_quiet=True)
 
-    def _write_string(self, s, out=None, only_once=False, _cache=set()):
-        if only_once and s in _cache:
-            return
+    def _write_string(self, s, out=None):
         write_string(s, out=out, encoding=self.params.get('encoding'))
-        if only_once:
-            _cache.add(s)
 
-    def to_stdout(self, message, skip_eol=False, check_quiet=False, only_once=False):
+    def to_stdout(self, message, skip_eol=False, check_quiet=False):
         """Print message to stdout if not in quiet mode."""
         if self.params.get('logger'):
             self.params['logger'].debug(message)
@@ -556,9 +517,9 @@ class YoutubeDL(object):
             terminator = ['\n', ''][skip_eol]
             output = message + terminator
 
-            self._write_string(output, self._screen_file, only_once=only_once)
+            self._write_string(output, self._screen_file)
 
-    def to_stderr(self, message, only_once=False):
+    def to_stderr(self, message):
         """Print message to stderr."""
         assert isinstance(message, compat_str)
         if self.params.get('logger'):
@@ -566,7 +527,7 @@ class YoutubeDL(object):
         else:
             message = self._bidi_workaround(message)
             output = message + '\n'
-            self._write_string(output, self._err_file, only_once=only_once)
+            self._write_string(output, self._err_file)
 
     def to_console_title(self, message):
         if not self.params.get('consoletitle', False):
@@ -607,7 +568,7 @@ class YoutubeDL(object):
         if self.params.get('cookiefile') is not None:
             self.cookiejar.save(ignore_discard=True, ignore_expires=True)
 
-    def trouble(self, *args, **kwargs):
+    def trouble(self, message=None, tb=None):
         """Determine action to take when a download problem appears.
 
         Depending on if the downloader has been configured to ignore
@@ -616,11 +577,6 @@ class YoutubeDL(object):
 
         tb, if given, is additional traceback information.
         """
-        # message=None, tb=None, is_error=True
-        message = args[0] if len(args) > 0 else kwargs.get('message', None)
-        tb = args[1] if len(args) > 1 else kwargs.get('tb', None)
-        is_error = args[2] if len(args) > 2 else kwargs.get('is_error', True)
-
         if message is not None:
             self.to_stderr(message)
         if self.params.get('verbose'):
@@ -633,10 +589,7 @@ class YoutubeDL(object):
                 else:
                     tb_data = traceback.format_list(traceback.extract_stack())
                     tb = ''.join(tb_data)
-            if tb:
-                self.to_stderr(tb)
-        if not is_error:
-            return
+            self.to_stderr(tb)
         if not self.params.get('ignoreerrors', False):
             if sys.exc_info()[0] and hasattr(sys.exc_info()[1], 'exc_info') and sys.exc_info()[1].exc_info[0]:
                 exc_info = sys.exc_info()[1].exc_info
@@ -645,7 +598,7 @@ class YoutubeDL(object):
             raise DownloadError(message, exc_info)
         self._download_retcode = 1
 
-    def report_warning(self, message, only_once=False):
+    def report_warning(self, message):
         '''
         Print the message to stderr, it will be prefixed with 'WARNING:'
         If stderr is a tty file the 'WARNING:' will be colored
@@ -660,9 +613,9 @@ class YoutubeDL(object):
             else:
                 _msg_header = 'WARNING:'
             warning_message = '%s %s' % (_msg_header, message)
-            self.to_stderr(warning_message, only_once=only_once)
+            self.to_stderr(warning_message)
 
-    def report_error(self, message, *args, **kwargs):
+    def report_error(self, message, tb=None):
         '''
         Do the same as trouble, but prefixes the message with 'ERROR:', colored
         in red if stderr is a tty file.
@@ -671,28 +624,8 @@ class YoutubeDL(object):
             _msg_header = '\033[0;31mERROR:\033[0m'
         else:
             _msg_header = 'ERROR:'
-        kwargs['message'] = '%s %s' % (_msg_header, message)
-        self.trouble(*args, **kwargs)
-
-    def write_debug(self, message, only_once=False):
-        '''Log debug message or Print message to stderr'''
-        if not self.params.get('verbose', False):
-            return
-        message = '[debug] {0}'.format(message)
-        if self.params.get('logger'):
-            self.params['logger'].debug(message)
-        else:
-            self.to_stderr(message, only_once)
-
-    def report_unscoped_cookies(self, *args, **kwargs):
-        # message=None, tb=False, is_error=False
-        if len(args) <= 2:
-            kwargs.setdefault('is_error', False)
-            if len(args) <= 0:
-                kwargs.setdefault(
-                    'message',
-                    'Unscoped cookies are not allowed: please specify some sort of scoping')
-        self.report_error(*args, **kwargs)
+        error_message = '%s %s' % (_msg_header, message)
+        self.trouble(error_message, tb)
 
     def report_file_already_downloaded(self, file_name):
         """Report file has already been fully downloaded."""
@@ -787,7 +720,7 @@ class YoutubeDL(object):
                 filename = encodeFilename(filename, True).decode(preferredencoding())
             return sanitize_path(filename)
         except ValueError as err:
-            self.report_error('Error in output template: ' + error_to_compat_str(err) + ' (encoding: ' + repr(preferredencoding()) + ')')
+            self.report_error('Error in output template: ' + str(err) + ' (encoding: ' + repr(preferredencoding()) + ')')
             return None
 
     def _match_entry(self, info_dict, incomplete):
@@ -840,20 +773,11 @@ class YoutubeDL(object):
 
     def extract_info(self, url, download=True, ie_key=None, extra_info={},
                      process=True, force_generic_extractor=False):
-        """
-        Return a list with a dictionary for each video extracted.
-
-        Arguments:
-        url -- URL to extract
-
-        Keyword arguments:
-        download -- whether to download videos during extraction
-        ie_key -- extractor key hint
-        extra_info -- dictionary containing the extra values to add to each result
-        process -- whether to resolve all unresolved references (URLs, playlist items),
-            must be True for download to work.
-        force_generic_extractor -- force using the generic extractor
-        """
+        '''
+        Returns a list with a dictionary for each video we find.
+        If 'download', also downloads the videos.
+        extra_info is a dict containing the extra values to add to each result
+        '''
 
         if not ie_key and force_generic_extractor:
             ie_key = 'Generic'
@@ -888,7 +812,7 @@ class YoutubeDL(object):
                 msg += '\nYou might want to use a VPN or a proxy server (with --proxy) to workaround.'
                 self.report_error(msg)
             except ExtractorError as e:  # An error we somewhat expected
-                self.report_error(compat_str(e), tb=e.format_traceback())
+                self.report_error(compat_str(e), e.format_traceback())
             except MaxDownloadsReached:
                 raise
             except Exception as e:
@@ -898,83 +822,8 @@ class YoutubeDL(object):
                     raise
         return wrapper
 
-    def _remove_cookie_header(self, http_headers):
-        """Filters out `Cookie` header from an `http_headers` dict
-        The `Cookie` header is removed to prevent leaks as a result of unscoped cookies.
-        See: https://github.com/yt-dlp/yt-dlp/security/advisories/GHSA-v8mc-9377-rwjj
-
-        @param http_headers     An `http_headers` dict from which any `Cookie` header
-                                should be removed, or None
-        """
-        return dict(filter(lambda pair: pair[0].lower() != 'cookie', (http_headers or {}).items()))
-
-    def _load_cookies(self, data, **kwargs):
-        """Loads cookies from a `Cookie` header
-
-        This tries to work around the security vulnerability of passing cookies to every domain.
-
-        @param data         The Cookie header as a string to load the cookies from
-        @param autoscope    If `False`, scope cookies using Set-Cookie syntax and error for cookie without domains
-                            If `True`, save cookies for later to be stored in the jar with a limited scope
-                            If a URL, save cookies in the jar with the domain of the URL
-        """
-        # autoscope=True (kw-only)
-        autoscope = kwargs.get('autoscope', True)
-
-        for cookie in compat_http_cookies_SimpleCookie(data).values() if data else []:
-            if autoscope and any(cookie.values()):
-                raise ValueError('Invalid syntax in Cookie Header')
-
-            domain = cookie.get('domain') or ''
-            expiry = cookie.get('expires')
-            if expiry == '':  # 0 is valid so we check for `''` explicitly
-                expiry = None
-            prepared_cookie = compat_http_cookiejar_Cookie(
-                cookie.get('version') or 0, cookie.key, cookie.value, None, False,
-                domain, True, True, cookie.get('path') or '', bool(cookie.get('path')),
-                bool(cookie.get('secure')), expiry, False, None, None, {})
-
-            if domain:
-                self.cookiejar.set_cookie(prepared_cookie)
-            elif autoscope is True:
-                self.report_warning(
-                    'Passing cookies as a header is a potential security risk; '
-                    'they will be scoped to the domain of the downloaded urls. '
-                    'Please consider loading cookies from a file or browser instead.',
-                    only_once=True)
-                self._header_cookies.append(prepared_cookie)
-            elif autoscope:
-                self.report_warning(
-                    'The extractor result contains an unscoped cookie as an HTTP header. '
-                    'If you are specifying an input URL, ' + bug_reports_message(),
-                    only_once=True)
-                self._apply_header_cookies(autoscope, [prepared_cookie])
-            else:
-                self.report_unscoped_cookies()
-
-    def _load_cookies_from_headers(self, headers):
-        self._load_cookies(traverse_obj(headers, 'cookie', casesense=False))
-
-    def _apply_header_cookies(self, url, cookies=None):
-        """This method applies stray header cookies to the provided url
-
-        This loads header cookies and scopes them to the domain provided in `url`.
-        While this is not ideal, it helps reduce the risk of them being sent to
-        an unintended destination.
-        """
-        parsed = compat_urllib_parse.urlparse(url)
-        if not parsed.hostname:
-            return
-
-        for cookie in map(copy.copy, cookies or self._header_cookies):
-            cookie.domain = '.' + parsed.hostname
-            self.cookiejar.set_cookie(cookie)
-
     @__handle_extraction_exceptions
     def __extract_info(self, url, ie, download, extra_info, process):
-        # Compat with passing cookies in http headers
-        self._apply_header_cookies(url)
-
         ie_result = ie.extract(url)
         if ie_result is None:  # Finished already (backwards compatibility; listformats and friends should be moved here)
             return
@@ -1000,7 +849,7 @@ class YoutubeDL(object):
 
     def process_ie_result(self, ie_result, download=True, extra_info={}):
         """
-        Take the result of the ie (may be modified) and resolve all unresolved
+        Take the result of the ie(may be modified) and resolve all unresolved
         references (URLs, playlist items).
 
         It will also download the videos if 'download'.
@@ -1062,8 +911,8 @@ class YoutubeDL(object):
         elif result_type in ('playlist', 'multi_video'):
             # Protect from infinite recursion due to recursively nested playlists
             # (see https://github.com/ytdl-org/youtube-dl/issues/27833)
-            webpage_url = ie_result.get('webpage_url')  # not all pl/mv have this
-            if webpage_url and webpage_url in self._playlist_urls:
+            webpage_url = ie_result['webpage_url']
+            if webpage_url in self._playlist_urls:
                 self.to_screen(
                     '[download] Skipping already downloaded playlist: %s'
                     % ie_result.get('title') or ie_result.get('id'))
@@ -1071,10 +920,6 @@ class YoutubeDL(object):
 
             self._playlist_level += 1
             self._playlist_urls.add(webpage_url)
-            new_result = dict((k, v) for k, v in extra_info.items() if k not in ie_result)
-            if new_result:
-                new_result.update(ie_result)
-                ie_result = new_result
             try:
                 return self.__process_playlist(ie_result, download)
             finally:
@@ -1531,16 +1376,17 @@ class YoutubeDL(object):
                         'abr': formats_info[1].get('abr'),
                         'ext': output_ext,
                     }
+                video_selector, audio_selector = map(_build_selector_function, selector.selector)
 
                 def selector_function(ctx):
-                    selector_fn = lambda x: _build_selector_function(x)(ctx)
-                    for pair in itertools.product(*map(selector_fn, selector.selector)):
+                    for pair in itertools.product(
+                            video_selector(copy.deepcopy(ctx)), audio_selector(copy.deepcopy(ctx))):
                         yield _merge(pair)
 
             filters = [self._build_format_filter(f) for f in selector.filters]
 
             def final_selector(ctx):
-                ctx_copy = dict(ctx)
+                ctx_copy = copy.deepcopy(ctx)
                 for _filter in filters:
                     ctx_copy['formats'] = list(filter(_filter, ctx_copy['formats']))
                 return selector_function(ctx_copy)
@@ -1575,73 +1421,29 @@ class YoutubeDL(object):
         parsed_selector = _parse_format_selection(iter(TokenIterator(tokens)))
         return _build_selector_function(parsed_selector)
 
-    def _calc_headers(self, info_dict, load_cookies=False):
-        if load_cookies:  # For --load-info-json
-            # load cookies from http_headers in legacy info.json
-            self._load_cookies(traverse_obj(info_dict, ('http_headers', 'Cookie'), casesense=False),
-                               autoscope=info_dict['url'])
-            # load scoped cookies from info.json
-            self._load_cookies(info_dict.get('cookies'), autoscope=False)
-
-        cookies = self.cookiejar.get_cookies_for_url(info_dict['url'])
-        if cookies:
-            # Make a string like name1=val1; attr1=a_val1; ...name2=val2; ...
-            # By convention a cookie name can't be a well-known attribute name
-            # so this syntax is unambiguous and can be parsed by (eg) SimpleCookie
-            encoder = compat_http_cookies_SimpleCookie()
-            values = []
-            attributes = (('Domain', '='), ('Path', '='), ('Secure',), ('Expires', '='), ('Version', '='))
-            attributes = tuple([x[0].lower()] + list(x) for x in attributes)
-            for cookie in cookies:
-                _, value = encoder.value_encode(cookie.value)
-                # Py 2 '' --> '', Py 3 '' --> '""'
-                if value == '':
-                    value = '""'
-                values.append('='.join((cookie.name, value)))
-                for attr in attributes:
-                    value = getattr(cookie, attr[0], None)
-                    if value:
-                        values.append('%s%s' % (''.join(attr[1:]), value if len(attr) == 3 else ''))
-            info_dict['cookies'] = '; '.join(values)
-
+    def _calc_headers(self, info_dict):
         res = std_headers.copy()
-        res.update(info_dict.get('http_headers') or {})
-        res = self._remove_cookie_header(res)
+
+        add_headers = info_dict.get('http_headers')
+        if add_headers:
+            res.update(add_headers)
+
+        cookies = self._calc_cookies(info_dict)
+        if cookies:
+            res['Cookie'] = cookies
 
         if 'X-Forwarded-For' not in res:
             x_forwarded_for_ip = info_dict.get('__x_forwarded_for_ip')
             if x_forwarded_for_ip:
                 res['X-Forwarded-For'] = x_forwarded_for_ip
 
-        return res or None
+        return res
 
     def _calc_cookies(self, info_dict):
         pr = sanitized_Request(info_dict['url'])
         self.cookiejar.add_cookie_header(pr)
         return pr.get_header('Cookie')
 
-    def _fill_common_fields(self, info_dict, final=True):
-
-        for ts_key, date_key in (
-                ('timestamp', 'upload_date'),
-                ('release_timestamp', 'release_date'),
-        ):
-            if info_dict.get(date_key) is None and info_dict.get(ts_key) is not None:
-                # Working around out-of-range timestamp values (e.g. negative ones on Windows,
-                # see http://bugs.python.org/issue1646728)
-                try:
-                    upload_date = datetime.datetime.utcfromtimestamp(info_dict[ts_key])
-                    info_dict[date_key] = compat_str(upload_date.strftime('%Y%m%d'))
-                except (ValueError, OverflowError, OSError):
-                    pass
-
-        # Auto generate title fields corresponding to the *_number fields when missing
-        # in order to always have clean titles. This is very common for TV series.
-        if final:
-            for field in ('chapter', 'season', 'episode'):
-                if info_dict.get('%s_number' % field) is not None and not info_dict.get(field):
-                    info_dict[field] = '%s %d' % (field.capitalize(), info_dict['%s_number' % field])
-
     def process_video_result(self, info_dict, download=True):
         assert info_dict.get('_type', 'video') == 'video'
 
@@ -1709,7 +1511,24 @@ class YoutubeDL(object):
         if 'display_id' not in info_dict and 'id' in info_dict:
             info_dict['display_id'] = info_dict['id']
 
-        self._fill_common_fields(info_dict)
+        for ts_key, date_key in (
+                ('timestamp', 'upload_date'),
+                ('release_timestamp', 'release_date'),
+        ):
+            if info_dict.get(date_key) is None and info_dict.get(ts_key) is not None:
+                # Working around out-of-range timestamp values (e.g. negative ones on Windows,
+                # see http://bugs.python.org/issue1646728)
+                try:
+                    upload_date = datetime.datetime.utcfromtimestamp(info_dict[ts_key])
+                    info_dict[date_key] = upload_date.strftime('%Y%m%d')
+                except (ValueError, OverflowError, OSError):
+                    pass
+
+        # Auto generate title fields corresponding to the *_number fields when missing
+        # in order to always have clean titles. This is very common for TV series.
+        for field in ('chapter', 'season', 'episode'):
+            if info_dict.get('%s_number' % field) is not None and not info_dict.get(field):
+                info_dict[field] = '%s %d' % (field.capitalize(), info_dict['%s_number' % field])
 
         for cc_kind in ('subtitles', 'automatic_captions'):
             cc = info_dict.get(cc_kind)
@@ -1741,6 +1560,9 @@ class YoutubeDL(object):
         else:
             formats = info_dict['formats']
 
+        if not formats:
+            raise ExtractorError('No video formats found!')
+
         def is_wellformed(f):
             url = f.get('url')
             if not url:
@@ -1753,10 +1575,7 @@ class YoutubeDL(object):
             return True
 
         # Filter out malformed formats for better extraction robustness
-        formats = list(filter(is_wellformed, formats or []))
-
-        if not formats:
-            raise ExtractorError('No video formats found!')
+        formats = list(filter(is_wellformed, formats))
 
         formats_dict = {}
 
@@ -1797,13 +1616,10 @@ class YoutubeDL(object):
                 format['protocol'] = determine_protocol(format)
             # Add HTTP headers, so that external programs can use them from the
             # json output
-            format['http_headers'] = self._calc_headers(ChainMap(format, info_dict), load_cookies=True)
-
-        # Safeguard against old/insecure infojson when using --load-info-json
-        info_dict['http_headers'] = self._remove_cookie_header(
-            info_dict.get('http_headers') or {}) or None
-
-        # Remove private housekeeping stuff (copied to http_headers in _calc_headers())
+            full_format_info = info_dict.copy()
+            full_format_info.update(format)
+            format['http_headers'] = self._calc_headers(full_format_info)
+        # Remove private housekeeping stuff
         if '__x_forwarded_for_ip' in info_dict:
             del info_dict['__x_forwarded_for_ip']
 
@@ -1946,17 +1762,17 @@ class YoutubeDL(object):
             self.to_stdout(formatSeconds(info_dict['duration']))
         print_mandatory('format')
         if self.params.get('forcejson', False):
-            self.to_stdout(json.dumps(self.sanitize_info(info_dict)))
+            self.to_stdout(json.dumps(info_dict))
 
-    @_catch_unsafe_file_extension
     def process_info(self, info_dict):
         """Process a single resolved IE result."""
 
         assert info_dict.get('_type', 'video') == 'video'
 
-        max_downloads = int_or_none(self.params.get('max_downloads')) or float('inf')
-        if self._num_downloads >= max_downloads:
-            raise MaxDownloadsReached()
+        max_downloads = self.params.get('max_downloads')
+        if max_downloads is not None:
+            if self._num_downloads >= int(max_downloads):
+                raise MaxDownloadsReached()
 
         # TODO: backward compatibility, to be removed
         info_dict['fulltitle'] = info_dict['title']
@@ -2007,7 +1823,7 @@ class YoutubeDL(object):
             else:
                 try:
                     self.to_screen('[info] Writing video description to: ' + descfn)
-                    with open(encodeFilename(descfn), 'w', encoding='utf-8') as descfile:
+                    with io.open(encodeFilename(descfn), 'w', encoding='utf-8') as descfile:
                         descfile.write(info_dict['description'])
                 except (OSError, IOError):
                     self.report_error('Cannot write description file ' + descfn)
@@ -2022,7 +1838,7 @@ class YoutubeDL(object):
             else:
                 try:
                     self.to_screen('[info] Writing video annotations to: ' + annofn)
-                    with open(encodeFilename(annofn), 'w', encoding='utf-8') as annofile:
+                    with io.open(encodeFilename(annofn), 'w', encoding='utf-8') as annofile:
                         annofile.write(info_dict['annotations'])
                 except (KeyError, TypeError):
                     self.report_warning('There are no annotations to write.')
@@ -2049,7 +1865,7 @@ class YoutubeDL(object):
                         try:
                             # Use newline='' to prevent conversion of newline characters
                             # See https://github.com/ytdl-org/youtube-dl/issues/10268
-                            with open(encodeFilename(sub_filename), 'w', encoding='utf-8', newline='') as subfile:
+                            with io.open(encodeFilename(sub_filename), 'w', encoding='utf-8', newline='') as subfile:
                                 subfile.write(sub_info['data'])
                         except (OSError, IOError):
                             self.report_error('Cannot write subtitles file ' + sub_filename)
@@ -2058,41 +1874,36 @@ class YoutubeDL(object):
                         try:
                             sub_data = ie._request_webpage(
                                 sub_info['url'], info_dict['id'], note=False).read()
-                            with open(encodeFilename(sub_filename), 'wb') as subfile:
+                            with io.open(encodeFilename(sub_filename), 'wb') as subfile:
                                 subfile.write(sub_data)
                         except (ExtractorError, IOError, OSError, ValueError) as err:
                             self.report_warning('Unable to download subtitle for "%s": %s' %
                                                 (sub_lang, error_to_compat_str(err)))
                             continue
 
-        self._write_info_json(
-            'video description', info_dict,
-            replace_extension(filename, 'info.json', info_dict.get('ext')))
+        if self.params.get('writeinfojson', False):
+            infofn = replace_extension(filename, 'info.json', info_dict.get('ext'))
+            if self.params.get('nooverwrites', False) and os.path.exists(encodeFilename(infofn)):
+                self.to_screen('[info] Video description metadata is already present')
+            else:
+                self.to_screen('[info] Writing video description metadata as JSON to: ' + infofn)
+                try:
+                    write_json_file(self.filter_requested_info(info_dict), infofn)
+                except (OSError, IOError):
+                    self.report_error('Cannot write metadata to JSON file ' + infofn)
+                    return
 
         self._write_thumbnails(info_dict, filename)
 
         if not self.params.get('skip_download', False):
             try:
-                def checked_get_suitable_downloader(info_dict, params):
-                    ed_args = params.get('external_downloader_args')
-                    dler = get_suitable_downloader(info_dict, params)
-                    if ed_args and not params.get('external_downloader_args'):
-                        # external_downloader_args was cleared because external_downloader was rejected
-                        self.report_warning('Requested external downloader cannot be used: '
-                                            'ignoring --external-downloader-args.')
-                    return dler
-
                 def dl(name, info):
-                    fd = checked_get_suitable_downloader(info, self.params)(self, self.params)
+                    fd = get_suitable_downloader(info, self.params)(self, self.params)
                     for ph in self._progress_hooks:
                         fd.add_progress_hook(ph)
                     if self.params.get('verbose'):
                         self.to_screen('[debug] Invoking downloader on %r' % info.get('url'))
-
-                    new_info = dict((k, v) for k, v in info.items() if not k.startswith('__p'))
-                    new_info['http_headers'] = self._calc_headers(new_info)
-
-                    return fd.download(name, new_info)
+                    return fd.download(name, info)
 
                 if info_dict.get('requested_formats') is not None:
                     downloaded = []
@@ -2121,26 +1932,18 @@ class YoutubeDL(object):
                         # TODO: Check acodec/vcodec
                         return False
 
-                    exts = [info_dict['ext']]
+                    filename_real_ext = os.path.splitext(filename)[1][1:]
+                    filename_wo_ext = (
+                        os.path.splitext(filename)[0]
+                        if filename_real_ext == info_dict['ext']
+                        else filename)
                     requested_formats = info_dict['requested_formats']
                     if self.params.get('merge_output_format') is None and not compatible_formats(requested_formats):
                         info_dict['ext'] = 'mkv'
                         self.report_warning(
                             'Requested formats are incompatible for merge and will be merged into mkv.')
-                    exts.append(info_dict['ext'])
-
                     # Ensure filename always has a correct extension for successful merge
-                    def correct_ext(filename, ext=exts[1]):
-                        if filename == '-':
-                            return filename
-                        f_name, f_real_ext = os.path.splitext(filename)
-                        f_real_ext = f_real_ext[1:]
-                        filename_wo_ext = f_name if f_real_ext in exts else filename
-                        if ext is None:
-                            ext = f_real_ext or None
-                        return join_nonempty(filename_wo_ext, ext, delim='.')
-
-                    filename = correct_ext(filename)
+                    filename = '%s.%s' % (filename_wo_ext, info_dict['ext'])
                     if os.path.exists(encodeFilename(filename)):
                         self.to_screen(
                             '[download] %s has already been downloaded and '
@@ -2150,9 +1953,8 @@ class YoutubeDL(object):
                             new_info = dict(info_dict)
                             new_info.update(f)
                             fname = prepend_extension(
-                                correct_ext(
-                                    self.prepare_filename(new_info), new_info['ext']),
-                                'f%s' % (f['format_id'],), new_info['ext'])
+                                self.prepare_filename(new_info),
+                                'f%s' % f['format_id'], new_info['ext'])
                             if not ensure_dir_exists(fname):
                                 return
                             downloaded.append(fname)
@@ -2238,12 +2040,9 @@ class YoutubeDL(object):
                 try:
                     self.post_process(filename, info_dict)
                 except (PostProcessingError) as err:
-                    self.report_error('postprocessing: %s' % error_to_compat_str(err))
+                    self.report_error('postprocessing: %s' % str(err))
                     return
                 self.record_download_archive(info_dict)
-                # avoid possible nugatory search for further items (PR #26638)
-                if self._num_downloads >= max_downloads:
-                    raise MaxDownloadsReached()
 
     def download(self, url_list):
         """Download a given list of URLs."""
@@ -2266,13 +2065,16 @@ class YoutubeDL(object):
                 raise
             else:
                 if self.params.get('dump_single_json', False):
-                    self.to_stdout(json.dumps(self.sanitize_info(res)))
+                    self.to_stdout(json.dumps(res))
 
         return self._download_retcode
 
     def download_with_info_file(self, info_filename):
-        with open(info_filename, encoding='utf-8') as f:
-            info = self.filter_requested_info(json.load(f))
+        with contextlib.closing(fileinput.FileInput(
+                [info_filename], mode='r',
+                openhook=fileinput.hook_encoded('utf-8'))) as f:
+            # FileInput doesn't have a read method, we can't call json.load
+            info = self.filter_requested_info(json.loads('\n'.join(f)))
         try:
             self.process_ie_result(info, download=True)
         except DownloadError:
@@ -2285,36 +2087,10 @@ class YoutubeDL(object):
         return self._download_retcode
 
     @staticmethod
-    def sanitize_info(info_dict, remove_private_keys=False):
-        ''' Sanitize the infodict for converting to json '''
-        if info_dict is None:
-            return info_dict
-
-        if remove_private_keys:
-            reject = lambda k, v: (v is None
-                                   or k.startswith('__')
-                                   or k in ('requested_formats',
-                                            'requested_subtitles'))
-        else:
-            reject = lambda k, v: False
-
-        def filter_fn(obj):
-            if isinstance(obj, dict):
-                return dict((k, filter_fn(v)) for k, v in obj.items() if not reject(k, v))
-            elif isinstance(obj, (list, tuple, set, LazyList)):
-                return list(map(filter_fn, obj))
-            elif obj is None or any(isinstance(obj, c)
-                                    for c in (compat_integer_types,
-                                              (compat_str, float, bool))):
-                return obj
-            else:
-                return repr(obj)
-
-        return filter_fn(info_dict)
-
-    @classmethod
-    def filter_requested_info(cls, info_dict):
-        return cls.sanitize_info(info_dict, True)
+    def filter_requested_info(info_dict):
+        return dict(
+            (k, v) for k, v in info_dict.items()
+            if k not in ['requested_formats', 'requested_subtitles'])
 
     def post_process(self, filename, ie_info):
         """Run all the postprocessors on the given file."""
@@ -2521,21 +2297,18 @@ class YoutubeDL(object):
                 self.get_encoding()))
         write_string(encoding_str, encoding=None)
 
-        writeln_debug = lambda *s: self.write_debug(''.join(s))
-        writeln_debug('youtube-dl version ', __version__)
+        self._write_string('[debug] youtube-dl version ' + __version__ + '\n')
         if _LAZY_LOADER:
-            writeln_debug('Lazy loading extractors enabled')
-        if ytdl_is_updateable():
-            writeln_debug('Single file build')
+            self._write_string('[debug] Lazy loading extractors enabled' + '\n')
         try:
             sp = subprocess.Popen(
                 ['git', 'rev-parse', '--short', 'HEAD'],
                 stdout=subprocess.PIPE, stderr=subprocess.PIPE,
                 cwd=os.path.dirname(os.path.abspath(__file__)))
-            out, err = process_communicate_or_kill(sp)
+            out, err = sp.communicate()
             out = out.decode().strip()
             if re.match('[0-9a-f]+', out):
-                writeln_debug('Git HEAD: ', out)
+                self._write_string('[debug] Git HEAD: ' + out + '\n')
         except Exception:
             try:
                 sys.exc_clear()
@@ -2548,22 +2321,9 @@ class YoutubeDL(object):
                 return impl_name + ' version %d.%d.%d' % sys.pypy_version_info[:3]
             return impl_name
 
-        def libc_ver():
-            try:
-                return platform.libc_ver()
-            except OSError:  # We may not have access to the executable
-                return []
-
-        libc = join_nonempty(*libc_ver(), delim=' ')
-        writeln_debug('Python %s (%s %s %s) - %s - %s%s' % (
-            platform.python_version(),
-            python_implementation(),
-            platform.machine(),
-            platform.architecture()[0],
-            platform_name(),
-            OPENSSL_VERSION,
-            (' - %s' % (libc, )) if libc else ''
-        ))
+        self._write_string('[debug] Python version %s (%s) - %s\n' % (
+            platform.python_version(), python_implementation(),
+            platform_name()))
 
         exe_versions = FFmpegPostProcessor.get_versions(self)
         exe_versions['rtmpdump'] = rtmpdump_version()
@@ -2575,17 +2335,17 @@ class YoutubeDL(object):
         )
         if not exe_str:
             exe_str = 'none'
-        writeln_debug('exe versions: %s' % (exe_str, ))
+        self._write_string('[debug] exe versions: %s\n' % exe_str)
 
         proxy_map = {}
         for handler in self._opener.handlers:
             if hasattr(handler, 'proxies'):
                 proxy_map.update(handler.proxies)
-        writeln_debug('Proxy map: ', compat_str(proxy_map))
+        self._write_string('[debug] Proxy map: ' + compat_str(proxy_map) + '\n')
 
         if self.params.get('call_home', False):
             ipaddr = self.urlopen('https://yt-dl.org/ip').read().decode('utf-8')
-            writeln_debug('Public IP address: %s' % (ipaddr, ))
+            self._write_string('[debug] Public IP address: %s\n' % ipaddr)
             latest_version = self.urlopen(
                 'https://yt-dl.org/latest/version').read().decode('utf-8')
             if version_tuple(latest_version) > version_tuple(__version__):
@@ -2602,7 +2362,7 @@ class YoutubeDL(object):
         opts_proxy = self.params.get('proxy')
 
         if opts_cookiefile is None:
-            self.cookiejar = YoutubeDLCookieJar()
+            self.cookiejar = compat_cookiejar.CookieJar()
         else:
             opts_cookiefile = expand_path(opts_cookiefile)
             self.cookiejar = YoutubeDLCookieJar(opts_cookiefile)
@@ -2663,28 +2423,6 @@ class YoutubeDL(object):
             encoding = preferredencoding()
         return encoding
 
-    def _write_info_json(self, label, info_dict, infofn, overwrite=None):
-        if not self.params.get('writeinfojson', False):
-            return False
-
-        def msg(fmt, lbl):
-            return fmt % (lbl + ' metadata',)
-
-        if overwrite is None:
-            overwrite = not self.params.get('nooverwrites', False)
-
-        if not overwrite and os.path.exists(encodeFilename(infofn)):
-            self.to_screen(msg('[info] %s is already present', label.title()))
-            return 'exists'
-        else:
-            self.to_screen(msg('[info] Writing %s as JSON to: ', label) + infofn)
-            try:
-                write_json_file(self.filter_requested_info(info_dict), infofn)
-                return True
-            except (OSError, IOError):
-                self.report_error(msg('Cannot write %s to JSON file ', label) + infofn)
-                return
-
     def _write_thumbnails(self, info_dict, filename):
         if self.params.get('writethumbnail', False):
             thumbnails = info_dict.get('thumbnails')
diff --git a/youtube_dl/__init__.py b/youtube_dl/__init__.py
index 3c1272e7b..e1bd67919 100644
--- a/youtube_dl/__init__.py
+++ b/youtube_dl/__init__.py
@@ -5,6 +5,7 @@ from __future__ import unicode_literals
 
 __license__ = 'Public Domain'
 
+import codecs
 import io
 import os
 import random
@@ -16,12 +17,10 @@ from .options import (
 )
 from .compat import (
     compat_getpass,
-    compat_register_utf8,
     compat_shlex_split,
-    _workaround_optparse_bug9161,
+    workaround_optparse_bug9161,
 )
 from .utils import (
-    _UnsafeExtensionError,
     DateRange,
     decodeOption,
     DEFAULT_OUTTMPL,
@@ -47,10 +46,12 @@ from .YoutubeDL import YoutubeDL
 
 
 def _real_main(argv=None):
-    # Compatibility fix for Windows
-    compat_register_utf8()
+    # Compatibility fixes for Windows
+    if sys.platform == 'win32':
+        # https://github.com/ytdl-org/youtube-dl/issues/820
+        codecs.register(lambda name: codecs.lookup('utf-8') if name == 'cp65001' else None)
 
-    _workaround_optparse_bug9161()
+    workaround_optparse_bug9161()
 
     setproctitle('youtube-dl')
 
@@ -174,9 +175,6 @@ def _real_main(argv=None):
     if opts.ap_mso and opts.ap_mso not in MSO_INFO:
         parser.error('Unsupported TV Provider, use --ap-list-mso to get a list of supported TV Providers')
 
-    if opts.no_check_extensions:
-        _UnsafeExtensionError.lenient = True
-
     def parse_retries(retries):
         if retries in ('inf', 'infinite'):
             parsed_retries = float('inf')
diff --git a/youtube_dl/aes.py b/youtube_dl/aes.py
index a94a41079..461bb6d41 100644
--- a/youtube_dl/aes.py
+++ b/youtube_dl/aes.py
@@ -8,18 +8,6 @@ from .utils import bytes_to_intlist, intlist_to_bytes
 BLOCK_SIZE_BYTES = 16
 
 
-def pkcs7_padding(data):
-    """
-    PKCS#7 padding
-
-    @param {int[]} data        cleartext
-    @returns {int[]}           padding data
-    """
-
-    remaining_length = BLOCK_SIZE_BYTES - len(data) % BLOCK_SIZE_BYTES
-    return data + [remaining_length] * remaining_length
-
-
 def aes_ctr_decrypt(data, key, counter):
     """
     Decrypt with aes in counter mode
@@ -88,7 +76,8 @@ def aes_cbc_encrypt(data, key, iv):
     previous_cipher_block = iv
     for i in range(block_count):
         block = data[i * BLOCK_SIZE_BYTES: (i + 1) * BLOCK_SIZE_BYTES]
-        block = pkcs7_padding(block)
+        remaining_length = BLOCK_SIZE_BYTES - len(block)
+        block += [remaining_length] * remaining_length
         mixed_block = xor(block, previous_cipher_block)
 
         encrypted_block = aes_encrypt(mixed_block, expanded_key)
@@ -99,28 +88,6 @@ def aes_cbc_encrypt(data, key, iv):
     return encrypted_data
 
 
-def aes_ecb_encrypt(data, key):
-    """
-    Encrypt with aes in ECB mode. Using PKCS#7 padding
-
-    @param {int[]} data        cleartext
-    @param {int[]} key         16/24/32-Byte cipher key
-    @returns {int[]}           encrypted data
-    """
-    expanded_key = key_expansion(key)
-    block_count = int(ceil(float(len(data)) / BLOCK_SIZE_BYTES))
-
-    encrypted_data = []
-    for i in range(block_count):
-        block = data[i * BLOCK_SIZE_BYTES: (i + 1) * BLOCK_SIZE_BYTES]
-        block = pkcs7_padding(block)
-
-        encrypted_block = aes_encrypt(block, expanded_key)
-        encrypted_data += encrypted_block
-
-    return encrypted_data
-
-
 def key_expansion(data):
     """
     Generate key schedule
@@ -336,7 +303,7 @@ def xor(data1, data2):
 
 
 def rijndael_mul(a, b):
-    if (a == 0 or b == 0):
+    if(a == 0 or b == 0):
         return 0
     return RIJNDAEL_EXP_TABLE[(RIJNDAEL_LOG_TABLE[a] + RIJNDAEL_LOG_TABLE[b]) % 0xFF]
 
diff --git a/youtube_dl/cache.py b/youtube_dl/cache.py
index eb0a729c2..7bdade1bd 100644
--- a/youtube_dl/cache.py
+++ b/youtube_dl/cache.py
@@ -1,67 +1,41 @@
-# coding: utf-8
 from __future__ import unicode_literals
 
 import errno
+import io
 import json
 import os
 import re
 import shutil
 import traceback
 
-from .compat import (
-    compat_getenv,
-    compat_open as open,
-    compat_os_makedirs,
-)
+from .compat import compat_getenv
 from .utils import (
-    error_to_compat_str,
-    escape_rfc3986,
     expand_path,
-    is_outdated_version,
-    traverse_obj,
     write_json_file,
 )
-from .version import __version__
 
 
 class Cache(object):
-
-    _YTDL_DIR = 'youtube-dl'
-    _VERSION_KEY = _YTDL_DIR + '_version'
-    _DEFAULT_VERSION = '2021.12.17'
-
     def __init__(self, ydl):
         self._ydl = ydl
 
-    def _write_debug(self, *args, **kwargs):
-        self._ydl.write_debug(*args, **kwargs)
-
-    def _report_warning(self, *args, **kwargs):
-        self._ydl.report_warning(*args, **kwargs)
-
-    def _to_screen(self, *args, **kwargs):
-        self._ydl.to_screen(*args, **kwargs)
-
-    def _get_param(self, k, default=None):
-        return self._ydl.params.get(k, default)
-
     def _get_root_dir(self):
-        res = self._get_param('cachedir')
+        res = self._ydl.params.get('cachedir')
         if res is None:
             cache_root = compat_getenv('XDG_CACHE_HOME', '~/.cache')
-            res = os.path.join(cache_root, self._YTDL_DIR)
+            res = os.path.join(cache_root, 'youtube-dl')
         return expand_path(res)
 
     def _get_cache_fn(self, section, key, dtype):
-        assert re.match(r'^[\w.-]+$', section), \
+        assert re.match(r'^[a-zA-Z0-9_.-]+$', section), \
             'invalid section %r' % section
-        key = escape_rfc3986(key, safe='').replace('%', ',')  # encode non-ascii characters
+        assert re.match(r'^[a-zA-Z0-9_.-]+$', key), 'invalid key %r' % key
         return os.path.join(
             self._get_root_dir(), section, '%s.%s' % (key, dtype))
 
     @property
     def enabled(self):
-        return self._get_param('cachedir') is not False
+        return self._ydl.params.get('cachedir') is not False
 
     def store(self, section, key, data, dtype='json'):
         assert dtype in ('json',)
@@ -71,75 +45,52 @@ class Cache(object):
 
         fn = self._get_cache_fn(section, key, dtype)
         try:
-            compat_os_makedirs(os.path.dirname(fn), exist_ok=True)
-            self._write_debug('Saving {section}.{key} to cache'.format(section=section, key=key))
-            write_json_file({self._VERSION_KEY: __version__, 'data': data}, fn)
+            try:
+                os.makedirs(os.path.dirname(fn))
+            except OSError as ose:
+                if ose.errno != errno.EEXIST:
+                    raise
+            write_json_file(data, fn)
         except Exception:
             tb = traceback.format_exc()
-            self._report_warning('Writing cache to {fn!r} failed: {tb}'.format(fn=fn, tb=tb))
+            self._ydl.report_warning(
+                'Writing cache to %r failed: %s' % (fn, tb))
 
-    def clear(self, section, key, dtype='json'):
-
-        if not self.enabled:
-            return
-
-        fn = self._get_cache_fn(section, key, dtype)
-        self._write_debug('Clearing {section}.{key} from cache'.format(section=section, key=key))
-        try:
-            os.remove(fn)
-        except Exception as e:
-            if getattr(e, 'errno') == errno.ENOENT:
-                # file not found
-                return
-            tb = traceback.format_exc()
-            self._report_warning('Clearing cache from {fn!r} failed: {tb}'.format(fn=fn, tb=tb))
-
-    def _validate(self, data, min_ver):
-        version = traverse_obj(data, self._VERSION_KEY)
-        if not version:  # Backward compatibility
-            data, version = {'data': data}, self._DEFAULT_VERSION
-        if not is_outdated_version(version, min_ver or '0', assume_new=False):
-            return data['data']
-        self._write_debug('Discarding old cache from version {version} (needs {min_ver})'.format(version=version, min_ver=min_ver))
-
-    def load(self, section, key, dtype='json', default=None, **kw_min_ver):
+    def load(self, section, key, dtype='json', default=None):
         assert dtype in ('json',)
-        min_ver = kw_min_ver.get('min_ver')
 
         if not self.enabled:
             return default
 
         cache_fn = self._get_cache_fn(section, key, dtype)
         try:
-            with open(cache_fn, encoding='utf-8') as cachef:
-                self._write_debug('Loading {section}.{key} from cache'.format(section=section, key=key), only_once=True)
-                return self._validate(json.load(cachef), min_ver)
-        except (ValueError, KeyError):
             try:
-                file_size = 'size: %d' % os.path.getsize(cache_fn)
-            except (OSError, IOError) as oe:
-                file_size = error_to_compat_str(oe)
-            self._report_warning('Cache retrieval from %s failed (%s)' % (cache_fn, file_size))
-        except Exception as e:
-            if getattr(e, 'errno') == errno.ENOENT:
-                # no cache available
-                return
-            self._report_warning('Cache retrieval from %s failed' % (cache_fn,))
+                with io.open(cache_fn, 'r', encoding='utf-8') as cachef:
+                    return json.load(cachef)
+            except ValueError:
+                try:
+                    file_size = os.path.getsize(cache_fn)
+                except (OSError, IOError) as oe:
+                    file_size = str(oe)
+                self._ydl.report_warning(
+                    'Cache retrieval from %s failed (%s)' % (cache_fn, file_size))
+        except IOError:
+            pass  # No cache available
 
         return default
 
     def remove(self):
         if not self.enabled:
-            self._to_screen('Cache is disabled (Did you combine --no-cache-dir and --rm-cache-dir?)')
+            self._ydl.to_screen('Cache is disabled (Did you combine --no-cache-dir and --rm-cache-dir?)')
             return
 
         cachedir = self._get_root_dir()
         if not any((term in cachedir) for term in ('cache', 'tmp')):
-            raise Exception('Not removing directory %s - this does not look like a cache dir' % (cachedir,))
+            raise Exception('Not removing directory %s - this does not look like a cache dir' % cachedir)
 
-        self._to_screen(
-            'Removing cache dir %s .' % (cachedir,), skip_eol=True, ),
+        self._ydl.to_screen(
+            'Removing cache dir %s .' % cachedir, skip_eol=True)
         if os.path.exists(cachedir):
-            self._to_screen('.', skip_eol=True)
+            self._ydl.to_screen('.', skip_eol=True)
             shutil.rmtree(cachedir)
-        self._to_screen('.')
+        self._ydl.to_screen('.')
diff --git a/youtube_dl/casefold.py b/youtube_dl/casefold.py
deleted file mode 100644
index 712b2e7fa..000000000
--- a/youtube_dl/casefold.py
+++ /dev/null
@@ -1,1663 +0,0 @@
-# coding: utf-8
-from __future__ import unicode_literals
-
-from .compat import (
-    compat_str,
-    compat_chr,
-)
-
-# Below is included the text of icu/CaseFolding.txt retrieved from
-# https://github.com/unicode-org/icu/blob/main/icu4c/source/data/unidata/CaseFolding.txt
-# In case newly foldable Unicode characters are defined, paste the new version
-# of the text inside the ''' marks.
-# The text is expected to have only blank lines and lines with 1st character #,
-# all ignored, and fold definitions like this:
-# `from_hex_code; status; space_separated_to_hex_code_list; comment`
-# Only `status` C/F are used.
-
-_map_str = '''
-# CaseFolding-15.0.0.txt
-# Date: 2022-02-02, 23:35:35 GMT
-# © 2022 Unicode®, Inc.
-# Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
-# For terms of use, see https://www.unicode.org/terms_of_use.html
-#
-# Unicode Character Database
-#   For documentation, see https://www.unicode.org/reports/tr44/
-#
-# Case Folding Properties
-#
-# This file is a supplement to the UnicodeData file.
-# It provides a case folding mapping generated from the Unicode Character Database.
-# If all characters are mapped according to the full mapping below, then
-# case differences (according to UnicodeData.txt and SpecialCasing.txt)
-# are eliminated.
-#
-# The data supports both implementations that require simple case foldings
-# (where string lengths don't change), and implementations that allow full case folding
-# (where string lengths may grow). Note that where they can be supported, the
-# full case foldings are superior: for example, they allow "MASSE" and "Maße" to match.
-#
-# All code points not listed in this file map to themselves.
-#
-# NOTE: case folding does not preserve normalization formats!
-#
-# For information on case folding, including how to have case folding
-# preserve normalization formats, see Section 3.13 Default Case Algorithms in
-# The Unicode Standard.
-#
-# ================================================================================
-# Format
-# ================================================================================
-# The entries in this file are in the following machine-readable format:
-#
-# <code>; <status>; <mapping>; # <name>
-#
-# The status field is:
-# C: common case folding, common mappings shared by both simple and full mappings.
-# F: full case folding, mappings that cause strings to grow in length. Multiple characters are separated by spaces.
-# S: simple case folding, mappings to single characters where different from F.
-# T: special case for uppercase I and dotted uppercase I
-#    - For non-Turkic languages, this mapping is normally not used.
-#    - For Turkic languages (tr, az), this mapping can be used instead of the normal mapping for these characters.
-#      Note that the Turkic mappings do not maintain canonical equivalence without additional processing.
-#      See the discussions of case mapping in the Unicode Standard for more information.
-#
-# Usage:
-#  A. To do a simple case folding, use the mappings with status C + S.
-#  B. To do a full case folding, use the mappings with status C + F.
-#
-#    The mappings with status T can be used or omitted depending on the desired case-folding
-#    behavior. (The default option is to exclude them.)
-#
-# =================================================================
-
-# Property: Case_Folding
-
-#  All code points not explicitly listed for Case_Folding
-#  have the value C for the status field, and the code point itself for the mapping field.
-
-# =================================================================
-0041; C; 0061; # LATIN CAPITAL LETTER A
-0042; C; 0062; # LATIN CAPITAL LETTER B
-0043; C; 0063; # LATIN CAPITAL LETTER C
-0044; C; 0064; # LATIN CAPITAL LETTER D
-0045; C; 0065; # LATIN CAPITAL LETTER E
-0046; C; 0066; # LATIN CAPITAL LETTER F
-0047; C; 0067; # LATIN CAPITAL LETTER G
-0048; C; 0068; # LATIN CAPITAL LETTER H
-0049; C; 0069; # LATIN CAPITAL LETTER I
-0049; T; 0131; # LATIN CAPITAL LETTER I
-004A; C; 006A; # LATIN CAPITAL LETTER J
-004B; C; 006B; # LATIN CAPITAL LETTER K
-004C; C; 006C; # LATIN CAPITAL LETTER L
-004D; C; 006D; # LATIN CAPITAL LETTER M
-004E; C; 006E; # LATIN CAPITAL LETTER N
-004F; C; 006F; # LATIN CAPITAL LETTER O
-0050; C; 0070; # LATIN CAPITAL LETTER P
-0051; C; 0071; # LATIN CAPITAL LETTER Q
-0052; C; 0072; # LATIN CAPITAL LETTER R
-0053; C; 0073; # LATIN CAPITAL LETTER S
-0054; C; 0074; # LATIN CAPITAL LETTER T
-0055; C; 0075; # LATIN CAPITAL LETTER U
-0056; C; 0076; # LATIN CAPITAL LETTER V
-0057; C; 0077; # LATIN CAPITAL LETTER W
-0058; C; 0078; # LATIN CAPITAL LETTER X
-0059; C; 0079; # LATIN CAPITAL LETTER Y
-005A; C; 007A; # LATIN CAPITAL LETTER Z
-00B5; C; 03BC; # MICRO SIGN
-00C0; C; 00E0; # LATIN CAPITAL LETTER A WITH GRAVE
-00C1; C; 00E1; # LATIN CAPITAL LETTER A WITH ACUTE
-00C2; C; 00E2; # LATIN CAPITAL LETTER A WITH CIRCUMFLEX
-00C3; C; 00E3; # LATIN CAPITAL LETTER A WITH TILDE
-00C4; C; 00E4; # LATIN CAPITAL LETTER A WITH DIAERESIS
-00C5; C; 00E5; # LATIN CAPITAL LETTER A WITH RING ABOVE
-00C6; C; 00E6; # LATIN CAPITAL LETTER AE
-00C7; C; 00E7; # LATIN CAPITAL LETTER C WITH CEDILLA
-00C8; C; 00E8; # LATIN CAPITAL LETTER E WITH GRAVE
-00C9; C; 00E9; # LATIN CAPITAL LETTER E WITH ACUTE
-00CA; C; 00EA; # LATIN CAPITAL LETTER E WITH CIRCUMFLEX
-00CB; C; 00EB; # LATIN CAPITAL LETTER E WITH DIAERESIS
-00CC; C; 00EC; # LATIN CAPITAL LETTER I WITH GRAVE
-00CD; C; 00ED; # LATIN CAPITAL LETTER I WITH ACUTE
-00CE; C; 00EE; # LATIN CAPITAL LETTER I WITH CIRCUMFLEX
-00CF; C; 00EF; # LATIN CAPITAL LETTER I WITH DIAERESIS
-00D0; C; 00F0; # LATIN CAPITAL LETTER ETH
-00D1; C; 00F1; # LATIN CAPITAL LETTER N WITH TILDE
-00D2; C; 00F2; # LATIN CAPITAL LETTER O WITH GRAVE
-00D3; C; 00F3; # LATIN CAPITAL LETTER O WITH ACUTE
-00D4; C; 00F4; # LATIN CAPITAL LETTER O WITH CIRCUMFLEX
-00D5; C; 00F5; # LATIN CAPITAL LETTER O WITH TILDE
-00D6; C; 00F6; # LATIN CAPITAL LETTER O WITH DIAERESIS
-00D8; C; 00F8; # LATIN CAPITAL LETTER O WITH STROKE
-00D9; C; 00F9; # LATIN CAPITAL LETTER U WITH GRAVE
-00DA; C; 00FA; # LATIN CAPITAL LETTER U WITH ACUTE
-00DB; C; 00FB; # LATIN CAPITAL LETTER U WITH CIRCUMFLEX
-00DC; C; 00FC; # LATIN CAPITAL LETTER U WITH DIAERESIS
-00DD; C; 00FD; # LATIN CAPITAL LETTER Y WITH ACUTE
-00DE; C; 00FE; # LATIN CAPITAL LETTER THORN
-00DF; F; 0073 0073; # LATIN SMALL LETTER SHARP S
-0100; C; 0101; # LATIN CAPITAL LETTER A WITH MACRON
-0102; C; 0103; # LATIN CAPITAL LETTER A WITH BREVE
-0104; C; 0105; # LATIN CAPITAL LETTER A WITH OGONEK
-0106; C; 0107; # LATIN CAPITAL LETTER C WITH ACUTE
-0108; C; 0109; # LATIN CAPITAL LETTER C WITH CIRCUMFLEX
-010A; C; 010B; # LATIN CAPITAL LETTER C WITH DOT ABOVE
-010C; C; 010D; # LATIN CAPITAL LETTER C WITH CARON
-010E; C; 010F; # LATIN CAPITAL LETTER D WITH CARON
-0110; C; 0111; # LATIN CAPITAL LETTER D WITH STROKE
-0112; C; 0113; # LATIN CAPITAL LETTER E WITH MACRON
-0114; C; 0115; # LATIN CAPITAL LETTER E WITH BREVE
-0116; C; 0117; # LATIN CAPITAL LETTER E WITH DOT ABOVE
-0118; C; 0119; # LATIN CAPITAL LETTER E WITH OGONEK
-011A; C; 011B; # LATIN CAPITAL LETTER E WITH CARON
-011C; C; 011D; # LATIN CAPITAL LETTER G WITH CIRCUMFLEX
-011E; C; 011F; # LATIN CAPITAL LETTER G WITH BREVE
-0120; C; 0121; # LATIN CAPITAL LETTER G WITH DOT ABOVE
-0122; C; 0123; # LATIN CAPITAL LETTER G WITH CEDILLA
-0124; C; 0125; # LATIN CAPITAL LETTER H WITH CIRCUMFLEX
-0126; C; 0127; # LATIN CAPITAL LETTER H WITH STROKE
-0128; C; 0129; # LATIN CAPITAL LETTER I WITH TILDE
-012A; C; 012B; # LATIN CAPITAL LETTER I WITH MACRON
-012C; C; 012D; # LATIN CAPITAL LETTER I WITH BREVE
-012E; C; 012F; # LATIN CAPITAL LETTER I WITH OGONEK
-0130; F; 0069 0307; # LATIN CAPITAL LETTER I WITH DOT ABOVE
-0130; T; 0069; # LATIN CAPITAL LETTER I WITH DOT ABOVE
-0132; C; 0133; # LATIN CAPITAL LIGATURE IJ
-0134; C; 0135; # LATIN CAPITAL LETTER J WITH CIRCUMFLEX
-0136; C; 0137; # LATIN CAPITAL LETTER K WITH CEDILLA
-0139; C; 013A; # LATIN CAPITAL LETTER L WITH ACUTE
-013B; C; 013C; # LATIN CAPITAL LETTER L WITH CEDILLA
-013D; C; 013E; # LATIN CAPITAL LETTER L WITH CARON
-013F; C; 0140; # LATIN CAPITAL LETTER L WITH MIDDLE DOT
-0141; C; 0142; # LATIN CAPITAL LETTER L WITH STROKE
-0143; C; 0144; # LATIN CAPITAL LETTER N WITH ACUTE
-0145; C; 0146; # LATIN CAPITAL LETTER N WITH CEDILLA
-0147; C; 0148; # LATIN CAPITAL LETTER N WITH CARON
-0149; F; 02BC 006E; # LATIN SMALL LETTER N PRECEDED BY APOSTROPHE
-014A; C; 014B; # LATIN CAPITAL LETTER ENG
-014C; C; 014D; # LATIN CAPITAL LETTER O WITH MACRON
-014E; C; 014F; # LATIN CAPITAL LETTER O WITH BREVE
-0150; C; 0151; # LATIN CAPITAL LETTER O WITH DOUBLE ACUTE
-0152; C; 0153; # LATIN CAPITAL LIGATURE OE
-0154; C; 0155; # LATIN CAPITAL LETTER R WITH ACUTE
-0156; C; 0157; # LATIN CAPITAL LETTER R WITH CEDILLA
-0158; C; 0159; # LATIN CAPITAL LETTER R WITH CARON
-015A; C; 015B; # LATIN CAPITAL LETTER S WITH ACUTE
-015C; C; 015D; # LATIN CAPITAL LETTER S WITH CIRCUMFLEX
-015E; C; 015F; # LATIN CAPITAL LETTER S WITH CEDILLA
-0160; C; 0161; # LATIN CAPITAL LETTER S WITH CARON
-0162; C; 0163; # LATIN CAPITAL LETTER T WITH CEDILLA
-0164; C; 0165; # LATIN CAPITAL LETTER T WITH CARON
-0166; C; 0167; # LATIN CAPITAL LETTER T WITH STROKE
-0168; C; 0169; # LATIN CAPITAL LETTER U WITH TILDE
-016A; C; 016B; # LATIN CAPITAL LETTER U WITH MACRON
-016C; C; 016D; # LATIN CAPITAL LETTER U WITH BREVE
-016E; C; 016F; # LATIN CAPITAL LETTER U WITH RING ABOVE
-0170; C; 0171; # LATIN CAPITAL LETTER U WITH DOUBLE ACUTE
-0172; C; 0173; # LATIN CAPITAL LETTER U WITH OGONEK
-0174; C; 0175; # LATIN CAPITAL LETTER W WITH CIRCUMFLEX
-0176; C; 0177; # LATIN CAPITAL LETTER Y WITH CIRCUMFLEX
-0178; C; 00FF; # LATIN CAPITAL LETTER Y WITH DIAERESIS
-0179; C; 017A; # LATIN CAPITAL LETTER Z WITH ACUTE
-017B; C; 017C; # LATIN CAPITAL LETTER Z WITH DOT ABOVE
-017D; C; 017E; # LATIN CAPITAL LETTER Z WITH CARON
-017F; C; 0073; # LATIN SMALL LETTER LONG S
-0181; C; 0253; # LATIN CAPITAL LETTER B WITH HOOK
-0182; C; 0183; # LATIN CAPITAL LETTER B WITH TOPBAR
-0184; C; 0185; # LATIN CAPITAL LETTER TONE SIX
-0186; C; 0254; # LATIN CAPITAL LETTER OPEN O
-0187; C; 0188; # LATIN CAPITAL LETTER C WITH HOOK
-0189; C; 0256; # LATIN CAPITAL LETTER AFRICAN D
-018A; C; 0257; # LATIN CAPITAL LETTER D WITH HOOK
-018B; C; 018C; # LATIN CAPITAL LETTER D WITH TOPBAR
-018E; C; 01DD; # LATIN CAPITAL LETTER REVERSED E
-018F; C; 0259; # LATIN CAPITAL LETTER SCHWA
-0190; C; 025B; # LATIN CAPITAL LETTER OPEN E
-0191; C; 0192; # LATIN CAPITAL LETTER F WITH HOOK
-0193; C; 0260; # LATIN CAPITAL LETTER G WITH HOOK
-0194; C; 0263; # LATIN CAPITAL LETTER GAMMA
-0196; C; 0269; # LATIN CAPITAL LETTER IOTA
-0197; C; 0268; # LATIN CAPITAL LETTER I WITH STROKE
-0198; C; 0199; # LATIN CAPITAL LETTER K WITH HOOK
-019C; C; 026F; # LATIN CAPITAL LETTER TURNED M
-019D; C; 0272; # LATIN CAPITAL LETTER N WITH LEFT HOOK
-019F; C; 0275; # LATIN CAPITAL LETTER O WITH MIDDLE TILDE
-01A0; C; 01A1; # LATIN CAPITAL LETTER O WITH HORN
-01A2; C; 01A3; # LATIN CAPITAL LETTER OI
-01A4; C; 01A5; # LATIN CAPITAL LETTER P WITH HOOK
-01A6; C; 0280; # LATIN LETTER YR
-01A7; C; 01A8; # LATIN CAPITAL LETTER TONE TWO
-01A9; C; 0283; # LATIN CAPITAL LETTER ESH
-01AC; C; 01AD; # LATIN CAPITAL LETTER T WITH HOOK
-01AE; C; 0288; # LATIN CAPITAL LETTER T WITH RETROFLEX HOOK
-01AF; C; 01B0; # LATIN CAPITAL LETTER U WITH HORN
-01B1; C; 028A; # LATIN CAPITAL LETTER UPSILON
-01B2; C; 028B; # LATIN CAPITAL LETTER V WITH HOOK
-01B3; C; 01B4; # LATIN CAPITAL LETTER Y WITH HOOK
-01B5; C; 01B6; # LATIN CAPITAL LETTER Z WITH STROKE
-01B7; C; 0292; # LATIN CAPITAL LETTER EZH
-01B8; C; 01B9; # LATIN CAPITAL LETTER EZH REVERSED
-01BC; C; 01BD; # LATIN CAPITAL LETTER TONE FIVE
-01C4; C; 01C6; # LATIN CAPITAL LETTER DZ WITH CARON
-01C5; C; 01C6; # LATIN CAPITAL LETTER D WITH SMALL LETTER Z WITH CARON
-01C7; C; 01C9; # LATIN CAPITAL LETTER LJ
-01C8; C; 01C9; # LATIN CAPITAL LETTER L WITH SMALL LETTER J
-01CA; C; 01CC; # LATIN CAPITAL LETTER NJ
-01CB; C; 01CC; # LATIN CAPITAL LETTER N WITH SMALL LETTER J
-01CD; C; 01CE; # LATIN CAPITAL LETTER A WITH CARON
-01CF; C; 01D0; # LATIN CAPITAL LETTER I WITH CARON
-01D1; C; 01D2; # LATIN CAPITAL LETTER O WITH CARON
-01D3; C; 01D4; # LATIN CAPITAL LETTER U WITH CARON
-01D5; C; 01D6; # LATIN CAPITAL LETTER U WITH DIAERESIS AND MACRON
-01D7; C; 01D8; # LATIN CAPITAL LETTER U WITH DIAERESIS AND ACUTE
-01D9; C; 01DA; # LATIN CAPITAL LETTER U WITH DIAERESIS AND CARON
-01DB; C; 01DC; # LATIN CAPITAL LETTER U WITH DIAERESIS AND GRAVE
-01DE; C; 01DF; # LATIN CAPITAL LETTER A WITH DIAERESIS AND MACRON
-01E0; C; 01E1; # LATIN CAPITAL LETTER A WITH DOT ABOVE AND MACRON
-01E2; C; 01E3; # LATIN CAPITAL LETTER AE WITH MACRON
-01E4; C; 01E5; # LATIN CAPITAL LETTER G WITH STROKE
-01E6; C; 01E7; # LATIN CAPITAL LETTER G WITH CARON
-01E8; C; 01E9; # LATIN CAPITAL LETTER K WITH CARON
-01EA; C; 01EB; # LATIN CAPITAL LETTER O WITH OGONEK
-01EC; C; 01ED; # LATIN CAPITAL LETTER O WITH OGONEK AND MACRON
-01EE; C; 01EF; # LATIN CAPITAL LETTER EZH WITH CARON
-01F0; F; 006A 030C; # LATIN SMALL LETTER J WITH CARON
-01F1; C; 01F3; # LATIN CAPITAL LETTER DZ
-01F2; C; 01F3; # LATIN CAPITAL LETTER D WITH SMALL LETTER Z
-01F4; C; 01F5; # LATIN CAPITAL LETTER G WITH ACUTE
-01F6; C; 0195; # LATIN CAPITAL LETTER HWAIR
-01F7; C; 01BF; # LATIN CAPITAL LETTER WYNN
-01F8; C; 01F9; # LATIN CAPITAL LETTER N WITH GRAVE
-01FA; C; 01FB; # LATIN CAPITAL LETTER A WITH RING ABOVE AND ACUTE
-01FC; C; 01FD; # LATIN CAPITAL LETTER AE WITH ACUTE
-01FE; C; 01FF; # LATIN CAPITAL LETTER O WITH STROKE AND ACUTE
-0200; C; 0201; # LATIN CAPITAL LETTER A WITH DOUBLE GRAVE
-0202; C; 0203; # LATIN CAPITAL LETTER A WITH INVERTED BREVE
-0204; C; 0205; # LATIN CAPITAL LETTER E WITH DOUBLE GRAVE
-0206; C; 0207; # LATIN CAPITAL LETTER E WITH INVERTED BREVE
-0208; C; 0209; # LATIN CAPITAL LETTER I WITH DOUBLE GRAVE
-020A; C; 020B; # LATIN CAPITAL LETTER I WITH INVERTED BREVE
-020C; C; 020D; # LATIN CAPITAL LETTER O WITH DOUBLE GRAVE
-020E; C; 020F; # LATIN CAPITAL LETTER O WITH INVERTED BREVE
-0210; C; 0211; # LATIN CAPITAL LETTER R WITH DOUBLE GRAVE
-0212; C; 0213; # LATIN CAPITAL LETTER R WITH INVERTED BREVE
-0214; C; 0215; # LATIN CAPITAL LETTER U WITH DOUBLE GRAVE
-0216; C; 0217; # LATIN CAPITAL LETTER U WITH INVERTED BREVE
-0218; C; 0219; # LATIN CAPITAL LETTER S WITH COMMA BELOW
-021A; C; 021B; # LATIN CAPITAL LETTER T WITH COMMA BELOW
-021C; C; 021D; # LATIN CAPITAL LETTER YOGH
-021E; C; 021F; # LATIN CAPITAL LETTER H WITH CARON
-0220; C; 019E; # LATIN CAPITAL LETTER N WITH LONG RIGHT LEG
-0222; C; 0223; # LATIN CAPITAL LETTER OU
-0224; C; 0225; # LATIN CAPITAL LETTER Z WITH HOOK
-0226; C; 0227; # LATIN CAPITAL LETTER A WITH DOT ABOVE
-0228; C; 0229; # LATIN CAPITAL LETTER E WITH CEDILLA
-022A; C; 022B; # LATIN CAPITAL LETTER O WITH DIAERESIS AND MACRON
-022C; C; 022D; # LATIN CAPITAL LETTER O WITH TILDE AND MACRON
-022E; C; 022F; # LATIN CAPITAL LETTER O WITH DOT ABOVE
-0230; C; 0231; # LATIN CAPITAL LETTER O WITH DOT ABOVE AND MACRON
-0232; C; 0233; # LATIN CAPITAL LETTER Y WITH MACRON
-023A; C; 2C65; # LATIN CAPITAL LETTER A WITH STROKE
-023B; C; 023C; # LATIN CAPITAL LETTER C WITH STROKE
-023D; C; 019A; # LATIN CAPITAL LETTER L WITH BAR
-023E; C; 2C66; # LATIN CAPITAL LETTER T WITH DIAGONAL STROKE
-0241; C; 0242; # LATIN CAPITAL LETTER GLOTTAL STOP
-0243; C; 0180; # LATIN CAPITAL LETTER B WITH STROKE
-0244; C; 0289; # LATIN CAPITAL LETTER U BAR
-0245; C; 028C; # LATIN CAPITAL LETTER TURNED V
-0246; C; 0247; # LATIN CAPITAL LETTER E WITH STROKE
-0248; C; 0249; # LATIN CAPITAL LETTER J WITH STROKE
-024A; C; 024B; # LATIN CAPITAL LETTER SMALL Q WITH HOOK TAIL
-024C; C; 024D; # LATIN CAPITAL LETTER R WITH STROKE
-024E; C; 024F; # LATIN CAPITAL LETTER Y WITH STROKE
-0345; C; 03B9; # COMBINING GREEK YPOGEGRAMMENI
-0370; C; 0371; # GREEK CAPITAL LETTER HETA
-0372; C; 0373; # GREEK CAPITAL LETTER ARCHAIC SAMPI
-0376; C; 0377; # GREEK CAPITAL LETTER PAMPHYLIAN DIGAMMA
-037F; C; 03F3; # GREEK CAPITAL LETTER YOT
-0386; C; 03AC; # GREEK CAPITAL LETTER ALPHA WITH TONOS
-0388; C; 03AD; # GREEK CAPITAL LETTER EPSILON WITH TONOS
-0389; C; 03AE; # GREEK CAPITAL LETTER ETA WITH TONOS
-038A; C; 03AF; # GREEK CAPITAL LETTER IOTA WITH TONOS
-038C; C; 03CC; # GREEK CAPITAL LETTER OMICRON WITH TONOS
-038E; C; 03CD; # GREEK CAPITAL LETTER UPSILON WITH TONOS
-038F; C; 03CE; # GREEK CAPITAL LETTER OMEGA WITH TONOS
-0390; F; 03B9 0308 0301; # GREEK SMALL LETTER IOTA WITH DIALYTIKA AND TONOS
-0391; C; 03B1; # GREEK CAPITAL LETTER ALPHA
-0392; C; 03B2; # GREEK CAPITAL LETTER BETA
-0393; C; 03B3; # GREEK CAPITAL LETTER GAMMA
-0394; C; 03B4; # GREEK CAPITAL LETTER DELTA
-0395; C; 03B5; # GREEK CAPITAL LETTER EPSILON
-0396; C; 03B6; # GREEK CAPITAL LETTER ZETA
-0397; C; 03B7; # GREEK CAPITAL LETTER ETA
-0398; C; 03B8; # GREEK CAPITAL LETTER THETA
-0399; C; 03B9; # GREEK CAPITAL LETTER IOTA
-039A; C; 03BA; # GREEK CAPITAL LETTER KAPPA
-039B; C; 03BB; # GREEK CAPITAL LETTER LAMDA
-039C; C; 03BC; # GREEK CAPITAL LETTER MU
-039D; C; 03BD; # GREEK CAPITAL LETTER NU
-039E; C; 03BE; # GREEK CAPITAL LETTER XI
-039F; C; 03BF; # GREEK CAPITAL LETTER OMICRON
-03A0; C; 03C0; # GREEK CAPITAL LETTER PI
-03A1; C; 03C1; # GREEK CAPITAL LETTER RHO
-03A3; C; 03C3; # GREEK CAPITAL LETTER SIGMA
-03A4; C; 03C4; # GREEK CAPITAL LETTER TAU
-03A5; C; 03C5; # GREEK CAPITAL LETTER UPSILON
-03A6; C; 03C6; # GREEK CAPITAL LETTER PHI
-03A7; C; 03C7; # GREEK CAPITAL LETTER CHI
-03A8; C; 03C8; # GREEK CAPITAL LETTER PSI
-03A9; C; 03C9; # GREEK CAPITAL LETTER OMEGA
-03AA; C; 03CA; # GREEK CAPITAL LETTER IOTA WITH DIALYTIKA
-03AB; C; 03CB; # GREEK CAPITAL LETTER UPSILON WITH DIALYTIKA
-03B0; F; 03C5 0308 0301; # GREEK SMALL LETTER UPSILON WITH DIALYTIKA AND TONOS
-03C2; C; 03C3; # GREEK SMALL LETTER FINAL SIGMA
-03CF; C; 03D7; # GREEK CAPITAL KAI SYMBOL
-03D0; C; 03B2; # GREEK BETA SYMBOL
-03D1; C; 03B8; # GREEK THETA SYMBOL
-03D5; C; 03C6; # GREEK PHI SYMBOL
-03D6; C; 03C0; # GREEK PI SYMBOL
-03D8; C; 03D9; # GREEK LETTER ARCHAIC KOPPA
-03DA; C; 03DB; # GREEK LETTER STIGMA
-03DC; C; 03DD; # GREEK LETTER DIGAMMA
-03DE; C; 03DF; # GREEK LETTER KOPPA
-03E0; C; 03E1; # GREEK LETTER SAMPI
-03E2; C; 03E3; # COPTIC CAPITAL LETTER SHEI
-03E4; C; 03E5; # COPTIC CAPITAL LETTER FEI
-03E6; C; 03E7; # COPTIC CAPITAL LETTER KHEI
-03E8; C; 03E9; # COPTIC CAPITAL LETTER HORI
-03EA; C; 03EB; # COPTIC CAPITAL LETTER GANGIA
-03EC; C; 03ED; # COPTIC CAPITAL LETTER SHIMA
-03EE; C; 03EF; # COPTIC CAPITAL LETTER DEI
-03F0; C; 03BA; # GREEK KAPPA SYMBOL
-03F1; C; 03C1; # GREEK RHO SYMBOL
-03F4; C; 03B8; # GREEK CAPITAL THETA SYMBOL
-03F5; C; 03B5; # GREEK LUNATE EPSILON SYMBOL
-03F7; C; 03F8; # GREEK CAPITAL LETTER SHO
-03F9; C; 03F2; # GREEK CAPITAL LUNATE SIGMA SYMBOL
-03FA; C; 03FB; # GREEK CAPITAL LETTER SAN
-03FD; C; 037B; # GREEK CAPITAL REVERSED LUNATE SIGMA SYMBOL
-03FE; C; 037C; # GREEK CAPITAL DOTTED LUNATE SIGMA SYMBOL
-03FF; C; 037D; # GREEK CAPITAL REVERSED DOTTED LUNATE SIGMA SYMBOL
-0400; C; 0450; # CYRILLIC CAPITAL LETTER IE WITH GRAVE
-0401; C; 0451; # CYRILLIC CAPITAL LETTER IO
-0402; C; 0452; # CYRILLIC CAPITAL LETTER DJE
-0403; C; 0453; # CYRILLIC CAPITAL LETTER GJE
-0404; C; 0454; # CYRILLIC CAPITAL LETTER UKRAINIAN IE
-0405; C; 0455; # CYRILLIC CAPITAL LETTER DZE
-0406; C; 0456; # CYRILLIC CAPITAL LETTER BYELORUSSIAN-UKRAINIAN I
-0407; C; 0457; # CYRILLIC CAPITAL LETTER YI
-0408; C; 0458; # CYRILLIC CAPITAL LETTER JE
-0409; C; 0459; # CYRILLIC CAPITAL LETTER LJE
-040A; C; 045A; # CYRILLIC CAPITAL LETTER NJE
-040B; C; 045B; # CYRILLIC CAPITAL LETTER TSHE
-040C; C; 045C; # CYRILLIC CAPITAL LETTER KJE
-040D; C; 045D; # CYRILLIC CAPITAL LETTER I WITH GRAVE
-040E; C; 045E; # CYRILLIC CAPITAL LETTER SHORT U
-040F; C; 045F; # CYRILLIC CAPITAL LETTER DZHE
-0410; C; 0430; # CYRILLIC CAPITAL LETTER A
-0411; C; 0431; # CYRILLIC CAPITAL LETTER BE
-0412; C; 0432; # CYRILLIC CAPITAL LETTER VE
-0413; C; 0433; # CYRILLIC CAPITAL LETTER GHE
-0414; C; 0434; # CYRILLIC CAPITAL LETTER DE
-0415; C; 0435; # CYRILLIC CAPITAL LETTER IE
-0416; C; 0436; # CYRILLIC CAPITAL LETTER ZHE
-0417; C; 0437; # CYRILLIC CAPITAL LETTER ZE
-0418; C; 0438; # CYRILLIC CAPITAL LETTER I
-0419; C; 0439; # CYRILLIC CAPITAL LETTER SHORT I
-041A; C; 043A; # CYRILLIC CAPITAL LETTER KA
-041B; C; 043B; # CYRILLIC CAPITAL LETTER EL
-041C; C; 043C; # CYRILLIC CAPITAL LETTER EM
-041D; C; 043D; # CYRILLIC CAPITAL LETTER EN
-041E; C; 043E; # CYRILLIC CAPITAL LETTER O
-041F; C; 043F; # CYRILLIC CAPITAL LETTER PE
-0420; C; 0440; # CYRILLIC CAPITAL LETTER ER
-0421; C; 0441; # CYRILLIC CAPITAL LETTER ES
-0422; C; 0442; # CYRILLIC CAPITAL LETTER TE
-0423; C; 0443; # CYRILLIC CAPITAL LETTER U
-0424; C; 0444; # CYRILLIC CAPITAL LETTER EF
-0425; C; 0445; # CYRILLIC CAPITAL LETTER HA
-0426; C; 0446; # CYRILLIC CAPITAL LETTER TSE
-0427; C; 0447; # CYRILLIC CAPITAL LETTER CHE
-0428; C; 0448; # CYRILLIC CAPITAL LETTER SHA
-0429; C; 0449; # CYRILLIC CAPITAL LETTER SHCHA
-042A; C; 044A; # CYRILLIC CAPITAL LETTER HARD SIGN
-042B; C; 044B; # CYRILLIC CAPITAL LETTER YERU
-042C; C; 044C; # CYRILLIC CAPITAL LETTER SOFT SIGN
-042D; C; 044D; # CYRILLIC CAPITAL LETTER E
-042E; C; 044E; # CYRILLIC CAPITAL LETTER YU
-042F; C; 044F; # CYRILLIC CAPITAL LETTER YA
-0460; C; 0461; # CYRILLIC CAPITAL LETTER OMEGA
-0462; C; 0463; # CYRILLIC CAPITAL LETTER YAT
-0464; C; 0465; # CYRILLIC CAPITAL LETTER IOTIFIED E
-0466; C; 0467; # CYRILLIC CAPITAL LETTER LITTLE YUS
-0468; C; 0469; # CYRILLIC CAPITAL LETTER IOTIFIED LITTLE YUS
-046A; C; 046B; # CYRILLIC CAPITAL LETTER BIG YUS
-046C; C; 046D; # CYRILLIC CAPITAL LETTER IOTIFIED BIG YUS
-046E; C; 046F; # CYRILLIC CAPITAL LETTER KSI
-0470; C; 0471; # CYRILLIC CAPITAL LETTER PSI
-0472; C; 0473; # CYRILLIC CAPITAL LETTER FITA
-0474; C; 0475; # CYRILLIC CAPITAL LETTER IZHITSA
-0476; C; 0477; # CYRILLIC CAPITAL LETTER IZHITSA WITH DOUBLE GRAVE ACCENT
-0478; C; 0479; # CYRILLIC CAPITAL LETTER UK
-047A; C; 047B; # CYRILLIC CAPITAL LETTER ROUND OMEGA
-047C; C; 047D; # CYRILLIC CAPITAL LETTER OMEGA WITH TITLO
-047E; C; 047F; # CYRILLIC CAPITAL LETTER OT
-0480; C; 0481; # CYRILLIC CAPITAL LETTER KOPPA
-048A; C; 048B; # CYRILLIC CAPITAL LETTER SHORT I WITH TAIL
-048C; C; 048D; # CYRILLIC CAPITAL LETTER SEMISOFT SIGN
-048E; C; 048F; # CYRILLIC CAPITAL LETTER ER WITH TICK
-0490; C; 0491; # CYRILLIC CAPITAL LETTER GHE WITH UPTURN
-0492; C; 0493; # CYRILLIC CAPITAL LETTER GHE WITH STROKE
-0494; C; 0495; # CYRILLIC CAPITAL LETTER GHE WITH MIDDLE HOOK
-0496; C; 0497; # CYRILLIC CAPITAL LETTER ZHE WITH DESCENDER
-0498; C; 0499; # CYRILLIC CAPITAL LETTER ZE WITH DESCENDER
-049A; C; 049B; # CYRILLIC CAPITAL LETTER KA WITH DESCENDER
-049C; C; 049D; # CYRILLIC CAPITAL LETTER KA WITH VERTICAL STROKE
-049E; C; 049F; # CYRILLIC CAPITAL LETTER KA WITH STROKE
-04A0; C; 04A1; # CYRILLIC CAPITAL LETTER BASHKIR KA
-04A2; C; 04A3; # CYRILLIC CAPITAL LETTER EN WITH DESCENDER
-04A4; C; 04A5; # CYRILLIC CAPITAL LIGATURE EN GHE
-04A6; C; 04A7; # CYRILLIC CAPITAL LETTER PE WITH MIDDLE HOOK
-04A8; C; 04A9; # CYRILLIC CAPITAL LETTER ABKHASIAN HA
-04AA; C; 04AB; # CYRILLIC CAPITAL LETTER ES WITH DESCENDER
-04AC; C; 04AD; # CYRILLIC CAPITAL LETTER TE WITH DESCENDER
-04AE; C; 04AF; # CYRILLIC CAPITAL LETTER STRAIGHT U
-04B0; C; 04B1; # CYRILLIC CAPITAL LETTER STRAIGHT U WITH STROKE
-04B2; C; 04B3; # CYRILLIC CAPITAL LETTER HA WITH DESCENDER
-04B4; C; 04B5; # CYRILLIC CAPITAL LIGATURE TE TSE
-04B6; C; 04B7; # CYRILLIC CAPITAL LETTER CHE WITH DESCENDER
-04B8; C; 04B9; # CYRILLIC CAPITAL LETTER CHE WITH VERTICAL STROKE
-04BA; C; 04BB; # CYRILLIC CAPITAL LETTER SHHA
-04BC; C; 04BD; # CYRILLIC CAPITAL LETTER ABKHASIAN CHE
-04BE; C; 04BF; # CYRILLIC CAPITAL LETTER ABKHASIAN CHE WITH DESCENDER
-04C0; C; 04CF; # CYRILLIC LETTER PALOCHKA
-04C1; C; 04C2; # CYRILLIC CAPITAL LETTER ZHE WITH BREVE
-04C3; C; 04C4; # CYRILLIC CAPITAL LETTER KA WITH HOOK
-04C5; C; 04C6; # CYRILLIC CAPITAL LETTER EL WITH TAIL
-04C7; C; 04C8; # CYRILLIC CAPITAL LETTER EN WITH HOOK
-04C9; C; 04CA; # CYRILLIC CAPITAL LETTER EN WITH TAIL
-04CB; C; 04CC; # CYRILLIC CAPITAL LETTER KHAKASSIAN CHE
-04CD; C; 04CE; # CYRILLIC CAPITAL LETTER EM WITH TAIL
-04D0; C; 04D1; # CYRILLIC CAPITAL LETTER A WITH BREVE
-04D2; C; 04D3; # CYRILLIC CAPITAL LETTER A WITH DIAERESIS
-04D4; C; 04D5; # CYRILLIC CAPITAL LIGATURE A IE
-04D6; C; 04D7; # CYRILLIC CAPITAL LETTER IE WITH BREVE
-04D8; C; 04D9; # CYRILLIC CAPITAL LETTER SCHWA
-04DA; C; 04DB; # CYRILLIC CAPITAL LETTER SCHWA WITH DIAERESIS
-04DC; C; 04DD; # CYRILLIC CAPITAL LETTER ZHE WITH DIAERESIS
-04DE; C; 04DF; # CYRILLIC CAPITAL LETTER ZE WITH DIAERESIS
-04E0; C; 04E1; # CYRILLIC CAPITAL LETTER ABKHASIAN DZE
-04E2; C; 04E3; # CYRILLIC CAPITAL LETTER I WITH MACRON
-04E4; C; 04E5; # CYRILLIC CAPITAL LETTER I WITH DIAERESIS
-04E6; C; 04E7; # CYRILLIC CAPITAL LETTER O WITH DIAERESIS
-04E8; C; 04E9; # CYRILLIC CAPITAL LETTER BARRED O
-04EA; C; 04EB; # CYRILLIC CAPITAL LETTER BARRED O WITH DIAERESIS
-04EC; C; 04ED; # CYRILLIC CAPITAL LETTER E WITH DIAERESIS
-04EE; C; 04EF; # CYRILLIC CAPITAL LETTER U WITH MACRON
-04F0; C; 04F1; # CYRILLIC CAPITAL LETTER U WITH DIAERESIS
-04F2; C; 04F3; # CYRILLIC CAPITAL LETTER U WITH DOUBLE ACUTE
-04F4; C; 04F5; # CYRILLIC CAPITAL LETTER CHE WITH DIAERESIS
-04F6; C; 04F7; # CYRILLIC CAPITAL LETTER GHE WITH DESCENDER
-04F8; C; 04F9; # CYRILLIC CAPITAL LETTER YERU WITH DIAERESIS
-04FA; C; 04FB; # CYRILLIC CAPITAL LETTER GHE WITH STROKE AND HOOK
-04FC; C; 04FD; # CYRILLIC CAPITAL LETTER HA WITH HOOK
-04FE; C; 04FF; # CYRILLIC CAPITAL LETTER HA WITH STROKE
-0500; C; 0501; # CYRILLIC CAPITAL LETTER KOMI DE
-0502; C; 0503; # CYRILLIC CAPITAL LETTER KOMI DJE
-0504; C; 0505; # CYRILLIC CAPITAL LETTER KOMI ZJE
-0506; C; 0507; # CYRILLIC CAPITAL LETTER KOMI DZJE
-0508; C; 0509; # CYRILLIC CAPITAL LETTER KOMI LJE
-050A; C; 050B; # CYRILLIC CAPITAL LETTER KOMI NJE
-050C; C; 050D; # CYRILLIC CAPITAL LETTER KOMI SJE
-050E; C; 050F; # CYRILLIC CAPITAL LETTER KOMI TJE
-0510; C; 0511; # CYRILLIC CAPITAL LETTER REVERSED ZE
-0512; C; 0513; # CYRILLIC CAPITAL LETTER EL WITH HOOK
-0514; C; 0515; # CYRILLIC CAPITAL LETTER LHA
-0516; C; 0517; # CYRILLIC CAPITAL LETTER RHA
-0518; C; 0519; # CYRILLIC CAPITAL LETTER YAE
-051A; C; 051B; # CYRILLIC CAPITAL LETTER QA
-051C; C; 051D; # CYRILLIC CAPITAL LETTER WE
-051E; C; 051F; # CYRILLIC CAPITAL LETTER ALEUT KA
-0520; C; 0521; # CYRILLIC CAPITAL LETTER EL WITH MIDDLE HOOK
-0522; C; 0523; # CYRILLIC CAPITAL LETTER EN WITH MIDDLE HOOK
-0524; C; 0525; # CYRILLIC CAPITAL LETTER PE WITH DESCENDER
-0526; C; 0527; # CYRILLIC CAPITAL LETTER SHHA WITH DESCENDER
-0528; C; 0529; # CYRILLIC CAPITAL LETTER EN WITH LEFT HOOK
-052A; C; 052B; # CYRILLIC CAPITAL LETTER DZZHE
-052C; C; 052D; # CYRILLIC CAPITAL LETTER DCHE
-052E; C; 052F; # CYRILLIC CAPITAL LETTER EL WITH DESCENDER
-0531; C; 0561; # ARMENIAN CAPITAL LETTER AYB
-0532; C; 0562; # ARMENIAN CAPITAL LETTER BEN
-0533; C; 0563; # ARMENIAN CAPITAL LETTER GIM
-0534; C; 0564; # ARMENIAN CAPITAL LETTER DA
-0535; C; 0565; # ARMENIAN CAPITAL LETTER ECH
-0536; C; 0566; # ARMENIAN CAPITAL LETTER ZA
-0537; C; 0567; # ARMENIAN CAPITAL LETTER EH
-0538; C; 0568; # ARMENIAN CAPITAL LETTER ET
-0539; C; 0569; # ARMENIAN CAPITAL LETTER TO
-053A; C; 056A; # ARMENIAN CAPITAL LETTER ZHE
-053B; C; 056B; # ARMENIAN CAPITAL LETTER INI
-053C; C; 056C; # ARMENIAN CAPITAL LETTER LIWN
-053D; C; 056D; # ARMENIAN CAPITAL LETTER XEH
-053E; C; 056E; # ARMENIAN CAPITAL LETTER CA
-053F; C; 056F; # ARMENIAN CAPITAL LETTER KEN
-0540; C; 0570; # ARMENIAN CAPITAL LETTER HO
-0541; C; 0571; # ARMENIAN CAPITAL LETTER JA
-0542; C; 0572; # ARMENIAN CAPITAL LETTER GHAD
-0543; C; 0573; # ARMENIAN CAPITAL LETTER CHEH
-0544; C; 0574; # ARMENIAN CAPITAL LETTER MEN
-0545; C; 0575; # ARMENIAN CAPITAL LETTER YI
-0546; C; 0576; # ARMENIAN CAPITAL LETTER NOW
-0547; C; 0577; # ARMENIAN CAPITAL LETTER SHA
-0548; C; 0578; # ARMENIAN CAPITAL LETTER VO
-0549; C; 0579; # ARMENIAN CAPITAL LETTER CHA
-054A; C; 057A; # ARMENIAN CAPITAL LETTER PEH
-054B; C; 057B; # ARMENIAN CAPITAL LETTER JHEH
-054C; C; 057C; # ARMENIAN CAPITAL LETTER RA
-054D; C; 057D; # ARMENIAN CAPITAL LETTER SEH
-054E; C; 057E; # ARMENIAN CAPITAL LETTER VEW
-054F; C; 057F; # ARMENIAN CAPITAL LETTER TIWN
-0550; C; 0580; # ARMENIAN CAPITAL LETTER REH
-0551; C; 0581; # ARMENIAN CAPITAL LETTER CO
-0552; C; 0582; # ARMENIAN CAPITAL LETTER YIWN
-0553; C; 0583; # ARMENIAN CAPITAL LETTER PIWR
-0554; C; 0584; # ARMENIAN CAPITAL LETTER KEH
-0555; C; 0585; # ARMENIAN CAPITAL LETTER OH
-0556; C; 0586; # ARMENIAN CAPITAL LETTER FEH
-0587; F; 0565 0582; # ARMENIAN SMALL LIGATURE ECH YIWN
-10A0; C; 2D00; # GEORGIAN CAPITAL LETTER AN
-10A1; C; 2D01; # GEORGIAN CAPITAL LETTER BAN
-10A2; C; 2D02; # GEORGIAN CAPITAL LETTER GAN
-10A3; C; 2D03; # GEORGIAN CAPITAL LETTER DON
-10A4; C; 2D04; # GEORGIAN CAPITAL LETTER EN
-10A5; C; 2D05; # GEORGIAN CAPITAL LETTER VIN
-10A6; C; 2D06; # GEORGIAN CAPITAL LETTER ZEN
-10A7; C; 2D07; # GEORGIAN CAPITAL LETTER TAN
-10A8; C; 2D08; # GEORGIAN CAPITAL LETTER IN
-10A9; C; 2D09; # GEORGIAN CAPITAL LETTER KAN
-10AA; C; 2D0A; # GEORGIAN CAPITAL LETTER LAS
-10AB; C; 2D0B; # GEORGIAN CAPITAL LETTER MAN
-10AC; C; 2D0C; # GEORGIAN CAPITAL LETTER NAR
-10AD; C; 2D0D; # GEORGIAN CAPITAL LETTER ON
-10AE; C; 2D0E; # GEORGIAN CAPITAL LETTER PAR
-10AF; C; 2D0F; # GEORGIAN CAPITAL LETTER ZHAR
-10B0; C; 2D10; # GEORGIAN CAPITAL LETTER RAE
-10B1; C; 2D11; # GEORGIAN CAPITAL LETTER SAN
-10B2; C; 2D12; # GEORGIAN CAPITAL LETTER TAR
-10B3; C; 2D13; # GEORGIAN CAPITAL LETTER UN
-10B4; C; 2D14; # GEORGIAN CAPITAL LETTER PHAR
-10B5; C; 2D15; # GEORGIAN CAPITAL LETTER KHAR
-10B6; C; 2D16; # GEORGIAN CAPITAL LETTER GHAN
-10B7; C; 2D17; # GEORGIAN CAPITAL LETTER QAR
-10B8; C; 2D18; # GEORGIAN CAPITAL LETTER SHIN
-10B9; C; 2D19; # GEORGIAN CAPITAL LETTER CHIN
-10BA; C; 2D1A; # GEORGIAN CAPITAL LETTER CAN
-10BB; C; 2D1B; # GEORGIAN CAPITAL LETTER JIL
-10BC; C; 2D1C; # GEORGIAN CAPITAL LETTER CIL
-10BD; C; 2D1D; # GEORGIAN CAPITAL LETTER CHAR
-10BE; C; 2D1E; # GEORGIAN CAPITAL LETTER XAN
-10BF; C; 2D1F; # GEORGIAN CAPITAL LETTER JHAN
-10C0; C; 2D20; # GEORGIAN CAPITAL LETTER HAE
-10C1; C; 2D21; # GEORGIAN CAPITAL LETTER HE
-10C2; C; 2D22; # GEORGIAN CAPITAL LETTER HIE
-10C3; C; 2D23; # GEORGIAN CAPITAL LETTER WE
-10C4; C; 2D24; # GEORGIAN CAPITAL LETTER HAR
-10C5; C; 2D25; # GEORGIAN CAPITAL LETTER HOE
-10C7; C; 2D27; # GEORGIAN CAPITAL LETTER YN
-10CD; C; 2D2D; # GEORGIAN CAPITAL LETTER AEN
-13F8; C; 13F0; # CHEROKEE SMALL LETTER YE
-13F9; C; 13F1; # CHEROKEE SMALL LETTER YI
-13FA; C; 13F2; # CHEROKEE SMALL LETTER YO
-13FB; C; 13F3; # CHEROKEE SMALL LETTER YU
-13FC; C; 13F4; # CHEROKEE SMALL LETTER YV
-13FD; C; 13F5; # CHEROKEE SMALL LETTER MV
-1C80; C; 0432; # CYRILLIC SMALL LETTER ROUNDED VE
-1C81; C; 0434; # CYRILLIC SMALL LETTER LONG-LEGGED DE
-1C82; C; 043E; # CYRILLIC SMALL LETTER NARROW O
-1C83; C; 0441; # CYRILLIC SMALL LETTER WIDE ES
-1C84; C; 0442; # CYRILLIC SMALL LETTER TALL TE
-1C85; C; 0442; # CYRILLIC SMALL LETTER THREE-LEGGED TE
-1C86; C; 044A; # CYRILLIC SMALL LETTER TALL HARD SIGN
-1C87; C; 0463; # CYRILLIC SMALL LETTER TALL YAT
-1C88; C; A64B; # CYRILLIC SMALL LETTER UNBLENDED UK
-1C90; C; 10D0; # GEORGIAN MTAVRULI CAPITAL LETTER AN
-1C91; C; 10D1; # GEORGIAN MTAVRULI CAPITAL LETTER BAN
-1C92; C; 10D2; # GEORGIAN MTAVRULI CAPITAL LETTER GAN
-1C93; C; 10D3; # GEORGIAN MTAVRULI CAPITAL LETTER DON
-1C94; C; 10D4; # GEORGIAN MTAVRULI CAPITAL LETTER EN
-1C95; C; 10D5; # GEORGIAN MTAVRULI CAPITAL LETTER VIN
-1C96; C; 10D6; # GEORGIAN MTAVRULI CAPITAL LETTER ZEN
-1C97; C; 10D7; # GEORGIAN MTAVRULI CAPITAL LETTER TAN
-1C98; C; 10D8; # GEORGIAN MTAVRULI CAPITAL LETTER IN
-1C99; C; 10D9; # GEORGIAN MTAVRULI CAPITAL LETTER KAN
-1C9A; C; 10DA; # GEORGIAN MTAVRULI CAPITAL LETTER LAS
-1C9B; C; 10DB; # GEORGIAN MTAVRULI CAPITAL LETTER MAN
-1C9C; C; 10DC; # GEORGIAN MTAVRULI CAPITAL LETTER NAR
-1C9D; C; 10DD; # GEORGIAN MTAVRULI CAPITAL LETTER ON
-1C9E; C; 10DE; # GEORGIAN MTAVRULI CAPITAL LETTER PAR
-1C9F; C; 10DF; # GEORGIAN MTAVRULI CAPITAL LETTER ZHAR
-1CA0; C; 10E0; # GEORGIAN MTAVRULI CAPITAL LETTER RAE
-1CA1; C; 10E1; # GEORGIAN MTAVRULI CAPITAL LETTER SAN
-1CA2; C; 10E2; # GEORGIAN MTAVRULI CAPITAL LETTER TAR
-1CA3; C; 10E3; # GEORGIAN MTAVRULI CAPITAL LETTER UN
-1CA4; C; 10E4; # GEORGIAN MTAVRULI CAPITAL LETTER PHAR
-1CA5; C; 10E5; # GEORGIAN MTAVRULI CAPITAL LETTER KHAR
-1CA6; C; 10E6; # GEORGIAN MTAVRULI CAPITAL LETTER GHAN
-1CA7; C; 10E7; # GEORGIAN MTAVRULI CAPITAL LETTER QAR
-1CA8; C; 10E8; # GEORGIAN MTAVRULI CAPITAL LETTER SHIN
-1CA9; C; 10E9; # GEORGIAN MTAVRULI CAPITAL LETTER CHIN
-1CAA; C; 10EA; # GEORGIAN MTAVRULI CAPITAL LETTER CAN
-1CAB; C; 10EB; # GEORGIAN MTAVRULI CAPITAL LETTER JIL
-1CAC; C; 10EC; # GEORGIAN MTAVRULI CAPITAL LETTER CIL
-1CAD; C; 10ED; # GEORGIAN MTAVRULI CAPITAL LETTER CHAR
-1CAE; C; 10EE; # GEORGIAN MTAVRULI CAPITAL LETTER XAN
-1CAF; C; 10EF; # GEORGIAN MTAVRULI CAPITAL LETTER JHAN
-1CB0; C; 10F0; # GEORGIAN MTAVRULI CAPITAL LETTER HAE
-1CB1; C; 10F1; # GEORGIAN MTAVRULI CAPITAL LETTER HE
-1CB2; C; 10F2; # GEORGIAN MTAVRULI CAPITAL LETTER HIE
-1CB3; C; 10F3; # GEORGIAN MTAVRULI CAPITAL LETTER WE
-1CB4; C; 10F4; # GEORGIAN MTAVRULI CAPITAL LETTER HAR
-1CB5; C; 10F5; # GEORGIAN MTAVRULI CAPITAL LETTER HOE
-1CB6; C; 10F6; # GEORGIAN MTAVRULI CAPITAL LETTER FI
-1CB7; C; 10F7; # GEORGIAN MTAVRULI CAPITAL LETTER YN
-1CB8; C; 10F8; # GEORGIAN MTAVRULI CAPITAL LETTER ELIFI
-1CB9; C; 10F9; # GEORGIAN MTAVRULI CAPITAL LETTER TURNED GAN
-1CBA; C; 10FA; # GEORGIAN MTAVRULI CAPITAL LETTER AIN
-1CBD; C; 10FD; # GEORGIAN MTAVRULI CAPITAL LETTER AEN
-1CBE; C; 10FE; # GEORGIAN MTAVRULI CAPITAL LETTER HARD SIGN
-1CBF; C; 10FF; # GEORGIAN MTAVRULI CAPITAL LETTER LABIAL SIGN
-1E00; C; 1E01; # LATIN CAPITAL LETTER A WITH RING BELOW
-1E02; C; 1E03; # LATIN CAPITAL LETTER B WITH DOT ABOVE
-1E04; C; 1E05; # LATIN CAPITAL LETTER B WITH DOT BELOW
-1E06; C; 1E07; # LATIN CAPITAL LETTER B WITH LINE BELOW
-1E08; C; 1E09; # LATIN CAPITAL LETTER C WITH CEDILLA AND ACUTE
-1E0A; C; 1E0B; # LATIN CAPITAL LETTER D WITH DOT ABOVE
-1E0C; C; 1E0D; # LATIN CAPITAL LETTER D WITH DOT BELOW
-1E0E; C; 1E0F; # LATIN CAPITAL LETTER D WITH LINE BELOW
-1E10; C; 1E11; # LATIN CAPITAL LETTER D WITH CEDILLA
-1E12; C; 1E13; # LATIN CAPITAL LETTER D WITH CIRCUMFLEX BELOW
-1E14; C; 1E15; # LATIN CAPITAL LETTER E WITH MACRON AND GRAVE
-1E16; C; 1E17; # LATIN CAPITAL LETTER E WITH MACRON AND ACUTE
-1E18; C; 1E19; # LATIN CAPITAL LETTER E WITH CIRCUMFLEX BELOW
-1E1A; C; 1E1B; # LATIN CAPITAL LETTER E WITH TILDE BELOW
-1E1C; C; 1E1D; # LATIN CAPITAL LETTER E WITH CEDILLA AND BREVE
-1E1E; C; 1E1F; # LATIN CAPITAL LETTER F WITH DOT ABOVE
-1E20; C; 1E21; # LATIN CAPITAL LETTER G WITH MACRON
-1E22; C; 1E23; # LATIN CAPITAL LETTER H WITH DOT ABOVE
-1E24; C; 1E25; # LATIN CAPITAL LETTER H WITH DOT BELOW
-1E26; C; 1E27; # LATIN CAPITAL LETTER H WITH DIAERESIS
-1E28; C; 1E29; # LATIN CAPITAL LETTER H WITH CEDILLA
-1E2A; C; 1E2B; # LATIN CAPITAL LETTER H WITH BREVE BELOW
-1E2C; C; 1E2D; # LATIN CAPITAL LETTER I WITH TILDE BELOW
-1E2E; C; 1E2F; # LATIN CAPITAL LETTER I WITH DIAERESIS AND ACUTE
-1E30; C; 1E31; # LATIN CAPITAL LETTER K WITH ACUTE
-1E32; C; 1E33; # LATIN CAPITAL LETTER K WITH DOT BELOW
-1E34; C; 1E35; # LATIN CAPITAL LETTER K WITH LINE BELOW
-1E36; C; 1E37; # LATIN CAPITAL LETTER L WITH DOT BELOW
-1E38; C; 1E39; # LATIN CAPITAL LETTER L WITH DOT BELOW AND MACRON
-1E3A; C; 1E3B; # LATIN CAPITAL LETTER L WITH LINE BELOW
-1E3C; C; 1E3D; # LATIN CAPITAL LETTER L WITH CIRCUMFLEX BELOW
-1E3E; C; 1E3F; # LATIN CAPITAL LETTER M WITH ACUTE
-1E40; C; 1E41; # LATIN CAPITAL LETTER M WITH DOT ABOVE
-1E42; C; 1E43; # LATIN CAPITAL LETTER M WITH DOT BELOW
-1E44; C; 1E45; # LATIN CAPITAL LETTER N WITH DOT ABOVE
-1E46; C; 1E47; # LATIN CAPITAL LETTER N WITH DOT BELOW
-1E48; C; 1E49; # LATIN CAPITAL LETTER N WITH LINE BELOW
-1E4A; C; 1E4B; # LATIN CAPITAL LETTER N WITH CIRCUMFLEX BELOW
-1E4C; C; 1E4D; # LATIN CAPITAL LETTER O WITH TILDE AND ACUTE
-1E4E; C; 1E4F; # LATIN CAPITAL LETTER O WITH TILDE AND DIAERESIS
-1E50; C; 1E51; # LATIN CAPITAL LETTER O WITH MACRON AND GRAVE
-1E52; C; 1E53; # LATIN CAPITAL LETTER O WITH MACRON AND ACUTE
-1E54; C; 1E55; # LATIN CAPITAL LETTER P WITH ACUTE
-1E56; C; 1E57; # LATIN CAPITAL LETTER P WITH DOT ABOVE
-1E58; C; 1E59; # LATIN CAPITAL LETTER R WITH DOT ABOVE
-1E5A; C; 1E5B; # LATIN CAPITAL LETTER R WITH DOT BELOW
-1E5C; C; 1E5D; # LATIN CAPITAL LETTER R WITH DOT BELOW AND MACRON
-1E5E; C; 1E5F; # LATIN CAPITAL LETTER R WITH LINE BELOW
-1E60; C; 1E61; # LATIN CAPITAL LETTER S WITH DOT ABOVE
-1E62; C; 1E63; # LATIN CAPITAL LETTER S WITH DOT BELOW
-1E64; C; 1E65; # LATIN CAPITAL LETTER S WITH ACUTE AND DOT ABOVE
-1E66; C; 1E67; # LATIN CAPITAL LETTER S WITH CARON AND DOT ABOVE
-1E68; C; 1E69; # LATIN CAPITAL LETTER S WITH DOT BELOW AND DOT ABOVE
-1E6A; C; 1E6B; # LATIN CAPITAL LETTER T WITH DOT ABOVE
-1E6C; C; 1E6D; # LATIN CAPITAL LETTER T WITH DOT BELOW
-1E6E; C; 1E6F; # LATIN CAPITAL LETTER T WITH LINE BELOW
-1E70; C; 1E71; # LATIN CAPITAL LETTER T WITH CIRCUMFLEX BELOW
-1E72; C; 1E73; # LATIN CAPITAL LETTER U WITH DIAERESIS BELOW
-1E74; C; 1E75; # LATIN CAPITAL LETTER U WITH TILDE BELOW
-1E76; C; 1E77; # LATIN CAPITAL LETTER U WITH CIRCUMFLEX BELOW
-1E78; C; 1E79; # LATIN CAPITAL LETTER U WITH TILDE AND ACUTE
-1E7A; C; 1E7B; # LATIN CAPITAL LETTER U WITH MACRON AND DIAERESIS
-1E7C; C; 1E7D; # LATIN CAPITAL LETTER V WITH TILDE
-1E7E; C; 1E7F; # LATIN CAPITAL LETTER V WITH DOT BELOW
-1E80; C; 1E81; # LATIN CAPITAL LETTER W WITH GRAVE
-1E82; C; 1E83; # LATIN CAPITAL LETTER W WITH ACUTE
-1E84; C; 1E85; # LATIN CAPITAL LETTER W WITH DIAERESIS
-1E86; C; 1E87; # LATIN CAPITAL LETTER W WITH DOT ABOVE
-1E88; C; 1E89; # LATIN CAPITAL LETTER W WITH DOT BELOW
-1E8A; C; 1E8B; # LATIN CAPITAL LETTER X WITH DOT ABOVE
-1E8C; C; 1E8D; # LATIN CAPITAL LETTER X WITH DIAERESIS
-1E8E; C; 1E8F; # LATIN CAPITAL LETTER Y WITH DOT ABOVE
-1E90; C; 1E91; # LATIN CAPITAL LETTER Z WITH CIRCUMFLEX
-1E92; C; 1E93; # LATIN CAPITAL LETTER Z WITH DOT BELOW
-1E94; C; 1E95; # LATIN CAPITAL LETTER Z WITH LINE BELOW
-1E96; F; 0068 0331; # LATIN SMALL LETTER H WITH LINE BELOW
-1E97; F; 0074 0308; # LATIN SMALL LETTER T WITH DIAERESIS
-1E98; F; 0077 030A; # LATIN SMALL LETTER W WITH RING ABOVE
-1E99; F; 0079 030A; # LATIN SMALL LETTER Y WITH RING ABOVE
-1E9A; F; 0061 02BE; # LATIN SMALL LETTER A WITH RIGHT HALF RING
-1E9B; C; 1E61; # LATIN SMALL LETTER LONG S WITH DOT ABOVE
-1E9E; F; 0073 0073; # LATIN CAPITAL LETTER SHARP S
-1E9E; S; 00DF; # LATIN CAPITAL LETTER SHARP S
-1EA0; C; 1EA1; # LATIN CAPITAL LETTER A WITH DOT BELOW
-1EA2; C; 1EA3; # LATIN CAPITAL LETTER A WITH HOOK ABOVE
-1EA4; C; 1EA5; # LATIN CAPITAL LETTER A WITH CIRCUMFLEX AND ACUTE
-1EA6; C; 1EA7; # LATIN CAPITAL LETTER A WITH CIRCUMFLEX AND GRAVE
-1EA8; C; 1EA9; # LATIN CAPITAL LETTER A WITH CIRCUMFLEX AND HOOK ABOVE
-1EAA; C; 1EAB; # LATIN CAPITAL LETTER A WITH CIRCUMFLEX AND TILDE
-1EAC; C; 1EAD; # LATIN CAPITAL LETTER A WITH CIRCUMFLEX AND DOT BELOW
-1EAE; C; 1EAF; # LATIN CAPITAL LETTER A WITH BREVE AND ACUTE
-1EB0; C; 1EB1; # LATIN CAPITAL LETTER A WITH BREVE AND GRAVE
-1EB2; C; 1EB3; # LATIN CAPITAL LETTER A WITH BREVE AND HOOK ABOVE
-1EB4; C; 1EB5; # LATIN CAPITAL LETTER A WITH BREVE AND TILDE
-1EB6; C; 1EB7; # LATIN CAPITAL LETTER A WITH BREVE AND DOT BELOW
-1EB8; C; 1EB9; # LATIN CAPITAL LETTER E WITH DOT BELOW
-1EBA; C; 1EBB; # LATIN CAPITAL LETTER E WITH HOOK ABOVE
-1EBC; C; 1EBD; # LATIN CAPITAL LETTER E WITH TILDE
-1EBE; C; 1EBF; # LATIN CAPITAL LETTER E WITH CIRCUMFLEX AND ACUTE
-1EC0; C; 1EC1; # LATIN CAPITAL LETTER E WITH CIRCUMFLEX AND GRAVE
-1EC2; C; 1EC3; # LATIN CAPITAL LETTER E WITH CIRCUMFLEX AND HOOK ABOVE
-1EC4; C; 1EC5; # LATIN CAPITAL LETTER E WITH CIRCUMFLEX AND TILDE
-1EC6; C; 1EC7; # LATIN CAPITAL LETTER E WITH CIRCUMFLEX AND DOT BELOW
-1EC8; C; 1EC9; # LATIN CAPITAL LETTER I WITH HOOK ABOVE
-1ECA; C; 1ECB; # LATIN CAPITAL LETTER I WITH DOT BELOW
-1ECC; C; 1ECD; # LATIN CAPITAL LETTER O WITH DOT BELOW
-1ECE; C; 1ECF; # LATIN CAPITAL LETTER O WITH HOOK ABOVE
-1ED0; C; 1ED1; # LATIN CAPITAL LETTER O WITH CIRCUMFLEX AND ACUTE
-1ED2; C; 1ED3; # LATIN CAPITAL LETTER O WITH CIRCUMFLEX AND GRAVE
-1ED4; C; 1ED5; # LATIN CAPITAL LETTER O WITH CIRCUMFLEX AND HOOK ABOVE
-1ED6; C; 1ED7; # LATIN CAPITAL LETTER O WITH CIRCUMFLEX AND TILDE
-1ED8; C; 1ED9; # LATIN CAPITAL LETTER O WITH CIRCUMFLEX AND DOT BELOW
-1EDA; C; 1EDB; # LATIN CAPITAL LETTER O WITH HORN AND ACUTE
-1EDC; C; 1EDD; # LATIN CAPITAL LETTER O WITH HORN AND GRAVE
-1EDE; C; 1EDF; # LATIN CAPITAL LETTER O WITH HORN AND HOOK ABOVE
-1EE0; C; 1EE1; # LATIN CAPITAL LETTER O WITH HORN AND TILDE
-1EE2; C; 1EE3; # LATIN CAPITAL LETTER O WITH HORN AND DOT BELOW
-1EE4; C; 1EE5; # LATIN CAPITAL LETTER U WITH DOT BELOW
-1EE6; C; 1EE7; # LATIN CAPITAL LETTER U WITH HOOK ABOVE
-1EE8; C; 1EE9; # LATIN CAPITAL LETTER U WITH HORN AND ACUTE
-1EEA; C; 1EEB; # LATIN CAPITAL LETTER U WITH HORN AND GRAVE
-1EEC; C; 1EED; # LATIN CAPITAL LETTER U WITH HORN AND HOOK ABOVE
-1EEE; C; 1EEF; # LATIN CAPITAL LETTER U WITH HORN AND TILDE
-1EF0; C; 1EF1; # LATIN CAPITAL LETTER U WITH HORN AND DOT BELOW
-1EF2; C; 1EF3; # LATIN CAPITAL LETTER Y WITH GRAVE
-1EF4; C; 1EF5; # LATIN CAPITAL LETTER Y WITH DOT BELOW
-1EF6; C; 1EF7; # LATIN CAPITAL LETTER Y WITH HOOK ABOVE
-1EF8; C; 1EF9; # LATIN CAPITAL LETTER Y WITH TILDE
-1EFA; C; 1EFB; # LATIN CAPITAL LETTER MIDDLE-WELSH LL
-1EFC; C; 1EFD; # LATIN CAPITAL LETTER MIDDLE-WELSH V
-1EFE; C; 1EFF; # LATIN CAPITAL LETTER Y WITH LOOP
-1F08; C; 1F00; # GREEK CAPITAL LETTER ALPHA WITH PSILI
-1F09; C; 1F01; # GREEK CAPITAL LETTER ALPHA WITH DASIA
-1F0A; C; 1F02; # GREEK CAPITAL LETTER ALPHA WITH PSILI AND VARIA
-1F0B; C; 1F03; # GREEK CAPITAL LETTER ALPHA WITH DASIA AND VARIA
-1F0C; C; 1F04; # GREEK CAPITAL LETTER ALPHA WITH PSILI AND OXIA
-1F0D; C; 1F05; # GREEK CAPITAL LETTER ALPHA WITH DASIA AND OXIA
-1F0E; C; 1F06; # GREEK CAPITAL LETTER ALPHA WITH PSILI AND PERISPOMENI
-1F0F; C; 1F07; # GREEK CAPITAL LETTER ALPHA WITH DASIA AND PERISPOMENI
-1F18; C; 1F10; # GREEK CAPITAL LETTER EPSILON WITH PSILI
-1F19; C; 1F11; # GREEK CAPITAL LETTER EPSILON WITH DASIA
-1F1A; C; 1F12; # GREEK CAPITAL LETTER EPSILON WITH PSILI AND VARIA
-1F1B; C; 1F13; # GREEK CAPITAL LETTER EPSILON WITH DASIA AND VARIA
-1F1C; C; 1F14; # GREEK CAPITAL LETTER EPSILON WITH PSILI AND OXIA
-1F1D; C; 1F15; # GREEK CAPITAL LETTER EPSILON WITH DASIA AND OXIA
-1F28; C; 1F20; # GREEK CAPITAL LETTER ETA WITH PSILI
-1F29; C; 1F21; # GREEK CAPITAL LETTER ETA WITH DASIA
-1F2A; C; 1F22; # GREEK CAPITAL LETTER ETA WITH PSILI AND VARIA
-1F2B; C; 1F23; # GREEK CAPITAL LETTER ETA WITH DASIA AND VARIA
-1F2C; C; 1F24; # GREEK CAPITAL LETTER ETA WITH PSILI AND OXIA
-1F2D; C; 1F25; # GREEK CAPITAL LETTER ETA WITH DASIA AND OXIA
-1F2E; C; 1F26; # GREEK CAPITAL LETTER ETA WITH PSILI AND PERISPOMENI
-1F2F; C; 1F27; # GREEK CAPITAL LETTER ETA WITH DASIA AND PERISPOMENI
-1F38; C; 1F30; # GREEK CAPITAL LETTER IOTA WITH PSILI
-1F39; C; 1F31; # GREEK CAPITAL LETTER IOTA WITH DASIA
-1F3A; C; 1F32; # GREEK CAPITAL LETTER IOTA WITH PSILI AND VARIA
-1F3B; C; 1F33; # GREEK CAPITAL LETTER IOTA WITH DASIA AND VARIA
-1F3C; C; 1F34; # GREEK CAPITAL LETTER IOTA WITH PSILI AND OXIA
-1F3D; C; 1F35; # GREEK CAPITAL LETTER IOTA WITH DASIA AND OXIA
-1F3E; C; 1F36; # GREEK CAPITAL LETTER IOTA WITH PSILI AND PERISPOMENI
-1F3F; C; 1F37; # GREEK CAPITAL LETTER IOTA WITH DASIA AND PERISPOMENI
-1F48; C; 1F40; # GREEK CAPITAL LETTER OMICRON WITH PSILI
-1F49; C; 1F41; # GREEK CAPITAL LETTER OMICRON WITH DASIA
-1F4A; C; 1F42; # GREEK CAPITAL LETTER OMICRON WITH PSILI AND VARIA
-1F4B; C; 1F43; # GREEK CAPITAL LETTER OMICRON WITH DASIA AND VARIA
-1F4C; C; 1F44; # GREEK CAPITAL LETTER OMICRON WITH PSILI AND OXIA
-1F4D; C; 1F45; # GREEK CAPITAL LETTER OMICRON WITH DASIA AND OXIA
-1F50; F; 03C5 0313; # GREEK SMALL LETTER UPSILON WITH PSILI
-1F52; F; 03C5 0313 0300; # GREEK SMALL LETTER UPSILON WITH PSILI AND VARIA
-1F54; F; 03C5 0313 0301; # GREEK SMALL LETTER UPSILON WITH PSILI AND OXIA
-1F56; F; 03C5 0313 0342; # GREEK SMALL LETTER UPSILON WITH PSILI AND PERISPOMENI
-1F59; C; 1F51; # GREEK CAPITAL LETTER UPSILON WITH DASIA
-1F5B; C; 1F53; # GREEK CAPITAL LETTER UPSILON WITH DASIA AND VARIA
-1F5D; C; 1F55; # GREEK CAPITAL LETTER UPSILON WITH DASIA AND OXIA
-1F5F; C; 1F57; # GREEK CAPITAL LETTER UPSILON WITH DASIA AND PERISPOMENI
-1F68; C; 1F60; # GREEK CAPITAL LETTER OMEGA WITH PSILI
-1F69; C; 1F61; # GREEK CAPITAL LETTER OMEGA WITH DASIA
-1F6A; C; 1F62; # GREEK CAPITAL LETTER OMEGA WITH PSILI AND VARIA
-1F6B; C; 1F63; # GREEK CAPITAL LETTER OMEGA WITH DASIA AND VARIA
-1F6C; C; 1F64; # GREEK CAPITAL LETTER OMEGA WITH PSILI AND OXIA
-1F6D; C; 1F65; # GREEK CAPITAL LETTER OMEGA WITH DASIA AND OXIA
-1F6E; C; 1F66; # GREEK CAPITAL LETTER OMEGA WITH PSILI AND PERISPOMENI
-1F6F; C; 1F67; # GREEK CAPITAL LETTER OMEGA WITH DASIA AND PERISPOMENI
-1F80; F; 1F00 03B9; # GREEK SMALL LETTER ALPHA WITH PSILI AND YPOGEGRAMMENI
-1F81; F; 1F01 03B9; # GREEK SMALL LETTER ALPHA WITH DASIA AND YPOGEGRAMMENI
-1F82; F; 1F02 03B9; # GREEK SMALL LETTER ALPHA WITH PSILI AND VARIA AND YPOGEGRAMMENI
-1F83; F; 1F03 03B9; # GREEK SMALL LETTER ALPHA WITH DASIA AND VARIA AND YPOGEGRAMMENI
-1F84; F; 1F04 03B9; # GREEK SMALL LETTER ALPHA WITH PSILI AND OXIA AND YPOGEGRAMMENI
-1F85; F; 1F05 03B9; # GREEK SMALL LETTER ALPHA WITH DASIA AND OXIA AND YPOGEGRAMMENI
-1F86; F; 1F06 03B9; # GREEK SMALL LETTER ALPHA WITH PSILI AND PERISPOMENI AND YPOGEGRAMMENI
-1F87; F; 1F07 03B9; # GREEK SMALL LETTER ALPHA WITH DASIA AND PERISPOMENI AND YPOGEGRAMMENI
-1F88; F; 1F00 03B9; # GREEK CAPITAL LETTER ALPHA WITH PSILI AND PROSGEGRAMMENI
-1F88; S; 1F80; # GREEK CAPITAL LETTER ALPHA WITH PSILI AND PROSGEGRAMMENI
-1F89; F; 1F01 03B9; # GREEK CAPITAL LETTER ALPHA WITH DASIA AND PROSGEGRAMMENI
-1F89; S; 1F81; # GREEK CAPITAL LETTER ALPHA WITH DASIA AND PROSGEGRAMMENI
-1F8A; F; 1F02 03B9; # GREEK CAPITAL LETTER ALPHA WITH PSILI AND VARIA AND PROSGEGRAMMENI
-1F8A; S; 1F82; # GREEK CAPITAL LETTER ALPHA WITH PSILI AND VARIA AND PROSGEGRAMMENI
-1F8B; F; 1F03 03B9; # GREEK CAPITAL LETTER ALPHA WITH DASIA AND VARIA AND PROSGEGRAMMENI
-1F8B; S; 1F83; # GREEK CAPITAL LETTER ALPHA WITH DASIA AND VARIA AND PROSGEGRAMMENI
-1F8C; F; 1F04 03B9; # GREEK CAPITAL LETTER ALPHA WITH PSILI AND OXIA AND PROSGEGRAMMENI
-1F8C; S; 1F84; # GREEK CAPITAL LETTER ALPHA WITH PSILI AND OXIA AND PROSGEGRAMMENI
-1F8D; F; 1F05 03B9; # GREEK CAPITAL LETTER ALPHA WITH DASIA AND OXIA AND PROSGEGRAMMENI
-1F8D; S; 1F85; # GREEK CAPITAL LETTER ALPHA WITH DASIA AND OXIA AND PROSGEGRAMMENI
-1F8E; F; 1F06 03B9; # GREEK CAPITAL LETTER ALPHA WITH PSILI AND PERISPOMENI AND PROSGEGRAMMENI
-1F8E; S; 1F86; # GREEK CAPITAL LETTER ALPHA WITH PSILI AND PERISPOMENI AND PROSGEGRAMMENI
-1F8F; F; 1F07 03B9; # GREEK CAPITAL LETTER ALPHA WITH DASIA AND PERISPOMENI AND PROSGEGRAMMENI
-1F8F; S; 1F87; # GREEK CAPITAL LETTER ALPHA WITH DASIA AND PERISPOMENI AND PROSGEGRAMMENI
-1F90; F; 1F20 03B9; # GREEK SMALL LETTER ETA WITH PSILI AND YPOGEGRAMMENI
-1F91; F; 1F21 03B9; # GREEK SMALL LETTER ETA WITH DASIA AND YPOGEGRAMMENI
-1F92; F; 1F22 03B9; # GREEK SMALL LETTER ETA WITH PSILI AND VARIA AND YPOGEGRAMMENI
-1F93; F; 1F23 03B9; # GREEK SMALL LETTER ETA WITH DASIA AND VARIA AND YPOGEGRAMMENI
-1F94; F; 1F24 03B9; # GREEK SMALL LETTER ETA WITH PSILI AND OXIA AND YPOGEGRAMMENI
-1F95; F; 1F25 03B9; # GREEK SMALL LETTER ETA WITH DASIA AND OXIA AND YPOGEGRAMMENI
-1F96; F; 1F26 03B9; # GREEK SMALL LETTER ETA WITH PSILI AND PERISPOMENI AND YPOGEGRAMMENI
-1F97; F; 1F27 03B9; # GREEK SMALL LETTER ETA WITH DASIA AND PERISPOMENI AND YPOGEGRAMMENI
-1F98; F; 1F20 03B9; # GREEK CAPITAL LETTER ETA WITH PSILI AND PROSGEGRAMMENI
-1F98; S; 1F90; # GREEK CAPITAL LETTER ETA WITH PSILI AND PROSGEGRAMMENI
-1F99; F; 1F21 03B9; # GREEK CAPITAL LETTER ETA WITH DASIA AND PROSGEGRAMMENI
-1F99; S; 1F91; # GREEK CAPITAL LETTER ETA WITH DASIA AND PROSGEGRAMMENI
-1F9A; F; 1F22 03B9; # GREEK CAPITAL LETTER ETA WITH PSILI AND VARIA AND PROSGEGRAMMENI
-1F9A; S; 1F92; # GREEK CAPITAL LETTER ETA WITH PSILI AND VARIA AND PROSGEGRAMMENI
-1F9B; F; 1F23 03B9; # GREEK CAPITAL LETTER ETA WITH DASIA AND VARIA AND PROSGEGRAMMENI
-1F9B; S; 1F93; # GREEK CAPITAL LETTER ETA WITH DASIA AND VARIA AND PROSGEGRAMMENI
-1F9C; F; 1F24 03B9; # GREEK CAPITAL LETTER ETA WITH PSILI AND OXIA AND PROSGEGRAMMENI
-1F9C; S; 1F94; # GREEK CAPITAL LETTER ETA WITH PSILI AND OXIA AND PROSGEGRAMMENI
-1F9D; F; 1F25 03B9; # GREEK CAPITAL LETTER ETA WITH DASIA AND OXIA AND PROSGEGRAMMENI
-1F9D; S; 1F95; # GREEK CAPITAL LETTER ETA WITH DASIA AND OXIA AND PROSGEGRAMMENI
-1F9E; F; 1F26 03B9; # GREEK CAPITAL LETTER ETA WITH PSILI AND PERISPOMENI AND PROSGEGRAMMENI
-1F9E; S; 1F96; # GREEK CAPITAL LETTER ETA WITH PSILI AND PERISPOMENI AND PROSGEGRAMMENI
-1F9F; F; 1F27 03B9; # GREEK CAPITAL LETTER ETA WITH DASIA AND PERISPOMENI AND PROSGEGRAMMENI
-1F9F; S; 1F97; # GREEK CAPITAL LETTER ETA WITH DASIA AND PERISPOMENI AND PROSGEGRAMMENI
-1FA0; F; 1F60 03B9; # GREEK SMALL LETTER OMEGA WITH PSILI AND YPOGEGRAMMENI
-1FA1; F; 1F61 03B9; # GREEK SMALL LETTER OMEGA WITH DASIA AND YPOGEGRAMMENI
-1FA2; F; 1F62 03B9; # GREEK SMALL LETTER OMEGA WITH PSILI AND VARIA AND YPOGEGRAMMENI
-1FA3; F; 1F63 03B9; # GREEK SMALL LETTER OMEGA WITH DASIA AND VARIA AND YPOGEGRAMMENI
-1FA4; F; 1F64 03B9; # GREEK SMALL LETTER OMEGA WITH PSILI AND OXIA AND YPOGEGRAMMENI
-1FA5; F; 1F65 03B9; # GREEK SMALL LETTER OMEGA WITH DASIA AND OXIA AND YPOGEGRAMMENI
-1FA6; F; 1F66 03B9; # GREEK SMALL LETTER OMEGA WITH PSILI AND PERISPOMENI AND YPOGEGRAMMENI
-1FA7; F; 1F67 03B9; # GREEK SMALL LETTER OMEGA WITH DASIA AND PERISPOMENI AND YPOGEGRAMMENI
-1FA8; F; 1F60 03B9; # GREEK CAPITAL LETTER OMEGA WITH PSILI AND PROSGEGRAMMENI
-1FA8; S; 1FA0; # GREEK CAPITAL LETTER OMEGA WITH PSILI AND PROSGEGRAMMENI
-1FA9; F; 1F61 03B9; # GREEK CAPITAL LETTER OMEGA WITH DASIA AND PROSGEGRAMMENI
-1FA9; S; 1FA1; # GREEK CAPITAL LETTER OMEGA WITH DASIA AND PROSGEGRAMMENI
-1FAA; F; 1F62 03B9; # GREEK CAPITAL LETTER OMEGA WITH PSILI AND VARIA AND PROSGEGRAMMENI
-1FAA; S; 1FA2; # GREEK CAPITAL LETTER OMEGA WITH PSILI AND VARIA AND PROSGEGRAMMENI
-1FAB; F; 1F63 03B9; # GREEK CAPITAL LETTER OMEGA WITH DASIA AND VARIA AND PROSGEGRAMMENI
-1FAB; S; 1FA3; # GREEK CAPITAL LETTER OMEGA WITH DASIA AND VARIA AND PROSGEGRAMMENI
-1FAC; F; 1F64 03B9; # GREEK CAPITAL LETTER OMEGA WITH PSILI AND OXIA AND PROSGEGRAMMENI
-1FAC; S; 1FA4; # GREEK CAPITAL LETTER OMEGA WITH PSILI AND OXIA AND PROSGEGRAMMENI
-1FAD; F; 1F65 03B9; # GREEK CAPITAL LETTER OMEGA WITH DASIA AND OXIA AND PROSGEGRAMMENI
-1FAD; S; 1FA5; # GREEK CAPITAL LETTER OMEGA WITH DASIA AND OXIA AND PROSGEGRAMMENI
-1FAE; F; 1F66 03B9; # GREEK CAPITAL LETTER OMEGA WITH PSILI AND PERISPOMENI AND PROSGEGRAMMENI
-1FAE; S; 1FA6; # GREEK CAPITAL LETTER OMEGA WITH PSILI AND PERISPOMENI AND PROSGEGRAMMENI
-1FAF; F; 1F67 03B9; # GREEK CAPITAL LETTER OMEGA WITH DASIA AND PERISPOMENI AND PROSGEGRAMMENI
-1FAF; S; 1FA7; # GREEK CAPITAL LETTER OMEGA WITH DASIA AND PERISPOMENI AND PROSGEGRAMMENI
-1FB2; F; 1F70 03B9; # GREEK SMALL LETTER ALPHA WITH VARIA AND YPOGEGRAMMENI
-1FB3; F; 03B1 03B9; # GREEK SMALL LETTER ALPHA WITH YPOGEGRAMMENI
-1FB4; F; 03AC 03B9; # GREEK SMALL LETTER ALPHA WITH OXIA AND YPOGEGRAMMENI
-1FB6; F; 03B1 0342; # GREEK SMALL LETTER ALPHA WITH PERISPOMENI
-1FB7; F; 03B1 0342 03B9; # GREEK SMALL LETTER ALPHA WITH PERISPOMENI AND YPOGEGRAMMENI
-1FB8; C; 1FB0; # GREEK CAPITAL LETTER ALPHA WITH VRACHY
-1FB9; C; 1FB1; # GREEK CAPITAL LETTER ALPHA WITH MACRON
-1FBA; C; 1F70; # GREEK CAPITAL LETTER ALPHA WITH VARIA
-1FBB; C; 1F71; # GREEK CAPITAL LETTER ALPHA WITH OXIA
-1FBC; F; 03B1 03B9; # GREEK CAPITAL LETTER ALPHA WITH PROSGEGRAMMENI
-1FBC; S; 1FB3; # GREEK CAPITAL LETTER ALPHA WITH PROSGEGRAMMENI
-1FBE; C; 03B9; # GREEK PROSGEGRAMMENI
-1FC2; F; 1F74 03B9; # GREEK SMALL LETTER ETA WITH VARIA AND YPOGEGRAMMENI
-1FC3; F; 03B7 03B9; # GREEK SMALL LETTER ETA WITH YPOGEGRAMMENI
-1FC4; F; 03AE 03B9; # GREEK SMALL LETTER ETA WITH OXIA AND YPOGEGRAMMENI
-1FC6; F; 03B7 0342; # GREEK SMALL LETTER ETA WITH PERISPOMENI
-1FC7; F; 03B7 0342 03B9; # GREEK SMALL LETTER ETA WITH PERISPOMENI AND YPOGEGRAMMENI
-1FC8; C; 1F72; # GREEK CAPITAL LETTER EPSILON WITH VARIA
-1FC9; C; 1F73; # GREEK CAPITAL LETTER EPSILON WITH OXIA
-1FCA; C; 1F74; # GREEK CAPITAL LETTER ETA WITH VARIA
-1FCB; C; 1F75; # GREEK CAPITAL LETTER ETA WITH OXIA
-1FCC; F; 03B7 03B9; # GREEK CAPITAL LETTER ETA WITH PROSGEGRAMMENI
-1FCC; S; 1FC3; # GREEK CAPITAL LETTER ETA WITH PROSGEGRAMMENI
-1FD2; F; 03B9 0308 0300; # GREEK SMALL LETTER IOTA WITH DIALYTIKA AND VARIA
-1FD3; F; 03B9 0308 0301; # GREEK SMALL LETTER IOTA WITH DIALYTIKA AND OXIA
-1FD6; F; 03B9 0342; # GREEK SMALL LETTER IOTA WITH PERISPOMENI
-1FD7; F; 03B9 0308 0342; # GREEK SMALL LETTER IOTA WITH DIALYTIKA AND PERISPOMENI
-1FD8; C; 1FD0; # GREEK CAPITAL LETTER IOTA WITH VRACHY
-1FD9; C; 1FD1; # GREEK CAPITAL LETTER IOTA WITH MACRON
-1FDA; C; 1F76; # GREEK CAPITAL LETTER IOTA WITH VARIA
-1FDB; C; 1F77; # GREEK CAPITAL LETTER IOTA WITH OXIA
-1FE2; F; 03C5 0308 0300; # GREEK SMALL LETTER UPSILON WITH DIALYTIKA AND VARIA
-1FE3; F; 03C5 0308 0301; # GREEK SMALL LETTER UPSILON WITH DIALYTIKA AND OXIA
-1FE4; F; 03C1 0313; # GREEK SMALL LETTER RHO WITH PSILI
-1FE6; F; 03C5 0342; # GREEK SMALL LETTER UPSILON WITH PERISPOMENI
-1FE7; F; 03C5 0308 0342; # GREEK SMALL LETTER UPSILON WITH DIALYTIKA AND PERISPOMENI
-1FE8; C; 1FE0; # GREEK CAPITAL LETTER UPSILON WITH VRACHY
-1FE9; C; 1FE1; # GREEK CAPITAL LETTER UPSILON WITH MACRON
-1FEA; C; 1F7A; # GREEK CAPITAL LETTER UPSILON WITH VARIA
-1FEB; C; 1F7B; # GREEK CAPITAL LETTER UPSILON WITH OXIA
-1FEC; C; 1FE5; # GREEK CAPITAL LETTER RHO WITH DASIA
-1FF2; F; 1F7C 03B9; # GREEK SMALL LETTER OMEGA WITH VARIA AND YPOGEGRAMMENI
-1FF3; F; 03C9 03B9; # GREEK SMALL LETTER OMEGA WITH YPOGEGRAMMENI
-1FF4; F; 03CE 03B9; # GREEK SMALL LETTER OMEGA WITH OXIA AND YPOGEGRAMMENI
-1FF6; F; 03C9 0342; # GREEK SMALL LETTER OMEGA WITH PERISPOMENI
-1FF7; F; 03C9 0342 03B9; # GREEK SMALL LETTER OMEGA WITH PERISPOMENI AND YPOGEGRAMMENI
-1FF8; C; 1F78; # GREEK CAPITAL LETTER OMICRON WITH VARIA
-1FF9; C; 1F79; # GREEK CAPITAL LETTER OMICRON WITH OXIA
-1FFA; C; 1F7C; # GREEK CAPITAL LETTER OMEGA WITH VARIA
-1FFB; C; 1F7D; # GREEK CAPITAL LETTER OMEGA WITH OXIA
-1FFC; F; 03C9 03B9; # GREEK CAPITAL LETTER OMEGA WITH PROSGEGRAMMENI
-1FFC; S; 1FF3; # GREEK CAPITAL LETTER OMEGA WITH PROSGEGRAMMENI
-2126; C; 03C9; # OHM SIGN
-212A; C; 006B; # KELVIN SIGN
-212B; C; 00E5; # ANGSTROM SIGN
-2132; C; 214E; # TURNED CAPITAL F
-2160; C; 2170; # ROMAN NUMERAL ONE
-2161; C; 2171; # ROMAN NUMERAL TWO
-2162; C; 2172; # ROMAN NUMERAL THREE
-2163; C; 2173; # ROMAN NUMERAL FOUR
-2164; C; 2174; # ROMAN NUMERAL FIVE
-2165; C; 2175; # ROMAN NUMERAL SIX
-2166; C; 2176; # ROMAN NUMERAL SEVEN
-2167; C; 2177; # ROMAN NUMERAL EIGHT
-2168; C; 2178; # ROMAN NUMERAL NINE
-2169; C; 2179; # ROMAN NUMERAL TEN
-216A; C; 217A; # ROMAN NUMERAL ELEVEN
-216B; C; 217B; # ROMAN NUMERAL TWELVE
-216C; C; 217C; # ROMAN NUMERAL FIFTY
-216D; C; 217D; # ROMAN NUMERAL ONE HUNDRED
-216E; C; 217E; # ROMAN NUMERAL FIVE HUNDRED
-216F; C; 217F; # ROMAN NUMERAL ONE THOUSAND
-2183; C; 2184; # ROMAN NUMERAL REVERSED ONE HUNDRED
-24B6; C; 24D0; # CIRCLED LATIN CAPITAL LETTER A
-24B7; C; 24D1; # CIRCLED LATIN CAPITAL LETTER B
-24B8; C; 24D2; # CIRCLED LATIN CAPITAL LETTER C
-24B9; C; 24D3; # CIRCLED LATIN CAPITAL LETTER D
-24BA; C; 24D4; # CIRCLED LATIN CAPITAL LETTER E
-24BB; C; 24D5; # CIRCLED LATIN CAPITAL LETTER F
-24BC; C; 24D6; # CIRCLED LATIN CAPITAL LETTER G
-24BD; C; 24D7; # CIRCLED LATIN CAPITAL LETTER H
-24BE; C; 24D8; # CIRCLED LATIN CAPITAL LETTER I
-24BF; C; 24D9; # CIRCLED LATIN CAPITAL LETTER J
-24C0; C; 24DA; # CIRCLED LATIN CAPITAL LETTER K
-24C1; C; 24DB; # CIRCLED LATIN CAPITAL LETTER L
-24C2; C; 24DC; # CIRCLED LATIN CAPITAL LETTER M
-24C3; C; 24DD; # CIRCLED LATIN CAPITAL LETTER N
-24C4; C; 24DE; # CIRCLED LATIN CAPITAL LETTER O
-24C5; C; 24DF; # CIRCLED LATIN CAPITAL LETTER P
-24C6; C; 24E0; # CIRCLED LATIN CAPITAL LETTER Q
-24C7; C; 24E1; # CIRCLED LATIN CAPITAL LETTER R
-24C8; C; 24E2; # CIRCLED LATIN CAPITAL LETTER S
-24C9; C; 24E3; # CIRCLED LATIN CAPITAL LETTER T
-24CA; C; 24E4; # CIRCLED LATIN CAPITAL LETTER U
-24CB; C; 24E5; # CIRCLED LATIN CAPITAL LETTER V
-24CC; C; 24E6; # CIRCLED LATIN CAPITAL LETTER W
-24CD; C; 24E7; # CIRCLED LATIN CAPITAL LETTER X
-24CE; C; 24E8; # CIRCLED LATIN CAPITAL LETTER Y
-24CF; C; 24E9; # CIRCLED LATIN CAPITAL LETTER Z
-2C00; C; 2C30; # GLAGOLITIC CAPITAL LETTER AZU
-2C01; C; 2C31; # GLAGOLITIC CAPITAL LETTER BUKY
-2C02; C; 2C32; # GLAGOLITIC CAPITAL LETTER VEDE
-2C03; C; 2C33; # GLAGOLITIC CAPITAL LETTER GLAGOLI
-2C04; C; 2C34; # GLAGOLITIC CAPITAL LETTER DOBRO
-2C05; C; 2C35; # GLAGOLITIC CAPITAL LETTER YESTU
-2C06; C; 2C36; # GLAGOLITIC CAPITAL LETTER ZHIVETE
-2C07; C; 2C37; # GLAGOLITIC CAPITAL LETTER DZELO
-2C08; C; 2C38; # GLAGOLITIC CAPITAL LETTER ZEMLJA
-2C09; C; 2C39; # GLAGOLITIC CAPITAL LETTER IZHE
-2C0A; C; 2C3A; # GLAGOLITIC CAPITAL LETTER INITIAL IZHE
-2C0B; C; 2C3B; # GLAGOLITIC CAPITAL LETTER I
-2C0C; C; 2C3C; # GLAGOLITIC CAPITAL LETTER DJERVI
-2C0D; C; 2C3D; # GLAGOLITIC CAPITAL LETTER KAKO
-2C0E; C; 2C3E; # GLAGOLITIC CAPITAL LETTER LJUDIJE
-2C0F; C; 2C3F; # GLAGOLITIC CAPITAL LETTER MYSLITE
-2C10; C; 2C40; # GLAGOLITIC CAPITAL LETTER NASHI
-2C11; C; 2C41; # GLAGOLITIC CAPITAL LETTER ONU
-2C12; C; 2C42; # GLAGOLITIC CAPITAL LETTER POKOJI
-2C13; C; 2C43; # GLAGOLITIC CAPITAL LETTER RITSI
-2C14; C; 2C44; # GLAGOLITIC CAPITAL LETTER SLOVO
-2C15; C; 2C45; # GLAGOLITIC CAPITAL LETTER TVRIDO
-2C16; C; 2C46; # GLAGOLITIC CAPITAL LETTER UKU
-2C17; C; 2C47; # GLAGOLITIC CAPITAL LETTER FRITU
-2C18; C; 2C48; # GLAGOLITIC CAPITAL LETTER HERU
-2C19; C; 2C49; # GLAGOLITIC CAPITAL LETTER OTU
-2C1A; C; 2C4A; # GLAGOLITIC CAPITAL LETTER PE
-2C1B; C; 2C4B; # GLAGOLITIC CAPITAL LETTER SHTA
-2C1C; C; 2C4C; # GLAGOLITIC CAPITAL LETTER TSI
-2C1D; C; 2C4D; # GLAGOLITIC CAPITAL LETTER CHRIVI
-2C1E; C; 2C4E; # GLAGOLITIC CAPITAL LETTER SHA
-2C1F; C; 2C4F; # GLAGOLITIC CAPITAL LETTER YERU
-2C20; C; 2C50; # GLAGOLITIC CAPITAL LETTER YERI
-2C21; C; 2C51; # GLAGOLITIC CAPITAL LETTER YATI
-2C22; C; 2C52; # GLAGOLITIC CAPITAL LETTER SPIDERY HA
-2C23; C; 2C53; # GLAGOLITIC CAPITAL LETTER YU
-2C24; C; 2C54; # GLAGOLITIC CAPITAL LETTER SMALL YUS
-2C25; C; 2C55; # GLAGOLITIC CAPITAL LETTER SMALL YUS WITH TAIL
-2C26; C; 2C56; # GLAGOLITIC CAPITAL LETTER YO
-2C27; C; 2C57; # GLAGOLITIC CAPITAL LETTER IOTATED SMALL YUS
-2C28; C; 2C58; # GLAGOLITIC CAPITAL LETTER BIG YUS
-2C29; C; 2C59; # GLAGOLITIC CAPITAL LETTER IOTATED BIG YUS
-2C2A; C; 2C5A; # GLAGOLITIC CAPITAL LETTER FITA
-2C2B; C; 2C5B; # GLAGOLITIC CAPITAL LETTER IZHITSA
-2C2C; C; 2C5C; # GLAGOLITIC CAPITAL LETTER SHTAPIC
-2C2D; C; 2C5D; # GLAGOLITIC CAPITAL LETTER TROKUTASTI A
-2C2E; C; 2C5E; # GLAGOLITIC CAPITAL LETTER LATINATE MYSLITE
-2C2F; C; 2C5F; # GLAGOLITIC CAPITAL LETTER CAUDATE CHRIVI
-2C60; C; 2C61; # LATIN CAPITAL LETTER L WITH DOUBLE BAR
-2C62; C; 026B; # LATIN CAPITAL LETTER L WITH MIDDLE TILDE
-2C63; C; 1D7D; # LATIN CAPITAL LETTER P WITH STROKE
-2C64; C; 027D; # LATIN CAPITAL LETTER R WITH TAIL
-2C67; C; 2C68; # LATIN CAPITAL LETTER H WITH DESCENDER
-2C69; C; 2C6A; # LATIN CAPITAL LETTER K WITH DESCENDER
-2C6B; C; 2C6C; # LATIN CAPITAL LETTER Z WITH DESCENDER
-2C6D; C; 0251; # LATIN CAPITAL LETTER ALPHA
-2C6E; C; 0271; # LATIN CAPITAL LETTER M WITH HOOK
-2C6F; C; 0250; # LATIN CAPITAL LETTER TURNED A
-2C70; C; 0252; # LATIN CAPITAL LETTER TURNED ALPHA
-2C72; C; 2C73; # LATIN CAPITAL LETTER W WITH HOOK
-2C75; C; 2C76; # LATIN CAPITAL LETTER HALF H
-2C7E; C; 023F; # LATIN CAPITAL LETTER S WITH SWASH TAIL
-2C7F; C; 0240; # LATIN CAPITAL LETTER Z WITH SWASH TAIL
-2C80; C; 2C81; # COPTIC CAPITAL LETTER ALFA
-2C82; C; 2C83; # COPTIC CAPITAL LETTER VIDA
-2C84; C; 2C85; # COPTIC CAPITAL LETTER GAMMA
-2C86; C; 2C87; # COPTIC CAPITAL LETTER DALDA
-2C88; C; 2C89; # COPTIC CAPITAL LETTER EIE
-2C8A; C; 2C8B; # COPTIC CAPITAL LETTER SOU
-2C8C; C; 2C8D; # COPTIC CAPITAL LETTER ZATA
-2C8E; C; 2C8F; # COPTIC CAPITAL LETTER HATE
-2C90; C; 2C91; # COPTIC CAPITAL LETTER THETHE
-2C92; C; 2C93; # COPTIC CAPITAL LETTER IAUDA
-2C94; C; 2C95; # COPTIC CAPITAL LETTER KAPA
-2C96; C; 2C97; # COPTIC CAPITAL LETTER LAULA
-2C98; C; 2C99; # COPTIC CAPITAL LETTER MI
-2C9A; C; 2C9B; # COPTIC CAPITAL LETTER NI
-2C9C; C; 2C9D; # COPTIC CAPITAL LETTER KSI
-2C9E; C; 2C9F; # COPTIC CAPITAL LETTER O
-2CA0; C; 2CA1; # COPTIC CAPITAL LETTER PI
-2CA2; C; 2CA3; # COPTIC CAPITAL LETTER RO
-2CA4; C; 2CA5; # COPTIC CAPITAL LETTER SIMA
-2CA6; C; 2CA7; # COPTIC CAPITAL LETTER TAU
-2CA8; C; 2CA9; # COPTIC CAPITAL LETTER UA
-2CAA; C; 2CAB; # COPTIC CAPITAL LETTER FI
-2CAC; C; 2CAD; # COPTIC CAPITAL LETTER KHI
-2CAE; C; 2CAF; # COPTIC CAPITAL LETTER PSI
-2CB0; C; 2CB1; # COPTIC CAPITAL LETTER OOU
-2CB2; C; 2CB3; # COPTIC CAPITAL LETTER DIALECT-P ALEF
-2CB4; C; 2CB5; # COPTIC CAPITAL LETTER OLD COPTIC AIN
-2CB6; C; 2CB7; # COPTIC CAPITAL LETTER CRYPTOGRAMMIC EIE
-2CB8; C; 2CB9; # COPTIC CAPITAL LETTER DIALECT-P KAPA
-2CBA; C; 2CBB; # COPTIC CAPITAL LETTER DIALECT-P NI
-2CBC; C; 2CBD; # COPTIC CAPITAL LETTER CRYPTOGRAMMIC NI
-2CBE; C; 2CBF; # COPTIC CAPITAL LETTER OLD COPTIC OOU
-2CC0; C; 2CC1; # COPTIC CAPITAL LETTER SAMPI
-2CC2; C; 2CC3; # COPTIC CAPITAL LETTER CROSSED SHEI
-2CC4; C; 2CC5; # COPTIC CAPITAL LETTER OLD COPTIC SHEI
-2CC6; C; 2CC7; # COPTIC CAPITAL LETTER OLD COPTIC ESH
-2CC8; C; 2CC9; # COPTIC CAPITAL LETTER AKHMIMIC KHEI
-2CCA; C; 2CCB; # COPTIC CAPITAL LETTER DIALECT-P HORI
-2CCC; C; 2CCD; # COPTIC CAPITAL LETTER OLD COPTIC HORI
-2CCE; C; 2CCF; # COPTIC CAPITAL LETTER OLD COPTIC HA
-2CD0; C; 2CD1; # COPTIC CAPITAL LETTER L-SHAPED HA
-2CD2; C; 2CD3; # COPTIC CAPITAL LETTER OLD COPTIC HEI
-2CD4; C; 2CD5; # COPTIC CAPITAL LETTER OLD COPTIC HAT
-2CD6; C; 2CD7; # COPTIC CAPITAL LETTER OLD COPTIC GANGIA
-2CD8; C; 2CD9; # COPTIC CAPITAL LETTER OLD COPTIC DJA
-2CDA; C; 2CDB; # COPTIC CAPITAL LETTER OLD COPTIC SHIMA
-2CDC; C; 2CDD; # COPTIC CAPITAL LETTER OLD NUBIAN SHIMA
-2CDE; C; 2CDF; # COPTIC CAPITAL LETTER OLD NUBIAN NGI
-2CE0; C; 2CE1; # COPTIC CAPITAL LETTER OLD NUBIAN NYI
-2CE2; C; 2CE3; # COPTIC CAPITAL LETTER OLD NUBIAN WAU
-2CEB; C; 2CEC; # COPTIC CAPITAL LETTER CRYPTOGRAMMIC SHEI
-2CED; C; 2CEE; # COPTIC CAPITAL LETTER CRYPTOGRAMMIC GANGIA
-2CF2; C; 2CF3; # COPTIC CAPITAL LETTER BOHAIRIC KHEI
-A640; C; A641; # CYRILLIC CAPITAL LETTER ZEMLYA
-A642; C; A643; # CYRILLIC CAPITAL LETTER DZELO
-A644; C; A645; # CYRILLIC CAPITAL LETTER REVERSED DZE
-A646; C; A647; # CYRILLIC CAPITAL LETTER IOTA
-A648; C; A649; # CYRILLIC CAPITAL LETTER DJERV
-A64A; C; A64B; # CYRILLIC CAPITAL LETTER MONOGRAPH UK
-A64C; C; A64D; # CYRILLIC CAPITAL LETTER BROAD OMEGA
-A64E; C; A64F; # CYRILLIC CAPITAL LETTER NEUTRAL YER
-A650; C; A651; # CYRILLIC CAPITAL LETTER YERU WITH BACK YER
-A652; C; A653; # CYRILLIC CAPITAL LETTER IOTIFIED YAT
-A654; C; A655; # CYRILLIC CAPITAL LETTER REVERSED YU
-A656; C; A657; # CYRILLIC CAPITAL LETTER IOTIFIED A
-A658; C; A659; # CYRILLIC CAPITAL LETTER CLOSED LITTLE YUS
-A65A; C; A65B; # CYRILLIC CAPITAL LETTER BLENDED YUS
-A65C; C; A65D; # CYRILLIC CAPITAL LETTER IOTIFIED CLOSED LITTLE YUS
-A65E; C; A65F; # CYRILLIC CAPITAL LETTER YN
-A660; C; A661; # CYRILLIC CAPITAL LETTER REVERSED TSE
-A662; C; A663; # CYRILLIC CAPITAL LETTER SOFT DE
-A664; C; A665; # CYRILLIC CAPITAL LETTER SOFT EL
-A666; C; A667; # CYRILLIC CAPITAL LETTER SOFT EM
-A668; C; A669; # CYRILLIC CAPITAL LETTER MONOCULAR O
-A66A; C; A66B; # CYRILLIC CAPITAL LETTER BINOCULAR O
-A66C; C; A66D; # CYRILLIC CAPITAL LETTER DOUBLE MONOCULAR O
-A680; C; A681; # CYRILLIC CAPITAL LETTER DWE
-A682; C; A683; # CYRILLIC CAPITAL LETTER DZWE
-A684; C; A685; # CYRILLIC CAPITAL LETTER ZHWE
-A686; C; A687; # CYRILLIC CAPITAL LETTER CCHE
-A688; C; A689; # CYRILLIC CAPITAL LETTER DZZE
-A68A; C; A68B; # CYRILLIC CAPITAL LETTER TE WITH MIDDLE HOOK
-A68C; C; A68D; # CYRILLIC CAPITAL LETTER TWE
-A68E; C; A68F; # CYRILLIC CAPITAL LETTER TSWE
-A690; C; A691; # CYRILLIC CAPITAL LETTER TSSE
-A692; C; A693; # CYRILLIC CAPITAL LETTER TCHE
-A694; C; A695; # CYRILLIC CAPITAL LETTER HWE
-A696; C; A697; # CYRILLIC CAPITAL LETTER SHWE
-A698; C; A699; # CYRILLIC CAPITAL LETTER DOUBLE O
-A69A; C; A69B; # CYRILLIC CAPITAL LETTER CROSSED O
-A722; C; A723; # LATIN CAPITAL LETTER EGYPTOLOGICAL ALEF
-A724; C; A725; # LATIN CAPITAL LETTER EGYPTOLOGICAL AIN
-A726; C; A727; # LATIN CAPITAL LETTER HENG
-A728; C; A729; # LATIN CAPITAL LETTER TZ
-A72A; C; A72B; # LATIN CAPITAL LETTER TRESILLO
-A72C; C; A72D; # LATIN CAPITAL LETTER CUATRILLO
-A72E; C; A72F; # LATIN CAPITAL LETTER CUATRILLO WITH COMMA
-A732; C; A733; # LATIN CAPITAL LETTER AA
-A734; C; A735; # LATIN CAPITAL LETTER AO
-A736; C; A737; # LATIN CAPITAL LETTER AU
-A738; C; A739; # LATIN CAPITAL LETTER AV
-A73A; C; A73B; # LATIN CAPITAL LETTER AV WITH HORIZONTAL BAR
-A73C; C; A73D; # LATIN CAPITAL LETTER AY
-A73E; C; A73F; # LATIN CAPITAL LETTER REVERSED C WITH DOT
-A740; C; A741; # LATIN CAPITAL LETTER K WITH STROKE
-A742; C; A743; # LATIN CAPITAL LETTER K WITH DIAGONAL STROKE
-A744; C; A745; # LATIN CAPITAL LETTER K WITH STROKE AND DIAGONAL STROKE
-A746; C; A747; # LATIN CAPITAL LETTER BROKEN L
-A748; C; A749; # LATIN CAPITAL LETTER L WITH HIGH STROKE
-A74A; C; A74B; # LATIN CAPITAL LETTER O WITH LONG STROKE OVERLAY
-A74C; C; A74D; # LATIN CAPITAL LETTER O WITH LOOP
-A74E; C; A74F; # LATIN CAPITAL LETTER OO
-A750; C; A751; # LATIN CAPITAL LETTER P WITH STROKE THROUGH DESCENDER
-A752; C; A753; # LATIN CAPITAL LETTER P WITH FLOURISH
-A754; C; A755; # LATIN CAPITAL LETTER P WITH SQUIRREL TAIL
-A756; C; A757; # LATIN CAPITAL LETTER Q WITH STROKE THROUGH DESCENDER
-A758; C; A759; # LATIN CAPITAL LETTER Q WITH DIAGONAL STROKE
-A75A; C; A75B; # LATIN CAPITAL LETTER R ROTUNDA
-A75C; C; A75D; # LATIN CAPITAL LETTER RUM ROTUNDA
-A75E; C; A75F; # LATIN CAPITAL LETTER V WITH DIAGONAL STROKE
-A760; C; A761; # LATIN CAPITAL LETTER VY
-A762; C; A763; # LATIN CAPITAL LETTER VISIGOTHIC Z
-A764; C; A765; # LATIN CAPITAL LETTER THORN WITH STROKE
-A766; C; A767; # LATIN CAPITAL LETTER THORN WITH STROKE THROUGH DESCENDER
-A768; C; A769; # LATIN CAPITAL LETTER VEND
-A76A; C; A76B; # LATIN CAPITAL LETTER ET
-A76C; C; A76D; # LATIN CAPITAL LETTER IS
-A76E; C; A76F; # LATIN CAPITAL LETTER CON
-A779; C; A77A; # LATIN CAPITAL LETTER INSULAR D
-A77B; C; A77C; # LATIN CAPITAL LETTER INSULAR F
-A77D; C; 1D79; # LATIN CAPITAL LETTER INSULAR G
-A77E; C; A77F; # LATIN CAPITAL LETTER TURNED INSULAR G
-A780; C; A781; # LATIN CAPITAL LETTER TURNED L
-A782; C; A783; # LATIN CAPITAL LETTER INSULAR R
-A784; C; A785; # LATIN CAPITAL LETTER INSULAR S
-A786; C; A787; # LATIN CAPITAL LETTER INSULAR T
-A78B; C; A78C; # LATIN CAPITAL LETTER SALTILLO
-A78D; C; 0265; # LATIN CAPITAL LETTER TURNED H
-A790; C; A791; # LATIN CAPITAL LETTER N WITH DESCENDER
-A792; C; A793; # LATIN CAPITAL LETTER C WITH BAR
-A796; C; A797; # LATIN CAPITAL LETTER B WITH FLOURISH
-A798; C; A799; # LATIN CAPITAL LETTER F WITH STROKE
-A79A; C; A79B; # LATIN CAPITAL LETTER VOLAPUK AE
-A79C; C; A79D; # LATIN CAPITAL LETTER VOLAPUK OE
-A79E; C; A79F; # LATIN CAPITAL LETTER VOLAPUK UE
-A7A0; C; A7A1; # LATIN CAPITAL LETTER G WITH OBLIQUE STROKE
-A7A2; C; A7A3; # LATIN CAPITAL LETTER K WITH OBLIQUE STROKE
-A7A4; C; A7A5; # LATIN CAPITAL LETTER N WITH OBLIQUE STROKE
-A7A6; C; A7A7; # LATIN CAPITAL LETTER R WITH OBLIQUE STROKE
-A7A8; C; A7A9; # LATIN CAPITAL LETTER S WITH OBLIQUE STROKE
-A7AA; C; 0266; # LATIN CAPITAL LETTER H WITH HOOK
-A7AB; C; 025C; # LATIN CAPITAL LETTER REVERSED OPEN E
-A7AC; C; 0261; # LATIN CAPITAL LETTER SCRIPT G
-A7AD; C; 026C; # LATIN CAPITAL LETTER L WITH BELT
-A7AE; C; 026A; # LATIN CAPITAL LETTER SMALL CAPITAL I
-A7B0; C; 029E; # LATIN CAPITAL LETTER TURNED K
-A7B1; C; 0287; # LATIN CAPITAL LETTER TURNED T
-A7B2; C; 029D; # LATIN CAPITAL LETTER J WITH CROSSED-TAIL
-A7B3; C; AB53; # LATIN CAPITAL LETTER CHI
-A7B4; C; A7B5; # LATIN CAPITAL LETTER BETA
-A7B6; C; A7B7; # LATIN CAPITAL LETTER OMEGA
-A7B8; C; A7B9; # LATIN CAPITAL LETTER U WITH STROKE
-A7BA; C; A7BB; # LATIN CAPITAL LETTER GLOTTAL A
-A7BC; C; A7BD; # LATIN CAPITAL LETTER GLOTTAL I
-A7BE; C; A7BF; # LATIN CAPITAL LETTER GLOTTAL U
-A7C0; C; A7C1; # LATIN CAPITAL LETTER OLD POLISH O
-A7C2; C; A7C3; # LATIN CAPITAL LETTER ANGLICANA W
-A7C4; C; A794; # LATIN CAPITAL LETTER C WITH PALATAL HOOK
-A7C5; C; 0282; # LATIN CAPITAL LETTER S WITH HOOK
-A7C6; C; 1D8E; # LATIN CAPITAL LETTER Z WITH PALATAL HOOK
-A7C7; C; A7C8; # LATIN CAPITAL LETTER D WITH SHORT STROKE OVERLAY
-A7C9; C; A7CA; # LATIN CAPITAL LETTER S WITH SHORT STROKE OVERLAY
-A7D0; C; A7D1; # LATIN CAPITAL LETTER CLOSED INSULAR G
-A7D6; C; A7D7; # LATIN CAPITAL LETTER MIDDLE SCOTS S
-A7D8; C; A7D9; # LATIN CAPITAL LETTER SIGMOID S
-A7F5; C; A7F6; # LATIN CAPITAL LETTER REVERSED HALF H
-AB70; C; 13A0; # CHEROKEE SMALL LETTER A
-AB71; C; 13A1; # CHEROKEE SMALL LETTER E
-AB72; C; 13A2; # CHEROKEE SMALL LETTER I
-AB73; C; 13A3; # CHEROKEE SMALL LETTER O
-AB74; C; 13A4; # CHEROKEE SMALL LETTER U
-AB75; C; 13A5; # CHEROKEE SMALL LETTER V
-AB76; C; 13A6; # CHEROKEE SMALL LETTER GA
-AB77; C; 13A7; # CHEROKEE SMALL LETTER KA
-AB78; C; 13A8; # CHEROKEE SMALL LETTER GE
-AB79; C; 13A9; # CHEROKEE SMALL LETTER GI
-AB7A; C; 13AA; # CHEROKEE SMALL LETTER GO
-AB7B; C; 13AB; # CHEROKEE SMALL LETTER GU
-AB7C; C; 13AC; # CHEROKEE SMALL LETTER GV
-AB7D; C; 13AD; # CHEROKEE SMALL LETTER HA
-AB7E; C; 13AE; # CHEROKEE SMALL LETTER HE
-AB7F; C; 13AF; # CHEROKEE SMALL LETTER HI
-AB80; C; 13B0; # CHEROKEE SMALL LETTER HO
-AB81; C; 13B1; # CHEROKEE SMALL LETTER HU
-AB82; C; 13B2; # CHEROKEE SMALL LETTER HV
-AB83; C; 13B3; # CHEROKEE SMALL LETTER LA
-AB84; C; 13B4; # CHEROKEE SMALL LETTER LE
-AB85; C; 13B5; # CHEROKEE SMALL LETTER LI
-AB86; C; 13B6; # CHEROKEE SMALL LETTER LO
-AB87; C; 13B7; # CHEROKEE SMALL LETTER LU
-AB88; C; 13B8; # CHEROKEE SMALL LETTER LV
-AB89; C; 13B9; # CHEROKEE SMALL LETTER MA
-AB8A; C; 13BA; # CHEROKEE SMALL LETTER ME
-AB8B; C; 13BB; # CHEROKEE SMALL LETTER MI
-AB8C; C; 13BC; # CHEROKEE SMALL LETTER MO
-AB8D; C; 13BD; # CHEROKEE SMALL LETTER MU
-AB8E; C; 13BE; # CHEROKEE SMALL LETTER NA
-AB8F; C; 13BF; # CHEROKEE SMALL LETTER HNA
-AB90; C; 13C0; # CHEROKEE SMALL LETTER NAH
-AB91; C; 13C1; # CHEROKEE SMALL LETTER NE
-AB92; C; 13C2; # CHEROKEE SMALL LETTER NI
-AB93; C; 13C3; # CHEROKEE SMALL LETTER NO
-AB94; C; 13C4; # CHEROKEE SMALL LETTER NU
-AB95; C; 13C5; # CHEROKEE SMALL LETTER NV
-AB96; C; 13C6; # CHEROKEE SMALL LETTER QUA
-AB97; C; 13C7; # CHEROKEE SMALL LETTER QUE
-AB98; C; 13C8; # CHEROKEE SMALL LETTER QUI
-AB99; C; 13C9; # CHEROKEE SMALL LETTER QUO
-AB9A; C; 13CA; # CHEROKEE SMALL LETTER QUU
-AB9B; C; 13CB; # CHEROKEE SMALL LETTER QUV
-AB9C; C; 13CC; # CHEROKEE SMALL LETTER SA
-AB9D; C; 13CD; # CHEROKEE SMALL LETTER S
-AB9E; C; 13CE; # CHEROKEE SMALL LETTER SE
-AB9F; C; 13CF; # CHEROKEE SMALL LETTER SI
-ABA0; C; 13D0; # CHEROKEE SMALL LETTER SO
-ABA1; C; 13D1; # CHEROKEE SMALL LETTER SU
-ABA2; C; 13D2; # CHEROKEE SMALL LETTER SV
-ABA3; C; 13D3; # CHEROKEE SMALL LETTER DA
-ABA4; C; 13D4; # CHEROKEE SMALL LETTER TA
-ABA5; C; 13D5; # CHEROKEE SMALL LETTER DE
-ABA6; C; 13D6; # CHEROKEE SMALL LETTER TE
-ABA7; C; 13D7; # CHEROKEE SMALL LETTER DI
-ABA8; C; 13D8; # CHEROKEE SMALL LETTER TI
-ABA9; C; 13D9; # CHEROKEE SMALL LETTER DO
-ABAA; C; 13DA; # CHEROKEE SMALL LETTER DU
-ABAB; C; 13DB; # CHEROKEE SMALL LETTER DV
-ABAC; C; 13DC; # CHEROKEE SMALL LETTER DLA
-ABAD; C; 13DD; # CHEROKEE SMALL LETTER TLA
-ABAE; C; 13DE; # CHEROKEE SMALL LETTER TLE
-ABAF; C; 13DF; # CHEROKEE SMALL LETTER TLI
-ABB0; C; 13E0; # CHEROKEE SMALL LETTER TLO
-ABB1; C; 13E1; # CHEROKEE SMALL LETTER TLU
-ABB2; C; 13E2; # CHEROKEE SMALL LETTER TLV
-ABB3; C; 13E3; # CHEROKEE SMALL LETTER TSA
-ABB4; C; 13E4; # CHEROKEE SMALL LETTER TSE
-ABB5; C; 13E5; # CHEROKEE SMALL LETTER TSI
-ABB6; C; 13E6; # CHEROKEE SMALL LETTER TSO
-ABB7; C; 13E7; # CHEROKEE SMALL LETTER TSU
-ABB8; C; 13E8; # CHEROKEE SMALL LETTER TSV
-ABB9; C; 13E9; # CHEROKEE SMALL LETTER WA
-ABBA; C; 13EA; # CHEROKEE SMALL LETTER WE
-ABBB; C; 13EB; # CHEROKEE SMALL LETTER WI
-ABBC; C; 13EC; # CHEROKEE SMALL LETTER WO
-ABBD; C; 13ED; # CHEROKEE SMALL LETTER WU
-ABBE; C; 13EE; # CHEROKEE SMALL LETTER WV
-ABBF; C; 13EF; # CHEROKEE SMALL LETTER YA
-FB00; F; 0066 0066; # LATIN SMALL LIGATURE FF
-FB01; F; 0066 0069; # LATIN SMALL LIGATURE FI
-FB02; F; 0066 006C; # LATIN SMALL LIGATURE FL
-FB03; F; 0066 0066 0069; # LATIN SMALL LIGATURE FFI
-FB04; F; 0066 0066 006C; # LATIN SMALL LIGATURE FFL
-FB05; F; 0073 0074; # LATIN SMALL LIGATURE LONG S T
-FB06; F; 0073 0074; # LATIN SMALL LIGATURE ST
-FB13; F; 0574 0576; # ARMENIAN SMALL LIGATURE MEN NOW
-FB14; F; 0574 0565; # ARMENIAN SMALL LIGATURE MEN ECH
-FB15; F; 0574 056B; # ARMENIAN SMALL LIGATURE MEN INI
-FB16; F; 057E 0576; # ARMENIAN SMALL LIGATURE VEW NOW
-FB17; F; 0574 056D; # ARMENIAN SMALL LIGATURE MEN XEH
-FF21; C; FF41; # FULLWIDTH LATIN CAPITAL LETTER A
-FF22; C; FF42; # FULLWIDTH LATIN CAPITAL LETTER B
-FF23; C; FF43; # FULLWIDTH LATIN CAPITAL LETTER C
-FF24; C; FF44; # FULLWIDTH LATIN CAPITAL LETTER D
-FF25; C; FF45; # FULLWIDTH LATIN CAPITAL LETTER E
-FF26; C; FF46; # FULLWIDTH LATIN CAPITAL LETTER F
-FF27; C; FF47; # FULLWIDTH LATIN CAPITAL LETTER G
-FF28; C; FF48; # FULLWIDTH LATIN CAPITAL LETTER H
-FF29; C; FF49; # FULLWIDTH LATIN CAPITAL LETTER I
-FF2A; C; FF4A; # FULLWIDTH LATIN CAPITAL LETTER J
-FF2B; C; FF4B; # FULLWIDTH LATIN CAPITAL LETTER K
-FF2C; C; FF4C; # FULLWIDTH LATIN CAPITAL LETTER L
-FF2D; C; FF4D; # FULLWIDTH LATIN CAPITAL LETTER M
-FF2E; C; FF4E; # FULLWIDTH LATIN CAPITAL LETTER N
-FF2F; C; FF4F; # FULLWIDTH LATIN CAPITAL LETTER O
-FF30; C; FF50; # FULLWIDTH LATIN CAPITAL LETTER P
-FF31; C; FF51; # FULLWIDTH LATIN CAPITAL LETTER Q
-FF32; C; FF52; # FULLWIDTH LATIN CAPITAL LETTER R
-FF33; C; FF53; # FULLWIDTH LATIN CAPITAL LETTER S
-FF34; C; FF54; # FULLWIDTH LATIN CAPITAL LETTER T
-FF35; C; FF55; # FULLWIDTH LATIN CAPITAL LETTER U
-FF36; C; FF56; # FULLWIDTH LATIN CAPITAL LETTER V
-FF37; C; FF57; # FULLWIDTH LATIN CAPITAL LETTER W
-FF38; C; FF58; # FULLWIDTH LATIN CAPITAL LETTER X
-FF39; C; FF59; # FULLWIDTH LATIN CAPITAL LETTER Y
-FF3A; C; FF5A; # FULLWIDTH LATIN CAPITAL LETTER Z
-10400; C; 10428; # DESERET CAPITAL LETTER LONG I
-10401; C; 10429; # DESERET CAPITAL LETTER LONG E
-10402; C; 1042A; # DESERET CAPITAL LETTER LONG A
-10403; C; 1042B; # DESERET CAPITAL LETTER LONG AH
-10404; C; 1042C; # DESERET CAPITAL LETTER LONG O
-10405; C; 1042D; # DESERET CAPITAL LETTER LONG OO
-10406; C; 1042E; # DESERET CAPITAL LETTER SHORT I
-10407; C; 1042F; # DESERET CAPITAL LETTER SHORT E
-10408; C; 10430; # DESERET CAPITAL LETTER SHORT A
-10409; C; 10431; # DESERET CAPITAL LETTER SHORT AH
-1040A; C; 10432; # DESERET CAPITAL LETTER SHORT O
-1040B; C; 10433; # DESERET CAPITAL LETTER SHORT OO
-1040C; C; 10434; # DESERET CAPITAL LETTER AY
-1040D; C; 10435; # DESERET CAPITAL LETTER OW
-1040E; C; 10436; # DESERET CAPITAL LETTER WU
-1040F; C; 10437; # DESERET CAPITAL LETTER YEE
-10410; C; 10438; # DESERET CAPITAL LETTER H
-10411; C; 10439; # DESERET CAPITAL LETTER PEE
-10412; C; 1043A; # DESERET CAPITAL LETTER BEE
-10413; C; 1043B; # DESERET CAPITAL LETTER TEE
-10414; C; 1043C; # DESERET CAPITAL LETTER DEE
-10415; C; 1043D; # DESERET CAPITAL LETTER CHEE
-10416; C; 1043E; # DESERET CAPITAL LETTER JEE
-10417; C; 1043F; # DESERET CAPITAL LETTER KAY
-10418; C; 10440; # DESERET CAPITAL LETTER GAY
-10419; C; 10441; # DESERET CAPITAL LETTER EF
-1041A; C; 10442; # DESERET CAPITAL LETTER VEE
-1041B; C; 10443; # DESERET CAPITAL LETTER ETH
-1041C; C; 10444; # DESERET CAPITAL LETTER THEE
-1041D; C; 10445; # DESERET CAPITAL LETTER ES
-1041E; C; 10446; # DESERET CAPITAL LETTER ZEE
-1041F; C; 10447; # DESERET CAPITAL LETTER ESH
-10420; C; 10448; # DESERET CAPITAL LETTER ZHEE
-10421; C; 10449; # DESERET CAPITAL LETTER ER
-10422; C; 1044A; # DESERET CAPITAL LETTER EL
-10423; C; 1044B; # DESERET CAPITAL LETTER EM
-10424; C; 1044C; # DESERET CAPITAL LETTER EN
-10425; C; 1044D; # DESERET CAPITAL LETTER ENG
-10426; C; 1044E; # DESERET CAPITAL LETTER OI
-10427; C; 1044F; # DESERET CAPITAL LETTER EW
-104B0; C; 104D8; # OSAGE CAPITAL LETTER A
-104B1; C; 104D9; # OSAGE CAPITAL LETTER AI
-104B2; C; 104DA; # OSAGE CAPITAL LETTER AIN
-104B3; C; 104DB; # OSAGE CAPITAL LETTER AH
-104B4; C; 104DC; # OSAGE CAPITAL LETTER BRA
-104B5; C; 104DD; # OSAGE CAPITAL LETTER CHA
-104B6; C; 104DE; # OSAGE CAPITAL LETTER EHCHA
-104B7; C; 104DF; # OSAGE CAPITAL LETTER E
-104B8; C; 104E0; # OSAGE CAPITAL LETTER EIN
-104B9; C; 104E1; # OSAGE CAPITAL LETTER HA
-104BA; C; 104E2; # OSAGE CAPITAL LETTER HYA
-104BB; C; 104E3; # OSAGE CAPITAL LETTER I
-104BC; C; 104E4; # OSAGE CAPITAL LETTER KA
-104BD; C; 104E5; # OSAGE CAPITAL LETTER EHKA
-104BE; C; 104E6; # OSAGE CAPITAL LETTER KYA
-104BF; C; 104E7; # OSAGE CAPITAL LETTER LA
-104C0; C; 104E8; # OSAGE CAPITAL LETTER MA
-104C1; C; 104E9; # OSAGE CAPITAL LETTER NA
-104C2; C; 104EA; # OSAGE CAPITAL LETTER O
-104C3; C; 104EB; # OSAGE CAPITAL LETTER OIN
-104C4; C; 104EC; # OSAGE CAPITAL LETTER PA
-104C5; C; 104ED; # OSAGE CAPITAL LETTER EHPA
-104C6; C; 104EE; # OSAGE CAPITAL LETTER SA
-104C7; C; 104EF; # OSAGE CAPITAL LETTER SHA
-104C8; C; 104F0; # OSAGE CAPITAL LETTER TA
-104C9; C; 104F1; # OSAGE CAPITAL LETTER EHTA
-104CA; C; 104F2; # OSAGE CAPITAL LETTER TSA
-104CB; C; 104F3; # OSAGE CAPITAL LETTER EHTSA
-104CC; C; 104F4; # OSAGE CAPITAL LETTER TSHA
-104CD; C; 104F5; # OSAGE CAPITAL LETTER DHA
-104CE; C; 104F6; # OSAGE CAPITAL LETTER U
-104CF; C; 104F7; # OSAGE CAPITAL LETTER WA
-104D0; C; 104F8; # OSAGE CAPITAL LETTER KHA
-104D1; C; 104F9; # OSAGE CAPITAL LETTER GHA
-104D2; C; 104FA; # OSAGE CAPITAL LETTER ZA
-104D3; C; 104FB; # OSAGE CAPITAL LETTER ZHA
-10570; C; 10597; # VITHKUQI CAPITAL LETTER A
-10571; C; 10598; # VITHKUQI CAPITAL LETTER BBE
-10572; C; 10599; # VITHKUQI CAPITAL LETTER BE
-10573; C; 1059A; # VITHKUQI CAPITAL LETTER CE
-10574; C; 1059B; # VITHKUQI CAPITAL LETTER CHE
-10575; C; 1059C; # VITHKUQI CAPITAL LETTER DE
-10576; C; 1059D; # VITHKUQI CAPITAL LETTER DHE
-10577; C; 1059E; # VITHKUQI CAPITAL LETTER EI
-10578; C; 1059F; # VITHKUQI CAPITAL LETTER E
-10579; C; 105A0; # VITHKUQI CAPITAL LETTER FE
-1057A; C; 105A1; # VITHKUQI CAPITAL LETTER GA
-1057C; C; 105A3; # VITHKUQI CAPITAL LETTER HA
-1057D; C; 105A4; # VITHKUQI CAPITAL LETTER HHA
-1057E; C; 105A5; # VITHKUQI CAPITAL LETTER I
-1057F; C; 105A6; # VITHKUQI CAPITAL LETTER IJE
-10580; C; 105A7; # VITHKUQI CAPITAL LETTER JE
-10581; C; 105A8; # VITHKUQI CAPITAL LETTER KA
-10582; C; 105A9; # VITHKUQI CAPITAL LETTER LA
-10583; C; 105AA; # VITHKUQI CAPITAL LETTER LLA
-10584; C; 105AB; # VITHKUQI CAPITAL LETTER ME
-10585; C; 105AC; # VITHKUQI CAPITAL LETTER NE
-10586; C; 105AD; # VITHKUQI CAPITAL LETTER NJE
-10587; C; 105AE; # VITHKUQI CAPITAL LETTER O
-10588; C; 105AF; # VITHKUQI CAPITAL LETTER PE
-10589; C; 105B0; # VITHKUQI CAPITAL LETTER QA
-1058A; C; 105B1; # VITHKUQI CAPITAL LETTER RE
-1058C; C; 105B3; # VITHKUQI CAPITAL LETTER SE
-1058D; C; 105B4; # VITHKUQI CAPITAL LETTER SHE
-1058E; C; 105B5; # VITHKUQI CAPITAL LETTER TE
-1058F; C; 105B6; # VITHKUQI CAPITAL LETTER THE
-10590; C; 105B7; # VITHKUQI CAPITAL LETTER U
-10591; C; 105B8; # VITHKUQI CAPITAL LETTER VE
-10592; C; 105B9; # VITHKUQI CAPITAL LETTER XE
-10594; C; 105BB; # VITHKUQI CAPITAL LETTER Y
-10595; C; 105BC; # VITHKUQI CAPITAL LETTER ZE
-10C80; C; 10CC0; # OLD HUNGARIAN CAPITAL LETTER A
-10C81; C; 10CC1; # OLD HUNGARIAN CAPITAL LETTER AA
-10C82; C; 10CC2; # OLD HUNGARIAN CAPITAL LETTER EB
-10C83; C; 10CC3; # OLD HUNGARIAN CAPITAL LETTER AMB
-10C84; C; 10CC4; # OLD HUNGARIAN CAPITAL LETTER EC
-10C85; C; 10CC5; # OLD HUNGARIAN CAPITAL LETTER ENC
-10C86; C; 10CC6; # OLD HUNGARIAN CAPITAL LETTER ECS
-10C87; C; 10CC7; # OLD HUNGARIAN CAPITAL LETTER ED
-10C88; C; 10CC8; # OLD HUNGARIAN CAPITAL LETTER AND
-10C89; C; 10CC9; # OLD HUNGARIAN CAPITAL LETTER E
-10C8A; C; 10CCA; # OLD HUNGARIAN CAPITAL LETTER CLOSE E
-10C8B; C; 10CCB; # OLD HUNGARIAN CAPITAL LETTER EE
-10C8C; C; 10CCC; # OLD HUNGARIAN CAPITAL LETTER EF
-10C8D; C; 10CCD; # OLD HUNGARIAN CAPITAL LETTER EG
-10C8E; C; 10CCE; # OLD HUNGARIAN CAPITAL LETTER EGY
-10C8F; C; 10CCF; # OLD HUNGARIAN CAPITAL LETTER EH
-10C90; C; 10CD0; # OLD HUNGARIAN CAPITAL LETTER I
-10C91; C; 10CD1; # OLD HUNGARIAN CAPITAL LETTER II
-10C92; C; 10CD2; # OLD HUNGARIAN CAPITAL LETTER EJ
-10C93; C; 10CD3; # OLD HUNGARIAN CAPITAL LETTER EK
-10C94; C; 10CD4; # OLD HUNGARIAN CAPITAL LETTER AK
-10C95; C; 10CD5; # OLD HUNGARIAN CAPITAL LETTER UNK
-10C96; C; 10CD6; # OLD HUNGARIAN CAPITAL LETTER EL
-10C97; C; 10CD7; # OLD HUNGARIAN CAPITAL LETTER ELY
-10C98; C; 10CD8; # OLD HUNGARIAN CAPITAL LETTER EM
-10C99; C; 10CD9; # OLD HUNGARIAN CAPITAL LETTER EN
-10C9A; C; 10CDA; # OLD HUNGARIAN CAPITAL LETTER ENY
-10C9B; C; 10CDB; # OLD HUNGARIAN CAPITAL LETTER O
-10C9C; C; 10CDC; # OLD HUNGARIAN CAPITAL LETTER OO
-10C9D; C; 10CDD; # OLD HUNGARIAN CAPITAL LETTER NIKOLSBURG OE
-10C9E; C; 10CDE; # OLD HUNGARIAN CAPITAL LETTER RUDIMENTA OE
-10C9F; C; 10CDF; # OLD HUNGARIAN CAPITAL LETTER OEE
-10CA0; C; 10CE0; # OLD HUNGARIAN CAPITAL LETTER EP
-10CA1; C; 10CE1; # OLD HUNGARIAN CAPITAL LETTER EMP
-10CA2; C; 10CE2; # OLD HUNGARIAN CAPITAL LETTER ER
-10CA3; C; 10CE3; # OLD HUNGARIAN CAPITAL LETTER SHORT ER
-10CA4; C; 10CE4; # OLD HUNGARIAN CAPITAL LETTER ES
-10CA5; C; 10CE5; # OLD HUNGARIAN CAPITAL LETTER ESZ
-10CA6; C; 10CE6; # OLD HUNGARIAN CAPITAL LETTER ET
-10CA7; C; 10CE7; # OLD HUNGARIAN CAPITAL LETTER ENT
-10CA8; C; 10CE8; # OLD HUNGARIAN CAPITAL LETTER ETY
-10CA9; C; 10CE9; # OLD HUNGARIAN CAPITAL LETTER ECH
-10CAA; C; 10CEA; # OLD HUNGARIAN CAPITAL LETTER U
-10CAB; C; 10CEB; # OLD HUNGARIAN CAPITAL LETTER UU
-10CAC; C; 10CEC; # OLD HUNGARIAN CAPITAL LETTER NIKOLSBURG UE
-10CAD; C; 10CED; # OLD HUNGARIAN CAPITAL LETTER RUDIMENTA UE
-10CAE; C; 10CEE; # OLD HUNGARIAN CAPITAL LETTER EV
-10CAF; C; 10CEF; # OLD HUNGARIAN CAPITAL LETTER EZ
-10CB0; C; 10CF0; # OLD HUNGARIAN CAPITAL LETTER EZS
-10CB1; C; 10CF1; # OLD HUNGARIAN CAPITAL LETTER ENT-SHAPED SIGN
-10CB2; C; 10CF2; # OLD HUNGARIAN CAPITAL LETTER US
-118A0; C; 118C0; # WARANG CITI CAPITAL LETTER NGAA
-118A1; C; 118C1; # WARANG CITI CAPITAL LETTER A
-118A2; C; 118C2; # WARANG CITI CAPITAL LETTER WI
-118A3; C; 118C3; # WARANG CITI CAPITAL LETTER YU
-118A4; C; 118C4; # WARANG CITI CAPITAL LETTER YA
-118A5; C; 118C5; # WARANG CITI CAPITAL LETTER YO
-118A6; C; 118C6; # WARANG CITI CAPITAL LETTER II
-118A7; C; 118C7; # WARANG CITI CAPITAL LETTER UU
-118A8; C; 118C8; # WARANG CITI CAPITAL LETTER E
-118A9; C; 118C9; # WARANG CITI CAPITAL LETTER O
-118AA; C; 118CA; # WARANG CITI CAPITAL LETTER ANG
-118AB; C; 118CB; # WARANG CITI CAPITAL LETTER GA
-118AC; C; 118CC; # WARANG CITI CAPITAL LETTER KO
-118AD; C; 118CD; # WARANG CITI CAPITAL LETTER ENY
-118AE; C; 118CE; # WARANG CITI CAPITAL LETTER YUJ
-118AF; C; 118CF; # WARANG CITI CAPITAL LETTER UC
-118B0; C; 118D0; # WARANG CITI CAPITAL LETTER ENN
-118B1; C; 118D1; # WARANG CITI CAPITAL LETTER ODD
-118B2; C; 118D2; # WARANG CITI CAPITAL LETTER TTE
-118B3; C; 118D3; # WARANG CITI CAPITAL LETTER NUNG
-118B4; C; 118D4; # WARANG CITI CAPITAL LETTER DA
-118B5; C; 118D5; # WARANG CITI CAPITAL LETTER AT
-118B6; C; 118D6; # WARANG CITI CAPITAL LETTER AM
-118B7; C; 118D7; # WARANG CITI CAPITAL LETTER BU
-118B8; C; 118D8; # WARANG CITI CAPITAL LETTER PU
-118B9; C; 118D9; # WARANG CITI CAPITAL LETTER HIYO
-118BA; C; 118DA; # WARANG CITI CAPITAL LETTER HOLO
-118BB; C; 118DB; # WARANG CITI CAPITAL LETTER HORR
-118BC; C; 118DC; # WARANG CITI CAPITAL LETTER HAR
-118BD; C; 118DD; # WARANG CITI CAPITAL LETTER SSUU
-118BE; C; 118DE; # WARANG CITI CAPITAL LETTER SII
-118BF; C; 118DF; # WARANG CITI CAPITAL LETTER VIYO
-16E40; C; 16E60; # MEDEFAIDRIN CAPITAL LETTER M
-16E41; C; 16E61; # MEDEFAIDRIN CAPITAL LETTER S
-16E42; C; 16E62; # MEDEFAIDRIN CAPITAL LETTER V
-16E43; C; 16E63; # MEDEFAIDRIN CAPITAL LETTER W
-16E44; C; 16E64; # MEDEFAIDRIN CAPITAL LETTER ATIU
-16E45; C; 16E65; # MEDEFAIDRIN CAPITAL LETTER Z
-16E46; C; 16E66; # MEDEFAIDRIN CAPITAL LETTER KP
-16E47; C; 16E67; # MEDEFAIDRIN CAPITAL LETTER P
-16E48; C; 16E68; # MEDEFAIDRIN CAPITAL LETTER T
-16E49; C; 16E69; # MEDEFAIDRIN CAPITAL LETTER G
-16E4A; C; 16E6A; # MEDEFAIDRIN CAPITAL LETTER F
-16E4B; C; 16E6B; # MEDEFAIDRIN CAPITAL LETTER I
-16E4C; C; 16E6C; # MEDEFAIDRIN CAPITAL LETTER K
-16E4D; C; 16E6D; # MEDEFAIDRIN CAPITAL LETTER A
-16E4E; C; 16E6E; # MEDEFAIDRIN CAPITAL LETTER J
-16E4F; C; 16E6F; # MEDEFAIDRIN CAPITAL LETTER E
-16E50; C; 16E70; # MEDEFAIDRIN CAPITAL LETTER B
-16E51; C; 16E71; # MEDEFAIDRIN CAPITAL LETTER C
-16E52; C; 16E72; # MEDEFAIDRIN CAPITAL LETTER U
-16E53; C; 16E73; # MEDEFAIDRIN CAPITAL LETTER YU
-16E54; C; 16E74; # MEDEFAIDRIN CAPITAL LETTER L
-16E55; C; 16E75; # MEDEFAIDRIN CAPITAL LETTER Q
-16E56; C; 16E76; # MEDEFAIDRIN CAPITAL LETTER HP
-16E57; C; 16E77; # MEDEFAIDRIN CAPITAL LETTER NY
-16E58; C; 16E78; # MEDEFAIDRIN CAPITAL LETTER X
-16E59; C; 16E79; # MEDEFAIDRIN CAPITAL LETTER D
-16E5A; C; 16E7A; # MEDEFAIDRIN CAPITAL LETTER OE
-16E5B; C; 16E7B; # MEDEFAIDRIN CAPITAL LETTER N
-16E5C; C; 16E7C; # MEDEFAIDRIN CAPITAL LETTER R
-16E5D; C; 16E7D; # MEDEFAIDRIN CAPITAL LETTER O
-16E5E; C; 16E7E; # MEDEFAIDRIN CAPITAL LETTER AI
-16E5F; C; 16E7F; # MEDEFAIDRIN CAPITAL LETTER Y
-1E900; C; 1E922; # ADLAM CAPITAL LETTER ALIF
-1E901; C; 1E923; # ADLAM CAPITAL LETTER DAALI
-1E902; C; 1E924; # ADLAM CAPITAL LETTER LAAM
-1E903; C; 1E925; # ADLAM CAPITAL LETTER MIIM
-1E904; C; 1E926; # ADLAM CAPITAL LETTER BA
-1E905; C; 1E927; # ADLAM CAPITAL LETTER SINNYIIYHE
-1E906; C; 1E928; # ADLAM CAPITAL LETTER PE
-1E907; C; 1E929; # ADLAM CAPITAL LETTER BHE
-1E908; C; 1E92A; # ADLAM CAPITAL LETTER RA
-1E909; C; 1E92B; # ADLAM CAPITAL LETTER E
-1E90A; C; 1E92C; # ADLAM CAPITAL LETTER FA
-1E90B; C; 1E92D; # ADLAM CAPITAL LETTER I
-1E90C; C; 1E92E; # ADLAM CAPITAL LETTER O
-1E90D; C; 1E92F; # ADLAM CAPITAL LETTER DHA
-1E90E; C; 1E930; # ADLAM CAPITAL LETTER YHE
-1E90F; C; 1E931; # ADLAM CAPITAL LETTER WAW
-1E910; C; 1E932; # ADLAM CAPITAL LETTER NUN
-1E911; C; 1E933; # ADLAM CAPITAL LETTER KAF
-1E912; C; 1E934; # ADLAM CAPITAL LETTER YA
-1E913; C; 1E935; # ADLAM CAPITAL LETTER U
-1E914; C; 1E936; # ADLAM CAPITAL LETTER JIIM
-1E915; C; 1E937; # ADLAM CAPITAL LETTER CHI
-1E916; C; 1E938; # ADLAM CAPITAL LETTER HA
-1E917; C; 1E939; # ADLAM CAPITAL LETTER QAAF
-1E918; C; 1E93A; # ADLAM CAPITAL LETTER GA
-1E919; C; 1E93B; # ADLAM CAPITAL LETTER NYA
-1E91A; C; 1E93C; # ADLAM CAPITAL LETTER TU
-1E91B; C; 1E93D; # ADLAM CAPITAL LETTER NHA
-1E91C; C; 1E93E; # ADLAM CAPITAL LETTER VA
-1E91D; C; 1E93F; # ADLAM CAPITAL LETTER KHA
-1E91E; C; 1E940; # ADLAM CAPITAL LETTER GBE
-1E91F; C; 1E941; # ADLAM CAPITAL LETTER ZAL
-1E920; C; 1E942; # ADLAM CAPITAL LETTER KPO
-1E921; C; 1E943; # ADLAM CAPITAL LETTER SHA
-'''
-
-
-def _parse_unichr(s):
-    s = int(s, 16)
-    try:
-        return compat_chr(s)
-    except ValueError:
-        # work around "unichr() arg not in range(0x10000) (narrow Python build)"
-        return ('\\U%08x' % s).decode('unicode-escape')
-
-
-_map = dict(
-    (_parse_unichr(from_), ''.join(map(_parse_unichr, to_.split(' '))))
-    for from_, type_, to_, _ in (
-        l.split('; ', 3) for l in _map_str.splitlines() if l and not l[0] == '#')
-    if type_ in ('C', 'F'))
-del _map_str
-
-
-def _casefold(s):
-    assert isinstance(s, compat_str)
-    return ''.join((_map.get(c, c) for c in s))
diff --git a/youtube_dl/compat.py b/youtube_dl/compat.py
index ebe22bdf9..9e45c454b 100644
--- a/youtube_dl/compat.py
+++ b/youtube_dl/compat.py
@@ -1,12 +1,10 @@
 # coding: utf-8
 from __future__ import unicode_literals
-from __future__ import division
 
 import base64
 import binascii
 import collections
 import ctypes
-import datetime
 import email
 import getpass
 import io
@@ -16,122 +14,48 @@ import os
 import platform
 import re
 import shlex
+import shutil
 import socket
 import struct
 import subprocess
 import sys
-import types
 import xml.etree.ElementTree
 
-_IDENTITY = lambda x: x
 
-# naming convention
-# 'compat_' + Python3_name.replace('.', '_')
-# other aliases exist for convenience and/or legacy
-# wrap disposable test values in type() to reclaim storage
-
-# deal with critical unicode/str things first:
-# compat_str, compat_basestring, compat_chr
-try:
-    # Python 2
-    compat_str, compat_basestring, compat_chr = (
-        unicode, basestring, unichr
-    )
-except NameError:
-    compat_str, compat_basestring, compat_chr = (
-        str, (str, bytes), chr
-    )
-
-
-# compat_casefold
-try:
-    compat_str.casefold
-    compat_casefold = lambda s: s.casefold()
-except AttributeError:
-    from .casefold import _casefold as compat_casefold
-
-
-# compat_collections_abc
-try:
-    import collections.abc as compat_collections_abc
-except ImportError:
-    import collections as compat_collections_abc
-
-
-# compat_urllib_request
 try:
     import urllib.request as compat_urllib_request
 except ImportError:  # Python 2
     import urllib2 as compat_urllib_request
 
-# Also fix up lack of method arg in old Pythons
-try:
-    type(compat_urllib_request.Request('http://127.0.0.1', method='GET'))
-except TypeError:
-    def _add_init_method_arg(cls):
-
-        init = cls.__init__
-
-        def wrapped_init(self, *args, **kwargs):
-            method = kwargs.pop('method', 'GET')
-            init(self, *args, **kwargs)
-            if any(callable(x.__dict__.get('get_method')) for x in (self.__class__, self) if x != cls):
-                # allow instance or its subclass to override get_method()
-                return
-            if self.has_data() and method == 'GET':
-                method = 'POST'
-            self.get_method = types.MethodType(lambda _: method, self)
-
-        cls.__init__ = wrapped_init
-
-    _add_init_method_arg(compat_urllib_request.Request)
-    del _add_init_method_arg
-
-
-# compat_urllib_error
 try:
     import urllib.error as compat_urllib_error
 except ImportError:  # Python 2
     import urllib2 as compat_urllib_error
 
-
-# compat_urllib_parse
 try:
     import urllib.parse as compat_urllib_parse
 except ImportError:  # Python 2
     import urllib as compat_urllib_parse
-    import urlparse as _urlparse
-    for a in dir(_urlparse):
-        if not hasattr(compat_urllib_parse, a):
-            setattr(compat_urllib_parse, a, getattr(_urlparse, a))
-    del _urlparse
 
-# unfavoured aliases
-compat_urlparse = compat_urllib_parse
-compat_urllib_parse_urlparse = compat_urllib_parse.urlparse
+try:
+    from urllib.parse import urlparse as compat_urllib_parse_urlparse
+except ImportError:  # Python 2
+    from urlparse import urlparse as compat_urllib_parse_urlparse
 
+try:
+    import urllib.parse as compat_urlparse
+except ImportError:  # Python 2
+    import urlparse as compat_urlparse
 
-# compat_urllib_response
 try:
     import urllib.response as compat_urllib_response
 except ImportError:  # Python 2
     import urllib as compat_urllib_response
 
-
-# compat_urllib_response.addinfourl
-try:
-    compat_urllib_response.addinfourl.status
-except AttributeError:
-    # .getcode() is deprecated in Py 3.
-    compat_urllib_response.addinfourl.status = property(lambda self: self.getcode())
-
-
-# compat_http_cookiejar
 try:
     import http.cookiejar as compat_cookiejar
 except ImportError:  # Python 2
     import cookielib as compat_cookiejar
-compat_http_cookiejar = compat_cookiejar
 
 if sys.version_info[0] == 2:
     class compat_cookiejar_Cookie(compat_cookiejar.Cookie):
@@ -143,49 +67,26 @@ if sys.version_info[0] == 2:
             compat_cookiejar.Cookie.__init__(self, version, name, value, *args, **kwargs)
 else:
     compat_cookiejar_Cookie = compat_cookiejar.Cookie
-compat_http_cookiejar_Cookie = compat_cookiejar_Cookie
 
-
-# compat_http_cookies
 try:
     import http.cookies as compat_cookies
 except ImportError:  # Python 2
     import Cookie as compat_cookies
-compat_http_cookies = compat_cookies
 
-
-# compat_http_cookies_SimpleCookie
-if sys.version_info[0] == 2 or sys.version_info < (3, 3):
+if sys.version_info[0] == 2:
     class compat_cookies_SimpleCookie(compat_cookies.SimpleCookie):
         def load(self, rawdata):
-            must_have_value = 0
-            if not isinstance(rawdata, dict):
-                if sys.version_info[:2] != (2, 7) or sys.platform.startswith('java'):
-                    # attribute must have value for parsing
-                    rawdata, must_have_value = re.subn(
-                        r'(?i)(;\s*)(secure|httponly)(\s*(?:;|$))', r'\1\2=\2\3', rawdata)
-                if sys.version_info[0] == 2:
-                    if isinstance(rawdata, compat_str):
-                        rawdata = str(rawdata)
-            super(compat_cookies_SimpleCookie, self).load(rawdata)
-            if must_have_value > 0:
-                for morsel in self.values():
-                    for attr in ('secure', 'httponly'):
-                        if morsel.get(attr):
-                            morsel[attr] = True
+            if isinstance(rawdata, compat_str):
+                rawdata = str(rawdata)
+            return super(compat_cookies_SimpleCookie, self).load(rawdata)
 else:
     compat_cookies_SimpleCookie = compat_cookies.SimpleCookie
-compat_http_cookies_SimpleCookie = compat_cookies_SimpleCookie
 
-
-# compat_html_entities, probably useless now
 try:
     import html.entities as compat_html_entities
 except ImportError:  # Python 2
     import htmlentitydefs as compat_html_entities
 
-
-# compat_html_entities_html5
 try:  # Python >= 3.3
     compat_html_entities_html5 = compat_html_entities.html5
 except AttributeError:
@@ -2428,77 +2329,58 @@ try:
     import http.client as compat_http_client
 except ImportError:  # Python 2
     import httplib as compat_http_client
-try:
-    compat_http_client.HTTPResponse.getcode
-except AttributeError:
-    # Py < 3.1
-    compat_http_client.HTTPResponse.getcode = lambda self: self.status
 
-
-# compat_urllib_HTTPError
 try:
     from urllib.error import HTTPError as compat_HTTPError
 except ImportError:  # Python 2
     from urllib2 import HTTPError as compat_HTTPError
-compat_urllib_HTTPError = compat_HTTPError
 
-
-# compat_urllib_request_urlretrieve
 try:
     from urllib.request import urlretrieve as compat_urlretrieve
 except ImportError:  # Python 2
     from urllib import urlretrieve as compat_urlretrieve
-compat_urllib_request_urlretrieve = compat_urlretrieve
 
-
-# compat_html_parser_HTMLParser, compat_html_parser_HTMLParseError
 try:
-    from HTMLParser import (
-        HTMLParser as compat_HTMLParser,
-        HTMLParseError as compat_HTMLParseError)
-except ImportError:  # Python 3
     from html.parser import HTMLParser as compat_HTMLParser
+except ImportError:  # Python 2
+    from HTMLParser import HTMLParser as compat_HTMLParser
+
+try:  # Python 2
+    from HTMLParser import HTMLParseError as compat_HTMLParseError
+except ImportError:  # Python <3.4
     try:
         from html.parser import HTMLParseError as compat_HTMLParseError
     except ImportError:  # Python >3.4
-        # HTMLParseError was deprecated in Python 3.3 and removed in
+
+        # HTMLParseError has been deprecated in Python 3.3 and removed in
         # Python 3.5. Introducing dummy exception for Python >3.5 for compatible
         # and uniform cross-version exception handling
-
         class compat_HTMLParseError(Exception):
             pass
 
-compat_html_parser_HTMLParser = compat_HTMLParser
-compat_html_parser_HTMLParseError = compat_HTMLParseError
-
-
-# compat_subprocess_get_DEVNULL
 try:
-    _DEVNULL = subprocess.DEVNULL
-    compat_subprocess_get_DEVNULL = lambda: _DEVNULL
-except AttributeError:
+    from subprocess import DEVNULL
+    compat_subprocess_get_DEVNULL = lambda: DEVNULL
+except ImportError:
     compat_subprocess_get_DEVNULL = lambda: open(os.path.devnull, 'w')
 
-
-# compat_http_server
 try:
     import http.server as compat_http_server
 except ImportError:
     import BaseHTTPServer as compat_http_server
 
+try:
+    compat_str = unicode  # Python 2
+except NameError:
+    compat_str = str
 
-# compat_urllib_parse_unquote_to_bytes,
-# compat_urllib_parse_unquote, compat_urllib_parse_unquote_plus,
-# compat_urllib_parse_urlencode,
-# compat_urllib_parse_parse_qs
 try:
     from urllib.parse import unquote_to_bytes as compat_urllib_parse_unquote_to_bytes
     from urllib.parse import unquote as compat_urllib_parse_unquote
     from urllib.parse import unquote_plus as compat_urllib_parse_unquote_plus
-    from urllib.parse import urlencode as compat_urllib_parse_urlencode
-    from urllib.parse import parse_qs as compat_parse_qs
 except ImportError:  # Python 2
-    _asciire = getattr(compat_urllib_parse, '_asciire', None) or re.compile(r'([\x00-\x7f]+)')
+    _asciire = (compat_urllib_parse._asciire if hasattr(compat_urllib_parse, '_asciire')
+                else re.compile(r'([\x00-\x7f]+)'))
 
     # HACK: The following are the correct unquote_to_bytes, unquote and unquote_plus
     # implementations from cpython 3.4.3's stdlib. Python 2's version
@@ -2562,28 +2444,170 @@ except ImportError:  # Python 2
         string = string.replace('+', ' ')
         return compat_urllib_parse_unquote(string, encoding, errors)
 
+try:
+    from urllib.parse import urlencode as compat_urllib_parse_urlencode
+except ImportError:  # Python 2
     # Python 2 will choke in urlencode on mixture of byte and unicode strings.
     # Possible solutions are to either port it from python 3 with all
     # the friends or manually ensure input query contains only byte strings.
     # We will stick with latter thus recursively encoding the whole query.
-    def compat_urllib_parse_urlencode(query, doseq=0, safe='', encoding='utf-8', errors='strict'):
-
+    def compat_urllib_parse_urlencode(query, doseq=0, encoding='utf-8'):
         def encode_elem(e):
             if isinstance(e, dict):
                 e = encode_dict(e)
             elif isinstance(e, (list, tuple,)):
-                e = type(e)(encode_elem(el) for el in e)
+                list_e = encode_list(e)
+                e = tuple(list_e) if isinstance(e, tuple) else list_e
             elif isinstance(e, compat_str):
-                e = e.encode(encoding, errors)
+                e = e.encode(encoding)
             return e
 
         def encode_dict(d):
-            return tuple((encode_elem(k), encode_elem(v)) for k, v in d.items())
+            return dict((encode_elem(k), encode_elem(v)) for k, v in d.items())
 
-        return compat_urllib_parse._urlencode(encode_elem(query), doseq=doseq).decode('ascii')
+        def encode_list(l):
+            return [encode_elem(e) for e in l]
 
+        return compat_urllib_parse.urlencode(encode_elem(query), doseq=doseq)
+
+try:
+    from urllib.request import DataHandler as compat_urllib_request_DataHandler
+except ImportError:  # Python < 3.4
+    # Ported from CPython 98774:1733b3bd46db, Lib/urllib/request.py
+    class compat_urllib_request_DataHandler(compat_urllib_request.BaseHandler):
+        def data_open(self, req):
+            # data URLs as specified in RFC 2397.
+            #
+            # ignores POSTed data
+            #
+            # syntax:
+            # dataurl   := "data:" [ mediatype ] [ ";base64" ] "," data
+            # mediatype := [ type "/" subtype ] *( ";" parameter )
+            # data      := *urlchar
+            # parameter := attribute "=" value
+            url = req.get_full_url()
+
+            scheme, data = url.split(':', 1)
+            mediatype, data = data.split(',', 1)
+
+            # even base64 encoded data URLs might be quoted so unquote in any case:
+            data = compat_urllib_parse_unquote_to_bytes(data)
+            if mediatype.endswith(';base64'):
+                data = binascii.a2b_base64(data)
+                mediatype = mediatype[:-7]
+
+            if not mediatype:
+                mediatype = 'text/plain;charset=US-ASCII'
+
+            headers = email.message_from_string(
+                'Content-type: %s\nContent-length: %d\n' % (mediatype, len(data)))
+
+            return compat_urllib_response.addinfourl(io.BytesIO(data), headers, url)
+
+try:
+    compat_basestring = basestring  # Python 2
+except NameError:
+    compat_basestring = str
+
+try:
+    compat_chr = unichr  # Python 2
+except NameError:
+    compat_chr = chr
+
+try:
+    from xml.etree.ElementTree import ParseError as compat_xml_parse_error
+except ImportError:  # Python 2.6
+    from xml.parsers.expat import ExpatError as compat_xml_parse_error
+
+
+etree = xml.etree.ElementTree
+
+
+class _TreeBuilder(etree.TreeBuilder):
+    def doctype(self, name, pubid, system):
+        pass
+
+
+try:
+    # xml.etree.ElementTree.Element is a method in Python <=2.6 and
+    # the following will crash with:
+    #  TypeError: isinstance() arg 2 must be a class, type, or tuple of classes and types
+    isinstance(None, xml.etree.ElementTree.Element)
+    from xml.etree.ElementTree import Element as compat_etree_Element
+except TypeError:  # Python <=2.6
+    from xml.etree.ElementTree import _ElementInterface as compat_etree_Element
+
+if sys.version_info[0] >= 3:
+    def compat_etree_fromstring(text):
+        return etree.XML(text, parser=etree.XMLParser(target=_TreeBuilder()))
+else:
+    # python 2.x tries to encode unicode strings with ascii (see the
+    # XMLParser._fixtext method)
+    try:
+        _etree_iter = etree.Element.iter
+    except AttributeError:  # Python <=2.6
+        def _etree_iter(root):
+            for el in root.findall('*'):
+                yield el
+                for sub in _etree_iter(el):
+                    yield sub
+
+    # on 2.6 XML doesn't have a parser argument, function copied from CPython
+    # 2.7 source
+    def _XML(text, parser=None):
+        if not parser:
+            parser = etree.XMLParser(target=_TreeBuilder())
+        parser.feed(text)
+        return parser.close()
+
+    def _element_factory(*args, **kwargs):
+        el = etree.Element(*args, **kwargs)
+        for k, v in el.items():
+            if isinstance(v, bytes):
+                el.set(k, v.decode('utf-8'))
+        return el
+
+    def compat_etree_fromstring(text):
+        doc = _XML(text, parser=etree.XMLParser(target=_TreeBuilder(element_factory=_element_factory)))
+        for el in _etree_iter(doc):
+            if el.text is not None and isinstance(el.text, bytes):
+                el.text = el.text.decode('utf-8')
+        return doc
+
+if hasattr(etree, 'register_namespace'):
+    compat_etree_register_namespace = etree.register_namespace
+else:
+    def compat_etree_register_namespace(prefix, uri):
+        """Register a namespace prefix.
+        The registry is global, and any existing mapping for either the
+        given prefix or the namespace URI will be removed.
+        *prefix* is the namespace prefix, *uri* is a namespace uri. Tags and
+        attributes in this namespace will be serialized with prefix if possible.
+        ValueError is raised if prefix is reserved or is invalid.
+        """
+        if re.match(r"ns\d+$", prefix):
+            raise ValueError("Prefix format reserved for internal use")
+        for k, v in list(etree._namespace_map.items()):
+            if k == uri or v == prefix:
+                del etree._namespace_map[k]
+        etree._namespace_map[uri] = prefix
+
+if sys.version_info < (2, 7):
+    # Here comes the crazy part: In 2.6, if the xpath is a unicode,
+    # .//node does not match if a node is a direct child of . !
+    def compat_xpath(xpath):
+        if isinstance(xpath, compat_str):
+            xpath = xpath.encode('ascii')
+        return xpath
+else:
+    compat_xpath = lambda xpath: xpath
+
+try:
+    from urllib.parse import parse_qs as compat_parse_qs
+except ImportError:  # Python 2
     # HACK: The following is the correct parse_qs implementation from cpython 3's stdlib.
     # Python 2's version is apparently totally broken
+
     def _parse_qsl(qs, keep_blank_values=False, strict_parsing=False,
                    encoding='utf-8', errors='replace'):
         qs, _coerce_result = qs, compat_str
@@ -2625,422 +2649,10 @@ except ImportError:  # Python 2
                 parsed_result[name] = [value]
         return parsed_result
 
-    setattr(compat_urllib_parse, '_urlencode',
-            getattr(compat_urllib_parse, 'urlencode'))
-    for name, fix in (
-            ('unquote_to_bytes', compat_urllib_parse_unquote_to_bytes),
-            ('parse_unquote', compat_urllib_parse_unquote),
-            ('unquote_plus', compat_urllib_parse_unquote_plus),
-            ('urlencode', compat_urllib_parse_urlencode),
-            ('parse_qs', compat_parse_qs)):
-        setattr(compat_urllib_parse, name, fix)
 
-    try:
-        all(chr(i) in b'' for i in range(256))
-    except TypeError:
-        # not all chr(i) are str: patch Python2 quote
-
-        _safemaps = getattr(compat_urllib_parse, '_safemaps', {})
-        _always_safe = frozenset(compat_urllib_parse.always_safe)
-
-        def _quote(s, safe='/'):
-            """quote('abc def') -> 'abc%20def'"""
-
-            if not s and s is not None:  # fast path
-                return s
-            safe = frozenset(safe)
-            cachekey = (safe, _always_safe)
-            try:
-                safe_map = _safemaps[cachekey]
-            except KeyError:
-                safe = _always_safe | safe
-                safe_map = {}
-                for i in range(256):
-                    c = chr(i)
-                    safe_map[c] = (
-                        c if (i < 128 and c in safe)
-                        else b'%{0:02X}'.format(i))
-                _safemaps[cachekey] = safe_map
-
-            if safe.issuperset(s):
-                return s
-            return ''.join(safe_map[c] for c in s)
-
-        # linked code
-        def _quote_plus(s, safe=''):
-            return (
-                _quote(s, safe + b' ').replace(b' ', b'+') if b' ' in s
-                else _quote(s, safe))
-
-        # linked code
-        def _urlcleanup():
-            if compat_urllib_parse._urlopener:
-                compat_urllib_parse._urlopener.cleanup()
-            _safemaps.clear()
-            compat_urllib_parse.ftpcache.clear()
-
-        for name, fix in (
-                ('quote', _quote),
-                ('quote_plus', _quote_plus),
-                ('urlcleanup', _urlcleanup)):
-            setattr(compat_urllib_parse, '_' + name, getattr(compat_urllib_parse, name))
-            setattr(compat_urllib_parse, name, fix)
-
-compat_urllib_parse_parse_qs = compat_parse_qs
-
-
-# compat_urllib_request_DataHandler
-try:
-    from urllib.request import DataHandler as compat_urllib_request_DataHandler
-except ImportError:  # Python < 3.4
-    # Ported from CPython 98774:1733b3bd46db, Lib/urllib/request.py
-    class compat_urllib_request_DataHandler(compat_urllib_request.BaseHandler):
-        def data_open(self, req):
-            # data URLs as specified in RFC 2397.
-            #
-            # ignores POSTed data
-            #
-            # syntax:
-            # dataurl   := "data:" [ mediatype ] [ ";base64" ] "," data
-            # mediatype := [ type "/" subtype ] *( ";" parameter )
-            # data      := *urlchar
-            # parameter := attribute "=" value
-            url = req.get_full_url()
-
-            scheme, data = url.split(':', 1)
-            mediatype, data = data.split(',', 1)
-
-            # even base64 encoded data URLs might be quoted so unquote in any case:
-            data = compat_urllib_parse_unquote_to_bytes(data)
-            if mediatype.endswith(';base64'):
-                data = binascii.a2b_base64(data)
-                mediatype = mediatype[:-7]
-
-            if not mediatype:
-                mediatype = 'text/plain;charset=US-ASCII'
-
-            headers = email.message_from_string(
-                'Content-type: %s\nContent-length: %d\n' % (mediatype, len(data)))
-
-            return compat_urllib_response.addinfourl(io.BytesIO(data), headers, url)
-
-
-# compat_xml_etree_ElementTree_ParseError
-try:
-    from xml.etree.ElementTree import ParseError as compat_xml_parse_error
-except ImportError:  # Python 2.6
-    from xml.parsers.expat import ExpatError as compat_xml_parse_error
-compat_xml_etree_ElementTree_ParseError = compat_xml_parse_error
-
-
-# compat_xml_etree_ElementTree_Element
-_etree = xml.etree.ElementTree
-
-
-class _TreeBuilder(_etree.TreeBuilder):
-    def doctype(self, name, pubid, system):
-        pass
-
-
-try:
-    # xml.etree.ElementTree.Element is a method in Python <=2.6 and
-    # the following will crash with:
-    #  TypeError: isinstance() arg 2 must be a class, type, or tuple of classes and types
-    isinstance(None, _etree.Element)
-    from xml.etree.ElementTree import Element as compat_etree_Element
-except TypeError:  # Python <=2.6
-    from xml.etree.ElementTree import _ElementInterface as compat_etree_Element
-compat_xml_etree_ElementTree_Element = compat_etree_Element
-
-if sys.version_info[0] >= 3:
-    def compat_etree_fromstring(text):
-        return _etree.XML(text, parser=_etree.XMLParser(target=_TreeBuilder()))
-else:
-    # python 2.x tries to encode unicode strings with ascii (see the
-    # XMLParser._fixtext method)
-    try:
-        _etree_iter = _etree.Element.iter
-    except AttributeError:  # Python <=2.6
-        def _etree_iter(root):
-            for el in root.findall('*'):
-                yield el
-                for sub in _etree_iter(el):
-                    yield sub
-
-    # on 2.6 XML doesn't have a parser argument, function copied from CPython
-    # 2.7 source
-    def _XML(text, parser=None):
-        if not parser:
-            parser = _etree.XMLParser(target=_TreeBuilder())
-        parser.feed(text)
-        return parser.close()
-
-    def _element_factory(*args, **kwargs):
-        el = _etree.Element(*args, **kwargs)
-        for k, v in el.items():
-            if isinstance(v, bytes):
-                el.set(k, v.decode('utf-8'))
-        return el
-
-    def compat_etree_fromstring(text):
-        doc = _XML(text, parser=_etree.XMLParser(target=_TreeBuilder(element_factory=_element_factory)))
-        for el in _etree_iter(doc):
-            if el.text is not None and isinstance(el.text, bytes):
-                el.text = el.text.decode('utf-8')
-        return doc
-
-
-# compat_xml_etree_register_namespace
-try:
-    compat_etree_register_namespace = _etree.register_namespace
-except AttributeError:
-    def compat_etree_register_namespace(prefix, uri):
-        """Register a namespace prefix.
-        The registry is global, and any existing mapping for either the
-        given prefix or the namespace URI will be removed.
-        *prefix* is the namespace prefix, *uri* is a namespace uri. Tags and
-        attributes in this namespace will be serialized with prefix if possible.
-        ValueError is raised if prefix is reserved or is invalid.
-        """
-        if re.match(r'ns\d+$', prefix):
-            raise ValueError('Prefix format reserved for internal use')
-        for k, v in list(_etree._namespace_map.items()):
-            if k == uri or v == prefix:
-                del _etree._namespace_map[k]
-        _etree._namespace_map[uri] = prefix
-compat_xml_etree_register_namespace = compat_etree_register_namespace
-
-
-# compat_xpath, compat_etree_iterfind
-if sys.version_info < (2, 7):
-    # Here comes the crazy part: In 2.6, if the xpath is a unicode,
-    # .//node does not match if a node is a direct child of . !
-    def compat_xpath(xpath):
-        if isinstance(xpath, compat_str):
-            xpath = xpath.encode('ascii')
-        return xpath
-
-    # further code below based on CPython 2.7 source
-    import functools
-
-    _xpath_tokenizer_re = re.compile(r'''(?x)
-        (                                   # (1)
-            '[^']*'|"[^"]*"|                # quoted strings, or
-            ::|//?|\.\.|\(\)|[/.*:[\]()@=]  # navigation specials
-        )|                                  # or (2)
-        ((?:\{[^}]+\})?[^/[\]()@=\s]+)|     # token: optional {ns}, no specials
-        \s+                                 # or white space
-    ''')
-
-    def _xpath_tokenizer(pattern, namespaces=None):
-        for token in _xpath_tokenizer_re.findall(pattern):
-            tag = token[1]
-            if tag and tag[0] != "{" and ":" in tag:
-                try:
-                    if not namespaces:
-                        raise KeyError
-                    prefix, uri = tag.split(":", 1)
-                    yield token[0], "{%s}%s" % (namespaces[prefix], uri)
-                except KeyError:
-                    raise SyntaxError("prefix %r not found in prefix map" % prefix)
-            else:
-                yield token
-
-    def _get_parent_map(context):
-        parent_map = context.parent_map
-        if parent_map is None:
-            context.parent_map = parent_map = {}
-            for p in context.root.getiterator():
-                for e in p:
-                    parent_map[e] = p
-        return parent_map
-
-    def _select(context, result, filter_fn=lambda *_: True):
-        for elem in result:
-            for e in elem:
-                if filter_fn(e, elem):
-                    yield e
-
-    def _prepare_child(next_, token):
-        tag = token[1]
-        return functools.partial(_select, filter_fn=lambda e, _: e.tag == tag)
-
-    def _prepare_star(next_, token):
-        return _select
-
-    def _prepare_self(next_, token):
-        return lambda _, result: (e for e in result)
-
-    def _prepare_descendant(next_, token):
-        token = next(next_)
-        if token[0] == "*":
-            tag = "*"
-        elif not token[0]:
-            tag = token[1]
-        else:
-            raise SyntaxError("invalid descendant")
-
-        def select(context, result):
-            for elem in result:
-                for e in elem.getiterator(tag):
-                    if e is not elem:
-                        yield e
-        return select
-
-    def _prepare_parent(next_, token):
-        def select(context, result):
-            # FIXME: raise error if .. is applied at toplevel?
-            parent_map = _get_parent_map(context)
-            result_map = {}
-            for elem in result:
-                if elem in parent_map:
-                    parent = parent_map[elem]
-                    if parent not in result_map:
-                        result_map[parent] = None
-                        yield parent
-        return select
-
-    def _prepare_predicate(next_, token):
-        signature = []
-        predicate = []
-        for token in next_:
-            if token[0] == "]":
-                break
-            if token[0] and token[0][:1] in "'\"":
-                token = "'", token[0][1:-1]
-            signature.append(token[0] or "-")
-            predicate.append(token[1])
-
-        def select(context, result, filter_fn=lambda _: True):
-            for elem in result:
-                if filter_fn(elem):
-                    yield elem
-
-        signature = "".join(signature)
-        # use signature to determine predicate type
-        if signature == "@-":
-            # [@attribute] predicate
-            key = predicate[1]
-            return functools.partial(
-                select, filter_fn=lambda el: el.get(key) is not None)
-        if signature == "@-='":
-            # [@attribute='value']
-            key = predicate[1]
-            value = predicate[-1]
-            return functools.partial(
-                select, filter_fn=lambda el: el.get(key) == value)
-        if signature == "-" and not re.match(r"\d+$", predicate[0]):
-            # [tag]
-            tag = predicate[0]
-            return functools.partial(
-                select, filter_fn=lambda el: el.find(tag) is not None)
-        if signature == "-='" and not re.match(r"\d+$", predicate[0]):
-            # [tag='value']
-            tag = predicate[0]
-            value = predicate[-1]
-
-            def itertext(el):
-                for e in el.getiterator():
-                    e = e.text
-                    if e:
-                        yield e
-
-            def select(context, result):
-                for elem in result:
-                    for e in elem.findall(tag):
-                        if "".join(itertext(e)) == value:
-                            yield elem
-                            break
-            return select
-        if signature == "-" or signature == "-()" or signature == "-()-":
-            # [index] or [last()] or [last()-index]
-            if signature == "-":
-                index = int(predicate[0]) - 1
-            else:
-                if predicate[0] != "last":
-                    raise SyntaxError("unsupported function")
-                if signature == "-()-":
-                    try:
-                        index = int(predicate[2]) - 1
-                    except ValueError:
-                        raise SyntaxError("unsupported expression")
-                else:
-                    index = -1
-
-            def select(context, result):
-                parent_map = _get_parent_map(context)
-                for elem in result:
-                    try:
-                        parent = parent_map[elem]
-                        # FIXME: what if the selector is "*" ?
-                        elems = list(parent.findall(elem.tag))
-                        if elems[index] is elem:
-                            yield elem
-                    except (IndexError, KeyError):
-                        pass
-            return select
-        raise SyntaxError("invalid predicate")
-
-    ops = {
-        "": _prepare_child,
-        "*": _prepare_star,
-        ".": _prepare_self,
-        "..": _prepare_parent,
-        "//": _prepare_descendant,
-        "[": _prepare_predicate,
-    }
-
-    _cache = {}
-
-    class _SelectorContext:
-        parent_map = None
-
-        def __init__(self, root):
-            self.root = root
-
-    # Generate all matching objects.
-
-    def compat_etree_iterfind(elem, path, namespaces=None):
-        # compile selector pattern
-        if path[-1:] == "/":
-            path = path + "*"  # implicit all (FIXME: keep this?)
-        try:
-            selector = _cache[path]
-        except KeyError:
-            if len(_cache) > 100:
-                _cache.clear()
-            if path[:1] == "/":
-                raise SyntaxError("cannot use absolute path on element")
-            tokens = _xpath_tokenizer(path, namespaces)
-            selector = []
-            for token in tokens:
-                if token[0] == "/":
-                    continue
-                try:
-                    selector.append(ops[token[0]](tokens, token))
-                except StopIteration:
-                    raise SyntaxError("invalid path")
-            _cache[path] = selector
-        # execute selector pattern
-        result = [elem]
-        context = _SelectorContext(elem)
-        for select in selector:
-            result = select(context, result)
-        return result
-
-    # end of code based on CPython 2.7 source
-
-
-else:
-    compat_etree_iterfind = lambda element, match: element.iterfind(match)
-    compat_xpath = _IDENTITY
-
-
-# compat_os_name
 compat_os_name = os._name if os.name == 'java' else os.name
 
 
-# compat_shlex_quote
 if compat_os_name == 'nt':
     def compat_shlex_quote(s):
         return s if re.match(r'^[-_\w./]+$', s) else '"%s"' % s.replace('"', '\\"')
@@ -3055,7 +2667,6 @@ else:
                 return "'" + s.replace("'", "'\"'\"'") + "'"
 
 
-# compat_shlex.split
 try:
     args = shlex.split('中文')
     assert (isinstance(args, list)
@@ -3071,15 +2682,13 @@ except (AssertionError, UnicodeEncodeError):
         return list(map(lambda s: s.decode('utf-8'), shlex.split(s, comments, posix)))
 
 
-# compat_ord
 def compat_ord(c):
-    if isinstance(c, int):
+    if type(c) is int:
         return c
     else:
         return ord(c)
 
 
-# compat_getenv, compat_os_path_expanduser, compat_setenv
 if sys.version_info >= (3, 0):
     compat_getenv = os.getenv
     compat_expanduser = os.path.expanduser
@@ -3164,25 +2773,7 @@ else:
     else:
         compat_expanduser = os.path.expanduser
 
-compat_os_path_expanduser = compat_expanduser
 
-
-# compat_os_makedirs
-try:
-    os.makedirs('.', exist_ok=True)
-    compat_os_makedirs = os.makedirs
-except TypeError:  # < Py3.2
-    from errno import EEXIST as _errno_EEXIST
-
-    def compat_os_makedirs(name, mode=0o777, exist_ok=False):
-        try:
-            return os.makedirs(name, mode=mode)
-        except OSError as ose:
-            if not (exist_ok and ose.errno == _errno_EEXIST):
-                raise
-
-
-# compat_os_path_realpath
 if compat_os_name == 'nt' and sys.version_info < (3, 8):
     # os.path.realpath on Windows does not follow symbolic links
     # prior to Python 3.8 (see https://bugs.python.org/issue9949)
@@ -3193,10 +2784,7 @@ if compat_os_name == 'nt' and sys.version_info < (3, 8):
 else:
     compat_realpath = os.path.realpath
 
-compat_os_path_realpath = compat_realpath
 
-
-# compat_print
 if sys.version_info < (3, 0):
     def compat_print(s):
         from .utils import preferredencoding
@@ -3207,7 +2795,6 @@ else:
         print(s)
 
 
-# compat_getpass_getpass
 if sys.version_info < (3, 0) and sys.platform == 'win32':
     def compat_getpass(prompt, *args, **kwargs):
         if isinstance(prompt, compat_str):
@@ -3217,45 +2804,35 @@ if sys.version_info < (3, 0) and sys.platform == 'win32':
 else:
     compat_getpass = getpass.getpass
 
-compat_getpass_getpass = compat_getpass
-
-
-# compat_input
 try:
     compat_input = raw_input
 except NameError:  # Python 3
     compat_input = input
 
-
-# compat_kwargs
 # Python < 2.6.5 require kwargs to be bytes
 try:
-    (lambda x: x)(**{'x': 0})
+    def _testfunc(x):
+        pass
+    _testfunc(**{'x': 0})
 except TypeError:
     def compat_kwargs(kwargs):
         return dict((bytes(k), v) for k, v in kwargs.items())
 else:
-    compat_kwargs = _IDENTITY
+    compat_kwargs = lambda kwargs: kwargs
 
 
-# compat_numeric_types
 try:
     compat_numeric_types = (int, float, long, complex)
 except NameError:  # Python 3
     compat_numeric_types = (int, float, complex)
 
 
-# compat_integer_types
 try:
     compat_integer_types = (int, long)
 except NameError:  # Python 3
     compat_integer_types = (int, )
 
-# compat_int
-compat_int = compat_integer_types[-1]
 
-
-# compat_socket_create_connection
 if sys.version_info < (2, 7):
     def compat_socket_create_connection(address, timeout, source_address=None):
         host, port = address
@@ -3282,55 +2859,9 @@ else:
     compat_socket_create_connection = socket.create_connection
 
 
-# compat_contextlib_suppress
-try:
-    from contextlib import suppress as compat_contextlib_suppress
-except ImportError:
-    class compat_contextlib_suppress(object):
-        _exceptions = None
-
-        def __init__(self, *exceptions):
-            super(compat_contextlib_suppress, self).__init__()
-            # TODO: [Base]ExceptionGroup (3.12+)
-            self._exceptions = exceptions
-
-        def __enter__(self):
-            return self
-
-        def __exit__(self, exc_type, exc_val, exc_tb):
-            return exc_type is not None and issubclass(exc_type, self._exceptions or tuple())
-
-
-# subprocess.Popen context manager
-# avoids leaking handles if .communicate() is not called
-try:
-    _Popen = subprocess.Popen
-    # check for required context manager attributes
-    _Popen.__enter__ and _Popen.__exit__
-    compat_subprocess_Popen = _Popen
-except AttributeError:
-    # not a context manager - make one
-    from contextlib import contextmanager
-
-    @contextmanager
-    def compat_subprocess_Popen(*args, **kwargs):
-        popen = None
-        try:
-            popen = _Popen(*args, **kwargs)
-            yield popen
-        finally:
-            if popen:
-                for f in (popen.stdin, popen.stdout, popen.stderr):
-                    if f:
-                        # repeated .close() is OK, but just in case
-                        with compat_contextlib_suppress(EnvironmentError):
-                            f.close()
-            popen.wait()
-
-
 # Fix https://github.com/ytdl-org/youtube-dl/issues/4223
 # See http://bugs.python.org/issue9161 for what is broken
-def _workaround_optparse_bug9161():
+def workaround_optparse_bug9161():
     op = optparse.OptionParser()
     og = optparse.OptionGroup(op, 'foo')
     try:
@@ -3349,14 +2880,12 @@ def _workaround_optparse_bug9161():
         optparse.OptionGroup.add_option = _compat_add_option
 
 
-# compat_shutil_get_terminal_size
-try:
-    from shutil import get_terminal_size as compat_get_terminal_size  # Python >= 3.3
-except ImportError:
+if hasattr(shutil, 'get_terminal_size'):  # Python >= 3.3
+    compat_get_terminal_size = shutil.get_terminal_size
+else:
     _terminal_size = collections.namedtuple('terminal_size', ['columns', 'lines'])
 
     def compat_get_terminal_size(fallback=(80, 24)):
-        from .utils import process_communicate_or_kill
         columns = compat_getenv('COLUMNS')
         if columns:
             columns = int(columns)
@@ -3373,7 +2902,7 @@ except ImportError:
                 sp = subprocess.Popen(
                     ['stty', 'size'],
                     stdout=subprocess.PIPE, stderr=subprocess.PIPE)
-                out, err = process_communicate_or_kill(sp)
+                out, err = sp.communicate()
                 _lines, _columns = map(int, out.split())
             except Exception:
                 _columns, _lines = _terminal_size(*fallback)
@@ -3382,33 +2911,26 @@ except ImportError:
                 columns = _columns
             if lines is None or lines <= 0:
                 lines = _lines
-
         return _terminal_size(columns, lines)
 
-compat_shutil_get_terminal_size = compat_get_terminal_size
-
-
-# compat_itertools_count
 try:
-    type(itertools.count(start=0, step=1))
+    itertools.count(start=0, step=1)
     compat_itertools_count = itertools.count
-except TypeError:  # Python 2.6 lacks step
+except TypeError:  # Python 2.6
     def compat_itertools_count(start=0, step=1):
+        n = start
         while True:
-            yield start
-            start += step
+            yield n
+            n += step
 
-
-# compat_tokenize_tokenize
 if sys.version_info >= (3, 0):
     from tokenize import tokenize as compat_tokenize_tokenize
 else:
     from tokenize import generate_tokens as compat_tokenize_tokenize
 
 
-# compat_struct_pack, compat_struct_unpack, compat_Struct
 try:
-    type(struct.pack('!I', 0))
+    struct.pack('!I', 0)
 except TypeError:
     # In Python 2.6 and 2.7.x < 2.7.7, struct requires a bytes argument
     # See https://bugs.python.org/issue19099
@@ -3440,27 +2962,6 @@ else:
         compat_Struct = struct.Struct
 
 
-# builtins returning an iterator
-
-# compat_map, compat_filter
-# supposedly the same versioning as for zip below
-try:
-    from future_builtins import map as compat_map
-except ImportError:
-    try:
-        from itertools import imap as compat_map
-    except ImportError:
-        compat_map = map
-
-try:
-    from future_builtins import filter as compat_filter
-except ImportError:
-    try:
-        from itertools import ifilter as compat_filter
-    except ImportError:
-        compat_filter = filter
-
-# compat_zip
 try:
     from future_builtins import zip as compat_zip
 except ImportError:  # not 2.6+ or is 3.x
@@ -3470,87 +2971,6 @@ except ImportError:  # not 2.6+ or is 3.x
         compat_zip = zip
 
 
-# compat_itertools_zip_longest
-# method renamed between Py2/3
-try:
-    from itertools import zip_longest as compat_itertools_zip_longest
-except ImportError:
-    from itertools import izip_longest as compat_itertools_zip_longest
-
-
-# compat_collections_chain_map
-# collections.ChainMap: new class
-try:
-    from collections import ChainMap as compat_collections_chain_map
-    # Py3.3's ChainMap is deficient
-    if sys.version_info < (3, 4):
-        raise ImportError
-except ImportError:
-    # Py <= 3.3
-    class compat_collections_chain_map(compat_collections_abc.MutableMapping):
-
-        maps = [{}]
-
-        def __init__(self, *maps):
-            self.maps = list(maps) or [{}]
-
-        def __getitem__(self, k):
-            for m in self.maps:
-                if k in m:
-                    return m[k]
-            raise KeyError(k)
-
-        def __setitem__(self, k, v):
-            self.maps[0].__setitem__(k, v)
-            return
-
-        def __contains__(self, k):
-            return any((k in m) for m in self.maps)
-
-        def __delitem(self, k):
-            if k in self.maps[0]:
-                del self.maps[0][k]
-                return
-            raise KeyError(k)
-
-        def __delitem__(self, k):
-            self.__delitem(k)
-
-        def __iter__(self):
-            return itertools.chain(*reversed(self.maps))
-
-        def __len__(self):
-            return len(iter(self))
-
-        # to match Py3, don't del directly
-        def pop(self, k, *args):
-            if self.__contains__(k):
-                off = self.__getitem__(k)
-                self.__delitem(k)
-                return off
-            elif len(args) > 0:
-                return args[0]
-            raise KeyError(k)
-
-        def new_child(self, m=None, **kwargs):
-            m = m or {}
-            m.update(kwargs)
-            # support inheritance !
-            return type(self)(m, *self.maps)
-
-        @property
-        def parents(self):
-            return type(self)(*(self.maps[1:]))
-
-
-# compat_re_Pattern, compat_re_Match
-# Pythons disagree on the type of a pattern (RegexObject, _sre.SRE_Pattern, Pattern, ...?)
-compat_re_Pattern = type(re.compile(''))
-# and on the type of a match
-compat_re_Match = type(re.match('a', 'a'))
-
-
-# compat_base64_b64decode
 if sys.version_info < (3, 3):
     def compat_b64decode(s, *args, **kwargs):
         if isinstance(s, compat_str):
@@ -3559,10 +2979,7 @@ if sys.version_info < (3, 3):
 else:
     compat_b64decode = base64.b64decode
 
-compat_base64_b64decode = compat_b64decode
 
-
-# compat_ctypes_WINFUNCTYPE
 if platform.python_implementation() == 'PyPy' and sys.pypy_version_info < (5, 4, 0):
     # PyPy2 prior to version 5.4.0 expects byte strings as Windows function
     # names, see the original PyPy issue [1] and the youtube-dl one [2].
@@ -3581,153 +2998,63 @@ else:
         return ctypes.WINFUNCTYPE(*args, **kwargs)
 
 
-# compat_open
-if sys.version_info < (3, 0):
-    # open(file, mode='r', buffering=- 1, encoding=None, errors=None, newline=None, closefd=True) not: opener=None
-    def compat_open(file_, *args, **kwargs):
-        if len(args) > 6 or 'opener' in kwargs:
-            raise ValueError('open: unsupported argument "opener"')
-        return io.open(file_, *args, **kwargs)
-else:
-    compat_open = open
-
-
-# compat_register_utf8
-def compat_register_utf8():
-    if sys.platform == 'win32':
-        # https://github.com/ytdl-org/youtube-dl/issues/820
-        from codecs import register, lookup
-        register(
-            lambda name: lookup('utf-8') if name == 'cp65001' else None)
-
-
-# compat_datetime_timedelta_total_seconds
-try:
-    compat_datetime_timedelta_total_seconds = datetime.timedelta.total_seconds
-except AttributeError:
-    # Py 2.6
-    def compat_datetime_timedelta_total_seconds(td):
-        return (td.microseconds + (td.seconds + td.days * 24 * 3600) * 10**6) / 10**6
-
-
-# optional decompression packages
-# compat_brotli
-# PyPi brotli package implements 'br' Content-Encoding
-try:
-    import brotli as compat_brotli
-except ImportError:
-    compat_brotli = None
-# compat_ncompress
-# PyPi ncompress package implements 'compress' Content-Encoding
-try:
-    import ncompress as compat_ncompress
-except ImportError:
-    compat_ncompress = None
-
-# compat_zstandard
-# PyPi zstandard package implements 'zstd' Content-Encoding (RFC 8878 7.2)
-try:
-    import zstandard as compat_zstandard
-except ImportError:
-    compat_zstandard = None
-
-
-legacy = [
+__all__ = [
     'compat_HTMLParseError',
     'compat_HTMLParser',
     'compat_HTTPError',
+    'compat_Struct',
     'compat_b64decode',
+    'compat_basestring',
+    'compat_chr',
     'compat_cookiejar',
     'compat_cookiejar_Cookie',
     'compat_cookies',
     'compat_cookies_SimpleCookie',
+    'compat_ctypes_WINFUNCTYPE',
     'compat_etree_Element',
+    'compat_etree_fromstring',
     'compat_etree_register_namespace',
     'compat_expanduser',
-    'compat_getpass',
-    'compat_parse_qs',
-    'compat_realpath',
-    'compat_shlex_split',
-    'compat_urllib_parse_parse_qs',
-    'compat_urllib_parse_unquote',
-    'compat_urllib_parse_unquote_plus',
-    'compat_urllib_parse_unquote_to_bytes',
-    'compat_urllib_parse_urlencode',
-    'compat_urllib_parse_urlparse',
-    'compat_urlparse',
-    'compat_urlretrieve',
-    'compat_xml_parse_error',
-]
-
-
-__all__ = [
-    'compat_Struct',
-    'compat_base64_b64decode',
-    'compat_basestring',
-    'compat_brotli',
-    'compat_casefold',
-    'compat_chr',
-    'compat_collections_abc',
-    'compat_collections_chain_map',
-    'compat_contextlib_suppress',
-    'compat_ctypes_WINFUNCTYPE',
-    'compat_datetime_timedelta_total_seconds',
-    'compat_etree_fromstring',
-    'compat_etree_iterfind',
-    'compat_filter',
     'compat_get_terminal_size',
     'compat_getenv',
-    'compat_getpass_getpass',
+    'compat_getpass',
     'compat_html_entities',
     'compat_html_entities_html5',
-    'compat_html_parser_HTMLParseError',
-    'compat_html_parser_HTMLParser',
-    'compat_http_cookiejar',
-    'compat_http_cookiejar_Cookie',
-    'compat_http_cookies',
-    'compat_http_cookies_SimpleCookie',
     'compat_http_client',
     'compat_http_server',
     'compat_input',
-    'compat_int',
     'compat_integer_types',
     'compat_itertools_count',
-    'compat_itertools_zip_longest',
     'compat_kwargs',
-    'compat_map',
-    'compat_ncompress',
     'compat_numeric_types',
-    'compat_open',
     'compat_ord',
-    'compat_os_makedirs',
     'compat_os_name',
-    'compat_os_path_expanduser',
-    'compat_os_path_realpath',
+    'compat_parse_qs',
     'compat_print',
-    'compat_re_Match',
-    'compat_re_Pattern',
-    'compat_register_utf8',
+    'compat_realpath',
     'compat_setenv',
     'compat_shlex_quote',
-    'compat_shutil_get_terminal_size',
+    'compat_shlex_split',
     'compat_socket_create_connection',
     'compat_str',
     'compat_struct_pack',
     'compat_struct_unpack',
     'compat_subprocess_get_DEVNULL',
-    'compat_subprocess_Popen',
     'compat_tokenize_tokenize',
     'compat_urllib_error',
     'compat_urllib_parse',
+    'compat_urllib_parse_unquote',
+    'compat_urllib_parse_unquote_plus',
+    'compat_urllib_parse_unquote_to_bytes',
+    'compat_urllib_parse_urlencode',
+    'compat_urllib_parse_urlparse',
     'compat_urllib_request',
     'compat_urllib_request_DataHandler',
     'compat_urllib_response',
-    'compat_urllib_request_urlretrieve',
-    'compat_urllib_HTTPError',
-    'compat_xml_etree_ElementTree_Element',
-    'compat_xml_etree_ElementTree_ParseError',
-    'compat_xml_etree_register_namespace',
+    'compat_urlparse',
+    'compat_urlretrieve',
+    'compat_xml_parse_error',
     'compat_xpath',
     'compat_zip',
-    'compat_zstandard',
+    'workaround_optparse_bug9161',
 ]
diff --git a/youtube_dl/downloader/__init__.py b/youtube_dl/downloader/__init__.py
index d701d6292..2e485df9d 100644
--- a/youtube_dl/downloader/__init__.py
+++ b/youtube_dl/downloader/__init__.py
@@ -1,31 +1,22 @@
 from __future__ import unicode_literals
 
-from ..utils import (
-    determine_protocol,
-)
-
-
-def get_suitable_downloader(info_dict, params={}):
-    info_dict['protocol'] = determine_protocol(info_dict)
-    info_copy = info_dict.copy()
-    return _get_suitable_downloader(info_copy, params)
-
-
-# Some of these require get_suitable_downloader
 from .common import FileDownloader
-from .dash import DashSegmentsFD
 from .f4m import F4mFD
 from .hls import HlsFD
 from .http import HttpFD
 from .rtmp import RtmpFD
+from .dash import DashSegmentsFD
 from .rtsp import RtspFD
 from .ism import IsmFD
-from .niconico import NiconicoDmcFD
 from .external import (
     get_external_downloader,
     FFmpegFD,
 )
 
+from ..utils import (
+    determine_protocol,
+)
+
 PROTOCOL_MAP = {
     'rtmp': RtmpFD,
     'm3u8_native': HlsFD,
@@ -35,12 +26,13 @@ PROTOCOL_MAP = {
     'f4m': F4mFD,
     'http_dash_segments': DashSegmentsFD,
     'ism': IsmFD,
-    'niconico_dmc': NiconicoDmcFD,
 }
 
 
-def _get_suitable_downloader(info_dict, params={}):
+def get_suitable_downloader(info_dict, params={}):
     """Get the downloader class that can handle the info dict."""
+    protocol = determine_protocol(info_dict)
+    info_dict['protocol'] = protocol
 
     # if (info_dict.get('start_time') or info_dict.get('end_time')) and not info_dict.get('requested_formats') and FFmpegFD.can_download(info_dict):
     #     return FFmpegFD
@@ -50,11 +42,7 @@ def _get_suitable_downloader(info_dict, params={}):
         ed = get_external_downloader(external_downloader)
         if ed.can_download(info_dict):
             return ed
-        # Avoid using unwanted args since external_downloader was rejected
-        if params.get('external_downloader_args'):
-            params['external_downloader_args'] = None
 
-    protocol = info_dict['protocol']
     if protocol.startswith('m3u8') and info_dict.get('is_live'):
         return FFmpegFD
 
diff --git a/youtube_dl/downloader/common.py b/youtube_dl/downloader/common.py
index 91e691776..1cdba89cd 100644
--- a/youtube_dl/downloader/common.py
+++ b/youtube_dl/downloader/common.py
@@ -88,21 +88,17 @@ class FileDownloader(object):
             return '---.-%'
         return '%6s' % ('%3.1f%%' % percent)
 
-    @classmethod
-    def calc_eta(cls, start_or_rate, now_or_remaining, *args):
-        if len(args) < 2:
-            rate, remaining = (start_or_rate, now_or_remaining)
-            if None in (rate, remaining):
-                return None
-            return int(float(remaining) / rate)
-        start, now = (start_or_rate, now_or_remaining)
-        total, current = args[:2]
+    @staticmethod
+    def calc_eta(start, now, total, current):
         if total is None:
             return None
         if now is None:
             now = time.time()
-        rate = cls.calc_speed(start, now, current)
-        return rate and int((float(total) - float(current)) / rate)
+        dif = now - start
+        if current == 0 or dif < 0.001:  # One millisecond
+            return None
+        rate = float(current) / dif
+        return int((float(total) - float(current)) / rate)
 
     @staticmethod
     def format_eta(eta):
@@ -127,12 +123,6 @@ class FileDownloader(object):
     def format_retries(retries):
         return 'inf' if retries == float('inf') else '%.0f' % retries
 
-    @staticmethod
-    def filesize_or_none(unencoded_filename):
-        fn = encodeFilename(unencoded_filename)
-        if os.path.isfile(fn):
-            return os.path.getsize(fn)
-
     @staticmethod
     def best_block_size(elapsed_time, bytes):
         new_min = max(bytes / 2.0, 1.0)
@@ -339,10 +329,6 @@ class FileDownloader(object):
     def download(self, filename, info_dict):
         """Download to a filename using the info from info_dict
         Return True on success and False otherwise
-
-        This method filters the `Cookie` header from the info_dict to prevent leaks.
-        Downloaders have their own way of handling cookies.
-        See: https://github.com/yt-dlp/yt-dlp/security/advisories/GHSA-v8mc-9377-rwjj
         """
 
         nooverwrites_and_exists = (
diff --git a/youtube_dl/downloader/dash.py b/youtube_dl/downloader/dash.py
index f3c058879..c6d674bc6 100644
--- a/youtube_dl/downloader/dash.py
+++ b/youtube_dl/downloader/dash.py
@@ -1,7 +1,5 @@
 from __future__ import unicode_literals
 
-import itertools
-
 from .fragment import FragmentFD
 from ..compat import compat_urllib_error
 from ..utils import (
@@ -32,28 +30,26 @@ class DashSegmentsFD(FragmentFD):
         fragment_retries = self.params.get('fragment_retries', 0)
         skip_unavailable_fragments = self.params.get('skip_unavailable_fragments', True)
 
-        for frag_index, fragment in enumerate(fragments, 1):
+        frag_index = 0
+        for i, fragment in enumerate(fragments):
+            frag_index += 1
             if frag_index <= ctx['fragment_index']:
                 continue
-            success = False
             # In DASH, the first segment contains necessary headers to
             # generate a valid MP4 file, so always abort for the first segment
-            fatal = frag_index == 1 or not skip_unavailable_fragments
-            fragment_url = fragment.get('url')
-            if not fragment_url:
-                assert fragment_base_url
-                fragment_url = urljoin(fragment_base_url, fragment['path'])
-            headers = info_dict.get('http_headers')
-            fragment_range = fragment.get('range')
-            if fragment_range:
-                headers = headers.copy() if headers else {}
-                headers['Range'] = 'bytes=%s' % (fragment_range,)
-            for count in itertools.count():
+            fatal = i == 0 or not skip_unavailable_fragments
+            count = 0
+            while count <= fragment_retries:
                 try:
-                    success, frag_content = self._download_fragment(ctx, fragment_url, info_dict, headers)
+                    fragment_url = fragment.get('url')
+                    if not fragment_url:
+                        assert fragment_base_url
+                        fragment_url = urljoin(fragment_base_url, fragment['path'])
+                    success, frag_content = self._download_fragment(ctx, fragment_url, info_dict)
                     if not success:
                         return False
                     self._append_fragment(ctx, frag_content)
+                    break
                 except compat_urllib_error.HTTPError as err:
                     # YouTube may often return 404 HTTP error for a fragment causing the
                     # whole download to fail. However if the same fragment is immediately
@@ -61,21 +57,22 @@ class DashSegmentsFD(FragmentFD):
                     # is usually enough) thus allowing to download the whole file successfully.
                     # To be future-proof we will retry all fragments that fail with any
                     # HTTP error.
-                    if count < fragment_retries:
-                        self.report_retry_fragment(err, frag_index, count + 1, fragment_retries)
-                        continue
+                    count += 1
+                    if count <= fragment_retries:
+                        self.report_retry_fragment(err, frag_index, count, fragment_retries)
                 except DownloadError:
                     # Don't retry fragment if error occurred during HTTP downloading
-                    # itself since it has its own retry settings
-                    if fatal:
-                        raise
-                break
+                    # itself since it has own retry settings
+                    if not fatal:
+                        self.report_skip_fragment(frag_index)
+                        break
+                    raise
 
-            if not success:
+            if count > fragment_retries:
                 if not fatal:
                     self.report_skip_fragment(frag_index)
                     continue
-                self.report_error('giving up after %s fragment retries' % count)
+                self.report_error('giving up after %s fragment retries' % fragment_retries)
                 return False
 
         self._finish_frag_download(ctx)
diff --git a/youtube_dl/downloader/external.py b/youtube_dl/downloader/external.py
index 4fbc0f520..c31f8910a 100644
--- a/youtube_dl/downloader/external.py
+++ b/youtube_dl/downloader/external.py
@@ -1,24 +1,17 @@
 from __future__ import unicode_literals
 
-import os
+import os.path
 import re
 import subprocess
 import sys
-import tempfile
 import time
 
 from .common import FileDownloader
 from ..compat import (
     compat_setenv,
     compat_str,
-    compat_subprocess_Popen,
 )
-
-try:
-    from ..postprocessor.ffmpeg import FFmpegPostProcessor, EXT_TO_OUT_FORMATS
-except ImportError:
-    FFmpegPostProcessor = None
-
+from ..postprocessor.ffmpeg import FFmpegPostProcessor, EXT_TO_OUT_FORMATS
 from ..utils import (
     cli_option,
     cli_valueless_option,
@@ -29,9 +22,6 @@ from ..utils import (
     handle_youtubedl_headers,
     check_executable,
     is_outdated_version,
-    process_communicate_or_kill,
-    T,
-    traverse_obj,
 )
 
 
@@ -39,7 +29,6 @@ class ExternalFD(FileDownloader):
     def real_download(self, filename, info_dict):
         self.report_destination(filename)
         tmpfilename = self.temp_name(filename)
-        self._cookies_tempfile = None
 
         try:
             started = time.time()
@@ -52,13 +41,6 @@ class ExternalFD(FileDownloader):
             # should take place
             retval = 0
             self.to_screen('[%s] Interrupted by user' % self.get_basename())
-        finally:
-            if self._cookies_tempfile and os.path.isfile(self._cookies_tempfile):
-                try:
-                    os.remove(self._cookies_tempfile)
-                except OSError:
-                    self.report_warning(
-                        'Unable to delete temporary cookies file "{0}"'.format(self._cookies_tempfile))
 
         if retval == 0:
             status = {
@@ -114,16 +96,6 @@ class ExternalFD(FileDownloader):
     def _configuration_args(self, default=[]):
         return cli_configuration_args(self.params, 'external_downloader_args', default)
 
-    def _write_cookies(self):
-        if not self.ydl.cookiejar.filename:
-            tmp_cookies = tempfile.NamedTemporaryFile(suffix='.cookies', delete=False)
-            tmp_cookies.close()
-            self._cookies_tempfile = tmp_cookies.name
-            self.to_screen('[download] Writing temporary cookies file to "{0}"'.format(self._cookies_tempfile))
-        # real_download resets _cookies_tempfile; if it's None, save() will write to cookiejar.filename
-        self.ydl.cookiejar.save(self._cookies_tempfile, ignore_discard=True, ignore_expires=True)
-        return self.ydl.cookiejar.filename or self._cookies_tempfile
-
     def _call_downloader(self, tmpfilename, info_dict):
         """ Either overwrite this or implement _make_cmd """
         cmd = [encodeArgument(a) for a in self._make_cmd(tmpfilename, info_dict)]
@@ -132,26 +104,18 @@ class ExternalFD(FileDownloader):
 
         p = subprocess.Popen(
             cmd, stderr=subprocess.PIPE)
-        _, stderr = process_communicate_or_kill(p)
+        _, stderr = p.communicate()
         if p.returncode != 0:
             self.to_stderr(stderr.decode('utf-8', 'replace'))
         return p.returncode
 
-    @staticmethod
-    def _header_items(info_dict):
-        return traverse_obj(
-            info_dict, ('http_headers', T(dict.items), Ellipsis))
-
 
 class CurlFD(ExternalFD):
     AVAILABLE_OPT = '-V'
 
     def _make_cmd(self, tmpfilename, info_dict):
-        cmd = [self.exe, '--location', '-o', tmpfilename, '--compressed']
-        cookie_header = self.ydl.cookiejar.get_cookie_header(info_dict['url'])
-        if cookie_header:
-            cmd += ['--cookie', cookie_header]
-        for key, val in self._header_items(info_dict):
+        cmd = [self.exe, '--location', '-o', tmpfilename]
+        for key, val in info_dict['http_headers'].items():
             cmd += ['--header', '%s: %s' % (key, val)]
         cmd += self._bool_option('--continue-at', 'continuedl', '-', '0')
         cmd += self._valueless_option('--silent', 'noprogress')
@@ -177,7 +141,7 @@ class CurlFD(ExternalFD):
 
         # curl writes the progress to stderr so don't capture it.
         p = subprocess.Popen(cmd)
-        process_communicate_or_kill(p)
+        p.communicate()
         return p.returncode
 
 
@@ -186,11 +150,8 @@ class AxelFD(ExternalFD):
 
     def _make_cmd(self, tmpfilename, info_dict):
         cmd = [self.exe, '-o', tmpfilename]
-        for key, val in self._header_items(info_dict):
+        for key, val in info_dict['http_headers'].items():
             cmd += ['-H', '%s: %s' % (key, val)]
-        cookie_header = self.ydl.cookiejar.get_cookie_header(info_dict['url'])
-        if cookie_header:
-            cmd += ['-H', 'Cookie: {0}'.format(cookie_header), '--max-redirect=0']
         cmd += self._configuration_args()
         cmd += ['--', info_dict['url']]
         return cmd
@@ -200,10 +161,8 @@ class WgetFD(ExternalFD):
     AVAILABLE_OPT = '--version'
 
     def _make_cmd(self, tmpfilename, info_dict):
-        cmd = [self.exe, '-O', tmpfilename, '-nv', '--compression=auto']
-        if self.ydl.cookiejar.get_cookie_header(info_dict['url']):
-            cmd += ['--load-cookies', self._write_cookies()]
-        for key, val in self._header_items(info_dict):
+        cmd = [self.exe, '-O', tmpfilename, '-nv', '--no-cookies']
+        for key, val in info_dict['http_headers'].items():
             cmd += ['--header', '%s: %s' % (key, val)]
         cmd += self._option('--limit-rate', 'ratelimit')
         retry = self._option('--tries', 'retries')
@@ -212,10 +171,7 @@ class WgetFD(ExternalFD):
                 retry[1] = '0'
             cmd += retry
         cmd += self._option('--bind-address', 'source_address')
-        proxy = self.params.get('proxy')
-        if proxy:
-            for var in ('http_proxy', 'https_proxy'):
-                cmd += ['--execute', '%s=%s' % (var, proxy)]
+        cmd += self._option('--proxy', 'proxy')
         cmd += self._valueless_option('--no-check-certificate', 'nocheckcertificate')
         cmd += self._configuration_args()
         cmd += ['--', info_dict['url']]
@@ -225,121 +181,24 @@ class WgetFD(ExternalFD):
 class Aria2cFD(ExternalFD):
     AVAILABLE_OPT = '-v'
 
-    @staticmethod
-    def _aria2c_filename(fn):
-        return fn if os.path.isabs(fn) else os.path.join('.', fn)
-
     def _make_cmd(self, tmpfilename, info_dict):
-        cmd = [self.exe, '-c',
-               '--console-log-level=warn', '--summary-interval=0', '--download-result=hide',
-               '--http-accept-gzip=true', '--file-allocation=none', '-x16', '-j16', '-s16']
-        if 'fragments' in info_dict:
-            cmd += ['--allow-overwrite=true', '--allow-piece-length-change=true']
-        else:
-            cmd += ['--min-split-size', '1M']
-
-        if self.ydl.cookiejar.get_cookie_header(info_dict['url']):
-            cmd += ['--load-cookies={0}'.format(self._write_cookies())]
-        for key, val in self._header_items(info_dict):
-            cmd += ['--header', '%s: %s' % (key, val)]
-        cmd += self._configuration_args(['--max-connection-per-server', '4'])
+        cmd = [self.exe, '-c']
+        cmd += self._configuration_args([
+            '--min-split-size', '1M', '--max-connection-per-server', '4'])
+        dn = os.path.dirname(tmpfilename)
+        if dn:
+            cmd += ['--dir', dn]
         cmd += ['--out', os.path.basename(tmpfilename)]
-        cmd += self._option('--max-overall-download-limit', 'ratelimit')
+        for key, val in info_dict['http_headers'].items():
+            cmd += ['--header', '%s: %s' % (key, val)]
         cmd += self._option('--interface', 'source_address')
         cmd += self._option('--all-proxy', 'proxy')
         cmd += self._bool_option('--check-certificate', 'nocheckcertificate', 'false', 'true', '=')
         cmd += self._bool_option('--remote-time', 'updatetime', 'true', 'false', '=')
-        cmd += self._bool_option('--show-console-readout', 'noprogress', 'false', 'true', '=')
-        cmd += self._configuration_args()
-
-        # aria2c strips out spaces from the beginning/end of filenames and paths.
-        # We work around this issue by adding a "./" to the beginning of the
-        # filename and relative path, and adding a "/" at the end of the path.
-        # See: https://github.com/yt-dlp/yt-dlp/issues/276
-        # https://github.com/ytdl-org/youtube-dl/issues/20312
-        # https://github.com/aria2/aria2/issues/1373
-        dn = os.path.dirname(tmpfilename)
-        if dn:
-            cmd += ['--dir', self._aria2c_filename(dn) + os.path.sep]
-        if 'fragments' not in info_dict:
-            cmd += ['--out', self._aria2c_filename(os.path.basename(tmpfilename))]
-        cmd += ['--auto-file-renaming=false']
-        if 'fragments' in info_dict:
-            cmd += ['--file-allocation=none', '--uri-selector=inorder']
-            url_list_file = '%s.frag.urls' % (tmpfilename, )
-            url_list = []
-            for frag_index, fragment in enumerate(info_dict['fragments']):
-                fragment_filename = '%s-Frag%d' % (os.path.basename(tmpfilename), frag_index)
-                url_list.append('%s\n\tout=%s' % (fragment['url'], self._aria2c_filename(fragment_filename)))
-            stream, _ = self.sanitize_open(url_list_file, 'wb')
-            stream.write('\n'.join(url_list).encode())
-            stream.close()
-            cmd += ['-i', self._aria2c_filename(url_list_file)]
-        else:
-            cmd += ['--', info_dict['url']]
+        cmd += ['--', info_dict['url']]
         return cmd
 
 
-class Aria2pFD(ExternalFD):
-    ''' Aria2pFD class
-    This class support to use aria2p as downloader.
-    (Aria2p, a command-line tool and Python library to interact with an aria2c daemon process
-    through JSON-RPC.)
-    It can help you to get download progress more easily.
-    To use aria2p as downloader, you need to install aria2c and aria2p, aria2p can download with pip.
-    Then run aria2c in the background and enable with the --enable-rpc option.
-    '''
-    try:
-        import aria2p
-        __avail = True
-    except ImportError:
-        __avail = False
-
-    @classmethod
-    def available(cls):
-        return cls.__avail
-
-    def _call_downloader(self, tmpfilename, info_dict):
-        aria2 = self.aria2p.API(
-            self.aria2p.Client(
-                host='http://localhost',
-                port=6800,
-                secret=''
-            )
-        )
-
-        options = {
-            'min-split-size': '1M',
-            'max-connection-per-server': 4,
-            'auto-file-renaming': 'false',
-        }
-        options['dir'] = os.path.dirname(tmpfilename) or os.path.abspath('.')
-        options['out'] = os.path.basename(tmpfilename)
-        if self.ydl.cookiejar.get_cookie_header(info_dict['url']):
-            options['load-cookies'] = self._write_cookies()
-        options['header'] = []
-        for key, val in self._header_items(info_dict):
-            options['header'].append('{0}: {1}'.format(key, val))
-        download = aria2.add_uris([info_dict['url']], options)
-        status = {
-            'status': 'downloading',
-            'tmpfilename': tmpfilename,
-        }
-        started = time.time()
-        while download.status in ['active', 'waiting']:
-            download = aria2.get_download(download.gid)
-            status.update({
-                'downloaded_bytes': download.completed_length,
-                'total_bytes': download.total_length,
-                'elapsed': time.time() - started,
-                'eta': download.eta.total_seconds(),
-                'speed': download.download_speed,
-            })
-            self._hook_progress(status)
-            time.sleep(.5)
-        return download.status != 'complete'
-
-
 class HttpieFD(ExternalFD):
     @classmethod
     def available(cls):
@@ -347,34 +206,25 @@ class HttpieFD(ExternalFD):
 
     def _make_cmd(self, tmpfilename, info_dict):
         cmd = ['http', '--download', '--output', tmpfilename, info_dict['url']]
-        for key, val in self._header_items(info_dict):
+        for key, val in info_dict['http_headers'].items():
             cmd += ['%s:%s' % (key, val)]
-
-        # httpie 3.1.0+ removes the Cookie header on redirect, so this should be safe for now. [1]
-        # If we ever need cookie handling for redirects, we can export the cookiejar into a session. [2]
-        # 1: https://github.com/httpie/httpie/security/advisories/GHSA-9w4w-cpc8-h2fq
-        # 2: https://httpie.io/docs/cli/sessions
-        cookie_header = self.ydl.cookiejar.get_cookie_header(info_dict['url'])
-        if cookie_header:
-            cmd += ['Cookie:%s' % cookie_header]
         return cmd
 
 
 class FFmpegFD(ExternalFD):
     @classmethod
     def supports(cls, info_dict):
-        return info_dict['protocol'] in ('http', 'https', 'ftp', 'ftps', 'm3u8', 'rtsp', 'rtmp', 'mms', 'http_dash_segments')
+        return info_dict['protocol'] in ('http', 'https', 'ftp', 'ftps', 'm3u8', 'rtsp', 'rtmp', 'mms')
 
     @classmethod
     def available(cls):
-        # actual availability can only be confirmed for an instance
-        return bool(FFmpegPostProcessor)
+        return FFmpegPostProcessor().available
 
     def _call_downloader(self, tmpfilename, info_dict):
-        # `downloader` means the parent `YoutubeDL`
-        ffpp = FFmpegPostProcessor(downloader=self.ydl)
+        url = info_dict['url']
+        ffpp = FFmpegPostProcessor(downloader=self)
         if not ffpp.available:
-            self.report_error('ffmpeg required for download but no ffmpeg (nor avconv) executable could be found. Please install one.')
+            self.report_error('m3u8 download detected but ffmpeg or avconv could not be found. Please install one.')
             return False
         ffpp.check_version()
 
@@ -403,15 +253,7 @@ class FFmpegFD(ExternalFD):
         # if end_time:
         #     args += ['-t', compat_str(end_time - start_time)]
 
-        url = info_dict['url']
-        cookies = self.ydl.cookiejar.get_cookies_for_url(url)
-        if cookies:
-            args.extend(['-cookies', ''.join(
-                '{0}={1}; path={2}; domain={3};\r\n'.format(
-                    cookie.name, cookie.value, cookie.path, cookie.domain)
-                for cookie in cookies)])
-
-        if info_dict.get('http_headers') and re.match(r'^https?://', url):
+        if info_dict['http_headers'] and re.match(r'^https?://', url):
             # Trailing \r\n after each HTTP header is important to prevent warning from ffmpeg/avconv:
             # [http @ 00000000003d2fa0] No trailing CRLF found in HTTP header.
             headers = handle_youtubedl_headers(info_dict['http_headers'])
@@ -491,25 +333,18 @@ class FFmpegFD(ExternalFD):
 
         self._debug_cmd(args)
 
-        # From [1], a PIPE opened in Popen() should be closed, unless
-        # .communicate() is called. Avoid leaking any PIPEs by using Popen
-        # as a context manager (newer Python 3.x and compat)
-        # Fixes "Resource Warning" in test/test_downloader_external.py
-        # [1] https://devpress.csdn.net/python/62fde12d7e66823466192e48.html
-        with compat_subprocess_Popen(args, stdin=subprocess.PIPE, env=env) as proc:
-            try:
-                retval = proc.wait()
-            except BaseException as e:
-                # subprocess.run would send the SIGKILL signal to ffmpeg and the
-                # mp4 file couldn't be played, but if we ask ffmpeg to quit it
-                # produces a file that is playable (this is mostly useful for live
-                # streams). Note that Windows is not affected and produces playable
-                # files (see https://github.com/ytdl-org/youtube-dl/issues/8300).
-                if isinstance(e, KeyboardInterrupt) and sys.platform != 'win32':
-                    process_communicate_or_kill(proc, b'q')
-                else:
-                    proc.kill()
-                raise
+        proc = subprocess.Popen(args, stdin=subprocess.PIPE, env=env)
+        try:
+            retval = proc.wait()
+        except KeyboardInterrupt:
+            # subprocces.run would send the SIGKILL signal to ffmpeg and the
+            # mp4 file couldn't be played, but if we ask ffmpeg to quit it
+            # produces a file that is playable (this is mostly useful for live
+            # streams). Note that Windows is not affected and produces playable
+            # files (see https://github.com/ytdl-org/youtube-dl/issues/8300).
+            if sys.platform != 'win32':
+                proc.communicate(b'q')
+            raise
         return retval
 
 
diff --git a/youtube_dl/downloader/fragment.py b/youtube_dl/downloader/fragment.py
index 913e91b64..35c76feba 100644
--- a/youtube_dl/downloader/fragment.py
+++ b/youtube_dl/downloader/fragment.py
@@ -71,7 +71,7 @@ class FragmentFD(FileDownloader):
 
     @staticmethod
     def __do_ytdl_file(ctx):
-        return ctx['live'] is not True and ctx['tmpfilename'] != '-'
+        return not ctx['live'] and not ctx['tmpfilename'] == '-'
 
     def _read_ytdl_file(self, ctx):
         assert 'ytdl_corrupt' not in ctx
@@ -101,13 +101,6 @@ class FragmentFD(FileDownloader):
             'url': frag_url,
             'http_headers': headers or info_dict.get('http_headers'),
         }
-        frag_resume_len = 0
-        if ctx['dl'].params.get('continuedl', True):
-            frag_resume_len = self.filesize_or_none(
-                self.temp_name(fragment_filename))
-        fragment_info_dict['frag_resume_len'] = frag_resume_len
-        ctx['frag_resume_len'] = frag_resume_len or 0
-
         success = ctx['dl'].download(fragment_filename, fragment_info_dict)
         if not success:
             return False, None
@@ -131,7 +124,9 @@ class FragmentFD(FileDownloader):
             del ctx['fragment_filename_sanitized']
 
     def _prepare_frag_download(self, ctx):
-        if not ctx.setdefault('live', False):
+        if 'live' not in ctx:
+            ctx['live'] = False
+        if not ctx['live']:
             total_frags_str = '%d' % ctx['total_frags']
             ad_frags = ctx.get('ad_frags', 0)
             if ad_frags:
@@ -141,11 +136,10 @@ class FragmentFD(FileDownloader):
         self.to_screen(
             '[%s] Total fragments: %s' % (self.FD_NAME, total_frags_str))
         self.report_destination(ctx['filename'])
-        continuedl = self.params.get('continuedl', True)
         dl = HttpQuietDownloader(
             self.ydl,
             {
-                'continuedl': continuedl,
+                'continuedl': True,
                 'quiet': True,
                 'noprogress': True,
                 'ratelimit': self.params.get('ratelimit'),
@@ -156,11 +150,12 @@ class FragmentFD(FileDownloader):
         )
         tmpfilename = self.temp_name(ctx['filename'])
         open_mode = 'wb'
+        resume_len = 0
 
         # Establish possible resume length
-        resume_len = self.filesize_or_none(tmpfilename) or 0
-        if resume_len > 0:
+        if os.path.isfile(encodeFilename(tmpfilename)):
             open_mode = 'ab'
+            resume_len = os.path.getsize(encodeFilename(tmpfilename))
 
         # Should be initialized before ytdl file check
         ctx.update({
@@ -169,8 +164,7 @@ class FragmentFD(FileDownloader):
         })
 
         if self.__do_ytdl_file(ctx):
-            ytdl_file_exists = os.path.isfile(encodeFilename(self.ytdl_filename(ctx['filename'])))
-            if continuedl and ytdl_file_exists:
+            if os.path.isfile(encodeFilename(self.ytdl_filename(ctx['filename']))):
                 self._read_ytdl_file(ctx)
                 is_corrupt = ctx.get('ytdl_corrupt') is True
                 is_inconsistent = ctx['fragment_index'] > 0 and resume_len == 0
@@ -184,12 +178,7 @@ class FragmentFD(FileDownloader):
                     if 'ytdl_corrupt' in ctx:
                         del ctx['ytdl_corrupt']
                     self._write_ytdl_file(ctx)
-
             else:
-                if not continuedl:
-                    if ytdl_file_exists:
-                        self._read_ytdl_file(ctx)
-                    ctx['fragment_index'] = resume_len = 0
                 self._write_ytdl_file(ctx)
                 assert ctx['fragment_index'] == 0
 
@@ -220,7 +209,6 @@ class FragmentFD(FileDownloader):
         start = time.time()
         ctx.update({
             'started': start,
-            'fragment_started': start,
             # Amount of fragment's bytes downloaded by the time of the previous
             # frag progress hook invocation
             'prev_frag_downloaded_bytes': 0,
@@ -230,9 +218,6 @@ class FragmentFD(FileDownloader):
             if s['status'] not in ('downloading', 'finished'):
                 return
 
-            if not total_frags and ctx.get('fragment_count'):
-                state['fragment_count'] = ctx['fragment_count']
-
             time_now = time.time()
             state['elapsed'] = time_now - start
             frag_total_bytes = s.get('total_bytes') or 0
@@ -247,17 +232,16 @@ class FragmentFD(FileDownloader):
                 ctx['fragment_index'] = state['fragment_index']
                 state['downloaded_bytes'] += frag_total_bytes - ctx['prev_frag_downloaded_bytes']
                 ctx['complete_frags_downloaded_bytes'] = state['downloaded_bytes']
-                ctx['speed'] = state['speed'] = self.calc_speed(
-                    ctx['fragment_started'], time_now, frag_total_bytes)
-                ctx['fragment_started'] = time.time()
                 ctx['prev_frag_downloaded_bytes'] = 0
             else:
                 frag_downloaded_bytes = s['downloaded_bytes']
                 state['downloaded_bytes'] += frag_downloaded_bytes - ctx['prev_frag_downloaded_bytes']
-                ctx['speed'] = state['speed'] = self.calc_speed(
-                    ctx['fragment_started'], time_now, frag_downloaded_bytes - ctx['frag_resume_len'])
                 if not ctx['live']:
-                    state['eta'] = self.calc_eta(state['speed'], estimated_size - state['downloaded_bytes'])
+                    state['eta'] = self.calc_eta(
+                        start, time_now, estimated_size - resume_len,
+                        state['downloaded_bytes'] - resume_len)
+                state['speed'] = s.get('speed') or ctx.get('speed')
+                ctx['speed'] = state['speed']
                 ctx['prev_frag_downloaded_bytes'] = frag_downloaded_bytes
             self._hook_progress(state)
 
@@ -284,7 +268,7 @@ class FragmentFD(FileDownloader):
                         os.utime(ctx['filename'], (time.time(), filetime))
                     except Exception:
                         pass
-            downloaded_bytes = self.filesize_or_none(ctx['filename']) or 0
+            downloaded_bytes = os.path.getsize(encodeFilename(ctx['filename']))
 
         self._hook_progress({
             'downloaded_bytes': downloaded_bytes,
diff --git a/youtube_dl/downloader/http.py b/youtube_dl/downloader/http.py
index 3cad87420..d8ac41dcc 100644
--- a/youtube_dl/downloader/http.py
+++ b/youtube_dl/downloader/http.py
@@ -58,9 +58,9 @@ class HttpFD(FileDownloader):
 
         if self.params.get('continuedl', True):
             # Establish possible resume length
-            ctx.resume_len = info_dict.get('frag_resume_len')
-            if ctx.resume_len is None:
-                ctx.resume_len = self.filesize_or_none(ctx.tmpfilename) or 0
+            if os.path.isfile(encodeFilename(ctx.tmpfilename)):
+                ctx.resume_len = os.path.getsize(
+                    encodeFilename(ctx.tmpfilename))
 
         ctx.is_resume = ctx.resume_len > 0
 
@@ -115,9 +115,9 @@ class HttpFD(FileDownloader):
                         raise RetryDownload(err)
                     raise err
                 # When trying to resume, Content-Range HTTP header of response has to be checked
-                # to match the value of requested Range HTTP header. This is due to webservers
+                # to match the value of requested Range HTTP header. This is due to a webservers
                 # that don't support resuming and serve a whole file with no Content-Range
-                # set in response despite requested Range (see
+                # set in response despite of requested Range (see
                 # https://github.com/ytdl-org/youtube-dl/issues/6057#issuecomment-126129799)
                 if has_range:
                     content_range = ctx.data.headers.get('Content-Range')
@@ -141,8 +141,7 @@ class HttpFD(FileDownloader):
                     # Content-Range is either not present or invalid. Assuming remote webserver is
                     # trying to send the whole file, resume is not possible, so wiping the local file
                     # and performing entire redownload
-                    if range_start > 0:
-                        self.report_unable_to_resume()
+                    self.report_unable_to_resume()
                     ctx.resume_len = 0
                     ctx.open_mode = 'wb'
                 ctx.data_len = int_or_none(ctx.data.info().get('Content-length', None))
@@ -294,7 +293,10 @@ class HttpFD(FileDownloader):
 
                 # Progress message
                 speed = self.calc_speed(start, now, byte_counter - ctx.resume_len)
-                eta = self.calc_eta(speed, ctx.data_len and (ctx.data_len - byte_counter))
+                if ctx.data_len is None:
+                    eta = None
+                else:
+                    eta = self.calc_eta(start, time.time(), ctx.data_len - ctx.resume_len, byte_counter - ctx.resume_len)
 
                 self._hook_progress({
                     'status': 'downloading',
diff --git a/youtube_dl/downloader/niconico.py b/youtube_dl/downloader/niconico.py
deleted file mode 100644
index 6392c9989..000000000
--- a/youtube_dl/downloader/niconico.py
+++ /dev/null
@@ -1,66 +0,0 @@
-# coding: utf-8
-from __future__ import unicode_literals
-
-try:
-    import threading
-except ImportError:
-    threading = None
-
-from .common import FileDownloader
-from ..downloader import get_suitable_downloader
-from ..extractor.niconico import NiconicoIE
-from ..utils import sanitized_Request
-
-
-class NiconicoDmcFD(FileDownloader):
-    """ Downloading niconico douga from DMC with heartbeat """
-
-    FD_NAME = 'niconico_dmc'
-
-    def real_download(self, filename, info_dict):
-        self.to_screen('[%s] Downloading from DMC' % self.FD_NAME)
-
-        ie = NiconicoIE(self.ydl)
-        info_dict, heartbeat_info_dict = ie._get_heartbeat_info(info_dict)
-
-        fd = get_suitable_downloader(info_dict, params=self.params)(self.ydl, self.params)
-        for ph in self._progress_hooks:
-            fd.add_progress_hook(ph)
-
-        if not threading:
-            self.to_screen('[%s] Threading for Heartbeat not available' % self.FD_NAME)
-            return fd.real_download(filename, info_dict)
-
-        success = download_complete = False
-        timer = [None]
-        heartbeat_lock = threading.Lock()
-        heartbeat_url = heartbeat_info_dict['url']
-        heartbeat_data = heartbeat_info_dict['data'].encode()
-        heartbeat_interval = heartbeat_info_dict.get('interval', 30)
-
-        request = sanitized_Request(heartbeat_url, heartbeat_data)
-
-        def heartbeat():
-            try:
-                self.ydl.urlopen(request).read()
-            except Exception:
-                self.to_screen('[%s] Heartbeat failed' % self.FD_NAME)
-
-            with heartbeat_lock:
-                if not download_complete:
-                    timer[0] = threading.Timer(heartbeat_interval, heartbeat)
-                    timer[0].start()
-
-        heartbeat_info_dict['ping']()
-        self.to_screen('[%s] Heartbeat with %d second interval ...' % (self.FD_NAME, heartbeat_interval))
-        try:
-            heartbeat()
-            if type(fd).__name__ == 'HlsFD':
-                info_dict.update(ie._extract_m3u8_formats(info_dict['url'], info_dict['id'])[0])
-            success = fd.real_download(filename, info_dict)
-        finally:
-            if heartbeat_lock:
-                with heartbeat_lock:
-                    timer[0].cancel()
-                    download_complete = True
-            return success
diff --git a/youtube_dl/downloader/rtmp.py b/youtube_dl/downloader/rtmp.py
index 8a25dbc8d..fbb7f51b0 100644
--- a/youtube_dl/downloader/rtmp.py
+++ b/youtube_dl/downloader/rtmp.py
@@ -89,13 +89,11 @@ class RtmpFD(FileDownloader):
                                 self.to_screen('')
                             cursor_in_new_line = True
                             self.to_screen('[rtmpdump] ' + line)
-                if not cursor_in_new_line:
-                    self.to_screen('')
-                return proc.wait()
-            except BaseException:  # Including KeyboardInterrupt
-                proc.kill()
+            finally:
                 proc.wait()
-                raise
+            if not cursor_in_new_line:
+                self.to_screen('')
+            return proc.returncode
 
         url = info_dict['url']
         player_url = info_dict.get('player_url')
diff --git a/youtube_dl/extractor/adn.py b/youtube_dl/extractor/adn.py
index 5ff419f19..a55ebbcbd 100644
--- a/youtube_dl/extractor/adn.py
+++ b/youtube_dl/extractor/adn.py
@@ -31,34 +31,30 @@ from ..utils import (
 
 
 class ADNIE(InfoExtractor):
-    IE_DESC = 'Animation Digital Network'
-    _VALID_URL = r'https?://(?:www\.)?(?:animation|anime)digitalnetwork\.fr/video/[^/]+/(?P<id>\d+)'
-    _TESTS = [{
-        'url': 'https://animationdigitalnetwork.fr/video/fruits-basket/9841-episode-1-a-ce-soir',
-        'md5': '1c9ef066ceb302c86f80c2b371615261',
+    IE_DESC = 'Anime Digital Network'
+    _VALID_URL = r'https?://(?:www\.)?animedigitalnetwork\.fr/video/[^/]+/(?P<id>\d+)'
+    _TEST = {
+        'url': 'http://animedigitalnetwork.fr/video/blue-exorcist-kyoto-saga/7778-episode-1-debut-des-hostilites',
+        'md5': '0319c99885ff5547565cacb4f3f9348d',
         'info_dict': {
-            'id': '9841',
+            'id': '7778',
             'ext': 'mp4',
-            'title': 'Fruits Basket - Episode 1',
-            'description': 'md5:14be2f72c3c96809b0ca424b0097d336',
-            'series': 'Fruits Basket',
-            'duration': 1437,
-            'release_date': '20190405',
+            'title': 'Blue Exorcist - Kyôto Saga - Episode 1',
+            'description': 'md5:2f7b5aa76edbc1a7a92cedcda8a528d5',
+            'series': 'Blue Exorcist - Kyôto Saga',
+            'duration': 1467,
+            'release_date': '20170106',
             'comment_count': int,
             'average_rating': float,
-            'season_number': 1,
-            'episode': 'À ce soir !',
+            'season_number': 2,
+            'episode': 'Début des hostilités',
             'episode_number': 1,
-        },
-        'skip': 'Only available in region (FR, ...)',
-    }, {
-        'url': 'http://animedigitalnetwork.fr/video/blue-exorcist-kyoto-saga/7778-episode-1-debut-des-hostilites',
-        'only_matching': True,
-    }]
+        }
+    }
 
-    _NETRC_MACHINE = 'animationdigitalnetwork'
-    _BASE = 'animationdigitalnetwork.fr'
-    _API_BASE_URL = 'https://gw.api.' + _BASE + '/'
+    _NETRC_MACHINE = 'animedigitalnetwork'
+    _BASE_URL = 'http://animedigitalnetwork.fr'
+    _API_BASE_URL = 'https://gw.api.animedigitalnetwork.fr/'
     _PLAYER_BASE_URL = _API_BASE_URL + 'player/'
     _HEADERS = {}
     _LOGIN_ERR_MESSAGE = 'Unable to log in'
@@ -86,14 +82,14 @@ class ADNIE(InfoExtractor):
         if subtitle_location:
             enc_subtitles = self._download_webpage(
                 subtitle_location, video_id, 'Downloading subtitles data',
-                fatal=False, headers={'Origin': 'https://' + self._BASE})
+                fatal=False, headers={'Origin': 'https://animedigitalnetwork.fr'})
         if not enc_subtitles:
             return None
 
-        # http://animationdigitalnetwork.fr/components/com_vodvideo/videojs/adn-vjs.min.js
+        # http://animedigitalnetwork.fr/components/com_vodvideo/videojs/adn-vjs.min.js
         dec_subtitles = intlist_to_bytes(aes_cbc_decrypt(
             bytes_to_intlist(compat_b64decode(enc_subtitles[24:])),
-            bytes_to_intlist(binascii.unhexlify(self._K + '7fac1178830cfe0c')),
+            bytes_to_intlist(binascii.unhexlify(self._K + 'ab9f52f5baae7c72')),
             bytes_to_intlist(compat_b64decode(enc_subtitles[:24]))
         ))
         subtitles_json = self._parse_json(
@@ -142,9 +138,9 @@ Format: Marked,Start,End,Style,Name,MarginL,MarginR,MarginV,Effect,Text'''
         if not username:
             return
         try:
-            url = self._API_BASE_URL + 'authentication/login'
             access_token = (self._download_json(
-                url, None, 'Logging in', self._LOGIN_ERR_MESSAGE, fatal=False,
+                self._API_BASE_URL + 'authentication/login', None,
+                'Logging in', self._LOGIN_ERR_MESSAGE, fatal=False,
                 data=urlencode_postdata({
                     'password': password,
                     'rememberMe': False,
@@ -157,8 +153,7 @@ Format: Marked,Start,End,Style,Name,MarginL,MarginR,MarginV,Effect,Text'''
             message = None
             if isinstance(e.cause, compat_HTTPError) and e.cause.code == 401:
                 resp = self._parse_json(
-                    self._webpage_read_content(e.cause, url, username),
-                    username, fatal=False) or {}
+                    e.cause.read().decode(), None, fatal=False) or {}
                 message = resp.get('message') or resp.get('code')
             self.report_warning(message or self._LOGIN_ERR_MESSAGE)
 
@@ -216,9 +211,7 @@ Format: Marked,Start,End,Style,Name,MarginL,MarginR,MarginV,Effect,Text'''
                     # This usually goes away with a different random pkcs1pad, so retry
                     continue
 
-                error = self._parse_json(
-                    self._webpage_read_content(e.cause, links_url, video_id),
-                    video_id, fatal=False) or {}
+                error = self._parse_json(e.cause.read(), video_id)
                 message = error.get('message')
                 if e.cause.code == 403 and error.get('code') == 'player-bad-geolocation-country':
                     self.raise_geo_restricted(msg=message)
diff --git a/youtube_dl/extractor/aenetworks.py b/youtube_dl/extractor/aenetworks.py
index 59fbe048a..e55c03fd7 100644
--- a/youtube_dl/extractor/aenetworks.py
+++ b/youtube_dl/extractor/aenetworks.py
@@ -8,8 +8,6 @@ from ..utils import (
     ExtractorError,
     GeoRestrictedError,
     int_or_none,
-    remove_start,
-    traverse_obj,
     update_url_query,
     urlencode_postdata,
 )
@@ -22,8 +20,8 @@ class AENetworksBaseIE(ThePlatformIE):
             (?:history(?:vault)?|aetv|mylifetime|lifetimemovieclub)\.com|
             fyi\.tv
         )/'''
-    _THEPLATFORM_KEY = '43jXaGRQud'
-    _THEPLATFORM_SECRET = 'S10BPXHMlb'
+    _THEPLATFORM_KEY = 'crazyjava'
+    _THEPLATFORM_SECRET = 's3cr3t'
     _DOMAIN_MAP = {
         'history.com': ('HISTORY', 'history'),
         'aetv.com': ('AETV', 'aetv'),
@@ -35,17 +33,14 @@ class AENetworksBaseIE(ThePlatformIE):
     }
 
     def _extract_aen_smil(self, smil_url, video_id, auth=None):
-        query = {
-            'mbr': 'true',
-            'formats': 'M3U+none,MPEG-DASH+none,MPEG4,MP3',
-        }
+        query = {'mbr': 'true'}
         if auth:
             query['auth'] = auth
         TP_SMIL_QUERY = [{
             'assetTypes': 'high_video_ak',
-            'switch': 'hls_high_ak',
+            'switch': 'hls_high_ak'
         }, {
-            'assetTypes': 'high_video_s3',
+            'assetTypes': 'high_video_s3'
         }, {
             'assetTypes': 'high_video_s3',
             'switch': 'hls_high_fastly',
@@ -80,14 +75,7 @@ class AENetworksBaseIE(ThePlatformIE):
         requestor_id, brand = self._DOMAIN_MAP[domain]
         result = self._download_json(
             'https://feeds.video.aetnd.com/api/v2/%s/videos' % brand,
-            filter_value, query={'filter[%s]' % filter_key: filter_value})
-        result = traverse_obj(
-            result, ('results',
-                     lambda k, v: k == 0 and v[filter_key] == filter_value),
-            get_all=False)
-        if not result:
-            raise ExtractorError('Show not found in A&E feed (too new?)', expected=True,
-                                 video_id=remove_start(filter_value, '/'))
+            filter_value, query={'filter[%s]' % filter_key: filter_value})['results'][0]
         title = result['title']
         video_id = result['id']
         media_url = result['publicUrl']
@@ -138,7 +126,7 @@ class AENetworksIE(AENetworksBaseIE):
             'skip_download': True,
         },
         'add_ie': ['ThePlatform'],
-        'skip': 'Geo-restricted - This content is not available in your location.'
+        'skip': 'This video is only available for users of participating TV providers.',
     }, {
         'url': 'http://www.aetv.com/shows/duck-dynasty/season-9/episode-1',
         'info_dict': {
@@ -155,7 +143,6 @@ class AENetworksIE(AENetworksBaseIE):
             'skip_download': True,
         },
         'add_ie': ['ThePlatform'],
-        'skip': 'This video is only available for users of participating TV providers.',
     }, {
         'url': 'http://www.fyi.tv/shows/tiny-house-nation/season-1/episode-8',
         'only_matching': True
diff --git a/youtube_dl/extractor/aliexpress.py b/youtube_dl/extractor/aliexpress.py
index 9722fe9ac..6f241e683 100644
--- a/youtube_dl/extractor/aliexpress.py
+++ b/youtube_dl/extractor/aliexpress.py
@@ -18,7 +18,7 @@ class AliExpressLiveIE(InfoExtractor):
             'id': '2800002704436634',
             'ext': 'mp4',
             'title': 'CASIMA7.22',
-            'thumbnail': r're:https?://.*\.jpg',
+            'thumbnail': r're:http://.*\.jpg',
             'uploader': 'CASIMA Official Store',
             'timestamp': 1500717600,
             'upload_date': '20170722',
diff --git a/youtube_dl/extractor/alsace20tv.py b/youtube_dl/extractor/alsace20tv.py
deleted file mode 100644
index 228cec3ec..000000000
--- a/youtube_dl/extractor/alsace20tv.py
+++ /dev/null
@@ -1,89 +0,0 @@
-# coding: utf-8
-from __future__ import unicode_literals
-
-from .common import InfoExtractor
-from ..utils import (
-    clean_html,
-    dict_get,
-    get_element_by_class,
-    int_or_none,
-    unified_strdate,
-    url_or_none,
-)
-
-
-class Alsace20TVIE(InfoExtractor):
-    _VALID_URL = r'https?://(?:www\.)?alsace20\.tv/(?:[\w-]+/)+[\w-]+-(?P<id>[\w]+)'
-    _TESTS = [{
-        'url': 'https://www.alsace20.tv/VOD/Actu/JT/Votre-JT-jeudi-3-fevrier-lyNHCXpYJh.html',
-        # 'md5': 'd91851bf9af73c0ad9b2cdf76c127fbb',
-        'info_dict': {
-            'id': 'lyNHCXpYJh',
-            'ext': 'mp4',
-            'description': 'md5:fc0bc4a0692d3d2dba4524053de4c7b7',
-            'title': 'Votre JT du jeudi 3 février',
-            'upload_date': '20220203',
-            'thumbnail': r're:https?://.+\.jpg',
-            'duration': 1073,
-            'view_count': int,
-        },
-        'params': {
-            'format': 'bestvideo',
-        },
-    }]
-
-    def _extract_video(self, video_id, url=None):
-        info = self._download_json(
-            'https://www.alsace20.tv/visionneuse/visio_v9_js.php?key=%s&habillage=0&mode=html' % (video_id, ),
-            video_id) or {}
-        title = info['titre']
-
-        formats = []
-        for res, fmt_url in (info.get('files') or {}).items():
-            formats.extend(
-                self._extract_smil_formats(fmt_url, video_id, fatal=False)
-                if '/smil:_' in fmt_url
-                else self._extract_mpd_formats(fmt_url, video_id, mpd_id=res, fatal=False))
-        self._sort_formats(formats)
-
-        webpage = (url and self._download_webpage(url, video_id, fatal=False)) or ''
-        thumbnail = url_or_none(dict_get(info, ('image', 'preview', )) or self._og_search_thumbnail(webpage))
-        upload_date = self._search_regex(r'/(\d{6})_', thumbnail, 'upload_date', default=None)
-        upload_date = unified_strdate('20%s-%s-%s' % (upload_date[:2], upload_date[2:4], upload_date[4:])) if upload_date else None
-        return {
-            'id': video_id,
-            'title': title,
-            'formats': formats,
-            'description': clean_html(get_element_by_class('wysiwyg', webpage)),
-            'upload_date': upload_date,
-            'thumbnail': thumbnail,
-            'duration': int_or_none(self._og_search_property('video:duration', webpage) if webpage else None),
-            'view_count': int_or_none(info.get('nb_vues')),
-        }
-
-    def _real_extract(self, url):
-        video_id = self._match_id(url)
-        return self._extract_video(video_id, url)
-
-
-class Alsace20TVEmbedIE(Alsace20TVIE):
-    _VALID_URL = r'https?://(?:www\.)?alsace20\.tv/emb/(?P<id>[\w]+)'
-    _TESTS = [{
-        'url': 'https://www.alsace20.tv/emb/lyNHCXpYJh',
-        # 'md5': 'd91851bf9af73c0ad9b2cdf76c127fbb',
-        'info_dict': {
-            'id': 'lyNHCXpYJh',
-            'ext': 'mp4',
-            'title': 'Votre JT du jeudi 3 février',
-            'upload_date': '20220203',
-            'thumbnail': r're:https?://.+\.jpg',
-            'view_count': int,
-        },
-        'params': {
-            'format': 'bestvideo',
-        },
-    }]
-
-    def _real_extract(self, url):
-        video_id = self._match_id(url)
-        return self._extract_video(video_id)
diff --git a/youtube_dl/extractor/americastestkitchen.py b/youtube_dl/extractor/americastestkitchen.py
index 08d3604e9..be960c0f9 100644
--- a/youtube_dl/extractor/americastestkitchen.py
+++ b/youtube_dl/extractor/americastestkitchen.py
@@ -15,7 +15,7 @@ from ..utils import (
 
 
 class AmericasTestKitchenIE(InfoExtractor):
-    _VALID_URL = r'https?://(?:www\.)?(?:americastestkitchen|cooks(?:country|illustrated))\.com/(?:cooks(?:country|illustrated)/)?(?P<resource_type>episode|videos)/(?P<id>\d+)'
+    _VALID_URL = r'https?://(?:www\.)?(?:americastestkitchen|cooks(?:country|illustrated))\.com/(?P<resource_type>episode|videos)/(?P<id>\d+)'
     _TESTS = [{
         'url': 'https://www.americastestkitchen.com/episode/582-weeknight-japanese-suppers',
         'md5': 'b861c3e365ac38ad319cfd509c30577f',
@@ -23,20 +23,15 @@ class AmericasTestKitchenIE(InfoExtractor):
             'id': '5b400b9ee338f922cb06450c',
             'title': 'Japanese Suppers',
             'ext': 'mp4',
-            'display_id': 'weeknight-japanese-suppers',
             'description': 'md5:64e606bfee910627efc4b5f050de92b3',
-            'timestamp': 1523304000,
-            'upload_date': '20180409',
-            'release_date': '20180409',
+            'thumbnail': r're:^https?://',
+            'timestamp': 1523318400,
+            'upload_date': '20180410',
+            'release_date': '20180410',
             'series': "America's Test Kitchen",
-            'season': 'Season 18',
             'season_number': 18,
             'episode': 'Japanese Suppers',
             'episode_number': 15,
-            'duration': 1376,
-            'thumbnail': r're:^https?://',
-            'average_rating': 0,
-            'view_count': int,
         },
         'params': {
             'skip_download': True,
@@ -49,20 +44,15 @@ class AmericasTestKitchenIE(InfoExtractor):
             'id': '5fbe8c61bda2010001c6763b',
             'title': 'Simple Chicken Dinner',
             'ext': 'mp4',
-            'display_id': 'atktv_2103_simple-chicken-dinner_full-episode_web-mp4',
             'description': 'md5:eb68737cc2fd4c26ca7db30139d109e7',
-            'timestamp': 1610737200,
-            'upload_date': '20210115',
-            'release_date': '20210115',
+            'thumbnail': r're:^https?://',
+            'timestamp': 1610755200,
+            'upload_date': '20210116',
+            'release_date': '20210116',
             'series': "America's Test Kitchen",
-            'season': 'Season 21',
             'season_number': 21,
             'episode': 'Simple Chicken Dinner',
             'episode_number': 3,
-            'duration': 1397,
-            'thumbnail': r're:^https?://',
-            'view_count': int,
-            'average_rating': 0,
         },
         'params': {
             'skip_download': True,
@@ -70,12 +60,6 @@ class AmericasTestKitchenIE(InfoExtractor):
     }, {
         'url': 'https://www.americastestkitchen.com/videos/3420-pan-seared-salmon',
         'only_matching': True,
-    }, {
-        'url': 'https://www.americastestkitchen.com/cookscountry/episode/564-when-only-chocolate-will-do',
-        'only_matching': True,
-    }, {
-        'url': 'https://www.americastestkitchen.com/cooksillustrated/videos/4478-beef-wellington',
-        'only_matching': True,
     }, {
         'url': 'https://www.cookscountry.com/episode/564-when-only-chocolate-will-do',
         'only_matching': True,
@@ -110,7 +94,7 @@ class AmericasTestKitchenIE(InfoExtractor):
 
 
 class AmericasTestKitchenSeasonIE(InfoExtractor):
-    _VALID_URL = r'https?://(?:www\.)?(?P<show>americastestkitchen|(?P<cooks>cooks(?:country|illustrated)))\.com(?:(?:/(?P<show2>cooks(?:country|illustrated)))?(?:/?$|(?<!ated)(?<!ated\.com)/episodes/browse/season_(?P<season>\d+)))'
+    _VALID_URL = r'https?://(?:www\.)?(?P<show>americastestkitchen|cookscountry)\.com/episodes/browse/season_(?P<id>\d+)'
     _TESTS = [{
         # ATK Season
         'url': 'https://www.americastestkitchen.com/episodes/browse/season_1',
@@ -121,93 +105,48 @@ class AmericasTestKitchenSeasonIE(InfoExtractor):
         'playlist_count': 13,
     }, {
         # Cooks Country Season
-        'url': 'https://www.americastestkitchen.com/cookscountry/episodes/browse/season_12',
+        'url': 'https://www.cookscountry.com/episodes/browse/season_12',
         'info_dict': {
             'id': 'season_12',
             'title': 'Season 12',
         },
         'playlist_count': 13,
-    }, {
-        # America's Test Kitchen Series
-        'url': 'https://www.americastestkitchen.com/',
-        'info_dict': {
-            'id': 'americastestkitchen',
-            'title': 'America\'s Test Kitchen',
-        },
-        'playlist_count': 558,
-    }, {
-        # Cooks Country Series
-        'url': 'https://www.americastestkitchen.com/cookscountry',
-        'info_dict': {
-            'id': 'cookscountry',
-            'title': 'Cook\'s Country',
-        },
-        'playlist_count': 199,
-    }, {
-        'url': 'https://www.americastestkitchen.com/cookscountry/',
-        'only_matching': True,
-    }, {
-        'url': 'https://www.cookscountry.com/episodes/browse/season_12',
-        'only_matching': True,
-    }, {
-        'url': 'https://www.cookscountry.com',
-        'only_matching': True,
-    }, {
-        'url': 'https://www.americastestkitchen.com/cooksillustrated/',
-        'only_matching': True,
-    }, {
-        'url': 'https://www.cooksillustrated.com',
-        'only_matching': True,
     }]
 
     def _real_extract(self, url):
-        match = re.match(self._VALID_URL, url).groupdict()
-        show = match.get('show2')
-        show_path = ('/' + show) if show else ''
-        show = show or match['show']
-        season_number = int_or_none(match.get('season'))
+        show_name, season_number = re.match(self._VALID_URL, url).groups()
+        season_number = int(season_number)
 
-        slug, title = {
-            'americastestkitchen': ('atk', 'America\'s Test Kitchen'),
-            'cookscountry': ('cco', 'Cook\'s Country'),
-            'cooksillustrated': ('cio', 'Cook\'s Illustrated'),
-        }[show]
+        slug = 'atk' if show_name == 'americastestkitchen' else 'cco'
 
-        facet_filters = [
-            'search_document_klass:episode',
-            'search_show_slug:' + slug,
-        ]
-
-        if season_number:
-            playlist_id = 'season_%d' % season_number
-            playlist_title = 'Season %d' % season_number
-            facet_filters.append('search_season_list:' + playlist_title)
-        else:
-            playlist_id = show
-            playlist_title = title
+        season = 'Season %d' % season_number
 
         season_search = self._download_json(
             'https://y1fnzxui30-dsn.algolia.net/1/indexes/everest_search_%s_season_desc_production' % slug,
-            playlist_id, headers={
-                'Origin': 'https://www.americastestkitchen.com',
+            season, headers={
+                'Origin': 'https://www.%s.com' % show_name,
                 'X-Algolia-API-Key': '8d504d0099ed27c1b73708d22871d805',
                 'X-Algolia-Application-Id': 'Y1FNZXUI30',
             }, query={
-                'facetFilters': json.dumps(facet_filters),
-                'attributesToRetrieve': 'description,search_%s_episode_number,search_document_date,search_url,title,search_atk_episode_season' % slug,
+                'facetFilters': json.dumps([
+                    'search_season_list:' + season,
+                    'search_document_klass:episode',
+                    'search_show_slug:' + slug,
+                ]),
+                'attributesToRetrieve': 'description,search_%s_episode_number,search_document_date,search_url,title' % slug,
                 'attributesToHighlight': '',
                 'hitsPerPage': 1000,
             })
 
         def entries():
             for episode in (season_search.get('hits') or []):
-                search_url = episode.get('search_url')  # always formatted like '/episode/123-title-of-episode'
+                search_url = episode.get('search_url')
                 if not search_url:
                     continue
                 yield {
                     '_type': 'url',
-                    'url': 'https://www.americastestkitchen.com%s%s' % (show_path, search_url),
-                    'id': try_get(episode, lambda e: e['objectID'].rsplit('_', 1)[-1]),
+                    'url': 'https://www.%s.com%s' % (show_name, search_url),
+                    'id': try_get(episode, lambda e: e['objectID'].split('_')[-1]),
                     'title': episode.get('title'),
                     'description': episode.get('description'),
                     'timestamp': unified_timestamp(episode.get('search_document_date')),
@@ -217,4 +156,4 @@ class AmericasTestKitchenSeasonIE(InfoExtractor):
                 }
 
         return self.playlist_result(
-            entries(), playlist_id, playlist_title)
+            entries(), 'season_%d' % season_number, season)
diff --git a/youtube_dl/extractor/appleconnect.py b/youtube_dl/extractor/appleconnect.py
index 494f8330c..a84b8b1eb 100644
--- a/youtube_dl/extractor/appleconnect.py
+++ b/youtube_dl/extractor/appleconnect.py
@@ -9,10 +9,10 @@ from ..utils import (
 
 
 class AppleConnectIE(InfoExtractor):
-    _VALID_URL = r'https?://itunes\.apple\.com/\w{0,2}/?post/(?:id)?sa\.(?P<id>[\w-]+)'
-    _TESTS = [{
+    _VALID_URL = r'https?://itunes\.apple\.com/\w{0,2}/?post/idsa\.(?P<id>[\w-]+)'
+    _TEST = {
         'url': 'https://itunes.apple.com/us/post/idsa.4ab17a39-2720-11e5-96c5-a5b38f6c42d3',
-        'md5': 'c1d41f72c8bcaf222e089434619316e4',
+        'md5': 'e7c38568a01ea45402570e6029206723',
         'info_dict': {
             'id': '4ab17a39-2720-11e5-96c5-a5b38f6c42d3',
             'ext': 'm4v',
@@ -22,10 +22,7 @@ class AppleConnectIE(InfoExtractor):
             'upload_date': '20150710',
             'timestamp': 1436545535,
         },
-    }, {
-        'url': 'https://itunes.apple.com/us/post/sa.0fe0229f-2457-11e5-9f40-1bb645f2d5d9',
-        'only_matching': True,
-    }]
+    }
 
     def _real_extract(self, url):
         video_id = self._match_id(url)
@@ -39,7 +36,7 @@ class AppleConnectIE(InfoExtractor):
 
         video_data = self._parse_json(video_json, video_id)
         timestamp = str_to_int(self._html_search_regex(r'data-timestamp="(\d+)"', webpage, 'timestamp'))
-        like_count = str_to_int(self._html_search_regex(r'(\d+) Loves', webpage, 'like count', default=None))
+        like_count = str_to_int(self._html_search_regex(r'(\d+) Loves', webpage, 'like count'))
 
         return {
             'id': video_id,
diff --git a/youtube_dl/extractor/applepodcasts.py b/youtube_dl/extractor/applepodcasts.py
index 95e0f663c..6a74de758 100644
--- a/youtube_dl/extractor/applepodcasts.py
+++ b/youtube_dl/extractor/applepodcasts.py
@@ -3,11 +3,8 @@ from __future__ import unicode_literals
 
 from .common import InfoExtractor
 from ..utils import (
-    clean_html,
     clean_podcast_url,
-    get_element_by_class,
     int_or_none,
-    parse_codecs,
     parse_iso8601,
     try_get,
 )
@@ -17,17 +14,16 @@ class ApplePodcastsIE(InfoExtractor):
     _VALID_URL = r'https?://podcasts\.apple\.com/(?:[^/]+/)?podcast(?:/[^/]+){1,2}.*?\bi=(?P<id>\d+)'
     _TESTS = [{
         'url': 'https://podcasts.apple.com/us/podcast/207-whitney-webb-returns/id1135137367?i=1000482637777',
-        'md5': '41dc31cd650143e530d9423b6b5a344f',
+        'md5': 'df02e6acb11c10e844946a39e7222b08',
         'info_dict': {
             'id': '1000482637777',
             'ext': 'mp3',
             'title': '207 - Whitney Webb Returns',
-            'description': 'md5:75ef4316031df7b41ced4e7b987f79c6',
+            'description': 'md5:13a73bade02d2e43737751e3987e1399',
             'upload_date': '20200705',
-            'timestamp': 1593932400,
-            'duration': 6454,
+            'timestamp': 1593921600,
+            'duration': 6425,
             'series': 'The Tim Dillon Show',
-            'thumbnail': 're:.+[.](png|jpe?g|webp)',
         }
     }, {
         'url': 'https://podcasts.apple.com/podcast/207-whitney-webb-returns/id1135137367?i=1000482637777',
@@ -43,40 +39,19 @@ class ApplePodcastsIE(InfoExtractor):
     def _real_extract(self, url):
         episode_id = self._match_id(url)
         webpage = self._download_webpage(url, episode_id)
-        episode_data = {}
-        ember_data = {}
-        # new page type 2021-11
-        amp_data = self._parse_json(self._search_regex(
-            r'(?s)id="shoebox-media-api-cache-amp-podcasts"[^>]*>\s*({.+?})\s*<',
-            webpage, 'AMP data', default='{}'), episode_id, fatal=False) or {}
-        amp_data = try_get(amp_data,
-                           lambda a: self._parse_json(
-                               next(a[x] for x in iter(a) if episode_id in x),
-                               episode_id),
-                           dict) or {}
-        amp_data = amp_data.get('d') or []
-        episode_data = try_get(
-            amp_data,
-            lambda a: next(x for x in a
-                           if x['type'] == 'podcast-episodes' and x['id'] == episode_id),
-            dict)
-        if not episode_data:
-            # try pre 2021-11 page type: TODO: consider deleting if no longer used
-            ember_data = self._parse_json(self._search_regex(
-                r'(?s)id="shoebox-ember-data-store"[^>]*>\s*({.+?})\s*<',
-                webpage, 'ember data'), episode_id) or {}
-            ember_data = ember_data.get(episode_id) or ember_data
-            episode_data = try_get(ember_data, lambda x: x['data'], dict)
-        episode = episode_data['attributes']
+        ember_data = self._parse_json(self._search_regex(
+            r'id="shoebox-ember-data-store"[^>]*>\s*({.+?})\s*<',
+            webpage, 'ember data'), episode_id)
+        ember_data = ember_data.get(episode_id) or ember_data
+        episode = ember_data['data']['attributes']
         description = episode.get('description') or {}
 
         series = None
-        for inc in (amp_data or ember_data.get('included') or []):
+        for inc in (ember_data.get('included') or []):
             if inc.get('type') == 'media/podcast':
                 series = try_get(inc, lambda x: x['attributes']['name'])
-        series = series or clean_html(get_element_by_class('podcast-header__identity', webpage))
 
-        info = [{
+        return {
             'id': episode_id,
             'title': episode['name'],
             'url': clean_podcast_url(episode['assetUrl']),
@@ -84,10 +59,4 @@ class ApplePodcastsIE(InfoExtractor):
             'timestamp': parse_iso8601(episode.get('releaseDateTime')),
             'duration': int_or_none(episode.get('durationInMilliseconds'), 1000),
             'series': series,
-            'thumbnail': self._og_search_thumbnail(webpage),
-        }]
-        self._sort_formats(info)
-        info = info[0]
-        codecs = parse_codecs(info.get('ext', 'mp3'))
-        info.update(codecs)
-        return info
+        }
diff --git a/youtube_dl/extractor/ard.py b/youtube_dl/extractor/ard.py
index a5b1f54d5..d57c5ba0f 100644
--- a/youtube_dl/extractor/ard.py
+++ b/youtube_dl/extractor/ard.py
@@ -249,14 +249,14 @@ class ARDMediathekIE(ARDMediathekBaseIE):
 
 
 class ARDIE(InfoExtractor):
-    _VALID_URL = r'(?P<mainurl>https?://(?:www\.)?daserste\.de/(?:[^/?#&]+/)+(?P<id>[^/?#&]+))\.html'
+    _VALID_URL = r'(?P<mainurl>https?://(?:www\.)?daserste\.de/[^?#]+/videos(?:extern)?/(?P<display_id>[^/?#]+)-(?:video-?)?(?P<id>[0-9]+))\.html'
     _TESTS = [{
         # available till 7.01.2022
         'url': 'https://www.daserste.de/information/talk/maischberger/videos/maischberger-die-woche-video100.html',
         'md5': '867d8aa39eeaf6d76407c5ad1bb0d4c1',
         'info_dict': {
-            'id': 'maischberger-die-woche-video100',
-            'display_id': 'maischberger-die-woche-video100',
+            'display_id': 'maischberger-die-woche',
+            'id': '100',
             'ext': 'mp4',
             'duration': 3687.0,
             'title': 'maischberger. die woche vom 7. Januar 2021',
@@ -264,25 +264,16 @@ class ARDIE(InfoExtractor):
             'thumbnail': r're:^https?://.*\.jpg$',
         },
     }, {
-        'url': 'https://www.daserste.de/information/politik-weltgeschehen/morgenmagazin/videosextern/dominik-kahun-aus-der-nhl-direkt-zur-weltmeisterschaft-100.html',
-        'only_matching': True,
-    }, {
-        'url': 'https://www.daserste.de/information/nachrichten-wetter/tagesthemen/videosextern/tagesthemen-17736.html',
+        'url': 'https://www.daserste.de/information/reportage-dokumentation/erlebnis-erde/videosextern/woelfe-und-herdenschutzhunde-ungleiche-brueder-102.html',
         'only_matching': True,
     }, {
         'url': 'http://www.daserste.de/information/reportage-dokumentation/dokus/videos/die-story-im-ersten-mission-unter-falscher-flagge-100.html',
         'only_matching': True,
-    }, {
-        'url': 'https://www.daserste.de/unterhaltung/serie/in-aller-freundschaft-die-jungen-aerzte/Drehpause-100.html',
-        'only_matching': True,
-    }, {
-        'url': 'https://www.daserste.de/unterhaltung/film/filmmittwoch-im-ersten/videos/making-ofwendezeit-video-100.html',
-        'only_matching': True,
     }]
 
     def _real_extract(self, url):
         mobj = re.match(self._VALID_URL, url)
-        display_id = mobj.group('id')
+        display_id = mobj.group('display_id')
 
         player_url = mobj.group('mainurl') + '~playerXml.xml'
         doc = self._download_xml(player_url, display_id)
@@ -332,24 +323,9 @@ class ARDIE(InfoExtractor):
             formats.append(f)
         self._sort_formats(formats)
 
-        _SUB_FORMATS = (
-            ('./dataTimedText', 'ttml'),
-            ('./dataTimedTextNoOffset', 'ttml'),
-            ('./dataTimedTextVtt', 'vtt'),
-        )
-
-        subtitles = {}
-        for subsel, subext in _SUB_FORMATS:
-            for node in video_node.findall(subsel):
-                subtitles.setdefault('de', []).append({
-                    'url': node.attrib['url'],
-                    'ext': subext,
-                })
-
         return {
-            'id': xpath_text(video_node, './videoId', default=display_id),
+            'id': mobj.group('id'),
             'formats': formats,
-            'subtitles': subtitles,
             'display_id': display_id,
             'title': video_node.find('./title').text,
             'duration': parse_duration(video_node.find('./duration').text),
diff --git a/youtube_dl/extractor/arte.py b/youtube_dl/extractor/arte.py
index 5bfe57b10..03abdbfaf 100644
--- a/youtube_dl/extractor/arte.py
+++ b/youtube_dl/extractor/arte.py
@@ -12,7 +12,6 @@ from ..utils import (
     ExtractorError,
     int_or_none,
     qualities,
-    strip_or_none,
     try_get,
     unified_strdate,
     url_or_none,
@@ -253,49 +252,3 @@ class ArteTVPlaylistIE(ArteTVBaseIE):
         title = collection.get('title')
         description = collection.get('shortDescription') or collection.get('teaserText')
         return self.playlist_result(entries, playlist_id, title, description)
-
-
-class ArteTVCategoryIE(ArteTVBaseIE):
-    _VALID_URL = r'https?://(?:www\.)?arte\.tv/(?P<lang>%s)/videos/(?P<id>[\w-]+(?:/[\w-]+)*)/?\s*$' % ArteTVBaseIE._ARTE_LANGUAGES
-    _TESTS = [{
-        'url': 'https://www.arte.tv/en/videos/politics-and-society/',
-        'info_dict': {
-            'id': 'politics-and-society',
-            'title': 'Politics and society',
-            'description': 'Investigative documentary series, geopolitical analysis, and international commentary',
-        },
-        'playlist_mincount': 13,
-    },
-    ]
-
-    @classmethod
-    def suitable(cls, url):
-        return (
-            not any(ie.suitable(url) for ie in (ArteTVIE, ArteTVPlaylistIE, ))
-            and super(ArteTVCategoryIE, cls).suitable(url))
-
-    def _real_extract(self, url):
-        lang, playlist_id = re.match(self._VALID_URL, url).groups()
-        webpage = self._download_webpage(url, playlist_id)
-
-        items = []
-        for video in re.finditer(
-                r'<a\b[^>]*?href\s*=\s*(?P<q>"|\'|\b)(?P<url>https?://www\.arte\.tv/%s/videos/[\w/-]+)(?P=q)' % lang,
-                webpage):
-            video = video.group('url')
-            if video == url:
-                continue
-            if any(ie.suitable(video) for ie in (ArteTVIE, ArteTVPlaylistIE, )):
-                items.append(video)
-
-        if items:
-            title = (self._og_search_title(webpage, default=None)
-                     or self._html_search_regex(r'<title\b[^>]*>([^<]+)</title>', default=None))
-            title = strip_or_none(title.rsplit('|', 1)[0]) or self._generic_title(url)
-
-            result = self.playlist_from_matches(items, playlist_id=playlist_id, playlist_title=title)
-            if result:
-                description = self._og_search_description(webpage, default=None)
-                if description:
-                    result['description'] = description
-                return result
diff --git a/youtube_dl/extractor/audiomack.py b/youtube_dl/extractor/audiomack.py
index 4d1fbad1f..cc7771354 100644
--- a/youtube_dl/extractor/audiomack.py
+++ b/youtube_dl/extractor/audiomack.py
@@ -14,7 +14,7 @@ from ..utils import (
 
 
 class AudiomackIE(InfoExtractor):
-    _VALID_URL = r'https?://(?:www\.)?audiomack\.com/(?:song/|(?=.+/song/))(?P<id>[\w/-]+)'
+    _VALID_URL = r'https?://(?:www\.)?audiomack\.com/song/(?P<id>[\w/-]+)'
     IE_NAME = 'audiomack'
     _TESTS = [
         # hosted on audiomack
@@ -29,27 +29,25 @@ class AudiomackIE(InfoExtractor):
             }
         },
         # audiomack wrapper around soundcloud song
-        # Needs new test URL.
         {
             'add_ie': ['Soundcloud'],
             'url': 'http://www.audiomack.com/song/hip-hop-daily/black-mamba-freestyle',
-            'only_matching': True,
-            # 'info_dict': {
-                # 'id': '258901379',
-                # 'ext': 'mp3',
-                # 'description': 'mamba day freestyle for the legend Kobe Bryant ',
-                # 'title': 'Black Mamba Freestyle [Prod. By Danny Wolf]',
-                # 'uploader': 'ILOVEMAKONNEN',
-                # 'upload_date': '20160414',
-            # }
+            'info_dict': {
+                'id': '258901379',
+                'ext': 'mp3',
+                'description': 'mamba day freestyle for the legend Kobe Bryant ',
+                'title': 'Black Mamba Freestyle [Prod. By Danny Wolf]',
+                'uploader': 'ILOVEMAKONNEN',
+                'upload_date': '20160414',
+            }
         },
     ]
 
     def _real_extract(self, url):
-        # URLs end with [uploader name]/song/[uploader title]
+        # URLs end with [uploader name]/[uploader title]
         # this title is whatever the user types in, and is rarely
         # the proper song title.  Real metadata is in the api response
-        album_url_tag = self._match_id(url).replace('/song/', '/')
+        album_url_tag = self._match_id(url)
 
         # Request the extended version of the api for extra fields like artist and title
         api_response = self._download_json(
@@ -75,13 +73,13 @@ class AudiomackIE(InfoExtractor):
 
 
 class AudiomackAlbumIE(InfoExtractor):
-    _VALID_URL = r'https?://(?:www\.)?audiomack\.com/(?:album/|(?=.+/album/))(?P<id>[\w/-]+)'
+    _VALID_URL = r'https?://(?:www\.)?audiomack\.com/album/(?P<id>[\w/-]+)'
     IE_NAME = 'audiomack:album'
     _TESTS = [
         # Standard album playlist
         {
             'url': 'http://www.audiomack.com/album/flytunezcom/tha-tour-part-2-mixtape',
-            'playlist_count': 11,
+            'playlist_count': 15,
             'info_dict':
             {
                 'id': '812251',
@@ -97,24 +95,24 @@ class AudiomackAlbumIE(InfoExtractor):
             },
             'playlist': [{
                 'info_dict': {
-                    'title': 'PPP (Pistol P Project) - 10. 4 Minutes Of Hell Part 4 (prod by DY OF 808 MAFIA)',
-                    'id': '837580',
+                    'title': 'PPP (Pistol P Project) - 9. Heaven or Hell (CHIMACA) ft Zuse (prod by DJ FU)',
+                    'id': '837577',
                     'ext': 'mp3',
                     'uploader': 'Lil Herb a.k.a. G Herbo',
                 }
             }],
             'params': {
-                'playliststart': 2,
-                'playlistend': 2,
+                'playliststart': 9,
+                'playlistend': 9,
             }
         }
     ]
 
     def _real_extract(self, url):
-        # URLs end with [uploader name]/album/[uploader title]
+        # URLs end with [uploader name]/[uploader title]
         # this title is whatever the user types in, and is rarely
         # the proper song title.  Real metadata is in the api response
-        album_url_tag = self._match_id(url).replace('/album/', '/')
+        album_url_tag = self._match_id(url)
         result = {'_type': 'playlist', 'entries': []}
         # There is no one endpoint for album metadata - instead it is included/repeated in each song's metadata
         # Therefore we don't know how many songs the album has and must infi-loop until failure
@@ -136,7 +134,7 @@ class AudiomackAlbumIE(InfoExtractor):
                 # Pull out the album metadata and add to result (if it exists)
                 for resultkey, apikey in [('id', 'album_id'), ('title', 'album_title')]:
                     if apikey in api_response and resultkey not in result:
-                        result[resultkey] = compat_str(api_response[apikey])
+                        result[resultkey] = api_response[apikey]
                 song_id = url_basename(api_response['url']).rpartition('.')[0]
                 result['entries'].append({
                     'id': compat_str(api_response.get('id', song_id)),
diff --git a/youtube_dl/extractor/bbc.py b/youtube_dl/extractor/bbc.py
index 378b52f4f..e8d000bbb 100644
--- a/youtube_dl/extractor/bbc.py
+++ b/youtube_dl/extractor/bbc.py
@@ -11,8 +11,6 @@ from ..compat import (
     compat_etree_Element,
     compat_HTTPError,
     compat_parse_qs,
-    compat_str,
-    compat_urllib_error,
     compat_urllib_parse_urlparse,
     compat_urlparse,
 )
@@ -27,10 +25,8 @@ from ..utils import (
     js_to_json,
     parse_duration,
     parse_iso8601,
-    strip_or_none,
     try_get,
     unescapeHTML,
-    unified_timestamp,
     url_or_none,
     urlencode_postdata,
     urljoin,
@@ -40,7 +36,7 @@ from ..utils import (
 class BBCCoUkIE(InfoExtractor):
     IE_NAME = 'bbc.co.uk'
     IE_DESC = 'BBC iPlayer'
-    _ID_REGEX = r'(?:[pbml][\da-z]{7}|w[\da-z]{7,14})'
+    _ID_REGEX = r'(?:[pbm][\da-z]{7}|w[\da-z]{7,14})'
     _VALID_URL = r'''(?x)
                     https?://
                         (?:www\.)?bbc\.co\.uk/
@@ -396,17 +392,9 @@ class BBCCoUkIE(InfoExtractor):
                         formats.extend(self._extract_mpd_formats(
                             href, programme_id, mpd_id=format_id, fatal=False))
                     elif transfer_format == 'hls':
-                        # TODO: let expected_status be passed into _extract_xxx_formats() instead
-                        try:
-                            fmts = self._extract_m3u8_formats(
-                                href, programme_id, ext='mp4', entry_protocol='m3u8_native',
-                                m3u8_id=format_id, fatal=False)
-                        except ExtractorError as e:
-                            if not (isinstance(e.exc_info[1], compat_urllib_error.HTTPError)
-                                    and e.exc_info[1].code in (403, 404)):
-                                raise
-                            fmts = []
-                        formats.extend(fmts)
+                        formats.extend(self._extract_m3u8_formats(
+                            href, programme_id, ext='mp4', entry_protocol='m3u8_native',
+                            m3u8_id=format_id, fatal=False))
                     elif transfer_format == 'hds':
                         formats.extend(self._extract_f4m_formats(
                             href, programme_id, f4m_id=format_id, fatal=False))
@@ -773,44 +761,23 @@ class BBCIE(BBCCoUkIE):
         'only_matching': True,
     }, {
         # custom redirection to www.bbc.com
-        # also, video with window.__INITIAL_DATA__
         'url': 'http://www.bbc.co.uk/news/science-environment-33661876',
-        'info_dict': {
-            'id': 'p02xzws1',
-            'ext': 'mp4',
-            'title': "Pluto may have 'nitrogen glaciers'",
-            'description': 'md5:6a95b593f528d7a5f2605221bc56912f',
-            'thumbnail': r're:https?://.+/.+\.jpg',
-            'timestamp': 1437785037,
-            'upload_date': '20150725',
-        },
-    }, {
-        # video with window.__INITIAL_DATA__ and value as JSON string
-        'url': 'https://www.bbc.com/news/av/world-europe-59468682',
-        'info_dict': {
-            'id': 'p0b71qth',
-            'ext': 'mp4',
-            'title': 'Why France is making this woman a national hero',
-            'description': 'md5:7affdfab80e9c3a1f976230a1ff4d5e4',
-            'thumbnail': r're:https?://.+/.+\.jpg',
-            'timestamp': 1638230731,
-            'upload_date': '20211130',
-        },
+        'only_matching': True,
     }, {
         # single video article embedded with data-media-vpid
         'url': 'http://www.bbc.co.uk/sport/rowing/35908187',
         'only_matching': True,
     }, {
-        # bbcthreeConfig
         'url': 'https://www.bbc.co.uk/bbcthree/clip/73d0bbd0-abc3-4cea-b3c0-cdae21905eb1',
         'info_dict': {
             'id': 'p06556y7',
             'ext': 'mp4',
-            'title': 'Things Not To Say to people that live on council estates',
-            'description': "From being labelled a 'chav', to the presumption that they're 'scroungers', people who live on council estates encounter all kinds of prejudices and false assumptions about themselves, their families, and their lifestyles. Here, eight people discuss the common statements, misconceptions, and clichés that they're tired of hearing.",
-            'duration': 360,
-            'thumbnail': r're:https?://.+/.+\.jpg',
+            'title': 'Transfers: Cristiano Ronaldo to Man Utd, Arsenal to spend?',
+            'description': 'md5:4b7dfd063d5a789a1512e99662be3ddd',
         },
+        'params': {
+            'skip_download': True,
+        }
     }, {
         # window.__PRELOADED_STATE__
         'url': 'https://www.bbc.co.uk/radio/play/b0b9z4yl',
@@ -1183,16 +1150,9 @@ class BBCIE(BBCCoUkIE):
                 return self.playlist_result(
                     entries, playlist_id, playlist_title, playlist_description)
 
-        initial_data = self._search_regex(
-            r'window\.__INITIAL_DATA__\s*=\s*("{.+?}")\s*;', webpage,
-            'quoted preload state', default=None)
-        if initial_data is None:
-            initial_data = self._search_regex(
-                r'window\.__INITIAL_DATA__\s*=\s*({.+?})\s*;', webpage,
-                'preload state', default={})
-        else:
-            initial_data = self._parse_json(initial_data or '"{}"', playlist_id, fatal=False)
-        initial_data = self._parse_json(initial_data, playlist_id, fatal=False)
+        initial_data = self._parse_json(self._search_regex(
+            r'window\.__INITIAL_DATA__\s*=\s*({.+?});', webpage,
+            'preload state', default='{}'), playlist_id, fatal=False)
         if initial_data:
             def parse_media(media):
                 if not media:
@@ -1204,39 +1164,19 @@ class BBCIE(BBCCoUkIE):
                         continue
                     formats, subtitles = self._download_media_selector(item_id)
                     self._sort_formats(formats)
-                    item_desc = None
-                    blocks = try_get(media, lambda x: x['summary']['blocks'], list)
-                    if blocks:
-                        summary = []
-                        for block in blocks:
-                            text = try_get(block, lambda x: x['model']['text'], compat_str)
-                            if text:
-                                summary.append(text)
-                        if summary:
-                            item_desc = '\n\n'.join(summary)
-                    item_time = None
-                    for meta in try_get(media, lambda x: x['metadata']['items'], list) or []:
-                        if try_get(meta, lambda x: x['label']) == 'Published':
-                            item_time = unified_timestamp(meta.get('timestamp'))
-                            break
                     entries.append({
                         'id': item_id,
                         'title': item_title,
                         'thumbnail': item.get('holdingImageUrl'),
                         'formats': formats,
                         'subtitles': subtitles,
-                        'timestamp': item_time,
-                        'description': strip_or_none(item_desc),
                     })
             for resp in (initial_data.get('data') or {}).values():
                 name = resp.get('name')
                 if name == 'media-experience':
                     parse_media(try_get(resp, lambda x: x['data']['initialItem']['mediaItem'], dict))
                 elif name == 'article':
-                    for block in (try_get(resp,
-                                          (lambda x: x['data']['blocks'],
-                                           lambda x: x['data']['content']['model']['blocks'],),
-                                          list) or []):
+                    for block in (try_get(resp, lambda x: x['data']['blocks'], list) or []):
                         if block.get('type') != 'media':
                             continue
                         parse_media(block.get('model'))
diff --git a/youtube_dl/extractor/bigo.py b/youtube_dl/extractor/bigo.py
deleted file mode 100644
index ddf76ac55..000000000
--- a/youtube_dl/extractor/bigo.py
+++ /dev/null
@@ -1,59 +0,0 @@
-# coding: utf-8
-from __future__ import unicode_literals
-
-from .common import InfoExtractor
-from ..utils import ExtractorError, urlencode_postdata
-
-
-class BigoIE(InfoExtractor):
-    _VALID_URL = r'https?://(?:www\.)?bigo\.tv/(?:[a-z]{2,}/)?(?P<id>[^/]+)'
-
-    _TESTS = [{
-        'url': 'https://www.bigo.tv/ja/221338632',
-        'info_dict': {
-            'id': '6576287577575737440',
-            'title': '土よ〜💁‍♂️ 休憩室/REST room',
-            'thumbnail': r're:https?://.+',
-            'uploader': '✨Shin💫',
-            'uploader_id': '221338632',
-            'is_live': True,
-        },
-        'skip': 'livestream',
-    }, {
-        'url': 'https://www.bigo.tv/th/Tarlerm1304',
-        'only_matching': True,
-    }, {
-        'url': 'https://bigo.tv/115976881',
-        'only_matching': True,
-    }]
-
-    def _real_extract(self, url):
-        user_id = self._match_id(url)
-
-        info_raw = self._download_json(
-            'https://bigo.tv/studio/getInternalStudioInfo',
-            user_id, data=urlencode_postdata({'siteId': user_id}))
-
-        if not isinstance(info_raw, dict):
-            raise ExtractorError('Received invalid JSON data')
-        if info_raw.get('code'):
-            raise ExtractorError(
-                'Bigo says: %s (code %s)' % (info_raw.get('msg'), info_raw.get('code')), expected=True)
-        info = info_raw.get('data') or {}
-
-        if not info.get('alive'):
-            raise ExtractorError('This user is offline.', expected=True)
-
-        return {
-            'id': info.get('roomId') or user_id,
-            'title': info.get('roomTopic') or info.get('nick_name') or user_id,
-            'formats': [{
-                'url': info.get('hls_src'),
-                'ext': 'mp4',
-                'protocol': 'm3u8',
-            }],
-            'thumbnail': info.get('snapshot'),
-            'uploader': info.get('nick_name'),
-            'uploader_id': user_id,
-            'is_live': True,
-        }
diff --git a/youtube_dl/extractor/bilibili.py b/youtube_dl/extractor/bilibili.py
index d42f0e98a..589fdc1ce 100644
--- a/youtube_dl/extractor/bilibili.py
+++ b/youtube_dl/extractor/bilibili.py
@@ -233,7 +233,7 @@ class BiliBiliIE(InfoExtractor):
             webpage)
         if uploader_mobj:
             info.update({
-                'uploader': uploader_mobj.group('name').strip(),
+                'uploader': uploader_mobj.group('name'),
                 'uploader_id': uploader_mobj.group('id'),
             })
         if not info.get('uploader'):
@@ -369,11 +369,6 @@ class BilibiliAudioIE(BilibiliAudioBaseIE):
             'filesize': int_or_none(play_data.get('size')),
         }]
 
-        for a_format in formats:
-            a_format.setdefault('http_headers', {}).update({
-                'Referer': url,
-            })
-
         song = self._call_api('song/info', au_id)
         title = song['title']
         statistic = song.get('statistic') or {}
diff --git a/youtube_dl/extractor/blerp.py b/youtube_dl/extractor/blerp.py
deleted file mode 100644
index 355daef6e..000000000
--- a/youtube_dl/extractor/blerp.py
+++ /dev/null
@@ -1,173 +0,0 @@
-# coding: utf-8
-from __future__ import unicode_literals
-
-import json
-
-from ..utils import (
-    strip_or_none,
-    traverse_obj,
-)
-from .common import InfoExtractor
-
-
-class BlerpIE(InfoExtractor):
-    IE_NAME = 'blerp'
-    _VALID_URL = r'https?://(?:www\.)?blerp\.com/soundbites/(?P<id>[0-9a-zA-Z]+)'
-    _TESTS = [{
-        'url': 'https://blerp.com/soundbites/6320fe8745636cb4dd677a5a',
-        'info_dict': {
-            'id': '6320fe8745636cb4dd677a5a',
-            'title': 'Samsung Galaxy S8 Over the Horizon Ringtone 2016',
-            'uploader': 'luminousaj',
-            'uploader_id': '5fb81e51aa66ae000c395478',
-            'ext': 'mp3',
-            'tags': ['samsung', 'galaxy', 's8', 'over the horizon', '2016', 'ringtone'],
-        }
-    }, {
-        'url': 'https://blerp.com/soundbites/5bc94ef4796001000498429f',
-        'info_dict': {
-            'id': '5bc94ef4796001000498429f',
-            'title': 'Yee',
-            'uploader': '179617322678353920',
-            'uploader_id': '5ba99cf71386730004552c42',
-            'ext': 'mp3',
-            'tags': ['YEE', 'YEET', 'wo ha haah catchy tune yee', 'yee']
-        }
-    }]
-
-    _GRAPHQL_OPERATIONNAME = "webBitePageGetBite"
-    _GRAPHQL_QUERY = (
-        '''query webBitePageGetBite($_id: MongoID!) {
-            web {
-                biteById(_id: $_id) {
-                    ...bitePageFrag
-                    __typename
-                }
-                __typename
-            }
-        }
-
-        fragment bitePageFrag on Bite {
-            _id
-            title
-            userKeywords
-            keywords
-            color
-            visibility
-            isPremium
-            owned
-            price
-            extraReview
-            isAudioExists
-            image {
-                filename
-                original {
-                    url
-                    __typename
-                }
-                __typename
-            }
-            userReactions {
-                _id
-                reactions
-                createdAt
-                __typename
-            }
-            topReactions
-            totalSaveCount
-            saved
-            blerpLibraryType
-            license
-            licenseMetaData
-            playCount
-            totalShareCount
-            totalFavoriteCount
-            totalAddedToBoardCount
-            userCategory
-            userAudioQuality
-            audioCreationState
-            transcription
-            userTranscription
-            description
-            createdAt
-            updatedAt
-            author
-            listingType
-            ownerObject {
-                _id
-                username
-                profileImage {
-                    filename
-                    original {
-                        url
-                        __typename
-                    }
-                    __typename
-                }
-                __typename
-            }
-            transcription
-            favorited
-            visibility
-            isCurated
-            sourceUrl
-            audienceRating
-            strictAudienceRating
-            ownerId
-            reportObject {
-                reportedContentStatus
-                __typename
-            }
-            giphy {
-                mp4
-                gif
-                __typename
-            }
-            audio {
-                filename
-                original {
-                    url
-                    __typename
-                }
-                mp3 {
-                    url
-                    __typename
-                }
-                __typename
-            }
-            __typename
-        }
-
-        ''')
-
-    def _real_extract(self, url):
-        audio_id = self._match_id(url)
-
-        data = {
-            'operationName': self._GRAPHQL_OPERATIONNAME,
-            'query': self._GRAPHQL_QUERY,
-            'variables': {
-                '_id': audio_id
-            }
-        }
-
-        headers = {
-            'Content-Type': 'application/json'
-        }
-
-        json_result = self._download_json('https://api.blerp.com/graphql',
-                                          audio_id, data=json.dumps(data).encode('utf-8'), headers=headers)
-
-        bite_json = json_result['data']['web']['biteById']
-
-        info_dict = {
-            'id': bite_json['_id'],
-            'url': bite_json['audio']['mp3']['url'],
-            'title': bite_json['title'],
-            'uploader': traverse_obj(bite_json, ('ownerObject', 'username'), expected_type=strip_or_none),
-            'uploader_id': traverse_obj(bite_json, ('ownerObject', '_id'), expected_type=strip_or_none),
-            'ext': 'mp3',
-            'tags': list(filter(None, map(strip_or_none, (traverse_obj(bite_json, 'userKeywords', expected_type=list) or []))) or None)
-        }
-
-        return info_dict
diff --git a/youtube_dl/extractor/blinkx.py b/youtube_dl/extractor/blinkx.py
new file mode 100644
index 000000000..db5e12b21
--- /dev/null
+++ b/youtube_dl/extractor/blinkx.py
@@ -0,0 +1,86 @@
+from __future__ import unicode_literals
+
+import json
+
+from .common import InfoExtractor
+from ..utils import (
+    remove_start,
+    int_or_none,
+)
+
+
+class BlinkxIE(InfoExtractor):
+    _VALID_URL = r'(?:https?://(?:www\.)blinkx\.com/#?ce/|blinkx:)(?P<id>[^?]+)'
+    IE_NAME = 'blinkx'
+
+    _TEST = {
+        'url': 'http://www.blinkx.com/ce/Da0Gw3xc5ucpNduzLuDDlv4WC9PuI4fDi1-t6Y3LyfdY2SZS5Urbvn-UPJvrvbo8LTKTc67Wu2rPKSQDJyZeeORCR8bYkhs8lI7eqddznH2ofh5WEEdjYXnoRtj7ByQwt7atMErmXIeYKPsSDuMAAqJDlQZ-3Ff4HJVeH_s3Gh8oQ',
+        'md5': '337cf7a344663ec79bf93a526a2e06c7',
+        'info_dict': {
+            'id': 'Da0Gw3xc',
+            'ext': 'mp4',
+            'title': 'No Daily Show for John Oliver; HBO Show Renewed - IGN News',
+            'uploader': 'IGN News',
+            'upload_date': '20150217',
+            'timestamp': 1424215740,
+            'description': 'HBO has renewed Last Week Tonight With John Oliver for two more seasons.',
+            'duration': 47.743333,
+        },
+    }
+
+    def _real_extract(self, url):
+        video_id = self._match_id(url)
+        display_id = video_id[:8]
+
+        api_url = ('https://apib4.blinkx.com/api.php?action=play_video&'
+                   + 'video=%s' % video_id)
+        data_json = self._download_webpage(api_url, display_id)
+        data = json.loads(data_json)['api']['results'][0]
+        duration = None
+        thumbnails = []
+        formats = []
+        for m in data['media']:
+            if m['type'] == 'jpg':
+                thumbnails.append({
+                    'url': m['link'],
+                    'width': int(m['w']),
+                    'height': int(m['h']),
+                })
+            elif m['type'] == 'original':
+                duration = float(m['d'])
+            elif m['type'] == 'youtube':
+                yt_id = m['link']
+                self.to_screen('Youtube video detected: %s' % yt_id)
+                return self.url_result(yt_id, 'Youtube', video_id=yt_id)
+            elif m['type'] in ('flv', 'mp4'):
+                vcodec = remove_start(m['vcodec'], 'ff')
+                acodec = remove_start(m['acodec'], 'ff')
+                vbr = int_or_none(m.get('vbr') or m.get('vbitrate'), 1000)
+                abr = int_or_none(m.get('abr') or m.get('abitrate'), 1000)
+                tbr = vbr + abr if vbr and abr else None
+                format_id = '%s-%sk-%s' % (vcodec, tbr, m['w'])
+                formats.append({
+                    'format_id': format_id,
+                    'url': m['link'],
+                    'vcodec': vcodec,
+                    'acodec': acodec,
+                    'abr': abr,
+                    'vbr': vbr,
+                    'tbr': tbr,
+                    'width': int_or_none(m.get('w')),
+                    'height': int_or_none(m.get('h')),
+                })
+
+        self._sort_formats(formats)
+
+        return {
+            'id': display_id,
+            'fullid': video_id,
+            'title': data['title'],
+            'formats': formats,
+            'uploader': data['channel_name'],
+            'timestamp': data['pubdate_epoch'],
+            'description': data.get('description'),
+            'thumbnails': thumbnails,
+            'duration': duration,
+        }
diff --git a/youtube_dl/extractor/bokecc.py b/youtube_dl/extractor/bokecc.py
index 4b8bef391..6017e8344 100644
--- a/youtube_dl/extractor/bokecc.py
+++ b/youtube_dl/extractor/bokecc.py
@@ -32,7 +32,7 @@ class BokeCCBaseIE(InfoExtractor):
 
 
 class BokeCCIE(BokeCCBaseIE):
-    IE_DESC = 'CC视频'
+    _IE_DESC = 'CC视频'
     _VALID_URL = r'https?://union\.bokecc\.com/playvideo\.bo\?(?P<query>.*)'
 
     _TESTS = [{
diff --git a/youtube_dl/extractor/bongacams.py b/youtube_dl/extractor/bongacams.py
index 016999d55..180542fbc 100644
--- a/youtube_dl/extractor/bongacams.py
+++ b/youtube_dl/extractor/bongacams.py
@@ -1,4 +1,3 @@
-# coding: utf-8
 from __future__ import unicode_literals
 
 import re
@@ -13,28 +12,13 @@ from ..utils import (
 
 
 class BongaCamsIE(InfoExtractor):
-    _VALID_URL = r'https?://(?P<host>(?:[^/]+\.)?bongacams\d*\.(?:com|net))/(?P<id>[^/?&#]+)'
+    _VALID_URL = r'https?://(?P<host>(?:[^/]+\.)?bongacams\d*\.com)/(?P<id>[^/?&#]+)'
     _TESTS = [{
         'url': 'https://de.bongacams.com/azumi-8',
         'only_matching': True,
     }, {
         'url': 'https://cn.bongacams.com/azumi-8',
         'only_matching': True,
-    }, {
-        'url': 'https://de.bongacams.net/claireashton',
-        'info_dict': {
-            'id': 'claireashton',
-            'ext': 'mp4',
-            'title': r're:ClaireAshton \d{4}-\d{2}-\d{2} \d{2}:\d{2}',
-            'age_limit': 18,
-            'uploader_id': 'ClaireAshton',
-            'uploader': 'ClaireAshton',
-            'like_count': int,
-            'is_live': True,
-        },
-        'params': {
-            'skip_download': True,
-        },
     }]
 
     def _real_extract(self, url):
diff --git a/youtube_dl/extractor/caffeine.py b/youtube_dl/extractor/caffeine.py
deleted file mode 100644
index bffedb9a7..000000000
--- a/youtube_dl/extractor/caffeine.py
+++ /dev/null
@@ -1,79 +0,0 @@
-# coding: utf-8
-from __future__ import unicode_literals
-
-from .common import InfoExtractor
-from ..utils import (
-    determine_ext,
-    int_or_none,
-    merge_dicts,
-    parse_iso8601,
-    T,
-    traverse_obj,
-    txt_or_none,
-    urljoin,
-)
-
-
-class CaffeineTVIE(InfoExtractor):
-    _VALID_URL = r'https?://(?:www\.)?caffeine\.tv/[^/]+/video/(?P<id>[0-9a-f-]+)'
-    _TESTS = [{
-        'url': 'https://www.caffeine.tv/TsuSurf/video/cffc0a00-e73f-11ec-8080-80017d29f26e',
-        'info_dict': {
-            'id': 'cffc0a00-e73f-11ec-8080-80017d29f26e',
-            'ext': 'mp4',
-            'title': 'GOOOOD MORNINNNNN #highlights',
-            'timestamp': 1654702180,
-            'upload_date': '20220608',
-            'uploader': 'TsuSurf',
-            'duration': 3145,
-            'age_limit': 17,
-        },
-        'params': {
-            'format': 'bestvideo',
-        },
-    }]
-
-    def _real_extract(self, url):
-        video_id = self._match_id(url)
-        json_data = self._download_json(
-            'https://api.caffeine.tv/social/public/activity/' + video_id,
-            video_id)
-        broadcast_info = traverse_obj(json_data, ('broadcast_info', T(dict))) or {}
-        title = broadcast_info['broadcast_title']
-        video_url = broadcast_info['video_url']
-
-        ext = determine_ext(video_url)
-        if ext == 'm3u8':
-            formats = self._extract_m3u8_formats(
-                video_url, video_id, 'mp4', entry_protocol='m3u8',
-                fatal=False)
-        else:
-            formats = [{'url': video_url}]
-        self._sort_formats(formats)
-
-        return merge_dicts({
-            'id': video_id,
-            'title': title,
-            'formats': formats,
-        }, traverse_obj(json_data, {
-            'uploader': ((None, 'user'), 'username'),
-        }, get_all=False), traverse_obj(json_data, {
-            'like_count': ('like_count', T(int_or_none)),
-            'view_count': ('view_count', T(int_or_none)),
-            'comment_count': ('comment_count', T(int_or_none)),
-            'tags': ('tags', Ellipsis, T(txt_or_none)),
-            'is_live': 'is_live',
-            'uploader': ('user', 'name'),
-        }), traverse_obj(broadcast_info, {
-            'duration': ('content_duration', T(int_or_none)),
-            'timestamp': ('broadcast_start_time', T(parse_iso8601)),
-            'thumbnail': ('preview_image_path', T(lambda u: urljoin(url, u))),
-            'age_limit': ('content_rating', T(lambda r: r and {
-                # assume Apple Store ratings [1]
-                # 1. https://en.wikipedia.org/wiki/Mobile_software_content_rating_system
-                'FOUR_PLUS': 0,
-                'NINE_PLUS': 9,
-                'TWELVE_PLUS': 12,
-                'SEVENTEEN_PLUS': 17,
-            }.get(r, 17))),
-        }))
diff --git a/youtube_dl/extractor/callin.py b/youtube_dl/extractor/callin.py
deleted file mode 100644
index 341be479f..000000000
--- a/youtube_dl/extractor/callin.py
+++ /dev/null
@@ -1,74 +0,0 @@
-# coding: utf-8
-from __future__ import unicode_literals
-
-from .common import InfoExtractor
-from ..compat import compat_str
-from ..utils import (
-    ExtractorError,
-    traverse_obj,
-    try_get,
-)
-
-
-class CallinIE(InfoExtractor):
-    _VALID_URL = r'https?://(?:www\.)?callin\.com/episode/(?:[^/#?-]+-)*(?P<id>[^/#?-]+)'
-    _TESTS = [{
-        'url': 'https://www.callin.com/episode/fcc-commissioner-brendan-carr-on-elons-PrumRdSQJW',
-        'md5': '14ede27ee2c957b7e4db93140fc0745c',
-        'info_dict': {
-            'id': 'PrumRdSQJW',
-            'ext': 'mp4',
-            'title': 'FCC Commissioner Brendan Carr on Elon’s Starlink',
-            'description': 'Or, why the government doesn’t like SpaceX',
-            'channel': 'The Pull Request',
-            'channel_url': 'https://callin.com/show/the-pull-request-ucnDJmEKAa',
-        }
-    }, {
-        'url': 'https://www.callin.com/episode/episode-81-elites-melt-down-over-student-debt-lzxMidUnjA',
-        'md5': '16f704ddbf82a27e3930533b12062f07',
-        'info_dict': {
-            'id': 'lzxMidUnjA',
-            'ext': 'mp4',
-            'title': 'Episode 81- Elites MELT DOWN over Student Debt Victory? Rumble in NYC?',
-            'description': 'Let’s talk todays episode about the primary election shake up in NYC and the elites melting down over student debt cancelation.',
-            'channel': 'The DEBRIEF With Briahna Joy Gray',
-            'channel_url': 'https://callin.com/show/the-debrief-with-briahna-joy-gray-siiFDzGegm',
-        }
-    }]
-
-    def _search_nextjs_data(self, webpage, video_id, transform_source=None, fatal=True, **kw):
-        return self._parse_json(
-            self._search_regex(
-                r'(?s)<script[^>]+id=[\'"]__NEXT_DATA__[\'"][^>]*>([^<]+)</script>',
-                webpage, 'next.js data', fatal=fatal, **kw),
-            video_id, transform_source=transform_source, fatal=fatal)
-
-    def _real_extract(self, url):
-        video_id = self._match_id(url)
-        webpage = self._download_webpage(url, video_id)
-
-        next_data = self._search_nextjs_data(webpage, video_id)
-        episode = traverse_obj(next_data, ('props', 'pageProps', 'episode'), expected_type=dict)
-        if not episode:
-            raise ExtractorError('Failed to find episode data')
-
-        title = episode.get('title') or self._og_search_title(webpage)
-        description = episode.get('description') or self._og_search_description(webpage)
-
-        formats = []
-        formats.extend(self._extract_m3u8_formats(
-            episode.get('m3u8'), video_id, 'mp4',
-            entry_protocol='m3u8_native', fatal=False))
-        self._sort_formats(formats)
-
-        channel = try_get(episode, lambda x: x['show']['title'], compat_str)
-        channel_url = try_get(episode, lambda x: x['show']['linkObj']['resourceUrl'], compat_str)
-
-        return {
-            'id': video_id,
-            'title': title,
-            'description': description,
-            'formats': formats,
-            'channel': channel,
-            'channel_url': channel_url,
-        }
diff --git a/youtube_dl/extractor/cammodels.py b/youtube_dl/extractor/cammodels.py
index d2e860b24..1eb81b75e 100644
--- a/youtube_dl/extractor/cammodels.py
+++ b/youtube_dl/extractor/cammodels.py
@@ -3,6 +3,7 @@ from __future__ import unicode_literals
 
 from .common import InfoExtractor
 from ..utils import (
+    ExtractorError,
     int_or_none,
     url_or_none,
 )
@@ -19,11 +20,32 @@ class CamModelsIE(InfoExtractor):
     def _real_extract(self, url):
         user_id = self._match_id(url)
 
+        webpage = self._download_webpage(
+            url, user_id, headers=self.geo_verification_headers())
+
+        manifest_root = self._html_search_regex(
+            r'manifestUrlRoot=([^&\']+)', webpage, 'manifest', default=None)
+
+        if not manifest_root:
+            ERRORS = (
+                ("I'm offline, but let's stay connected", 'This user is currently offline'),
+                ('in a private show', 'This user is in a private show'),
+                ('is currently performing LIVE', 'This model is currently performing live'),
+            )
+            for pattern, message in ERRORS:
+                if pattern in webpage:
+                    error = message
+                    expected = True
+                    break
+            else:
+                error = 'Unable to find manifest URL root'
+                expected = False
+            raise ExtractorError(error, expected=expected)
+
         manifest = self._download_json(
-            'https://manifest-server.naiadsystems.com/live/s:%s.json' % user_id, user_id)
+            '%s%s.json' % (manifest_root, user_id), user_id)
 
         formats = []
-        thumbnails = []
         for format_id, format_dict in manifest['formats'].items():
             if not isinstance(format_dict, dict):
                 continue
@@ -63,13 +85,6 @@ class CamModelsIE(InfoExtractor):
                         'preference': -1,
                     })
                 else:
-                    if format_id == 'jpeg':
-                        thumbnails.append({
-                            'url': f['url'],
-                            'width': f['width'],
-                            'height': f['height'],
-                            'format_id': f['format_id'],
-                        })
                     continue
                 formats.append(f)
         self._sort_formats(formats)
@@ -77,7 +92,6 @@ class CamModelsIE(InfoExtractor):
         return {
             'id': user_id,
             'title': self._live_title(user_id),
-            'thumbnails': thumbnails,
             'is_live': True,
             'formats': formats,
             'age_limit': 18
diff --git a/youtube_dl/extractor/cbsnews.py b/youtube_dl/extractor/cbsnews.py
index 1285ed65e..345debcf0 100644
--- a/youtube_dl/extractor/cbsnews.py
+++ b/youtube_dl/extractor/cbsnews.py
@@ -26,7 +26,7 @@ class CBSNewsEmbedIE(CBSIE):
     def _real_extract(self, url):
         item = self._parse_json(zlib.decompress(compat_b64decode(
             compat_urllib_parse_unquote(self._match_id(url))),
-            -zlib.MAX_WBITS).decode('utf-8'), None)['video']['items'][0]
+            -zlib.MAX_WBITS), None)['video']['items'][0]
         return self._extract_video_info(item['mpxRefId'], 'cbsnews')
 
 
diff --git a/youtube_dl/extractor/cbssports.py b/youtube_dl/extractor/cbssports.py
index a891c9a55..83b764762 100644
--- a/youtube_dl/extractor/cbssports.py
+++ b/youtube_dl/extractor/cbssports.py
@@ -1,113 +1,38 @@
 from __future__ import unicode_literals
 
-import re
-
-# from .cbs import CBSBaseIE
-from .common import InfoExtractor
-from ..utils import (
-    int_or_none,
-    try_get,
-)
+from .cbs import CBSBaseIE
 
 
-# class CBSSportsEmbedIE(CBSBaseIE):
-class CBSSportsEmbedIE(InfoExtractor):
-    IE_NAME = 'cbssports:embed'
-    _VALID_URL = r'''(?ix)https?://(?:(?:www\.)?cbs|embed\.247)sports\.com/player/embed.+?
-        (?:
-            ids%3D(?P<id>[\da-f]{8}-(?:[\da-f]{4}-){3}[\da-f]{12})|
-            pcid%3D(?P<pcid>\d+)
-        )'''
+class CBSSportsIE(CBSBaseIE):
+    _VALID_URL = r'https?://(?:www\.)?cbssports\.com/[^/]+/(?:video|news)/(?P<id>[^/?#&]+)'
+
     _TESTS = [{
-        'url': 'https://www.cbssports.com/player/embed/?args=player_id%3Db56c03a6-231a-4bbe-9c55-af3c8a8e9636%26ids%3Db56c03a6-231a-4bbe-9c55-af3c8a8e9636%26resizable%3D1%26autoplay%3Dtrue%26domain%3Dcbssports.com%26comp_ads_enabled%3Dfalse%26watchAndRead%3D0%26startTime%3D0%26env%3Dprod',
-        'only_matching': True,
+        'url': 'https://www.cbssports.com/nba/video/donovan-mitchell-flashes-star-potential-in-game-2-victory-over-thunder/',
+        'info_dict': {
+            'id': '1214315075735',
+            'ext': 'mp4',
+            'title': 'Donovan Mitchell flashes star potential in Game 2 victory over Thunder',
+            'description': 'md5:df6f48622612c2d6bd2e295ddef58def',
+            'timestamp': 1524111457,
+            'upload_date': '20180419',
+            'uploader': 'CBSI-NEW',
+        },
+        'params': {
+            # m3u8 download
+            'skip_download': True,
+        }
     }, {
-        'url': 'https://embed.247sports.com/player/embed/?args=%3fplayer_id%3d1827823171591%26channel%3dcollege-football-recruiting%26pcid%3d1827823171591%26width%3d640%26height%3d360%26autoplay%3dTrue%26comp_ads_enabled%3dFalse%26uvpc%3dhttps%253a%252f%252fwww.cbssports.com%252fapi%252fcontent%252fvideo%252fconfig%252f%253fcfg%253duvp_247sports_v4%2526partner%253d247%26uvpc_m%3dhttps%253a%252f%252fwww.cbssports.com%252fapi%252fcontent%252fvideo%252fconfig%252f%253fcfg%253duvp_247sports_m_v4%2526partner_m%253d247_mobile%26utag%3d247sportssite%26resizable%3dTrue',
+        'url': 'https://www.cbssports.com/nba/news/nba-playoffs-2018-watch-76ers-vs-heat-game-3-series-schedule-tv-channel-online-stream/',
         'only_matching': True,
     }]
 
-    # def _extract_video_info(self, filter_query, video_id):
-    #     return self._extract_feed_info('dJ5BDC', 'VxxJg8Ymh8sE', filter_query, video_id)
+    def _extract_video_info(self, filter_query, video_id):
+        return self._extract_feed_info('dJ5BDC', 'VxxJg8Ymh8sE', filter_query, video_id)
 
-    def _real_extract(self, url):
-        uuid, pcid = re.match(self._VALID_URL, url).groups()
-        query = {'id': uuid} if uuid else {'pcid': pcid}
-        video = self._download_json(
-            'https://www.cbssports.com/api/content/video/',
-            uuid or pcid, query=query)[0]
-        video_id = video['id']
-        title = video['title']
-        metadata = video.get('metaData') or {}
-        # return self._extract_video_info('byId=%d' % metadata['mpxOutletId'], video_id)
-        # return self._extract_video_info('byGuid=' + metadata['mpxRefId'], video_id)
-
-        formats = self._extract_m3u8_formats(
-            metadata['files'][0]['url'], video_id, 'mp4',
-            'm3u8_native', m3u8_id='hls', fatal=False)
-        self._sort_formats(formats)
-
-        image = video.get('image')
-        thumbnails = None
-        if image:
-            image_path = image.get('path')
-            if image_path:
-                thumbnails = [{
-                    'url': image_path,
-                    'width': int_or_none(image.get('width')),
-                    'height': int_or_none(image.get('height')),
-                    'filesize': int_or_none(image.get('size')),
-                }]
-
-        return {
-            'id': video_id,
-            'title': title,
-            'formats': formats,
-            'thumbnails': thumbnails,
-            'description': video.get('description'),
-            'timestamp': int_or_none(try_get(video, lambda x: x['dateCreated']['epoch'])),
-            'duration': int_or_none(metadata.get('duration')),
-        }
-
-
-class CBSSportsBaseIE(InfoExtractor):
     def _real_extract(self, url):
         display_id = self._match_id(url)
         webpage = self._download_webpage(url, display_id)
-        iframe_url = self._search_regex(
-            r'<iframe[^>]+(?:data-)?src="(https?://[^/]+/player/embed[^"]+)"',
-            webpage, 'embed url')
-        return self.url_result(iframe_url, CBSSportsEmbedIE.ie_key())
-
-
-class CBSSportsIE(CBSSportsBaseIE):
-    IE_NAME = 'cbssports'
-    _VALID_URL = r'https?://(?:www\.)?cbssports\.com/[^/]+/video/(?P<id>[^/?#&]+)'
-    _TESTS = [{
-        'url': 'https://www.cbssports.com/college-football/video/cover-3-stanford-spring-gleaning/',
-        'info_dict': {
-            'id': 'b56c03a6-231a-4bbe-9c55-af3c8a8e9636',
-            'ext': 'mp4',
-            'title': 'Cover 3: Stanford Spring Gleaning',
-            'description': 'The Cover 3 crew break down everything you need to know about the Stanford Cardinal this spring.',
-            'timestamp': 1617218398,
-            'upload_date': '20210331',
-            'duration': 502,
-        },
-    }]
-
-
-class TwentyFourSevenSportsIE(CBSSportsBaseIE):
-    IE_NAME = '247sports'
-    _VALID_URL = r'https?://(?:www\.)?247sports\.com/Video/(?:[^/?#&]+-)?(?P<id>\d+)'
-    _TESTS = [{
-        'url': 'https://247sports.com/Video/2021-QB-Jake-Garcia-senior-highlights-through-five-games-10084854/',
-        'info_dict': {
-            'id': '4f1265cb-c3b5-44a8-bb1d-1914119a0ccc',
-            'ext': 'mp4',
-            'title': '2021 QB Jake Garcia senior highlights through five games',
-            'description': 'md5:8cb67ebed48e2e6adac1701e0ff6e45b',
-            'timestamp': 1607114223,
-            'upload_date': '20201204',
-            'duration': 208,
-        },
-    }]
+        video_id = self._search_regex(
+            [r'(?:=|%26)pcid%3D(\d+)', r'embedVideo(?:Container)?_(\d+)'],
+            webpage, 'video id')
+        return self._extract_video_info('byId=%s' % video_id, video_id)
diff --git a/youtube_dl/extractor/cda.py b/youtube_dl/extractor/cda.py
index e1b391937..1b4362144 100644
--- a/youtube_dl/extractor/cda.py
+++ b/youtube_dl/extractor/cda.py
@@ -133,8 +133,6 @@ class CDAIE(InfoExtractor):
             'age_limit': 18 if need_confirm_age else 0,
         }
 
-        info = self._search_json_ld(webpage, video_id, default={})
-
         # Source: https://www.cda.pl/js/player.js?t=1606154898
         def decrypt_file(a):
             for p in ('_XDDD', '_CDA', '_ADC', '_CXD', '_QWE', '_Q5', '_IKSDE'):
@@ -199,7 +197,7 @@ class CDAIE(InfoExtractor):
                 handler = self._download_webpage
 
             webpage = handler(
-                urljoin(self._BASE_URL, href), video_id,
+                self._BASE_URL + href, video_id,
                 'Downloading %s version information' % resolution, fatal=False)
             if not webpage:
                 # Manually report warning because empty page is returned when
@@ -211,4 +209,6 @@ class CDAIE(InfoExtractor):
 
         self._sort_formats(formats)
 
+        info = self._search_json_ld(webpage, video_id, default={})
+
         return merge_dicts(info_dict, info)
diff --git a/youtube_dl/extractor/ceskatelevize.py b/youtube_dl/extractor/ceskatelevize.py
index fe677d8e8..7cb4efb74 100644
--- a/youtube_dl/extractor/ceskatelevize.py
+++ b/youtube_dl/extractor/ceskatelevize.py
@@ -12,21 +12,35 @@ from ..utils import (
     ExtractorError,
     float_or_none,
     sanitized_Request,
-    str_or_none,
-    traverse_obj,
+    unescapeHTML,
+    update_url_query,
     urlencode_postdata,
     USER_AGENTS,
 )
 
 
 class CeskaTelevizeIE(InfoExtractor):
-    _VALID_URL = r'https?://(?:www\.)?ceskatelevize\.cz/(?:ivysilani|porady|zive)/(?:[^/?#&]+/)*(?P<id>[^/#?]+)'
+    _VALID_URL = r'https?://(?:www\.)?ceskatelevize\.cz/ivysilani/(?:[^/?#&]+/)*(?P<id>[^/#?]+)'
     _TESTS = [{
+        'url': 'http://www.ceskatelevize.cz/ivysilani/ivysilani/10441294653-hyde-park-civilizace/214411058091220',
+        'info_dict': {
+            'id': '61924494877246241',
+            'ext': 'mp4',
+            'title': 'Hyde Park Civilizace: Život v Grónsku',
+            'description': 'md5:3fec8f6bb497be5cdb0c9e8781076626',
+            'thumbnail': r're:^https?://.*\.jpg',
+            'duration': 3350,
+        },
+        'params': {
+            # m3u8 download
+            'skip_download': True,
+        },
+    }, {
         'url': 'http://www.ceskatelevize.cz/ivysilani/10441294653-hyde-park-civilizace/215411058090502/bonus/20641-bonus-01-en',
         'info_dict': {
             'id': '61924494877028507',
             'ext': 'mp4',
-            'title': 'Bonus 01 - En - Hyde Park Civilizace',
+            'title': 'Hyde Park Civilizace: Bonus 01 - En',
             'description': 'English Subtittles',
             'thumbnail': r're:^https?://.*\.jpg',
             'duration': 81.3,
@@ -37,111 +51,31 @@ class CeskaTelevizeIE(InfoExtractor):
         },
     }, {
         # live stream
-        'url': 'http://www.ceskatelevize.cz/zive/ct1/',
-        'info_dict': {
-            'id': '102',
-            'ext': 'mp4',
-            'title': r'ČT1 - živé vysílání online',
-            'description': 'Sledujte živé vysílání kanálu ČT1 online. Vybírat si můžete i z dalších kanálů České televize na kterémkoli z vašich zařízení.',
-            'is_live': True,
-        },
-        'params': {
-            # m3u8 download
-            'skip_download': True,
-        },
-    }, {
-        # another
         'url': 'http://www.ceskatelevize.cz/ivysilani/zive/ct4/',
-        'only_matching': True,
         'info_dict': {
             'id': 402,
             'ext': 'mp4',
             'title': r're:^ČT Sport \d{4}-\d{2}-\d{2} \d{2}:\d{2}$',
             'is_live': True,
         },
-        # 'skip': 'Georestricted to Czech Republic',
-    }, {
-        'url': 'http://www.ceskatelevize.cz/ivysilani/embed/iFramePlayer.php?hash=d6a3e1370d2e4fa76296b90bad4dfc19673b641e&IDEC=217 562 22150/0004&channelID=1&width=100%25',
-        'only_matching': True,
-    }, {
-        # video with 18+ caution trailer
-        'url': 'http://www.ceskatelevize.cz/porady/10520528904-queer/215562210900007-bogotart/',
-        'info_dict': {
-            'id': '215562210900007-bogotart',
-            'title': 'Bogotart - Queer',
-            'description': 'Hlavní město Kolumbie v doprovodu queer umělců. Vroucí svět plný vášně, sebevědomí, ale i násilí a bolesti',
-        },
-        'playlist': [{
-            'info_dict': {
-                'id': '61924494877311053',
-                'ext': 'mp4',
-                'title': 'Bogotart - Queer (Varování 18+)',
-                'duration': 11.9,
-            },
-        }, {
-            'info_dict': {
-                'id': '61924494877068022',
-                'ext': 'mp4',
-                'title': 'Bogotart - Queer (Queer)',
-                'thumbnail': r're:^https?://.*\.jpg',
-                'duration': 1558.3,
-            },
-        }],
         'params': {
             # m3u8 download
             'skip_download': True,
         },
+        'skip': 'Georestricted to Czech Republic',
     }, {
-        # iframe embed
-        'url': 'http://www.ceskatelevize.cz/porady/10614999031-neviditelni/21251212048/',
+        'url': 'http://www.ceskatelevize.cz/ivysilani/embed/iFramePlayer.php?hash=d6a3e1370d2e4fa76296b90bad4dfc19673b641e&IDEC=217 562 22150/0004&channelID=1&width=100%25',
         'only_matching': True,
     }]
 
-    def _search_nextjs_data(self, webpage, video_id, **kw):
-        return self._parse_json(
-            self._search_regex(
-                r'(?s)<script[^>]+id=[\'"]__NEXT_DATA__[\'"][^>]*>([^<]+)</script>',
-                webpage, 'next.js data', **kw),
-            video_id, **kw)
-
     def _real_extract(self, url):
         playlist_id = self._match_id(url)
-        webpage, urlh = self._download_webpage_handle(url, playlist_id)
-        parsed_url = compat_urllib_parse_urlparse(urlh.geturl())
-        site_name = self._og_search_property('site_name', webpage, fatal=False, default='Česká televize')
-        playlist_title = self._og_search_title(webpage, default=None)
-        if site_name and playlist_title:
-            playlist_title = re.split(r'\s*[—|]\s*%s' % (site_name, ), playlist_title, 1)[0]
-        playlist_description = self._og_search_description(webpage, default=None)
-        if playlist_description:
-            playlist_description = playlist_description.replace('\xa0', ' ')
 
-        type_ = 'IDEC'
-        if re.search(r'(^/porady|/zive)/', parsed_url.path):
-            next_data = self._search_nextjs_data(webpage, playlist_id)
-            if '/zive/' in parsed_url.path:
-                idec = traverse_obj(next_data, ('props', 'pageProps', 'data', 'liveBroadcast', 'current', 'idec'), get_all=False)
-            else:
-                idec = traverse_obj(next_data, ('props', 'pageProps', 'data', ('show', 'mediaMeta'), 'idec'), get_all=False)
-                if not idec:
-                    idec = traverse_obj(next_data, ('props', 'pageProps', 'data', 'videobonusDetail', 'bonusId'), get_all=False)
-                    if idec:
-                        type_ = 'bonus'
-            if not idec:
-                raise ExtractorError('Failed to find IDEC id')
-            iframe_hash = self._download_webpage(
-                'https://www.ceskatelevize.cz/v-api/iframe-hash/',
-                playlist_id, note='Getting IFRAME hash')
-            query = {'hash': iframe_hash, 'origin': 'iVysilani', 'autoStart': 'true', type_: idec, }
-            webpage = self._download_webpage(
-                'https://www.ceskatelevize.cz/ivysilani/embed/iFramePlayer.php',
-                playlist_id, note='Downloading player', query=query)
+        webpage = self._download_webpage(url, playlist_id)
 
         NOT_AVAILABLE_STRING = 'This content is not available at your territory due to limited copyright.'
         if '%s</p>' % NOT_AVAILABLE_STRING in webpage:
-            self.raise_geo_restricted(NOT_AVAILABLE_STRING)
-        if any(not_found in webpage for not_found in ('Neplatný parametr pro videopřehrávač', 'IDEC nebyl nalezen', )):
-            raise ExtractorError('no video with IDEC available', video_id=idec, expected=True)
+            raise ExtractorError(NOT_AVAILABLE_STRING, expected=True)
 
         type_ = None
         episode_id = None
@@ -166,7 +100,7 @@ class CeskaTelevizeIE(InfoExtractor):
         data = {
             'playlist[0][type]': type_,
             'playlist[0][id]': episode_id,
-            'requestUrl': parsed_url.path,
+            'requestUrl': compat_urllib_parse_urlparse(url).path,
             'requestSource': 'iVysilani',
         }
 
@@ -174,7 +108,7 @@ class CeskaTelevizeIE(InfoExtractor):
 
         for user_agent in (None, USER_AGENTS['Safari']):
             req = sanitized_Request(
-                'https://www.ceskatelevize.cz/ivysilani/ajax/get-client-playlist/',
+                'https://www.ceskatelevize.cz/ivysilani/ajax/get-client-playlist',
                 data=urlencode_postdata(data))
 
             req.add_header('Content-type', 'application/x-www-form-urlencoded')
@@ -196,6 +130,9 @@ class CeskaTelevizeIE(InfoExtractor):
             req = sanitized_Request(compat_urllib_parse_unquote(playlist_url))
             req.add_header('Referer', url)
 
+            playlist_title = self._og_search_title(webpage, default=None)
+            playlist_description = self._og_search_description(webpage, default=None)
+
             playlist = self._download_json(req, playlist_id, fatal=False)
             if not playlist:
                 continue
@@ -230,7 +167,7 @@ class CeskaTelevizeIE(InfoExtractor):
                     entries[num]['formats'].extend(formats)
                     continue
 
-                item_id = str_or_none(item.get('id') or item['assetId'])
+                item_id = item.get('id') or item['assetId']
                 title = item['title']
 
                 duration = float_or_none(item.get('duration'))
@@ -244,6 +181,8 @@ class CeskaTelevizeIE(InfoExtractor):
 
                 if playlist_len == 1:
                     final_title = playlist_title or title
+                    if is_live:
+                        final_title = self._live_title(final_title)
                 else:
                     final_title = '%s (%s)' % (playlist_title, title)
 
@@ -261,8 +200,6 @@ class CeskaTelevizeIE(InfoExtractor):
         for e in entries:
             self._sort_formats(e['formats'])
 
-        if len(entries) == 1:
-            return entries[0]
         return self.playlist_result(entries, playlist_id, playlist_title, playlist_description)
 
     def _get_subtitles(self, episode_id, subs):
@@ -299,3 +236,54 @@ class CeskaTelevizeIE(InfoExtractor):
                     yield line
 
         return '\r\n'.join(_fix_subtitle(subtitles))
+
+
+class CeskaTelevizePoradyIE(InfoExtractor):
+    _VALID_URL = r'https?://(?:www\.)?ceskatelevize\.cz/porady/(?:[^/?#&]+/)*(?P<id>[^/#?]+)'
+    _TESTS = [{
+        # video with 18+ caution trailer
+        'url': 'http://www.ceskatelevize.cz/porady/10520528904-queer/215562210900007-bogotart/',
+        'info_dict': {
+            'id': '215562210900007-bogotart',
+            'title': 'Queer: Bogotart',
+            'description': 'Alternativní průvodce současným queer světem',
+        },
+        'playlist': [{
+            'info_dict': {
+                'id': '61924494876844842',
+                'ext': 'mp4',
+                'title': 'Queer: Bogotart (Varování 18+)',
+                'duration': 10.2,
+            },
+        }, {
+            'info_dict': {
+                'id': '61924494877068022',
+                'ext': 'mp4',
+                'title': 'Queer: Bogotart (Queer)',
+                'thumbnail': r're:^https?://.*\.jpg',
+                'duration': 1558.3,
+            },
+        }],
+        'params': {
+            # m3u8 download
+            'skip_download': True,
+        },
+    }, {
+        # iframe embed
+        'url': 'http://www.ceskatelevize.cz/porady/10614999031-neviditelni/21251212048/',
+        'only_matching': True,
+    }]
+
+    def _real_extract(self, url):
+        video_id = self._match_id(url)
+
+        webpage = self._download_webpage(url, video_id)
+
+        data_url = update_url_query(unescapeHTML(self._search_regex(
+            (r'<span[^>]*\bdata-url=(["\'])(?P<url>(?:(?!\1).)+)\1',
+             r'<iframe[^>]+\bsrc=(["\'])(?P<url>(?:https?:)?//(?:www\.)?ceskatelevize\.cz/ivysilani/embed/iFramePlayer\.php.*?)\1'),
+            webpage, 'iframe player url', group='url')), query={
+                'autoStart': 'true',
+        })
+
+        return self.url_result(data_url, ie=CeskaTelevizeIE.ie_key())
diff --git a/youtube_dl/extractor/clipchamp.py b/youtube_dl/extractor/clipchamp.py
deleted file mode 100644
index 3b485eaab..000000000
--- a/youtube_dl/extractor/clipchamp.py
+++ /dev/null
@@ -1,69 +0,0 @@
-# coding: utf-8
-from __future__ import unicode_literals
-
-from .common import InfoExtractor
-from ..compat import compat_str
-from ..utils import (
-    ExtractorError,
-    merge_dicts,
-    T,
-    traverse_obj,
-    unified_timestamp,
-    url_or_none,
-)
-
-
-class ClipchampIE(InfoExtractor):
-    _VALID_URL = r'https?://(?:www\.)?clipchamp\.com/watch/(?P<id>[\w-]+)'
-    _TESTS = [{
-        'url': 'https://clipchamp.com/watch/gRXZ4ZhdDaU',
-        'info_dict': {
-            'id': 'gRXZ4ZhdDaU',
-            'ext': 'mp4',
-            'title': 'Untitled video',
-            'uploader': 'Alexander Schwartz',
-            'timestamp': 1680805580,
-            'upload_date': '20230406',
-            'thumbnail': r're:^https?://.+\.jpg',
-        },
-        'params': {
-            'skip_download': 'm3u8',
-            'format': 'bestvideo',
-        },
-    }]
-
-    _STREAM_URL_TMPL = 'https://%s.cloudflarestream.com/%s/manifest/video.%s'
-    _STREAM_URL_QUERY = {'parentOrigin': 'https://clipchamp.com'}
-
-    def _real_extract(self, url):
-        video_id = self._match_id(url)
-        webpage = self._download_webpage(url, video_id)
-        data = self._search_nextjs_data(webpage, video_id)['props']['pageProps']['video']
-
-        storage_location = data.get('storage_location')
-        if storage_location != 'cf_stream':
-            raise ExtractorError('Unsupported clip storage location "%s"' % (storage_location,))
-
-        path = data['download_url']
-        iframe = self._download_webpage(
-            'https://iframe.cloudflarestream.com/' + path, video_id, 'Downloading player iframe')
-        subdomain = self._search_regex(
-            r'''\bcustomer-domain-prefix\s*=\s*("|')(?P<sd>[\w-]+)\1''', iframe,
-            'subdomain', group='sd', fatal=False) or 'customer-2ut9yn3y6fta1yxe'
-
-        formats = self._extract_mpd_formats(
-            self._STREAM_URL_TMPL % (subdomain, path, 'mpd'), video_id,
-            query=self._STREAM_URL_QUERY, fatal=False, mpd_id='dash')
-        formats.extend(self._extract_m3u8_formats(
-            self._STREAM_URL_TMPL % (subdomain, path, 'm3u8'), video_id, 'mp4',
-            query=self._STREAM_URL_QUERY, fatal=False, m3u8_id='hls'))
-
-        return merge_dicts({
-            'id': video_id,
-            'formats': formats,
-            'uploader': ' '.join(traverse_obj(data, ('creator', ('first_name', 'last_name'), T(compat_str)))) or None,
-        }, traverse_obj(data, {
-            'title': ('project', 'project_name', T(compat_str)),
-            'timestamp': ('created_at', T(unified_timestamp)),
-            'thumbnail': ('thumbnail_url', T(url_or_none)),
-        }), rev=True)
diff --git a/youtube_dl/extractor/cloudy.py b/youtube_dl/extractor/cloudy.py
index d39a9a5c2..85ca20ecc 100644
--- a/youtube_dl/extractor/cloudy.py
+++ b/youtube_dl/extractor/cloudy.py
@@ -9,7 +9,7 @@ from ..utils import (
 
 
 class CloudyIE(InfoExtractor):
-    IE_DESC = 'cloudy.ec'
+    _IE_DESC = 'cloudy.ec'
     _VALID_URL = r'https?://(?:www\.)?cloudy\.ec/(?:v/|embed\.php\?.*?\bid=)(?P<id>[A-Za-z0-9]+)'
     _TESTS = [{
         'url': 'https://www.cloudy.ec/v/af511e2527aac',
diff --git a/youtube_dl/extractor/common.py b/youtube_dl/extractor/common.py
index a64fcfccc..797c35fd5 100644
--- a/youtube_dl/extractor/common.py
+++ b/youtube_dl/extractor/common.py
@@ -2,9 +2,7 @@
 from __future__ import unicode_literals
 
 import base64
-import collections
 import datetime
-import functools
 import hashlib
 import json
 import netrc
@@ -25,9 +23,6 @@ from ..compat import (
     compat_getpass,
     compat_integer_types,
     compat_http_client,
-    compat_kwargs,
-    compat_map as map,
-    compat_open as open,
     compat_os_name,
     compat_str,
     compat_urllib_error,
@@ -36,7 +31,6 @@ from ..compat import (
     compat_urllib_request,
     compat_urlparse,
     compat_xml_parse_error,
-    compat_zip as zip,
 )
 from ..downloader.f4m import (
     get_base_url,
@@ -60,7 +54,6 @@ from ..utils import (
     GeoRestrictedError,
     GeoUtils,
     int_or_none,
-    join_nonempty,
     js_to_json,
     JSON_LD_RE,
     mimetype2ext,
@@ -77,9 +70,6 @@ from ..utils import (
     str_or_none,
     str_to_int,
     strip_or_none,
-    T,
-    traverse_obj,
-    try_get,
     unescapeHTML,
     unified_strdate,
     unified_timestamp,
@@ -88,7 +78,6 @@ from ..utils import (
     urljoin,
     url_basename,
     url_or_none,
-    variadic,
     xpath_element,
     xpath_text,
     xpath_with_ns,
@@ -184,8 +173,6 @@ class InfoExtractor(object):
                                             fragment_base_url
                                  * "duration" (optional, int or float)
                                  * "filesize" (optional, int)
-                                 * "range" (optional, str of the form "start-end"
-                                            to use in HTTP Range header)
                     * preference Order number of this format. If this field is
                                  present and not None, the formats get sorted
                                  by this field, regardless of all other values.
@@ -379,22 +366,9 @@ class InfoExtractor(object):
     title, description etc.
 
 
-    A subclass of InfoExtractor must be defined to handle each specific site (or
-    several sites). Such a concrete subclass should be added to the list of
-    extractors. It should also:
-    * define its _VALID_URL attribute as a regexp, or a Sequence of alternative
-      regexps (but see below)
-    * re-define the _real_extract() method
-    * optionally re-define the _real_initialize() method.
-
-    An extractor subclass may also override suitable() if necessary, but the
-    function signature must be preserved and the function must import everything
-    it needs (except other extractors), so that lazy_extractors works correctly.
-    If the subclass's suitable() and _real_extract() functions avoid using
-    _VALID_URL, the subclass need not set that class attribute.
-
-    An abstract subclass of InfoExtractor may be used to simplify implementation
-    within an extractor module; it should not be added to the list of extractors.
+    Subclasses of this one should re-define the _real_initialize() and
+    _real_extract() methods and define a _VALID_URL regexp.
+    Probably, they should also be added to the list of extractors.
 
     _GEO_BYPASS attribute may be set to False in order to disable
     geo restriction bypass mechanisms for a particular extractor.
@@ -422,8 +396,6 @@ class InfoExtractor(object):
     _GEO_COUNTRIES = None
     _GEO_IP_BLOCKS = None
     _WORKING = True
-    # supply this in public subclasses: used in supported sites list, etc
-    # IE_DESC = 'short description of IE'
 
     def __init__(self, downloader=None):
         """Constructor. Receives an optional downloader."""
@@ -431,33 +403,22 @@ class InfoExtractor(object):
         self._x_forwarded_for_ip = None
         self.set_downloader(downloader)
 
-    @classmethod
-    def __match_valid_url(cls, url):
-        # This does not use has/getattr intentionally - we want to know whether
-        # we have cached the regexp for cls, whereas getattr would also
-        # match its superclass
-        if '_VALID_URL_RE' not in cls.__dict__:
-            # _VALID_URL can now be a list/tuple of patterns
-            cls._VALID_URL_RE = tuple(map(re.compile, variadic(cls._VALID_URL)))
-        # 20% faster than next(filter(None, (p.match(url) for p in cls._VALID_URL_RE)), None) in 2.7
-        for p in cls._VALID_URL_RE:
-            p = p.match(url)
-            if p:
-                return p
-
-    # The public alias can safely be overridden, as in some back-ports
-    _match_valid_url = __match_valid_url
-
     @classmethod
     def suitable(cls, url):
         """Receives a URL and returns True if suitable for this IE."""
-        # This function must import everything it needs (except other extractors),
-        # so that lazy_extractors works correctly
-        return cls.__match_valid_url(url) is not None
+
+        # This does not use has/getattr intentionally - we want to know whether
+        # we have cached the regexp for *this* class, whereas getattr would also
+        # match the superclass
+        if '_VALID_URL_RE' not in cls.__dict__:
+            cls._VALID_URL_RE = re.compile(cls._VALID_URL)
+        return cls._VALID_URL_RE.match(url) is not None
 
     @classmethod
     def _match_id(cls, url):
-        m = cls.__match_valid_url(url)
+        if '_VALID_URL_RE' not in cls.__dict__:
+            cls._VALID_URL_RE = re.compile(cls._VALID_URL)
+        m = cls._VALID_URL_RE.match(url)
         assert m
         return compat_str(m.group('id'))
 
@@ -505,7 +466,7 @@ class InfoExtractor(object):
         if not self._x_forwarded_for_ip:
 
             # Geo bypass mechanism is explicitly disabled by user
-            if not self.get_param('geo_bypass', True):
+            if not self._downloader.params.get('geo_bypass', True):
                 return
 
             if not geo_bypass_context:
@@ -527,7 +488,7 @@ class InfoExtractor(object):
 
             # Explicit IP block specified by user, use it right away
             # regardless of whether extractor is geo bypassable or not
-            ip_block = self.get_param('geo_bypass_ip_block', None)
+            ip_block = self._downloader.params.get('geo_bypass_ip_block', None)
 
             # Otherwise use random IP block from geo bypass context but only
             # if extractor is known as geo bypassable
@@ -538,8 +499,8 @@ class InfoExtractor(object):
 
             if ip_block:
                 self._x_forwarded_for_ip = GeoUtils.random_ipv4(ip_block)
-                if self.get_param('verbose', False):
-                    self.to_screen(
+                if self._downloader.params.get('verbose', False):
+                    self._downloader.to_screen(
                         '[debug] Using fake IP %s as X-Forwarded-For.'
                         % self._x_forwarded_for_ip)
                 return
@@ -548,7 +509,7 @@ class InfoExtractor(object):
 
             # Explicit country code specified by user, use it right away
             # regardless of whether extractor is geo bypassable or not
-            country = self.get_param('geo_bypass_country', None)
+            country = self._downloader.params.get('geo_bypass_country', None)
 
             # Otherwise use random country code from geo bypass context but
             # only if extractor is known as geo bypassable
@@ -559,8 +520,8 @@ class InfoExtractor(object):
 
             if country:
                 self._x_forwarded_for_ip = GeoUtils.random_ipv4(country)
-                if self.get_param('verbose', False):
-                    self.to_screen(
+                if self._downloader.params.get('verbose', False):
+                    self._downloader.to_screen(
                         '[debug] Using fake IP %s (%s) as X-Forwarded-For.'
                         % (self._x_forwarded_for_ip, country.upper()))
 
@@ -586,9 +547,9 @@ class InfoExtractor(object):
             raise ExtractorError('An extractor error has occurred.', cause=e)
 
     def __maybe_fake_ip_and_retry(self, countries):
-        if (not self.get_param('geo_bypass_country', None)
+        if (not self._downloader.params.get('geo_bypass_country', None)
                 and self._GEO_BYPASS
-                and self.get_param('geo_bypass', True)
+                and self._downloader.params.get('geo_bypass', True)
                 and not self._x_forwarded_for_ip
                 and countries):
             country_code = random.choice(countries)
@@ -604,14 +565,6 @@ class InfoExtractor(object):
         """Sets the downloader for this IE."""
         self._downloader = downloader
 
-    @property
-    def cache(self):
-        return self._downloader.cache
-
-    @property
-    def cookiejar(self):
-        return self._downloader.cookiejar
-
     def _real_initialize(self):
         """Real initialization process. Redefine in subclasses."""
         pass
@@ -698,7 +651,7 @@ class InfoExtractor(object):
             if fatal:
                 raise ExtractorError(errmsg, sys.exc_info()[2], cause=err)
             else:
-                self.report_warning(errmsg)
+                self._downloader.report_warning(errmsg)
                 return False
 
     def _download_webpage_handle(self, url_or_request, video_id, note=None, errnote=None, fatal=True, encoding=None, data=None, headers={}, query={}, expected_status=None):
@@ -770,11 +723,11 @@ class InfoExtractor(object):
             webpage_bytes = prefix + webpage_bytes
         if not encoding:
             encoding = self._guess_encoding_from_content(content_type, webpage_bytes)
-        if self.get_param('dump_intermediate_pages', False):
+        if self._downloader.params.get('dump_intermediate_pages', False):
             self.to_screen('Dumping request to ' + urlh.geturl())
             dump = base64.b64encode(webpage_bytes).decode('ascii')
-            self.to_screen(dump)
-        if self.get_param('write_pages', False):
+            self._downloader.to_screen(dump)
+        if self._downloader.params.get('write_pages', False):
             basen = '%s_%s' % (video_id, urlh.geturl())
             if len(basen) > 240:
                 h = '___' + hashlib.md5(basen.encode('utf-8')).hexdigest()
@@ -958,37 +911,14 @@ class InfoExtractor(object):
             else:
                 self.report_warning(errmsg + str(ve))
 
-    def __ie_msg(self, *msg):
-        return '[{0}] {1}'.format(self.IE_NAME, ''.join(msg))
-
-    # msg, video_id=None, *args, only_once=False, **kwargs
-    def report_warning(self, msg, *args, **kwargs):
-        if len(args) > 0:
-            video_id = args[0]
-            args = args[1:]
-        else:
-            video_id = kwargs.pop('video_id', None)
+    def report_warning(self, msg, video_id=None):
         idstr = '' if video_id is None else '%s: ' % video_id
         self._downloader.report_warning(
-            self.__ie_msg(idstr, msg), *args, **kwargs)
+            '[%s] %s%s' % (self.IE_NAME, idstr, msg))
 
     def to_screen(self, msg):
         """Print msg to screen, prefixing it with '[ie_name]'"""
-        self._downloader.to_screen(self.__ie_msg(msg))
-
-    def write_debug(self, msg, only_once=False):
-        '''Log debug message or Print message to stderr'''
-        self._downloader.write_debug(self.__ie_msg(msg), only_once=only_once)
-
-    # name, default=None, *args, **kwargs
-    def get_param(self, name, *args, **kwargs):
-        default, args = (args[0], args[1:]) if len(args) > 0 else (kwargs.pop('default', None), args)
-        if self._downloader:
-            return self._downloader.params.get(name, default, *args, **kwargs)
-        return default
-
-    def report_drm(self, video_id):
-        self.raise_no_formats('This video is DRM protected', expected=True, video_id=video_id)
+        self._downloader.to_screen('[%s] %s' % (self.IE_NAME, msg))
 
     def report_extraction(self, id_or_name):
         """Report information extraction."""
@@ -1016,15 +946,6 @@ class InfoExtractor(object):
     def raise_geo_restricted(msg='This video is not available from your location due to geo restriction', countries=None):
         raise GeoRestrictedError(msg, countries=countries)
 
-    def raise_no_formats(self, msg, expected=False, video_id=None):
-        if expected and (
-                self.get_param('ignore_no_formats_error') or self.get_param('wait_for_video')):
-            self.report_warning(msg, video_id)
-        elif isinstance(msg, ExtractorError):
-            raise msg
-        else:
-            raise ExtractorError(msg, expected=expected, video_id=video_id)
-
     # Methods for following #608
     @staticmethod
     def url_result(url, ie=None, video_id=None, video_title=None):
@@ -1074,7 +995,7 @@ class InfoExtractor(object):
                 if mobj:
                     break
 
-        if not self.get_param('no_color') and compat_os_name != 'nt' and sys.stderr.isatty():
+        if not self._downloader.params.get('no_color') and compat_os_name != 'nt' and sys.stderr.isatty():
             _name = '\033[0;34m%s\033[0m' % name
         else:
             _name = name
@@ -1083,8 +1004,6 @@ class InfoExtractor(object):
             if group is None:
                 # return the first matching group
                 return next(g for g in mobj.groups() if g is not None)
-            elif isinstance(group, (list, tuple)):
-                return tuple(mobj.group(g) for g in group)
             else:
                 return mobj.group(group)
         elif default is not NO_DEFAULT:
@@ -1092,79 +1011,26 @@ class InfoExtractor(object):
         elif fatal:
             raise RegexNotFoundError('Unable to extract %s' % _name)
         else:
-            self.report_warning('unable to extract %s' % _name + bug_reports_message())
+            self._downloader.report_warning('unable to extract %s' % _name + bug_reports_message())
             return None
 
-    def _search_json(self, start_pattern, string, name, video_id, **kwargs):
-        """Searches string for the JSON object specified by start_pattern"""
-
-        # self, start_pattern, string, name, video_id, *, end_pattern='',
-        # contains_pattern=r'{(?s:.+)}', fatal=True, default=NO_DEFAULT
-        # NB: end_pattern is only used to reduce the size of the initial match
-        end_pattern = kwargs.pop('end_pattern', '')
-        # (?:[\s\S]) simulates (?(s):.) (eg)
-        contains_pattern = kwargs.pop('contains_pattern', r'{[\s\S]+}')
-        fatal = kwargs.pop('fatal', True)
-        default = kwargs.pop('default', NO_DEFAULT)
-
-        if default is NO_DEFAULT:
-            default, has_default = {}, False
-        else:
-            fatal, has_default = False, True
-
-        json_string = self._search_regex(
-            r'(?:{0})\s*(?P<json>{1})\s*(?:{2})'.format(
-                start_pattern, contains_pattern, end_pattern),
-            string, name, group='json', fatal=fatal, default=None if has_default else NO_DEFAULT)
-        if not json_string:
-            return default
-
-        # yt-dlp has a special JSON parser that allows trailing text.
-        # Until that arrives here, the diagnostic from the exception
-        # raised by json.loads() is used to extract the wanted text.
-        # Either way, it's a problem if a transform_source() can't
-        # handle the trailing text.
-
-        # force an exception
-        kwargs['fatal'] = True
-
-        # self._downloader._format_err(name, self._downloader.Styles.EMPHASIS)
-        for _ in range(2):
-            try:
-                # return self._parse_json(json_string, video_id, ignore_extra=True, **kwargs)
-                transform_source = kwargs.pop('transform_source', None)
-                if transform_source:
-                    json_string = transform_source(json_string)
-                return self._parse_json(json_string, video_id, **compat_kwargs(kwargs))
-            except ExtractorError as e:
-                end = int_or_none(self._search_regex(r'\(char\s+(\d+)', error_to_compat_str(e), 'end', default=None))
-                if end is not None:
-                    json_string = json_string[:end]
-                    continue
-                msg = 'Unable to extract {0} - Failed to parse JSON'.format(name)
-                if fatal:
-                    raise ExtractorError(msg, cause=e.cause, video_id=video_id)
-                elif not has_default:
-                    self.report_warning(
-                        '{0}: {1}'.format(msg, error_to_compat_str(e)), video_id=video_id)
-            return default
-
     def _html_search_regex(self, pattern, string, name, default=NO_DEFAULT, fatal=True, flags=0, group=None):
         """
         Like _search_regex, but strips HTML tags and unescapes entities.
         """
         res = self._search_regex(pattern, string, name, default, fatal, flags, group)
-        if isinstance(res, tuple):
-            return tuple(map(clean_html, res))
-        return clean_html(res)
+        if res:
+            return clean_html(res).strip()
+        else:
+            return res
 
     def _get_netrc_login_info(self, netrc_machine=None):
         username = None
         password = None
+        netrc_machine = netrc_machine or self._NETRC_MACHINE
 
-        if self.get_param('usenetrc', False):
+        if self._downloader.params.get('usenetrc', False):
             try:
-                netrc_machine = netrc_machine or self._NETRC_MACHINE
                 info = netrc.netrc().authenticators(netrc_machine)
                 if info is not None:
                     username = info[0]
@@ -1172,8 +1038,8 @@ class InfoExtractor(object):
                 else:
                     raise netrc.NetrcParseError(
                         'No authenticators for %s' % netrc_machine)
-            except (AttributeError, IOError, netrc.NetrcParseError) as err:
-                self.report_warning(
+            except (IOError, netrc.NetrcParseError) as err:
+                self._downloader.report_warning(
                     'parsing .netrc: %s' % error_to_compat_str(err))
 
         return username, password
@@ -1210,17 +1076,17 @@ class InfoExtractor(object):
         """
         if self._downloader is None:
             return None
+        downloader_params = self._downloader.params
 
-        twofactor = self.get_param('twofactor')
-        if twofactor is not None:
-            return twofactor
+        if downloader_params.get('twofactor') is not None:
+            return downloader_params['twofactor']
 
         return compat_getpass('Type %s and press [Return]: ' % note)
 
     # Helper functions for extracting OpenGraph info
     @staticmethod
     def _og_regexes(prop):
-        content_re = r'content=(?:"([^"]+?)"|\'([^\']+?)\'|\s*([^\s"\'=<>`]+?)(?=\s|/?>))'
+        content_re = r'content=(?:"([^"]+?)"|\'([^\']+?)\'|\s*([^\s"\'=<>`]+?))'
         property_re = (r'(?:name|property)=(?:\'og[:-]%(prop)s\'|"og[:-]%(prop)s"|\s*og[:-]%(prop)s\b)'
                        % {'prop': re.escape(prop)})
         template = r'<meta[^>]+?%s[^>]+?%s'
@@ -1348,7 +1214,7 @@ class InfoExtractor(object):
         elif fatal:
             raise RegexNotFoundError('Unable to extract JSON-LD')
         else:
-            self.report_warning('unable to extract JSON-LD %s' % bug_reports_message())
+            self._downloader.report_warning('unable to extract JSON-LD %s' % bug_reports_message())
             return {}
 
     def _json_ld(self, json_ld, video_id, fatal=True, expected_type=None):
@@ -1481,48 +1347,6 @@ class InfoExtractor(object):
                     break
         return dict((k, v) for k, v in info.items() if v is not None)
 
-    def _search_nextjs_data(self, webpage, video_id, **kw):
-        # ..., *, transform_source=None, fatal=True, default=NO_DEFAULT
-
-        # TODO: remove this backward compat
-        default = kw.get('default', NO_DEFAULT)
-        if default == '{}':
-            kw['default'] = {}
-            kw = compat_kwargs(kw)
-
-        return self._search_json(
-            r'''<script\s[^>]*?\bid\s*=\s*('|")__NEXT_DATA__\1[^>]*>''',
-            webpage, 'next.js data', video_id, end_pattern='</script>',
-            **kw)
-
-    def _search_nuxt_data(self, webpage, video_id, *args, **kwargs):
-        """Parses Nuxt.js metadata. This works as long as the function __NUXT__ invokes is a pure function"""
-
-        # self, webpage, video_id, context_name='__NUXT__', *, fatal=True, traverse=('data', 0)
-        context_name = args[0] if len(args) > 0 else kwargs.get('context_name', '__NUXT__')
-        fatal = kwargs.get('fatal', True)
-        traverse = kwargs.get('traverse', ('data', 0))
-
-        re_ctx = re.escape(context_name)
-
-        FUNCTION_RE = (r'\(\s*function\s*\((?P<arg_keys>[\s\S]*?)\)\s*\{\s*'
-                       r'return\s+(?P<js>\{[\s\S]*?})\s*;?\s*}\s*\((?P<arg_vals>[\s\S]*?)\)')
-
-        js, arg_keys, arg_vals = self._search_regex(
-            (p.format(re_ctx, FUNCTION_RE) for p in
-             (r'<script>\s*window\s*\.\s*{0}\s*=\s*{1}\s*\)\s*;?\s*</script>',
-              r'{0}\s*\([\s\S]*?{1}')),
-            webpage, context_name, group=('js', 'arg_keys', 'arg_vals'),
-            default=NO_DEFAULT if fatal else (None, None, None))
-        if js is None:
-            return {}
-
-        args = dict(zip(arg_keys.split(','), map(json.dumps, self._parse_json(
-            '[{0}]'.format(arg_vals), video_id, transform_source=js_to_json, fatal=fatal) or ())))
-
-        ret = self._parse_json(js, video_id, transform_source=functools.partial(js_to_json, vars=args), fatal=fatal)
-        return traverse_obj(ret, traverse) or {}
-
     @staticmethod
     def _hidden_inputs(html):
         html = re.sub(r'<!--(?:(?!<!--).)*-->', '', html)
@@ -1579,7 +1403,7 @@ class InfoExtractor(object):
 
             if f.get('vcodec') == 'none':  # audio only
                 preference -= 50
-                if self.get_param('prefer_free_formats'):
+                if self._downloader.params.get('prefer_free_formats'):
                     ORDER = ['aac', 'mp3', 'm4a', 'webm', 'ogg', 'opus']
                 else:
                     ORDER = ['webm', 'opus', 'ogg', 'mp3', 'aac', 'm4a']
@@ -1591,7 +1415,7 @@ class InfoExtractor(object):
             else:
                 if f.get('acodec') == 'none':  # video only
                     preference -= 40
-                if self.get_param('prefer_free_formats'):
+                if self._downloader.params.get('prefer_free_formats'):
                     ORDER = ['flv', 'mp4', 'webm']
                 else:
                     ORDER = ['webm', 'flv', 'mp4']
@@ -1657,7 +1481,7 @@ class InfoExtractor(object):
         """ Either "http:" or "https:", depending on the user's preferences """
         return (
             'http:'
-            if self.get_param('prefer_insecure', False)
+            if self._downloader.params.get('prefer_insecure', False)
             else 'https:')
 
     def _proto_relative_url(self, url, scheme=None):
@@ -1807,12 +1631,6 @@ class InfoExtractor(object):
             'format_note': 'Quality selection URL',
         }
 
-    def _report_ignoring_subs(self, name):
-        self.report_warning(bug_reports_message(
-            'Ignoring subtitle tracks found in the {0} manifest; '
-            'if any subtitle tracks are missing,'.format(name)
-        ), only_once=True)
-
     def _extract_m3u8_formats(self, m3u8_url, video_id, ext=None,
                               entry_protocol='m3u8', preference=None,
                               m3u8_id=None, note=None, errnote=None,
@@ -2253,46 +2071,23 @@ class InfoExtractor(object):
             })
         return entries
 
-    def _extract_mpd_formats(self, *args, **kwargs):
-        fmts, subs = self._extract_mpd_formats_and_subtitles(*args, **kwargs)
-        if subs:
-            self._report_ignoring_subs('DASH')
-        return fmts
-
-    def _extract_mpd_formats_and_subtitles(
-            self, mpd_url, video_id, mpd_id=None, note=None, errnote=None,
-            fatal=True, data=None, headers=None, query=None):
-
-        # TODO: or not? param not yet implemented
-        if self.get_param('ignore_no_formats_error'):
-            fatal = False
-
+    def _extract_mpd_formats(self, mpd_url, video_id, mpd_id=None, note=None, errnote=None, fatal=True, data=None, headers={}, query={}):
         res = self._download_xml_handle(
             mpd_url, video_id,
-            note='Downloading MPD manifest' if note is None else note,
-            errnote='Failed to download MPD manifest' if errnote is None else errnote,
-            fatal=fatal, data=data, headers=headers or {}, query=query or {})
+            note=note or 'Downloading MPD manifest',
+            errnote=errnote or 'Failed to download MPD manifest',
+            fatal=fatal, data=data, headers=headers, query=query)
         if res is False:
-            return [], {}
+            return []
         mpd_doc, urlh = res
         if mpd_doc is None:
-            return [], {}
+            return []
+        mpd_base_url = base_url(urlh.geturl())
 
-        # We could have been redirected to a new url when we retrieved our mpd file.
-        mpd_url = urlh.geturl()
-        mpd_base_url = base_url(mpd_url)
-
-        return self._parse_mpd_formats_and_subtitles(
+        return self._parse_mpd_formats(
             mpd_doc, mpd_id, mpd_base_url, mpd_url)
 
-    def _parse_mpd_formats(self, *args, **kwargs):
-        fmts, subs = self._parse_mpd_formats_and_subtitles(*args, **kwargs)
-        if subs:
-            self._report_ignoring_subs('DASH')
-        return fmts
-
-    def _parse_mpd_formats_and_subtitles(
-            self, mpd_doc, mpd_id=None, mpd_base_url='', mpd_url=None):
+    def _parse_mpd_formats(self, mpd_doc, mpd_id=None, mpd_base_url='', mpd_url=None):
         """
         Parse formats from MPD manifest.
         References:
@@ -2300,10 +2095,8 @@ class InfoExtractor(object):
             http://standards.iso.org/ittf/PubliclyAvailableStandards/c065274_ISO_IEC_23009-1_2014.zip
          2. https://en.wikipedia.org/wiki/Dynamic_Adaptive_Streaming_over_HTTP
         """
-        # TODO: param not yet implemented: default like previous yt-dl logic
-        if not self.get_param('dynamic_mpd', False):
-            if mpd_doc.get('type') == 'dynamic':
-                return [], {}
+        if mpd_doc.get('type') == 'dynamic':
+            return []
 
         namespace = self._search_regex(r'(?i)^{([^}]+)?}MPD$', mpd_doc.tag, 'namespace', default=None)
 
@@ -2313,24 +2106,8 @@ class InfoExtractor(object):
         def is_drm_protected(element):
             return element.find(_add_ns('ContentProtection')) is not None
 
-        from ..utils import YoutubeDLHandler
-        fix_path = YoutubeDLHandler._fix_path
-
-        def resolve_base_url(element, parent_base_url=None):
-            # TODO: use native XML traversal when ready
-            b_url = traverse_obj(element, (
-                T(lambda e: e.find(_add_ns('BaseURL')).text)))
-            if parent_base_url and b_url:
-                if not parent_base_url[-1] in ('/', ':'):
-                    parent_base_url += '/'
-                b_url = compat_urlparse.urljoin(parent_base_url, b_url)
-            if b_url:
-                b_url = fix_path(b_url)
-            return b_url or parent_base_url
-
         def extract_multisegment_info(element, ms_parent_info):
             ms_info = ms_parent_info.copy()
-            base_url = ms_info['base_url'] = resolve_base_url(element, ms_info.get('base_url'))
 
             # As per [1, 5.3.9.2.2] SegmentList and SegmentTemplate share some
             # common attributes and elements.  We will only extract relevant
@@ -2364,27 +2141,15 @@ class InfoExtractor(object):
             def extract_Initialization(source):
                 initialization = source.find(_add_ns('Initialization'))
                 if initialization is not None:
-                    ms_info['initialization_url'] = initialization.get('sourceURL') or base_url
-                    initialization_url_range = initialization.get('range')
-                    if initialization_url_range:
-                        ms_info['initialization_url_range'] = initialization_url_range
+                    ms_info['initialization_url'] = initialization.attrib['sourceURL']
 
             segment_list = element.find(_add_ns('SegmentList'))
             if segment_list is not None:
                 extract_common(segment_list)
                 extract_Initialization(segment_list)
                 segment_urls_e = segment_list.findall(_add_ns('SegmentURL'))
-                segment_urls = traverse_obj(segment_urls_e, (
-                    Ellipsis, T(lambda e: e.attrib), 'media'))
-                if segment_urls:
-                    ms_info['segment_urls'] = segment_urls
-                segment_urls_range = traverse_obj(segment_urls_e, (
-                    Ellipsis, T(lambda e: e.attrib), 'mediaRange',
-                    T(lambda r: re.findall(r'^\d+-\d+$', r)), 0))
-                if segment_urls_range:
-                    ms_info['segment_urls_range'] = segment_urls_range
-                    if not segment_urls:
-                        ms_info['segment_urls'] = [base_url for _ in segment_urls_range]
+                if segment_urls_e:
+                    ms_info['segment_urls'] = [segment.attrib['media'] for segment in segment_urls_e]
             else:
                 segment_template = element.find(_add_ns('SegmentTemplate'))
                 if segment_template is not None:
@@ -2400,20 +2165,17 @@ class InfoExtractor(object):
             return ms_info
 
         mpd_duration = parse_duration(mpd_doc.get('mediaPresentationDuration'))
-        formats, subtitles = [], {}
-        stream_numbers = collections.defaultdict(int)
-        mpd_base_url = resolve_base_url(mpd_doc, mpd_base_url or mpd_url)
+        formats = []
         for period in mpd_doc.findall(_add_ns('Period')):
             period_duration = parse_duration(period.get('duration')) or mpd_duration
             period_ms_info = extract_multisegment_info(period, {
                 'start_number': 1,
                 'timescale': 1,
-                'base_url': mpd_base_url,
             })
             for adaptation_set in period.findall(_add_ns('AdaptationSet')):
                 if is_drm_protected(adaptation_set):
                     continue
-                adaptation_set_ms_info = extract_multisegment_info(adaptation_set, period_ms_info)
+                adaption_set_ms_info = extract_multisegment_info(adaptation_set, period_ms_info)
                 for representation in adaptation_set.findall(_add_ns('Representation')):
                     if is_drm_protected(representation):
                         continue
@@ -2421,35 +2183,27 @@ class InfoExtractor(object):
                     representation_attrib.update(representation.attrib)
                     # According to [1, 5.3.7.2, Table 9, page 41], @mimeType is mandatory
                     mime_type = representation_attrib['mimeType']
-                    content_type = representation_attrib.get('contentType') or mime_type.split('/')[0]
-                    codec_str = representation_attrib.get('codecs', '')
-                    # Some kind of binary subtitle found in some youtube livestreams
-                    if mime_type == 'application/x-rawcc':
-                        codecs = {'scodec': codec_str}
-                    else:
-                        codecs = parse_codecs(codec_str)
-                    if content_type not in ('video', 'audio', 'text'):
-                        if mime_type == 'image/jpeg':
-                            content_type = mime_type
-                        elif codecs.get('vcodec', 'none') != 'none':
-                            content_type = 'video'
-                        elif codecs.get('acodec', 'none') != 'none':
-                            content_type = 'audio'
-                        elif codecs.get('scodec', 'none') != 'none':
-                            content_type = 'text'
-                        elif mimetype2ext(mime_type) in ('tt', 'dfxp', 'ttml', 'xml', 'json'):
-                            content_type = 'text'
-                        else:
-                            self.report_warning('Unknown MIME type %s in DASH manifest' % mime_type)
-                            continue
-
-                    representation_id = representation_attrib.get('id')
-                    lang = representation_attrib.get('lang')
-                    url_el = representation.find(_add_ns('BaseURL'))
-                    filesize = int_or_none(url_el.get('{http://youtube.com/yt/2012/10/10}contentLength') if url_el is not None else None)
-                    bandwidth = int_or_none(representation_attrib.get('bandwidth'))
-                    format_id = join_nonempty(representation_id or content_type, mpd_id)
-                    if content_type in ('video', 'audio'):
+                    content_type = mime_type.split('/')[0]
+                    if content_type == 'text':
+                        # TODO implement WebVTT downloading
+                        pass
+                    elif content_type in ('video', 'audio'):
+                        base_url = ''
+                        for element in (representation, adaptation_set, period, mpd_doc):
+                            base_url_e = element.find(_add_ns('BaseURL'))
+                            if base_url_e is not None:
+                                base_url = base_url_e.text + base_url
+                                if re.match(r'^https?://', base_url):
+                                    break
+                        if mpd_base_url and not re.match(r'^https?://', base_url):
+                            if not mpd_base_url.endswith('/') and not base_url.startswith('/'):
+                                mpd_base_url += '/'
+                            base_url = mpd_base_url + base_url
+                        representation_id = representation_attrib.get('id')
+                        lang = representation_attrib.get('lang')
+                        url_el = representation.find(_add_ns('BaseURL'))
+                        filesize = int_or_none(url_el.attrib.get('{http://youtube.com/yt/2012/10/10}contentLength') if url_el is not None else None)
+                        bandwidth = int_or_none(representation_attrib.get('bandwidth'))
                         f = {
                             'format_id': '%s-%s' % (mpd_id, representation_id) if mpd_id else representation_id,
                             'manifest_url': mpd_url,
@@ -2464,130 +2218,104 @@ class InfoExtractor(object):
                             'filesize': filesize,
                             'container': mimetype2ext(mime_type) + '_dash',
                         }
-                        f.update(codecs)
-                    elif content_type == 'text':
-                        f = {
-                            'ext': mimetype2ext(mime_type),
-                            'manifest_url': mpd_url,
-                            'filesize': filesize,
-                        }
-                    elif content_type == 'image/jpeg':
-                        # See test case in VikiIE
-                        # https://www.viki.com/videos/1175236v-choosing-spouse-by-lottery-episode-1
-                        f = {
-                            'format_id': format_id,
-                            'ext': 'mhtml',
-                            'manifest_url': mpd_url,
-                            'format_note': 'DASH storyboards (jpeg)',
-                            'acodec': 'none',
-                            'vcodec': 'none',
-                        }
-                    if is_drm_protected(adaptation_set) or is_drm_protected(representation):
-                        f['has_drm'] = True
-                    representation_ms_info = extract_multisegment_info(representation, adaptation_set_ms_info)
+                        f.update(parse_codecs(representation_attrib.get('codecs')))
+                        representation_ms_info = extract_multisegment_info(representation, adaption_set_ms_info)
 
-                    def prepare_template(template_name, identifiers):
-                        tmpl = representation_ms_info[template_name]
-                        # First of, % characters outside $...$ templates
-                        # must be escaped by doubling for proper processing
-                        # by % operator string formatting used further (see
-                        # https://github.com/ytdl-org/youtube-dl/issues/16867).
-                        t = ''
-                        in_template = False
-                        for c in tmpl:
-                            t += c
-                            if c == '$':
-                                in_template = not in_template
-                            elif c == '%' and not in_template:
+                        def prepare_template(template_name, identifiers):
+                            tmpl = representation_ms_info[template_name]
+                            # First of, % characters outside $...$ templates
+                            # must be escaped by doubling for proper processing
+                            # by % operator string formatting used further (see
+                            # https://github.com/ytdl-org/youtube-dl/issues/16867).
+                            t = ''
+                            in_template = False
+                            for c in tmpl:
                                 t += c
-                        # Next, $...$ templates are translated to their
-                        # %(...) counterparts to be used with % operator
-                        t = t.replace('$RepresentationID$', representation_id)
-                        t = re.sub(r'\$(%s)\$' % '|'.join(identifiers), r'%(\1)d', t)
-                        t = re.sub(r'\$(%s)%%([^$]+)\$' % '|'.join(identifiers), r'%(\1)\2', t)
-                        t.replace('$$', '$')
-                        return t
+                                if c == '$':
+                                    in_template = not in_template
+                                elif c == '%' and not in_template:
+                                    t += c
+                            # Next, $...$ templates are translated to their
+                            # %(...) counterparts to be used with % operator
+                            t = t.replace('$RepresentationID$', representation_id)
+                            t = re.sub(r'\$(%s)\$' % '|'.join(identifiers), r'%(\1)d', t)
+                            t = re.sub(r'\$(%s)%%([^$]+)\$' % '|'.join(identifiers), r'%(\1)\2', t)
+                            t.replace('$$', '$')
+                            return t
 
-                    # @initialization is a regular template like @media one
-                    # so it should be handled just the same way (see
-                    # https://github.com/ytdl-org/youtube-dl/issues/11605)
-                    if 'initialization' in representation_ms_info:
-                        initialization_template = prepare_template(
-                            'initialization',
-                            # As per [1, 5.3.9.4.2, Table 15, page 54] $Number$ and
-                            # $Time$ shall not be included for @initialization thus
-                            # only $Bandwidth$ remains
-                            ('Bandwidth', ))
-                        representation_ms_info['initialization_url'] = initialization_template % {
-                            'Bandwidth': bandwidth,
-                        }
+                        # @initialization is a regular template like @media one
+                        # so it should be handled just the same way (see
+                        # https://github.com/ytdl-org/youtube-dl/issues/11605)
+                        if 'initialization' in representation_ms_info:
+                            initialization_template = prepare_template(
+                                'initialization',
+                                # As per [1, 5.3.9.4.2, Table 15, page 54] $Number$ and
+                                # $Time$ shall not be included for @initialization thus
+                                # only $Bandwidth$ remains
+                                ('Bandwidth', ))
+                            representation_ms_info['initialization_url'] = initialization_template % {
+                                'Bandwidth': bandwidth,
+                            }
 
-                    def location_key(location):
-                        return 'url' if re.match(r'^https?://', location) else 'path'
+                        def location_key(location):
+                            return 'url' if re.match(r'^https?://', location) else 'path'
 
-                    def calc_segment_duration():
-                        return float_or_none(
-                            representation_ms_info['segment_duration'],
-                            representation_ms_info['timescale']) if 'segment_duration' in representation_ms_info else None
+                        if 'segment_urls' not in representation_ms_info and 'media' in representation_ms_info:
 
-                    if 'segment_urls' not in representation_ms_info and 'media' in representation_ms_info:
+                            media_template = prepare_template('media', ('Number', 'Bandwidth', 'Time'))
+                            media_location_key = location_key(media_template)
 
-                        media_template = prepare_template('media', ('Number', 'Bandwidth', 'Time'))
-                        media_location_key = location_key(media_template)
+                            # As per [1, 5.3.9.4.4, Table 16, page 55] $Number$ and $Time$
+                            # can't be used at the same time
+                            if '%(Number' in media_template and 's' not in representation_ms_info:
+                                segment_duration = None
+                                if 'total_number' not in representation_ms_info and 'segment_duration' in representation_ms_info:
+                                    segment_duration = float_or_none(representation_ms_info['segment_duration'], representation_ms_info['timescale'])
+                                    representation_ms_info['total_number'] = int(math.ceil(float(period_duration) / segment_duration))
+                                representation_ms_info['fragments'] = [{
+                                    media_location_key: media_template % {
+                                        'Number': segment_number,
+                                        'Bandwidth': bandwidth,
+                                    },
+                                    'duration': segment_duration,
+                                } for segment_number in range(
+                                    representation_ms_info['start_number'],
+                                    representation_ms_info['total_number'] + representation_ms_info['start_number'])]
+                            else:
+                                # $Number*$ or $Time$ in media template with S list available
+                                # Example $Number*$: http://www.svtplay.se/klipp/9023742/stopptid-om-bjorn-borg
+                                # Example $Time$: https://play.arkena.com/embed/avp/v2/player/media/b41dda37-d8e7-4d3f-b1b5-9a9db578bdfe/1/129411
+                                representation_ms_info['fragments'] = []
+                                segment_time = 0
+                                segment_d = None
+                                segment_number = representation_ms_info['start_number']
 
-                        # As per [1, 5.3.9.4.4, Table 16, page 55] $Number$ and $Time$
-                        # can't be used at the same time
-                        if '%(Number' in media_template and 's' not in representation_ms_info:
-                            segment_duration = None
-                            if 'total_number' not in representation_ms_info and 'segment_duration' in representation_ms_info:
-                                segment_duration = float_or_none(representation_ms_info['segment_duration'], representation_ms_info['timescale'])
-                                representation_ms_info['total_number'] = int(math.ceil(
-                                    float_or_none(period_duration, segment_duration, default=0)))
-                            representation_ms_info['fragments'] = [{
-                                media_location_key: media_template % {
-                                    'Number': segment_number,
-                                    'Bandwidth': bandwidth,
-                                },
-                                'duration': segment_duration,
-                            } for segment_number in range(
-                                representation_ms_info['start_number'],
-                                representation_ms_info['total_number'] + representation_ms_info['start_number'])]
-                        else:
-                            # $Number*$ or $Time$ in media template with S list available
-                            # Example $Number*$: http://www.svtplay.se/klipp/9023742/stopptid-om-bjorn-borg
-                            # Example $Time$: https://play.arkena.com/embed/avp/v2/player/media/b41dda37-d8e7-4d3f-b1b5-9a9db578bdfe/1/129411
-                            representation_ms_info['fragments'] = []
-                            segment_time = 0
-                            segment_d = None
-                            segment_number = representation_ms_info['start_number']
+                                def add_segment_url():
+                                    segment_url = media_template % {
+                                        'Time': segment_time,
+                                        'Bandwidth': bandwidth,
+                                        'Number': segment_number,
+                                    }
+                                    representation_ms_info['fragments'].append({
+                                        media_location_key: segment_url,
+                                        'duration': float_or_none(segment_d, representation_ms_info['timescale']),
+                                    })
 
-                            def add_segment_url():
-                                segment_url = media_template % {
-                                    'Time': segment_time,
-                                    'Bandwidth': bandwidth,
-                                    'Number': segment_number,
-                                }
-                                representation_ms_info['fragments'].append({
-                                    media_location_key: segment_url,
-                                    'duration': float_or_none(segment_d, representation_ms_info['timescale']),
-                                })
-
-                            for num, s in enumerate(representation_ms_info['s']):
-                                segment_time = s.get('t') or segment_time
-                                segment_d = s['d']
-                                add_segment_url()
-                                segment_number += 1
-                                for r in range(s.get('r', 0)):
-                                    segment_time += segment_d
+                                for num, s in enumerate(representation_ms_info['s']):
+                                    segment_time = s.get('t') or segment_time
+                                    segment_d = s['d']
                                     add_segment_url()
                                     segment_number += 1
-                                segment_time += segment_d
-                    elif 'segment_urls' in representation_ms_info:
-                        fragments = []
-                        if 's' in representation_ms_info:
+                                    for r in range(s.get('r', 0)):
+                                        segment_time += segment_d
+                                        add_segment_url()
+                                        segment_number += 1
+                                    segment_time += segment_d
+                        elif 'segment_urls' in representation_ms_info and 's' in representation_ms_info:
                             # No media template
                             # Example: https://www.youtube.com/watch?v=iXZV5uAYMJI
                             # or any YouTube dashsegments video
+                            fragments = []
                             segment_index = 0
                             timescale = representation_ms_info['timescale']
                             for s in representation_ms_info['s']:
@@ -2599,78 +2327,48 @@ class InfoExtractor(object):
                                         'duration': duration,
                                     })
                                     segment_index += 1
-                        elif 'segment_urls_range' in representation_ms_info:
-                            # Segment URLs with mediaRange
-                            # Example: https://kinescope.io/200615537/master.mpd
-                            # https://github.com/ytdl-org/youtube-dl/issues/30235
-                            # or any mpd generated with Bento4 `mp4dash --no-split --use-segment-list`
-                            segment_duration = calc_segment_duration()
-                            for segment_url, segment_url_range in zip(
-                                    representation_ms_info['segment_urls'], representation_ms_info['segment_urls_range']):
-                                fragments.append({
-                                    location_key(segment_url): segment_url,
-                                    'range': segment_url_range,
-                                    'duration': segment_duration,
-                                })
-                        else:
+                            representation_ms_info['fragments'] = fragments
+                        elif 'segment_urls' in representation_ms_info:
                             # Segment URLs with no SegmentTimeline
                             # Example: https://www.seznam.cz/zpravy/clanek/cesko-zasahne-vitr-o-sile-vichrice-muze-byt-i-zivotu-nebezpecny-39091
                             # https://github.com/ytdl-org/youtube-dl/pull/14844
-                            segment_duration = calc_segment_duration()
+                            fragments = []
+                            segment_duration = float_or_none(
+                                representation_ms_info['segment_duration'],
+                                representation_ms_info['timescale']) if 'segment_duration' in representation_ms_info else None
                             for segment_url in representation_ms_info['segment_urls']:
-                                fragments.append({
+                                fragment = {
                                     location_key(segment_url): segment_url,
-                                    'duration': segment_duration,
-                                })
-                        representation_ms_info['fragments'] = fragments
-
-                    # If there is a fragments key available then we correctly recognized fragmented media.
-                    # Otherwise we will assume unfragmented media with direct access. Technically, such
-                    # assumption is not necessarily correct since we may simply have no support for
-                    # some forms of fragmented media renditions yet, but for now we'll use this fallback.
-                    if 'fragments' in representation_ms_info:
-                        base_url = representation_ms_info['base_url']
-                        f.update({
-                            # NB: mpd_url may be empty when MPD manifest is parsed from a string
-                            'url': mpd_url or base_url,
-                            'fragment_base_url': base_url,
-                            'fragments': [],
-                            'protocol': 'http_dash_segments',
-                        })
-                        if 'initialization_url' in representation_ms_info and 'initialization_url_range' in representation_ms_info:
-                            # Initialization URL with range (accompanied by Segment URLs with mediaRange above)
-                            # https://github.com/ytdl-org/youtube-dl/issues/30235
-                            initialization_url = representation_ms_info['initialization_url']
-                            f['fragments'].append({
-                                location_key(initialization_url): initialization_url,
-                                'range': representation_ms_info['initialization_url_range'],
+                                }
+                                if segment_duration:
+                                    fragment['duration'] = segment_duration
+                                fragments.append(fragment)
+                            representation_ms_info['fragments'] = fragments
+                        # If there is a fragments key available then we correctly recognized fragmented media.
+                        # Otherwise we will assume unfragmented media with direct access. Technically, such
+                        # assumption is not necessarily correct since we may simply have no support for
+                        # some forms of fragmented media renditions yet, but for now we'll use this fallback.
+                        if 'fragments' in representation_ms_info:
+                            f.update({
+                                # NB: mpd_url may be empty when MPD manifest is parsed from a string
+                                'url': mpd_url or base_url,
+                                'fragment_base_url': base_url,
+                                'fragments': [],
+                                'protocol': 'http_dash_segments',
                             })
-                        elif 'initialization_url' in representation_ms_info:
-                            initialization_url = representation_ms_info['initialization_url']
-                            if not f.get('url'):
-                                f['url'] = initialization_url
-                            f['fragments'].append({location_key(initialization_url): initialization_url})
-                        elif 'initialization_url_range' in representation_ms_info:
-                            # no Initialization URL but range (accompanied by no Segment URLs but mediaRange above)
-                            # https://github.com/ytdl-org/youtube-dl/issues/27575
-                            f['fragments'].append({
-                                location_key(base_url): base_url,
-                                'range': representation_ms_info['initialization_url_range'],
-                            })
-                        f['fragments'].extend(representation_ms_info['fragments'])
-                        if not period_duration:
-                            period_duration = sum(traverse_obj(representation_ms_info, (
-                                'fragments', Ellipsis, 'duration', T(float_or_none))))
-                    else:
-                        # Assuming direct URL to unfragmented media.
-                        f['url'] = representation_ms_info['base_url']
-                    if content_type in ('video', 'audio', 'image/jpeg'):
-                        f['manifest_stream_number'] = stream_numbers[f['url']]
-                        stream_numbers[f['url']] += 1
+                            if 'initialization_url' in representation_ms_info:
+                                initialization_url = representation_ms_info['initialization_url']
+                                if not f.get('url'):
+                                    f['url'] = initialization_url
+                                f['fragments'].append({location_key(initialization_url): initialization_url})
+                            f['fragments'].extend(representation_ms_info['fragments'])
+                        else:
+                            # Assuming direct URL to unfragmented media.
+                            f['url'] = base_url
                         formats.append(f)
-                    elif content_type == 'text':
-                        subtitles.setdefault(lang or 'und', []).append(f)
-        return formats, subtitles
+                    else:
+                        self.report_warning('Unknown MIME type %s in DASH manifest' % mime_type)
+        return formats
 
     def _extract_ism_formats(self, ism_url, video_id, ism_id=None, note=None, errnote=None, fatal=True, data=None, headers={}, query={}):
         res = self._download_xml_handle(
@@ -2796,8 +2494,7 @@ class InfoExtractor(object):
                 return f
             return {}
 
-        def _media_formats(src, cur_media_type, type_info=None):
-            type_info = type_info or {}
+        def _media_formats(src, cur_media_type, type_info={}):
             full_url = absolute_url(src)
             ext = type_info.get('ext') or determine_ext(full_url)
             if ext == 'm3u8':
@@ -2815,7 +2512,6 @@ class InfoExtractor(object):
                 formats = [{
                     'url': full_url,
                     'vcodec': 'none' if cur_media_type == 'audio' else None,
-                    'ext': ext,
                 }]
             return is_plain_url, formats
 
@@ -2824,7 +2520,7 @@ class InfoExtractor(object):
         # so we wll include them right here (see
         # https://www.ampproject.org/docs/reference/components/amp-video)
         # For dl8-* tags see https://delight-vr.com/documentation/dl8-video/
-        _MEDIA_TAG_NAME_RE = r'(?:(?:amp|dl8(?:-live)?)-)?(video(?:-js)?|audio)'
+        _MEDIA_TAG_NAME_RE = r'(?:(?:amp|dl8(?:-live)?)-)?(video|audio)'
         media_tags = [(media_tag, media_tag_name, media_type, '')
                       for media_tag, media_tag_name, media_type
                       in re.findall(r'(?s)(<(%s)[^>]*/>)' % _MEDIA_TAG_NAME_RE, webpage)]
@@ -2842,8 +2538,7 @@ class InfoExtractor(object):
             media_attributes = extract_attributes(media_tag)
             src = strip_or_none(media_attributes.get('src'))
             if src:
-                f = parse_content_type(media_attributes.get('type'))
-                _, formats = _media_formats(src, media_type, f)
+                _, formats = _media_formats(src, media_type)
                 media_info['formats'].extend(formats)
             media_info['thumbnail'] = absolute_url(media_attributes.get('poster'))
             if media_content:
@@ -3017,32 +2712,31 @@ class InfoExtractor(object):
         return formats
 
     def _find_jwplayer_data(self, webpage, video_id=None, transform_source=js_to_json):
-        return self._search_json(
-            r'''(?<!-)\bjwplayer\s*\(\s*(?P<q>'|")(?!(?P=q)).+(?P=q)\s*\)(?:(?!</script>).)*?\.\s*(?:setup\s*\(|(?P<load>load)\s*\(\s*\[)''',
-            webpage, 'JWPlayer data', video_id,
-            # must be a {...} or sequence, ending
-            contains_pattern=r'\{[\s\S]*}(?(load)(?:\s*,\s*\{[\s\S]*})*)', end_pattern=r'(?(load)\]|\))',
-            transform_source=transform_source, default=None)
+        mobj = re.search(
+            r'(?s)jwplayer\((?P<quote>[\'"])[^\'" ]+(?P=quote)\)(?!</script>).*?\.setup\s*\((?P<options>[^)]+)\)',
+            webpage)
+        if mobj:
+            try:
+                jwplayer_data = self._parse_json(mobj.group('options'),
+                                                 video_id=video_id,
+                                                 transform_source=transform_source)
+            except ExtractorError:
+                pass
+            else:
+                if isinstance(jwplayer_data, dict):
+                    return jwplayer_data
 
     def _extract_jwplayer_data(self, webpage, video_id, *args, **kwargs):
-        # allow passing `transform_source` through to _find_jwplayer_data()
-        transform_source = kwargs.pop('transform_source', None)
-        kwfind = compat_kwargs({'transform_source': transform_source}) if transform_source else {}
-
-        jwplayer_data = self._find_jwplayer_data(webpage, video_id, **kwfind)
-
-        return self._parse_jwplayer_data(jwplayer_data, video_id, *args, **kwargs)
+        jwplayer_data = self._find_jwplayer_data(
+            webpage, video_id, transform_source=js_to_json)
+        return self._parse_jwplayer_data(
+            jwplayer_data, video_id, *args, **kwargs)
 
     def _parse_jwplayer_data(self, jwplayer_data, video_id=None, require_title=True,
                              m3u8_id=None, mpd_id=None, rtmp_params=None, base_url=None):
-        flat_pl = try_get(jwplayer_data, lambda x: x.get('playlist') or True)
-        if flat_pl is None:
-            # not even a dict
-            return []
-
         # JWPlayer backward compatibility: flattened playlists
         # https://github.com/jwplayer/jwplayer/blob/v7.4.3/src/js/api/config.js#L81-L96
-        if flat_pl is True:
+        if 'playlist' not in jwplayer_data:
             jwplayer_data = {'playlist': [jwplayer_data]}
 
         entries = []
@@ -3065,14 +2759,22 @@ class InfoExtractor(object):
                 mpd_id=mpd_id, rtmp_params=rtmp_params, base_url=base_url)
 
             subtitles = {}
-            for track in traverse_obj(video_data, (
-                    'tracks', lambda _, t: t.get('kind').lower() in ('captions', 'subtitles'))):
-                track_url = urljoin(base_url, track.get('file'))
-                if not track_url:
-                    continue
-                subtitles.setdefault(track.get('label') or 'en', []).append({
-                    'url': self._proto_relative_url(track_url)
-                })
+            tracks = video_data.get('tracks')
+            if tracks and isinstance(tracks, list):
+                for track in tracks:
+                    if not isinstance(track, dict):
+                        continue
+                    track_kind = track.get('kind')
+                    if not track_kind or not isinstance(track_kind, compat_str):
+                        continue
+                    if track_kind.lower() not in ('captions', 'subtitles'):
+                        continue
+                    track_url = urljoin(base_url, track.get('file'))
+                    if not track_url:
+                        continue
+                    subtitles.setdefault(track.get('label') or 'en', []).append({
+                        'url': self._proto_relative_url(track_url)
+                    })
 
             entry = {
                 'id': this_video_id,
@@ -3082,13 +2784,6 @@ class InfoExtractor(object):
                 'timestamp': int_or_none(video_data.get('pubdate')),
                 'duration': float_or_none(jwplayer_data.get('duration') or video_data.get('duration')),
                 'subtitles': subtitles,
-                'alt_title': clean_html(video_data.get('subtitle')),  # attributes used e.g. by Tele5 ...
-                'genre': clean_html(video_data.get('genre')),
-                'channel': clean_html(dict_get(video_data, ('category', 'channel'))),
-                'season_number': int_or_none(video_data.get('season')),
-                'episode_number': int_or_none(video_data.get('episode')),
-                'release_year': int_or_none(video_data.get('releasedate')),
-                'age_limit': int_or_none(video_data.get('age_restriction')),
             }
             # https://github.com/jwplayer/jwplayer/blob/master/src/js/utils/validator.js#L32
             if len(formats) == 1 and re.search(r'^(?:http|//).*(?:youtube\.com|youtu\.be)/.+', formats[0]['url']):
@@ -3097,9 +2792,7 @@ class InfoExtractor(object):
                     'url': formats[0]['url'],
                 })
             else:
-                # avoid exception in case of only sttls
-                if formats:
-                    self._sort_formats(formats)
+                self._sort_formats(formats)
                 entry['formats'] = formats
             entries.append(entry)
         if len(entries) == 1:
@@ -3109,7 +2802,7 @@ class InfoExtractor(object):
 
     def _parse_jwplayer_formats(self, jwplayer_sources_data, video_id=None,
                                 m3u8_id=None, mpd_id=None, rtmp_params=None, base_url=None):
-        urls = set()
+        urls = []
         formats = []
         for source in jwplayer_sources_data:
             if not isinstance(source, dict):
@@ -3118,14 +2811,14 @@ class InfoExtractor(object):
                 base_url, self._proto_relative_url(source.get('file')))
             if not source_url or source_url in urls:
                 continue
-            urls.add(source_url)
+            urls.append(source_url)
             source_type = source.get('type') or ''
             ext = mimetype2ext(source_type) or determine_ext(source_url)
-            if source_type == 'hls' or ext == 'm3u8' or 'format=m3u8-aapl' in source_url:
+            if source_type == 'hls' or ext == 'm3u8':
                 formats.extend(self._extract_m3u8_formats(
                     source_url, video_id, 'mp4', entry_protocol='m3u8_native',
                     m3u8_id=m3u8_id, fatal=False))
-            elif source_type == 'dash' or ext == 'mpd' or 'format=mpd-time-csf' in source_url:
+            elif source_type == 'dash' or ext == 'mpd':
                 formats.extend(self._extract_mpd_formats(
                     source_url, video_id, mpd_id=mpd_id, fatal=False))
             elif ext == 'smil':
@@ -3140,29 +2833,26 @@ class InfoExtractor(object):
                     'ext': ext,
                 })
             else:
-                format_id = str_or_none(source.get('label'))
                 height = int_or_none(source.get('height'))
-                if height is None and format_id:
+                if height is None:
                     # Often no height is provided but there is a label in
                     # format like "1080p", "720p SD", or 1080.
-                    height = parse_resolution(format_id).get('height')
+                    height = int_or_none(self._search_regex(
+                        r'^(\d{3,4})[pP]?(?:\b|$)', compat_str(source.get('label') or ''),
+                        'height', default=None))
                 a_format = {
                     'url': source_url,
                     'width': int_or_none(source.get('width')),
                     'height': height,
-                    'tbr': int_or_none(source.get('bitrate'), scale=1000),
-                    'filesize': int_or_none(source.get('filesize')),
+                    'tbr': int_or_none(source.get('bitrate')),
                     'ext': ext,
                 }
-                if format_id:
-                    a_format['format_id'] = format_id
-
                 if source_url.startswith('rtmp'):
                     a_format['ext'] = 'flv'
                     # See com/longtailvideo/jwplayer/media/RTMPMediaProvider.as
                     # of jwplayer.flash.swf
                     rtmp_url_parts = re.split(
-                        r'((?:mp4|mp3|flv):)', source_url, maxsplit=1)
+                        r'((?:mp4|mp3|flv):)', source_url, 1)
                     if len(rtmp_url_parts) == 3:
                         rtmp_url, prefix, play_path = rtmp_url_parts
                         a_format.update({
@@ -3189,7 +2879,7 @@ class InfoExtractor(object):
             if fatal:
                 raise ExtractorError(msg)
             else:
-                self.report_warning(msg)
+                self._downloader.report_warning(msg)
         return res
 
     def _float(self, v, name, fatal=False, **kwargs):
@@ -3199,7 +2889,7 @@ class InfoExtractor(object):
             if fatal:
                 raise ExtractorError(msg)
             else:
-                self.report_warning(msg)
+                self._downloader.report_warning(msg)
         return res
 
     def _set_cookie(self, domain, name, value, expire_time=None, port=None,
@@ -3208,12 +2898,12 @@ class InfoExtractor(object):
             0, name, value, port, port is not None, domain, True,
             domain.startswith('.'), path, True, secure, expire_time,
             discard, None, None, rest)
-        self.cookiejar.set_cookie(cookie)
+        self._downloader.cookiejar.set_cookie(cookie)
 
     def _get_cookies(self, url):
         """ Return a compat_cookies_SimpleCookie with the cookies for the url """
         req = sanitized_Request(url)
-        self.cookiejar.add_cookie_header(req)
+        self._downloader.cookiejar.add_cookie_header(req)
         return compat_cookies_SimpleCookie(req.get_header('Cookie'))
 
     def _apply_first_set_cookie_header(self, url_handle, cookie):
@@ -3273,8 +2963,8 @@ class InfoExtractor(object):
         return not any_restricted
 
     def extract_subtitles(self, *args, **kwargs):
-        if (self.get_param('writesubtitles', False)
-                or self.get_param('listsubtitles')):
+        if (self._downloader.params.get('writesubtitles', False)
+                or self._downloader.params.get('listsubtitles')):
             return self._get_subtitles(*args, **kwargs)
         return {}
 
@@ -3291,24 +2981,16 @@ class InfoExtractor(object):
         return ret
 
     @classmethod
-    def _merge_subtitles(cls, subtitle_dict1, *subtitle_dicts, **kwargs):
-        """ Merge subtitle dictionaries, language by language. """
-
-        # ..., * , target=None
-        target = kwargs.get('target')
-        if target is None:
-            target = dict(subtitle_dict1)
-        else:
-            subtitle_dicts = (subtitle_dict1,) + subtitle_dicts
-
-        for subtitle_dict in subtitle_dicts:
-            for lang in subtitle_dict:
-                target[lang] = cls._merge_subtitle_items(target.get(lang, []), subtitle_dict[lang])
-        return target
+    def _merge_subtitles(cls, subtitle_dict1, subtitle_dict2):
+        """ Merge two subtitle dictionaries, language by language. """
+        ret = dict(subtitle_dict1)
+        for lang in subtitle_dict2:
+            ret[lang] = cls._merge_subtitle_items(subtitle_dict1.get(lang, []), subtitle_dict2[lang])
+        return ret
 
     def extract_automatic_captions(self, *args, **kwargs):
-        if (self.get_param('writeautomaticsub', False)
-                or self.get_param('listsubtitles')):
+        if (self._downloader.params.get('writeautomaticsub', False)
+                or self._downloader.params.get('listsubtitles')):
             return self._get_automatic_captions(*args, **kwargs)
         return {}
 
@@ -3316,9 +2998,9 @@ class InfoExtractor(object):
         raise NotImplementedError('This method must be implemented by subclasses')
 
     def mark_watched(self, *args, **kwargs):
-        if (self.get_param('mark_watched', False)
+        if (self._downloader.params.get('mark_watched', False)
                 and (self._get_login_info()[0] is not None
-                     or self.get_param('cookiefile') is not None)):
+                     or self._downloader.params.get('cookiefile') is not None)):
             self._mark_watched(*args, **kwargs)
 
     def _mark_watched(self, *args, **kwargs):
@@ -3326,7 +3008,7 @@ class InfoExtractor(object):
 
     def geo_verification_headers(self):
         headers = {}
-        geo_verification_proxy = self.get_param('geo_verification_proxy')
+        geo_verification_proxy = self._downloader.params.get('geo_verification_proxy')
         if geo_verification_proxy:
             headers['Ytdl-request-proxy'] = geo_verification_proxy
         return headers
@@ -3337,29 +3019,6 @@ class InfoExtractor(object):
     def _generic_title(self, url):
         return compat_urllib_parse_unquote(os.path.splitext(url_basename(url))[0])
 
-    def _yes_playlist(self, playlist_id, video_id, *args, **kwargs):
-        # smuggled_data=None, *, playlist_label='playlist', video_label='video'
-        smuggled_data = args[0] if len(args) == 1 else kwargs.get('smuggled_data')
-        playlist_label = kwargs.get('playlist_label', 'playlist')
-        video_label = kwargs.get('video_label', 'video')
-
-        if not playlist_id or not video_id:
-            return not video_id
-
-        no_playlist = (smuggled_data or {}).get('force_noplaylist')
-        if no_playlist is not None:
-            return not no_playlist
-
-        video_id = '' if video_id is True else ' ' + video_id
-        noplaylist = self.get_param('noplaylist')
-        self.to_screen(
-            'Downloading just the {0}{1} because of --no-playlist'.format(video_label, video_id)
-            if noplaylist else
-            'Downloading {0}{1} - add --no-playlist to download just the {2}{3}'.format(
-                playlist_label, '' if playlist_id is True else ' ' + playlist_id,
-                video_label, video_id))
-        return not noplaylist
-
 
 class SearchInfoExtractor(InfoExtractor):
     """
diff --git a/youtube_dl/extractor/cpac.py b/youtube_dl/extractor/cpac.py
deleted file mode 100644
index 22741152c..000000000
--- a/youtube_dl/extractor/cpac.py
+++ /dev/null
@@ -1,148 +0,0 @@
-# coding: utf-8
-from __future__ import unicode_literals
-
-from .common import InfoExtractor
-from ..compat import compat_str
-from ..utils import (
-    int_or_none,
-    str_or_none,
-    try_get,
-    unified_timestamp,
-    update_url_query,
-    urljoin,
-)
-
-# compat_range
-try:
-    if callable(xrange):
-        range = xrange
-except (NameError, TypeError):
-    pass
-
-
-class CPACIE(InfoExtractor):
-    IE_NAME = 'cpac'
-    _VALID_URL = r'https?://(?:www\.)?cpac\.ca/(?P<fr>l-)?episode\?id=(?P<id>[\da-f]{8}(?:-[\da-f]{4}){3}-[\da-f]{12})'
-    _TEST = {
-        # 'url': 'http://www.cpac.ca/en/programs/primetime-politics/episodes/65490909',
-        'url': 'https://www.cpac.ca/episode?id=fc7edcae-4660-47e1-ba61-5b7f29a9db0f',
-        'md5': 'e46ad699caafd7aa6024279f2614e8fa',
-        'info_dict': {
-            'id': 'fc7edcae-4660-47e1-ba61-5b7f29a9db0f',
-            'ext': 'mp4',
-            'upload_date': '20220215',
-            'title': 'News Conference to Celebrate National Kindness Week – February 15, 2022',
-            'description': 'md5:466a206abd21f3a6f776cdef290c23fb',
-            'timestamp': 1644901200,
-        },
-        'params': {
-            'format': 'bestvideo',
-            'hls_prefer_native': True,
-        },
-    }
-
-    def _real_extract(self, url):
-        video_id = self._match_id(url)
-        url_lang = 'fr' if '/l-episode?' in url else 'en'
-
-        content = self._download_json(
-            'https://www.cpac.ca/api/1/services/contentModel.json?url=/site/website/episode/index.xml&crafterSite=cpacca&id=' + video_id,
-            video_id)
-        video_url = try_get(content, lambda x: x['page']['details']['videoUrl'], compat_str)
-        formats = []
-        if video_url:
-            content = content['page']
-            title = str_or_none(content['details']['title_%s_t' % (url_lang, )])
-            formats = self._extract_m3u8_formats(video_url, video_id, m3u8_id='hls', ext='mp4')
-            for fmt in formats:
-                # prefer language to match URL
-                fmt_lang = fmt.get('language')
-                if fmt_lang == url_lang:
-                    fmt['language_preference'] = 10
-                elif not fmt_lang:
-                    fmt['language_preference'] = -1
-                else:
-                    fmt['language_preference'] = -10
-
-        self._sort_formats(formats)
-
-        category = str_or_none(content['details']['category_%s_t' % (url_lang, )])
-
-        def is_live(v_type):
-            return (v_type == 'live') if v_type is not None else None
-
-        return {
-            'id': video_id,
-            'formats': formats,
-            'title': title,
-            'description': str_or_none(content['details'].get('description_%s_t' % (url_lang, ))),
-            'timestamp': unified_timestamp(content['details'].get('liveDateTime')),
-            'category': [category] if category else None,
-            'thumbnail': urljoin(url, str_or_none(content['details'].get('image_%s_s' % (url_lang, )))),
-            'is_live': is_live(content['details'].get('type')),
-        }
-
-
-class CPACPlaylistIE(InfoExtractor):
-    IE_NAME = 'cpac:playlist'
-    _VALID_URL = r'(?i)https?://(?:www\.)?cpac\.ca/(?:program|search|(?P<fr>emission|rechercher))\?(?:[^&]+&)*?(?P<id>(?:id=\d+|programId=\d+|key=[^&]+))'
-
-    _TESTS = [{
-        'url': 'https://www.cpac.ca/program?id=6',
-        'info_dict': {
-            'id': 'id=6',
-            'title': 'Headline Politics',
-            'description': 'Watch CPAC’s signature long-form coverage of the day’s pressing political events as they unfold.',
-        },
-        'playlist_count': 10,
-    }, {
-        'url': 'https://www.cpac.ca/search?key=hudson&type=all&order=desc',
-        'info_dict': {
-            'id': 'key=hudson',
-            'title': 'hudson',
-        },
-        'playlist_count': 22,
-    }, {
-        'url': 'https://www.cpac.ca/search?programId=50',
-        'info_dict': {
-            'id': 'programId=50',
-            'title': '50',
-        },
-        'playlist_count': 9,
-    }, {
-        'url': 'https://www.cpac.ca/emission?id=6',
-        'only_matching': True,
-    }, {
-        'url': 'https://www.cpac.ca/rechercher?key=hudson&type=all&order=desc',
-        'only_matching': True,
-    }]
-
-    def _real_extract(self, url):
-        video_id = self._match_id(url)
-        url_lang = 'fr' if any(x in url for x in ('/emission?', '/rechercher?')) else 'en'
-        pl_type, list_type = ('program', 'itemList') if any(x in url for x in ('/program?', '/emission?')) else ('search', 'searchResult')
-        api_url = (
-            'https://www.cpac.ca/api/1/services/contentModel.json?url=/site/website/%s/index.xml&crafterSite=cpacca&%s'
-            % (pl_type, video_id, ))
-        content = self._download_json(api_url, video_id)
-        entries = []
-        total_pages = int_or_none(try_get(content, lambda x: x['page'][list_type]['totalPages']), default=1)
-        for page in range(1, total_pages + 1):
-            if page > 1:
-                api_url = update_url_query(api_url, {'page': '%d' % (page, ), })
-                content = self._download_json(
-                    api_url, video_id,
-                    note='Downloading continuation - %d' % (page, ),
-                    fatal=False)
-
-            for item in try_get(content, lambda x: x['page'][list_type]['item'], list) or []:
-                episode_url = urljoin(url, try_get(item, lambda x: x['url_%s_s' % (url_lang, )]))
-                if episode_url:
-                    entries.append(episode_url)
-
-        return self.playlist_result(
-            (self.url_result(entry) for entry in entries),
-            playlist_id=video_id,
-            playlist_title=try_get(content, lambda x: x['page']['program']['title_%s_t' % (url_lang, )]) or video_id.split('=')[-1],
-            playlist_description=try_get(content, lambda x: x['page']['program']['description_%s_t' % (url_lang, )]),
-        )
diff --git a/youtube_dl/extractor/curiositystream.py b/youtube_dl/extractor/curiositystream.py
index 48ff30432..e4a7fca6c 100644
--- a/youtube_dl/extractor/curiositystream.py
+++ b/youtube_dl/extractor/curiositystream.py
@@ -25,12 +25,12 @@ class CuriosityStreamBaseIE(InfoExtractor):
             raise ExtractorError(
                 '%s said: %s' % (self.IE_NAME, error), expected=True)
 
-    def _call_api(self, path, video_id, query=None):
+    def _call_api(self, path, video_id):
         headers = {}
         if self._auth_token:
             headers['X-Auth-Token'] = self._auth_token
         result = self._download_json(
-            self._API_BASE_URL + path, video_id, headers=headers, query=query)
+            self._API_BASE_URL + path, video_id, headers=headers)
         self._handle_errors(result)
         return result['data']
 
@@ -52,75 +52,62 @@ class CuriosityStreamIE(CuriosityStreamBaseIE):
     _VALID_URL = r'https?://(?:app\.)?curiositystream\.com/video/(?P<id>\d+)'
     _TEST = {
         'url': 'https://app.curiositystream.com/video/2',
+        'md5': '262bb2f257ff301115f1973540de8983',
         'info_dict': {
             'id': '2',
             'ext': 'mp4',
             'title': 'How Did You Develop The Internet?',
             'description': 'Vint Cerf, Google\'s Chief Internet Evangelist, describes how he and Bob Kahn created the internet.',
-        },
-        'params': {
-            'format': 'bestvideo',
-            # m3u8 download
-            'skip_download': True,
-        },
+        }
     }
 
     def _real_extract(self, url):
         video_id = self._match_id(url)
+        media = self._call_api('media/' + video_id, video_id)
+        title = media['title']
 
         formats = []
-        for encoding_format in ('m3u8', 'mpd'):
-            media = self._call_api('media/' + video_id, video_id, query={
-                'encodingsNew': 'true',
-                'encodingsFormat': encoding_format,
-            })
-            for encoding in media.get('encodings', []):
-                playlist_url = encoding.get('master_playlist_url')
-                if encoding_format == 'm3u8':
-                    # use `m3u8` entry_protocol until EXT-X-MAP is properly supported by `m3u8_native` entry_protocol
-                    formats.extend(self._extract_m3u8_formats(
-                        playlist_url, video_id, 'mp4',
-                        m3u8_id='hls', fatal=False))
-                elif encoding_format == 'mpd':
-                    formats.extend(self._extract_mpd_formats(
-                        playlist_url, video_id, mpd_id='dash', fatal=False))
-                encoding_url = encoding.get('url')
-                file_url = encoding.get('file_url')
-                if not encoding_url and not file_url:
+        for encoding in media.get('encodings', []):
+            m3u8_url = encoding.get('master_playlist_url')
+            if m3u8_url:
+                formats.extend(self._extract_m3u8_formats(
+                    m3u8_url, video_id, 'mp4', 'm3u8_native',
+                    m3u8_id='hls', fatal=False))
+            encoding_url = encoding.get('url')
+            file_url = encoding.get('file_url')
+            if not encoding_url and not file_url:
+                continue
+            f = {
+                'width': int_or_none(encoding.get('width')),
+                'height': int_or_none(encoding.get('height')),
+                'vbr': int_or_none(encoding.get('video_bitrate')),
+                'abr': int_or_none(encoding.get('audio_bitrate')),
+                'filesize': int_or_none(encoding.get('size_in_bytes')),
+                'vcodec': encoding.get('video_codec'),
+                'acodec': encoding.get('audio_codec'),
+                'container': encoding.get('container_type'),
+            }
+            for f_url in (encoding_url, file_url):
+                if not f_url:
                     continue
-                f = {
-                    'width': int_or_none(encoding.get('width')),
-                    'height': int_or_none(encoding.get('height')),
-                    'vbr': int_or_none(encoding.get('video_bitrate')),
-                    'abr': int_or_none(encoding.get('audio_bitrate')),
-                    'filesize': int_or_none(encoding.get('size_in_bytes')),
-                    'vcodec': encoding.get('video_codec'),
-                    'acodec': encoding.get('audio_codec'),
-                    'container': encoding.get('container_type'),
-                }
-                for f_url in (encoding_url, file_url):
-                    if not f_url:
-                        continue
-                    fmt = f.copy()
-                    rtmp = re.search(r'^(?P<url>rtmpe?://(?P<host>[^/]+)/(?P<app>.+))/(?P<playpath>mp[34]:.+)$', f_url)
-                    if rtmp:
-                        fmt.update({
-                            'url': rtmp.group('url'),
-                            'play_path': rtmp.group('playpath'),
-                            'app': rtmp.group('app'),
-                            'ext': 'flv',
-                            'format_id': 'rtmp',
-                        })
-                    else:
-                        fmt.update({
-                            'url': f_url,
-                            'format_id': 'http',
-                        })
-                    formats.append(fmt)
+                fmt = f.copy()
+                rtmp = re.search(r'^(?P<url>rtmpe?://(?P<host>[^/]+)/(?P<app>.+))/(?P<playpath>mp[34]:.+)$', f_url)
+                if rtmp:
+                    fmt.update({
+                        'url': rtmp.group('url'),
+                        'play_path': rtmp.group('playpath'),
+                        'app': rtmp.group('app'),
+                        'ext': 'flv',
+                        'format_id': 'rtmp',
+                    })
+                else:
+                    fmt.update({
+                        'url': f_url,
+                        'format_id': 'http',
+                    })
+                formats.append(fmt)
         self._sort_formats(formats)
 
-        title = media['title']
-
         subtitles = {}
         for closed_caption in media.get('closed_captions', []):
             sub_url = closed_caption.get('file')
@@ -145,7 +132,7 @@ class CuriosityStreamIE(CuriosityStreamBaseIE):
 
 class CuriosityStreamCollectionIE(CuriosityStreamBaseIE):
     IE_NAME = 'curiositystream:collection'
-    _VALID_URL = r'https?://(?:app\.)?curiositystream\.com/(?:collections?|series)/(?P<id>\d+)'
+    _VALID_URL = r'https?://(?:app\.)?curiositystream\.com/(?:collection|series)/(?P<id>\d+)'
     _TESTS = [{
         'url': 'https://app.curiositystream.com/collection/2',
         'info_dict': {
@@ -153,13 +140,10 @@ class CuriosityStreamCollectionIE(CuriosityStreamBaseIE):
             'title': 'Curious Minds: The Internet',
             'description': 'How is the internet shaping our lives in the 21st Century?',
         },
-        'playlist_mincount': 16,
+        'playlist_mincount': 17,
     }, {
         'url': 'https://curiositystream.com/series/2',
         'only_matching': True,
-    }, {
-        'url': 'https://curiositystream.com/collections/36',
-        'only_matching': True,
     }]
 
     def _real_extract(self, url):
diff --git a/youtube_dl/extractor/dispeak.py b/youtube_dl/extractor/dispeak.py
index 276fd4b09..c345e0274 100644
--- a/youtube_dl/extractor/dispeak.py
+++ b/youtube_dl/extractor/dispeak.py
@@ -32,18 +32,6 @@ class DigitallySpeakingIE(InfoExtractor):
         # From http://www.gdcvault.com/play/1013700/Advanced-Material
         'url': 'http://sevt.dispeak.com/ubm/gdc/eur10/xml/11256_1282118587281VNIT.xml',
         'only_matching': True,
-    }, {
-        # From https://gdcvault.com/play/1016624, empty speakerVideo
-        'url': 'https://sevt.dispeak.com/ubm/gdc/online12/xml/201210-822101_1349794556671DDDD.xml',
-        'info_dict': {
-            'id': '201210-822101_1349794556671DDDD',
-            'ext': 'flv',
-            'title': 'Pre-launch - Preparing to Take the Plunge',
-        },
-    }, {
-        # From http://www.gdcvault.com/play/1014846/Conference-Keynote-Shigeru, empty slideVideo
-        'url': 'http://events.digitallyspeaking.com/gdc/project25/xml/p25-miyamoto1999_1282467389849HSVB.xml',
-        'only_matching': True,
     }]
 
     def _parse_mp4(self, metadata):
@@ -96,20 +84,26 @@ class DigitallySpeakingIE(InfoExtractor):
                 'vcodec': 'none',
                 'format_id': audio.get('code'),
             })
-        for video_key, format_id, preference in (
-                ('slide', 'slides', -2), ('speaker', 'speaker', -1)):
-            video_path = xpath_text(metadata, './%sVideo' % video_key)
-            if not video_path:
-                continue
-            formats.append({
-                'url': 'rtmp://%s/ondemand?ovpfv=1.1' % akamai_url,
-                'play_path': remove_end(video_path, '.flv'),
-                'ext': 'flv',
-                'format_note': '%s video' % video_key,
-                'quality': preference,
-                'preference': preference,
-                'format_id': format_id,
-            })
+        slide_video_path = xpath_text(metadata, './slideVideo', fatal=True)
+        formats.append({
+            'url': 'rtmp://%s/ondemand?ovpfv=1.1' % akamai_url,
+            'play_path': remove_end(slide_video_path, '.flv'),
+            'ext': 'flv',
+            'format_note': 'slide deck video',
+            'quality': -2,
+            'preference': -2,
+            'format_id': 'slides',
+        })
+        speaker_video_path = xpath_text(metadata, './speakerVideo', fatal=True)
+        formats.append({
+            'url': 'rtmp://%s/ondemand?ovpfv=1.1' % akamai_url,
+            'play_path': remove_end(speaker_video_path, '.flv'),
+            'ext': 'flv',
+            'format_note': 'speaker video',
+            'quality': -1,
+            'preference': -1,
+            'format_id': 'speaker',
+        })
         return formats
 
     def _real_extract(self, url):
diff --git a/youtube_dl/extractor/dlf.py b/youtube_dl/extractor/dlf.py
deleted file mode 100644
index cc3de4582..000000000
--- a/youtube_dl/extractor/dlf.py
+++ /dev/null
@@ -1,204 +0,0 @@
-# coding: utf-8
-from __future__ import unicode_literals
-
-import re
-
-from .common import InfoExtractor
-from ..compat import (
-    compat_str,
-)
-from ..utils import (
-    determine_ext,
-    extract_attributes,
-    int_or_none,
-    merge_dicts,
-    traverse_obj,
-    url_or_none,
-    variadic,
-)
-
-
-class DLFBaseIE(InfoExtractor):
-    _VALID_URL_BASE = r'https?://(?:www\.)?deutschlandfunk\.de/'
-    _BUTTON_REGEX = r'(<button[^>]+alt="Anhören"[^>]+data-audio-diraid[^>]*>)'
-
-    def _parse_button_attrs(self, button, audio_id=None):
-        attrs = extract_attributes(button)
-        audio_id = audio_id or attrs['data-audio-diraid']
-
-        url = traverse_obj(
-            attrs, 'data-audio-download-src', 'data-audio', 'data-audioreference',
-            'data-audio-src', expected_type=url_or_none)
-        ext = determine_ext(url)
-        formats = (self._extract_m3u8_formats(url, audio_id, fatal=False)
-                   if ext == 'm3u8' else [{'url': url, 'ext': ext, 'vcodec': 'none'}])
-        self._sort_formats(formats)
-
-        def traverse_attrs(path):
-            path = list(variadic(path))
-            t = path.pop() if callable(path[-1]) else None
-            return traverse_obj(attrs, path, expected_type=t, get_all=False)
-
-        def txt_or_none(v, default=None):
-            return default if v is None else (compat_str(v).strip() or default)
-
-        return merge_dicts(*reversed([{
-            'id': audio_id,
-            # 'extractor_key': DLFIE.ie_key(),
-            # 'extractor': DLFIE.IE_NAME,
-            'formats': formats,
-        }, dict((k, traverse_attrs(v)) for k, v in {
-            'title': (('data-audiotitle', 'data-audio-title', 'data-audio-download-tracking-title'), txt_or_none),
-            'duration': (('data-audioduration', 'data-audio-duration'), int_or_none),
-            'thumbnail': ('data-audioimage', url_or_none),
-            'uploader': 'data-audio-producer',
-            'series': 'data-audio-series',
-            'channel': 'data-audio-origin-site-name',
-            'webpage_url': ('data-audio-download-tracking-path', url_or_none),
-        }.items())]))
-
-
-class DLFIE(DLFBaseIE):
-    IE_NAME = 'dlf'
-    _VALID_URL = DLFBaseIE._VALID_URL_BASE + r'[\w-]+-dlf-(?P<id>[\da-f]{8})-100\.html'
-    _TESTS = [
-        # Audio as an HLS stream
-        {
-            'url': 'https://www.deutschlandfunk.de/tanz-der-saiteninstrumente-das-wild-strings-trio-aus-slowenien-dlf-03a3eb19-100.html',
-            'info_dict': {
-                'id': '03a3eb19',
-                'title': r're:Tanz der Saiteninstrumente [-/] Das Wild Strings Trio aus Slowenien',
-                'ext': 'm4a',
-                'duration': 3298,
-                'thumbnail': 'https://assets.deutschlandfunk.de/FALLBACK-IMAGE-AUDIO/512x512.png?t=1603714364673',
-                'uploader': 'Deutschlandfunk',
-                'series': 'On Stage',
-                'channel': 'deutschlandfunk'
-            },
-            'params': {
-                'skip_download': 'm3u8'
-            },
-            'skip': 'This webpage no longer exists'
-        }, {
-            'url': 'https://www.deutschlandfunk.de/russische-athleten-kehren-zurueck-auf-die-sportbuehne-ein-gefaehrlicher-tueroeffner-dlf-d9cc1856-100.html',
-            'info_dict': {
-                'id': 'd9cc1856',
-                'title': 'Russische Athleten kehren zurück auf die Sportbühne: Ein gefährlicher Türöffner',
-                'ext': 'mp3',
-                'duration': 291,
-                'thumbnail': 'https://assets.deutschlandfunk.de/FALLBACK-IMAGE-AUDIO/512x512.png?t=1603714364673',
-                'uploader': 'Deutschlandfunk',
-                'series': 'Kommentare und Themen der Woche',
-                'channel': 'deutschlandfunk'
-            }
-        },
-    ]
-
-    def _real_extract(self, url):
-        audio_id = self._match_id(url)
-        webpage = self._download_webpage(url, audio_id)
-
-        return self._parse_button_attrs(
-            self._search_regex(self._BUTTON_REGEX, webpage, 'button'), audio_id)
-
-
-class DLFCorpusIE(DLFBaseIE):
-    IE_NAME = 'dlf:corpus'
-    IE_DESC = 'DLF Multi-feed Archives'
-    _VALID_URL = DLFBaseIE._VALID_URL_BASE + r'(?P<id>(?![\w-]+-dlf-[\da-f]{8})[\w-]+-\d+)\.html'
-    _TESTS = [
-        # Recorded news broadcast with referrals to related broadcasts
-        {
-            'url': 'https://www.deutschlandfunk.de/fechten-russland-belarus-ukraine-protest-100.html',
-            'info_dict': {
-                'id': 'fechten-russland-belarus-ukraine-protest-100',
-                'title': r're:Wiederzulassung als neutrale Athleten [-/] Was die Rückkehr russischer und belarussischer Sportler beim Fechten bedeutet',
-                'description': 'md5:91340aab29c71aa7518ad5be13d1e8ad'
-            },
-            'playlist_mincount': 5,
-            'playlist': [{
-                'info_dict': {
-                    'id': '1fc5d64a',
-                    'title': r're:Wiederzulassung als neutrale Athleten [-/] Was die Rückkehr russischer und belarussischer Sportler beim Fechten bedeutet',
-                    'ext': 'mp3',
-                    'duration': 252,
-                    'thumbnail': 'https://assets.deutschlandfunk.de/aad16241-6b76-4a09-958b-96d0ee1d6f57/512x512.jpg?t=1679480020313',
-                    'uploader': 'Deutschlandfunk',
-                    'series': 'Sport',
-                    'channel': 'deutschlandfunk'
-                }
-            }, {
-                'info_dict': {
-                    'id': '2ada145f',
-                    'title': r're:(?:Sportpolitik / )?Fechtverband votiert für Rückkehr russischer Athleten',
-                    'ext': 'mp3',
-                    'duration': 336,
-                    'thumbnail': 'https://assets.deutschlandfunk.de/FILE_93982766f7317df30409b8a184ac044a/512x512.jpg?t=1678547581005',
-                    'uploader': 'Deutschlandfunk',
-                    'series': 'Deutschlandfunk Nova',
-                    'channel': 'deutschlandfunk-nova'
-                }
-            }, {
-                'info_dict': {
-                    'id': '5e55e8c9',
-                    'title': r're:Wiederzulassung von Russland und Belarus [-/] "Herumlavieren" des Fechter-Bundes sorgt für Unverständnis',
-                    'ext': 'mp3',
-                    'duration': 187,
-                    'thumbnail': 'https://assets.deutschlandfunk.de/a595989d-1ed1-4a2e-8370-b64d7f11d757/512x512.jpg?t=1679173825412',
-                    'uploader': 'Deutschlandfunk',
-                    'series': 'Sport am Samstag',
-                    'channel': 'deutschlandfunk'
-                }
-            }, {
-                'info_dict': {
-                    'id': '47e1a096',
-                    'title': r're:Rückkehr Russlands im Fechten [-/] "Fassungslos, dass es einfach so passiert ist"',
-                    'ext': 'mp3',
-                    'duration': 602,
-                    'thumbnail': 'https://assets.deutschlandfunk.de/da4c494a-21cc-48b4-9cc7-40e09fd442c2/512x512.jpg?t=1678562155770',
-                    'uploader': 'Deutschlandfunk',
-                    'series': 'Sport am Samstag',
-                    'channel': 'deutschlandfunk'
-                }
-            }, {
-                'info_dict': {
-                    'id': '5e55e8c9',
-                    'title': r're:Wiederzulassung von Russland und Belarus [-/] "Herumlavieren" des Fechter-Bundes sorgt für Unverständnis',
-                    'ext': 'mp3',
-                    'duration': 187,
-                    'thumbnail': 'https://assets.deutschlandfunk.de/a595989d-1ed1-4a2e-8370-b64d7f11d757/512x512.jpg?t=1679173825412',
-                    'uploader': 'Deutschlandfunk',
-                    'series': 'Sport am Samstag',
-                    'channel': 'deutschlandfunk'
-                }
-            }]
-        },
-        # Podcast feed with tag buttons, playlist count fluctuates
-        {
-            'url': 'https://www.deutschlandfunk.de/kommentare-und-themen-der-woche-100.html',
-            'info_dict': {
-                'id': 'kommentare-und-themen-der-woche-100',
-                'title': 'Meinung - Kommentare und Themen der Woche',
-                'description': 'md5:2901bbd65cd2d45e116d399a099ce5d5',
-            },
-            'playlist_mincount': 10,
-        },
-        # Podcast feed with no description
-        {
-            'url': 'https://www.deutschlandfunk.de/podcast-tolle-idee-100.html',
-            'info_dict': {
-                'id': 'podcast-tolle-idee-100',
-                'title': 'Wissenschaftspodcast - Tolle Idee! - Was wurde daraus?',
-            },
-            'playlist_mincount': 11,
-        },
-    ]
-
-    def _real_extract(self, url):
-        playlist_id = self._match_id(url)
-        webpage = self._download_webpage(url, playlist_id)
-
-        return self.playlist_result(
-            map(self._parse_button_attrs, re.findall(self._BUTTON_REGEX, webpage)),
-            playlist_id, self._html_search_meta(['og:title', 'twitter:title'], webpage, default=None),
-            self._html_search_meta(['description', 'og:description', 'twitter:description'], webpage, default=None))
diff --git a/youtube_dl/extractor/egghead.py b/youtube_dl/extractor/egghead.py
index 9bbd703e0..aff9b88c0 100644
--- a/youtube_dl/extractor/egghead.py
+++ b/youtube_dl/extractor/egghead.py
@@ -22,19 +22,16 @@ class EggheadBaseIE(InfoExtractor):
 class EggheadCourseIE(EggheadBaseIE):
     IE_DESC = 'egghead.io course'
     IE_NAME = 'egghead:course'
-    _VALID_URL = r'https://(?:app\.)?egghead\.io/(?:course|playlist)s/(?P<id>[^/?#&]+)'
-    _TESTS = [{
+    _VALID_URL = r'https://egghead\.io/courses/(?P<id>[^/?#&]+)'
+    _TEST = {
         'url': 'https://egghead.io/courses/professor-frisby-introduces-composable-functional-javascript',
         'playlist_count': 29,
         'info_dict': {
-            'id': '432655',
+            'id': '72',
             'title': 'Professor Frisby Introduces Composable Functional JavaScript',
             'description': 're:(?s)^This course teaches the ubiquitous.*You\'ll start composing functionality before you know it.$',
         },
-    }, {
-        'url': 'https://app.egghead.io/playlists/professor-frisby-introduces-composable-functional-javascript',
-        'only_matching': True,
-    }]
+    }
 
     def _real_extract(self, url):
         playlist_id = self._match_id(url)
@@ -68,7 +65,7 @@ class EggheadCourseIE(EggheadBaseIE):
 class EggheadLessonIE(EggheadBaseIE):
     IE_DESC = 'egghead.io lesson'
     IE_NAME = 'egghead:lesson'
-    _VALID_URL = r'https://(?:app\.)?egghead\.io/(?:api/v1/)?lessons/(?P<id>[^/?#&]+)'
+    _VALID_URL = r'https://egghead\.io/(?:api/v1/)?lessons/(?P<id>[^/?#&]+)'
     _TESTS = [{
         'url': 'https://egghead.io/lessons/javascript-linear-data-flow-with-container-style-types-box',
         'info_dict': {
@@ -91,9 +88,6 @@ class EggheadLessonIE(EggheadBaseIE):
     }, {
         'url': 'https://egghead.io/api/v1/lessons/react-add-redux-to-a-react-application',
         'only_matching': True,
-    }, {
-        'url': 'https://app.egghead.io/lessons/javascript-linear-data-flow-with-container-style-types-box',
-        'only_matching': True,
     }]
 
     def _real_extract(self, url):
diff --git a/youtube_dl/extractor/epidemicsound.py b/youtube_dl/extractor/epidemicsound.py
deleted file mode 100644
index 1a52738aa..000000000
--- a/youtube_dl/extractor/epidemicsound.py
+++ /dev/null
@@ -1,101 +0,0 @@
-# coding: utf-8
-from __future__ import unicode_literals
-
-from .common import InfoExtractor
-from ..utils import (
-    float_or_none,
-    T,
-    traverse_obj,
-    txt_or_none,
-    unified_timestamp,
-    url_or_none,
-)
-
-
-class EpidemicSoundIE(InfoExtractor):
-    _VALID_URL = r'https?://(?:www\.)?epidemicsound\.com/track/(?P<id>[0-9a-zA-Z]+)'
-    _TESTS = [{
-        'url': 'https://www.epidemicsound.com/track/yFfQVRpSPz/',
-        'md5': 'd98ff2ddb49e8acab9716541cbc9dfac',
-        'info_dict': {
-            'id': '45014',
-            'display_id': 'yFfQVRpSPz',
-            'ext': 'mp3',
-            'tags': ['foley', 'door', 'knock', 'glass', 'window', 'glass door knock'],
-            'title': 'Door Knock Door 1',
-            'duration': 1,
-            'thumbnail': 'https://cdn.epidemicsound.com/curation-assets/commercial-release-cover-images/default-sfx/3000x3000.jpg',
-            'timestamp': 1415320353,
-            'upload_date': '20141107',
-            'age_limit': None,
-            # check that the "best" format was found, since test file MD5 doesn't
-            # distinguish the formats
-            'format': 'full',
-        },
-    }, {
-        'url': 'https://www.epidemicsound.com/track/mj8GTTwsZd/',
-        'md5': 'c82b745890f9baf18dc2f8d568ee3830',
-        'info_dict': {
-            'id': '148700',
-            'display_id': 'mj8GTTwsZd',
-            'ext': 'mp3',
-            'tags': ['liquid drum n bass', 'energetic'],
-            'title': 'Noplace',
-            'duration': 237,
-            'thumbnail': 'https://cdn.epidemicsound.com/curation-assets/commercial-release-cover-images/11138/3000x3000.jpg',
-            'timestamp': 1694426482,
-            'release_timestamp': 1700535606,
-            'upload_date': '20230911',
-            'age_limit': None,
-            'format': 'full',
-        },
-    }]
-
-    def _real_extract(self, url):
-        video_id = self._match_id(url)
-        json_data = self._download_json('https://www.epidemicsound.com/json/track/' + video_id, video_id)
-
-        def fmt_or_none(f):
-            if not f.get('format'):
-                f['format'] = f.get('format_id')
-            elif not f.get('format_id'):
-                f['format_id'] = f['format']
-            if not (f['url'] and f['format']):
-                return
-            if f.get('format_note'):
-                f['format_note'] = 'track ID ' + f['format_note']
-            f['preference'] = -1 if f['format'] == 'full' else -2
-            return f
-
-        formats = traverse_obj(json_data, (
-            'stems', T(dict.items), Ellipsis, {
-                'format': (0, T(txt_or_none)),
-                'format_note': (1, 's3TrackId', T(txt_or_none)),
-                'format_id': (1, 'stemType', T(txt_or_none)),
-                'url': (1, 'lqMp3Url', T(url_or_none)),
-            }, T(fmt_or_none)))
-
-        self._sort_formats(formats)
-
-        info = traverse_obj(json_data, {
-            'id': ('id', T(txt_or_none)),
-            'tags': ('metadataTags', Ellipsis, T(txt_or_none)),
-            'title': ('title', T(txt_or_none)),
-            'duration': ('length', T(float_or_none)),
-            'timestamp': ('added', T(unified_timestamp)),
-            'thumbnail': (('imageUrl', 'cover'), T(url_or_none)),
-            'age_limit': ('isExplicit', T(lambda b: 18 if b else None)),
-            'release_timestamp': ('releaseDate', T(unified_timestamp)),
-        }, get_all=False)
-
-        info.update(traverse_obj(json_data, {
-            'categories': ('genres', Ellipsis, 'tag', T(txt_or_none)),
-            'tags': ('metadataTags', Ellipsis, T(txt_or_none)),
-        }))
-
-        info.update({
-            'display_id': video_id,
-            'formats': formats,
-        })
-
-        return info
diff --git a/youtube_dl/extractor/eroprofile.py b/youtube_dl/extractor/eroprofile.py
index c460dc7f9..c08643a17 100644
--- a/youtube_dl/extractor/eroprofile.py
+++ b/youtube_dl/extractor/eroprofile.py
@@ -6,7 +6,7 @@ from .common import InfoExtractor
 from ..compat import compat_urllib_parse_urlencode
 from ..utils import (
     ExtractorError,
-    merge_dicts,
+    unescapeHTML
 )
 
 
@@ -24,8 +24,7 @@ class EroProfileIE(InfoExtractor):
             'title': 'sexy babe softcore',
             'thumbnail': r're:https?://.*\.jpg',
             'age_limit': 18,
-        },
-        'skip': 'Video not found',
+        }
     }, {
         'url': 'http://www.eroprofile.com/m/videos/view/Try-It-On-Pee_cut_2-wmv-4shared-com-file-sharing-download-movie-file',
         'md5': '1baa9602ede46ce904c431f5418d8916',
@@ -78,15 +77,19 @@ class EroProfileIE(InfoExtractor):
             [r"glbUpdViews\s*\('\d*','(\d+)'", r'p/report/video/(\d+)'],
             webpage, 'video id', default=None)
 
+        video_url = unescapeHTML(self._search_regex(
+            r'<source src="([^"]+)', webpage, 'video url'))
         title = self._html_search_regex(
-            (r'Title:</th><td>([^<]+)</td>', r'<h1[^>]*>(.+?)</h1>'),
-            webpage, 'title')
+            r'Title:</th><td>([^<]+)</td>', webpage, 'title')
+        thumbnail = self._search_regex(
+            r'onclick="showVideoPlayer\(\)"><img src="([^"]+)',
+            webpage, 'thumbnail', fatal=False)
 
-        info = self._parse_html5_media_entries(url, webpage, video_id)[0]
-
-        return merge_dicts(info, {
+        return {
             'id': video_id,
             'display_id': display_id,
+            'url': video_url,
             'title': title,
+            'thumbnail': thumbnail,
             'age_limit': 18,
-        })
+        }
diff --git a/youtube_dl/extractor/extractors.py b/youtube_dl/extractor/extractors.py
index 3da5f8020..d5cd364e8 100644
--- a/youtube_dl/extractor/extractors.py
+++ b/youtube_dl/extractor/extractors.py
@@ -51,10 +51,6 @@ from .anvato import AnvatoIE
 from .aol import AolIE
 from .allocine import AllocineIE
 from .aliexpress import AliExpressLiveIE
-from .alsace20tv import (
-    Alsace20TVIE,
-    Alsace20TVEmbedIE,
-)
 from .apa import APAIE
 from .aparat import AparatIE
 from .appleconnect import AppleConnectIE
@@ -75,7 +71,6 @@ from .arte import (
     ArteTVIE,
     ArteTVEmbedIE,
     ArteTVPlaylistIE,
-    ArteTVCategoryIE,
 )
 from .arnes import ArnesIE
 from .asiancrush import (
@@ -119,7 +114,6 @@ from .bfmtv import (
 )
 from .bibeltv import BibelTVIE
 from .bigflix import BigflixIE
-from .bigo import BigoIE
 from .bild import BildIE
 from .bilibili import (
     BiliBiliIE,
@@ -138,7 +132,7 @@ from .bleacherreport import (
     BleacherReportIE,
     BleacherReportCMSIE,
 )
-from .blerp import BlerpIE
+from .blinkx import BlinkxIE
 from .bloomberg import BloombergIE
 from .bokecc import BokeCCIE
 from .bongacams import BongaCamsIE
@@ -159,8 +153,6 @@ from .businessinsider import BusinessInsiderIE
 from .buzzfeed import BuzzFeedIE
 from .byutv import BYUtvIE
 from .c56 import C56IE
-from .caffeine import CaffeineTVIE
-from .callin import CallinIE
 from .camdemy import (
     CamdemyIE,
     CamdemyFolderIE
@@ -199,11 +191,7 @@ from .cbsnews import (
     CBSNewsIE,
     CBSNewsLiveVideoIE,
 )
-from .cbssports import (
-    CBSSportsEmbedIE,
-    CBSSportsIE,
-    TwentyFourSevenSportsIE,
-)
+from .cbssports import CBSSportsIE
 from .ccc import (
     CCCIE,
     CCCPlaylistIE,
@@ -211,7 +199,10 @@ from .ccc import (
 from .ccma import CCMAIE
 from .cctv import CCTVIE
 from .cda import CDAIE
-from .ceskatelevize import CeskaTelevizeIE
+from .ceskatelevize import (
+    CeskaTelevizeIE,
+    CeskaTelevizePoradyIE,
+)
 from .channel9 import Channel9IE
 from .charlierose import CharlieRoseIE
 from .chaturbate import ChaturbateIE
@@ -227,7 +218,6 @@ from .ciscolive import (
     CiscoLiveSearchIE,
 )
 from .cjsw import CJSWIE
-from .clipchamp import ClipchampIE
 from .cliphunter import CliphunterIE
 from .clippit import ClippitIE
 from .cliprs import ClipRsIE
@@ -260,10 +250,6 @@ from .commonprotocols import (
 from .condenast import CondeNastIE
 from .contv import CONtvIE
 from .corus import CorusIE
-from .cpac import (
-    CPACIE,
-    CPACPlaylistIE,
-)
 from .cracked import CrackedIE
 from .crackle import CrackleIE
 from .crooksandliars import CrooksAndLiarsIE
@@ -297,10 +283,6 @@ from .dbtv import DBTVIE
 from .dctp import DctpTvIE
 from .deezer import DeezerPlaylistIE
 from .democracynow import DemocracynowIE
-from .dlf import (
-    DLFCorpusIE,
-    DLFIE,
-)
 from .dfb import DFBIE
 from .dhm import DHMIE
 from .digg import DiggIE
@@ -358,7 +340,6 @@ from .ellentube import (
 from .elpais import ElPaisIE
 from .embedly import EmbedlyIE
 from .engadget import EngadgetIE
-from .epidemicsound import EpidemicSoundIE
 from .eporner import EpornerIE
 from .eroprofile import EroProfileIE
 from .escapist import EscapistIE
@@ -383,7 +364,6 @@ from .fc2 import (
     FC2EmbedIE,
 )
 from .fczenit import FczenitIE
-from .fifa import FifaIE
 from .filmon import (
     FilmOnIE,
     FilmOnChannelIE,
@@ -443,7 +423,6 @@ from .gamespot import GameSpotIE
 from .gamestar import GameStarIE
 from .gaskrank import GaskrankIE
 from .gazeta import GazetaIE
-from .gbnews import GBNewsIE
 from .gdcvault import GDCVaultIE
 from .gedidigital import GediDigitalIE
 from .generic import GenericIE
@@ -451,13 +430,6 @@ from .gfycat import GfycatIE
 from .giantbomb import GiantBombIE
 from .giga import GigaIE
 from .glide import GlideIE
-from .globalplayer import (
-    GlobalPlayerLiveIE,
-    GlobalPlayerLivePlaylistIE,
-    GlobalPlayerAudioIE,
-    GlobalPlayerAudioEpisodeIE,
-    GlobalPlayerVideoIE
-)
 from .globo import (
     GloboIE,
     GloboArticleIE,
@@ -494,7 +466,6 @@ from .hotstar import (
 )
 from .howcast import HowcastIE
 from .howstuffworks import HowStuffWorksIE
-from .hrfernsehen import HRFernsehenIE
 from .hrti import (
     HRTiIE,
     HRTiPlaylistIE,
@@ -571,10 +542,8 @@ from .khanacademy import (
 from .kickstarter import KickStarterIE
 from .kinja import KinjaEmbedIE
 from .kinopoisk import KinoPoiskIE
-from .kommunetv import KommunetvIE
 from .konserthusetplay import KonserthusetPlayIE
 from .krasview import KrasViewIE
-from .kth import KTHIE
 from .ku6 import Ku6IE
 from .kusi import KUSIIE
 from .kuwo import (
@@ -638,6 +607,10 @@ from .linkedin import (
 from .linuxacademy import LinuxAcademyIE
 from .litv import LiTVIE
 from .livejournal import LiveJournalIE
+from .liveleak import (
+    LiveLeakIE,
+    LiveLeakEmbedIE,
+)
 from .livestream import (
     LivestreamIE,
     LivestreamOriginalIE,
@@ -663,7 +636,6 @@ from .mangomolo import (
     MangomoloLiveIE,
 )
 from .manyvids import ManyVidsIE
-from .maoritv import MaoriTVIE
 from .markiza import (
     MarkizaIE,
     MarkizaPageIE,
@@ -744,7 +716,6 @@ from .myvi import (
     MyviIE,
     MyviEmbedIE,
 )
-from .myvideoge import MyVideoGeIE
 from .myvidster import MyVidsterIE
 from .nationalgeographic import (
     NationalGeographicVideoIE,
@@ -818,14 +789,7 @@ from .nick import (
     NickNightIE,
     NickRuIE,
 )
-from .niconico import (
-    NiconicoIE,
-    NiconicoPlaylistIE,
-    NiconicoUserIE,
-    NicovideoSearchIE,
-    NicovideoSearchDateIE,
-    NicovideoSearchURLIE,
-)
+from .niconico import NiconicoIE, NiconicoPlaylistIE
 from .ninecninemedia import NineCNineMediaIE
 from .ninegag import NineGagIE
 from .ninenow import NineNowIE
@@ -898,13 +862,21 @@ from .ooyala import (
 )
 from .ora import OraTVIE
 from .orf import (
-    ORFONIE,
-    ORFONLiveIE,
+    ORFTVthekIE,
+    ORFFM4IE,
     ORFFM4StoryIE,
+    ORFOE1IE,
+    ORFOE3IE,
+    ORFNOEIE,
+    ORFWIEIE,
+    ORFBGLIE,
+    ORFOOEIE,
+    ORFSTMIE,
+    ORFKTNIE,
+    ORFSBGIE,
+    ORFTIRIE,
+    ORFVBGIE,
     ORFIPTVIE,
-    ORFPodcastIE,
-    ORFRadioIE,
-    ORFRadioCollectionIE,
 )
 from .outsidetv import OutsideTVIE
 from .packtpub import (
@@ -921,10 +893,6 @@ from .parliamentliveuk import ParliamentLiveUKIE
 from .patreon import PatreonIE
 from .pbs import PBSIE
 from .pearvideo import PearVideoIE
-from .peekvids import (
-    PeekVidsIE,
-    PlayVidsIE,
-)
 from .peertube import PeerTubeIE
 from .people import PeopleIE
 from .performgroup import PerformGroupIE
@@ -953,7 +921,6 @@ from .platzi import (
 from .playfm import PlayFMIE
 from .playplustv import PlayPlusTVIE
 from .plays import PlaysTVIE
-from .playstuff import PlayStuffIE
 from .playtvak import PlaytvakIE
 from .playvid import PlayvidIE
 from .playwire import PlaywireIE
@@ -981,10 +948,6 @@ from .pornhub import (
 from .pornotube import PornotubeIE
 from .pornovoisines import PornoVoisinesIE
 from .pornoxo import PornoXOIE
-from .pr0gramm import (
-    Pr0grammIE,
-    Pr0grammStaticIE,
-)
 from .puhutv import (
     PuhuTVIE,
     PuhuTVSerieIE,
@@ -1022,10 +985,6 @@ from .raywenderlich import (
     RayWenderlichIE,
     RayWenderlichCourseIE,
 )
-from .rbgtum import (
-    RbgTumIE,
-    RbgTumCourseIE,
-)
 from .rbmaradio import RBMARadioIE
 from .rds import RDSIE
 from .redbulltv import (
@@ -1081,10 +1040,6 @@ from .rutube import (
 from .rutv import RUTVIE
 from .ruutu import RuutuIE
 from .ruv import RuvIE
-from .s4c import (
-    S4CIE,
-    S4CSeriesIE,
-)
 from .safari import (
     SafariIE,
     SafariApiIE,
@@ -1220,7 +1175,6 @@ from .storyfire import (
 from .streamable import StreamableIE
 from .streamcloud import StreamcloudIE
 from .streamcz import StreamCZIE
-from .streamsb import StreamsbIE
 from .streetvoice import StreetVoiceIE
 from .stretchinternet import StretchInternetIE
 from .stv import STVPlayerIE
@@ -1290,11 +1244,6 @@ from .theweatherchannel import TheWeatherChannelIE
 from .thisamericanlife import ThisAmericanLifeIE
 from .thisav import ThisAVIE
 from .thisoldhouse import ThisOldHouseIE
-from .thisvid import (
-    ThisVidIE,
-    ThisVidMemberIE,
-    ThisVidPlaylistIE,
-)
 from .threeqsdn import ThreeQSDNIE
 from .tiktok import (
     TikTokIE,
@@ -1579,7 +1528,6 @@ from .weibo import (
     WeiboMobileIE
 )
 from .weiqitv import WeiqiTVIE
-from .whyp import WhypIE
 from .wistia import (
     WistiaIE,
     WistiaPlaylistIE,
@@ -1645,15 +1593,7 @@ from .younow import (
     YouNowChannelIE,
     YouNowMomentIE,
 )
-from .youporn import (
-    YouPornIE,
-    YouPornCategoryIE,
-    YouPornChannelIE,
-    YouPornCollectionIE,
-    YouPornStarIE,
-    YouPornTagIE,
-    YouPornVideosIE,
-)
+from .youporn import YouPornIE
 from .yourporn import YourPornIE
 from .yourupload import YourUploadIE
 from .youtube import (
@@ -1665,7 +1605,7 @@ from .youtube import (
     YoutubeRecommendedIE,
     YoutubeSearchDateIE,
     YoutubeSearchIE,
-    YoutubeSearchURLIE,
+    #YoutubeSearchURLIE,
     YoutubeSubscriptionsIE,
     YoutubeTruncatedIDIE,
     YoutubeTruncatedURLIE,
diff --git a/youtube_dl/extractor/facebook.py b/youtube_dl/extractor/facebook.py
index 04650af39..cb34c59f5 100644
--- a/youtube_dl/extractor/facebook.py
+++ b/youtube_dl/extractor/facebook.py
@@ -521,10 +521,7 @@ class FacebookIE(InfoExtractor):
                 raise ExtractorError(
                     'The video is not available, Facebook said: "%s"' % m_msg.group(1),
                     expected=True)
-            elif any(p in webpage for p in (
-                    '>You must log in to continue',
-                    'id="login_form"',
-                    'id="loginbutton"')):
+            elif '>You must log in to continue' in webpage:
                 self.raise_login_required()
 
         if not video_data and '/watchparty/' in url:
diff --git a/youtube_dl/extractor/fifa.py b/youtube_dl/extractor/fifa.py
deleted file mode 100644
index 15157774e..000000000
--- a/youtube_dl/extractor/fifa.py
+++ /dev/null
@@ -1,101 +0,0 @@
-# coding: utf-8
-from __future__ import unicode_literals
-
-from .common import InfoExtractor
-
-from ..utils import (
-    int_or_none,
-    traverse_obj,
-    unified_timestamp,
-)
-
-if not callable(getattr(InfoExtractor, '_match_valid_url', None)):
-
-    BaseInfoExtractor = InfoExtractor
-
-    import re
-
-    class InfoExtractor(BaseInfoExtractor):
-
-        @classmethod
-        def _match_valid_url(cls, url):
-            return re.match(cls._VALID_URL, url)
-
-
-class FifaIE(InfoExtractor):
-    _VALID_URL = r'https?://www.fifa.com/fifaplus/(?P<locale>\w{2})/watch/([^#?]+/)?(?P<id>\w+)'
-    _TESTS = [{
-        'url': 'https://www.fifa.com/fifaplus/en/watch/7on10qPcnyLajDDU3ntg6y',
-        'info_dict': {
-            'id': '7on10qPcnyLajDDU3ntg6y',
-            'title': 'Italy v France | Final | 2006 FIFA World Cup Germany™ | Full Match Replay',
-            'description': 'md5:f4520d0ee80529c8ba4134a7d692ff8b',
-            'ext': 'mp4',
-            'categories': ['FIFA Tournaments'],
-            'thumbnail': 'https://digitalhub.fifa.com/transform/135e2656-3a51-407b-8810-6c34bec5b59b/FMR_2006_Italy_France_Final_Hero',
-            'duration': 8165,
-        },
-        'params': {'skip_download': 'm3u8'},
-    }, {
-        'url': 'https://www.fifa.com/fifaplus/pt/watch/1cg5r5Qt6Qt12ilkDgb1sV',
-        'info_dict': {
-            'id': '1cg5r5Qt6Qt12ilkDgb1sV',
-            'title': 'Brazil v Germany | Semi-finals | 2014 FIFA World Cup Brazil™ | Extended Highlights',
-            'description': 'md5:d908c74ee66322b804ae2e521b02a855',
-            'ext': 'mp4',
-            'categories': ['FIFA Tournaments', 'Highlights'],
-            'thumbnail': 'https://digitalhub.fifa.com/transform/d8fe6f61-276d-4a73-a7fe-6878a35fd082/FIFAPLS_100EXTHL_2014BRAvGER_TMB',
-            'duration': 902,
-            'release_timestamp': 1404777600,
-            'release_date': '20140708',
-        },
-        'params': {'skip_download': 'm3u8'},
-    }, {
-        'url': 'https://www.fifa.com/fifaplus/fr/watch/3C6gQH9C2DLwzNx7BMRQdp',
-        'info_dict': {
-            'id': '3C6gQH9C2DLwzNx7BMRQdp',
-            'title': 'Josimar goal against Northern Ireland | Classic Goals',
-            'description': 'md5:cbe7e7bb52f603c9f1fe9a4780fe983b',
-            'ext': 'mp4',
-            'categories': ['FIFA Tournaments', 'Goal'],
-            'duration': 28,
-            'thumbnail': 'https://digitalhub.fifa.com/transform/f9301391-f8d9-48b5-823e-c093ac5e3e11/CG_MEN_1986_JOSIMAR',
-        },
-        'params': {'skip_download': 'm3u8'},
-    }]
-
-    def _real_extract(self, url):
-        video_id, locale = self._match_valid_url(url).group('id', 'locale')
-        webpage = self._download_webpage(url, video_id)
-
-        preconnect_link = self._search_regex(
-            r'<link\b[^>]+\brel\s*=\s*"preconnect"[^>]+href\s*=\s*"([^"]+)"', webpage, 'Preconnect Link')
-
-        video_details = self._download_json(
-            '{preconnect_link}/sections/videoDetails/{video_id}'.format(**locals()), video_id, 'Downloading Video Details', fatal=False)
-
-        preplay_parameters = self._download_json(
-            '{preconnect_link}/videoPlayerData/{video_id}'.format(**locals()), video_id, 'Downloading Preplay Parameters')['preplayParameters']
-
-        content_data = self._download_json(
-            # 1. query string is expected to be sent as-is
-            # 2. `sig` must be appended
-            # 3. if absent, the call appears to work but the manifest is bad (404)
-            'https://content.uplynk.com/preplay/{contentId}/multiple.json?{queryStr}&sig={signature}'.format(**preplay_parameters),
-            video_id, 'Downloading Content Data')
-
-        # formats, subtitles = self._extract_m3u8_formats_and_subtitles(content_data['playURL'], video_id)
-        formats, subtitles = self._extract_m3u8_formats(content_data['playURL'], video_id, ext='mp4', entry_protocol='m3u8_native'), None
-        self._sort_formats(formats)
-
-        return {
-            'id': video_id,
-            'title': video_details['title'],
-            'description': video_details.get('description'),
-            'duration': int_or_none(video_details.get('duration')),
-            'release_timestamp': unified_timestamp(video_details.get('dateOfRelease')),
-            'categories': traverse_obj(video_details, (('videoCategory', 'videoSubcategory'),)),
-            'thumbnail': traverse_obj(video_details, ('backgroundImage', 'src')),
-            'formats': formats,
-            'subtitles': subtitles,
-        }
diff --git a/youtube_dl/extractor/formula1.py b/youtube_dl/extractor/formula1.py
index 67662e6de..fecfc28ae 100644
--- a/youtube_dl/extractor/formula1.py
+++ b/youtube_dl/extractor/formula1.py
@@ -5,23 +5,29 @@ from .common import InfoExtractor
 
 
 class Formula1IE(InfoExtractor):
-    _VALID_URL = r'https?://(?:www\.)?formula1\.com/en/latest/video\.[^.]+\.(?P<id>\d+)\.html'
-    _TEST = {
-        'url': 'https://www.formula1.com/en/latest/video.race-highlights-spain-2016.6060988138001.html',
-        'md5': 'be7d3a8c2f804eb2ab2aa5d941c359f8',
+    _VALID_URL = r'https?://(?:www\.)?formula1\.com/(?:content/fom-website/)?en/video/\d{4}/\d{1,2}/(?P<id>.+?)\.html'
+    _TESTS = [{
+        'url': 'http://www.formula1.com/content/fom-website/en/video/2016/5/Race_highlights_-_Spain_2016.html',
+        'md5': '8c79e54be72078b26b89e0e111c0502b',
         'info_dict': {
-            'id': '6060988138001',
+            'id': 'JvYXJpMzE6pArfHWm5ARp5AiUmD-gibV',
             'ext': 'mp4',
             'title': 'Race highlights - Spain 2016',
-            'timestamp': 1463332814,
-            'upload_date': '20160515',
-            'uploader_id': '6057949432001',
         },
-        'add_ie': ['BrightcoveNew'],
-    }
-    BRIGHTCOVE_URL_TEMPLATE = 'http://players.brightcove.net/6057949432001/S1WMrhjlh_default/index.html?videoId=%s'
+        'params': {
+            # m3u8 download
+            'skip_download': True,
+        },
+        'add_ie': ['Ooyala'],
+    }, {
+        'url': 'http://www.formula1.com/en/video/2016/5/Race_highlights_-_Spain_2016.html',
+        'only_matching': True,
+    }]
 
     def _real_extract(self, url):
-        bc_id = self._match_id(url)
+        display_id = self._match_id(url)
+        webpage = self._download_webpage(url, display_id)
+        ooyala_embed_code = self._search_regex(
+            r'data-videoid="([^"]+)"', webpage, 'ooyala embed code')
         return self.url_result(
-            self.BRIGHTCOVE_URL_TEMPLATE % bc_id, 'BrightcoveNew', bc_id)
+            'ooyala:%s' % ooyala_embed_code, 'Ooyala', ooyala_embed_code)
diff --git a/youtube_dl/extractor/francetv.py b/youtube_dl/extractor/francetv.py
index e4ec2e200..7cc88bf18 100644
--- a/youtube_dl/extractor/francetv.py
+++ b/youtube_dl/extractor/francetv.py
@@ -383,10 +383,6 @@ class FranceTVInfoIE(FranceTVBaseInfoExtractor):
     }, {
         'url': 'http://france3-regions.francetvinfo.fr/limousin/emissions/jt-1213-limousin',
         'only_matching': True,
-    }, {
-        # "<figure id=" pattern (#28792)
-        'url': 'https://www.francetvinfo.fr/culture/patrimoine/incendie-de-notre-dame-de-paris/notre-dame-de-paris-de-l-incendie-de-la-cathedrale-a-sa-reconstruction_4372291.html',
-        'only_matching': True,
     }]
 
     def _real_extract(self, url):
@@ -404,7 +400,7 @@ class FranceTVInfoIE(FranceTVBaseInfoExtractor):
             (r'player\.load[^;]+src:\s*["\']([^"\']+)',
              r'id-video=([^@]+@[^"]+)',
              r'<a[^>]+href="(?:https?:)?//videos\.francetv\.fr/video/([^@]+@[^"]+)"',
-             r'(?:data-id|<figure[^<]+\bid)=["\']([\da-f]{8}-[\da-f]{4}-[\da-f]{4}-[\da-f]{4}-[\da-f]{12})'),
+             r'data-id=["\']([\da-f]{8}-[\da-f]{4}-[\da-f]{4}-[\da-f]{4}-[\da-f]{12})'),
             webpage, 'video id')
 
         return self._make_url_result(video_id)
diff --git a/youtube_dl/extractor/funimation.py b/youtube_dl/extractor/funimation.py
index d8f1e169a..8bbedca26 100644
--- a/youtube_dl/extractor/funimation.py
+++ b/youtube_dl/extractor/funimation.py
@@ -16,7 +16,7 @@ from ..utils import (
 
 
 class FunimationIE(InfoExtractor):
-    _VALID_URL = r'https?://(?:www\.)?funimation(?:\.com|now\.uk)/(?:[^/]+/)?shows/[^/]+/(?P<id>[^/?#&]+)'
+    _VALID_URL = r'https?://(?:www\.)?funimation(?:\.com|now\.uk)/shows/[^/]+/(?P<id>[^/?#&]+)'
 
     _NETRC_MACHINE = 'funimation'
     _TOKEN = None
@@ -51,10 +51,6 @@ class FunimationIE(InfoExtractor):
     }, {
         'url': 'https://www.funimationnow.uk/shows/puzzle-dragons-x/drop-impact/simulcast/',
         'only_matching': True,
-    }, {
-        # with lang code
-        'url': 'https://www.funimation.com/en/shows/hacksign/role-play/',
-        'only_matching': True,
     }]
 
     def _login(self):
diff --git a/youtube_dl/extractor/gbnews.py b/youtube_dl/extractor/gbnews.py
deleted file mode 100644
index f04f30e5a..000000000
--- a/youtube_dl/extractor/gbnews.py
+++ /dev/null
@@ -1,139 +0,0 @@
-# coding: utf-8
-from __future__ import unicode_literals
-
-from .common import InfoExtractor
-from ..utils import (
-    extract_attributes,
-    ExtractorError,
-    T,
-    traverse_obj,
-    txt_or_none,
-    url_or_none,
-)
-
-
-class GBNewsIE(InfoExtractor):
-    IE_DESC = 'GB News clips, features and live stream'
-
-    # \w+ is normally shows or news, but apparently any word redirects to the correct URL
-    _VALID_URL = r'https?://(?:www\.)?gbnews\.(?:uk|com)/(?:\w+/)?(?P<id>[^#?]+)'
-
-    _PLATFORM = 'safari'
-    _SSMP_URL = 'https://mm-v2.simplestream.com/ssmp/api.php'
-    _TESTS = [{
-        'url': 'https://www.gbnews.uk/shows/andrew-neils-message-to-companies-choosing-to-boycott-gb-news/106889',
-        'info_dict': {
-            'id': '106889',
-            'ext': 'mp4',
-            'title': "Andrew Neil's message to companies choosing to boycott GB News",
-            'description': 'md5:b281f5d22fd6d5eda64a4e3ba771b351',
-        },
-        'skip': '404 not found',
-    }, {
-        'url': 'https://www.gbnews.com/news/bbc-claudine-gay-harvard-university-antisemitism-row',
-        'info_dict': {
-            'id': '52264136',
-            'display_id': 'bbc-claudine-gay-harvard-university-antisemitism-row',
-            'ext': 'mp4',
-            'title': 'BBC deletes post after furious backlash over headline downplaying antisemitism',
-            'description': 'The post was criticised by former employers of the broadcaster',
-        },
-    }, {
-        'url': 'https://www.gbnews.uk/watchlive',
-        'info_dict': {
-            'id': '1069',
-            'display_id': 'watchlive',
-            'ext': 'mp4',
-            'title': 'GB News Live',
-            'is_live': True,
-        },
-        'params': {
-            'skip_download': 'm3u8',
-        },
-    }]
-
-    def _real_extract(self, url):
-        display_id = self._match_id(url).split('/')[-1]
-
-        webpage = self._download_webpage(url, display_id)
-        # extraction based on https://github.com/ytdl-org/youtube-dl/issues/29341
-        '''
-        <div id="video-106908"
-            class="simplestream"
-            data-id="GB001"
-            data-type="vod"
-            data-key="3Li3Nt2Qs8Ct3Xq9Fi5Uy0Mb2Bj0Qs"
-            data-token="f9c317c727dc07f515b20036c8ef14a6"
-            data-expiry="1624300052"
-            data-uvid="37900558"
-            data-poster="https://thumbnails.simplestreamcdn.com/gbnews/ondemand/37900558.jpg?width=700&"
-            data-npaw="false"
-            data-env="production">
-        '''
-        # exception if no match
-        video_data = self._search_regex(
-            r'(<div\s[^>]*\bclass\s*=\s*(\'|")(?!.*sidebar\b)simplestream(?:\s[\s\w$-]*)?\2[^>]*>)',
-            webpage, 'video data')
-
-        video_data = extract_attributes(video_data)
-        ss_id = video_data.get('data-id')
-        if not ss_id:
-            raise ExtractorError('Simplestream ID not found')
-
-        json_data = self._download_json(
-            self._SSMP_URL, display_id,
-            note='Downloading Simplestream JSON metadata',
-            errnote='Unable to download Simplestream JSON metadata',
-            query={
-                'id': ss_id,
-                'env': video_data.get('data-env', 'production'),
-            }, fatal=False)
-
-        meta_url = traverse_obj(json_data, ('response', 'api_hostname'))
-        if not meta_url:
-            raise ExtractorError('No API host found')
-
-        uvid = video_data['data-uvid']
-        dtype = video_data.get('data-type')
-        stream_data = self._download_json(
-            '%s/api/%s/stream/%s' % (meta_url, 'show' if dtype == 'vod' else dtype, uvid),
-            uvid,
-            query={
-                'key': video_data.get('data-key'),
-                'platform': self._PLATFORM,
-            },
-            headers={
-                'Token': video_data.get('data-token'),
-                'Token-Expiry': video_data.get('data-expiry'),
-                'Uvid': uvid,
-            }, fatal=False)
-
-        stream_url = traverse_obj(stream_data, (
-            'response', 'stream', T(url_or_none)))
-        if not stream_url:
-            raise ExtractorError('No stream data/URL')
-
-        # now known to be a dict
-        stream_data = stream_data['response']
-        drm = stream_data.get('drm')
-        if drm:
-            self.report_drm(uvid)
-
-        formats = self._extract_m3u8_formats(
-            stream_url, uvid, ext='mp4', entry_protocol='m3u8_native',
-            fatal=False)
-        # exception if no formats
-        self._sort_formats(formats)
-
-        return {
-            'id': uvid,
-            'display_id': display_id,
-            'title': (traverse_obj(stream_data, ('title', T(txt_or_none)))
-                      or self._og_search_title(webpage, default=None)
-                      or display_id.replace('-', ' ').capitalize()),
-            'description': self._og_search_description(webpage, default=None),
-            'thumbnail': (traverse_obj(video_data, ('data-poster', T(url_or_none)))
-                          or self._og_search_thumbnail(webpage)),
-            'formats': formats,
-            'is_live': (dtype == 'live') or None,
-        }
diff --git a/youtube_dl/extractor/gdcvault.py b/youtube_dl/extractor/gdcvault.py
index acc6478b8..2f555c1d4 100644
--- a/youtube_dl/extractor/gdcvault.py
+++ b/youtube_dl/extractor/gdcvault.py
@@ -6,7 +6,6 @@ from .common import InfoExtractor
 from .kaltura import KalturaIE
 from ..utils import (
     HEADRequest,
-    remove_start,
     sanitized_Request,
     smuggle_url,
     urlencode_postdata,
@@ -103,26 +102,6 @@ class GDCVaultIE(InfoExtractor):
                 'format': 'mp4-408',
             },
         },
-        {
-            # Kaltura embed, whitespace between quote and embedded URL in iframe's src
-            'url': 'https://www.gdcvault.com/play/1025699',
-            'info_dict': {
-                'id': '0_zagynv0a',
-                'ext': 'mp4',
-                'title': 'Tech Toolbox',
-                'upload_date': '20190408',
-                'uploader_id': 'joe@blazestreaming.com',
-                'timestamp': 1554764629,
-            },
-            'params': {
-                'skip_download': True,
-            },
-        },
-        {
-            # HTML5 video
-            'url': 'http://www.gdcvault.com/play/1014846/Conference-Keynote-Shigeru',
-            'only_matching': True,
-        },
     ]
 
     def _login(self, webpage_url, display_id):
@@ -196,18 +175,7 @@ class GDCVaultIE(InfoExtractor):
 
             xml_name = self._html_search_regex(
                 r'<iframe src=".*?\?xml(?:=|URL=xml/)(.+?\.xml).*?".*?</iframe>',
-                start_page, 'xml filename', default=None)
-            if not xml_name:
-                info = self._parse_html5_media_entries(url, start_page, video_id)[0]
-                info.update({
-                    'title': remove_start(self._search_regex(
-                        r'>Session Name:\s*<.*?>\s*<td>(.+?)</td>', start_page,
-                        'title', default=None) or self._og_search_title(
-                        start_page, default=None), 'GDC Vault - '),
-                    'id': video_id,
-                    'display_id': display_id,
-                })
-                return info
+                start_page, 'xml filename')
             embed_url = '%s/xml/%s' % (xml_root, xml_name)
             ie_key = 'DigitallySpeaking'
 
diff --git a/youtube_dl/extractor/generic.py b/youtube_dl/extractor/generic.py
index b01900afa..f99d887ca 100644
--- a/youtube_dl/extractor/generic.py
+++ b/youtube_dl/extractor/generic.py
@@ -28,7 +28,6 @@ from ..utils import (
     mimetype2ext,
     orderedSet,
     parse_duration,
-    parse_resolution,
     sanitized_Request,
     smuggle_url,
     unescapeHTML,
@@ -36,7 +35,6 @@ from ..utils import (
     unsmuggle_url,
     UnsupportedError,
     url_or_none,
-    urljoin,
     xpath_attr,
     xpath_text,
     xpath_with_ns,
@@ -86,6 +84,7 @@ from .jwplatform import JWPlatformIE
 from .digiteka import DigitekaIE
 from .arkena import ArkenaIE
 from .instagram import InstagramIE
+from .liveleak import LiveLeakIE
 from .threeqsdn import ThreeQSDNIE
 from .theplatform import ThePlatformIE
 from .kaltura import KalturaIE
@@ -127,7 +126,6 @@ from .viqeo import ViqeoIE
 from .expressen import ExpressenIE
 from .zype import ZypeIE
 from .odnoklassniki import OdnoklassnikiIE
-from .vk import VKIE
 from .kinja import KinjaEmbedIE
 from .arcpublishing import ArcPublishingIE
 from .medialaan import MedialaanIE
@@ -1630,6 +1628,31 @@ class GenericIE(InfoExtractor):
                 'upload_date': '20160409',
             },
         },
+        # LiveLeak embed
+        {
+            'url': 'http://www.wykop.pl/link/3088787/',
+            'md5': '7619da8c820e835bef21a1efa2a0fc71',
+            'info_dict': {
+                'id': '874_1459135191',
+                'ext': 'mp4',
+                'title': 'Man shows poor quality of new apartment building',
+                'description': 'The wall is like a sand pile.',
+                'uploader': 'Lake8737',
+            },
+            'add_ie': [LiveLeakIE.ie_key()],
+        },
+        # Another LiveLeak embed pattern (#13336)
+        {
+            'url': 'https://milo.yiannopoulos.net/2017/06/concealed-carry-robbery/',
+            'info_dict': {
+                'id': '2eb_1496309988',
+                'ext': 'mp4',
+                'title': 'Thief robs place where everyone was armed',
+                'description': 'md5:694d73ee79e535953cf2488562288eee',
+                'uploader': 'brazilwtf',
+            },
+            'add_ie': [LiveLeakIE.ie_key()],
+        },
         # Duplicated embedded video URLs
         {
             'url': 'http://www.hudl.com/athlete/2538180/highlights/149298443',
@@ -2225,121 +2248,6 @@ class GenericIE(InfoExtractor):
             },
             'playlist_mincount': 52,
         },
-        {
-            # Sibnet embed (https://help.sibnet.ru/?sibnet_video_embed)
-            'url': 'https://phpbb3.x-tk.ru/bbcode-video-sibnet-t24.html',
-            'only_matching': True,
-        }, {
-            # KVS Player
-            'url': 'https://www.kvs-demo.com/videos/105/kelis-4th-of-july/',
-            'info_dict': {
-                'id': '105',
-                'display_id': 'kelis-4th-of-july',
-                'ext': 'mp4',
-                'title': 'Kelis - 4th Of July',
-                'thumbnail': r're:https://(?:www\.)?kvs-demo.com/contents/videos_screenshots/0/105/preview.jpg',
-            },
-        }, {
-            # KVS Player
-            'url': 'https://www.kvs-demo.com/embed/105/',
-            'info_dict': {
-                'id': '105',
-                'display_id': 'kelis-4th-of-july',
-                'ext': 'mp4',
-                'title': 'Kelis - 4th Of July / Embed Player',
-                'thumbnail': r're:https://(?:www\.)?kvs-demo.com/contents/videos_screenshots/0/105/preview.jpg',
-            },
-            'params': {
-                'skip_download': True,
-            },
-        }, {
-            # KVS Player (tested also in thisvid.py)
-            'url': 'https://youix.com/video/leningrad-zoj/',
-            'md5': '94f96ba95706dc3880812b27b7d8a2b8',
-            'info_dict': {
-                'id': '18485',
-                'display_id': 'leningrad-zoj',
-                'ext': 'mp4',
-                'title': 'Клип: Ленинград - ЗОЖ скачать, смотреть онлайн | Youix.com',
-                'thumbnail': r're:https://youix.com/contents/videos_screenshots/18000/18485/preview(?:_480x320_youix_com.mp4)?\.jpg',
-            },
-        }, {
-            # KVS Player
-            'url': 'https://youix.com/embed/18485',
-            'md5': '94f96ba95706dc3880812b27b7d8a2b8',
-            'info_dict': {
-                'id': '18485',
-                'display_id': 'leningrad-zoj',
-                'ext': 'mp4',
-                'title': 'Ленинград - ЗОЖ',
-                'thumbnail': r're:https://youix.com/contents/videos_screenshots/18000/18485/preview(?:_480x320_youix_com.mp4)?\.jpg',
-            },
-        }, {
-            # KVS Player
-            'url': 'https://bogmedia.org/videos/21217/40-nochey-40-nights-2016/',
-            'md5': '94166bdb26b4cb1fb9214319a629fc51',
-            'info_dict': {
-                'id': '21217',
-                'display_id': '40-nochey-2016',
-                'ext': 'mp4',
-                'title': '40 ночей (2016) - BogMedia.org',
-                'description': 'md5:4e6d7d622636eb7948275432eb256dc3',
-                'thumbnail': 'https://bogmedia.org/contents/videos_screenshots/21000/21217/preview_480p.mp4.jpg',
-            },
-        }, {
-            # KVS Player (for sites that serve kt_player.js via non-https urls)
-            'url': 'http://www.camhub.world/embed/389508',
-            'md5': 'fbe89af4cfb59c8fd9f34a202bb03e32',
-            'info_dict': {
-                'id': '389508',
-                'display_id': 'syren-de-mer-onlyfans-05-07-2020have-a-happy-safe-holiday5f014e68a220979bdb8cd-source',
-                'ext': 'mp4',
-                'title': 'Syren De Mer  onlyfans_05-07-2020Have_a_happy_safe_holiday5f014e68a220979bdb8cd_source / Embed плеер',
-                'thumbnail': r're:https?://www\.camhub\.world/contents/videos_screenshots/389000/389508/preview\.mp4\.jpg',
-            },
-        }, {
-            'url': 'https://mrdeepfakes.com/video/5/selena-gomez-pov-deep-fakes',
-            'md5': 'fec4ad5ec150f655e0c74c696a4a2ff4',
-            'info_dict': {
-                'id': '5',
-                'display_id': 'selena-gomez-pov-deep-fakes',
-                'ext': 'mp4',
-                'title': 'Selena Gomez POV (Deep Fakes) DeepFake Porn - MrDeepFakes',
-                'description': 'md5:17d1f84b578c9c26875ac5ef9a932354',
-                'height': 720,
-                'age_limit': 18,
-            },
-        }, {
-            'url': 'https://shooshtime.com/videos/284002/just-out-of-the-shower-joi/',
-            'md5': 'e2f0a4c329f7986280b7328e24036d60',
-            'info_dict': {
-                'id': '284002',
-                'display_id': 'just-out-of-the-shower-joi',
-                'ext': 'mp4',
-                'title': 'Just Out Of The Shower JOI - Shooshtime',
-                'height': 720,
-                'age_limit': 18,
-            },
-        }, {
-            # would like to use the yt-dl test video but searching for
-            # '"\'/\\ä↭𝕐' fails, so using an old vid from YouTube Korea
-            'note': 'Test default search',
-            'url': 'Shorts로 허락 필요없이 놀자! (BTS편)',
-            'info_dict': {
-                'id': 'usDGO4Zb-dc',
-                'ext': 'mp4',
-                'title': 'YouTube Shorts로 허락 필요없이 놀자! (BTS편)',
-                'description': 'md5:96e31607eba81ab441567b5e289f4716',
-                'upload_date': '20211107',
-                'uploader': 'YouTube Korea',
-                'location': '대한민국',
-            },
-            'params': {
-                'default_search': 'ytsearch',
-                'skip_download': True,
-            },
-            'expected_warnings': ['uploader id'],
-        },
     ]
 
     def report_following_redirect(self, new_url):
@@ -2444,88 +2352,6 @@ class GenericIE(InfoExtractor):
             'title': title,
         }
 
-    def _extract_kvs(self, url, webpage, video_id):
-
-        def getlicensetoken(license):
-            modlicense = license.replace('$', '').replace('0', '1')
-            center = int(len(modlicense) / 2)
-            fronthalf = int(modlicense[:center + 1])
-            backhalf = int(modlicense[center:])
-
-            modlicense = compat_str(4 * abs(fronthalf - backhalf))
-
-            def parts():
-                for o in range(0, center + 1):
-                    for i in range(1, 5):
-                        yield compat_str((int(license[o + i]) + int(modlicense[o])) % 10)
-
-            return ''.join(parts())
-
-        def getrealurl(video_url, license_code):
-            if not video_url.startswith('function/0/'):
-                return video_url  # not obfuscated
-
-            url_path, _, url_query = video_url.partition('?')
-            urlparts = url_path.split('/')[2:]
-            license = getlicensetoken(license_code)
-            newmagic = urlparts[5][:32]
-
-            def spells(x, o):
-                l = (o + sum(int(n) for n in license[o:])) % 32
-                for i in range(0, len(x)):
-                    yield {l: x[o], o: x[l]}.get(i, x[i])
-
-            for o in range(len(newmagic) - 1, -1, -1):
-                newmagic = ''.join(spells(newmagic, o))
-
-            urlparts[5] = newmagic + urlparts[5][32:]
-            return '/'.join(urlparts) + '?' + url_query
-
-        flashvars = self._search_regex(
-            r'(?s)<script\b[^>]*>.*?var\s+flashvars\s*=\s*(\{.+?\});.*?</script>',
-            webpage, 'flashvars')
-        flashvars = self._parse_json(flashvars, video_id, transform_source=js_to_json)
-
-        # extract the part after the last / as the display_id from the
-        # canonical URL.
-        display_id = self._search_regex(
-            r'(?:<link href="https?://[^"]+/(.+?)/?" rel="canonical"\s*/?>'
-            r'|<link rel="canonical" href="https?://[^"]+/(.+?)/?"\s*/?>)',
-            webpage, 'display_id', fatal=False
-        )
-        title = self._html_search_regex(r'<(?:h1|title)>(?:Video: )?(.+?)</(?:h1|title)>', webpage, 'title')
-
-        thumbnail = flashvars['preview_url']
-        if thumbnail.startswith('//'):
-            protocol, _, _ = url.partition('/')
-            thumbnail = protocol + thumbnail
-
-        url_keys = list(filter(re.compile(r'^video_(?:url|alt_url\d*)$').match, flashvars.keys()))
-        formats = []
-        for key in url_keys:
-            if '/get_file/' not in flashvars[key]:
-                continue
-            format_id = flashvars.get(key + '_text', key)
-            formats.append(merge_dicts(
-                parse_resolution(format_id) or parse_resolution(flashvars[key]), {
-                    'url': urljoin(url, getrealurl(flashvars[key], flashvars['license_code'])),
-                    'format_id': format_id,
-                    'ext': 'mp4',
-                    'http_headers': {'Referer': url},
-                }))
-            if not formats[-1].get('height'):
-                formats[-1]['quality'] = 1
-
-        self._sort_formats(formats)
-
-        return {
-            'id': flashvars['video_id'],
-            'display_id': display_id,
-            'title': title,
-            'thumbnail': thumbnail,
-            'formats': formats,
-        }
-
     def _real_extract(self, url):
         if url.startswith('//'):
             return self.url_result(self.http_scheme() + url)
@@ -2734,16 +2560,9 @@ class GenericIE(InfoExtractor):
         # but actually don't.
         AGE_LIMIT_MARKERS = [
             r'Proudly Labeled <a href="http://www\.rtalabel\.org/" title="Restricted to Adults">RTA</a>',
-            r'>[^<]*you acknowledge you are at least (\d+) years old',
-            r'>\s*(?:18\s+U(?:\.S\.C\.|SC)\s+)?(?:§+\s*)?2257\b',
         ]
-        for marker in AGE_LIMIT_MARKERS:
-            m = re.search(marker, webpage)
-            if not m:
-                continue
-            age_limit = max(
-                age_limit or 0,
-                int_or_none(m.groups() and m.group(1), default=18))
+        if any(re.search(marker, webpage) for marker in AGE_LIMIT_MARKERS):
+            age_limit = 18
 
         # video uploader is domain name
         video_uploader = self._search_regex(
@@ -2958,11 +2777,6 @@ class GenericIE(InfoExtractor):
         if odnoklassniki_url:
             return self.url_result(odnoklassniki_url, OdnoklassnikiIE.ie_key())
 
-        # Look for sibnet embedded player
-        sibnet_urls = VKIE._extract_sibnet_urls(webpage)
-        if sibnet_urls:
-            return self.playlist_from_matches(sibnet_urls, video_id, video_title)
-
         # Look for embedded ivi player
         mobj = re.search(r'<embed[^>]+?src=(["\'])(?P<url>https?://(?:www\.)?ivi\.ru/video/player.+?)\1', webpage)
         if mobj is not None:
@@ -3354,6 +3168,11 @@ class GenericIE(InfoExtractor):
             return self.url_result(
                 self._proto_relative_url(instagram_embed_url), InstagramIE.ie_key())
 
+        # Look for LiveLeak embeds
+        liveleak_urls = LiveLeakIE._extract_urls(webpage)
+        if liveleak_urls:
+            return self.playlist_from_matches(liveleak_urls, video_id, video_title)
+
         # Look for 3Q SDN embeds
         threeqsdn_url = ThreeQSDNIE._extract_url(webpage)
         if threeqsdn_url:
@@ -3581,29 +3400,12 @@ class GenericIE(InfoExtractor):
                         'url': src,
                         'ext': (mimetype2ext(src_type)
                                 or ext if ext in KNOWN_EXTENSIONS else 'mp4'),
-                        'http_headers': {
-                            'Referer': full_response.geturl(),
-                        },
                     })
             if formats:
                 self._sort_formats(formats)
                 info_dict['formats'] = formats
                 return info_dict
 
-        # Look for generic KVS player (before ld+json for tests)
-        found = self._search_regex(
-            (r'<script\b[^>]+?\bsrc\s*=\s*(["\'])https?://(?:\S+?/)+kt_player\.js\?v=(?P<ver>\d+(?:\.\d+)+)\1[^>]*>',
-             # kt_player('kt_player', 'https://i.shoosh.co/player/kt_player.swf?v=5.5.1', ...
-             r'kt_player\s*\(\s*(["\'])(?:(?!\1)[\w\W])+\1\s*,\s*(["\'])https?://(?:\S+?/)+kt_player\.swf\?v=(?P<ver>\d+(?:\.\d+)+)\2\s*,',
-             ), webpage, 'KVS player', group='ver', default=False)
-        if found:
-            self.report_extraction('%s: KVS Player' % (video_id, ))
-            if found.split('.')[0] not in ('4', '5', '6'):
-                self.report_warning('Untested major version (%s) in player engine - download may fail.' % (found, ))
-            return merge_dicts(
-                self._extract_kvs(url, webpage, video_id),
-                info_dict)
-
         # Looking for http://schema.org/VideoObject
         json_ld = self._search_json_ld(
             webpage, video_id, default={}, expected_type='VideoObject')
@@ -3666,7 +3468,7 @@ class GenericIE(InfoExtractor):
             m_video_type = re.findall(r'<meta.*?property="og:video:type".*?content="video/(.*?)"', webpage)
             # We only look in og:video if the MIME type is a video, don't try if it's a Flash player:
             if m_video_type is not None:
-                found = filter_video(re.findall(r'<meta.*?property="og:(?:video|audio)".*?content="(.*?)"', webpage))
+                found = filter_video(re.findall(r'<meta.*?property="og:video".*?content="(.*?)"', webpage))
         if not found:
             REDIRECT_REGEX = r'[0-9]{,2};\s*(?:URL|url)=\'?([^\'"]+)'
             found = re.search(
diff --git a/youtube_dl/extractor/globalplayer.py b/youtube_dl/extractor/globalplayer.py
deleted file mode 100644
index ae75dcabf..000000000
--- a/youtube_dl/extractor/globalplayer.py
+++ /dev/null
@@ -1,273 +0,0 @@
-# coding: utf-8
-from __future__ import unicode_literals
-
-from .common import InfoExtractor
-from ..utils import (
-    clean_html,
-    join_nonempty,
-    merge_dicts,
-    parse_duration,
-    str_or_none,
-    T,
-    traverse_obj,
-    unified_strdate,
-    unified_timestamp,
-    urlhandle_detect_ext,
-)
-
-
-class GlobalPlayerBaseIE(InfoExtractor):
-
-    def _get_page_props(self, url, video_id):
-        webpage = self._download_webpage(url, video_id)
-        return self._search_nextjs_data(webpage, video_id)['props']['pageProps']
-
-    def _request_ext(self, url, video_id):
-        return urlhandle_detect_ext(self._request_webpage(  # Server rejects HEAD requests
-            url, video_id, note='Determining source extension'))
-
-    @staticmethod
-    def _clean_desc(x):
-        x = clean_html(x)
-        if x:
-            x = x.replace('\xa0', ' ')
-        return x
-
-    def _extract_audio(self, episode, series):
-
-        return merge_dicts({
-            'vcodec': 'none',
-        }, traverse_obj(series, {
-            'series': 'title',
-            'series_id': 'id',
-            'thumbnail': 'imageUrl',
-            'uploader': 'itunesAuthor',  # podcasts only
-        }), traverse_obj(episode, {
-            'id': 'id',
-            'description': ('description', T(self._clean_desc)),
-            'duration': ('duration', T(parse_duration)),
-            'thumbnail': 'imageUrl',
-            'url': 'streamUrl',
-            'timestamp': (('pubDate', 'startDate'), T(unified_timestamp)),
-            'title': 'title',
-        }, get_all=False), rev=True)
-
-
-class GlobalPlayerLiveIE(GlobalPlayerBaseIE):
-    _VALID_URL = r'https?://www\.globalplayer\.com/live/(?P<id>\w+)/\w+'
-    _TESTS = [{
-        'url': 'https://www.globalplayer.com/live/smoothchill/uk/',
-        'info_dict': {
-            'id': '2mx1E',
-            'ext': 'aac',
-            'display_id': 'smoothchill-uk',
-            'title': 're:^Smooth Chill.+$',
-            'thumbnail': 'https://herald.musicradio.com/media/f296ade8-50c9-4f60-911f-924e96873620.png',
-            'description': 'Music To Chill To',
-            # 'live_status': 'is_live',
-            'is_live': True,
-        },
-    }, {
-        # national station
-        'url': 'https://www.globalplayer.com/live/heart/uk/',
-        'info_dict': {
-            'id': '2mwx4',
-            'ext': 'aac',
-            'description': 'turn up the feel good!',
-            'thumbnail': 'https://herald.musicradio.com/media/49b9e8cb-15bf-4bf2-8c28-a4850cc6b0f3.png',
-            # 'live_status': 'is_live',
-            'is_live': True,
-            'title': 're:^Heart UK.+$',
-            'display_id': 'heart-uk',
-        },
-    }, {
-        # regional variation
-        'url': 'https://www.globalplayer.com/live/heart/london/',
-        'info_dict': {
-            'id': 'AMqg',
-            'ext': 'aac',
-            'thumbnail': 'https://herald.musicradio.com/media/49b9e8cb-15bf-4bf2-8c28-a4850cc6b0f3.png',
-            'title': 're:^Heart London.+$',
-            # 'live_status': 'is_live',
-            'is_live': True,
-            'display_id': 'heart-london',
-            'description': 'turn up the feel good!',
-        },
-    }]
-
-    def _real_extract(self, url):
-        video_id = self._match_id(url)
-        station = self._get_page_props(url, video_id)['station']
-        stream_url = station['streamUrl']
-
-        return merge_dicts({
-            'id': station['id'],
-            'display_id': (
-                join_nonempty('brandSlug', 'slug', from_dict=station)
-                or station.get('legacyStationPrefix')),
-            'url': stream_url,
-            'ext': self._request_ext(stream_url, video_id),
-            'vcodec': 'none',
-            'is_live': True,
-        }, {
-            'title': self._live_title(traverse_obj(
-                station, (('name', 'brandName'), T(str_or_none)),
-                get_all=False)),
-        }, traverse_obj(station, {
-            'description': 'tagline',
-            'thumbnail': 'brandLogo',
-        }), rev=True)
-
-
-class GlobalPlayerLivePlaylistIE(GlobalPlayerBaseIE):
-    _VALID_URL = r'https?://www\.globalplayer\.com/playlists/(?P<id>\w+)'
-    _TESTS = [{
-        # "live playlist"
-        'url': 'https://www.globalplayer.com/playlists/8bLk/',
-        'info_dict': {
-            'id': '8bLk',
-            'ext': 'aac',
-            # 'live_status': 'is_live',
-            'is_live': True,
-            'description': r're:(?s).+\bclassical\b.+\bClassic FM Hall [oO]f Fame\b',
-            'thumbnail': 'https://images.globalplayer.com/images/551379?width=450&signature=oMLPZIoi5_dBSHnTMREW0Xg76mA=',
-            'title': 're:Classic FM Hall of Fame.+$'
-        },
-    }]
-
-    def _real_extract(self, url):
-        video_id = self._match_id(url)
-        station = self._get_page_props(url, video_id)['playlistData']
-        stream_url = station['streamUrl']
-
-        return merge_dicts({
-            'id': video_id,
-            'url': stream_url,
-            'ext': self._request_ext(stream_url, video_id),
-            'vcodec': 'none',
-            'is_live': True,
-        }, traverse_obj(station, {
-            'title': 'title',
-            'description': ('description', T(self._clean_desc)),
-            'thumbnail': 'image',
-        }), rev=True)
-
-
-class GlobalPlayerAudioIE(GlobalPlayerBaseIE):
-    _VALID_URL = r'https?://www\.globalplayer\.com/(?:(?P<podcast>podcasts)/|catchup/\w+/\w+/)(?P<id>\w+)/?(?:$|[?#])'
-    _TESTS = [{
-        # podcast
-        'url': 'https://www.globalplayer.com/podcasts/42KuaM/',
-        'playlist_mincount': 5,
-        'info_dict': {
-            'id': '42KuaM',
-            'title': 'Filthy Ritual',
-            'thumbnail': 'md5:60286e7d12d795bd1bbc9efc6cee643e',
-            'categories': ['Society & Culture', 'True Crime'],
-            'uploader': 'Global',
-            'description': r're:(?s).+\bscam\b.+?\bseries available now\b',
-        },
-    }, {
-        # radio catchup
-        'url': 'https://www.globalplayer.com/catchup/lbc/uk/46vyD7z/',
-        'playlist_mincount': 2,
-        'info_dict': {
-            'id': '46vyD7z',
-            'description': 'Nick Ferrari At Breakfast is Leading Britain\'s Conversation.',
-            'title': 'Nick Ferrari',
-            'thumbnail': 'md5:4df24d8a226f5b2508efbcc6ae874ebf',
-        },
-    }]
-
-    def _real_extract(self, url):
-        video_id, podcast = self._match_valid_url(url).group('id', 'podcast')
-        props = self._get_page_props(url, video_id)
-        series = props['podcastInfo'] if podcast else props['catchupInfo']
-
-        return merge_dicts({
-            '_type': 'playlist',
-            'id': video_id,
-            'entries': [self._extract_audio(ep, series) for ep in traverse_obj(
-                        series, ('episodes', lambda _, v: v['id'] and v['streamUrl']))],
-            'categories': traverse_obj(series, ('categories', Ellipsis, 'name')) or None,
-        }, traverse_obj(series, {
-            'description': ('description', T(self._clean_desc)),
-            'thumbnail': 'imageUrl',
-            'title': 'title',
-            'uploader': 'itunesAuthor',  # podcasts only
-        }), rev=True)
-
-
-class GlobalPlayerAudioEpisodeIE(GlobalPlayerBaseIE):
-    _VALID_URL = r'https?://www\.globalplayer\.com/(?:(?P<podcast>podcasts)|catchup/\w+/\w+)/episodes/(?P<id>\w+)/?(?:$|[?#])'
-    _TESTS = [{
-        # podcast
-        'url': 'https://www.globalplayer.com/podcasts/episodes/7DrfNnE/',
-        'info_dict': {
-            'id': '7DrfNnE',
-            'ext': 'mp3',
-            'title': 'Filthy Ritual - Trailer',
-            'description': 'md5:1f1562fd0f01b4773b590984f94223e0',
-            'thumbnail': 'md5:60286e7d12d795bd1bbc9efc6cee643e',
-            'duration': 225.0,
-            'timestamp': 1681254900,
-            'series': 'Filthy Ritual',
-            'series_id': '42KuaM',
-            'upload_date': '20230411',
-            'uploader': 'Global',
-        },
-    }, {
-        # radio catchup
-        'url': 'https://www.globalplayer.com/catchup/lbc/uk/episodes/2zGq26Vcv1fCWhddC4JAwETXWe/',
-        'only_matching': True,
-        # expired: refresh the details with a current show for a full test
-        'info_dict': {
-            'id': '2zGq26Vcv1fCWhddC4JAwETXWe',
-            'ext': 'm4a',
-            'timestamp': 1682056800,
-            'series': 'Nick Ferrari',
-            'thumbnail': 'md5:4df24d8a226f5b2508efbcc6ae874ebf',
-            'upload_date': '20230421',
-            'series_id': '46vyD7z',
-            'description': 'Nick Ferrari At Breakfast is Leading Britain\'s Conversation.',
-            'title': 'Nick Ferrari',
-            'duration': 10800.0,
-        },
-    }]
-
-    def _real_extract(self, url):
-        video_id, podcast = self._match_valid_url(url).group('id', 'podcast')
-        props = self._get_page_props(url, video_id)
-        episode = props['podcastEpisode'] if podcast else props['catchupEpisode']
-
-        return self._extract_audio(
-            episode, traverse_obj(episode, 'podcast', 'show', expected_type=dict) or {})
-
-
-class GlobalPlayerVideoIE(GlobalPlayerBaseIE):
-    _VALID_URL = r'https?://www\.globalplayer\.com/videos/(?P<id>\w+)'
-    _TESTS = [{
-        'url': 'https://www.globalplayer.com/videos/2JsSZ7Gm2uP/',
-        'info_dict': {
-            'id': '2JsSZ7Gm2uP',
-            'ext': 'mp4',
-            'description': 'md5:6a9f063c67c42f218e42eee7d0298bfd',
-            'thumbnail': 'md5:d4498af48e15aae4839ce77b97d39550',
-            'upload_date': '20230420',
-            'title': 'Treble Malakai Bayoh sings a sublime Handel aria at Classic FM Live',
-        },
-    }]
-
-    def _real_extract(self, url):
-        video_id = self._match_id(url)
-        meta = self._get_page_props(url, video_id)['videoData']
-
-        return merge_dicts({
-            'id': video_id,
-        }, traverse_obj(meta, {
-            'url': 'url',
-            'thumbnail': ('image', 'url'),
-            'title': 'title',
-            'upload_date': ('publish_date', T(unified_strdate)),
-            'description': 'description',
-        }), rev=True)
diff --git a/youtube_dl/extractor/go.py b/youtube_dl/extractor/go.py
index 878ba14e6..0d731e90a 100644
--- a/youtube_dl/extractor/go.py
+++ b/youtube_dl/extractor/go.py
@@ -4,12 +4,10 @@ from __future__ import unicode_literals
 import re
 
 from .adobepass import AdobePassIE
-from ..compat import compat_str
 from ..utils import (
     int_or_none,
     determine_ext,
     parse_age_limit,
-    try_get,
     urlencode_postdata,
     ExtractorError,
 )
@@ -118,18 +116,6 @@ class GoIE(AdobePassIE):
             # m3u8 download
             'skip_download': True,
         },
-    }, {
-        'url': 'https://abc.com/shows/modern-family/episode-guide/season-01/101-pilot',
-        'info_dict': {
-            'id': 'VDKA22600213',
-            'ext': 'mp4',
-            'title': 'Pilot',
-            'description': 'md5:74306df917cfc199d76d061d66bebdb4',
-        },
-        'params': {
-            # m3u8 download
-            'skip_download': True,
-        },
     }, {
         'url': 'http://abc.go.com/shows/the-catch/episode-guide/season-01/10-the-wedding',
         'only_matching': True,
@@ -163,30 +149,14 @@ class GoIE(AdobePassIE):
         brand = site_info.get('brand')
         if not video_id or not site_info:
             webpage = self._download_webpage(url, display_id or video_id)
-            data = self._parse_json(
-                self._search_regex(
-                    r'["\']__abc_com__["\']\s*\]\s*=\s*({.+?})\s*;', webpage,
-                    'data', default='{}'),
-                display_id or video_id, fatal=False)
-            # https://abc.com/shows/modern-family/episode-guide/season-01/101-pilot
-            layout = try_get(data, lambda x: x['page']['content']['video']['layout'], dict)
-            video_id = None
-            if layout:
-                video_id = try_get(
-                    layout,
-                    (lambda x: x['videoid'], lambda x: x['video']['id']),
-                    compat_str)
-            if not video_id:
-                video_id = self._search_regex(
-                    (
-                        # There may be inner quotes, e.g. data-video-id="'VDKA3609139'"
-                        # from http://freeform.go.com/shows/shadowhunters/episodes/season-2/1-this-guilty-blood
-                        r'data-video-id=["\']*(VDKA\w+)',
-                        # page.analytics.videoIdCode
-                        r'\bvideoIdCode["\']\s*:\s*["\']((?:vdka|VDKA)\w+)',
-                        # https://abc.com/shows/the-rookie/episode-guide/season-02/03-the-bet
-                        r'\b(?:video)?id["\']\s*:\s*["\'](VDKA\w+)'
-                    ), webpage, 'video id', default=video_id)
+            video_id = self._search_regex(
+                (
+                    # There may be inner quotes, e.g. data-video-id="'VDKA3609139'"
+                    # from http://freeform.go.com/shows/shadowhunters/episodes/season-2/1-this-guilty-blood
+                    r'data-video-id=["\']*(VDKA\w+)',
+                    # https://abc.com/shows/the-rookie/episode-guide/season-02/03-the-bet
+                    r'\b(?:video)?id["\']\s*:\s*["\'](VDKA\w+)'
+                ), webpage, 'video id', default=video_id)
             if not site_info:
                 brand = self._search_regex(
                     (r'data-brand=\s*["\']\s*(\d+)',
diff --git a/youtube_dl/extractor/hrfernsehen.py b/youtube_dl/extractor/hrfernsehen.py
deleted file mode 100644
index 11b879dbd..000000000
--- a/youtube_dl/extractor/hrfernsehen.py
+++ /dev/null
@@ -1,101 +0,0 @@
-# coding: utf-8
-
-from __future__ import unicode_literals
-
-import json
-import re
-
-from ..utils import (
-    int_or_none,
-    unified_timestamp,
-    unescapeHTML
-)
-from .common import InfoExtractor
-
-
-class HRFernsehenIE(InfoExtractor):
-    IE_NAME = 'hrfernsehen'
-    _VALID_URL = r'^https?://www\.(?:hr-fernsehen|hessenschau)\.de/.*,video-(?P<id>[0-9]{6})\.html'
-
-    _TESTS = [{
-        'url': 'https://www.hessenschau.de/tv-sendung/hessenschau-vom-26082020,video-130546.html',
-        'md5': '5c4e0ba94677c516a2f65a84110fc536',
-        'info_dict': {
-            'id': '130546',
-            'ext': 'mp4',
-            'description': 'Sturmtief Kirsten fegt über Hessen / Die Corona-Pandemie – eine Chronologie / '
-                           'Sterbehilfe: Die Lage in Hessen / Miss Hessen leitet zwei eigene Unternehmen / '
-                           'Pop-Up Museum zeigt Schwarze Unterhaltung und Black Music',
-            'subtitles': {'de': [{
-                'url': 'https://hr-a.akamaihd.net/video/as/hessenschau/2020_08/hrLogo_200826200407_L385592_512x288-25p-500kbit.vtt'
-            }]},
-            'timestamp': 1598470200,
-            'upload_date': '20200826',
-            'thumbnail': 'https://www.hessenschau.de/tv-sendung/hs_ganz-1554~_t-1598465545029_v-16to9__medium.jpg',
-            'title': 'hessenschau vom 26.08.2020'
-        }
-    }, {
-        'url': 'https://www.hr-fernsehen.de/sendungen-a-z/mex/sendungen/fair-und-gut---was-hinter-aldis-eigenem-guetesiegel-steckt,video-130544.html',
-        'only_matching': True
-    }]
-
-    _GEO_COUNTRIES = ['DE']
-
-    def extract_airdate(self, loader_data):
-        airdate_str = loader_data.get('mediaMetadata', {}).get('agf', {}).get('airdate')
-
-        if airdate_str is None:
-            return None
-
-        return unified_timestamp(airdate_str)
-
-    def extract_formats(self, loader_data):
-        stream_formats = []
-        for stream_obj in loader_data["videoResolutionLevels"]:
-            stream_format = {
-                'format_id': str(stream_obj['verticalResolution']) + "p",
-                'height': stream_obj['verticalResolution'],
-                'url': stream_obj['url'],
-            }
-
-            quality_information = re.search(r'([0-9]{3,4})x([0-9]{3,4})-([0-9]{2})p-([0-9]{3,4})kbit',
-                                            stream_obj['url'])
-            if quality_information:
-                stream_format['width'] = int_or_none(quality_information.group(1))
-                stream_format['height'] = int_or_none(quality_information.group(2))
-                stream_format['fps'] = int_or_none(quality_information.group(3))
-                stream_format['tbr'] = int_or_none(quality_information.group(4))
-
-            stream_formats.append(stream_format)
-
-        self._sort_formats(stream_formats)
-        return stream_formats
-
-    def _real_extract(self, url):
-        video_id = self._match_id(url)
-        webpage = self._download_webpage(url, video_id)
-
-        title = self._html_search_meta(
-            ['og:title', 'twitter:title', 'name'], webpage)
-        description = self._html_search_meta(
-            ['description'], webpage)
-
-        loader_str = unescapeHTML(self._search_regex(r"data-new-hr-mediaplayer-loader='([^']*)'", webpage, "ardloader"))
-        loader_data = json.loads(loader_str)
-
-        info = {
-            'id': video_id,
-            'title': title,
-            'description': description,
-            'formats': self.extract_formats(loader_data),
-            'timestamp': self.extract_airdate(loader_data)
-        }
-
-        if "subtitle" in loader_data:
-            info["subtitles"] = {"de": [{"url": loader_data["subtitle"]}]}
-
-        thumbnails = list(set([t for t in loader_data.get("previewImageUrl", {}).values()]))
-        if len(thumbnails) > 0:
-            info["thumbnails"] = [{"url": t} for t in thumbnails]
-
-        return info
diff --git a/youtube_dl/extractor/ign.py b/youtube_dl/extractor/ign.py
index c7daa30e5..0d9f50ed2 100644
--- a/youtube_dl/extractor/ign.py
+++ b/youtube_dl/extractor/ign.py
@@ -1,29 +1,19 @@
-# coding: utf-8
-
 from __future__ import unicode_literals
 
 import re
 
 from .common import InfoExtractor
 from ..compat import (
-    compat_filter as filter,
-    compat_HTTPError,
     compat_parse_qs,
-    compat_urlparse,
+    compat_urllib_parse_urlparse,
 )
 from ..utils import (
+    HEADRequest,
     determine_ext,
-    error_to_compat_str,
-    extract_attributes,
-    ExtractorError,
     int_or_none,
-    merge_dicts,
-    orderedSet,
     parse_iso8601,
     strip_or_none,
-    traverse_obj,
-    url_or_none,
-    urljoin,
+    try_get,
 )
 
 
@@ -32,102 +22,14 @@ class IGNBaseIE(InfoExtractor):
         return self._download_json(
             'http://apis.ign.com/{0}/v3/{0}s/slug/{1}'.format(self._PAGE_TYPE, slug), slug)
 
-    def _checked_call_api(self, slug):
-        try:
-            return self._call_api(slug)
-        except ExtractorError as e:
-            if isinstance(e.cause, compat_HTTPError) and e.cause.code == 404:
-                e.cause.args = e.cause.args or [
-                    e.cause.geturl(), e.cause.getcode(), e.cause.reason]
-                raise ExtractorError(
-                    'Content not found: expired?', cause=e.cause,
-                    expected=True)
-            raise
-
-    def _extract_video_info(self, video, fatal=True):
-        video_id = video['videoId']
-
-        formats = []
-        refs = traverse_obj(video, 'refs', expected_type=dict) or {}
-
-        m3u8_url = url_or_none(refs.get('m3uUrl'))
-        if m3u8_url:
-            formats.extend(self._extract_m3u8_formats(
-                m3u8_url, video_id, 'mp4', 'm3u8_native',
-                m3u8_id='hls', fatal=False))
-
-        f4m_url = url_or_none(refs.get('f4mUrl'))
-        if f4m_url:
-            formats.extend(self._extract_f4m_formats(
-                f4m_url, video_id, f4m_id='hds', fatal=False))
-
-        for asset in (video.get('assets') or []):
-            asset_url = url_or_none(asset.get('url'))
-            if not asset_url:
-                continue
-            formats.append({
-                'url': asset_url,
-                'tbr': int_or_none(asset.get('bitrate'), 1000),
-                'fps': int_or_none(asset.get('frame_rate')),
-                'height': int_or_none(asset.get('height')),
-                'width': int_or_none(asset.get('width')),
-            })
-
-        mezzanine_url = traverse_obj(
-            video, ('system', 'mezzanineUrl'), expected_type=url_or_none)
-        if mezzanine_url:
-            formats.append({
-                'ext': determine_ext(mezzanine_url, 'mp4'),
-                'format_id': 'mezzanine',
-                'preference': 1,
-                'url': mezzanine_url,
-            })
-
-        if formats or fatal:
-            self._sort_formats(formats)
-        else:
-            return
-
-        thumbnails = traverse_obj(
-            video, ('thumbnails', Ellipsis, {'url': 'url'}), expected_type=url_or_none)
-        tags = traverse_obj(
-            video, ('tags', Ellipsis, 'displayName'),
-            expected_type=lambda x: x.strip() or None)
-
-        metadata = traverse_obj(video, 'metadata', expected_type=dict) or {}
-        title = traverse_obj(
-            metadata, 'longTitle', 'title', 'name',
-            expected_type=lambda x: x.strip() or None)
-
-        return {
-            'id': video_id,
-            'title': title,
-            'description': strip_or_none(metadata.get('description')),
-            'timestamp': parse_iso8601(metadata.get('publishDate')),
-            'duration': int_or_none(metadata.get('duration')),
-            'thumbnails': thumbnails,
-            'formats': formats,
-            'tags': tags,
-        }
-
-    # yt-dlp shim
-    @classmethod
-    def _extract_from_webpage(cls, url, webpage):
-        for embed_url in orderedSet(
-                cls._extract_embed_urls(url, webpage) or [], lazy=True):
-            yield cls.url_result(embed_url, None if cls._VALID_URL is False else cls)
-
 
 class IGNIE(IGNBaseIE):
     """
     Extractor for some of the IGN sites, like www.ign.com, es.ign.com de.ign.com.
     Some videos of it.ign.com are also supported
     """
-    _VIDEO_PATH_RE = r'/(?:\d{4}/\d{2}/\d{2}/)?(?P<id>.+?)'
-    _PLAYLIST_PATH_RE = r'(?:/?\?(?P<filt>[^&#]+))?'
-    _VALID_URL = (
-        r'https?://(?:.+?\.ign|www\.pcmag)\.com/videos(?:%s)'
-        % '|'.join((_VIDEO_PATH_RE + r'(?:[/?&#]|$)', _PLAYLIST_PATH_RE)))
+
+    _VALID_URL = r'https?://(?:.+?\.ign|www\.pcmag)\.com/videos/(?:\d{4}/\d{2}/\d{2}/)?(?P<id>[^/?&#]+)'
     IE_NAME = 'ign.com'
     _PAGE_TYPE = 'video'
 
@@ -142,10 +44,7 @@ class IGNIE(IGNBaseIE):
             'timestamp': 1370440800,
             'upload_date': '20130605',
             'tags': 'count:9',
-        },
-        'params': {
-            'nocheckcertificate': True,
-        },
+        }
     }, {
         'url': 'http://www.pcmag.com/videos/2015/01/06/010615-whats-new-now-is-gogo-snooping-on-your-data',
         'md5': 'f1581a6fe8c5121be5b807684aeac3f6',
@@ -157,51 +56,86 @@ class IGNIE(IGNBaseIE):
             'timestamp': 1420571160,
             'upload_date': '20150106',
             'tags': 'count:4',
-        },
-        'skip': '404 Not Found',
+        }
     }, {
         'url': 'https://www.ign.com/videos/is-a-resident-evil-4-remake-on-the-way-ign-daily-fix',
         'only_matching': True,
     }]
 
-    @classmethod
-    def _extract_embed_urls(cls, url, webpage):
-        grids = re.findall(
-            r'''(?s)<section\b[^>]+\bclass\s*=\s*['"](?:[\w-]+\s+)*?content-feed-grid(?!\B|-)[^>]+>(.+?)</section[^>]*>''',
-            webpage)
-        return filter(None,
-                      (urljoin(url, m.group('path')) for m in re.finditer(
-                          r'''<a\b[^>]+\bhref\s*=\s*('|")(?P<path>/videos%s)\1'''
-                          % cls._VIDEO_PATH_RE, grids[0] if grids else '')))
-
     def _real_extract(self, url):
-        m = re.match(self._VALID_URL, url)
-        display_id = m.group('id')
-        if display_id:
-            return self._extract_video(url, display_id)
-        display_id = m.group('filt') or 'all'
-        return self._extract_playlist(url, display_id)
-
-    def _extract_playlist(self, url, display_id):
-        webpage = self._download_webpage(url, display_id)
-
-        return self.playlist_result(
-            (self.url_result(u, ie=self.ie_key())
-             for u in self._extract_embed_urls(url, webpage)),
-            playlist_id=display_id)
-
-    def _extract_video(self, url, display_id):
         display_id = self._match_id(url)
-        video = self._checked_call_api(display_id)
+        video = self._call_api(display_id)
+        video_id = video['videoId']
+        metadata = video['metadata']
+        title = metadata.get('longTitle') or metadata.get('title') or metadata['name']
 
-        info = self._extract_video_info(video)
+        formats = []
+        refs = video.get('refs') or {}
 
-        return merge_dicts({
+        m3u8_url = refs.get('m3uUrl')
+        if m3u8_url:
+            formats.extend(self._extract_m3u8_formats(
+                m3u8_url, video_id, 'mp4', 'm3u8_native',
+                m3u8_id='hls', fatal=False))
+
+        f4m_url = refs.get('f4mUrl')
+        if f4m_url:
+            formats.extend(self._extract_f4m_formats(
+                f4m_url, video_id, f4m_id='hds', fatal=False))
+
+        for asset in (video.get('assets') or []):
+            asset_url = asset.get('url')
+            if not asset_url:
+                continue
+            formats.append({
+                'url': asset_url,
+                'tbr': int_or_none(asset.get('bitrate'), 1000),
+                'fps': int_or_none(asset.get('frame_rate')),
+                'height': int_or_none(asset.get('height')),
+                'width': int_or_none(asset.get('width')),
+            })
+
+        mezzanine_url = try_get(video, lambda x: x['system']['mezzanineUrl'])
+        if mezzanine_url:
+            formats.append({
+                'ext': determine_ext(mezzanine_url, 'mp4'),
+                'format_id': 'mezzanine',
+                'preference': 1,
+                'url': mezzanine_url,
+            })
+
+        self._sort_formats(formats)
+
+        thumbnails = []
+        for thumbnail in (video.get('thumbnails') or []):
+            thumbnail_url = thumbnail.get('url')
+            if not thumbnail_url:
+                continue
+            thumbnails.append({
+                'url': thumbnail_url,
+            })
+
+        tags = []
+        for tag in (video.get('tags') or []):
+            display_name = tag.get('displayName')
+            if not display_name:
+                continue
+            tags.append(display_name)
+
+        return {
+            'id': video_id,
+            'title': title,
+            'description': strip_or_none(metadata.get('description')),
+            'timestamp': parse_iso8601(metadata.get('publishDate')),
+            'duration': int_or_none(metadata.get('duration')),
             'display_id': display_id,
-        }, info)
+            'thumbnails': thumbnails,
+            'formats': formats,
+            'tags': tags,
+        }
 
 
-class IGNVideoIE(IGNBaseIE):
+class IGNVideoIE(InfoExtractor):
     _VALID_URL = r'https?://.+?\.ign\.com/(?:[a-z]{2}/)?[^/]+/(?P<id>\d+)/(?:video|trailer)/'
     _TESTS = [{
         'url': 'http://me.ign.com/en/videos/112203/video/how-hitman-aims-to-be-different-than-every-other-s',
@@ -213,8 +147,7 @@ class IGNVideoIE(IGNBaseIE):
             'description': 'Taking out assassination targets in Hitman has never been more stylish.',
             'timestamp': 1444665600,
             'upload_date': '20151012',
-        },
-        'expected_warnings': ['HTTP Error 400: Bad Request'],
+        }
     }, {
         'url': 'http://me.ign.com/ar/angry-birds-2/106533/video/lrd-ldyy-lwl-lfylm-angry-birds',
         'only_matching': True,
@@ -234,38 +167,22 @@ class IGNVideoIE(IGNBaseIE):
 
     def _real_extract(self, url):
         video_id = self._match_id(url)
-        parsed_url = compat_urlparse.urlparse(url)
-        embed_url = compat_urlparse.urlunparse(
-            parsed_url._replace(path=parsed_url.path.rsplit('/', 1)[0] + '/embed'))
-
-        webpage, urlh = self._download_webpage_handle(embed_url, video_id)
-        new_url = urlh.geturl()
+        req = HEADRequest(url.rsplit('/', 1)[0] + '/embed')
+        url = self._request_webpage(req, video_id).geturl()
         ign_url = compat_parse_qs(
-            compat_urlparse.urlparse(new_url).query).get('url', [None])[-1]
+            compat_urllib_parse_urlparse(url).query).get('url', [None])[0]
         if ign_url:
             return self.url_result(ign_url, IGNIE.ie_key())
-        video = self._search_regex(r'(<div\b[^>]+\bdata-video-id\s*=\s*[^>]+>)', webpage, 'video element', fatal=False)
-        if not video:
-            if new_url == url:
-                raise ExtractorError('Redirect loop: ' + url)
-            return self.url_result(new_url)
-        video = extract_attributes(video)
-        video_data = video.get('data-settings') or '{}'
-        video_data = self._parse_json(video_data, video_id)['video']
-        info = self._extract_video_info(video_data)
-
-        return merge_dicts({
-            'display_id': video_id,
-        }, info)
+        return self.url_result(url)
 
 
 class IGNArticleIE(IGNBaseIE):
-    _VALID_URL = r'https?://.+?\.ign\.com/(?:articles(?:/\d{4}/\d{2}/\d{2})?|(?:[a-z]{2}/)?(?:[\w-]+/)*?feature/\d+)/(?P<id>[^/?&#]+)'
+    _VALID_URL = r'https?://.+?\.ign\.com/(?:articles(?:/\d{4}/\d{2}/\d{2})?|(?:[a-z]{2}/)?feature/\d+)/(?P<id>[^/?&#]+)'
     _PAGE_TYPE = 'article'
     _TESTS = [{
         'url': 'http://me.ign.com/en/feature/15775/100-little-things-in-gta-5-that-will-blow-your-mind',
         'info_dict': {
-            'id': '72113',
+            'id': '524497489e4e8ff5848ece34',
             'title': '100 Little Things in GTA 5 That Will Blow Your Mind',
         },
         'playlist': [
@@ -273,7 +190,7 @@ class IGNArticleIE(IGNBaseIE):
                 'info_dict': {
                     'id': '5ebbd138523268b93c9141af17bec937',
                     'ext': 'mp4',
-                    'title': 'Grand Theft Auto V Video Review',
+                    'title': 'GTA 5 Video Review',
                     'description': 'Rockstar drops the mic on this generation of games. Watch our review of the masterly Grand Theft Auto V.',
                     'timestamp': 1379339880,
                     'upload_date': '20130916',
@@ -283,7 +200,7 @@ class IGNArticleIE(IGNBaseIE):
                 'info_dict': {
                     'id': '638672ee848ae4ff108df2a296418ee2',
                     'ext': 'mp4',
-                    'title': 'GTA 5 In Slow Motion',
+                    'title': '26 Twisted Moments from GTA 5 in Slow Motion',
                     'description': 'The twisted beauty of GTA 5 in stunning slow motion.',
                     'timestamp': 1386878820,
                     'upload_date': '20131212',
@@ -291,17 +208,16 @@ class IGNArticleIE(IGNBaseIE):
             },
         ],
         'params': {
+            'playlist_items': '2-3',
             'skip_download': True,
         },
-        'expected_warnings': ['Backend fetch failed'],
     }, {
         'url': 'http://www.ign.com/articles/2014/08/15/rewind-theater-wild-trailer-gamescom-2014?watch',
         'info_dict': {
             'id': '53ee806780a81ec46e0790f8',
             'title': 'Rewind Theater - Wild Trailer Gamescom 2014',
         },
-        'playlist_count': 1,
-        'expected_warnings': ['Backend fetch failed'],
+        'playlist_count': 2,
     }, {
         # videoId pattern
         'url': 'http://www.ign.com/articles/2017/06/08/new-ducktales-short-donalds-birthday-doesnt-go-as-planned',
@@ -324,91 +240,18 @@ class IGNArticleIE(IGNBaseIE):
         'only_matching': True,
     }]
 
-    def _checked_call_api(self, slug):
-        try:
-            return self._call_api(slug)
-        except ExtractorError as e:
-            if isinstance(e.cause, compat_HTTPError):
-                e.cause.args = e.cause.args or [
-                    e.cause.geturl(), e.cause.getcode(), e.cause.reason]
-                if e.cause.code == 404:
-                    raise ExtractorError(
-                        'Content not found: expired?', cause=e.cause,
-                        expected=True)
-                elif e.cause.code == 503:
-                    self.report_warning(error_to_compat_str(e.cause))
-                    return
-            raise
-
-    def _search_nextjs_data(self, webpage, video_id, **kw):
-        return self._parse_json(
-            self._search_regex(
-                r'(?s)<script[^>]+id=[\'"]__NEXT_DATA__[\'"][^>]*>([^<]+)</script>',
-                webpage, 'next.js data', **kw),
-            video_id, **kw)
-
     def _real_extract(self, url):
         display_id = self._match_id(url)
-        article = self._checked_call_api(display_id)
+        article = self._call_api(display_id)
 
-        if article:
-            # obsolete ?
-            def entries():
-                media_url = traverse_obj(
-                    article, ('mediaRelations', 0, 'media', 'metadata', 'url'),
-                    expected_type=url_or_none)
-                if media_url:
-                    yield self.url_result(media_url, IGNIE.ie_key())
-                for content in (article.get('content') or []):
-                    for video_url in re.findall(r'(?:\[(?:ignvideo\s+url|youtube\s+clip_id)|<iframe[^>]+src)="([^"]+)"', content):
-                        if url_or_none(video_url):
-                            yield self.url_result(video_url)
-
-            return self.playlist_result(
-                entries(), article.get('articleId'),
-                traverse_obj(
-                    article, ('metadata', 'headline'),
-                    expected_type=lambda x: x.strip() or None))
-
-        webpage = self._download_webpage(url, display_id)
-
-        playlist_id = self._html_search_meta('dable:item_id', webpage, default=None)
-        if playlist_id:
-
-            def entries():
-                for m in re.finditer(
-                        r'''(?s)<object\b[^>]+\bclass\s*=\s*("|')ign-videoplayer\1[^>]*>(?P<params>.+?)</object''',
-                        webpage):
-                    flashvars = self._search_regex(
-                        r'''(<param\b[^>]+\bname\s*=\s*("|')flashvars\2[^>]*>)''',
-                        m.group('params'), 'flashvars', default='')
-                    flashvars = compat_parse_qs(extract_attributes(flashvars).get('value') or '')
-                    v_url = url_or_none((flashvars.get('url') or [None])[-1])
-                    if v_url:
-                        yield self.url_result(v_url)
-        else:
-            playlist_id = self._search_regex(
-                r'''\bdata-post-id\s*=\s*("|')(?P<id>[\da-f]+)\1''',
-                webpage, 'id', group='id', default=None)
-
-            nextjs_data = self._search_nextjs_data(webpage, display_id)
-
-            def entries():
-                for player in traverse_obj(
-                        nextjs_data,
-                        ('props', 'apolloState', 'ROOT_QUERY', lambda k, _: k.startswith('videoPlayerProps('), '__ref')):
-                    # skip promo links (which may not always be served, eg GH CI servers)
-                    if traverse_obj(nextjs_data,
-                                    ('props', 'apolloState', player.replace('PlayerProps', 'ModernContent')),
-                                    expected_type=dict):
-                        continue
-                    video = traverse_obj(nextjs_data, ('props', 'apolloState', player), expected_type=dict) or {}
-                    info = self._extract_video_info(video, fatal=False)
-                    if info:
-                        yield merge_dicts({
-                            'display_id': display_id,
-                        }, info)
+        def entries():
+            media_url = try_get(article, lambda x: x['mediaRelations'][0]['media']['metadata']['url'])
+            if media_url:
+                yield self.url_result(media_url, IGNIE.ie_key())
+            for content in (article.get('content') or []):
+                for video_url in re.findall(r'(?:\[(?:ignvideo\s+url|youtube\s+clip_id)|<iframe[^>]+src)="([^"]+)"', content):
+                    yield self.url_result(video_url)
 
         return self.playlist_result(
-            entries(), playlist_id or display_id,
-            re.sub(r'\s+-\s+IGN\s*$', '', self._og_search_title(webpage, default='')) or None)
+            entries(), article.get('articleId'),
+            strip_or_none(try_get(article, lambda x: x['metadata']['headline'])))
diff --git a/youtube_dl/extractor/imgur.py b/youtube_dl/extractor/imgur.py
index 59f129d6a..a5ba03efa 100644
--- a/youtube_dl/extractor/imgur.py
+++ b/youtube_dl/extractor/imgur.py
@@ -1,267 +1,101 @@
-# coding: utf-8
 from __future__ import unicode_literals
 
 import re
 
 from .common import InfoExtractor
 from ..utils import (
-    determine_ext,
-    ExtractorError,
-    float_or_none,
     int_or_none,
     js_to_json,
-    merge_dicts,
     mimetype2ext,
-    parse_iso8601,
-    T,
-    traverse_obj,
-    txt_or_none,
-    url_or_none,
+    ExtractorError,
 )
 
 
-class ImgurBaseIE(InfoExtractor):
-    # hard-coded value, as also used by ArchiveTeam
-    _CLIENT_ID = '546c25a59c58ad7'
-
-    @classmethod
-    def _imgur_result(cls, item_id):
-        return cls.url_result('imgur:%s' % item_id, ImgurIE.ie_key(), item_id)
-
-    def _call_api(self, endpoint, video_id, **kwargs):
-        return self._download_json(
-            'https://api.imgur.com/post/v1/%s/%s?client_id=%s&include=media,account' % (endpoint, video_id, self._CLIENT_ID),
-            video_id, **kwargs)
-
-    @staticmethod
-    def get_description(s):
-        if 'Discover the magic of the internet at Imgur' in s:
-            return None
-        return txt_or_none(s)
-
-
-class ImgurIE(ImgurBaseIE):
-    _VALID_URL = r'''(?x)
-        (?:
-            https?://(?:i\.)?imgur\.com/(?!(?:a|gallery|t|topic|r)/)|
-            imgur:
-        )(?P<id>[a-zA-Z0-9]+)
-    '''
+class ImgurIE(InfoExtractor):
+    _VALID_URL = r'https?://(?:i\.)?imgur\.com/(?!(?:a|gallery|(?:t(?:opic)?|r)/[^/]+)/)(?P<id>[a-zA-Z0-9]+)'
 
     _TESTS = [{
-        'url': 'https://imgur.com/A61SaA1',
+        'url': 'https://i.imgur.com/A61SaA1.gifv',
         'info_dict': {
             'id': 'A61SaA1',
             'ext': 'mp4',
             'title': 're:Imgur GIF$|MRW gifv is up and running without any bugs$',
-            'timestamp': 1416446068,
-            'upload_date': '20141120',
         },
     }, {
-        'url': 'https://i.imgur.com/A61SaA1.gifv',
+        'url': 'https://imgur.com/A61SaA1',
         'only_matching': True,
     }, {
         'url': 'https://i.imgur.com/crGpqCV.mp4',
         'only_matching': True,
     }, {
-        # previously, no title
+        # no title
         'url': 'https://i.imgur.com/jxBXAMC.gifv',
-        'info_dict': {
-            'id': 'jxBXAMC',
-            'ext': 'mp4',
-            'title': 'Fahaka puffer feeding',
-            'timestamp': 1533835503,
-            'upload_date': '20180809',
-        },
+        'only_matching': True,
     }]
 
-    def _extract_twitter_formats(self, html, tw_id='twitter', **kwargs):
-        fatal = kwargs.pop('fatal', False)
-        tw_stream = self._html_search_meta('twitter:player:stream', html, fatal=fatal, **kwargs)
-        if not tw_stream:
-            return []
-        ext = mimetype2ext(self._html_search_meta(
-            'twitter:player:stream:content_type', html, default=None))
-        width, height = (int_or_none(self._html_search_meta('twitter:player:' + v, html, default=None))
-                         for v in ('width', 'height'))
-        return [{
-            'format_id': tw_id,
-            'url': tw_stream,
-            'ext': ext or determine_ext(tw_stream),
-            'width': width,
-            'height': height,
-        }]
-
     def _real_extract(self, url):
         video_id = self._match_id(url)
-        data = self._call_api('media', video_id, fatal=False, expected_status=404)
         webpage = self._download_webpage(
-            'https://i.imgur.com/{id}.gifv'.format(id=video_id), video_id, fatal=not data) or ''
+            'https://i.imgur.com/{id}.gifv'.format(id=video_id), video_id)
 
-        if not traverse_obj(data, ('media', 0, (
-                ('type', T(lambda t: t == 'video' or None)),
-                ('metadata', 'is_animated'))), get_all=False):
-            raise ExtractorError(
-                '%s is not a video or animated image' % video_id,
-                expected=True)
-
-        media_fmt = traverse_obj(data, ('media', 0, {
-            'url': ('url', T(url_or_none)),
-            'ext': 'ext',
-            'width': ('width', T(int_or_none)),
-            'height': ('height', T(int_or_none)),
-            'filesize': ('size', T(int_or_none)),
-            'acodec': ('metadata', 'has_sound', T(lambda b: None if b else 'none')),
-        }))
-
-        media_url = traverse_obj(media_fmt, 'url')
-        if media_url:
-            if not media_fmt.get('ext'):
-                media_fmt['ext'] = mimetype2ext(traverse_obj(
-                    data, ('media', 0, 'mime_type'))) or determine_ext(media_url)
-            if traverse_obj(data, ('media', 0, 'type')) == 'image':
-                media_fmt['acodec'] = 'none'
-                media_fmt.setdefault('preference', -10)
-
-        tw_formats = self._extract_twitter_formats(webpage)
-        if traverse_obj(tw_formats, (0, 'url')) == media_url:
-            tw_formats = []
-        else:
-            # maybe this isn't an animated image/video?
-            self._check_formats(tw_formats, video_id)
+        width = int_or_none(self._og_search_property(
+            'video:width', webpage, default=None))
+        height = int_or_none(self._og_search_property(
+            'video:height', webpage, default=None))
 
         video_elements = self._search_regex(
             r'(?s)<div class="video-elements">(.*?)</div>',
             webpage, 'video elements', default=None)
-        if not (video_elements or tw_formats or media_url):
+        if not video_elements:
             raise ExtractorError(
-                'No sources found for video %s. Maybe a plain image?' % video_id,
+                'No sources found for video %s. Maybe an image?' % video_id,
                 expected=True)
 
-        def mung_format(fmt, *extra):
-            fmt.update({
+        formats = []
+        for m in re.finditer(r'<source\s+src="(?P<src>[^"]+)"\s+type="(?P<type>[^"]+)"', video_elements):
+            formats.append({
+                'format_id': m.group('type').partition('/')[2],
+                'url': self._proto_relative_url(m.group('src')),
+                'ext': mimetype2ext(m.group('type')),
+                'width': width,
+                'height': height,
                 'http_headers': {
                     'User-Agent': 'youtube-dl (like wget)',
                 },
             })
-            for d in extra:
-                fmt.update(d)
-            return fmt
 
-        if video_elements:
-            def og_get_size(media_type):
-                return dict((p, int_or_none(self._og_search_property(
-                    ':'.join((media_type, p)), webpage, default=None)))
-                    for p in ('width', 'height'))
-
-            size = og_get_size('video')
-            if all(v is None for v in size.values()):
-                size = og_get_size('image')
-
-            formats = traverse_obj(
-                re.finditer(r'<source\s+src="(?P<src>[^"]+)"\s+type="(?P<type>[^"]+)"', video_elements),
-                (Ellipsis, {
-                    'format_id': ('type', T(lambda s: s.partition('/')[2])),
-                    'url': ('src', T(self._proto_relative_url)),
-                    'ext': ('type', T(mimetype2ext)),
-                }, T(lambda f: mung_format(f, size))))
-
-            gif_json = self._search_regex(
-                r'(?s)var\s+videoItem\s*=\s*(\{.*?\})',
-                webpage, 'GIF code', fatal=False)
-            MUST_BRANCH = (None, T(lambda _: None))
-            formats.extend(traverse_obj(gif_json, (
-                T(lambda j: self._parse_json(
-                    j, video_id, transform_source=js_to_json, fatal=False)), {
-                        'url': ('gifUrl', T(self._proto_relative_url)),
-                        'filesize': ('size', T(int_or_none)),
-                }, T(lambda f: mung_format(f, size, {
-                    'format_id': 'gif',
-                    'preference': -10,  # gifs are worse than videos
-                    'ext': 'gif',
-                    'acodec': 'none',
-                    'vcodec': 'gif',
-                    'container': 'gif',
-                })), MUST_BRANCH)))
-        else:
-            formats = []
-
-        # maybe add formats from JSON or page Twitter metadata
-        if not any((u == media_url) for u in traverse_obj(formats, (Ellipsis, 'url'))):
-            formats.append(mung_format(media_fmt))
-        tw_url = traverse_obj(tw_formats, (0, 'url'))
-        if not any((u == tw_url) for u in traverse_obj(formats, (Ellipsis, 'url'))):
-            formats.extend(mung_format(f) for f in tw_formats)
+        gif_json = self._search_regex(
+            r'(?s)var\s+videoItem\s*=\s*(\{.*?\})',
+            webpage, 'GIF code', fatal=False)
+        if gif_json:
+            gifd = self._parse_json(
+                gif_json, video_id, transform_source=js_to_json)
+            formats.append({
+                'format_id': 'gif',
+                'preference': -10,
+                'width': width,
+                'height': height,
+                'ext': 'gif',
+                'acodec': 'none',
+                'vcodec': 'gif',
+                'container': 'gif',
+                'url': self._proto_relative_url(gifd['gifUrl']),
+                'filesize': gifd.get('size'),
+                'http_headers': {
+                    'User-Agent': 'youtube-dl (like wget)',
+                },
+            })
 
         self._sort_formats(formats)
 
-        return merge_dicts(traverse_obj(data, {
-            'uploader_id': ('account_id', T(txt_or_none),
-                            T(lambda a: a if int_or_none(a) != 0 else None)),
-            'uploader': ('account', 'username', T(txt_or_none)),
-            'uploader_url': ('account', 'avatar_url', T(url_or_none)),
-            'like_count': ('upvote_count', T(int_or_none)),
-            'dislike_count': ('downvote_count', T(int_or_none)),
-            'comment_count': ('comment_count', T(int_or_none)),
-            'age_limit': ('is_mature', T(lambda x: 18 if x else None)),
-            'timestamp': (('updated_at', 'created_at'), T(parse_iso8601)),
-            'release_timestamp': ('created_at', T(parse_iso8601)),
-        }, get_all=False), traverse_obj(data, ('media', 0, 'metadata', {
-            'title': ('title', T(txt_or_none)),
-            'description': ('description', T(self.get_description)),
-            'duration': ('duration', T(float_or_none)),
-            'timestamp': (('updated_at', 'created_at'), T(parse_iso8601)),
-            'release_timestamp': ('created_at', T(parse_iso8601)),
-        })), {
+        return {
             'id': video_id,
             'formats': formats,
-            'title': self._og_search_title(webpage, default='Imgur video ' + video_id),
-            'description': self.get_description(self._og_search_description(webpage)),
-            'thumbnail': url_or_none(self._html_search_meta('thumbnailUrl', webpage, default=None)),
-        })
+            'title': self._og_search_title(webpage, default=video_id),
+        }
 
 
-class ImgurGalleryBaseIE(ImgurBaseIE):
-    _GALLERY = True
-
-    def _real_extract(self, url):
-        gallery_id = self._match_id(url)
-
-        data = self._call_api('albums', gallery_id, fatal=False, expected_status=404)
-
-        info = traverse_obj(data, {
-            'title': ('title', T(txt_or_none)),
-            'description': ('description', T(self.get_description)),
-        })
-
-        if traverse_obj(data, 'is_album'):
-
-            def yield_media_ids():
-                for m_id in traverse_obj(data, (
-                        'media', lambda _, v: v.get('type') == 'video' or v['metadata']['is_animated'],
-                        'id', T(txt_or_none))):
-                    yield m_id
-
-            # if a gallery with exactly one video, apply album metadata to video
-            media_id = (
-                self._GALLERY
-                and traverse_obj(data, ('image_count', T(lambda c: c == 1)))
-                and next(yield_media_ids(), None))
-
-            if not media_id:
-                result = self.playlist_result(
-                    map(self._imgur_result, yield_media_ids()), gallery_id)
-                result.update(info)
-                return result
-            gallery_id = media_id
-
-        result = self._imgur_result(gallery_id)
-        info['_type'] = 'url_transparent'
-        result.update(info)
-        return result
-
-
-class ImgurGalleryIE(ImgurGalleryBaseIE):
+class ImgurGalleryIE(InfoExtractor):
     IE_NAME = 'imgur:gallery'
     _VALID_URL = r'https?://(?:i\.)?imgur\.com/(?:gallery|(?:t(?:opic)?|r)/[^/]+)/(?P<id>[a-zA-Z0-9]+)'
 
@@ -272,93 +106,49 @@ class ImgurGalleryIE(ImgurGalleryBaseIE):
             'title': 'Adding faces make every GIF better',
         },
         'playlist_count': 25,
-        'skip': 'Zoinks! You\'ve taken a wrong turn.',
     }, {
-        # TODO: static images - replace with animated/video gallery
         'url': 'http://imgur.com/topic/Aww/ll5Vk',
         'only_matching': True,
     }, {
         'url': 'https://imgur.com/gallery/YcAQlkx',
-        'add_ies': ['Imgur'],
         'info_dict': {
             'id': 'YcAQlkx',
             'ext': 'mp4',
             'title': 'Classic Steve Carell gif...cracks me up everytime....damn the repost downvotes....',
-            'timestamp': 1358554297,
-            'upload_date': '20130119',
-            'uploader_id': '1648642',
-            'uploader': 'wittyusernamehere',
-        },
+        }
     }, {
-        # TODO: static image - replace with animated/video gallery
         'url': 'http://imgur.com/topic/Funny/N8rOudd',
         'only_matching': True,
     }, {
         'url': 'http://imgur.com/r/aww/VQcQPhM',
-        'add_ies': ['Imgur'],
-        'info_dict': {
-            'id': 'VQcQPhM',
-            'ext': 'mp4',
-            'title': 'The boss is here',
-            'timestamp': 1476494751,
-            'upload_date': '20161015',
-            'uploader_id': '19138530',
-            'uploader': 'thematrixcam',
-        },
-    },
-        # from PR #16674
-        {
-        'url': 'https://imgur.com/t/unmuted/6lAn9VQ',
-        'info_dict': {
-            'id': '6lAn9VQ',
-            'title': 'Penguins !',
-        },
-        'playlist_count': 3,
-    }, {
-        'url': 'https://imgur.com/t/unmuted/kx2uD3C',
-        'add_ies': ['Imgur'],
-        'info_dict': {
-            'id': 'ZVMv45i',
-            'ext': 'mp4',
-            'title': 'Intruder',
-            'timestamp': 1528129683,
-            'upload_date': '20180604',
-        },
-    }, {
-        'url': 'https://imgur.com/t/unmuted/wXSK0YH',
-        'add_ies': ['Imgur'],
-        'info_dict': {
-            'id': 'JCAP4io',
-            'ext': 'mp4',
-            'title': 're:I got the blues$',
-            'description': 'Luka’s vocal stylings.\n\nFP edit: don’t encourage me. I’ll never stop posting Luka and friends.',
-            'timestamp': 1527809525,
-            'upload_date': '20180531',
-        },
+        'only_matching': True,
     }]
 
+    def _real_extract(self, url):
+        gallery_id = self._match_id(url)
 
-class ImgurAlbumIE(ImgurGalleryBaseIE):
+        data = self._download_json(
+            'https://imgur.com/gallery/%s.json' % gallery_id,
+            gallery_id)['data']['image']
+
+        if data.get('is_album'):
+            entries = [
+                self.url_result('http://imgur.com/%s' % image['hash'], ImgurIE.ie_key(), image['hash'])
+                for image in data['album_images']['images'] if image.get('hash')]
+            return self.playlist_result(entries, gallery_id, data.get('title'), data.get('description'))
+
+        return self.url_result('http://imgur.com/%s' % gallery_id, ImgurIE.ie_key(), gallery_id)
+
+
+class ImgurAlbumIE(ImgurGalleryIE):
     IE_NAME = 'imgur:album'
     _VALID_URL = r'https?://(?:i\.)?imgur\.com/a/(?P<id>[a-zA-Z0-9]+)'
-    _GALLERY = False
+
     _TESTS = [{
-        # TODO: only static images - replace with animated/video gallery
         'url': 'http://imgur.com/a/j6Orj',
-        'only_matching': True,
-    },
-        # from PR #21693
-        {
-        'url': 'https://imgur.com/a/iX265HX',
         'info_dict': {
-            'id': 'iX265HX',
-            'title': 'enen-no-shouboutai'
+            'id': 'j6Orj',
+            'title': 'A Literary Analysis of "Star Wars: The Force Awakens"',
         },
-        'playlist_count': 2,
-    }, {
-        'url': 'https://imgur.com/a/8pih2Ed',
-        'info_dict': {
-            'id': '8pih2Ed'
-        },
-        'playlist_mincount': 1,
+        'playlist_count': 12,
     }]
diff --git a/youtube_dl/extractor/infoq.py b/youtube_dl/extractor/infoq.py
index 60b02b699..0a70a1fb4 100644
--- a/youtube_dl/extractor/infoq.py
+++ b/youtube_dl/extractor/infoq.py
@@ -1,9 +1,6 @@
 # coding: utf-8
 
 from __future__ import unicode_literals
-from ..utils import (
-    ExtractorError,
-)
 
 from ..compat import (
     compat_b64decode,
@@ -93,11 +90,7 @@ class InfoQIE(BokeCCBaseIE):
         }]
 
     def _extract_http_audio(self, webpage, video_id):
-        try:
-            fields = self._form_hidden_inputs('mp3Form', webpage)
-        except ExtractorError:
-            fields = {}
-
+        fields = self._form_hidden_inputs('mp3Form', webpage)
         http_audio_url = fields.get('filename')
         if not http_audio_url:
             return []
diff --git a/youtube_dl/extractor/itv.py b/youtube_dl/extractor/itv.py
index 2510ad887..e86c40b42 100644
--- a/youtube_dl/extractor/itv.py
+++ b/youtube_dl/extractor/itv.py
@@ -3,259 +3,123 @@ from __future__ import unicode_literals
 
 import json
 import re
-import sys
 
 from .common import InfoExtractor
 from .brightcove import BrightcoveNewIE
-from ..compat import (
-    compat_HTTPError,
-    compat_integer_types,
-    compat_kwargs,
-    compat_urlparse,
-)
 from ..utils import (
     clean_html,
     determine_ext,
-    error_to_compat_str,
     extract_attributes,
-    ExtractorError,
-    get_element_by_attribute,
-    int_or_none,
+    get_element_by_class,
+    JSON_LD_RE,
     merge_dicts,
     parse_duration,
-    parse_iso8601,
-    remove_start,
     smuggle_url,
-    strip_or_none,
-    traverse_obj,
     url_or_none,
-    urljoin,
 )
 
 
-class ITVBaseIE(InfoExtractor):
-
-    def __handle_request_webpage_error(self, err, video_id=None, errnote=None, fatal=True):
-        if errnote is False:
-            return False
-        if errnote is None:
-            errnote = 'Unable to download webpage'
-
-        errmsg = '%s: %s' % (errnote, error_to_compat_str(err))
-        if fatal:
-            raise ExtractorError(errmsg, sys.exc_info()[2], cause=err, video_id=video_id)
-        else:
-            self._downloader.report_warning(errmsg)
-            return False
-
-    @staticmethod
-    def _vanilla_ua_header():
-        return {'User-Agent': 'Mozilla/5.0'}
-
-    def _download_webpage_handle(self, url, video_id, *args, **kwargs):
-        # specialised to (a) use vanilla UA (b) detect geo-block
-        params = self._downloader.params
-        nkwargs = {}
-        if (
-                'user_agent' not in params
-                and not any(re.match(r'(?i)user-agent\s*:', h)
-                            for h in (params.get('headers') or []))
-                and 'User-Agent' not in (kwargs.get('headers') or {})):
-
-            kwargs.setdefault('headers', {})
-            kwargs['headers'] = self._vanilla_ua_header()
-            nkwargs = kwargs
-        if kwargs.get('expected_status') is not None:
-            exp = kwargs['expected_status']
-            if isinstance(exp, compat_integer_types):
-                exp = [exp]
-            if isinstance(exp, (list, tuple)) and 403 not in exp:
-                kwargs['expected_status'] = [403]
-                kwargs['expected_status'].extend(exp)
-                nkwargs = kwargs
-        else:
-            kwargs['expected_status'] = 403
-            nkwargs = kwargs
-
-        if nkwargs:
-            kwargs = compat_kwargs(kwargs)
-
-        ret = super(ITVBaseIE, self)._download_webpage_handle(url, video_id, *args, **kwargs)
-        if ret is False:
-            return ret
-        webpage, urlh = ret
-
-        if urlh.getcode() == 403:
-            # geo-block error is like this, with an unnecessary 'Of':
-            # '{\n  "Message" : "Request Originated Outside Of Allowed Geographic Region",\
-            # \n  "TransactionId" : "oas-magni-475082-xbYF0W"\n}'
-            if '"Request Originated Outside Of Allowed Geographic Region"' in webpage:
-                self.raise_geo_restricted(countries=['GB'])
-            ret = self.__handle_request_webpage_error(
-                compat_HTTPError(urlh.geturl(), 403, 'HTTP Error 403: Forbidden', urlh.headers, urlh),
-                fatal=kwargs.get('fatal'))
-
-        return ret
-
-
-class ITVIE(ITVBaseIE):
-    _VALID_URL = r'https?://(?:www\.)?itv\.com/(?:(?P<w>watch)|hub)/[^/]+/(?(w)[\w-]+/)(?P<id>\w+)'
-    IE_DESC = 'ITVX'
-    _WORKING = False
-
+class ITVIE(InfoExtractor):
+    _VALID_URL = r'https?://(?:www\.)?itv\.com/hub/[^/]+/(?P<id>[0-9a-zA-Z]+)'
+    _GEO_COUNTRIES = ['GB']
     _TESTS = [{
-        'note': 'Hub URLs redirect to ITVX',
         'url': 'https://www.itv.com/hub/liar/2a4547a0012',
-        'only_matching': True,
-    }, {
-        'note': 'Hub page unavailable via data-playlist-url (404 now)',
-        'url': 'https://www.itv.com/hub/through-the-keyhole/2a2271a0033',
-        'only_matching': True,
-    }, {
-        'note': 'Hub page with InvalidVodcrid (404 now)',
-        'url': 'https://www.itv.com/hub/james-martins-saturday-morning/2a5159a0034',
-        'only_matching': True,
-    }, {
-        'note': 'Hub page with ContentUnavailable (404 now)',
-        'url': 'https://www.itv.com/hub/whos-doing-the-dishes/2a2898a0024',
-        'only_matching': True,
-    }, {
-        'note': 'ITVX, or itvX, show',
-        'url': 'https://www.itv.com/watch/vera/1a7314/1a7314a0014',
-        'md5': 'bd0ad666b2c058fffe7d036785880064',
         'info_dict': {
-            'id': '1a7314a0014',
+            'id': '2a4547a0012',
             'ext': 'mp4',
-            'title': 'Vera - Series 3 - Episode 4 - Prodigal Son',
-            'description': 'Vera and her team investigate the fatal stabbing of an ex-Met police officer outside a busy Newcastle nightclub - but there aren\'t many clues.',
-            'timestamp': 1653591600,
-            'upload_date': '20220526',
-            'uploader': 'ITVX',
-            'thumbnail': r're:https://\w+\.itv\.com/images/(?:\w+/)+\d+x\d+\?',
-            'duration': 5340.8,
-            'age_limit': 16,
-            'series': 'Vera',
-            'series_number': 3,
-            'episode': 'Prodigal Son',
-            'episode_number': 4,
-            'channel': 'ITV3',
-            'categories': list,
+            'title': 'Liar - Series 2 - Episode 6',
+            'description': 'md5:d0f91536569dec79ea184f0a44cca089',
+            'series': 'Liar',
+            'season_number': 2,
+            'episode_number': 6,
         },
         'params': {
             # m3u8 download
-            # 'skip_download': True,
+            'skip_download': True,
         },
-        'skip': 'only available in UK',
     }, {
-        'note': 'Latest ITV news bulletin: details change daily',
-        'url': 'https://www.itv.com/watch/news/varies-but-is-not-checked/6js5d0f',
-        'info_dict': {
-            'id': '6js5d0f',
-            'ext': 'mp4',
-            'title': r're:The latest ITV News headlines - \S.+',
-            'description': r'''re:.* today's top stories from the ITV News team.$''',
-            'timestamp': int,
-            'upload_date': r're:2\d\d\d(?:0[1-9]|1[0-2])(?:[012][1-9]|3[01])',
-            'uploader': 'ITVX',
-            'thumbnail': r're:https://images\.ctfassets\.net/(?:\w+/)+[\w.]+\.(?:jpg|png)',
-            'duration': float,
-            'age_limit': None,
-        },
-        'params': {
-            # variable download
-            # 'skip_download': True,
-        },
-        'skip': 'only available in UK',
-    }
-    ]
-
-    def _og_extract(self, webpage, require_title=False):
-        return {
-            'title': self._og_search_title(webpage, fatal=require_title),
-            'description': self._og_search_description(webpage, default=None),
-            'thumbnail': self._og_search_thumbnail(webpage, default=None),
-            'uploader': self._og_search_property('site_name', webpage, default=None),
-        }
+        # unavailable via data-playlist-url
+        'url': 'https://www.itv.com/hub/through-the-keyhole/2a2271a0033',
+        'only_matching': True,
+    }, {
+        # InvalidVodcrid
+        'url': 'https://www.itv.com/hub/james-martins-saturday-morning/2a5159a0034',
+        'only_matching': True,
+    }, {
+        # ContentUnavailable
+        'url': 'https://www.itv.com/hub/whos-doing-the-dishes/2a2898a0024',
+        'only_matching': True,
+    }]
 
     def _real_extract(self, url):
         video_id = self._match_id(url)
-
         webpage = self._download_webpage(url, video_id)
-
-        # now quite different params!
         params = extract_attributes(self._search_regex(
-            r'''(<[^>]+\b(?:class|data-testid)\s*=\s*("|')genie-container\2[^>]*>)''',
-            webpage, 'params'))
-
-        ios_playlist_url = traverse_obj(
-            params, 'data-video-id', 'data-video-playlist',
-            get_all=False, expected_type=url_or_none)
+            r'(?s)(<[^>]+id="video"[^>]*>)', webpage, 'params'))
 
+        ios_playlist_url = params.get('data-video-playlist') or params['data-video-id']
+        hmac = params['data-video-hmac']
         headers = self.geo_verification_headers()
         headers.update({
             'Accept': 'application/vnd.itv.vod.playlist.v2+json',
             'Content-Type': 'application/json',
+            'hmac': hmac.upper(),
         })
         ios_playlist = self._download_json(
             ios_playlist_url, video_id, data=json.dumps({
                 'user': {
+                    'itvUserId': '',
                     'entitlements': [],
+                    'token': ''
                 },
                 'device': {
-                    'manufacturer': 'Mobile Safari',
-                    'model': '5.1',
+                    'manufacturer': 'Safari',
+                    'model': '5',
                     'os': {
-                        'name': 'iOS',
-                        'version': '5.0',
-                        'type': ' mobile'
+                        'name': 'Windows NT',
+                        'version': '6.1',
+                        'type': 'desktop'
                     }
                 },
                 'client': {
                     'version': '4.1',
-                    'id': 'browser',
-                    'supportsAdPods': True,
-                    'service': 'itv.x',
-                    'appversion': '2.43.28',
+                    'id': 'browser'
                 },
                 'variantAvailability': {
-                    'player': 'hls',
                     'featureset': {
                         'min': ['hls', 'aes', 'outband-webvtt'],
                         'max': ['hls', 'aes', 'outband-webvtt']
                     },
-                    'platformTag': 'mobile'
+                    'platformTag': 'dotcom'
                 }
             }).encode(), headers=headers)
         video_data = ios_playlist['Playlist']['Video']
-        ios_base_url = traverse_obj(video_data, 'Base', expected_type=url_or_none)
-
-        media_url = (
-            (lambda u: url_or_none(urljoin(ios_base_url, u)))
-            if ios_base_url else url_or_none)
+        ios_base_url = video_data.get('Base')
 
         formats = []
-        for media_file in traverse_obj(video_data, 'MediaFiles', expected_type=list) or []:
-            href = traverse_obj(media_file, 'Href', expected_type=media_url)
+        for media_file in (video_data.get('MediaFiles') or []):
+            href = media_file.get('Href')
             if not href:
                 continue
+            if ios_base_url:
+                href = ios_base_url + href
             ext = determine_ext(href)
             if ext == 'm3u8':
                 formats.extend(self._extract_m3u8_formats(
-                    href, video_id, 'mp4', entry_protocol='m3u8',
+                    href, video_id, 'mp4', entry_protocol='m3u8_native',
                     m3u8_id='hls', fatal=False))
-
             else:
                 formats.append({
                     'url': href,
                 })
         self._sort_formats(formats)
-        for f in formats:
-            f.setdefault('http_headers', {})
-            f['http_headers'].update(self._vanilla_ua_header())
 
         subtitles = {}
-        for sub in traverse_obj(video_data, 'Subtitles', expected_type=list) or []:
-            href = traverse_obj(sub, 'Href', expected_type=url_or_none)
+        subs = video_data.get('Subtitles') or []
+        for sub in subs:
+            if not isinstance(sub, dict):
+                continue
+            href = url_or_none(sub.get('Href'))
             if not href:
                 continue
             subtitles.setdefault('en', []).append({
@@ -263,132 +127,59 @@ class ITVIE(ITVBaseIE):
                 'ext': determine_ext(href, 'vtt'),
             })
 
-        next_data = self._search_nextjs_data(webpage, video_id, fatal=False, default={})
-        video_data.update(traverse_obj(next_data, ('props', 'pageProps', ('title', 'episode')), expected_type=dict)[0] or {})
-        title = traverse_obj(video_data, 'headerTitle', 'episodeTitle')
-        info = self._og_extract(webpage, require_title=not title)
-        tn = info.pop('thumbnail', None)
-        if tn:
-            info['thumbnails'] = [{'url': tn}]
-
-        # num. episode title
-        num_ep_title = video_data.get('numberedEpisodeTitle')
-        if not num_ep_title:
-            num_ep_title = clean_html(get_element_by_attribute('data-testid', 'episode-hero-description-strong', webpage))
-            num_ep_title = num_ep_title and num_ep_title.rstrip(' -')
-        ep_title = strip_or_none(
-            video_data.get('episodeTitle')
-            or (num_ep_title.split('.', 1)[-1] if num_ep_title else None))
-        title = title or re.sub(r'\s+-\s+ITVX$', '', info['title'])
-        if ep_title and ep_title != title:
-            title = title + ' - ' + ep_title
-
-        def get_thumbnails():
-            tns = []
-            for w, x in (traverse_obj(video_data, ('imagePresets'), expected_type=dict) or {}).items():
-                if isinstance(x, dict):
-                    for y, z in x.items():
-                        tns.append({'id': w + '_' + y, 'url': z})
-            return tns or None
-
-        video_str = lambda *x: traverse_obj(
-            video_data, *x, get_all=False, expected_type=strip_or_none)
+        info = self._search_json_ld(webpage, video_id, default={})
+        if not info:
+            json_ld = self._parse_json(self._search_regex(
+                JSON_LD_RE, webpage, 'JSON-LD', '{}',
+                group='json_ld'), video_id, fatal=False)
+            if json_ld and json_ld.get('@type') == 'BreadcrumbList':
+                for ile in (json_ld.get('itemListElement:') or []):
+                    item = ile.get('item:') or {}
+                    if item.get('@type') == 'TVEpisode':
+                        item['@context'] = 'http://schema.org'
+                        info = self._json_ld(item, video_id, fatal=False) or {}
+                        break
 
         return merge_dicts({
             'id': video_id,
-            'title': title,
+            'title': self._html_search_meta(['og:title', 'twitter:title'], webpage),
             'formats': formats,
             'subtitles': subtitles,
-            # parsing hh:mm:ss:nnn not yet patched
-            'duration': parse_duration(re.sub(r'(\d{2})(:)(\d{3}$)', r'\1.\3', video_data.get('Duration') or '')),
-            'description': video_str('synopsis'),
-            'timestamp': traverse_obj(video_data, 'broadcastDateTime', 'dateTime', expected_type=parse_iso8601),
-            'thumbnails': get_thumbnails(),
-            'series': video_str('showTitle', 'programmeTitle'),
-            'series_number': int_or_none(video_data.get('seriesNumber')),
-            'episode': ep_title,
-            'episode_number': int_or_none((num_ep_title or '').split('.')[0]),
-            'channel': video_str('channel'),
-            'categories': traverse_obj(video_data, ('categories', 'formatted'), expected_type=list),
-            'age_limit': {False: 16, True: 0}.get(video_data.get('isChildrenCategory')),
+            'duration': parse_duration(video_data.get('Duration')),
+            'description': clean_html(get_element_by_class('episode-info__synopsis', webpage)),
         }, info)
 
 
-class ITVBTCCIE(ITVBaseIE):
-    _VALID_URL = r'https?://(?:www\.)?itv\.com/(?!(?:watch|hub)/)(?:[^/]+/)+(?P<id>[^/?#&]+)'
-    IE_DESC = 'ITV articles: News, British Touring Car Championship'
-    _TESTS = [{
-        'note': 'British Touring Car Championship',
-        'url': 'https://www.itv.com/btcc/articles/btcc-2018-all-the-action-from-brands-hatch',
+class ITVBTCCIE(InfoExtractor):
+    _VALID_URL = r'https?://(?:www\.)?itv\.com/btcc/(?:[^/]+/)*(?P<id>[^/?#&]+)'
+    _TEST = {
+        'url': 'http://www.itv.com/btcc/races/btcc-2018-all-the-action-from-brands-hatch',
         'info_dict': {
             'id': 'btcc-2018-all-the-action-from-brands-hatch',
             'title': 'BTCC 2018: All the action from Brands Hatch',
         },
         'playlist_mincount': 9,
-    }, {
-        'note': 'redirects to /btcc/articles/...',
-        'url': 'http://www.itv.com/btcc/races/btcc-2018-all-the-action-from-brands-hatch',
-        'only_matching': True,
-    }, {
-        'note': 'news article',
-        'url': 'https://www.itv.com/news/wales/2020-07-23/sean-fletcher-shows-off-wales-coastline-in-new-itv-series-as-british-tourists-opt-for-staycations',
-        'info_dict': {
-            'id': 'sean-fletcher-shows-off-wales-coastline-in-new-itv-series-as-british-tourists-opt-for-staycations',
-            'title': '''Sean Fletcher on why Wales' coastline should be your 'staycation' destination | ITV News''',
-        },
-        'playlist_mincount': 1,
-    }]
-
-    # should really be a class var of the BC IE
-    BRIGHTCOVE_URL_TEMPLATE = 'http://players.brightcove.net/%s/%s_default/index.html?videoId=%s'
-    BRIGHTCOVE_ACCOUNT = '1582188683001'
-    BRIGHTCOVE_PLAYER = 'HkiHLnNRx'
+    }
+    BRIGHTCOVE_URL_TEMPLATE = 'http://players.brightcove.net/1582188683001/HkiHLnNRx_default/index.html?videoId=%s'
 
     def _real_extract(self, url):
         playlist_id = self._match_id(url)
 
-        webpage, urlh = self._download_webpage_handle(url, playlist_id)
-        link = compat_urlparse.urlparse(urlh.geturl()).path.strip('/')
+        webpage = self._download_webpage(url, playlist_id)
 
-        next_data = self._search_nextjs_data(webpage, playlist_id, fatal=False, default='{}')
-        path_prefix = compat_urlparse.urlparse(next_data.get('assetPrefix') or '').path.strip('/')
-        link = remove_start(link, path_prefix).strip('/')
-
-        content = traverse_obj(
-            next_data, ('props', 'pageProps', Ellipsis),
-            expected_type=lambda x: x if x['link'] == link else None,
-            get_all=False, default={})
-        content = traverse_obj(
-            content, ('body', 'content', Ellipsis, 'data'),
-            expected_type=lambda x: x if x.get('name') == 'Brightcove' or x.get('type') == 'Brightcove' else None)
-
-        contraband = {
-            # ITV does not like some GB IP ranges, so here are some
-            # IP blocks it accepts
-            'geo_ip_blocks': [
-                '193.113.0.0/16', '54.36.162.0/23', '159.65.16.0/21'
-            ],
-            'referrer': urlh.geturl(),
-        }
-
-        def entries():
-
-            for data in content or []:
-                video_id = data.get('id')
-                if not video_id:
-                    continue
-                account = data.get('accountId') or self.BRIGHTCOVE_ACCOUNT
-                player = data.get('playerId') or self.BRIGHTCOVE_PLAYER
-                yield self.url_result(
-                    smuggle_url(self.BRIGHTCOVE_URL_TEMPLATE % (account, player, video_id), contraband),
-                    ie=BrightcoveNewIE.ie_key(), video_id=video_id)
-
-            # obsolete ?
-            for video_id in re.findall(r'''data-video-id=["'](\d+)''', webpage):
-                yield self.url_result(
-                    smuggle_url(self.BRIGHTCOVE_URL_TEMPLATE % (self.BRIGHTCOVE_ACCOUNT, self.BRIGHTCOVE_PLAYER, video_id), contraband),
-                    ie=BrightcoveNewIE.ie_key(), video_id=video_id)
+        entries = [
+            self.url_result(
+                smuggle_url(self.BRIGHTCOVE_URL_TEMPLATE % video_id, {
+                    # ITV does not like some GB IP ranges, so here are some
+                    # IP blocks it accepts
+                    'geo_ip_blocks': [
+                        '193.113.0.0/16', '54.36.162.0/23', '159.65.16.0/21'
+                    ],
+                    'referrer': url,
+                }),
+                ie=BrightcoveNewIE.ie_key(), video_id=video_id)
+            for video_id in re.findall(r'data-video-id=["\'](\d+)', webpage)]
 
         title = self._og_search_title(webpage, fatal=False)
 
-        return self.playlist_result(entries(), playlist_id, title)
+        return self.playlist_result(entries, playlist_id, title)
diff --git a/youtube_dl/extractor/jamendo.py b/youtube_dl/extractor/jamendo.py
index 1db7c64af..490efa8fb 100644
--- a/youtube_dl/extractor/jamendo.py
+++ b/youtube_dl/extractor/jamendo.py
@@ -29,51 +29,34 @@ class JamendoIE(InfoExtractor):
             'id': '196219',
             'display_id': 'stories-from-emona-i',
             'ext': 'flac',
-            # 'title': 'Maya Filipič - Stories from Emona I',
-            'title': 'Stories from Emona I',
-            # 'artist': 'Maya Filipič',
+            'title': 'Maya Filipič - Stories from Emona I',
+            'artist': 'Maya Filipič',
             'track': 'Stories from Emona I',
             'duration': 210,
             'thumbnail': r're:^https?://.*\.jpg',
             'timestamp': 1217438117,
             'upload_date': '20080730',
-            'license': 'by-nc-nd',
-            'view_count': int,
-            'like_count': int,
-            'average_rating': int,
-            'tags': ['piano', 'peaceful', 'newage', 'strings', 'upbeat'],
         }
     }, {
         'url': 'https://licensing.jamendo.com/en/track/1496667/energetic-rock',
         'only_matching': True,
     }]
 
-    def _call_api(self, resource, resource_id):
-        path = '/api/%ss' % resource
-        rand = compat_str(random.random())
-        return self._download_json(
-            'https://www.jamendo.com' + path, resource_id, query={
-                'id[]': resource_id,
-            }, headers={
-                'X-Jam-Call': '$%s*%s~' % (hashlib.sha1((path + rand).encode()).hexdigest(), rand)
-            })[0]
-
     def _real_extract(self, url):
         track_id, display_id = self._VALID_URL_RE.match(url).groups()
-        # webpage = self._download_webpage(
-        #     'https://www.jamendo.com/track/' + track_id, track_id)
-        # models = self._parse_json(self._html_search_regex(
-        #     r"data-bundled-models='([^']+)",
-        #     webpage, 'bundled models'), track_id)
-        # track = models['track']['models'][0]
-        track = self._call_api('track', track_id)
+        webpage = self._download_webpage(
+            'https://www.jamendo.com/track/' + track_id, track_id)
+        models = self._parse_json(self._html_search_regex(
+            r"data-bundled-models='([^']+)",
+            webpage, 'bundled models'), track_id)
+        track = models['track']['models'][0]
         title = track_name = track['name']
-        # get_model = lambda x: try_get(models, lambda y: y[x]['models'][0], dict) or {}
-        # artist = get_model('artist')
-        # artist_name = artist.get('name')
-        # if artist_name:
-        #     title = '%s - %s' % (artist_name, title)
-        # album = get_model('album')
+        get_model = lambda x: try_get(models, lambda y: y[x]['models'][0], dict) or {}
+        artist = get_model('artist')
+        artist_name = artist.get('name')
+        if artist_name:
+            title = '%s - %s' % (artist_name, title)
+        album = get_model('album')
 
         formats = [{
             'url': 'https://%s.jamendo.com/?trackid=%s&format=%s&from=app-97dab294'
@@ -91,7 +74,7 @@ class JamendoIE(InfoExtractor):
 
         urls = []
         thumbnails = []
-        for covers in (track.get('cover') or {}).values():
+        for _, covers in track.get('cover', {}).items():
             for cover_id, cover_url in covers.items():
                 if not cover_url or cover_url in urls:
                     continue
@@ -105,14 +88,13 @@ class JamendoIE(InfoExtractor):
                 })
 
         tags = []
-        for tag in (track.get('tags') or []):
+        for tag in track.get('tags', []):
             tag_name = tag.get('name')
             if not tag_name:
                 continue
             tags.append(tag_name)
 
         stats = track.get('stats') or {}
-        license = track.get('licenseCC') or []
 
         return {
             'id': track_id,
@@ -121,11 +103,11 @@ class JamendoIE(InfoExtractor):
             'title': title,
             'description': track.get('description'),
             'duration': int_or_none(track.get('duration')),
-            # 'artist': artist_name,
+            'artist': artist_name,
             'track': track_name,
-            # 'album': album.get('name'),
+            'album': album.get('name'),
             'formats': formats,
-            'license': '-'.join(license) if license else None,
+            'license': '-'.join(track.get('licenseCC', [])) or None,
             'timestamp': int_or_none(track.get('dateCreated')),
             'view_count': int_or_none(stats.get('listenedAll')),
             'like_count': int_or_none(stats.get('favorited')),
@@ -134,9 +116,9 @@ class JamendoIE(InfoExtractor):
         }
 
 
-class JamendoAlbumIE(JamendoIE):
+class JamendoAlbumIE(InfoExtractor):
     _VALID_URL = r'https?://(?:www\.)?jamendo\.com/album/(?P<id>[0-9]+)'
-    _TESTS = [{
+    _TEST = {
         'url': 'https://www.jamendo.com/album/121486/duck-on-cover',
         'info_dict': {
             'id': '121486',
@@ -169,7 +151,17 @@ class JamendoAlbumIE(JamendoIE):
         'params': {
             'playlistend': 2
         }
-    }]
+    }
+
+    def _call_api(self, resource, resource_id):
+        path = '/api/%ss' % resource
+        rand = compat_str(random.random())
+        return self._download_json(
+            'https://www.jamendo.com' + path, resource_id, query={
+                'id[]': resource_id,
+            }, headers={
+                'X-Jam-Call': '$%s*%s~' % (hashlib.sha1((path + rand).encode()).hexdigest(), rand)
+            })[0]
 
     def _real_extract(self, url):
         album_id = self._match_id(url)
@@ -177,7 +169,7 @@ class JamendoAlbumIE(JamendoIE):
         album_name = album.get('name')
 
         entries = []
-        for track in (album.get('tracks') or []):
+        for track in album.get('tracks', []):
             track_id = track.get('id')
             if not track_id:
                 continue
diff --git a/youtube_dl/extractor/kaltura.py b/youtube_dl/extractor/kaltura.py
index 6d4d93394..49d13460d 100644
--- a/youtube_dl/extractor/kaltura.py
+++ b/youtube_dl/extractor/kaltura.py
@@ -120,7 +120,7 @@ class KalturaIE(InfoExtractor):
     def _extract_urls(webpage):
         # Embed codes: https://knowledge.kaltura.com/embedding-kaltura-media-players-your-site
         finditer = (
-            list(re.finditer(
+            re.finditer(
                 r"""(?xs)
                     kWidget\.(?:thumb)?[Ee]mbed\(
                     \{.*?
@@ -128,8 +128,8 @@ class KalturaIE(InfoExtractor):
                         (?P<q2>['"])_?(?P<partner_id>(?:(?!(?P=q2)).)+)(?P=q2),.*?
                         (?P<q3>['"])entry_?[Ii]d(?P=q3)\s*:\s*
                         (?P<q4>['"])(?P<id>(?:(?!(?P=q4)).)+)(?P=q4)(?:,|\s*\})
-                """, webpage))
-            or list(re.finditer(
+                """, webpage)
+            or re.finditer(
                 r'''(?xs)
                     (?P<q1>["'])
                         (?:https?:)?//cdnapi(?:sec)?\.kaltura\.com(?::\d+)?/(?:(?!(?P=q1)).)*\b(?:p|partner_id)/(?P<partner_id>\d+)(?:(?!(?P=q1)).)*
@@ -142,16 +142,16 @@ class KalturaIE(InfoExtractor):
                         \[\s*(?P<q2_1>["'])entry_?[Ii]d(?P=q2_1)\s*\]\s*=\s*
                     )
                     (?P<q3>["'])(?P<id>(?:(?!(?P=q3)).)+)(?P=q3)
-                ''', webpage))
-            or list(re.finditer(
+                ''', webpage)
+            or re.finditer(
                 r'''(?xs)
-                    <(?:iframe[^>]+src|meta[^>]+\bcontent)=(?P<q1>["'])\s*
+                    <(?:iframe[^>]+src|meta[^>]+\bcontent)=(?P<q1>["'])
                       (?:https?:)?//(?:(?:www|cdnapi(?:sec)?)\.)?kaltura\.com/(?:(?!(?P=q1)).)*\b(?:p|partner_id)/(?P<partner_id>\d+)
                       (?:(?!(?P=q1)).)*
                       [?&;]entry_id=(?P<id>(?:(?!(?P=q1))[^&])+)
                       (?:(?!(?P=q1)).)*
                     (?P=q1)
-                ''', webpage))
+                ''', webpage)
         )
         urls = []
         for mobj in finditer:
@@ -373,5 +373,5 @@ class KalturaIE(InfoExtractor):
             'duration': info.get('duration'),
             'timestamp': info.get('createdAt'),
             'uploader_id': info.get('userId') if info.get('userId') != 'None' else None,
-            'view_count': int_or_none(info.get('plays')),
+            'view_count': info.get('plays'),
         }
diff --git a/youtube_dl/extractor/kommunetv.py b/youtube_dl/extractor/kommunetv.py
deleted file mode 100644
index 91d06a74f..000000000
--- a/youtube_dl/extractor/kommunetv.py
+++ /dev/null
@@ -1,35 +0,0 @@
-# coding: utf-8
-from __future__ import unicode_literals
-
-from .common import InfoExtractor
-from ..utils import update_url
-
-
-class KommunetvIE(InfoExtractor):
-    _VALID_URL = r'https://(\w+).kommunetv.no/archive/(?P<id>\w+)'
-    _TEST = {
-        'url': 'https://oslo.kommunetv.no/archive/921',
-        'md5': '5f102be308ee759be1e12b63d5da4bbc',
-        'info_dict': {
-            'id': '921',
-            'title': 'Bystyremøte',
-            'ext': 'mp4'
-        }
-    }
-
-    def _real_extract(self, url):
-        video_id = self._match_id(url)
-        headers = {
-            'Accept': 'application/json'
-        }
-        data = self._download_json('https://oslo.kommunetv.no/api/streams?streamType=1&id=%s' % video_id, video_id, headers=headers)
-        title = data['stream']['title']
-        file = data['playlist'][0]['playlist'][0]['file']
-        url = update_url(file, query=None, fragment=None)
-        formats = self._extract_m3u8_formats(url, video_id, ext='mp4', entry_protocol='m3u8_native', m3u8_id='hls', fatal=False)
-        self._sort_formats(formats)
-        return {
-            'id': video_id,
-            'formats': formats,
-            'title': title
-        }
diff --git a/youtube_dl/extractor/kth.py b/youtube_dl/extractor/kth.py
deleted file mode 100644
index b8db461f5..000000000
--- a/youtube_dl/extractor/kth.py
+++ /dev/null
@@ -1,31 +0,0 @@
-# coding: utf-8
-from __future__ import unicode_literals
-
-from .common import InfoExtractor
-from ..utils import smuggle_url
-
-
-class KTHIE(InfoExtractor):
-    _VALID_URL = r'https?://play\.kth\.se/(?:[^/]+/)+(?P<id>[a-z0-9_]+)'
-    _TEST = {
-        'url': 'https://play.kth.se/media/Lunch+breakA+De+nya+aff%C3%A4rerna+inom+Fordonsdalen/0_uoop6oz9',
-        'md5': 'd83ada6d00ca98b73243a88efe19e8a6',
-        'info_dict': {
-            'id': '0_uoop6oz9',
-            'ext': 'mp4',
-            'title': 'md5:bd1d6931facb6828762a33e6ce865f37',
-            'thumbnail': 're:https?://.+/thumbnail/.+',
-            'duration': 3516,
-            'timestamp': 1647345358,
-            'upload_date': '20220315',
-            'uploader_id': 'md5:0ec23e33a89e795a4512930c8102509f',
-        }
-    }
-
-    def _real_extract(self, url):
-        video_id = self._match_id(url)
-        result = self.url_result(
-            smuggle_url('kaltura:308:%s' % video_id, {
-                'service_url': 'https://api.kaltura.nordu.net'}),
-            'Kaltura')
-        return result
diff --git a/youtube_dl/extractor/lbry.py b/youtube_dl/extractor/lbry.py
index cfd6b8393..ae43d56ea 100644
--- a/youtube_dl/extractor/lbry.py
+++ b/youtube_dl/extractor/lbry.py
@@ -120,26 +120,6 @@ class LBRYIE(LBRYBaseIE):
             'channel_url': 'https://lbry.tv/@LBRYFoundation:0ed629d2b9c601300cacf7eabe9da0be79010212',
             'vcodec': 'none',
         }
-    }, {
-        # HLS
-        'url': 'https://odysee.com/@gardeningincanada:b/plants-i-will-never-grow-again.-the:e',
-        'md5': 'fc82f45ea54915b1495dd7cb5cc1289f',
-        'info_dict': {
-            'id': 'e51671357333fe22ae88aad320bde2f6f96b1410',
-            'ext': 'mp4',
-            'title': 'PLANTS I WILL NEVER GROW AGAIN. THE BLACK LIST PLANTS FOR A CANADIAN GARDEN | Gardening in Canada 🍁',
-            'description': 'md5:9c539c6a03fb843956de61a4d5288d5e',
-            'timestamp': 1618254123,
-            'upload_date': '20210412',
-            'release_timestamp': 1618254002,
-            'release_date': '20210412',
-            'tags': list,
-            'duration': 554,
-            'channel': 'Gardening In Canada',
-            'channel_id': 'b8be0e93b423dad221abe29545fbe8ec36e806bc',
-            'channel_url': 'https://odysee.com/@gardeningincanada:b8be0e93b423dad221abe29545fbe8ec36e806bc',
-            'formats': 'mincount:3',
-        }
     }, {
         'url': 'https://odysee.com/@BrodieRobertson:5/apple-is-tracking-everything-you-do-on:e',
         'only_matching': True,
@@ -183,18 +163,10 @@ class LBRYIE(LBRYBaseIE):
         streaming_url = self._call_api_proxy(
             'get', claim_id, {'uri': uri}, 'streaming url')['streaming_url']
         info = self._parse_stream(result, url)
-        urlh = self._request_webpage(
-            streaming_url, display_id, note='Downloading streaming redirect url info')
-        if determine_ext(urlh.geturl()) == 'm3u8':
-            info['formats'] = self._extract_m3u8_formats(
-                urlh.geturl(), display_id, 'mp4', entry_protocol='m3u8_native',
-                m3u8_id='hls')
-            self._sort_formats(info['formats'])
-        else:
-            info['url'] = streaming_url
         info.update({
             'id': claim_id,
             'title': title,
+            'url': streaming_url,
         })
         return info
 
diff --git a/youtube_dl/extractor/liveleak.py b/youtube_dl/extractor/liveleak.py
new file mode 100644
index 000000000..4ac437c8b
--- /dev/null
+++ b/youtube_dl/extractor/liveleak.py
@@ -0,0 +1,191 @@
+from __future__ import unicode_literals
+
+import re
+
+from .common import InfoExtractor
+from ..utils import int_or_none
+
+
+class LiveLeakIE(InfoExtractor):
+    _VALID_URL = r'https?://(?:\w+\.)?liveleak\.com/view\?.*?\b[it]=(?P<id>[\w_]+)'
+    _TESTS = [{
+        'url': 'http://www.liveleak.com/view?i=757_1364311680',
+        'md5': '0813c2430bea7a46bf13acf3406992f4',
+        'info_dict': {
+            'id': '757_1364311680',
+            'ext': 'mp4',
+            'description': 'extremely bad day for this guy..!',
+            'uploader': 'ljfriel2',
+            'title': 'Most unlucky car accident',
+            'thumbnail': r're:^https?://.*\.jpg$'
+        }
+    }, {
+        'url': 'http://www.liveleak.com/view?i=f93_1390833151',
+        'md5': 'd3f1367d14cc3c15bf24fbfbe04b9abf',
+        'info_dict': {
+            'id': 'f93_1390833151',
+            'ext': 'mp4',
+            'description': 'German Television Channel NDR does an exclusive interview with Edward Snowden.\r\nUploaded on LiveLeak cause German Television thinks the rest of the world isn\'t intereseted in Edward Snowden.',
+            'uploader': 'ARD_Stinkt',
+            'title': 'German Television does first Edward Snowden Interview (ENGLISH)',
+            'thumbnail': r're:^https?://.*\.jpg$'
+        }
+    }, {
+        # Prochan embed
+        'url': 'http://www.liveleak.com/view?i=4f7_1392687779',
+        'md5': '42c6d97d54f1db107958760788c5f48f',
+        'info_dict': {
+            'id': '4f7_1392687779',
+            'ext': 'mp4',
+            'description': "The guy with the cigarette seems amazingly nonchalant about the whole thing...  I really hope my friends' reactions would be a bit stronger.\r\n\r\nAction-go to 0:55.",
+            'uploader': 'CapObveus',
+            'title': 'Man is Fatally Struck by Reckless Car While Packing up a Moving Truck',
+            'age_limit': 18,
+        },
+        'skip': 'Video is dead',
+    }, {
+        # Covers https://github.com/ytdl-org/youtube-dl/pull/5983
+        # Multiple resolutions
+        'url': 'http://www.liveleak.com/view?i=801_1409392012',
+        'md5': 'c3a449dbaca5c0d1825caecd52a57d7b',
+        'info_dict': {
+            'id': '801_1409392012',
+            'ext': 'mp4',
+            'description': 'Happened on 27.7.2014. \r\nAt 0:53 you can see people still swimming at near beach.',
+            'uploader': 'bony333',
+            'title': 'Crazy Hungarian tourist films close call waterspout in Croatia',
+            'thumbnail': r're:^https?://.*\.jpg$'
+        }
+    }, {
+        # Covers https://github.com/ytdl-org/youtube-dl/pull/10664#issuecomment-247439521
+        'url': 'http://m.liveleak.com/view?i=763_1473349649',
+        'add_ie': ['Youtube'],
+        'info_dict': {
+            'id': '763_1473349649',
+            'ext': 'mp4',
+            'title': 'Reporters and public officials ignore epidemic of black on asian violence in Sacramento | Colin Flaherty',
+            'description': 'Colin being the warrior he is and showing the injustice Asians in Sacramento are being subjected to.',
+            'uploader': 'Ziz',
+            'upload_date': '20160908',
+            'uploader_id': 'UCEbta5E_jqlZmEJsriTEtnw'
+        },
+        'params': {
+            'skip_download': True,
+        },
+    }, {
+        'url': 'https://www.liveleak.com/view?i=677_1439397581',
+        'info_dict': {
+            'id': '677_1439397581',
+            'title': 'Fuel Depot in China Explosion caught on video',
+        },
+        'playlist_count': 3,
+    }, {
+        'url': 'https://www.liveleak.com/view?t=HvHi_1523016227',
+        'only_matching': True,
+    }, {
+        # No original video
+        'url': 'https://www.liveleak.com/view?t=C26ZZ_1558612804',
+        'only_matching': True,
+    }]
+
+    @staticmethod
+    def _extract_urls(webpage):
+        return re.findall(
+            r'<iframe[^>]+src="(https?://(?:\w+\.)?liveleak\.com/ll_embed\?[^"]*[ift]=[\w_]+[^"]+)"',
+            webpage)
+
+    def _real_extract(self, url):
+        video_id = self._match_id(url)
+        webpage = self._download_webpage(url, video_id)
+
+        video_title = self._og_search_title(webpage).replace('LiveLeak.com -', '').strip()
+        video_description = self._og_search_description(webpage)
+        video_uploader = self._html_search_regex(
+            r'By:.*?(\w+)</a>', webpage, 'uploader', fatal=False)
+        age_limit = int_or_none(self._search_regex(
+            r'you confirm that you are ([0-9]+) years and over.',
+            webpage, 'age limit', default=None))
+        video_thumbnail = self._og_search_thumbnail(webpage)
+
+        entries = self._parse_html5_media_entries(url, webpage, video_id)
+        if not entries:
+            # Maybe an embed?
+            embed_url = self._search_regex(
+                r'<iframe[^>]+src="((?:https?:)?//(?:www\.)?(?:prochan|youtube)\.com/embed[^"]+)"',
+                webpage, 'embed URL')
+            return {
+                '_type': 'url_transparent',
+                'url': embed_url,
+                'id': video_id,
+                'title': video_title,
+                'description': video_description,
+                'uploader': video_uploader,
+                'age_limit': age_limit,
+            }
+
+        for idx, info_dict in enumerate(entries):
+            formats = []
+            for a_format in info_dict['formats']:
+                if not a_format.get('height'):
+                    a_format['height'] = int_or_none(self._search_regex(
+                        r'([0-9]+)p\.mp4', a_format['url'], 'height label',
+                        default=None))
+                formats.append(a_format)
+
+                # Removing '.*.mp4' gives the raw video, which is essentially
+                # the same video without the LiveLeak logo at the top (see
+                # https://github.com/ytdl-org/youtube-dl/pull/4768)
+                orig_url = re.sub(r'\.mp4\.[^.]+', '', a_format['url'])
+                if a_format['url'] != orig_url:
+                    format_id = a_format.get('format_id')
+                    format_id = 'original' + ('-' + format_id if format_id else '')
+                    if self._is_valid_url(orig_url, video_id, format_id):
+                        formats.append({
+                            'format_id': format_id,
+                            'url': orig_url,
+                            'preference': 1,
+                        })
+            self._sort_formats(formats)
+            info_dict['formats'] = formats
+
+            # Don't append entry ID for one-video pages to keep backward compatibility
+            if len(entries) > 1:
+                info_dict['id'] = '%s_%s' % (video_id, idx + 1)
+            else:
+                info_dict['id'] = video_id
+
+            info_dict.update({
+                'title': video_title,
+                'description': video_description,
+                'uploader': video_uploader,
+                'age_limit': age_limit,
+                'thumbnail': video_thumbnail,
+            })
+
+        return self.playlist_result(entries, video_id, video_title)
+
+
+class LiveLeakEmbedIE(InfoExtractor):
+    _VALID_URL = r'https?://(?:www\.)?liveleak\.com/ll_embed\?.*?\b(?P<kind>[ift])=(?P<id>[\w_]+)'
+
+    # See generic.py for actual test cases
+    _TESTS = [{
+        'url': 'https://www.liveleak.com/ll_embed?i=874_1459135191',
+        'only_matching': True,
+    }, {
+        'url': 'https://www.liveleak.com/ll_embed?f=ab065df993c1',
+        'only_matching': True,
+    }]
+
+    def _real_extract(self, url):
+        kind, video_id = re.match(self._VALID_URL, url).groups()
+
+        if kind == 'f':
+            webpage = self._download_webpage(url, video_id)
+            liveleak_url = self._search_regex(
+                r'(?:logourl\s*:\s*|window\.open\()(?P<q1>[\'"])(?P<url>%s)(?P=q1)' % LiveLeakIE._VALID_URL,
+                webpage, 'LiveLeak URL', group='url')
+        else:
+            liveleak_url = 'http://www.liveleak.com/view?%s=%s' % (kind, video_id)
+
+        return self.url_result(liveleak_url, ie=LiveLeakIE.ie_key())
diff --git a/youtube_dl/extractor/manyvids.py b/youtube_dl/extractor/manyvids.py
index 75978cfd6..e8d7163e4 100644
--- a/youtube_dl/extractor/manyvids.py
+++ b/youtube_dl/extractor/manyvids.py
@@ -1,16 +1,11 @@
 # coding: utf-8
 from __future__ import unicode_literals
 
-import re
-
 from .common import InfoExtractor
-from ..compat import compat_str
 from ..utils import (
     determine_ext,
-    extract_attributes,
     int_or_none,
     str_to_int,
-    url_or_none,
     urlencode_postdata,
 )
 
@@ -25,20 +20,17 @@ class ManyVidsIE(InfoExtractor):
             'id': '133957',
             'ext': 'mp4',
             'title': 'everthing about me (Preview)',
-            'uploader': 'ellyxxix',
             'view_count': int,
             'like_count': int,
         },
     }, {
         # full video
         'url': 'https://www.manyvids.com/Video/935718/MY-FACE-REVEAL/',
-        'md5': 'bb47bab0e0802c2a60c24ef079dfe60f',
+        'md5': 'f3e8f7086409e9b470e2643edb96bdcc',
         'info_dict': {
             'id': '935718',
             'ext': 'mp4',
             'title': 'MY FACE REVEAL',
-            'description': 'md5:ec5901d41808b3746fed90face161612',
-            'uploader': 'Sarah Calanthe',
             'view_count': int,
             'like_count': int,
         },
@@ -47,50 +39,17 @@ class ManyVidsIE(InfoExtractor):
     def _real_extract(self, url):
         video_id = self._match_id(url)
 
-        real_url = 'https://www.manyvids.com/video/%s/gtm.js' % (video_id, )
-        try:
-            webpage = self._download_webpage(real_url, video_id)
-        except Exception:
-            # probably useless fallback
-            webpage = self._download_webpage(url, video_id)
+        webpage = self._download_webpage(url, video_id)
 
-        info = self._search_regex(
-            r'''(<div\b[^>]*\bid\s*=\s*(['"])pageMetaDetails\2[^>]*>)''',
-            webpage, 'meta details', default='')
-        info = extract_attributes(info)
+        video_url = self._search_regex(
+            r'data-(?:video-filepath|meta-video)\s*=s*(["\'])(?P<url>(?:(?!\1).)+)\1',
+            webpage, 'video URL', group='url')
 
-        player = self._search_regex(
-            r'''(<div\b[^>]*\bid\s*=\s*(['"])rmpPlayerStream\2[^>]*>)''',
-            webpage, 'player details', default='')
-        player = extract_attributes(player)
-
-        video_urls_and_ids = (
-            (info.get('data-meta-video'), 'video'),
-            (player.get('data-video-transcoded'), 'transcoded'),
-            (player.get('data-video-filepath'), 'filepath'),
-            (self._og_search_video_url(webpage, secure=False, default=None), 'og_video'),
-        )
-
-        def txt_or_none(s, default=None):
-            return (s.strip() or default) if isinstance(s, compat_str) else default
-
-        uploader = txt_or_none(info.get('data-meta-author'))
-
-        def mung_title(s):
-            if uploader:
-                s = re.sub(r'^\s*%s\s+[|-]' % (re.escape(uploader), ), '', s)
-            return txt_or_none(s)
-
-        title = (
-            mung_title(info.get('data-meta-title'))
-            or self._html_search_regex(
-                (r'<span[^>]+class=["\']item-title[^>]+>([^<]+)',
-                 r'<h2[^>]+class=["\']h2 m-0["\'][^>]*>([^<]+)'),
-                webpage, 'title', default=None)
-            or self._html_search_meta(
-                'twitter:title', webpage, 'title', fatal=True))
-
-        title = re.sub(r'\s*[|-]\s+ManyVids\s*$', '', title) or title
+        title = self._html_search_regex(
+            (r'<span[^>]+class=["\']item-title[^>]+>([^<]+)',
+             r'<h2[^>]+class=["\']h2 m-0["\'][^>]*>([^<]+)'),
+            webpage, 'title', default=None) or self._html_search_meta(
+            'twitter:title', webpage, 'title', fatal=True)
 
         if any(p in webpage for p in ('preview_videos', '_preview.mp4')):
             title += ' (Preview)'
@@ -103,8 +62,7 @@ class ManyVidsIE(InfoExtractor):
             # Sets some cookies
             self._download_webpage(
                 'https://www.manyvids.com/includes/ajax_repository/you_had_me_at_hello.php',
-                video_id, note='Setting format cookies', fatal=False,
-                data=urlencode_postdata({
+                video_id, fatal=False, data=urlencode_postdata({
                     'mvtoken': mv_token,
                     'vid': video_id,
                 }), headers={
@@ -112,56 +70,23 @@ class ManyVidsIE(InfoExtractor):
                     'X-Requested-With': 'XMLHttpRequest'
                 })
 
-        formats = []
-        for v_url, fmt in video_urls_and_ids:
-            v_url = url_or_none(v_url)
-            if not v_url:
-                continue
-            if determine_ext(v_url) == 'm3u8':
-                formats.extend(self._extract_m3u8_formats(
-                    v_url, video_id, 'mp4', entry_protocol='m3u8_native',
-                    m3u8_id='hls'))
-            else:
-                formats.append({
-                    'url': v_url,
-                    'format_id': fmt,
-                })
+        if determine_ext(video_url) == 'm3u8':
+            formats = self._extract_m3u8_formats(
+                video_url, video_id, 'mp4', entry_protocol='m3u8_native',
+                m3u8_id='hls')
+        else:
+            formats = [{'url': video_url}]
 
-        self._remove_duplicate_formats(formats)
-
-        for f in formats:
-            if f.get('height') is None:
-                f['height'] = int_or_none(
-                    self._search_regex(r'_(\d{2,3}[02468])_', f['url'], 'video height', default=None))
-            if '/preview/' in f['url']:
-                f['format_id'] = '_'.join(filter(None, (f.get('format_id'), 'preview')))
-                f['preference'] = -10
-            if 'transcoded' in f['format_id']:
-                f['preference'] = f.get('preference', -1) - 1
-
-        self._sort_formats(formats)
-
-        def get_likes():
-            likes = self._search_regex(
-                r'''(<a\b[^>]*\bdata-id\s*=\s*(['"])%s\2[^>]*>)''' % (video_id, ),
-                webpage, 'likes', default='')
-            likes = extract_attributes(likes)
-            return int_or_none(likes.get('data-likes'))
-
-        def get_views():
-            return str_to_int(self._html_search_regex(
-                r'''(?s)<span\b[^>]*\bclass\s*=["']views-wrapper\b[^>]+>.+?<span\b[^>]+>\s*(\d[\d,.]*)\s*</span>''',
-                webpage, 'view count', default=None))
+        like_count = int_or_none(self._search_regex(
+            r'data-likes=["\'](\d+)', webpage, 'like count', default=None))
+        view_count = str_to_int(self._html_search_regex(
+            r'(?s)<span[^>]+class="views-wrapper"[^>]*>(.+?)</span', webpage,
+            'view count', default=None))
 
         return {
             'id': video_id,
             'title': title,
+            'view_count': view_count,
+            'like_count': like_count,
             'formats': formats,
-            'description': txt_or_none(info.get('data-meta-description')),
-            'uploader': txt_or_none(info.get('data-meta-author')),
-            'thumbnail': (
-                url_or_none(info.get('data-meta-image'))
-                or url_or_none(player.get('data-video-screenshot'))),
-            'view_count': get_views(),
-            'like_count': get_likes(),
         }
diff --git a/youtube_dl/extractor/maoritv.py b/youtube_dl/extractor/maoritv.py
deleted file mode 100644
index 0d23fec75..000000000
--- a/youtube_dl/extractor/maoritv.py
+++ /dev/null
@@ -1,31 +0,0 @@
-# coding: utf-8
-from __future__ import unicode_literals
-
-from .common import InfoExtractor
-
-
-class MaoriTVIE(InfoExtractor):
-    _VALID_URL = r'https?://(?:www\.)?maoritelevision\.com/shows/(?:[^/]+/)+(?P<id>[^/?&#]+)'
-    _TEST = {
-        'url': 'https://www.maoritelevision.com/shows/korero-mai/S01E054/korero-mai-series-1-episode-54',
-        'md5': '5ade8ef53851b6a132c051b1cd858899',
-        'info_dict': {
-            'id': '4774724855001',
-            'ext': 'mp4',
-            'title': 'Kōrero Mai, Series 1 Episode 54',
-            'upload_date': '20160226',
-            'timestamp': 1456455018,
-            'description': 'md5:59bde32fd066d637a1a55794c56d8dcb',
-            'uploader_id': '1614493167001',
-        },
-    }
-    BRIGHTCOVE_URL_TEMPLATE = 'http://players.brightcove.net/1614493167001/HJlhIQhQf_default/index.html?videoId=%s'
-
-    def _real_extract(self, url):
-        display_id = self._match_id(url)
-        webpage = self._download_webpage(url, display_id)
-        brightcove_id = self._search_regex(
-            r'data-main-video-id=["\'](\d+)', webpage, 'brightcove id')
-        return self.url_result(
-            self.BRIGHTCOVE_URL_TEMPLATE % brightcove_id,
-            'BrightcoveNew', brightcove_id)
diff --git a/youtube_dl/extractor/medaltv.py b/youtube_dl/extractor/medaltv.py
index 67bb4debb..1603b55f6 100644
--- a/youtube_dl/extractor/medaltv.py
+++ b/youtube_dl/extractor/medaltv.py
@@ -15,39 +15,33 @@ from ..utils import (
 
 
 class MedalTVIE(InfoExtractor):
-    _VALID_URL = r'https?://(?:www\.)?medal\.tv/clips/(?P<id>[^/?#&]+)'
+    _VALID_URL = r'https?://(?:www\.)?medal\.tv/clips/(?P<id>[0-9]+)'
     _TESTS = [{
-        'url': 'https://medal.tv/clips/2mA60jWAGQCBH',
+        'url': 'https://medal.tv/clips/34934644/3Is9zyGMoBMr',
         'md5': '7b07b064331b1cf9e8e5c52a06ae68fa',
         'info_dict': {
-            'id': '2mA60jWAGQCBH',
+            'id': '34934644',
             'ext': 'mp4',
             'title': 'Quad Cold',
             'description': 'Medal,https://medal.tv/desktop/',
             'uploader': 'MowgliSB',
             'timestamp': 1603165266,
             'upload_date': '20201020',
-            'uploader_id': '10619174',
+            'uploader_id': 10619174,
         }
     }, {
-        'url': 'https://medal.tv/clips/2um24TWdty0NA',
+        'url': 'https://medal.tv/clips/36787208',
         'md5': 'b6dc76b78195fff0b4f8bf4a33ec2148',
         'info_dict': {
-            'id': '2um24TWdty0NA',
+            'id': '36787208',
             'ext': 'mp4',
             'title': 'u tk me i tk u bigger',
             'description': 'Medal,https://medal.tv/desktop/',
             'uploader': 'Mimicc',
             'timestamp': 1605580939,
             'upload_date': '20201117',
-            'uploader_id': '5156321',
+            'uploader_id': 5156321,
         }
-    }, {
-        'url': 'https://medal.tv/clips/37rMeFpryCC-9',
-        'only_matching': True,
-    }, {
-        'url': 'https://medal.tv/clips/2WRj40tpY_EU9',
-        'only_matching': True,
     }]
 
     def _real_extract(self, url):
diff --git a/youtube_dl/extractor/mediaset.py b/youtube_dl/extractor/mediaset.py
index 20048c6ab..2c16fc9e2 100644
--- a/youtube_dl/extractor/mediaset.py
+++ b/youtube_dl/extractor/mediaset.py
@@ -24,7 +24,7 @@ class MediasetIE(ThePlatformBaseIE):
                             (?:(?:www|static3)\.)?mediasetplay\.mediaset\.it/
                             (?:
                                 (?:video|on-demand|movie)/(?:[^/]+/)+[^/]+_|
-                                player(?:/v\d+)?/index\.html\?.*?\bprogramGuid=
+                                player/index\.html\?.*?\bprogramGuid=
                             )
                     )(?P<id>[0-9A-Z]{16,})
                     '''
@@ -73,10 +73,6 @@ class MediasetIE(ThePlatformBaseIE):
         # iframe twitter (from http://www.wittytv.it/se-prima-mi-fidavo-zero/)
         'url': 'https://static3.mediasetplay.mediaset.it/player/index.html?appKey=5ad3966b1de1c4000d5cec48&programGuid=FAFU000000665104&id=665104',
         'only_matching': True,
-    }, {
-        # embedUrl (from https://www.wittytv.it/amici/est-ce-que-tu-maimes-gabriele-5-dicembre-copia/)
-        'url': 'https://static3.mediasetplay.mediaset.it/player/v2/index.html?partnerId=wittytv&configId=&programGuid=FD00000000153323&autoplay=true&purl=http://www.wittytv.it/amici/est-ce-que-tu-maimes-gabriele-5-dicembre-copia/',
-        'only_matching': True,
     }, {
         'url': 'mediaset:FAFU000000665924',
         'only_matching': True,
diff --git a/youtube_dl/extractor/minds.py b/youtube_dl/extractor/minds.py
index e8fd582aa..8e9f0f825 100644
--- a/youtube_dl/extractor/minds.py
+++ b/youtube_dl/extractor/minds.py
@@ -78,7 +78,7 @@ class MindsIE(MindsBaseIE):
             else:
                 return self.url_result(entity['perma_url'])
         else:
-            assert (entity['subtype'] == 'video')
+            assert(entity['subtype'] == 'video')
             video_id = entity_id
         # 1080p and webm formats available only on the sources array
         video = self._call_api(
diff --git a/youtube_dl/extractor/mixcloud.py b/youtube_dl/extractor/mixcloud.py
index 2b5e2c15c..69319857d 100644
--- a/youtube_dl/extractor/mixcloud.py
+++ b/youtube_dl/extractor/mixcloud.py
@@ -1,4 +1,3 @@
-# coding: utf-8
 from __future__ import unicode_literals
 
 import itertools
@@ -11,7 +10,7 @@ from ..compat import (
     compat_ord,
     compat_str,
     compat_urllib_parse_unquote,
-    compat_zip as zip,
+    compat_zip
 )
 from ..utils import (
     int_or_none,
@@ -25,7 +24,7 @@ class MixcloudBaseIE(InfoExtractor):
     def _call_api(self, object_type, object_fields, display_id, username, slug=None):
         lookup_key = object_type + 'Lookup'
         return self._download_json(
-            'https://app.mixcloud.com/graphql', display_id, query={
+            'https://www.mixcloud.com/graphql', display_id, query={
                 'query': '''{
   %s(lookup: {username: "%s"%s}) {
     %s
@@ -45,7 +44,7 @@ class MixcloudIE(MixcloudBaseIE):
             'ext': 'm4a',
             'title': 'Cryptkeeper',
             'description': 'After quite a long silence from myself, finally another Drum\'n\'Bass mix with my favourite current dance floor bangers.',
-            'uploader': 'dholbach',  # was: 'Daniel Holbach',
+            'uploader': 'Daniel Holbach',
             'uploader_id': 'dholbach',
             'thumbnail': r're:https?://.*\.jpg',
             'view_count': int,
@@ -58,7 +57,7 @@ class MixcloudIE(MixcloudBaseIE):
             'id': 'gillespeterson_caribou-7-inch-vinyl-mix-chat',
             'ext': 'mp3',
             'title': 'Caribou 7 inch Vinyl Mix & Chat',
-            'description': r're:Last week Dan Snaith aka Caribou swung by the Brownswood.{136}',
+            'description': 'md5:2b8aec6adce69f9d41724647c65875e8',
             'uploader': 'Gilles Peterson Worldwide',
             'uploader_id': 'gillespeterson',
             'thumbnail': 're:https?://.*',
@@ -66,23 +65,6 @@ class MixcloudIE(MixcloudBaseIE):
             'timestamp': 1422987057,
             'upload_date': '20150203',
         },
-        'params': {
-            'skip_download': '404 not found',
-        },
-    }, {
-        'url': 'https://www.mixcloud.com/gillespeterson/carnival-m%C3%BAsica-popular-brasileira-mix/',
-        'info_dict': {
-            'id': 'gillespeterson_carnival-música-popular-brasileira-mix',
-            'ext': 'm4a',
-            'title': 'Carnival Música Popular Brasileira Mix',
-            'description': r're:Gilles was recently in Brazil to play at Boiler Room.{208}',
-            'timestamp': 1454347174,
-            'upload_date': '20160201',
-            'uploader': 'Gilles Peterson Worldwide',
-            'uploader_id': 'gillespeterson',
-            'thumbnail': 're:https?://.*',
-            'view_count': int,
-        },
     }, {
         'url': 'https://beta.mixcloud.com/RedLightRadio/nosedrip-15-red-light-radio-01-18-2016/',
         'only_matching': True,
@@ -94,10 +76,10 @@ class MixcloudIE(MixcloudBaseIE):
         """Encrypt/Decrypt XOR cipher. Both ways are possible because it's XOR."""
         return ''.join([
             compat_chr(compat_ord(ch) ^ compat_ord(k))
-            for ch, k in zip(ciphertext, itertools.cycle(key))])
+            for ch, k in compat_zip(ciphertext, itertools.cycle(key))])
 
     def _real_extract(self, url):
-        username, slug = self._match_valid_url(url).groups()
+        username, slug = re.match(self._VALID_URL, url).groups()
         username, slug = compat_urllib_parse_unquote(username), compat_urllib_parse_unquote(slug)
         track_id = '%s_%s' % (username, slug)
 
diff --git a/youtube_dl/extractor/motherless.py b/youtube_dl/extractor/motherless.py
index d352cb180..ef1e081f2 100644
--- a/youtube_dl/extractor/motherless.py
+++ b/youtube_dl/extractor/motherless.py
@@ -1,4 +1,3 @@
-# coding: utf-8
 from __future__ import unicode_literals
 
 import datetime
@@ -72,7 +71,7 @@ class MotherlessIE(InfoExtractor):
             'title': 'a/ Hot Teens',
             'categories': list,
             'upload_date': '20210104',
-            'uploader_id': 'anonymous',
+            'uploader_id': 'yonbiw',
             'thumbnail': r're:https?://.*\.jpg',
             'age_limit': 18,
         },
@@ -126,10 +125,9 @@ class MotherlessIE(InfoExtractor):
                 kwargs = {_AGO_UNITS.get(uploaded_ago[-1]): delta}
                 upload_date = (datetime.datetime.utcnow() - datetime.timedelta(**kwargs)).strftime('%Y%m%d')
 
-        comment_count = len(re.findall(r'''class\s*=\s*['"]media-comment-contents\b''', webpage))
+        comment_count = webpage.count('class="media-comment-contents"')
         uploader_id = self._html_search_regex(
-            (r'''<span\b[^>]+\bclass\s*=\s*["']username\b[^>]*>([^<]+)</span>''',
-             r'''(?s)['"](?:media-meta-member|thumb-member-username)\b[^>]+>\s*<a\b[^>]+\bhref\s*=\s*['"]/m/([^"']+)'''),
+            r'"thumb-member-username">\s+<a href="/m/([^"]+)"',
             webpage, 'uploader_id')
 
         categories = self._html_search_meta('keywords', webpage, default=None)
@@ -171,18 +169,7 @@ class MotherlessGroupIE(InfoExtractor):
             'description': 'Sex can be funny. Wide smiles,laugh, games, fun of '
                            'any kind!'
         },
-        'playlist_mincount': 0,
-        'expected_warnings': [
-            'This group has no videos.',
-        ]
-    }, {
-        'url': 'https://motherless.com/g/beautiful_cock',
-        'info_dict': {
-            'id': 'beautiful_cock',
-            'title': 'Beautiful Cock',
-            'description': 'Group for lovely cocks yours, mine, a friends anything human',
-        },
-        'playlist_mincount': 2500,
+        'playlist_mincount': 9,
     }]
 
     @classmethod
@@ -221,23 +208,16 @@ class MotherlessGroupIE(InfoExtractor):
             r'<title>([\w\s]+\w)\s+-', webpage, 'title', fatal=False)
         description = self._html_search_meta(
             'description', webpage, fatal=False)
-        page_count = str_to_int(self._search_regex(
-            r'(\d+)\s*</(?:a|span)>\s*<(?:a|span)[^>]+(?:>\s*NEXT|\brel\s*=\s*["\']?next)\b',
-            webpage, 'page_count', default=0))
-        if not page_count:
-            message = self._search_regex(
-                r'''class\s*=\s*['"]error-page\b[^>]*>\s*<p[^>]*>\s*(?P<error_msg>[^<]+)(?<=\S)\s*''',
-                webpage, 'error_msg', default=None) or 'This group has no videos.'
-            self.report_warning(message, group_id)
-            page_count = 1
+        page_count = self._int(self._search_regex(
+            r'(\d+)</(?:a|span)><(?:a|span)[^>]+>\s*NEXT',
+            webpage, 'page_count'), 'page_count')
         PAGE_SIZE = 80
 
         def _get_page(idx):
-            if idx > 0:
-                webpage = self._download_webpage(
-                    page_url, group_id, query={'page': idx + 1},
-                    note='Downloading page %d/%d' % (idx + 1, page_count)
-                )
+            webpage = self._download_webpage(
+                page_url, group_id, query={'page': idx + 1},
+                note='Downloading page %d/%d' % (idx + 1, page_count)
+            )
             for entry in self._extract_entries(webpage, url):
                 yield entry
 
diff --git a/youtube_dl/extractor/mtv.py b/youtube_dl/extractor/mtv.py
index 5a5205c0e..600cf2d89 100644
--- a/youtube_dl/extractor/mtv.py
+++ b/youtube_dl/extractor/mtv.py
@@ -255,9 +255,7 @@ class MTVServicesInfoExtractor(InfoExtractor):
 
     @staticmethod
     def _extract_child_with_type(parent, t):
-        for c in parent['children']:
-            if c.get('type') == t:
-                return c
+        return next(c for c in parent['children'] if c.get('type') == t)
 
     def _extract_mgid(self, webpage):
         try:
@@ -288,8 +286,7 @@ class MTVServicesInfoExtractor(InfoExtractor):
             data = self._parse_json(self._search_regex(
                 r'__DATA__\s*=\s*({.+?});', webpage, 'data'), None)
             main_container = self._extract_child_with_type(data, 'MainContainer')
-            ab_testing = self._extract_child_with_type(main_container, 'ABTesting')
-            video_player = self._extract_child_with_type(ab_testing or main_container, 'VideoPlayer')
+            video_player = self._extract_child_with_type(main_container, 'VideoPlayer')
             mgid = video_player['props']['media']['video']['config']['uri']
 
         return mgid
diff --git a/youtube_dl/extractor/myspass.py b/youtube_dl/extractor/myspass.py
index f540c52ee..db7ebc94c 100644
--- a/youtube_dl/extractor/myspass.py
+++ b/youtube_dl/extractor/myspass.py
@@ -35,9 +35,7 @@ class MySpassIE(InfoExtractor):
         title = xpath_text(metadata, 'title', fatal=True)
         video_url = xpath_text(metadata, 'url_flv', 'download url', True)
         video_id_int = int(video_id)
-
-        grps = re.search(r'/myspass2009/\d+/(\d+)/(\d+)/(\d+)/', video_url)
-        for group in grps.groups() if grps else []:
+        for group in re.search(r'/myspass2009/\d+/(\d+)/(\d+)/(\d+)/', video_url).groups():
             group_int = int(group)
             if group_int > video_id_int:
                 video_url = video_url.replace(
diff --git a/youtube_dl/extractor/myvideoge.py b/youtube_dl/extractor/myvideoge.py
deleted file mode 100644
index efbfda7a6..000000000
--- a/youtube_dl/extractor/myvideoge.py
+++ /dev/null
@@ -1,87 +0,0 @@
-# coding: utf-8
-from __future__ import unicode_literals
-
-import re
-
-from .common import InfoExtractor
-from ..utils import (
-    clean_html,
-    get_element_by_id,
-    get_element_by_class,
-    int_or_none,
-    js_to_json,
-    MONTH_NAMES,
-    qualities,
-    unified_strdate,
-)
-
-
-class MyVideoGeIE(InfoExtractor):
-    _VALID_URL = r'https?://(?:www\.)?myvideo\.ge/v/(?P<id>[0-9]+)'
-    _TEST = {
-        'url': 'https://www.myvideo.ge/v/3941048',
-        'md5': '8c192a7d2b15454ba4f29dc9c9a52ea9',
-        'info_dict': {
-            'id': '3941048',
-            'ext': 'mp4',
-            'title': 'The best prikol',
-            'upload_date': '20200611',
-            'thumbnail': r're:^https?://.*\.jpg$',
-            'uploader': 'chixa33',
-            'description': 'md5:5b067801318e33c2e6eea4ab90b1fdd3',
-        },
-        # working from local dev system
-        'skip': 'site blocks CI servers',
-    }
-    _MONTH_NAMES_KA = ['იანვარი', 'თებერვალი', 'მარტი', 'აპრილი', 'მაისი', 'ივნისი', 'ივლისი', 'აგვისტო', 'სექტემბერი', 'ოქტომბერი', 'ნოემბერი', 'დეკემბერი']
-
-    _quality = staticmethod(qualities(('SD', 'HD')))
-
-    def _real_extract(self, url):
-        video_id = self._match_id(url)
-        webpage = self._download_webpage(url, video_id)
-
-        title = (
-            self._og_search_title(webpage, default=None)
-            or clean_html(get_element_by_class('my_video_title', webpage))
-            or self._html_search_regex(r'<title\b[^>]*>([^<]+)</title\b', webpage, 'title'))
-
-        jwplayer_sources = self._parse_json(
-            self._search_regex(
-                r'''(?s)jwplayer\s*\(\s*['"]mvplayer['"]\s*\)\s*\.\s*setup\s*\(.*?\bsources\s*:\s*(\[.*?])\s*[,});]''', webpage, 'jwplayer sources', fatal=False)
-            or '',
-            video_id, transform_source=js_to_json, fatal=False)
-
-        formats = self._parse_jwplayer_formats(jwplayer_sources or [], video_id)
-        for f in formats or []:
-            f['preference'] = self._quality(f['format_id'])
-        self._sort_formats(formats)
-
-        description = (
-            self._og_search_description(webpage)
-            or get_element_by_id('long_desc_holder', webpage)
-            or self._html_search_meta('description', webpage))
-
-        uploader = self._search_regex(r'<a[^>]+class="mv_user_name"[^>]*>([^<]+)<', webpage, 'uploader', fatal=False)
-
-        upload_date = get_element_by_class('mv_vid_upl_date', webpage)
-        # as ka locale may not be present roll a local date conversion
-        upload_date = (unified_strdate(
-            # translate any ka month to an en one
-            re.sub('|'.join(self._MONTH_NAMES_KA),
-                   lambda m: MONTH_NAMES['en'][self._MONTH_NAMES_KA.index(m.group(0))],
-                   upload_date, re.I))
-            if upload_date else None)
-
-        return {
-            'id': video_id,
-            'title': title,
-            'description': description,
-            'uploader': uploader,
-            'formats': formats,
-            'thumbnail': self._og_search_thumbnail(webpage),
-            'upload_date': upload_date,
-            'view_count': int_or_none(get_element_by_class('mv_vid_views', webpage)),
-            'like_count': int_or_none(get_element_by_id('likes_count', webpage)),
-            'dislike_count': int_or_none(get_element_by_id('dislikes_count', webpage)),
-        }
diff --git a/youtube_dl/extractor/ndr.py b/youtube_dl/extractor/ndr.py
index 26627f8b0..ddd828d92 100644
--- a/youtube_dl/extractor/ndr.py
+++ b/youtube_dl/extractor/ndr.py
@@ -4,10 +4,8 @@ from __future__ import unicode_literals
 import re
 
 from .common import InfoExtractor
-from ..compat import compat_urllib_parse_urlparse
 from ..utils import (
     determine_ext,
-    ExtractorError,
     int_or_none,
     merge_dicts,
     parse_iso8601,
@@ -22,13 +20,13 @@ class NDRBaseIE(InfoExtractor):
         mobj = re.match(self._VALID_URL, url)
         display_id = next(group for group in mobj.groups() if group)
         webpage = self._download_webpage(url, display_id)
-        return self._extract_embed(webpage, display_id, url)
+        return self._extract_embed(webpage, display_id)
 
 
 class NDRIE(NDRBaseIE):
     IE_NAME = 'ndr'
     IE_DESC = 'NDR.de - Norddeutscher Rundfunk'
-    _VALID_URL = r'https?://(?:\w+\.)*ndr\.de/(?:[^/]+/)*(?P<id>[^/?#]+),[\da-z]+\.html'
+    _VALID_URL = r'https?://(?:www\.)?ndr\.de/(?:[^/]+/)*(?P<id>[^/?#]+),[\da-z]+\.html'
     _TESTS = [{
         # httpVideo, same content id
         'url': 'http://www.ndr.de/fernsehen/Party-Poette-und-Parade,hafengeburtstag988.html',
@@ -40,14 +38,13 @@ class NDRIE(NDRBaseIE):
             'title': 'Party, Pötte und Parade',
             'description': 'md5:ad14f9d2f91d3040b6930c697e5f6b4c',
             'uploader': 'ndrtv',
-            'timestamp': 1431255671,
+            'timestamp': 1431108900,
             'upload_date': '20150510',
             'duration': 3498,
         },
         'params': {
             'skip_download': True,
         },
-        'expected_warnings': ['Unable to download f4m manifest'],
     }, {
         # httpVideo, different content id
         'url': 'http://www.ndr.de/sport/fussball/40-Osnabrueck-spielt-sich-in-einen-Rausch,osna270.html',
@@ -66,7 +63,6 @@ class NDRIE(NDRBaseIE):
         'params': {
             'skip_download': True,
         },
-        'skip': 'No longer available',
     }, {
         # httpAudio, same content id
         'url': 'http://www.ndr.de/info/La-Valette-entgeht-der-Hinrichtung,audio51535.html',
@@ -78,8 +74,8 @@ class NDRIE(NDRBaseIE):
             'title': 'La Valette entgeht der Hinrichtung',
             'description': 'md5:22f9541913a40fe50091d5cdd7c9f536',
             'uploader': 'ndrinfo',
-            'timestamp': 1631711863,
-            'upload_date': '20210915',
+            'timestamp': 1290626100,
+            'upload_date': '20140729',
             'duration': 884,
         },
         'params': {
@@ -93,10 +89,9 @@ class NDRIE(NDRBaseIE):
             'display_id': 'extra-3-Satiremagazin-mit-Christian-Ehring',
             'ext': 'mp4',
             'title': 'Extra 3 vom 11.11.2020 mit Christian Ehring',
-            'description': 'md5:700f6de264010585012a72f97b0ac0c9',
+            'description': 'md5:42ee53990a715eaaf4dc7f13a3bd56c6',
             'uploader': 'ndrtv',
-            'upload_date': '20201207',
-            'timestamp': 1614349457,
+            'upload_date': '20201113',
             'duration': 1749,
             'subtitles': {
                 'de': [{
@@ -114,38 +109,19 @@ class NDRIE(NDRBaseIE):
         'only_matching': True,
     }]
 
-    def _extract_embed(self, webpage, display_id, url):
-        embed_url = (
-            self._html_search_meta(
-                'embedURL', webpage, 'embed URL',
-                default=None)
-            or self._search_regex(
-                r'\bembedUrl["\']\s*:\s*(["\'])(?P<url>(?:(?!\1).)+)\1', webpage,
-                'embed URL', group='url', default=None)
-            or self._search_regex(
-                r'\bvar\s*sophoraID\s*=\s*(["\'])(?P<url>(?:(?!\1).)+)\1', webpage,
-                'embed URL', group='url', default=''))
-        # some more work needed if we only found sophoraID
-        if re.match(r'^[a-z]+\d+$', embed_url):
-            # get the initial part of the url path,. eg /panorama/archiv/2022/
-            parsed_url = compat_urllib_parse_urlparse(url)
-            path = self._search_regex(r'(.+/)%s' % display_id, parsed_url.path or '', 'embed URL', default='')
-            # find tell-tale image with the actual ID
-            ndr_id = self._search_regex(r'%s([a-z]+\d+)(?!\.)\b' % (path, ), webpage, 'embed URL', default=None)
-            # or try to use special knowledge!
-            NDR_INFO_URL_TPL = 'https://www.ndr.de/info/%s-player.html'
-            embed_url = 'ndr:%s' % (ndr_id, ) if ndr_id else NDR_INFO_URL_TPL % (embed_url, )
-        if not embed_url:
-            raise ExtractorError('Unable to extract embedUrl')
-
+    def _extract_embed(self, webpage, display_id):
+        embed_url = self._html_search_meta(
+            'embedURL', webpage, 'embed URL',
+            default=None) or self._search_regex(
+            r'\bembedUrl["\']\s*:\s*(["\'])(?P<url>(?:(?!\1).)+)\1', webpage,
+            'embed URL', group='url')
         description = self._search_regex(
             r'<p[^>]+itemprop="description">([^<]+)</p>',
             webpage, 'description', default=None) or self._og_search_description(webpage)
         timestamp = parse_iso8601(
             self._search_regex(
-                (r'<span[^>]+itemprop="(?:datePublished|uploadDate)"[^>]+content="(?P<cont>[^"]+)"',
-                 r'\bvar\s*pdt\s*=\s*(?P<q>["\'])(?P<cont>(?:(?!(?P=q)).)+)(?P=q)', ),
-                webpage, 'upload date', group='cont', default=None))
+                r'<span[^>]+itemprop="(?:datePublished|uploadDate)"[^>]+content="([^"]+)"',
+                webpage, 'upload date', default=None))
         info = self._search_json_ld(webpage, display_id, default={})
         return merge_dicts({
             '_type': 'url_transparent',
@@ -177,19 +153,19 @@ class NJoyIE(NDRBaseIE):
         'params': {
             'skip_download': True,
         },
-        'skip': 'No longer available',
     }, {
         # httpVideo, different content id
         'url': 'http://www.n-joy.de/musik/Das-frueheste-DJ-Set-des-Nordens-live-mit-Felix-Jaehn-,felixjaehn168.html',
         'md5': '417660fffa90e6df2fda19f1b40a64d8',
         'info_dict': {
-            'id': 'livestream283',
+            'id': 'dockville882',
             'display_id': 'Das-frueheste-DJ-Set-des-Nordens-live-mit-Felix-Jaehn-',
-            'ext': 'mp3',
-            'title': 'Das frueheste DJ Set des Nordens live mit Felix Jaehn',
-            'description': 'md5:681698f527b8601e511e7b79edde7d2c',
+            'ext': 'mp4',
+            'title': '"Ich hab noch nie" mit Felix Jaehn',
+            'description': 'md5:85dd312d53be1b99e1f998a16452a2f3',
             'uploader': 'njoy',
-            'upload_date': '20210830',
+            'upload_date': '20150822',
+            'duration': 211,
         },
         'params': {
             'skip_download': True,
@@ -199,25 +175,18 @@ class NJoyIE(NDRBaseIE):
         'only_matching': True,
     }]
 
-    def _extract_embed(self, webpage, display_id, url=None):
-        # find tell-tale URL with the actual ID, or ...
+    def _extract_embed(self, webpage, display_id):
         video_id = self._search_regex(
-            (r'''\bsrc\s*=\s*["']?(?:/\w+)+/([a-z]+\d+)(?!\.)\b''',
-             r'<iframe[^>]+id="pp_([\da-z]+)"', ),
-            webpage, 'NDR id', default=None)
-
-        description = (
-            self._html_search_meta('description', webpage)
-            or self._search_regex(
-                r'<div[^>]+class="subline"[^>]*>[^<]+</div>\s*<p>([^<]+)</p>',
-                webpage, 'description', fatal=False))
+            r'<iframe[^>]+id="pp_([\da-z]+)"', webpage, 'embed id')
+        description = self._search_regex(
+            r'<div[^>]+class="subline"[^>]*>[^<]+</div>\s*<p>([^<]+)</p>',
+            webpage, 'description', fatal=False)
         return {
             '_type': 'url_transparent',
             'ie_key': 'NDREmbedBase',
             'url': 'ndr:%s' % video_id,
             'display_id': display_id,
             'description': description,
-            'title': display_id.replace('-', ' ').strip(),
         }
 
 
@@ -322,7 +291,7 @@ class NDREmbedBaseIE(InfoExtractor):
 
 class NDREmbedIE(NDREmbedBaseIE):
     IE_NAME = 'ndr:embed'
-    _VALID_URL = r'https?://(?:\w+\.)*ndr\.de/(?:[^/]+/)*(?P<id>[\da-z]+)-(?:(?:ard)?player|externalPlayer)\.html'
+    _VALID_URL = r'https?://(?:www\.)?ndr\.de/(?:[^/]+/)*(?P<id>[\da-z]+)-(?:player|externalPlayer)\.html'
     _TESTS = [{
         'url': 'http://www.ndr.de/fernsehen/sendungen/ndr_aktuell/ndraktuell28488-player.html',
         'md5': '8b9306142fe65bbdefb5ce24edb6b0a9',
@@ -335,7 +304,6 @@ class NDREmbedIE(NDREmbedBaseIE):
             'upload_date': '20150907',
             'duration': 132,
         },
-        'skip': 'No longer available',
     }, {
         'url': 'http://www.ndr.de/ndr2/events/soundcheck/soundcheck3366-player.html',
         'md5': '002085c44bae38802d94ae5802a36e78',
@@ -351,7 +319,6 @@ class NDREmbedIE(NDREmbedBaseIE):
         'params': {
             'skip_download': True,
         },
-        'skip': 'No longer available',
     }, {
         'url': 'http://www.ndr.de/info/audio51535-player.html',
         'md5': 'bb3cd38e24fbcc866d13b50ca59307b8',
@@ -361,7 +328,7 @@ class NDREmbedIE(NDREmbedBaseIE):
             'title': 'La Valette entgeht der Hinrichtung',
             'is_live': False,
             'uploader': 'ndrinfo',
-            'upload_date': '20210915',
+            'upload_date': '20140729',
             'duration': 884,
         },
         'params': {
@@ -382,17 +349,15 @@ class NDREmbedIE(NDREmbedBaseIE):
         'params': {
             'skip_download': True,
         },
-        'skip': 'No longer available',
     }, {
         # httpVideoLive
         'url': 'http://www.ndr.de/fernsehen/livestream/livestream217-externalPlayer.html',
         'info_dict': {
             'id': 'livestream217',
-            'ext': 'mp4',
+            'ext': 'flv',
             'title': r're:^NDR Fernsehen Niedersachsen \d{4}-\d{2}-\d{2} \d{2}:\d{2}$',
             'is_live': True,
-            'upload_date': '20210409',
-            'uploader': 'ndrtv',
+            'upload_date': '20150910',
         },
         'params': {
             'skip_download': True,
@@ -430,10 +395,9 @@ class NJoyEmbedIE(NDREmbedBaseIE):
             'ext': 'mp4',
             'title': 'Zehn Jahre Reeperbahn Festival - die Doku',
             'is_live': False,
-            'upload_date': '20200826',
+            'upload_date': '20150807',
             'duration': 1011,
         },
-        'expected_warnings': ['Unable to download f4m manifest'],
     }, {
         # httpAudio
         'url': 'http://www.n-joy.de/news_wissen/stefanrichter100-player_image-d5e938b1-f21a-4b9a-86b8-aaba8bca3a13_theme-n-joy.html',
@@ -450,7 +414,6 @@ class NJoyEmbedIE(NDREmbedBaseIE):
         'params': {
             'skip_download': True,
         },
-        'skip': 'No longer available',
     }, {
         # httpAudioLive, no explicit ext
         'url': 'http://www.n-joy.de/news_wissen/webradioweltweit100-player_image-3fec0484-2244-4565-8fb8-ed25fd28b173_theme-n-joy.html',
@@ -460,7 +423,7 @@ class NJoyEmbedIE(NDREmbedBaseIE):
             'title': r're:^N-JOY Weltweit \d{4}-\d{2}-\d{2} \d{2}:\d{2}$',
             'is_live': True,
             'uploader': 'njoy',
-            'upload_date': '20210830',
+            'upload_date': '20150810',
         },
         'params': {
             'skip_download': True,
diff --git a/youtube_dl/extractor/neteasemusic.py b/youtube_dl/extractor/neteasemusic.py
index 5e5c6271b..978a05841 100644
--- a/youtube_dl/extractor/neteasemusic.py
+++ b/youtube_dl/extractor/neteasemusic.py
@@ -1,32 +1,20 @@
 # coding: utf-8
 from __future__ import unicode_literals
 
-from base64 import b64encode
-from binascii import hexlify
-from datetime import datetime
 from hashlib import md5
-from random import randint
-import json
+from base64 import b64encode
+from datetime import datetime
 import re
-import time
 
 from .common import InfoExtractor
-from ..aes import aes_ecb_encrypt, pkcs7_padding
 from ..compat import (
     compat_urllib_parse_urlencode,
     compat_str,
     compat_itertools_count,
 )
 from ..utils import (
-    ExtractorError,
-    bytes_to_intlist,
-    error_to_compat_str,
-    float_or_none,
-    int_or_none,
-    intlist_to_bytes,
     sanitized_Request,
-    std_headers,
-    try_get,
+    float_or_none,
 )
 
 
@@ -47,106 +35,32 @@ class NetEaseMusicBaseIE(InfoExtractor):
         result = b64encode(m.digest()).decode('ascii')
         return result.replace('/', '_').replace('+', '-')
 
-    @classmethod
-    def make_player_api_request_data_and_headers(cls, song_id, bitrate):
-        KEY = b'e82ckenh8dichen8'
-        URL = '/api/song/enhance/player/url'
-        now = int(time.time() * 1000)
-        rand = randint(0, 1000)
-        cookie = {
-            'osver': None,
-            'deviceId': None,
-            'appver': '8.0.0',
-            'versioncode': '140',
-            'mobilename': None,
-            'buildver': '1623435496',
-            'resolution': '1920x1080',
-            '__csrf': '',
-            'os': 'pc',
-            'channel': None,
-            'requestId': '{0}_{1:04}'.format(now, rand),
-        }
-        request_text = json.dumps(
-            {'ids': '[{0}]'.format(song_id), 'br': bitrate, 'header': cookie},
-            separators=(',', ':'))
-        message = 'nobody{0}use{1}md5forencrypt'.format(
-            URL, request_text).encode('latin1')
-        msg_digest = md5(message).hexdigest()
-
-        data = '{0}-36cd479b6b5-{1}-36cd479b6b5-{2}'.format(
-            URL, request_text, msg_digest)
-        data = pkcs7_padding(bytes_to_intlist(data))
-        encrypted = intlist_to_bytes(aes_ecb_encrypt(data, bytes_to_intlist(KEY)))
-        encrypted_params = hexlify(encrypted).decode('ascii').upper()
-
-        cookie = '; '.join(
-            ['{0}={1}'.format(k, v if v is not None else 'undefined')
-             for [k, v] in cookie.items()])
-
-        headers = {
-            'User-Agent': std_headers['User-Agent'],
-            'Content-Type': 'application/x-www-form-urlencoded',
-            'Referer': 'https://music.163.com',
-            'Cookie': cookie,
-        }
-        return ('params={0}'.format(encrypted_params), headers)
-
-    def _call_player_api(self, song_id, bitrate):
-        url = 'https://interface3.music.163.com/eapi/song/enhance/player/url'
-        data, headers = self.make_player_api_request_data_and_headers(song_id, bitrate)
-        try:
-            msg = 'empty result'
-            result = self._download_json(
-                url, song_id, data=data.encode('ascii'), headers=headers)
-            if result:
-                return result
-        except ExtractorError as e:
-            if type(e.cause) in (ValueError, TypeError):
-                # JSON load failure
-                raise
-        except Exception as e:
-            msg = error_to_compat_str(e)
-            self.report_warning('%s API call (%s) failed: %s' % (
-                song_id, bitrate, msg))
-        return {}
-
     def extract_formats(self, info):
-        err = 0
         formats = []
-        song_id = info['id']
         for song_format in self._FORMATS:
             details = info.get(song_format)
             if not details:
                 continue
+            song_file_path = '/%s/%s.%s' % (
+                self._encrypt(details['dfsId']), details['dfsId'], details['extension'])
 
-            bitrate = int_or_none(details.get('bitrate')) or 999000
-            data = self._call_player_api(song_id, bitrate)
-            for song in try_get(data, lambda x: x['data'], list) or []:
-                song_url = try_get(song, lambda x: x['url'])
-                if not song_url:
-                    continue
+            # 203.130.59.9, 124.40.233.182, 115.231.74.139, etc is a reverse proxy-like feature
+            # from NetEase's CDN provider that can be used if m5.music.126.net does not
+            # work, especially for users outside of Mainland China
+            # via: https://github.com/JixunMoe/unblock-163/issues/3#issuecomment-163115880
+            for host in ('http://m5.music.126.net', 'http://115.231.74.139/m1.music.126.net',
+                         'http://124.40.233.182/m1.music.126.net', 'http://203.130.59.9/m1.music.126.net'):
+                song_url = host + song_file_path
                 if self._is_valid_url(song_url, info['id'], 'song'):
                     formats.append({
                         'url': song_url,
                         'ext': details.get('extension'),
-                        'abr': float_or_none(song.get('br'), scale=1000),
+                        'abr': float_or_none(details.get('bitrate'), scale=1000),
                         'format_id': song_format,
-                        'filesize': int_or_none(song.get('size')),
-                        'asr': int_or_none(details.get('sr')),
+                        'filesize': details.get('size'),
+                        'asr': details.get('sr')
                     })
-                elif err == 0:
-                    err = try_get(song, lambda x: x['code'], int)
-
-        if not formats:
-            msg = 'No media links found'
-            if err != 0 and (err < 200 or err >= 400):
-                raise ExtractorError(
-                    '%s (site code %d)' % (msg, err, ), expected=True)
-            else:
-                self.raise_geo_restricted(
-                    msg + ': probably this video is not available from your location due to geo restriction.',
-                    countries=['CN'])
-
+                    break
         return formats
 
     @classmethod
@@ -162,19 +76,33 @@ class NetEaseMusicBaseIE(InfoExtractor):
 class NetEaseMusicIE(NetEaseMusicBaseIE):
     IE_NAME = 'netease:song'
     IE_DESC = '网易云音乐'
-    _VALID_URL = r'https?://(y\.)?music\.163\.com/(?:[#m]/)?song\?.*?\bid=(?P<id>[0-9]+)'
+    _VALID_URL = r'https?://music\.163\.com/(#/)?song\?id=(?P<id>[0-9]+)'
     _TESTS = [{
         'url': 'http://music.163.com/#/song?id=32102397',
-        'md5': '3e909614ce09b1ccef4a3eb205441190',
+        'md5': 'f2e97280e6345c74ba9d5677dd5dcb45',
         'info_dict': {
             'id': '32102397',
             'ext': 'mp3',
-            'title': 'Bad Blood',
+            'title': 'Bad Blood (feat. Kendrick Lamar)',
             'creator': 'Taylor Swift / Kendrick Lamar',
-            'upload_date': '20150516',
-            'timestamp': 1431792000,
-            'description': 'md5:25fc5f27e47aad975aa6d36382c7833c',
+            'upload_date': '20150517',
+            'timestamp': 1431878400,
+            'description': 'md5:a10a54589c2860300d02e1de821eb2ef',
         },
+        'skip': 'Blocked outside Mainland China',
+    }, {
+        'note': 'No lyrics translation.',
+        'url': 'http://music.163.com/#/song?id=29822014',
+        'info_dict': {
+            'id': '29822014',
+            'ext': 'mp3',
+            'title': '听见下雨的声音',
+            'creator': '周杰伦',
+            'upload_date': '20141225',
+            'timestamp': 1419523200,
+            'description': 'md5:a4d8d89f44656af206b7b2555c0bce6c',
+        },
+        'skip': 'Blocked outside Mainland China',
     }, {
         'note': 'No lyrics.',
         'url': 'http://music.163.com/song?id=17241424',
@@ -184,9 +112,9 @@ class NetEaseMusicIE(NetEaseMusicBaseIE):
             'title': 'Opus 28',
             'creator': 'Dustin O\'Halloran',
             'upload_date': '20080211',
-            'description': 'md5:f12945b0f6e0365e3b73c5032e1b0ff4',
             'timestamp': 1202745600,
         },
+        'skip': 'Blocked outside Mainland China',
     }, {
         'note': 'Has translated name.',
         'url': 'http://music.163.com/#/song?id=22735043',
@@ -200,18 +128,7 @@ class NetEaseMusicIE(NetEaseMusicBaseIE):
             'timestamp': 1264608000,
             'alt_title': '说出愿望吧(Genie)',
         },
-    }, {
-        'url': 'https://y.music.163.com/m/song?app_version=8.8.45&id=95670&uct2=sKnvS4+0YStsWkqsPhFijw%3D%3D&dlt=0846',
-        'md5': '95826c73ea50b1c288b22180ec9e754d',
-        'info_dict': {
-            'id': '95670',
-            'ext': 'mp3',
-            'title': '国际歌',
-            'creator': '马备',
-            'upload_date': '19911130',
-            'timestamp': 691516800,
-            'description': 'md5:1ba2f911a2b0aa398479f595224f2141',
-        },
+        'skip': 'Blocked outside Mainland China',
     }]
 
     def _process_lyrics(self, lyrics_info):
diff --git a/youtube_dl/extractor/nhk.py b/youtube_dl/extractor/nhk.py
index f43d91cd5..8a9331a79 100644
--- a/youtube_dl/extractor/nhk.py
+++ b/youtube_dl/extractor/nhk.py
@@ -1,4 +1,3 @@
-# coding: utf-8
 from __future__ import unicode_literals
 
 import re
@@ -8,7 +7,7 @@ from ..utils import urljoin
 
 
 class NhkBaseIE(InfoExtractor):
-    _API_URL_TEMPLATE = 'https://nwapi.nhk.jp/nhkworld/%sod%slist/v7b/%s/%s/%s/all%s.json'
+    _API_URL_TEMPLATE = 'https://api.nhk.or.jp/nhkworld/%sod%slist/v7a/%s/%s/%s/all%s.json'
     _BASE_URL_REGEX = r'https?://www3\.nhk\.or\.jp/nhkworld/(?P<lang>[a-z]{2})/ondemand'
     _TYPE_REGEX = r'/(?P<type>video|audio)/'
 
@@ -24,7 +23,7 @@ class NhkBaseIE(InfoExtractor):
     def _extract_episode_info(self, url, episode=None):
         fetch_episode = episode is None
         lang, m_type, episode_id = re.match(NhkVodIE._VALID_URL, url).groups()
-        if len(episode_id) == 7:
+        if episode_id.isdigit():
             episode_id = episode_id[:4] + '-' + episode_id[4:]
 
         is_video = m_type == 'video'
@@ -85,8 +84,7 @@ class NhkBaseIE(InfoExtractor):
 
 
 class NhkVodIE(NhkBaseIE):
-    # the 7-character IDs can have alphabetic chars too: assume [a-z] rather than just [a-f], eg
-    _VALID_URL = r'%s%s(?P<id>[0-9a-z]{7}|[^/]+?-\d{8}-[0-9a-z]+)' % (NhkBaseIE._BASE_URL_REGEX, NhkBaseIE._TYPE_REGEX)
+    _VALID_URL = r'%s%s(?P<id>\d{7}|[^/]+?-\d{8}-[0-9a-z]+)' % (NhkBaseIE._BASE_URL_REGEX, NhkBaseIE._TYPE_REGEX)
     # Content available only for a limited period of time. Visit
     # https://www3.nhk.or.jp/nhkworld/en/ondemand/ for working samples.
     _TESTS = [{
@@ -126,19 +124,6 @@ class NhkVodIE(NhkBaseIE):
     }, {
         'url': 'https://www3.nhk.or.jp/nhkworld/en/ondemand/audio/j_art-20150903-1/',
         'only_matching': True,
-    }, {
-        # video, alphabetic character in ID #29670
-        'url': 'https://www3.nhk.or.jp/nhkworld/en/ondemand/video/9999a34/',
-        'only_matching': True,
-        'info_dict': {
-            'id': 'qfjay6cg',
-            'ext': 'mp4',
-            'title': 'DESIGN TALKS plus - Fishermen’s Finery',
-            'description': 'md5:8a8f958aaafb0d7cb59d38de53f1e448',
-            'thumbnail': r're:^https?:/(/[a-z0-9.-]+)+\.jpg\?w=1920&h=1080$',
-            'upload_date': '20210615',
-            'timestamp': 1623722008,
-        }
     }]
 
     def _real_extract(self, url):
diff --git a/youtube_dl/extractor/niconico.py b/youtube_dl/extractor/niconico.py
index 93f813968..a85fc3d5c 100644
--- a/youtube_dl/extractor/niconico.py
+++ b/youtube_dl/extractor/niconico.py
@@ -2,28 +2,25 @@
 from __future__ import unicode_literals
 
 import datetime
-import itertools
+import functools
 import json
-import re
+import math
 
-from .common import InfoExtractor, SearchInfoExtractor
-from ..postprocessor.ffmpeg import FFmpegPostProcessor
+from .common import InfoExtractor
 from ..compat import (
     compat_parse_qs,
-    compat_str,
     compat_urllib_parse_urlparse,
 )
 from ..utils import (
-    ExtractorError,
+    determine_ext,
     dict_get,
+    ExtractorError,
     float_or_none,
+    InAdvancePagedList,
     int_or_none,
-    OnDemandPagedList,
     parse_duration,
     parse_iso8601,
-    PostProcessingError,
     remove_start,
-    str_or_none,
     try_get,
     unified_timestamp,
     urlencode_postdata,
@@ -37,7 +34,7 @@ class NiconicoIE(InfoExtractor):
 
     _TESTS = [{
         'url': 'http://www.nicovideo.jp/watch/sm22312215',
-        'md5': 'a5bad06f1347452102953f323c69da34s',
+        'md5': 'd1a75c0823e2f629128c43e1212760f9',
         'info_dict': {
             'id': 'sm22312215',
             'ext': 'mp4',
@@ -160,34 +157,11 @@ class NiconicoIE(InfoExtractor):
     }, {
         'url': 'http://sp.nicovideo.jp/watch/sm28964488?ss_pos=1&cp_in=wt_tg',
         'only_matching': True,
-    }, {
-        # DMC video with heartbeat
-        'url': 'https://www.nicovideo.jp/watch/sm34815188',
-        'md5': '9360c6e1f1519d7759e2fe8e1326ae83',
-        'info_dict': {
-            'id': 'sm34815188',
-            'ext': 'mp4',
-            'title': 'md5:aee93e9f3366db72f902f6cd5d389cb7',
-            'description': 'md5:7b9149fc7a00ab053cafaf5c19662704',
-            'thumbnail': r're:https?://.*',
-            'uploader': 'md5:2762e18fa74dbb40aa1ad27c6291ee32',
-            'uploader_id': '67449889',
-            'upload_date': '20190322',
-            'timestamp': int,  # timestamp is unstable
-            'duration': 1082.0,
-            'view_count': int,
-            'comment_count': int,
-        },
     }]
 
     _VALID_URL = r'https?://(?:www\.|secure\.|sp\.)?nicovideo\.jp/watch/(?P<id>(?:[a-z]{2})?[0-9]+)'
     _NETRC_MACHINE = 'niconico'
 
-    _API_HEADERS = {
-        'X-Frontend-ID': '6',
-        'X-Frontend-Version': '0'
-    }
-
     def _real_initialize(self):
         self._login()
 
@@ -217,89 +191,37 @@ class NiconicoIE(InfoExtractor):
             self._downloader.report_warning('unable to log in: bad username or password')
         return login_ok
 
-    def _get_heartbeat_info(self, info_dict):
+    def _extract_format_for_quality(self, api_data, video_id, audio_quality, video_quality):
+        def yesno(boolean):
+            return 'yes' if boolean else 'no'
 
-        video_id, video_src_id, audio_src_id = info_dict['url'].split(':')[1].split('/')
+        session_api_data = api_data['video']['dmcInfo']['session_api']
+        session_api_endpoint = session_api_data['urls'][0]
 
-        api_data = (
-            info_dict.get('_api_data')
-            or self._parse_json(
-                self._html_search_regex(
-                    'data-api-data="([^"]+)"',
-                    self._download_webpage('http://www.nicovideo.jp/watch/' + video_id, video_id),
-                    'API data', default='{}'),
-                video_id))
-
-        session_api_data = try_get(api_data, lambda x: x['media']['delivery']['movie']['session'])
-        session_api_endpoint = try_get(session_api_data, lambda x: x['urls'][0])
-
-        def ping():
-            status = try_get(
-                self._download_json(
-                    'https://nvapi.nicovideo.jp/v1/2ab0cbaa/watch', video_id,
-                    query={'t': try_get(api_data, lambda x: x['media']['delivery']['trackingId'])},
-                    note='Acquiring permission for downloading video',
-                    headers=self._API_HEADERS),
-                lambda x: x['meta']['status'])
-            if status != 200:
-                self.report_warning('Failed to acquire permission for playing video. The video may not download.')
-
-        yesno = lambda x: 'yes' if x else 'no'
-
-        # m3u8 (encryption)
-        if try_get(api_data, lambda x: x['media']['delivery']['encryption']) is not None:
-            protocol = 'm3u8'
-            encryption = self._parse_json(session_api_data['token'], video_id)['hls_encryption']
-            session_api_http_parameters = {
-                'parameters': {
-                    'hls_parameters': {
-                        'encryption': {
-                            encryption: {
-                                'encrypted_key': try_get(api_data, lambda x: x['media']['delivery']['encryption']['encryptedKey']),
-                                'key_uri': try_get(api_data, lambda x: x['media']['delivery']['encryption']['keyUri'])
-                            }
-                        },
-                        'transfer_preset': '',
-                        'use_ssl': yesno(session_api_endpoint['isSsl']),
-                        'use_well_known_port': yesno(session_api_endpoint['isWellKnownPort']),
-                        'segment_duration': 6000,
-                    }
-                }
-            }
-        # http
-        else:
-            protocol = 'http'
-            session_api_http_parameters = {
-                'parameters': {
-                    'http_output_download_parameters': {
-                        'use_ssl': yesno(session_api_endpoint['isSsl']),
-                        'use_well_known_port': yesno(session_api_endpoint['isWellKnownPort']),
-                    }
-                }
-            }
+        format_id = '-'.join(map(lambda s: remove_start(s['id'], 'archive_'), [video_quality, audio_quality]))
 
         session_response = self._download_json(
             session_api_endpoint['url'], video_id,
             query={'_format': 'json'},
             headers={'Content-Type': 'application/json'},
-            note='Downloading JSON metadata for %s' % info_dict['format_id'],
+            note='Downloading JSON metadata for %s' % format_id,
             data=json.dumps({
                 'session': {
                     'client_info': {
-                        'player_id': session_api_data.get('playerId'),
+                        'player_id': session_api_data['player_id'],
                     },
                     'content_auth': {
-                        'auth_type': try_get(session_api_data, lambda x: x['authTypes'][session_api_data['protocols'][0]]),
-                        'content_key_timeout': session_api_data.get('contentKeyTimeout'),
+                        'auth_type': session_api_data['auth_types'][session_api_data['protocols'][0]],
+                        'content_key_timeout': session_api_data['content_key_timeout'],
                         'service_id': 'nicovideo',
-                        'service_user_id': session_api_data.get('serviceUserId')
+                        'service_user_id': session_api_data['service_user_id']
                     },
-                    'content_id': session_api_data.get('contentId'),
+                    'content_id': session_api_data['content_id'],
                     'content_src_id_sets': [{
                         'content_src_ids': [{
                             'src_id_to_mux': {
-                                'audio_src_ids': [audio_src_id],
-                                'video_src_ids': [video_src_id],
+                                'audio_src_ids': [audio_quality['id']],
+                                'video_src_ids': [video_quality['id']],
                             }
                         }]
                     }],
@@ -307,81 +229,52 @@ class NiconicoIE(InfoExtractor):
                     'content_uri': '',
                     'keep_method': {
                         'heartbeat': {
-                            'lifetime': session_api_data.get('heartbeatLifetime')
+                            'lifetime': session_api_data['heartbeat_lifetime']
                         }
                     },
-                    'priority': session_api_data.get('priority'),
+                    'priority': session_api_data['priority'],
                     'protocol': {
                         'name': 'http',
                         'parameters': {
-                            'http_parameters': session_api_http_parameters
+                            'http_parameters': {
+                                'parameters': {
+                                    'http_output_download_parameters': {
+                                        'use_ssl': yesno(session_api_endpoint['is_ssl']),
+                                        'use_well_known_port': yesno(session_api_endpoint['is_well_known_port']),
+                                    }
+                                }
+                            }
                         }
                     },
-                    'recipe_id': session_api_data.get('recipeId'),
+                    'recipe_id': session_api_data['recipe_id'],
                     'session_operation_auth': {
                         'session_operation_auth_by_signature': {
-                            'signature': session_api_data.get('signature'),
-                            'token': session_api_data.get('token'),
+                            'signature': session_api_data['signature'],
+                            'token': session_api_data['token'],
                         }
                     },
                     'timing_constraint': 'unlimited'
                 }
             }).encode())
 
-        info_dict['url'] = session_response['data']['session']['content_uri']
-        info_dict['protocol'] = protocol
-
-        # get heartbeat info
-        heartbeat_info_dict = {
-            'url': session_api_endpoint['url'] + '/' + session_response['data']['session']['id'] + '?_format=json&_method=PUT',
-            'data': json.dumps(session_response['data']),
-            # interval, convert milliseconds to seconds, then halve to make a buffer.
-            'interval': float_or_none(session_api_data.get('heartbeatLifetime'), scale=3000),
-            'ping': ping
-        }
-
-        return info_dict, heartbeat_info_dict
-
-    def _extract_format_for_quality(self, api_data, video_id, audio_quality, video_quality):
-        def parse_format_id(id_code):
-            mobj = re.match(r'''(?x)
-                    (?:archive_)?
-                    (?:(?P<codec>[^_]+)_)?
-                    (?:(?P<br>[\d]+)kbps_)?
-                    (?:(?P<res>[\d+]+)p_)?
-                ''', '%s_' % id_code)
-            return mobj.groupdict() if mobj else {}
-
-        protocol = 'niconico_dmc'
-        format_id = '-'.join(map(lambda s: remove_start(s['id'], 'archive_'), [video_quality, audio_quality]))
-        vdict = parse_format_id(video_quality['id'])
-        adict = parse_format_id(audio_quality['id'])
-        resolution = try_get(video_quality, lambda x: x['metadata']['resolution'], dict) or {'height': vdict.get('res')}
-        vbr = try_get(video_quality, lambda x: x['metadata']['bitrate'], float)
+        resolution = video_quality.get('resolution', {})
 
         return {
-            'url': '%s:%s/%s/%s' % (protocol, video_id, video_quality['id'], audio_quality['id']),
+            'url': session_response['data']['session']['content_uri'],
             'format_id': format_id,
-            'format_note': 'DMC %s' % try_get(video_quality, lambda x: x['metadata']['label'], compat_str),
             'ext': 'mp4',  # Session API are used in HTML5, which always serves mp4
-            'vcodec': vdict.get('codec'),
-            'acodec': adict.get('codec'),
-            'vbr': float_or_none(vbr, 1000) or float_or_none(vdict.get('br')),
-            'abr': float_or_none(audio_quality.get('bitrate'), 1000) or float_or_none(adict.get('br')),
-            'height': int_or_none(resolution.get('height', vdict.get('res'))),
-            'width': int_or_none(resolution.get('width')),
-            'quality': -2 if 'low' in format_id else -1,  # Default quality value is -1
-            'protocol': protocol,
-            'http_headers': {
-                'Origin': 'https://www.nicovideo.jp',
-                'Referer': 'https://www.nicovideo.jp/watch/' + video_id,
-            }
+            'abr': float_or_none(audio_quality.get('bitrate'), 1000),
+            'vbr': float_or_none(video_quality.get('bitrate'), 1000),
+            'height': resolution.get('height'),
+            'width': resolution.get('width'),
         }
 
     def _real_extract(self, url):
         video_id = self._match_id(url)
 
-        # Get video webpage for API data.
+        # Get video webpage. We are not actually interested in it for normal
+        # cases, but need the cookies in order to be able to download the
+        # info webpage
         webpage, handle = self._download_webpage_handle(
             'http://www.nicovideo.jp/watch/' + video_id, video_id)
         if video_id.startswith('so'):
@@ -391,136 +284,86 @@ class NiconicoIE(InfoExtractor):
             'data-api-data="([^"]+)"', webpage,
             'API data', default='{}'), video_id)
 
-        def get_video_info_web(items):
-            return dict_get(api_data['video'], items)
+        def _format_id_from_url(video_url):
+            return 'economy' if video_real_url.endswith('low') else 'normal'
 
-        # Get video info
-        video_info_xml = self._download_xml(
-            'http://ext.nicovideo.jp/api/getthumbinfo/' + video_id,
-            video_id, note='Downloading video info page')
+        try:
+            video_real_url = api_data['video']['smileInfo']['url']
+        except KeyError:  # Flash videos
+            # Get flv info
+            flv_info_webpage = self._download_webpage(
+                'http://flapi.nicovideo.jp/api/getflv/' + video_id + '?as3=1',
+                video_id, 'Downloading flv info')
 
-        def get_video_info_xml(items):
-            if not isinstance(items, list):
-                items = [items]
-            for item in items:
-                ret = xpath_text(video_info_xml, './/' + item)
-                if ret:
-                    return ret
+            flv_info = compat_parse_qs(flv_info_webpage)
+            if 'url' not in flv_info:
+                if 'deleted' in flv_info:
+                    raise ExtractorError('The video has been deleted.',
+                                         expected=True)
+                elif 'closed' in flv_info:
+                    raise ExtractorError('Niconico videos now require logging in',
+                                         expected=True)
+                elif 'error' in flv_info:
+                    raise ExtractorError('%s reports error: %s' % (
+                        self.IE_NAME, flv_info['error'][0]), expected=True)
+                else:
+                    raise ExtractorError('Unable to find video URL')
 
-        if get_video_info_xml('error'):
-            error_code = get_video_info_xml('code')
+            video_info_xml = self._download_xml(
+                'http://ext.nicovideo.jp/api/getthumbinfo/' + video_id,
+                video_id, note='Downloading video info page')
 
-            if error_code == 'DELETED':
-                raise ExtractorError('The video has been deleted.',
-                                     expected=True)
-            elif error_code == 'NOT_FOUND':
-                raise ExtractorError('The video is not found.',
-                                     expected=True)
-            elif error_code == 'COMMUNITY':
-                self.to_screen('%s: The video is community members only.' % video_id)
-            else:
-                raise ExtractorError('%s reports error: %s' % (self.IE_NAME, error_code))
+            def get_video_info(items):
+                if not isinstance(items, list):
+                    items = [items]
+                for item in items:
+                    ret = xpath_text(video_info_xml, './/' + item)
+                    if ret:
+                        return ret
 
-        # Start extracting video formats
-        formats = []
+            video_real_url = flv_info['url'][0]
 
-        # Get HTML5 videos info
-        quality_info = try_get(api_data, lambda x: x['media']['delivery']['movie'])
-        if not quality_info:
-            raise ExtractorError('The video can\'t be downloaded', expected=True)
+            extension = get_video_info('movie_type')
+            if not extension:
+                extension = determine_ext(video_real_url)
 
-        for audio_quality in quality_info.get('audios') or {}:
-            for video_quality in quality_info.get('videos') or {}:
-                if not audio_quality.get('isAvailable') or not video_quality.get('isAvailable'):
-                    continue
-                formats.append(self._extract_format_for_quality(
-                    api_data, video_id, audio_quality, video_quality))
+            formats = [{
+                'url': video_real_url,
+                'ext': extension,
+                'format_id': _format_id_from_url(video_real_url),
+            }]
+        else:
+            formats = []
 
-        # Get flv/swf info
-        timestamp = None
-        video_real_url = try_get(api_data, lambda x: x['video']['smileInfo']['url'])
-        if video_real_url:
-            is_economy = video_real_url.endswith('low')
+            dmc_info = api_data['video'].get('dmcInfo')
+            if dmc_info:  # "New" HTML5 videos
+                quality_info = dmc_info['quality']
+                for audio_quality in quality_info['audios']:
+                    for video_quality in quality_info['videos']:
+                        if not audio_quality['available'] or not video_quality['available']:
+                            continue
+                        formats.append(self._extract_format_for_quality(
+                            api_data, video_id, audio_quality, video_quality))
 
-            if is_economy:
-                self.report_warning('Site is currently in economy mode! You will only have access to lower quality streams')
-
-            # Invoking ffprobe to determine resolution
-            pp = FFmpegPostProcessor(self._downloader)
-            cookies = self._get_cookies('https://nicovideo.jp').output(header='', sep='; path=/; domain=nicovideo.jp;\n')
-
-            self.to_screen('%s: %s' % (video_id, 'Checking smile format with ffprobe'))
-
-            try:
-                metadata = pp.get_metadata_object(video_real_url, ['-cookies', cookies])
-            except PostProcessingError as err:
-                raise ExtractorError(err.msg, expected=True)
-
-            v_stream = a_stream = {}
-
-            # Some complex swf files doesn't have video stream (e.g. nm4809023)
-            for stream in metadata['streams']:
-                if stream['codec_type'] == 'video':
-                    v_stream = stream
-                elif stream['codec_type'] == 'audio':
-                    a_stream = stream
-
-            # Community restricted videos seem to have issues with the thumb API not returning anything at all
-            filesize = int(
-                (get_video_info_xml('size_high') if not is_economy else get_video_info_xml('size_low'))
-                or metadata['format']['size']
-            )
-            extension = (
-                get_video_info_xml('movie_type')
-                or 'mp4' if 'mp4' in metadata['format']['format_name'] else metadata['format']['format_name']
-            )
-
-            # 'creation_time' tag on video stream of re-encoded SMILEVIDEO mp4 files are '1970-01-01T00:00:00.000000Z'.
-            timestamp = (
-                parse_iso8601(get_video_info_web('first_retrieve'))
-                or unified_timestamp(get_video_info_web('postedDateTime'))
-            )
-            metadata_timestamp = (
-                parse_iso8601(try_get(v_stream, lambda x: x['tags']['creation_time']))
-                or timestamp if extension != 'mp4' else 0
-            )
-
-            # According to compconf, smile videos from pre-2017 are always better quality than their DMC counterparts
-            smile_threshold_timestamp = parse_iso8601('2016-12-08T00:00:00+09:00')
-
-            is_source = timestamp < smile_threshold_timestamp or metadata_timestamp > 0
-
-            # If movie file size is unstable, old server movie is not source movie.
-            if filesize > 1:
-                formats.append({
+                self._sort_formats(formats)
+            else:  # "Old" HTML5 videos
+                formats = [{
                     'url': video_real_url,
-                    'format_id': 'smile' if not is_economy else 'smile_low',
-                    'format_note': 'SMILEVIDEO source' if not is_economy else 'SMILEVIDEO low quality',
-                    'ext': extension,
-                    'container': extension,
-                    'vcodec': v_stream.get('codec_name'),
-                    'acodec': a_stream.get('codec_name'),
-                    # Some complex swf files doesn't have total bit rate metadata (e.g. nm6049209)
-                    'tbr': int_or_none(metadata['format'].get('bit_rate'), scale=1000),
-                    'vbr': int_or_none(v_stream.get('bit_rate'), scale=1000),
-                    'abr': int_or_none(a_stream.get('bit_rate'), scale=1000),
-                    'height': int_or_none(v_stream.get('height')),
-                    'width': int_or_none(v_stream.get('width')),
-                    'source_preference': 5 if not is_economy else -2,
-                    'quality': 5 if is_source and not is_economy else None,
-                    'filesize': filesize
-                })
+                    'ext': 'mp4',
+                    'format_id': _format_id_from_url(video_real_url),
+                }]
 
-        self._sort_formats(formats)
+            def get_video_info(items):
+                return dict_get(api_data['video'], items)
 
         # Start extracting information
-        title = (
-            get_video_info_xml('title')  # prefer to get the untranslated original title
-            or get_video_info_web(['originalTitle', 'title'])
-            or self._og_search_title(webpage, default=None)
-            or self._html_search_regex(
+        title = get_video_info('title')
+        if not title:
+            title = self._og_search_title(webpage, default=None)
+        if not title:
+            title = self._html_search_regex(
                 r'<span[^>]+class="videoHeaderTitle"[^>]*>([^<]+)</span>',
-                webpage, 'video title'))
+                webpage, 'video title')
 
         watch_api_data_string = self._html_search_regex(
             r'<div[^>]+id="watchAPIDataContainer"[^>]+>([^<]+)</div>',
@@ -529,15 +372,14 @@ class NiconicoIE(InfoExtractor):
         video_detail = watch_api_data.get('videoDetail', {})
 
         thumbnail = (
-            self._html_search_regex(r'<meta property="og:image" content="([^"]+)">', webpage, 'thumbnail data', default=None)
-            or dict_get(  # choose highest from 720p to 240p
-                get_video_info_web('thumbnail'),
-                ['ogp', 'player', 'largeUrl', 'middleUrl', 'url'])
+            get_video_info(['thumbnail_url', 'thumbnailURL'])
             or self._html_search_meta('image', webpage, 'thumbnail', default=None)
             or video_detail.get('thumbnail'))
 
-        description = get_video_info_web('description')
+        description = get_video_info('description')
 
+        timestamp = (parse_iso8601(get_video_info('first_retrieve'))
+                     or unified_timestamp(get_video_info('postedDateTime')))
         if not timestamp:
             match = self._html_search_meta('datePublished', webpage, 'date published', default=None)
             if match:
@@ -546,25 +388,19 @@ class NiconicoIE(InfoExtractor):
             timestamp = parse_iso8601(
                 video_detail['postedAt'].replace('/', '-'),
                 delimiter=' ', timezone=datetime.timedelta(hours=9))
-        timestamp = timestamp or try_get(api_data, lambda x: parse_iso8601(x['video']['registeredAt']))
 
-        view_count = int_or_none(get_video_info_web(['view_counter', 'viewCount']))
+        view_count = int_or_none(get_video_info(['view_counter', 'viewCount']))
         if not view_count:
             match = self._html_search_regex(
                 r'>Views: <strong[^>]*>([^<]+)</strong>',
                 webpage, 'view count', default=None)
             if match:
                 view_count = int_or_none(match.replace(',', ''))
-        view_count = (
-            view_count
-            or video_detail.get('viewCount')
-            or try_get(api_data, lambda x: x['video']['count']['view']))
-
-        comment_count = (
-            int_or_none(get_video_info_web('comment_num'))
-            or video_detail.get('commentCount')
-            or try_get(api_data, lambda x: x['video']['count']['comment']))
+        view_count = view_count or video_detail.get('viewCount')
 
+        comment_count = (int_or_none(get_video_info('comment_num'))
+                         or video_detail.get('commentCount')
+                         or try_get(api_data, lambda x: x['thread']['commentCount']))
         if not comment_count:
             match = self._html_search_regex(
                 r'>Comments: <strong[^>]*>([^<]+)</strong>',
@@ -573,41 +409,22 @@ class NiconicoIE(InfoExtractor):
                 comment_count = int_or_none(match.replace(',', ''))
 
         duration = (parse_duration(
-            get_video_info_web('length')
+            get_video_info('length')
             or self._html_search_meta(
                 'video:duration', webpage, 'video duration', default=None))
             or video_detail.get('length')
-            or get_video_info_web('duration'))
+            or get_video_info('duration'))
 
-        webpage_url = get_video_info_web('watch_url') or url
-
-        # for channel movie and community movie
-        channel_id = try_get(
-            api_data,
-            (lambda x: x['channel']['globalId'],
-             lambda x: x['community']['globalId']))
-        channel = try_get(
-            api_data,
-            (lambda x: x['channel']['name'],
-             lambda x: x['community']['name']))
+        webpage_url = get_video_info('watch_url') or url
 
         # Note: cannot use api_data.get('owner', {}) because owner may be set to "null"
         # in the JSON, which will cause None to be returned instead of {}.
         owner = try_get(api_data, lambda x: x.get('owner'), dict) or {}
-        uploader_id = str_or_none(
-            get_video_info_web(['ch_id', 'user_id'])
-            or owner.get('id')
-            or channel_id
-        )
-        uploader = (
-            get_video_info_web(['ch_name', 'user_nickname'])
-            or owner.get('nickname')
-            or channel
-        )
+        uploader_id = get_video_info(['ch_id', 'user_id']) or owner.get('id')
+        uploader = get_video_info(['ch_name', 'user_nickname']) or owner.get('nickname')
 
         return {
             'id': video_id,
-            '_api_data': api_data,
             'title': title,
             'formats': formats,
             'thumbnail': thumbnail,
@@ -615,8 +432,6 @@ class NiconicoIE(InfoExtractor):
             'uploader': uploader,
             'timestamp': timestamp,
             'uploader_id': uploader_id,
-            'channel': channel,
-            'channel_id': channel_id,
             'view_count': view_count,
             'comment_count': comment_count,
             'duration': duration,
@@ -625,7 +440,7 @@ class NiconicoIE(InfoExtractor):
 
 
 class NiconicoPlaylistIE(InfoExtractor):
-    _VALID_URL = r'https?://(?:www\.)?nicovideo\.jp/(?:user/\d+/|my/)?mylist/(?P<id>\d+)'
+    _VALID_URL = r'https?://(?:www\.)?nicovideo\.jp/(?:user/\d+/)?mylist/(?P<id>\d+)'
 
     _TESTS = [{
         'url': 'http://www.nicovideo.jp/mylist/27411728',
@@ -641,185 +456,60 @@ class NiconicoPlaylistIE(InfoExtractor):
         'url': 'https://www.nicovideo.jp/user/805442/mylist/27411728',
         'only_matching': True,
     }]
-
-    _API_HEADERS = {
-        'X-Frontend-ID': '6',
-        'X-Frontend-Version': '0'
-    }
-
-    def _real_extract(self, url):
-        list_id = self._match_id(url)
-
-        def get_page_data(pagenum, pagesize):
-            return self._download_json(
-                'http://nvapi.nicovideo.jp/v2/mylists/' + list_id, list_id,
-                query={'page': 1 + pagenum, 'pageSize': pagesize},
-                headers=self._API_HEADERS).get('data').get('mylist')
-
-        data = get_page_data(0, 1)
-        title = data.get('name')
-        description = data.get('description')
-        uploader = data.get('owner').get('name')
-        uploader_id = data.get('owner').get('id')
-
-        def pagefunc(pagenum):
-            data = get_page_data(pagenum, 25)
-            return ({
-                '_type': 'url',
-                'url': 'http://www.nicovideo.jp/watch/' + item.get('watchId'),
-            } for item in data.get('items'))
-
-        return {
-            '_type': 'playlist',
-            'id': list_id,
-            'title': title,
-            'description': description,
-            'uploader': uploader,
-            'uploader_id': uploader_id,
-            'entries': OnDemandPagedList(pagefunc, 25),
-        }
-
-
-class NicovideoSearchBaseIE(InfoExtractor):
-    _MAX_RESULTS = float('inf')
-
-    def _entries(self, url, item_id, query=None, note='Downloading page %(page)s'):
-        query = query or {}
-        pages = [query['page']] if 'page' in query else itertools.count(1)
-        for page_num in pages:
-            query['page'] = str(page_num)
-            webpage = self._download_webpage(url, item_id, query=query, note=note % {'page': page_num})
-            results = re.findall(r'(?<=data-video-id=)["\']?(?P<videoid>.+?)(?=["\'])', webpage)
-            for item in results:
-                yield self.url_result('http://www.nicovideo.jp/watch/%s' % item, 'Niconico', item)
-            if not results:
-                break
-
-    def _get_n_results(self, query, n):
-        entries = self._entries(self._proto_relative_url('//www.nicovideo.jp/search/%s' % query), query)
-        if n < self._MAX_RESULTS:
-            entries = itertools.islice(entries, 0, n)
-        return self.playlist_result(entries, query, query)
-
-
-class NicovideoSearchIE(NicovideoSearchBaseIE, SearchInfoExtractor):
-    IE_DESC = 'Nico video search'
-    IE_NAME = 'nicovideo:search'
-    _SEARCH_KEY = 'nicosearch'
-
-    def _search_results(self, query):
-        return self._entries(
-            self._proto_relative_url('//www.nicovideo.jp/search/%s' % query), query)
-
-
-class NicovideoSearchURLIE(NicovideoSearchBaseIE):
-    IE_NAME = '%s_url' % NicovideoSearchIE.IE_NAME
-    IE_DESC = 'Nico video search URLs'
-    _VALID_URL = r'https?://(?:www\.)?nicovideo\.jp/search/(?P<id>[^?#&]+)?'
-    _TESTS = [{
-        'url': 'http://www.nicovideo.jp/search/sm9',
-        'info_dict': {
-            'id': 'sm9',
-            'title': 'sm9'
-        },
-        'playlist_mincount': 40,
-    }, {
-        'url': 'https://www.nicovideo.jp/search/sm9?sort=h&order=d&end=2020-12-31&start=2020-01-01',
-        'info_dict': {
-            'id': 'sm9',
-            'title': 'sm9'
-        },
-        'playlist_count': 31,
-    }]
-
-    def _real_extract(self, url):
-        query = self._match_id(url)
-        return self.playlist_result(self._entries(url, query), query, query)
-
-
-class NicovideoSearchDateIE(NicovideoSearchBaseIE, SearchInfoExtractor):
-    IE_DESC = 'Nico video search, newest first'
-    IE_NAME = '%s:date' % NicovideoSearchIE.IE_NAME
-    _SEARCH_KEY = 'nicosearchdate'
-
-    _TESTS = [{
-        'url': 'nicosearchdateall:a',
-        'info_dict': {
-            'id': 'a',
-            'title': 'a'
-        },
-        'playlist_mincount': 1610,
-    }]
-
-    _START_DATE = datetime.date(2007, 1, 1)
-    _RESULTS_PER_PAGE = 32
-    _MAX_PAGES = 50
-
-    def _entries(self, url, item_id, start_date=None, end_date=None):
-        start_date, end_date = start_date or self._START_DATE, end_date or datetime.datetime.now().date()
-
-        # If the last page has a full page of videos, we need to break down the query interval further
-        last_page_len = len(list(self._get_entries_for_date(
-            url, item_id, start_date, end_date, self._MAX_PAGES,
-            note='Checking number of videos from {0} to {1}'.format(start_date, end_date))))
-        if (last_page_len == self._RESULTS_PER_PAGE and start_date != end_date):
-            midpoint = start_date + ((end_date - start_date) // 2)
-            for entry in itertools.chain(
-                    iter(self._entries(url, item_id, midpoint, end_date)),
-                    iter(self._entries(url, item_id, start_date, midpoint))):
-                yield entry
-        else:
-            self.to_screen('{0}: Downloading results from {1} to {2}'.format(item_id, start_date, end_date))
-            for entry in iter(self._get_entries_for_date(
-                    url, item_id, start_date, end_date, note='    Downloading page %(page)s')):
-                yield entry
-
-    def _get_entries_for_date(self, url, item_id, start_date, end_date=None, page_num=None, note=None):
-        query = {
-            'start': compat_str(start_date),
-            'end': compat_str(end_date or start_date),
-            'sort': 'f',
-            'order': 'd',
-        }
-        if page_num:
-            query['page'] = compat_str(page_num)
-
-        for entry in iter(super(NicovideoSearchDateIE, self)._entries(url, item_id, query=query, note=note)):
-            yield entry
-
-
-class NiconicoUserIE(InfoExtractor):
-    _VALID_URL = r'https?://(?:www\.)?nicovideo\.jp/user/(?P<id>\d+)/?(?:$|[#?])'
-    _TEST = {
-        'url': 'https://www.nicovideo.jp/user/419948',
-        'info_dict': {
-            'id': '419948',
-        },
-        'playlist_mincount': 101,
-    }
-    _API_URL = "https://nvapi.nicovideo.jp/v1/users/%s/videos?sortKey=registeredAt&sortOrder=desc&pageSize=%s&page=%s"
     _PAGE_SIZE = 100
 
-    _API_HEADERS = {
-        'X-Frontend-ID': '6',
-        'X-Frontend-Version': '0'
-    }
+    def _call_api(self, list_id, resource, query):
+        return self._download_json(
+            'https://nvapi.nicovideo.jp/v2/mylists/' + list_id, list_id,
+            'Downloading %s JSON metatdata' % resource, query=query,
+            headers={'X-Frontend-Id': 6})['data']['mylist']
 
-    def _entries(self, list_id):
-        total_count = 1
-        count = page_num = 0
-        while count < total_count:
-            json_parsed = self._download_json(
-                self._API_URL % (list_id, self._PAGE_SIZE, page_num + 1), list_id,
-                headers=self._API_HEADERS,
-                note='Downloading JSON metadata%s' % (' page %d' % page_num if page_num else ''))
-            if not page_num:
-                total_count = int_or_none(json_parsed['data'].get('totalCount'))
-            for entry in json_parsed["data"]["items"]:
-                count += 1
-                yield self.url_result('https://www.nicovideo.jp/watch/%s' % entry['id'])
-            page_num += 1
+    def _parse_owner(self, item):
+        owner = item.get('owner') or {}
+        if owner:
+            return {
+                'uploader': owner.get('name'),
+                'uploader_id': owner.get('id'),
+            }
+        return {}
+
+    def _fetch_page(self, list_id, page):
+        page += 1
+        items = self._call_api(list_id, 'page %d' % page, {
+            'page': page,
+            'pageSize': self._PAGE_SIZE,
+        })['items']
+        for item in items:
+            video = item.get('video') or {}
+            video_id = video.get('id')
+            if not video_id:
+                continue
+            count = video.get('count') or {}
+            get_count = lambda x: int_or_none(count.get(x))
+            info = {
+                '_type': 'url',
+                'id': video_id,
+                'title': video.get('title'),
+                'url': 'https://www.nicovideo.jp/watch/' + video_id,
+                'description': video.get('shortDescription'),
+                'duration': int_or_none(video.get('duration')),
+                'view_count': get_count('view'),
+                'comment_count': get_count('comment'),
+                'ie_key': NiconicoIE.ie_key(),
+            }
+            info.update(self._parse_owner(video))
+            yield info
 
     def _real_extract(self, url):
         list_id = self._match_id(url)
-        return self.playlist_result(self._entries(list_id), list_id)
+        mylist = self._call_api(list_id, 'list', {
+            'pageSize': 1,
+        })
+        entries = InAdvancePagedList(
+            functools.partial(self._fetch_page, list_id),
+            math.ceil(mylist['totalItemCount'] / self._PAGE_SIZE),
+            self._PAGE_SIZE)
+        result = self.playlist_result(
+            entries, list_id, mylist.get('name'), mylist.get('description'))
+        result.update(self._parse_owner(mylist))
+        return result
diff --git a/youtube_dl/extractor/nrk.py b/youtube_dl/extractor/nrk.py
index 5a62b50fc..40dee2162 100644
--- a/youtube_dl/extractor/nrk.py
+++ b/youtube_dl/extractor/nrk.py
@@ -58,9 +58,10 @@ class NRKBaseIE(InfoExtractor):
 
     def _call_api(self, path, video_id, item=None, note=None, fatal=True, query=None):
         return self._download_json(
-            urljoin('https://psapi.nrk.no/', path),
+            urljoin('http://psapi.nrk.no/', path),
             video_id, note or 'Downloading %s JSON' % item,
-            fatal=fatal, query=query)
+            fatal=fatal, query=query,
+            headers={'Accept-Encoding': 'gzip, deflate, br'})
 
 
 class NRKIE(NRKBaseIE):
diff --git a/youtube_dl/extractor/nuvid.py b/youtube_dl/extractor/nuvid.py
index f6c94dd77..ab6bfcd7f 100644
--- a/youtube_dl/extractor/nuvid.py
+++ b/youtube_dl/extractor/nuvid.py
@@ -1,113 +1,71 @@
-# coding: utf-8
 from __future__ import unicode_literals
 
+import re
+
 from .common import InfoExtractor
-from ..compat import compat_str
 from ..utils import (
     parse_duration,
-    int_or_none,
-    try_get,
-    url_or_none,
 )
 
-import re
-
 
 class NuvidIE(InfoExtractor):
     _VALID_URL = r'https?://(?:www|m)\.nuvid\.com/video/(?P<id>[0-9]+)'
-    _TESTS = [{
-        'url': 'https://www.nuvid.com/video/6513023/italian-babe',
-        'md5': '772d2f8288f3d3c5c45f7a41761c7844',
+    _TEST = {
+        'url': 'http://m.nuvid.com/video/1310741/',
+        'md5': 'eab207b7ac4fccfb4e23c86201f11277',
         'info_dict': {
-            'id': '6513023',
+            'id': '1310741',
             'ext': 'mp4',
-            'title': 'italian babe',
-            'format_id': '360p',
-            'duration': 321.0,
+            'title': 'Horny babes show their awesome bodeis and',
+            'duration': 129,
             'age_limit': 18,
-            'thumbnail': r're:https?://.+\.jpg',
-            'thumbnails': list,
         }
-    }, {
-        'url': 'https://m.nuvid.com/video/6523263',
-        'md5': 'ebd22ce8e47e1d9a4d0756a15c67da52',
-        'info_dict': {
-            'id': '6523263',
-            'ext': 'mp4',
-            'title': 'Slut brunette college student anal dorm',
-            'format_id': '720p',
-            'duration': 421.0,
-            'age_limit': 18,
-            'thumbnail': r're:https?://.+\.jpg',
-            'thumbnails': list,
-        }
-    }, {
-        'url': 'http://m.nuvid.com/video/6415801/',
-        'md5': '638d5ececb138d5753593f751ae3f697',
-        'info_dict': {
-            'id': '6415801',
-            'ext': 'mp4',
-            'title': 'My best friend wanted to fuck my wife for a long time',
-            'format_id': '720p',
-            'duration': 1882,
-            'age_limit': 18,
-            'thumbnail': r're:https?://.+\.jpg',
-            'thumbnails': list,
-        }
-    }]
+    }
 
     def _real_extract(self, url):
         video_id = self._match_id(url)
 
-        qualities = {
-            'lq': '360p',
-            'hq': '720p',
-        }
-
-        json_url = 'https://www.nuvid.com/player_config_json/?vid={video_id}&aid=0&domain_id=0&embed=0&check_speed=0'.format(**locals())
-        video_data = self._download_json(
-            json_url, video_id, headers={
-                'Accept': 'application/json, text/javascript, */*; q = 0.01',
-                'Content-Type': 'application/x-www-form-urlencoded; charset=utf-8',
-            }) or {}
-
-        # nice to have, not required
+        page_url = 'http://m.nuvid.com/video/%s' % video_id
         webpage = self._download_webpage(
-            'http://m.nuvid.com/video/%s' % (video_id, ),
-            video_id, 'Downloading video page', fatal=False) or ''
-
-        title = (
-            try_get(video_data, lambda x: x['title'], compat_str)
-            or self._html_search_regex(
-                (r'''<span\s[^>]*?\btitle\s*=\s*(?P<q>"|'|\b)(?P<title>[^"]+)(?P=q)\s*>''',
-                 r'''<div\s[^>]*?\bclass\s*=\s*(?P<q>"|'|\b)thumb-holder video(?P=q)>\s*<h5\b[^>]*>(?P<title>[^<]+)</h5''',
-                 r'''<span\s[^>]*?\bclass\s*=\s*(?P<q>"|'|\b)title_thumb(?P=q)>(?P<title>[^<]+)</span'''),
-                webpage, 'title', group='title')).strip()
+            page_url, video_id, 'Downloading video page')
+        # When dwnld_speed exists and has a value larger than the MP4 file's
+        # bitrate, Nuvid returns the MP4 URL
+        # It's unit is 100bytes/millisecond, see mobile-nuvid-min.js for the algorithm
+        self._set_cookie('nuvid.com', 'dwnld_speed', '10.0')
+        mp4_webpage = self._download_webpage(
+            page_url, video_id, 'Downloading video page for MP4 format')
 
+        html5_video_re = r'(?s)<(?:video|audio)[^<]*(?:>.*?<source[^>]*)?\s+src=["\'](.*?)["\']',
+        video_url = self._html_search_regex(html5_video_re, webpage, video_id)
+        mp4_video_url = self._html_search_regex(html5_video_re, mp4_webpage, video_id)
         formats = [{
-            'url': source,
-            'format_id': qualities.get(quality),
-            'height': int_or_none(qualities.get(quality)[:-1]),
-        } for quality, source in video_data.get('files').items() if source]
+            'url': video_url,
+        }]
+        if mp4_video_url != video_url:
+            formats.append({
+                'url': mp4_video_url,
+            })
 
-        self._check_formats(formats, video_id)
-        self._sort_formats(formats)
-
-        duration = parse_duration(video_data.get('duration') or video_data.get('duration_format'))
+        title = self._html_search_regex(
+            [r'<span title="([^"]+)">',
+             r'<div class="thumb-holder video">\s*<h5[^>]*>([^<]+)</h5>',
+             r'<span[^>]+class="title_thumb">([^<]+)</span>'], webpage, 'title').strip()
         thumbnails = [
-            {'url': thumb_url, }
-            for thumb_url in (
-                url_or_none(src) for src in re.findall(
-                    r'<div\s+class\s*=\s*"video-tmb-wrap"\s*>\s*<img\s+src\s*=\s*"([^"]+)"\s*/>',
-                    webpage))
+            {
+                'url': thumb_url,
+            } for thumb_url in re.findall(r'<img src="([^"]+)" alt="" />', webpage)
         ]
+        thumbnail = thumbnails[0]['url'] if thumbnails else None
+        duration = parse_duration(self._html_search_regex(
+            [r'<i class="fa fa-clock-o"></i>\s*(\d{2}:\d{2})',
+             r'<span[^>]+class="view_time">([^<]+)</span>'], webpage, 'duration', fatal=False))
 
         return {
             'id': video_id,
-            'formats': formats,
             'title': title,
-            'thumbnail': url_or_none(video_data.get('poster')),
             'thumbnails': thumbnails,
+            'thumbnail': thumbnail,
             'duration': duration,
             'age_limit': 18,
+            'formats': formats,
         }
diff --git a/youtube_dl/extractor/openload.py b/youtube_dl/extractor/openload.py
index 45b1add73..0c20d0177 100644
--- a/youtube_dl/extractor/openload.py
+++ b/youtube_dl/extractor/openload.py
@@ -7,7 +7,6 @@ import subprocess
 import tempfile
 
 from ..compat import (
-    compat_open as open,
     compat_urlparse,
     compat_kwargs,
 )
@@ -17,7 +16,6 @@ from ..utils import (
     ExtractorError,
     get_exe_version,
     is_outdated_version,
-    process_communicate_or_kill,
     std_headers,
 )
 
@@ -228,7 +226,7 @@ class PhantomJSwrapper(object):
             self.exe, '--ssl-protocol=any',
             self._TMP_FILES['script'].name
         ], stdout=subprocess.PIPE, stderr=subprocess.PIPE)
-        out, err = process_communicate_or_kill(p)
+        out, err = p.communicate()
         if p.returncode != 0:
             raise ExtractorError(
                 'Executing JS failed\n:' + encodeArgument(err))
diff --git a/youtube_dl/extractor/orf.py b/youtube_dl/extractor/orf.py
index 1ee78edbc..700ce448c 100644
--- a/youtube_dl/extractor/orf.py
+++ b/youtube_dl/extractor/orf.py
@@ -1,394 +1,385 @@
 # coding: utf-8
 from __future__ import unicode_literals
 
-import base64
-import functools
 import re
 
 from .common import InfoExtractor
-from .youtube import YoutubeIE
+from ..compat import compat_str
 from ..utils import (
     clean_html,
     determine_ext,
-    ExtractorError,
     float_or_none,
+    HEADRequest,
     int_or_none,
-    merge_dicts,
-    mimetype2ext,
-    parse_age_limit,
-    parse_iso8601,
+    orderedSet,
+    remove_end,
+    str_or_none,
     strip_jsonp,
-    txt_or_none,
+    unescapeHTML,
     unified_strdate,
-    update_url_query,
     url_or_none,
 )
-from ..traversal import T, traverse_obj
-
-k_float_or_none = functools.partial(float_or_none, scale=1000)
 
 
-class ORFRadioBase(InfoExtractor):
-    STATION_INFO = {
-        'fm4': ('fm4', 'fm4', 'orffm4'),
-        'noe': ('noe', 'oe2n', 'orfnoe'),
-        'wien': ('wie', 'oe2w', 'orfwie'),
-        'burgenland': ('bgl', 'oe2b', 'orfbgl'),
-        'ooe': ('ooe', 'oe2o', 'orfooe'),
-        'steiermark': ('stm', 'oe2st', 'orfstm'),
-        'kaernten': ('ktn', 'oe2k', 'orfktn'),
-        'salzburg': ('sbg', 'oe2s', 'orfsbg'),
-        'tirol': ('tir', 'oe2t', 'orftir'),
-        'vorarlberg': ('vbg', 'oe2v', 'orfvbg'),
-        'oe3': ('oe3', 'oe3', 'orfoe3'),
-        'oe1': ('oe1', 'oe1', 'orfoe1'),
-    }
-    _ID_NAMES = ('id', 'guid', 'program')
-
-    @classmethod
-    def _get_item_id(cls, data):
-        return traverse_obj(data, *cls._ID_NAMES, expected_type=txt_or_none)
-
-    @classmethod
-    def _get_api_payload(cls, data, expected_id, in_payload=False):
-        if expected_id not in traverse_obj(data, ('payload',)[:1 if in_payload else 0] + (cls._ID_NAMES, T(txt_or_none))):
-            raise ExtractorError('Unexpected API data result', video_id=expected_id)
-        return data['payload']
-
-    @staticmethod
-    def _extract_podcast_upload(data):
-        return traverse_obj(data, {
-            'url': ('enclosures', 0, 'url'),
-            'ext': ('enclosures', 0, 'type', T(mimetype2ext)),
-            'filesize': ('enclosures', 0, 'length', T(int_or_none)),
-            'title': ('title', T(txt_or_none)),
-            'description': ('description', T(clean_html)),
-            'timestamp': (('published', 'postDate'), T(parse_iso8601)),
-            'duration': ('duration', T(k_float_or_none)),
-            'series': ('podcast', 'title'),
-            'uploader': ((('podcast', 'author'), 'station'), T(txt_or_none)),
-            'uploader_id': ('podcast', 'channel', T(txt_or_none)),
-        }, get_all=False)
-
-    @classmethod
-    def _entries(cls, data, station, item_type=None):
-        if item_type in ('upload', 'podcast-episode'):
-            yield merge_dicts({
-                'id': cls._get_item_id(data),
-                'ext': 'mp3',
-                'vcodec': 'none',
-            }, cls._extract_podcast_upload(data), rev=True)
-            return
-
-        loop_station = cls.STATION_INFO[station][1]
-        for info in traverse_obj(data, ((('streams', Ellipsis), 'stream'), T(lambda v: v if v['loopStreamId'] else None))):
-            item_id = info['loopStreamId']
-            host = info.get('host') or 'loopstream01.apa.at'
-            yield merge_dicts({
-                'id': item_id.replace('.mp3', ''),
-                'ext': 'mp3',
-                'url': update_url_query('https://{0}/'.format(host), {
-                    'channel': loop_station,
-                    'id': item_id,
-                }),
-                'vcodec': 'none',
-                # '_old_archive_ids': [make_archive_id(old_ie, video_id)],
-            }, traverse_obj(data, {
-                'title': ('title', T(txt_or_none)),
-                'description': ('subtitle', T(clean_html)),
-                'uploader': 'station',
-                'series': ('programTitle', T(txt_or_none)),
-            }), traverse_obj(info, {
-                'duration': (('duration',
-                              (None, T(lambda x: x['end'] - x['start']))),
-                             T(k_float_or_none), any),
-                'timestamp': (('start', 'startISO'), T(parse_iso8601), any),
-            }))
-
-
-class ORFRadioIE(ORFRadioBase):
-    IE_NAME = 'orf:sound'
-    _STATION_RE = '|'.join(map(re.escape, ORFRadioBase.STATION_INFO.keys()))
-
-    _VALID_URL = (
-        r'https?://sound\.orf\.at/radio/(?P<station>{0})/sendung/(?P<id>\d+)(?:/(?P<show>\w+))?'.format(_STATION_RE),
-        r'https?://(?P<station>{0})\.orf\.at/player/(?P<date>\d{{8}})/(?P<id>\d+)'.format(_STATION_RE),
-    )
+class ORFTVthekIE(InfoExtractor):
+    IE_NAME = 'orf:tvthek'
+    IE_DESC = 'ORF TVthek'
+    _VALID_URL = r'https?://tvthek\.orf\.at/(?:[^/]+/)+(?P<id>\d+)'
 
     _TESTS = [{
-        'url': 'https://sound.orf.at/radio/ooe/sendung/37802/guten-morgen-oberoesterreich-am-feiertag',
-        'info_dict': {
-            'id': '37802',
-            'title': 'Guten Morgen Oberösterreich am Feiertag',
-            'description': 'Oberösterreichs meistgehörte regionale Frühsendung.\nRegionale Nachrichten zu jeder halben Stunde.\nModeration: Wolfgang Lehner\nNachrichten:  Stephan Schnabl',
-        },
+        'url': 'http://tvthek.orf.at/program/Aufgetischt/2745173/Aufgetischt-Mit-der-Steirischen-Tafelrunde/8891389',
         'playlist': [{
-            'md5': 'f9ff8517dd681b642a2c900e2c9e6085',
+            'md5': '2942210346ed779588f428a92db88712',
             'info_dict': {
-                'id': '2024-05-30_0559_tl_66_7DaysThu1_443862',
-                'ext': 'mp3',
-                'title': 'Guten Morgen Oberösterreich am Feiertag',
-                'description': 'Oberösterreichs meistgehörte regionale Frühsendung.\nRegionale Nachrichten zu jeder halben Stunde.\nModeration: Wolfgang Lehner\nNachrichten:  Stephan Schnabl',
-                'timestamp': 1717041587,
-                'upload_date': '20240530',
-                'uploader': 'ooe',
-                'duration': 14413.0,
-            }
-        }],
-        'skip': 'Shows from ORF Sound are only available for 30 days.'
-    }, {
-        'url': 'https://oe1.orf.at/player/20240531/758136',
-        'md5': '2397717aaf3ae9c22a4f090ee3b8d374',
-        'info_dict': {
-            'id': '2024-05-31_1905_tl_51_7DaysFri35_2413387',
-            'ext': 'mp3',
-            'title': '"Who Cares?"',
-            'description': 'Europas größte Netzkonferenz re:publica 2024',
-            'timestamp': 1717175100,
-            'upload_date': '20240531',
-            'uploader': 'oe1',
-            'duration': 1500,
-        },
-        'skip': 'Shows from ORF Sound are only available for 30 days.'
-    }]
-
-    def _real_extract(self, url):
-        m = self._match_valid_url(url)
-        station, show_id = m.group('station', 'id')
-        api_station, _, _ = self.STATION_INFO[station]
-        if 'date' in m.groupdict():
-            data = self._download_json(
-                'https://audioapi.orf.at/{0}/json/4.0/broadcast/{1}/{2}?_o={3}.orf.at'.format(
-                    api_station, show_id, m.group('date'), station), show_id)
-            show_id = data['id']
-        else:
-            data = self._download_json(
-                'https://audioapi.orf.at/{0}/api/json/5.0/broadcast/{1}?_o=sound.orf.at'.format(
-                    api_station, show_id), show_id)
-
-            data = self._get_api_payload(data, show_id, in_payload=True)
-
-        # site sends ISO8601 GMT date-times with separate TZ offset, ignored
-        # TODO: should `..._date` be calculated relative to TZ?
-
-        return merge_dicts(
-            {'_type': 'multi_video'},
-            self.playlist_result(
-                self._entries(data, station), show_id,
-                txt_or_none(data.get('title')),
-                clean_html(data.get('subtitle'))))
-
-
-class ORFRadioCollectionIE(ORFRadioBase):
-    IE_NAME = 'orf:collection'
-    _VALID_URL = r'https?://sound\.orf\.at/collection/(?P<coll_id>\d+)(?:/(?P<item_id>\d+))?'
-
-    _TESTS = [{
-        'url': 'https://sound.orf.at/collection/4/61908/was-das-uberschreiten-des-15-limits-bedeutet',
-        'info_dict': {
-            'id': '2577582',
-        },
-        'playlist': [{
-            'md5': '5789cec7d75575ff58d19c0428c80eb3',
-            'info_dict': {
-                'id': '2024-06-06_1659_tl_54_7DaysThu6_153926',
-                'ext': 'mp3',
-                'title': 'Klimakrise: Was das Überschreiten des 1,5°-Limits bedeutet',
-                'timestamp': 1717686674,
-                'upload_date': '20240606',
-                'uploader': 'fm4',
+                'id': '8896777',
+                'ext': 'mp4',
+                'title': 'Aufgetischt: Mit der Steirischen Tafelrunde',
+                'description': 'md5:c1272f0245537812d4e36419c207b67d',
+                'duration': 2668,
+                'upload_date': '20141208',
             },
         }],
-        'skip': 'Shows from ORF Sound are only available for 30 days.'
+        'skip': 'Blocked outside of Austria / Germany',
     }, {
-        # persistent playlist (FM4 Highlights)
-        'url': 'https://sound.orf.at/collection/4/',
+        'url': 'http://tvthek.orf.at/topic/Im-Wandel-der-Zeit/8002126/Best-of-Ingrid-Thurnher/7982256',
         'info_dict': {
-            'id': '4',
+            'id': '7982259',
+            'ext': 'mp4',
+            'title': 'Best of Ingrid Thurnher',
+            'upload_date': '20140527',
+            'description': 'Viele Jahre war Ingrid Thurnher das "Gesicht" der ZIB 2. Vor ihrem Wechsel zur ZIB 2 im Jahr 1995 moderierte sie unter anderem "Land und Leute", "Österreich-Bild" und "Niederösterreich heute".',
         },
-        'playlist_mincount': 10,
-        'playlist_maxcount': 13,
+        'params': {
+            'skip_download': True,  # rtsp downloads
+        },
+        'skip': 'Blocked outside of Austria / Germany',
+    }, {
+        'url': 'http://tvthek.orf.at/topic/Fluechtlingskrise/10463081/Heimat-Fremde-Heimat/13879132/Senioren-betreuen-Migrantenkinder/13879141',
+        'only_matching': True,
+    }, {
+        'url': 'http://tvthek.orf.at/profile/Universum/35429',
+        'only_matching': True,
     }]
 
     def _real_extract(self, url):
-        coll_id, item_id = self._match_valid_url(url).group('coll_id', 'item_id')
-        data = self._download_json(
-            'https://collector.orf.at/api/frontend/collections/{0}?_o=sound.orf.at'.format(
-                coll_id), coll_id)
-        data = self._get_api_payload(data, coll_id, in_payload=True)
+        playlist_id = self._match_id(url)
+        webpage = self._download_webpage(url, playlist_id)
 
-        def yield_items():
-            for item in traverse_obj(data, (
-                    'content', 'items', lambda _, v: any(k in v['target']['params'] for k in self._ID_NAMES))):
-                if item_id is None or item_id == txt_or_none(item.get('id')):
-                    target = item['target']
-                    typed_item_id = self._get_item_id(target['params'])
-                    station = target['params'].get('station')
-                    item_type = target.get('type')
-                    if typed_item_id and (station or item_type):
-                        yield station, typed_item_id, item_type
-                    if item_id is not None:
-                        break
-            else:
-                if item_id is not None:
-                    raise ExtractorError('Item not found in collection',
-                                         video_id=coll_id, expected=True)
+        data_jsb = self._parse_json(
+            self._search_regex(
+                r'<div[^>]+class=(["\']).*?VideoPlaylist.*?\1[^>]+data-jsb=(["\'])(?P<json>.+?)\2',
+                webpage, 'playlist', group='json'),
+            playlist_id, transform_source=unescapeHTML)['playlist']['videos']
 
-        def item_playlist(station, typed_item_id, item_type):
-            if item_type == 'upload':
-                item_data = self._download_json('https://audioapi.orf.at/radiothek/api/2.0/upload/{0}?_o=sound.orf.at'.format(
-                    typed_item_id), typed_item_id)
-            elif item_type == 'podcast-episode':
-                item_data = self._download_json('https://audioapi.orf.at/radiothek/api/2.0/episode/{0}?_o=sound.orf.at'.format(
-                    typed_item_id), typed_item_id)
-            else:
-                api_station, _, _ = self.STATION_INFO[station]
-                item_data = self._download_json(
-                    'https://audioapi.orf.at/{0}/api/json/5.0/{1}/{2}?_o=sound.orf.at'.format(
-                        api_station, item_type or 'broadcastitem', typed_item_id), typed_item_id)
+        entries = []
+        for sd in data_jsb:
+            video_id, title = sd.get('id'), sd.get('title')
+            if not video_id or not title:
+                continue
+            video_id = compat_str(video_id)
+            formats = []
+            for fd in sd['sources']:
+                src = url_or_none(fd.get('src'))
+                if not src:
+                    continue
+                format_id_list = []
+                for key in ('delivery', 'quality', 'quality_string'):
+                    value = fd.get(key)
+                    if value:
+                        format_id_list.append(value)
+                format_id = '-'.join(format_id_list)
+                ext = determine_ext(src)
+                if ext == 'm3u8':
+                    m3u8_formats = self._extract_m3u8_formats(
+                        src, video_id, 'mp4', m3u8_id=format_id, fatal=False)
+                    if any('/geoprotection' in f['url'] for f in m3u8_formats):
+                        self.raise_geo_restricted()
+                    formats.extend(m3u8_formats)
+                elif ext == 'f4m':
+                    formats.extend(self._extract_f4m_formats(
+                        src, video_id, f4m_id=format_id, fatal=False))
+                else:
+                    formats.append({
+                        'format_id': format_id,
+                        'url': src,
+                        'protocol': fd.get('protocol'),
+                    })
 
-            item_data = self._get_api_payload(item_data, typed_item_id, in_payload=True)
+            # Check for geoblocking.
+            # There is a property is_geoprotection, but that's always false
+            geo_str = sd.get('geoprotection_string')
+            if geo_str:
+                try:
+                    http_url = next(
+                        f['url']
+                        for f in formats
+                        if re.match(r'^https?://.*\.mp4$', f['url']))
+                except StopIteration:
+                    pass
+                else:
+                    req = HEADRequest(http_url)
+                    self._request_webpage(
+                        req, video_id,
+                        note='Testing for geoblocking',
+                        errnote=((
+                            'This video seems to be blocked outside of %s. '
+                            'You may want to try the streaming-* formats.')
+                            % geo_str),
+                        fatal=False)
 
-            return merge_dicts(
-                {'_type': 'multi_video'},
-                self.playlist_result(
-                    self._entries(item_data, station, item_type), typed_item_id,
-                    txt_or_none(data.get('title')),
-                    clean_html(data.get('subtitle'))))
-
-        def yield_item_entries():
-            for station, typed_id, item_type in yield_items():
-                yield item_playlist(station, typed_id, item_type)
-
-        if item_id is not None:
-            # coll_id = '/'.join((coll_id, item_id))
-            return next(yield_item_entries())
-
-        return self.playlist_result(yield_item_entries(), coll_id, data.get('title'))
-
-
-class ORFPodcastIE(ORFRadioBase):
-    IE_NAME = 'orf:podcast'
-    _STATION_RE = '|'.join(map(re.escape, (x[0] for x in ORFRadioBase.STATION_INFO.values()))) + '|tv'
-    _VALID_URL = r'https?://sound\.orf\.at/podcast/(?P<station>{0})/(?P<show>[\w-]+)/(?P<id>[\w-]+)'.format(_STATION_RE)
-    _TESTS = [{
-        'url': 'https://sound.orf.at/podcast/stm/der-kraeutertipp-von-christine-lackner/rotklee',
-        'md5': '1f2bab2ba90c2ce0c2754196ea78b35f',
-        'info_dict': {
-            'id': 'der-kraeutertipp-von-christine-lackner/rotklee',
-            'ext': 'mp3',
-            'title': 'Rotklee',
-            'description': 'In der Natur weit verbreitet - in der Medizin längst anerkennt: Rotklee. Dieser Podcast begleitet die Sendung "Radio Steiermark am Vormittag", Radio Steiermark, 28. Mai 2024.',
-            'timestamp': 1716891761,
-            'upload_date': '20240528',
-            'uploader_id': 'stm_kraeutertipp',
-            'uploader': 'ORF Radio Steiermark',
-            'duration': 101,
-            'series': 'Der Kräutertipp von Christine Lackner',
-        },
-        'skip': 'ORF podcasts are only available for a limited time'
-    }]
-
-    _ID_NAMES = ('slug', 'guid')
-
-    def _real_extract(self, url):
-        station, show, show_id = self._match_valid_url(url).group('station', 'show', 'id')
-        data = self._download_json(
-            'https://audioapi.orf.at/radiothek/api/2.0/podcast/{0}/{1}/{2}'.format(
-                station, show, show_id), show_id)
-        data = self._get_api_payload(data, show_id, in_payload=True)
-
-        return merge_dicts({
-            'id': '/'.join((show, show_id)),
-            'ext': 'mp3',
-            'vcodec': 'none',
-        }, self._extract_podcast_upload(data), rev=True)
-
-
-class ORFIPTVBase(InfoExtractor):
-    _TITLE_STRIP_RE = ''
-
-    def _extract_video(self, video_id, webpage, fatal=False):
-
-        data = self._download_json(
-            'http://bits.orf.at/filehandler/static-api/json/current/data.json?file=%s' % video_id,
-            video_id)[0]
-
-        video = traverse_obj(data, (
-            'sources', ('default', 'q8c'),
-            T(lambda x: x if x['loadBalancerUrl'] else None),
-            any))
-
-        load_balancer_url = video['loadBalancerUrl']
-
-        try:
-            rendition = self._download_json(
-                load_balancer_url, video_id, transform_source=strip_jsonp)
-        except ExtractorError:
-            rendition = None
-
-        if not rendition:
-            rendition = {
-                'redirect': {
-                    'smil': re.sub(
-                        r'(/)jsonp(/.+\.)mp4$', r'\1dash\2smil/manifest.mpd',
-                        load_balancer_url),
-                },
-            }
-
-        f = traverse_obj(video, {
-            'abr': ('audioBitrate', T(int_or_none)),
-            'vbr': ('bitrate', T(int_or_none)),
-            'fps': ('videoFps', T(int_or_none)),
-            'width': ('videoWidth', T(int_or_none)),
-            'height': ('videoHeight', T(int_or_none)),
-        })
-
-        formats = []
-        for format_id, format_url in traverse_obj(rendition, (
-                'redirect', T(dict.items), Ellipsis)):
-            if format_id == 'rtmp':
-                ff = f.copy()
-                ff.update({
-                    'url': format_url,
-                    'format_id': format_id,
-                })
-                formats.append(ff)
-            elif determine_ext(format_url) == 'f4m':
-                formats.extend(self._extract_f4m_formats(
-                    format_url, video_id, f4m_id=format_id))
-            elif determine_ext(format_url) == 'm3u8':
-                formats.extend(self._extract_m3u8_formats(
-                    format_url, video_id, 'mp4', m3u8_id=format_id,
-                    entry_protocol='m3u8_native'))
-            elif determine_ext(format_url) == 'mpd':
-                formats.extend(self._extract_mpd_formats(
-                    format_url, video_id, mpd_id=format_id))
-
-        if formats or fatal:
+            self._check_formats(formats, video_id)
             self._sort_formats(formats)
-        else:
-            return
 
-        return merge_dicts({
-            'id': video_id,
-            'title': re.sub(self._TITLE_STRIP_RE, '', self._og_search_title(webpage)),
-            'description': self._og_search_description(webpage),
-            'upload_date': unified_strdate(self._html_search_meta(
-                'dc.date', webpage, 'upload date', fatal=False)),
-            'formats': formats,
-        }, traverse_obj(data, {
-            'duration': ('duration', T(k_float_or_none)),
-            'thumbnail': ('sources', 'default', 'preview', T(url_or_none)),
-        }), rev=True)
+            subtitles = {}
+            for sub in sd.get('subtitles', []):
+                sub_src = sub.get('src')
+                if not sub_src:
+                    continue
+                subtitles.setdefault(sub.get('lang', 'de-AT'), []).append({
+                    'url': sub_src,
+                })
+
+            upload_date = unified_strdate(sd.get('created_date'))
+            entries.append({
+                '_type': 'video',
+                'id': video_id,
+                'title': title,
+                'formats': formats,
+                'subtitles': subtitles,
+                'description': sd.get('description'),
+                'duration': int_or_none(sd.get('duration_in_seconds')),
+                'upload_date': upload_date,
+                'thumbnail': sd.get('image_full_url'),
+            })
+
+        return {
+            '_type': 'playlist',
+            'entries': entries,
+            'id': playlist_id,
+        }
 
 
-class ORFIPTVIE(ORFIPTVBase):
+class ORFRadioIE(InfoExtractor):
+    def _real_extract(self, url):
+        mobj = re.match(self._VALID_URL, url)
+        show_date = mobj.group('date')
+        show_id = mobj.group('show')
+
+        data = self._download_json(
+            'http://audioapi.orf.at/%s/api/json/current/broadcast/%s/%s'
+            % (self._API_STATION, show_id, show_date), show_id)
+
+        entries = []
+        for info in data['streams']:
+            loop_stream_id = str_or_none(info.get('loopStreamId'))
+            if not loop_stream_id:
+                continue
+            title = str_or_none(data.get('title'))
+            if not title:
+                continue
+            start = int_or_none(info.get('start'), scale=1000)
+            end = int_or_none(info.get('end'), scale=1000)
+            duration = end - start if end and start else None
+            entries.append({
+                'id': loop_stream_id.replace('.mp3', ''),
+                'url': 'http://loopstream01.apa.at/?channel=%s&id=%s' % (self._LOOP_STATION, loop_stream_id),
+                'title': title,
+                'description': clean_html(data.get('subtitle')),
+                'duration': duration,
+                'timestamp': start,
+                'ext': 'mp3',
+                'series': data.get('programTitle'),
+            })
+
+        return {
+            '_type': 'playlist',
+            'id': show_id,
+            'title': data.get('title'),
+            'description': clean_html(data.get('subtitle')),
+            'entries': entries,
+        }
+
+
+class ORFFM4IE(ORFRadioIE):
+    IE_NAME = 'orf:fm4'
+    IE_DESC = 'radio FM4'
+    _VALID_URL = r'https?://(?P<station>fm4)\.orf\.at/player/(?P<date>[0-9]+)/(?P<show>4\w+)'
+    _API_STATION = 'fm4'
+    _LOOP_STATION = 'fm4'
+
+    _TEST = {
+        'url': 'http://fm4.orf.at/player/20170107/4CC',
+        'md5': '2b0be47375432a7ef104453432a19212',
+        'info_dict': {
+            'id': '2017-01-07_2100_tl_54_7DaysSat18_31295',
+            'ext': 'mp3',
+            'title': 'Solid Steel Radioshow',
+            'description': 'Die Mixshow von Coldcut und Ninja Tune.',
+            'duration': 3599,
+            'timestamp': 1483819257,
+            'upload_date': '20170107',
+        },
+        'skip': 'Shows from ORF radios are only available for 7 days.',
+        'only_matching': True,
+    }
+
+
+class ORFNOEIE(ORFRadioIE):
+    IE_NAME = 'orf:noe'
+    IE_DESC = 'Radio Niederösterreich'
+    _VALID_URL = r'https?://(?P<station>noe)\.orf\.at/player/(?P<date>[0-9]+)/(?P<show>\w+)'
+    _API_STATION = 'noe'
+    _LOOP_STATION = 'oe2n'
+
+    _TEST = {
+        'url': 'https://noe.orf.at/player/20200423/NGM',
+        'only_matching': True,
+    }
+
+
+class ORFWIEIE(ORFRadioIE):
+    IE_NAME = 'orf:wien'
+    IE_DESC = 'Radio Wien'
+    _VALID_URL = r'https?://(?P<station>wien)\.orf\.at/player/(?P<date>[0-9]+)/(?P<show>\w+)'
+    _API_STATION = 'wie'
+    _LOOP_STATION = 'oe2w'
+
+    _TEST = {
+        'url': 'https://wien.orf.at/player/20200423/WGUM',
+        'only_matching': True,
+    }
+
+
+class ORFBGLIE(ORFRadioIE):
+    IE_NAME = 'orf:burgenland'
+    IE_DESC = 'Radio Burgenland'
+    _VALID_URL = r'https?://(?P<station>burgenland)\.orf\.at/player/(?P<date>[0-9]+)/(?P<show>\w+)'
+    _API_STATION = 'bgl'
+    _LOOP_STATION = 'oe2b'
+
+    _TEST = {
+        'url': 'https://burgenland.orf.at/player/20200423/BGM',
+        'only_matching': True,
+    }
+
+
+class ORFOOEIE(ORFRadioIE):
+    IE_NAME = 'orf:oberoesterreich'
+    IE_DESC = 'Radio Oberösterreich'
+    _VALID_URL = r'https?://(?P<station>ooe)\.orf\.at/player/(?P<date>[0-9]+)/(?P<show>\w+)'
+    _API_STATION = 'ooe'
+    _LOOP_STATION = 'oe2o'
+
+    _TEST = {
+        'url': 'https://ooe.orf.at/player/20200423/OGMO',
+        'only_matching': True,
+    }
+
+
+class ORFSTMIE(ORFRadioIE):
+    IE_NAME = 'orf:steiermark'
+    IE_DESC = 'Radio Steiermark'
+    _VALID_URL = r'https?://(?P<station>steiermark)\.orf\.at/player/(?P<date>[0-9]+)/(?P<show>\w+)'
+    _API_STATION = 'stm'
+    _LOOP_STATION = 'oe2st'
+
+    _TEST = {
+        'url': 'https://steiermark.orf.at/player/20200423/STGMS',
+        'only_matching': True,
+    }
+
+
+class ORFKTNIE(ORFRadioIE):
+    IE_NAME = 'orf:kaernten'
+    IE_DESC = 'Radio Kärnten'
+    _VALID_URL = r'https?://(?P<station>kaernten)\.orf\.at/player/(?P<date>[0-9]+)/(?P<show>\w+)'
+    _API_STATION = 'ktn'
+    _LOOP_STATION = 'oe2k'
+
+    _TEST = {
+        'url': 'https://kaernten.orf.at/player/20200423/KGUMO',
+        'only_matching': True,
+    }
+
+
+class ORFSBGIE(ORFRadioIE):
+    IE_NAME = 'orf:salzburg'
+    IE_DESC = 'Radio Salzburg'
+    _VALID_URL = r'https?://(?P<station>salzburg)\.orf\.at/player/(?P<date>[0-9]+)/(?P<show>\w+)'
+    _API_STATION = 'sbg'
+    _LOOP_STATION = 'oe2s'
+
+    _TEST = {
+        'url': 'https://salzburg.orf.at/player/20200423/SGUM',
+        'only_matching': True,
+    }
+
+
+class ORFTIRIE(ORFRadioIE):
+    IE_NAME = 'orf:tirol'
+    IE_DESC = 'Radio Tirol'
+    _VALID_URL = r'https?://(?P<station>tirol)\.orf\.at/player/(?P<date>[0-9]+)/(?P<show>\w+)'
+    _API_STATION = 'tir'
+    _LOOP_STATION = 'oe2t'
+
+    _TEST = {
+        'url': 'https://tirol.orf.at/player/20200423/TGUMO',
+        'only_matching': True,
+    }
+
+
+class ORFVBGIE(ORFRadioIE):
+    IE_NAME = 'orf:vorarlberg'
+    IE_DESC = 'Radio Vorarlberg'
+    _VALID_URL = r'https?://(?P<station>vorarlberg)\.orf\.at/player/(?P<date>[0-9]+)/(?P<show>\w+)'
+    _API_STATION = 'vbg'
+    _LOOP_STATION = 'oe2v'
+
+    _TEST = {
+        'url': 'https://vorarlberg.orf.at/player/20200423/VGUM',
+        'only_matching': True,
+    }
+
+
+class ORFOE3IE(ORFRadioIE):
+    IE_NAME = 'orf:oe3'
+    IE_DESC = 'Radio Österreich 3'
+    _VALID_URL = r'https?://(?P<station>oe3)\.orf\.at/player/(?P<date>[0-9]+)/(?P<show>\w+)'
+    _API_STATION = 'oe3'
+    _LOOP_STATION = 'oe3'
+
+    _TEST = {
+        'url': 'https://oe3.orf.at/player/20200424/3WEK',
+        'only_matching': True,
+    }
+
+
+class ORFOE1IE(ORFRadioIE):
+    IE_NAME = 'orf:oe1'
+    IE_DESC = 'Radio Österreich 1'
+    _VALID_URL = r'https?://(?P<station>oe1)\.orf\.at/player/(?P<date>[0-9]+)/(?P<show>\w+)'
+    _API_STATION = 'oe1'
+    _LOOP_STATION = 'oe1'
+
+    _TEST = {
+        'url': 'http://oe1.orf.at/player/20170108/456544',
+        'md5': '34d8a6e67ea888293741c86a099b745b',
+        'info_dict': {
+            'id': '2017-01-08_0759_tl_51_7DaysSun6_256141',
+            'ext': 'mp3',
+            'title': 'Morgenjournal',
+            'duration': 609,
+            'timestamp': 1483858796,
+            'upload_date': '20170108',
+        },
+        'skip': 'Shows from ORF radios are only available for 7 days.'
+    }
+
+
+class ORFIPTVIE(InfoExtractor):
     IE_NAME = 'orf:iptv'
     IE_DESC = 'iptv.ORF.at'
-    _WORKING = False  # URLs redirect to orf.at/
     _VALID_URL = r'https?://iptv\.orf\.at/(?:#/)?stories/(?P<id>\d+)'
-    _TITLE_STRIP_RE = r'\s+-\s+iptv\.ORF\.at\S*$'
 
     _TEST = {
         'url': 'http://iptv.orf.at/stories/2275236/',
@@ -413,32 +404,74 @@ class ORFIPTVIE(ORFIPTVBase):
         video_id = self._search_regex(
             r'data-video(?:id)?="(\d+)"', webpage, 'video id')
 
-        return self._extract_video(video_id, webpage)
+        data = self._download_json(
+            'http://bits.orf.at/filehandler/static-api/json/current/data.json?file=%s' % video_id,
+            video_id)[0]
+
+        duration = float_or_none(data['duration'], 1000)
+
+        video = data['sources']['default']
+        load_balancer_url = video['loadBalancerUrl']
+        abr = int_or_none(video.get('audioBitrate'))
+        vbr = int_or_none(video.get('bitrate'))
+        fps = int_or_none(video.get('videoFps'))
+        width = int_or_none(video.get('videoWidth'))
+        height = int_or_none(video.get('videoHeight'))
+        thumbnail = video.get('preview')
+
+        rendition = self._download_json(
+            load_balancer_url, video_id, transform_source=strip_jsonp)
+
+        f = {
+            'abr': abr,
+            'vbr': vbr,
+            'fps': fps,
+            'width': width,
+            'height': height,
+        }
+
+        formats = []
+        for format_id, format_url in rendition['redirect'].items():
+            if format_id == 'rtmp':
+                ff = f.copy()
+                ff.update({
+                    'url': format_url,
+                    'format_id': format_id,
+                })
+                formats.append(ff)
+            elif determine_ext(format_url) == 'f4m':
+                formats.extend(self._extract_f4m_formats(
+                    format_url, video_id, f4m_id=format_id))
+            elif determine_ext(format_url) == 'm3u8':
+                formats.extend(self._extract_m3u8_formats(
+                    format_url, video_id, 'mp4', m3u8_id=format_id))
+            else:
+                continue
+        self._sort_formats(formats)
+
+        title = remove_end(self._og_search_title(webpage), ' - iptv.ORF.at')
+        description = self._og_search_description(webpage)
+        upload_date = unified_strdate(self._html_search_meta(
+            'dc.date', webpage, 'upload date'))
+
+        return {
+            'id': video_id,
+            'title': title,
+            'description': description,
+            'duration': duration,
+            'thumbnail': thumbnail,
+            'upload_date': upload_date,
+            'formats': formats,
+        }
 
 
-class ORFFM4StoryIE(ORFIPTVBase):
+class ORFFM4StoryIE(InfoExtractor):
     IE_NAME = 'orf:fm4:story'
     IE_DESC = 'fm4.orf.at stories'
     _VALID_URL = r'https?://fm4\.orf\.at/stories/(?P<id>\d+)'
-    _TITLE_STRIP_RE = r'\s+-\s+fm4\.ORF\.at\s*$'
 
-    _TESTS = [{
-        'url': 'https://fm4.orf.at/stories/3041554/',
-        'add_ie': ['Youtube'],
-        'info_dict': {
-            'id': '3041554',
-            'title': 'Is The EU Green Deal In Mortal Danger?',
-        },
-        'playlist_count': 4,
-        'params': {
-            'format': 'bestvideo',
-        },
-    }, {
+    _TEST = {
         'url': 'http://fm4.orf.at/stories/2865738/',
-        'info_dict': {
-            'id': '2865738',
-            'title': 'Manu Delago und Inner Tongue live',
-        },
         'playlist': [{
             'md5': 'e1c2c706c45c7b34cf478bbf409907ca',
             'info_dict': {
@@ -455,311 +488,83 @@ class ORFFM4StoryIE(ORFIPTVBase):
             'info_dict': {
                 'id': '547798',
                 'ext': 'flv',
-                'title': 'Manu Delago und Inner Tongue https://vod-ww.mdn.ors.at/cms-worldwide_episodes_nas/_definst_/nas/cms-worldwide_episodes/online/14228823_0005.smil/chunklist_b992000_vo.m3u8live (2)',
+                'title': 'Manu Delago und Inner Tongue live (2)',
                 'duration': 1504.08,
                 'thumbnail': r're:^https?://.*\.jpg$',
                 'upload_date': '20170913',
                 'description': 'Manu Delago und Inner Tongue haben bei der FM4 Soundpark Session live alles gegeben. Hier gibt es Fotos und die gesamte Session als Video.',
             },
         }],
-        'skip': 'Videos gone',
-    }]
+    }
 
     def _real_extract(self, url):
         story_id = self._match_id(url)
         webpage = self._download_webpage(url, story_id)
 
         entries = []
-        seen_ids = set()
-        for idx, video_id in enumerate(re.findall(r'data-video(?:id)?="(\d+)"', webpage)):
-            if video_id in seen_ids:
-                continue
-            seen_ids.add(video_id)
-            entry = self._extract_video(video_id, webpage, fatal=False)
-            if not entry:
-                continue
+        all_ids = orderedSet(re.findall(r'data-video(?:id)?="(\d+)"', webpage))
+        for idx, video_id in enumerate(all_ids):
+            data = self._download_json(
+                'http://bits.orf.at/filehandler/static-api/json/current/data.json?file=%s' % video_id,
+                video_id)[0]
 
-            if idx >= 1:
-                # Titles are duplicates, make them unique
-                entry['title'] = '%s (%d)' % (entry['title'], idx)
+            duration = float_or_none(data['duration'], 1000)
 
-            entries.append(entry)
+            video = data['sources']['q8c']
+            load_balancer_url = video['loadBalancerUrl']
+            abr = int_or_none(video.get('audioBitrate'))
+            vbr = int_or_none(video.get('bitrate'))
+            fps = int_or_none(video.get('videoFps'))
+            width = int_or_none(video.get('videoWidth'))
+            height = int_or_none(video.get('videoHeight'))
+            thumbnail = video.get('preview')
 
-        seen_ids = set()
-        for yt_id in re.findall(
-                r'data-id\s*=\s*["\']([\w-]+)[^>]+\bclass\s*=\s*["\']youtube\b',
-                webpage):
-            if yt_id in seen_ids:
-                continue
-            seen_ids.add(yt_id)
-            if YoutubeIE.suitable(yt_id):
-                entries.append(self.url_result(yt_id, ie='Youtube', video_id=yt_id))
+            rendition = self._download_json(
+                load_balancer_url, video_id, transform_source=strip_jsonp)
 
-        return self.playlist_result(
-            entries, story_id,
-            re.sub(self._TITLE_STRIP_RE, '', self._og_search_title(webpage, default='') or None))
+            f = {
+                'abr': abr,
+                'vbr': vbr,
+                'fps': fps,
+                'width': width,
+                'height': height,
+            }
 
-
-class ORFONBase(InfoExtractor):
-    _ENC_PFX = '3dSlfek03nsLKdj4Jsd'
-    _API_PATH = 'episode'
-
-    def _call_api(self, video_id, **kwargs):
-        encrypted_id = base64.b64encode('{0}{1}'.format(
-            self._ENC_PFX, video_id).encode('utf-8')).decode('ascii')
-        return self._download_json(
-            'https://api-tvthek.orf.at/api/v4.3/public/{0}/encrypted/{1}'.format(
-                self._API_PATH, encrypted_id),
-            video_id, **kwargs)
-
-    @classmethod
-    def _parse_metadata(cls, api_json):
-        return traverse_obj(api_json, {
-            'id': ('id', T(int), T(txt_or_none)),
-            'age_limit': ('age_classification', T(parse_age_limit)),
-            'duration': ((('exact_duration', T(k_float_or_none)),
-                          ('duration_second', T(float_or_none))),),
-            'title': (('title', 'headline'), T(txt_or_none)),
-            'description': (('description', 'teaser_text'), T(txt_or_none)),
-            # 'media_type': ('video_type', T(txt_or_none)),
-            'thumbnail': ('_embedded', 'image', 'public_urls', 'highlight_teaser', 'url', T(url_or_none)),
-            'timestamp': (('date', 'episode_date'), T(parse_iso8601)),
-            'release_timestamp': ('release_date', T(parse_iso8601)),
-            # 'modified_timestamp': ('updated_at', T(parse_iso8601)),
-        }, get_all=False)
-
-    def _extract_video(self, video_id, segment_id):
-        # Not a segmented episode: return single video
-        # Segmented episode without valid segment id: return entire playlist
-        # Segmented episode with valid segment id and yes-playlist: return entire playlist
-        # Segmented episode with valid segment id and no-playlist: return single video corresponding to segment id
-        # If a multi_video playlist would be returned, but an unsegmented source exists, that source is chosen instead.
-
-        api_json = self._call_api(video_id)
-
-        if traverse_obj(api_json, 'is_drm_protected'):
-            self.report_drm(video_id)
-
-        # updates formats, subtitles
-        def extract_sources(src_json, video_id):
-            for manifest_type in traverse_obj(src_json, ('sources', T(dict.keys), Ellipsis)):
-                for manifest_url in traverse_obj(src_json, ('sources', manifest_type, Ellipsis, 'src', T(url_or_none))):
-                    if manifest_type == 'hls':
-                        fmts, subs = self._extract_m3u8_formats(
-                            manifest_url, video_id, fatal=False, m3u8_id='hls',
-                            ext='mp4', entry_protocol='m3u8_native'), {}
-                        for f in fmts:
-                            if '_vo.' in f['url']:
-                                f['acodec'] = 'none'
-                    elif manifest_type == 'dash':
-                        fmts, subs = self._extract_mpd_formats_and_subtitles(
-                            manifest_url, video_id, fatal=False, mpd_id='dash')
-                    else:
-                        continue
-                    formats.extend(fmts)
-                    self._merge_subtitles(subs, target=subtitles)
-
-        formats, subtitles = [], {}
-        if segment_id is None:
-            extract_sources(api_json, video_id)
-        if not formats:
-            segments = traverse_obj(api_json, (
-                '_embedded', 'segments', lambda _, v: v['id']))
-            if len(segments) > 1 and segment_id is not None:
-                if not self._yes_playlist(video_id, segment_id, playlist_label='collection', video_label='segment'):
-                    segments = [next(s for s in segments if txt_or_none(s['id']) == segment_id)]
-
-            entries = []
-            for seg in segments:
-                formats, subtitles = [], {}
-                extract_sources(seg, segment_id)
-                self._sort_formats(formats)
-                entries.append(merge_dicts({
-                    'formats': formats,
-                    'subtitles': subtitles,
-                }, self._parse_metadata(seg), rev=True))
-            result = merge_dicts(
-                {'_type': 'multi_video' if len(entries) > 1 else 'playlist'},
-                self._parse_metadata(api_json),
-                self.playlist_result(entries, video_id))
-            # not yet processed in core for playlist/multi
-            self._downloader._fill_common_fields(result)
-            return result
-        else:
+            formats = []
+            for format_id, format_url in rendition['redirect'].items():
+                if format_id == 'rtmp':
+                    ff = f.copy()
+                    ff.update({
+                        'url': format_url,
+                        'format_id': format_id,
+                    })
+                    formats.append(ff)
+                elif determine_ext(format_url) == 'f4m':
+                    formats.extend(self._extract_f4m_formats(
+                        format_url, video_id, f4m_id=format_id))
+                elif determine_ext(format_url) == 'm3u8':
+                    formats.extend(self._extract_m3u8_formats(
+                        format_url, video_id, 'mp4', m3u8_id=format_id))
+                else:
+                    continue
             self._sort_formats(formats)
 
-        for sub_url in traverse_obj(api_json, (
-                '_embedded', 'subtitle',
-                ('xml_url', 'sami_url', 'stl_url', 'ttml_url', 'srt_url', 'vtt_url'),
-                T(url_or_none))):
-            self._merge_subtitles({'de': [{'url': sub_url}]}, target=subtitles)
+            title = remove_end(self._og_search_title(webpage), ' - fm4.ORF.at')
+            if idx >= 1:
+                # Titles are duplicates, make them unique
+                title += ' (' + str(idx + 1) + ')'
+            description = self._og_search_description(webpage)
+            upload_date = unified_strdate(self._html_search_meta(
+                'dc.date', webpage, 'upload date'))
 
-        return merge_dicts({
-            'id': video_id,
-            'formats': formats,
-            'subtitles': subtitles,
-            # '_old_archive_ids': [self._downloader._make_archive_id({'ie_key': 'ORFTVthek', 'id': video_id})],
-        }, self._parse_metadata(api_json), rev=True)
+            entries.append({
+                'id': video_id,
+                'title': title,
+                'description': description,
+                'duration': duration,
+                'thumbnail': thumbnail,
+                'upload_date': upload_date,
+                'formats': formats,
+            })
 
-    def _real_extract(self, url):
-        video_id, segment_id = self._match_valid_url(url).group('id', 'segment')
-        webpage = self._download_webpage(url, video_id)
-
-        # ORF doesn't like 410 or 404
-        if self._search_regex(r'<div\b[^>]*>\s*(Nicht mehr verfügbar)\s*</div>', webpage, 'Availability', default=False):
-            raise ExtractorError('Content is no longer available', expected=True, video_id=video_id)
-
-        return merge_dicts({
-            'id': video_id,
-            'title': self._html_search_meta(['og:title', 'twitter:title'], webpage, default=None),
-            'description': self._html_search_meta(
-                ['description', 'og:description', 'twitter:description'], webpage, default=None),
-        }, self._search_json_ld(webpage, video_id, default={}),
-            self._extract_video(video_id, segment_id),
-            rev=True)
-
-
-class ORFONIE(ORFONBase):
-    IE_NAME = 'orf:on'
-    _VALID_URL = r'https?://on\.orf\.at/video/(?P<id>\d+)(?:/(?P<segment>\d+))?'
-    _TESTS = [{
-        'url': 'https://on.orf.at/video/14210000/school-of-champions-48',
-        'info_dict': {
-            'id': '14210000',
-            'ext': 'mp4',
-            'duration': 2651.08,
-            'thumbnail': 'https://api-tvthek.orf.at/assets/segments/0167/98/thumb_16697671_segments_highlight_teaser.jpeg',
-            'title': 'School of Champions (4/8)',
-            'description': r're:(?s)Luca hat sein ganzes Leben in den Bergen Südtirols verbracht und ist bei seiner Mutter aufgewachsen, .{1029} Leo$',
-            # 'media_type': 'episode',
-            'timestamp': 1706558922,
-            'upload_date': '20240129',
-            'release_timestamp': 1706472362,
-            'release_date': '20240128',
-            # 'modified_timestamp': 1712756663,
-            # 'modified_date': '20240410',
-            # '_old_archive_ids': ['orftvthek 14210000'],
-        },
-        'params': {
-            'format': 'bestvideo',
-        },
-        'skip': 'Available until 2024-08-12',
-    }, {
-        'url': 'https://on.orf.at/video/3220355',
-        'md5': '925a93b2b9a37da5c9b979d7cf71aa2e',
-        'info_dict': {
-            'id': '3220355',
-            'ext': 'mp4',
-            'duration': 445.04,
-            'thumbnail': 'https://api-tvthek.orf.at/assets/segments/0002/60/thumb_159573_segments_highlight_teaser.png',
-            'title': '50 Jahre Burgenland: Der Festumzug',
-            'description': r're:(?s)Aus allen Landesteilen zogen festlich geschmückte Wagen und Musikkapellen .{270} Jenakowitsch$',
-            # 'media_type': 'episode',
-            'timestamp': 52916400,
-            'upload_date': '19710905',
-            'release_timestamp': 52916400,
-            'release_date': '19710905',
-            # 'modified_timestamp': 1498536049,
-            # 'modified_date': '20170627',
-            # '_old_archive_ids': ['orftvthek 3220355'],
-        },
-    }, {
-        # Video with multiple segments selecting the second segment
-        'url': 'https://on.orf.at/video/14226549/15639808/jugendbande-einbrueche-aus-langeweile',
-        'md5': 'fc151bba8c05ea77ab5693617e4a33d3',
-        'info_dict': {
-            'id': '15639808',
-            'ext': 'mp4',
-            'duration': 97.707,
-            'thumbnail': 'https://api-tvthek.orf.at/assets/segments/0175/43/thumb_17442704_segments_highlight_teaser.jpg',
-            'title': 'Jugendbande: Einbrüche aus Langeweile',
-            'description': r're:Jugendbande: Einbrüche aus Langeweile \| Neuer Kinder- und .{259} Wanda$',
-            # 'media_type': 'segment',
-            'timestamp': 1715792400,
-            'upload_date': '20240515',
-            # 'modified_timestamp': 1715794394,
-            # 'modified_date': '20240515',
-            # '_old_archive_ids': ['orftvthek 15639808'],
-        },
-        'params': {
-            'noplaylist': True,
-            'format': 'bestvideo',
-        },
-        'skip': 'Available until 2024-06-14',
-    }, {
-        # Video with multiple segments and no combined version
-        'url': 'https://on.orf.at/video/14227864/formel-1-grosser-preis-von-monaco-2024',
-        'info_dict': {
-            '_type': 'multi_video',
-            'id': '14227864',
-            'duration': 18410.52,
-            'thumbnail': 'https://api-tvthek.orf.at/assets/segments/0176/04/thumb_17503881_segments_highlight_teaser.jpg',
-            'title': 'Formel 1: Großer Preis von Monaco 2024',
-            'description': 'md5:aeeb010710ccf70ce28ccb4482243d4f',
-            # 'media_type': 'episode',
-            'timestamp': 1716721200,
-            'upload_date': '20240526',
-            'release_timestamp': 1716721802,
-            'release_date': '20240526',
-            # 'modified_timestamp': 1716884702,
-            # 'modified_date': '20240528',
-        },
-        'playlist_count': 42,
-        'skip': 'Gone: Nicht mehr verfügbar',
-    }, {
-        # Video with multiple segments, but with combined version
-        'url': 'https://on.orf.at/video/14228172',
-        'info_dict': {
-            'id': '14228172',
-            'ext': 'mp4',
-            'duration': 3294.878,
-            'thumbnail': 'https://api-tvthek.orf.at/assets/segments/0176/29/thumb_17528242_segments_highlight_teaser.jpg',
-            'title': 'Willkommen Österreich mit Stermann & Grissemann',
-            'description': r're:Zum Saisonfinale freuen sich die urlaubsreifen Gastgeber Stermann und .{1863} Geschichten\.$',
-            # 'media_type': 'episode',
-            'timestamp': 1716926584,
-            'upload_date': '20240528',
-            'release_timestamp': 1716919202,
-            'release_date': '20240528',
-            # 'modified_timestamp': 1716968045,
-            # 'modified_date': '20240529',
-            # '_old_archive_ids': ['orftvthek 14228172'],
-        },
-        'params': {
-            'format': 'bestvideo',
-        },
-        'skip': 'Gone: Nicht mehr verfügbar',
-    }]
-
-
-class ORFONLiveIE(ORFONBase):
-    _ENC_PFX = '8876324jshjd7293ktd'
-    _API_PATH = 'livestream'
-    _VALID_URL = r'https?://on\.orf\.at/livestream/(?P<id>\d+)(?:/(?P<segment>\d+))?'
-    _TESTS = [{
-        'url': 'https://on.orf.at/livestream/14320204/pressekonferenz-neos-zu-aktuellen-entwicklungen',
-        'info_dict': {
-            'id': '14320204',
-            'ext': 'mp4',
-            'title': 'Pressekonferenz: Neos zu aktuellen Entwicklungen',
-            'description': r're:(?s)Neos-Chefin Beate Meinl-Reisinger informi.{598}ng\."',
-            'timestamp': 1716886335,
-            'upload_date': '20240528',
-            # 'modified_timestamp': 1712756663,
-            # 'modified_date': '20240410',
-            # '_old_archive_ids': ['orftvthek 14210000'],
-        },
-        'params': {
-            'format': 'bestvideo',
-        },
-    }]
-
-    @classmethod
-    def _parse_metadata(cls, api_json):
-        return merge_dicts(
-            super(ORFONLiveIE, cls)._parse_metadata(api_json),
-            traverse_obj(api_json, {
-                'timestamp': ('updated_at', T(parse_iso8601)),
-                'release_timestamp': ('start', T(parse_iso8601)),
-                'is_live': True,
-            }))
+        return self.playlist_result(entries)
diff --git a/youtube_dl/extractor/palcomp3.py b/youtube_dl/extractor/palcomp3.py
index 60f7a4d48..fb29d83f9 100644
--- a/youtube_dl/extractor/palcomp3.py
+++ b/youtube_dl/extractor/palcomp3.py
@@ -8,7 +8,7 @@ from ..compat import compat_str
 from ..utils import (
     int_or_none,
     str_or_none,
-    traverse_obj,
+    try_get,
 )
 
 
@@ -109,7 +109,7 @@ class PalcoMP3ArtistIE(PalcoMP3BaseIE):
     }
     name'''
 
-    @classmethod
+    @ classmethod
     def suitable(cls, url):
         return False if re.match(PalcoMP3IE._VALID_URL, url) else super(PalcoMP3ArtistIE, cls).suitable(url)
 
@@ -118,8 +118,7 @@ class PalcoMP3ArtistIE(PalcoMP3BaseIE):
         artist = self._call_api(artist_slug, self._ARTIST_FIELDS_TMPL)['artist']
 
         def entries():
-            for music in traverse_obj(artist, (
-                    'musics', 'nodes', lambda _, m: m['musicID'])):
+            for music in (try_get(artist, lambda x: x['musics']['nodes'], list) or []):
                 yield self._parse_music(music)
 
         return self.playlist_result(
@@ -138,7 +137,7 @@ class PalcoMP3VideoIE(PalcoMP3BaseIE):
             'title': 'Maiara e Maraisa - Você Faz Falta Aqui - DVD Ao Vivo Em Campo Grande',
             'description': 'md5:7043342c09a224598e93546e98e49282',
             'upload_date': '20161107',
-            'uploader_id': '@maiaramaraisaoficial',
+            'uploader_id': 'maiaramaraisaoficial',
             'uploader': 'Maiara e Maraisa',
         }
     }]
diff --git a/youtube_dl/extractor/peekvids.py b/youtube_dl/extractor/peekvids.py
deleted file mode 100644
index c8aad564b..000000000
--- a/youtube_dl/extractor/peekvids.py
+++ /dev/null
@@ -1,193 +0,0 @@
-# coding: utf-8
-from __future__ import unicode_literals
-
-import re
-
-from .common import InfoExtractor
-from ..utils import (
-    ExtractorError,
-    get_element_by_class,
-    int_or_none,
-    merge_dicts,
-    url_or_none,
-)
-
-
-class PeekVidsIE(InfoExtractor):
-    _VALID_URL = r'''(?x)
-        https?://(?:www\.)?peekvids\.com/
-        (?:(?:[^/?#]+/){2}|embed/?\?(?:[^#]*&)?v=)
-        (?P<id>[^/?&#]*)
-    '''
-    _TESTS = [{
-        'url': 'https://peekvids.com/pc/dane-jones-cute-redhead-with-perfect-tits-with-mini-vamp/BSyLMbN0YCd',
-        'md5': '2ff6a357a9717dc9dc9894b51307e9a2',
-        'info_dict': {
-            'id': '1262717',
-            'display_id': 'BSyLMbN0YCd',
-            'title': ' Dane Jones - Cute redhead with perfect tits with Mini Vamp',
-            'ext': 'mp4',
-            'thumbnail': r're:^https?://.*\.jpg$',
-            'description': 'md5:0a61df3620de26c0af8963b1a730cd69',
-            'timestamp': 1642579329,
-            'upload_date': '20220119',
-            'duration': 416,
-            'view_count': int,
-            'age_limit': 18,
-            'uploader': 'SEXYhub.com',
-            'categories': list,
-            'tags': list,
-        },
-    }]
-    _DOMAIN = 'www.peekvids.com'
-
-    def _get_detail(self, html):
-        return get_element_by_class('detail-video-block', html)
-
-    def _real_extract(self, url):
-        video_id = self._match_id(url)
-        webpage = self._download_webpage(url, video_id, expected_status=429)
-        if '>Rate Limit Exceeded' in webpage:
-            raise ExtractorError(
-                '[%s] %s: %s' % (self.IE_NAME, video_id, 'You are suspected as a bot. Wait, or pass the captcha test on the site and provide --cookies.'),
-                expected=True)
-
-        title = self._html_search_regex(r'(?s)<h1\b[^>]*>(.+?)</h1>', webpage, 'title')
-
-        display_id = video_id
-        video_id = self._search_regex(r'(?s)<video\b[^>]+\bdata-id\s*=\s*["\']?([\w-]+)', webpage, 'short video ID')
-        srcs = self._download_json(
-            'https://%s/v-alt/%s' % (self._DOMAIN, video_id), video_id,
-            note='Downloading list of source files')
-        formats = [{
-            'url': f_url,
-            'format_id': f_id,
-            'height': int_or_none(f_id),
-        } for f_url, f_id in (
-            (url_or_none(f_v), f_match.group(1))
-            for f_v, f_match in (
-                (v, re.match(r'^data-src(\d{3,})$', k))
-                for k, v in srcs.items() if v) if f_match)
-            if f_url
-        ]
-        if not formats:
-            formats = [{'url': url} for url in srcs.values()]
-        self._sort_formats(formats)
-
-        info = self._search_json_ld(webpage, video_id, expected_type='VideoObject', default={})
-        info.pop('url', None)
-        # may not have found the thumbnail if it was in a list in the ld+json
-        info.setdefault('thumbnail', self._og_search_thumbnail(webpage))
-        detail = self._get_detail(webpage) or ''
-        info['description'] = self._html_search_regex(
-            r'(?s)(.+?)(?:%s\s*<|<ul\b)' % (re.escape(info.get('description', '')), ),
-            detail, 'description', default=None) or None
-        info['title'] = re.sub(r'\s*[,-][^,-]+$', '', info.get('title') or title) or self._generic_title(url)
-
-        def cat_tags(name, html):
-            l = self._html_search_regex(
-                r'(?s)<span\b[^>]*>\s*%s\s*:\s*</span>(.+?)</li>' % (re.escape(name), ),
-                html, name, default='')
-            return [x for x in re.split(r'\s+', l) if x]
-
-        return merge_dicts({
-            'id': video_id,
-            'display_id': display_id,
-            'age_limit': 18,
-            'formats': formats,
-            'categories': cat_tags('Categories', detail),
-            'tags': cat_tags('Tags', detail),
-            'uploader': self._html_search_regex(r'[Uu]ploaded\s+by\s(.+?)"', webpage, 'uploader', default=None),
-        }, info)
-
-
-class PlayVidsIE(PeekVidsIE):
-    _VALID_URL = r'https?://(?:www\.)?playvids\.com/(?:embed/|\w\w?/)?(?P<id>[^/?#]*)'
-    _TESTS = [{
-        'url': 'https://www.playvids.com/U3pBrYhsjXM/pc/dane-jones-cute-redhead-with-perfect-tits-with-mini-vamp',
-        'md5': '2f12e50213dd65f142175da633c4564c',
-        'info_dict': {
-            'id': '1978030',
-            'display_id': 'U3pBrYhsjXM',
-            'title': ' Dane Jones - Cute redhead with perfect tits with Mini Vamp',
-            'ext': 'mp4',
-            'thumbnail': r're:^https?://.*\.jpg$',
-            'description': 'md5:0a61df3620de26c0af8963b1a730cd69',
-            'timestamp': 1640435839,
-            'upload_date': '20211225',
-            'duration': 416,
-            'view_count': int,
-            'age_limit': 18,
-            'uploader': 'SEXYhub.com',
-            'categories': list,
-            'tags': list,
-        },
-    }, {
-        'url': 'https://www.playvids.com/es/U3pBrYhsjXM/pc/dane-jones-cute-redhead-with-perfect-tits-with-mini-vamp',
-        'only_matching': True,
-    }, {
-        'url': 'https://www.playvids.com/embed/U3pBrYhsjXM',
-        'only_matching': True,
-    }, {
-        'url': 'https://www.playvids.com/bKmGLe3IwjZ/sv/brazzers-800-phone-sex-madison-ivy-always-on-the-line',
-        'md5': 'e783986e596cafbf46411a174ab42ba6',
-        'info_dict': {
-            'id': '762385',
-            'display_id': 'bKmGLe3IwjZ',
-            'ext': 'mp4',
-            'title': 'Brazzers - 1 800 Phone Sex: Madison Ivy Always On The Line 6',
-            'description': 'md5:bdcd2db2b8ad85831a491d7c8605dcef',
-            'timestamp': 1516958544,
-            'upload_date': '20180126',
-            'thumbnail': r're:^https?://.*\.jpg$',
-            'duration': 480,
-            'uploader': 'Brazzers',
-            'age_limit': 18,
-            'view_count': int,
-            'age_limit': 18,
-            'categories': list,
-            'tags': list,
-        },
-    }, {
-        'url': 'https://www.playvids.com/v/47iUho33toY',
-        'md5': 'b056b5049d34b648c1e86497cf4febce',
-        'info_dict': {
-            'id': '700621',
-            'display_id': '47iUho33toY',
-            'ext': 'mp4',
-            'title': 'KATEE OWEN STRIPTIASE IN SEXY RED LINGERIE',
-            'description': None,
-            'timestamp': 1507052209,
-            'upload_date': '20171003',
-            'thumbnail': r're:^https?://.*\.jpg$',
-            'duration': 332,
-            'uploader': 'Cacerenele',
-            'age_limit': 18,
-            'view_count': int,
-            'categories': list,
-            'tags': list,
-        }
-    }, {
-        'url': 'https://www.playvids.com/z3_7iwWCmqt/sexy-teen-filipina-striptease-beautiful-pinay-bargirl-strips-and-dances',
-        'md5': 'efa09be9f031314b7b7e3bc6510cd0df',
-        'info_dict': {
-            'id': '1523518',
-            'display_id': 'z3_7iwWCmqt',
-            'ext': 'mp4',
-            'title': 'SEXY TEEN FILIPINA STRIPTEASE - Beautiful Pinay Bargirl Strips and Dances',
-            'description': None,
-            'timestamp': 1607470323,
-            'upload_date': '20201208',
-            'thumbnail': r're:^https?://.*\.jpg$',
-            'duration': 593,
-            'uploader': 'yorours',
-            'age_limit': 18,
-            'view_count': int,
-            'categories': list,
-            'tags': list,
-        },
-    }]
-    _DOMAIN = 'www.playvids.com'
-
-    def _get_detail(self, html):
-        return get_element_by_class('detail-block', html)
diff --git a/youtube_dl/extractor/peertube.py b/youtube_dl/extractor/peertube.py
index 3af533925..d9b13adc2 100644
--- a/youtube_dl/extractor/peertube.py
+++ b/youtube_dl/extractor/peertube.py
@@ -569,15 +569,15 @@ class PeerTubeIE(InfoExtractor):
             formats.append(f)
         self._sort_formats(formats)
 
-        description = video.get('description')
-        if len(description) >= 250:
-            # description is shortened
-            full_description = self._call_api(
-                host, video_id, 'description', note='Downloading description JSON',
-                fatal=False)
+        full_description = self._call_api(
+            host, video_id, 'description', note='Downloading description JSON',
+            fatal=False)
 
-            if isinstance(full_description, dict):
-                description = str_or_none(full_description.get('description')) or description
+        description = None
+        if isinstance(full_description, dict):
+            description = str_or_none(full_description.get('description'))
+        if not description:
+            description = video.get('description')
 
         subtitles = self.extract_subtitles(host, video_id)
 
diff --git a/youtube_dl/extractor/periscope.py b/youtube_dl/extractor/periscope.py
index b93a02b7d..b15906390 100644
--- a/youtube_dl/extractor/periscope.py
+++ b/youtube_dl/extractor/periscope.py
@@ -12,10 +12,6 @@ from ..utils import (
 
 
 class PeriscopeBaseIE(InfoExtractor):
-    _M3U8_HEADERS = {
-        'Referer': 'https://www.periscope.tv/'
-    }
-
     def _call_api(self, method, query, item_id):
         return self._download_json(
             'https://api.periscope.tv/api/v2/%s' % method,
@@ -58,11 +54,9 @@ class PeriscopeBaseIE(InfoExtractor):
             m3u8_url, video_id, 'mp4',
             entry_protocol='m3u8_native'
             if state in ('ended', 'timed_out') else 'm3u8',
-            m3u8_id=format_id, fatal=fatal, headers=self._M3U8_HEADERS)
+            m3u8_id=format_id, fatal=fatal)
         if len(m3u8_formats) == 1:
             self._add_width_and_height(m3u8_formats[0], width, height)
-        for f in m3u8_formats:
-            f.setdefault('http_headers', {}).update(self._M3U8_HEADERS)
         return m3u8_formats
 
 
diff --git a/youtube_dl/extractor/phoenix.py b/youtube_dl/extractor/phoenix.py
index e3ea01443..dbbfce983 100644
--- a/youtube_dl/extractor/phoenix.py
+++ b/youtube_dl/extractor/phoenix.py
@@ -9,9 +9,8 @@ from ..compat import compat_str
 from ..utils import (
     int_or_none,
     merge_dicts,
-    try_get,
     unified_timestamp,
-    urljoin,
+    xpath_text,
 )
 
 
@@ -28,11 +27,10 @@ class PhoenixIE(ZDFBaseIE):
             'title': 'Wohin führt der Protest in der Pandemie?',
             'description': 'md5:7d643fe7f565e53a24aac036b2122fbd',
             'duration': 1691,
-            'timestamp': 1613902500,
+            'timestamp': 1613906100,
             'upload_date': '20210221',
             'uploader': 'Phoenix',
-            'series': 'corona nachgehakt',
-            'episode': 'Wohin führt der Protest in der Pandemie?',
+            'channel': 'corona nachgehakt',
         },
     }, {
         # Youtube embed
@@ -81,53 +79,50 @@ class PhoenixIE(ZDFBaseIE):
 
         video_id = compat_str(video.get('basename') or video.get('content'))
 
-        details = self._download_json(
+        details = self._download_xml(
             'https://www.phoenix.de/php/mediaplayer/data/beitrags_details.php',
-            video_id, 'Downloading details JSON', query={
+            video_id, 'Downloading details XML', query={
                 'ak': 'web',
                 'ptmd': 'true',
                 'id': video_id,
                 'profile': 'player2',
             })
 
-        title = title or details['title']
-        content_id = details['tracking']['nielsen']['content']['assetid']
+        title = title or xpath_text(
+            details, './/information/title', 'title', fatal=True)
+        content_id = xpath_text(
+            details, './/video/details/basename', 'content id', fatal=True)
 
         info = self._extract_ptmd(
             'https://tmd.phoenix.de/tmd/2/ngplayer_2_3/vod/ptmd/phoenix/%s' % content_id,
             content_id, None, url)
 
-        duration = int_or_none(try_get(
-            details, lambda x: x['tracking']['nielsen']['content']['length']))
-        timestamp = unified_timestamp(details.get('editorialDate'))
-        series = try_get(
-            details, lambda x: x['tracking']['nielsen']['content']['program'],
-            compat_str)
-        episode = title if details.get('contentType') == 'episode' else None
+        timestamp = unified_timestamp(xpath_text(details, './/details/airtime'))
 
         thumbnails = []
-        teaser_images = try_get(details, lambda x: x['teaserImageRef']['layouts'], dict) or {}
-        for thumbnail_key, thumbnail_url in teaser_images.items():
-            thumbnail_url = urljoin(url, thumbnail_url)
+        for node in details.findall('.//teaserimages/teaserimage'):
+            thumbnail_url = node.text
             if not thumbnail_url:
                 continue
             thumbnail = {
                 'url': thumbnail_url,
             }
-            m = re.match('^([0-9]+)x([0-9]+)$', thumbnail_key)
-            if m:
-                thumbnail['width'] = int(m.group(1))
-                thumbnail['height'] = int(m.group(2))
+            thumbnail_key = node.get('key')
+            if thumbnail_key:
+                m = re.match('^([0-9]+)x([0-9]+)$', thumbnail_key)
+                if m:
+                    thumbnail['width'] = int(m.group(1))
+                    thumbnail['height'] = int(m.group(2))
             thumbnails.append(thumbnail)
 
         return merge_dicts(info, {
             'id': content_id,
             'title': title,
-            'description': details.get('leadParagraph'),
-            'duration': duration,
+            'description': xpath_text(details, './/information/detail'),
+            'duration': int_or_none(xpath_text(details, './/details/lengthSec')),
             'thumbnails': thumbnails,
             'timestamp': timestamp,
-            'uploader': details.get('tvService'),
-            'series': series,
-            'episode': episode,
+            'uploader': xpath_text(details, './/details/channel'),
+            'uploader_id': xpath_text(details, './/details/originChannelId'),
+            'channel': xpath_text(details, './/details/originChannelTitle'),
         })
diff --git a/youtube_dl/extractor/playstuff.py b/youtube_dl/extractor/playstuff.py
deleted file mode 100644
index 5a329957f..000000000
--- a/youtube_dl/extractor/playstuff.py
+++ /dev/null
@@ -1,65 +0,0 @@
-from __future__ import unicode_literals
-
-from .common import InfoExtractor
-from ..compat import compat_str
-from ..utils import (
-    smuggle_url,
-    try_get,
-)
-
-
-class PlayStuffIE(InfoExtractor):
-    _VALID_URL = r'https?://(?:www\.)?play\.stuff\.co\.nz/details/(?P<id>[^/?#&]+)'
-    _TESTS = [{
-        'url': 'https://play.stuff.co.nz/details/608778ac1de1c4001a3fa09a',
-        'md5': 'c82d3669e5247c64bc382577843e5bd0',
-        'info_dict': {
-            'id': '6250584958001',
-            'ext': 'mp4',
-            'title': 'Episode 1: Rotorua/Mt Maunganui/Tauranga',
-            'description': 'md5:c154bafb9f0dd02d01fd4100fb1c1913',
-            'uploader_id': '6005208634001',
-            'timestamp': 1619491027,
-            'upload_date': '20210427',
-        },
-        'add_ie': ['BrightcoveNew'],
-    }, {
-        # geo restricted, bypassable
-        'url': 'https://play.stuff.co.nz/details/_6155660351001',
-        'only_matching': True,
-    }]
-    BRIGHTCOVE_URL_TEMPLATE = 'http://players.brightcove.net/%s/%s_default/index.html?videoId=%s'
-
-    def _real_extract(self, url):
-        video_id = self._match_id(url)
-
-        webpage = self._download_webpage(url, video_id)
-
-        state = self._parse_json(
-            self._search_regex(
-                r'__INITIAL_STATE__\s*=\s*({.+?})\s*;', webpage, 'state'),
-            video_id)
-
-        account_id = try_get(
-            state, lambda x: x['configurations']['accountId'],
-            compat_str) or '6005208634001'
-        player_id = try_get(
-            state, lambda x: x['configurations']['playerId'],
-            compat_str) or 'default'
-
-        entries = []
-        for item_id, video in state['items'].items():
-            if not isinstance(video, dict):
-                continue
-            asset_id = try_get(
-                video, lambda x: x['content']['attributes']['assetId'],
-                compat_str)
-            if not asset_id:
-                continue
-            entries.append(self.url_result(
-                smuggle_url(
-                    self.BRIGHTCOVE_URL_TEMPLATE % (account_id, player_id, asset_id),
-                    {'geo_countries': ['NZ']}),
-                'BrightcoveNew', video_id))
-
-        return self.playlist_result(entries, video_id)
diff --git a/youtube_dl/extractor/pluralsight.py b/youtube_dl/extractor/pluralsight.py
index 2d63855df..abd08bc28 100644
--- a/youtube_dl/extractor/pluralsight.py
+++ b/youtube_dl/extractor/pluralsight.py
@@ -393,7 +393,7 @@ query viewClip {
                 # To somewhat reduce the probability of these consequences
                 # we will sleep random amount of time before each call to ViewClip.
                 self._sleep(
-                    random.randint(5, 10), display_id,
+                    random.randint(2, 5), display_id,
                     '%(video_id)s: Waiting for %(timeout)s seconds to avoid throttling')
 
                 if not viewclip:
diff --git a/youtube_dl/extractor/pornhub.py b/youtube_dl/extractor/pornhub.py
index e2e1500ff..2a7818e41 100644
--- a/youtube_dl/extractor/pornhub.py
+++ b/youtube_dl/extractor/pornhub.py
@@ -30,7 +30,6 @@ from ..utils import (
 
 class PornHubBaseIE(InfoExtractor):
     _NETRC_MACHINE = 'pornhub'
-    _PORNHUB_HOST_RE = r'(?:(?P<host>pornhub(?:premium)?\.(?:com|net|org))|pornhubthbh7ap3u\.onion)'
 
     def _download_webpage_handle(self, *args, **kwargs):
         def dl(*args, **kwargs):
@@ -123,13 +122,11 @@ class PornHubIE(PornHubBaseIE):
     _VALID_URL = r'''(?x)
                     https?://
                         (?:
-                            (?:[^/]+\.)?
-                            %s
-                            /(?:(?:view_video\.php|video/show)\?viewkey=|embed/)|
+                            (?:[^/]+\.)?(?P<host>pornhub(?:premium)?\.(?:com|net|org))/(?:(?:view_video\.php|video/show)\?viewkey=|embed/)|
                             (?:www\.)?thumbzilla\.com/video/
                         )
                         (?P<id>[\da-z]+)
-                    ''' % PornHubBaseIE._PORNHUB_HOST_RE
+                    '''
     _TESTS = [{
         'url': 'http://www.pornhub.com/view_video.php?viewkey=648719015',
         'md5': 'a6391306d050e4547f62b3f485dd9ba9',
@@ -239,13 +236,6 @@ class PornHubIE(PornHubBaseIE):
     }, {
         'url': 'https://www.pornhubpremium.com/view_video.php?viewkey=ph5f75b0f4b18e3',
         'only_matching': True,
-    }, {
-        # geo restricted
-        'url': 'https://www.pornhub.com/view_video.php?viewkey=ph5a9813bfa7156',
-        'only_matching': True,
-    }, {
-        'url': 'http://pornhubthbh7ap3u.onion/view_video.php?viewkey=ph5a9813bfa7156',
-        'only_matching': True,
     }]
 
     @staticmethod
@@ -285,11 +275,6 @@ class PornHubIE(PornHubBaseIE):
                 'PornHub said: %s' % error_msg,
                 expected=True, video_id=video_id)
 
-        if any(re.search(p, webpage) for p in (
-                r'class=["\']geoBlocked["\']',
-                r'>\s*This content is unavailable in your country')):
-            self.raise_geo_restricted()
-
         # video_title from flashvars contains whitespace instead of non-ASCII (see
         # http://www.pornhub.com/view_video.php?viewkey=1331683002), not relying
         # on that anymore.
@@ -413,24 +398,17 @@ class PornHubIE(PornHubBaseIE):
         formats = []
 
         def add_format(format_url, height=None):
-            ext = determine_ext(format_url)
-            if ext == 'mpd':
-                formats.extend(self._extract_mpd_formats(
-                    format_url, video_id, mpd_id='dash', fatal=False))
-                return
-            if ext == 'm3u8':
-                formats.extend(self._extract_m3u8_formats(
-                    format_url, video_id, 'mp4', entry_protocol='m3u8_native',
-                    m3u8_id='hls', fatal=False))
-                return
-            if not height:
-                height = int_or_none(self._search_regex(
-                    r'(?P<height>\d+)[pP]?_\d+[kK]', format_url, 'height',
-                    default=None))
+            tbr = None
+            mobj = re.search(r'(?P<height>\d+)[pP]?_(?P<tbr>\d+)[kK]', format_url)
+            if mobj:
+                if not height:
+                    height = int(mobj.group('height'))
+                tbr = int(mobj.group('tbr'))
             formats.append({
                 'url': format_url,
                 'format_id': '%dp' % height if height else None,
                 'height': height,
+                'tbr': tbr,
             })
 
         for video_url, height in video_urls:
@@ -439,6 +417,16 @@ class PornHubIE(PornHubBaseIE):
                     r'/(\d{6}/\d{2})/', video_url, 'upload data', default=None)
                 if upload_date:
                     upload_date = upload_date.replace('/', '')
+            ext = determine_ext(video_url)
+            if ext == 'mpd':
+                formats.extend(self._extract_mpd_formats(
+                    video_url, video_id, mpd_id='dash', fatal=False))
+                continue
+            elif ext == 'm3u8':
+                formats.extend(self._extract_m3u8_formats(
+                    video_url, video_id, 'mp4', entry_protocol='m3u8_native',
+                    m3u8_id='hls', fatal=False))
+                continue
             if '/video/get_media' in video_url:
                 medias = self._download_json(video_url, video_id, fatal=False)
                 if isinstance(medias, list):
@@ -452,8 +440,7 @@ class PornHubIE(PornHubBaseIE):
                         add_format(video_url, height)
                 continue
             add_format(video_url)
-        self._sort_formats(
-            formats, field_preference=('height', 'width', 'fps', 'format_id'))
+        self._sort_formats(formats)
 
         video_uploader = self._html_search_regex(
             r'(?s)From:&nbsp;.+?<(?:a\b[^>]+\bhref=["\']/(?:(?:user|channel)s|model|pornstar)/|span\b[^>]+\bclass=["\']username)[^>]+>(.+?)<',
@@ -526,7 +513,7 @@ class PornHubPlaylistBaseIE(PornHubBaseIE):
 
 
 class PornHubUserIE(PornHubPlaylistBaseIE):
-    _VALID_URL = r'(?P<url>https?://(?:[^/]+\.)?%s/(?:(?:user|channel)s|model|pornstar)/(?P<id>[^/?#&]+))(?:[?#&]|/(?!videos)|$)' % PornHubBaseIE._PORNHUB_HOST_RE
+    _VALID_URL = r'(?P<url>https?://(?:[^/]+\.)?(?P<host>pornhub(?:premium)?\.(?:com|net|org))/(?:(?:user|channel)s|model|pornstar)/(?P<id>[^/?#&]+))(?:[?#&]|/(?!videos)|$)'
     _TESTS = [{
         'url': 'https://www.pornhub.com/model/zoe_ph',
         'playlist_mincount': 118,
@@ -555,9 +542,6 @@ class PornHubUserIE(PornHubPlaylistBaseIE):
         # Same as before, multi page
         'url': 'https://www.pornhubpremium.com/pornstar/lily-labeau',
         'only_matching': True,
-    }, {
-        'url': 'https://pornhubthbh7ap3u.onion/model/zoe_ph',
-        'only_matching': True,
     }]
 
     def _real_extract(self, url):
@@ -633,7 +617,7 @@ class PornHubPagedPlaylistBaseIE(PornHubPlaylistBaseIE):
 
 
 class PornHubPagedVideoListIE(PornHubPagedPlaylistBaseIE):
-    _VALID_URL = r'https?://(?:[^/]+\.)?%s/(?P<id>(?:[^/]+/)*[^/?#&]+)' % PornHubBaseIE._PORNHUB_HOST_RE
+    _VALID_URL = r'https?://(?:[^/]+\.)?(?P<host>pornhub(?:premium)?\.(?:com|net|org))/(?P<id>(?:[^/]+/)*[^/?#&]+)'
     _TESTS = [{
         'url': 'https://www.pornhub.com/model/zoe_ph/videos',
         'only_matching': True,
@@ -738,9 +722,6 @@ class PornHubPagedVideoListIE(PornHubPagedPlaylistBaseIE):
     }, {
         'url': 'https://de.pornhub.com/playlist/4667351',
         'only_matching': True,
-    }, {
-        'url': 'https://pornhubthbh7ap3u.onion/model/zoe_ph/videos',
-        'only_matching': True,
     }]
 
     @classmethod
@@ -751,7 +732,7 @@ class PornHubPagedVideoListIE(PornHubPagedPlaylistBaseIE):
 
 
 class PornHubUserVideosUploadIE(PornHubPagedPlaylistBaseIE):
-    _VALID_URL = r'(?P<url>https?://(?:[^/]+\.)?%s/(?:(?:user|channel)s|model|pornstar)/(?P<id>[^/]+)/videos/upload)' % PornHubBaseIE._PORNHUB_HOST_RE
+    _VALID_URL = r'(?P<url>https?://(?:[^/]+\.)?(?P<host>pornhub(?:premium)?\.(?:com|net|org))/(?:(?:user|channel)s|model|pornstar)/(?P<id>[^/]+)/videos/upload)'
     _TESTS = [{
         'url': 'https://www.pornhub.com/pornstar/jenny-blighe/videos/upload',
         'info_dict': {
@@ -761,7 +742,4 @@ class PornHubUserVideosUploadIE(PornHubPagedPlaylistBaseIE):
     }, {
         'url': 'https://www.pornhub.com/model/zoe_ph/videos/upload',
         'only_matching': True,
-    }, {
-        'url': 'http://pornhubthbh7ap3u.onion/pornstar/jenny-blighe/videos/upload',
-        'only_matching': True,
     }]
diff --git a/youtube_dl/extractor/pr0gramm.py b/youtube_dl/extractor/pr0gramm.py
deleted file mode 100644
index b68224fd5..000000000
--- a/youtube_dl/extractor/pr0gramm.py
+++ /dev/null
@@ -1,105 +0,0 @@
-# coding: utf-8
-from __future__ import unicode_literals
-
-from .common import InfoExtractor
-
-import re
-from ..utils import (
-    merge_dicts,
-)
-
-
-class Pr0grammStaticIE(InfoExtractor):
-    # Possible urls:
-    # https://pr0gramm.com/static/5466437
-    _VALID_URL = r'https?://pr0gramm\.com/static/(?P<id>[0-9]+)'
-    _TEST = {
-        'url': 'https://pr0gramm.com/static/5466437',
-        'md5': '52fa540d70d3edc286846f8ca85938aa',
-        'info_dict': {
-            'id': '5466437',
-            'ext': 'mp4',
-            'title': 'pr0gramm-5466437 by g11st',
-            'uploader': 'g11st',
-            'upload_date': '20221221',
-        }
-    }
-
-    def _real_extract(self, url):
-        video_id = self._match_id(url)
-        webpage = self._download_webpage(url, video_id)
-
-        # Fetch media sources
-        entries = self._parse_html5_media_entries(url, webpage, video_id)
-        media_info = entries[0]
-
-        # this raises if there are no formats
-        self._sort_formats(media_info.get('formats') or [])
-
-        # Fetch author
-        uploader = self._html_search_regex(r'by\W+([\w-]+)\W+', webpage, 'uploader')
-
-        # Fetch approx upload timestamp from filename
-        # Have None-defaults in case the extraction fails
-        uploadDay = None
-        uploadMon = None
-        uploadYear = None
-        uploadTimestr = None
-        # (//img.pr0gramm.com/2022/12/21/62ae8aa5e2da0ebf.mp4)
-        m = re.search(r'//img\.pr0gramm\.com/(?P<year>[\d]+)/(?P<mon>[\d]+)/(?P<day>[\d]+)/\w+\.\w{,4}', webpage)
-
-        if (m):
-            # Up to a day of accuracy should suffice...
-            uploadDay = m.groupdict().get('day')
-            uploadMon = m.groupdict().get('mon')
-            uploadYear = m.groupdict().get('year')
-            uploadTimestr = uploadYear + uploadMon + uploadDay
-
-        return merge_dicts({
-            'id': video_id,
-            'title': 'pr0gramm-%s%s' % (video_id, (' by ' + uploader) if uploader else ''),
-            'uploader': uploader,
-            'upload_date': uploadTimestr
-        }, media_info)
-
-
-# This extractor is for the primary url (used for sharing, and appears in the
-# location bar) Since this page loads the DOM via JS, yt-dl can't find any
-# video information here. So let's redirect to a compatibility version of
-# the site, which does contain the <video>-element  by itself,  without requiring
-# js to be ran.
-class Pr0grammIE(InfoExtractor):
-    # Possible urls:
-    # https://pr0gramm.com/new/546637
-    # https://pr0gramm.com/new/video/546637
-    # https://pr0gramm.com/top/546637
-    # https://pr0gramm.com/top/video/546637
-    # https://pr0gramm.com/user/g11st/uploads/5466437
-    # https://pr0gramm.com/user/froschler/dafur-ist-man-hier/5091290
-    # https://pr0gramm.com/user/froschler/reinziehen-1elf/5232030
-    # https://pr0gramm.com/user/froschler/1elf/5232030
-    # https://pr0gramm.com/new/5495710:comment62621020 <- this is not the id!
-    # https://pr0gramm.com/top/fruher war alles damals/5498175
-
-    _VALID_URL = r'https?:\/\/pr0gramm\.com\/(?!static/\d+).+?\/(?P<id>[\d]+)(:|$)'
-    _TEST = {
-        'url': 'https://pr0gramm.com/new/video/5466437',
-        'info_dict': {
-            'id': '5466437',
-            'ext': 'mp4',
-            'title': 'pr0gramm-5466437 by g11st',
-            'uploader': 'g11st',
-            'upload_date': '20221221',
-        }
-    }
-
-    def _generic_title():
-        return "oof"
-
-    def _real_extract(self, url):
-        video_id = self._match_id(url)
-
-        return self.url_result(
-            'https://pr0gramm.com/static/' + video_id,
-            video_id=video_id,
-            ie=Pr0grammStaticIE.ie_key())
diff --git a/youtube_dl/extractor/rai.py b/youtube_dl/extractor/rai.py
index 563d3400f..67b86fc72 100644
--- a/youtube_dl/extractor/rai.py
+++ b/youtube_dl/extractor/rai.py
@@ -5,16 +5,15 @@ import re
 
 from .common import InfoExtractor
 from ..compat import (
-    compat_str,
     compat_urlparse,
+    compat_str,
 )
 from ..utils import (
-    determine_ext,
     ExtractorError,
+    determine_ext,
     find_xpath_attr,
     fix_xml_ampersands,
     GeoRestrictedError,
-    HEADRequest,
     int_or_none,
     parse_duration,
     remove_start,
@@ -97,100 +96,12 @@ class RaiBaseIE(InfoExtractor):
         if not formats and geoprotection is True:
             self.raise_geo_restricted(countries=self._GEO_COUNTRIES)
 
-        formats.extend(self._create_http_urls(relinker_url, formats))
-
         return dict((k, v) for k, v in {
             'is_live': is_live,
             'duration': duration,
             'formats': formats,
         }.items() if v is not None)
 
-    def _create_http_urls(self, relinker_url, fmts):
-        _RELINKER_REG = r'https?://(?P<host>[^/]+?)/(?:i/)?(?P<extra>[^/]+?)/(?P<path>.+?)/(?P<id>\w+)(?:_(?P<quality>[\d\,]+))?(?:\.mp4|/playlist\.m3u8).+?'
-        _MP4_TMPL = '%s&overrideUserAgentRule=mp4-%s'
-        _QUALITY = {
-            # tbr: w, h
-            '250': [352, 198],
-            '400': [512, 288],
-            '700': [512, 288],
-            '800': [700, 394],
-            '1200': [736, 414],
-            '1800': [1024, 576],
-            '2400': [1280, 720],
-            '3200': [1440, 810],
-            '3600': [1440, 810],
-            '5000': [1920, 1080],
-            '10000': [1920, 1080],
-        }
-
-        def test_url(url):
-            resp = self._request_webpage(
-                HEADRequest(url), None, headers={'User-Agent': 'Rai'},
-                fatal=False, errnote=False, note=False)
-
-            if resp is False:
-                return False
-
-            if resp.code == 200:
-                return False if resp.url == url else resp.url
-            return None
-
-        def get_format_info(tbr):
-            import math
-            br = int_or_none(tbr)
-            if len(fmts) == 1 and not br:
-                br = fmts[0].get('tbr')
-            if br > 300:
-                tbr = compat_str(math.floor(br / 100) * 100)
-            else:
-                tbr = '250'
-
-            # try extracting info from available m3u8 formats
-            format_copy = None
-            for f in fmts:
-                if f.get('tbr'):
-                    br_limit = math.floor(br / 100)
-                    if br_limit - 1 <= math.floor(f['tbr'] / 100) <= br_limit + 1:
-                        format_copy = f.copy()
-            return {
-                'width': format_copy.get('width'),
-                'height': format_copy.get('height'),
-                'tbr': format_copy.get('tbr'),
-                'vcodec': format_copy.get('vcodec'),
-                'acodec': format_copy.get('acodec'),
-                'fps': format_copy.get('fps'),
-                'format_id': 'https-%s' % tbr,
-            } if format_copy else {
-                'width': _QUALITY[tbr][0],
-                'height': _QUALITY[tbr][1],
-                'format_id': 'https-%s' % tbr,
-                'tbr': int(tbr),
-            }
-
-        loc = test_url(_MP4_TMPL % (relinker_url, '*'))
-        if not isinstance(loc, compat_str):
-            return []
-
-        mobj = re.match(
-            _RELINKER_REG,
-            test_url(relinker_url) or '')
-        if not mobj:
-            return []
-
-        available_qualities = mobj.group('quality').split(',') if mobj.group('quality') else ['*']
-        available_qualities = [i for i in available_qualities if i]
-
-        formats = []
-        for q in available_qualities:
-            fmt = {
-                'url': _MP4_TMPL % (relinker_url, q),
-                'protocol': 'https',
-                'ext': 'mp4',
-            }
-            fmt.update(get_format_info(q))
-            formats.append(fmt)
-        return formats
-
     @staticmethod
     def _extract_subtitles(url, video_data):
         STL_EXT = 'stl'
@@ -240,22 +151,6 @@ class RaiPlayIE(RaiBaseIE):
         'params': {
             'skip_download': True,
         },
-    }, {
-        # 1080p direct mp4 url
-        'url': 'https://www.raiplay.it/video/2021/03/Leonardo-S1E1-b5703b02-82ee-475a-85b6-c9e4a8adf642.html',
-        'md5': '2e501e8651d72f05ffe8f5d286ad560b',
-        'info_dict': {
-            'id': 'b5703b02-82ee-475a-85b6-c9e4a8adf642',
-            'ext': 'mp4',
-            'title': 'Leonardo - S1E1',
-            'alt_title': 'St 1 Ep 1 - Episodio 1',
-            'description': 'md5:f5360cd267d2de146e4e3879a5a47d31',
-            'thumbnail': r're:^https?://.*\.jpg$',
-            'uploader': 'Rai 1',
-            'duration': 3229,
-            'series': 'Leonardo',
-            'season': 'Season 1',
-        },
     }, {
         'url': 'http://www.raiplay.it/video/2016/11/gazebotraindesi-efebe701-969c-4593-92f3-285f0d1ce750.html?',
         'only_matching': True,
@@ -263,10 +158,6 @@ class RaiPlayIE(RaiBaseIE):
         # subtitles at 'subtitlesArray' key (see #27698)
         'url': 'https://www.raiplay.it/video/2020/12/Report---04-01-2021-2e90f1de-8eee-4de4-ac0e-78d21db5b600.html',
         'only_matching': True,
-    }, {
-        # DRM protected
-        'url': 'https://www.raiplay.it/video/2020/09/Lo-straordinario-mondo-di-Zoey-S1E1-Lo-straordinario-potere-di-Zoey-ed493918-1d32-44b7-8454-862e473d00ff.html',
-        'only_matching': True,
     }]
 
     def _real_extract(self, url):
@@ -275,13 +166,6 @@ class RaiPlayIE(RaiBaseIE):
         media = self._download_json(
             base + '.json', video_id, 'Downloading video JSON')
 
-        if try_get(
-                media,
-                (lambda x: x['rights_management']['rights']['drm'],
-                 lambda x: x['program_info']['rights_management']['rights']['drm']),
-                dict):
-            raise ExtractorError('This video is DRM protected.', expected=True)
-
         title = media['name']
 
         video = media['video']
@@ -423,7 +307,7 @@ class RaiIE(RaiBaseIE):
     }, {
         # with ContentItem in og:url
         'url': 'http://www.rai.it/dl/RaiTV/programmi/media/ContentItem-efb17665-691c-45d5-a60c-5301333cbb0c.html',
-        'md5': '06345bd97c932f19ffb129973d07a020',
+        'md5': '6865dd00cf0bbf5772fdd89d59bd768a',
         'info_dict': {
             'id': 'efb17665-691c-45d5-a60c-5301333cbb0c',
             'ext': 'mp4',
diff --git a/youtube_dl/extractor/rbgtum.py b/youtube_dl/extractor/rbgtum.py
deleted file mode 100644
index da48ebbc4..000000000
--- a/youtube_dl/extractor/rbgtum.py
+++ /dev/null
@@ -1,97 +0,0 @@
-# coding: utf-8
-from __future__ import unicode_literals
-
-import re
-
-from .common import InfoExtractor
-
-
-class RbgTumIE(InfoExtractor):
-    _VALID_URL = r'https://live\.rbg\.tum\.de/w/(?P<id>.+)'
-    _TESTS = [{
-        # Combined view
-        'url': 'https://live.rbg.tum.de/w/cpp/22128',
-        'md5': '53a5e7b3e07128e33bbf36687fe1c08f',
-        'info_dict': {
-            'id': 'cpp/22128',
-            'ext': 'mp4',
-            'title': 'Lecture: October 18. 2022',
-            'series': 'Concepts of C++ programming (IN2377)',
-        }
-    }, {
-        # Presentation only
-        'url': 'https://live.rbg.tum.de/w/I2DL/12349/PRES',
-        'md5': '36c584272179f3e56b0db5d880639cba',
-        'info_dict': {
-            'id': 'I2DL/12349/PRES',
-            'ext': 'mp4',
-            'title': 'Lecture 3: Introduction to Neural Networks',
-            'series': 'Introduction to Deep Learning (IN2346)',
-        }
-    }, {
-        # Camera only
-        'url': 'https://live.rbg.tum.de/w/fvv-info/16130/CAM',
-        'md5': 'e04189d92ff2f56aedf5cede65d37aad',
-        'info_dict': {
-            'id': 'fvv-info/16130/CAM',
-            'ext': 'mp4',
-            'title': 'Fachschaftsvollversammlung',
-            'series': 'Fachschaftsvollversammlung Informatik',
-        }
-    }, ]
-
-    def _real_extract(self, url):
-        video_id = self._match_id(url)
-        webpage = self._download_webpage(url, video_id)
-
-        m3u8 = self._html_search_regex(r'(https://.+?\.m3u8)', webpage, 'm3u8')
-        lecture_title = self._html_search_regex(r'(?si)<h1.*?>(.*)</h1>', webpage, 'title')
-        lecture_series_title = self._html_search_regex(
-            r'(?s)<title\b[^>]*>\s*(?:TUM-Live\s\|\s?)?([^:]+):?.*?</title>', webpage, 'series')
-
-        formats = self._extract_m3u8_formats(m3u8, video_id, 'mp4', entry_protocol='m3u8_native', m3u8_id='hls')
-        self._sort_formats(formats)
-
-        return {
-            'id': video_id,
-            'title': lecture_title,
-            'series': lecture_series_title,
-            'formats': formats,
-        }
-
-
-class RbgTumCourseIE(InfoExtractor):
-    _VALID_URL = r'https://live\.rbg\.tum\.de/course/(?P<id>.+)'
-    _TESTS = [{
-        'url': 'https://live.rbg.tum.de/course/2022/S/fpv',
-        'info_dict': {
-            'title': 'Funktionale Programmierung und Verifikation (IN0003)',
-            'id': '2022/S/fpv',
-        },
-        'params': {
-            'noplaylist': False,
-        },
-        'playlist_count': 13,
-    }, {
-        'url': 'https://live.rbg.tum.de/course/2022/W/set',
-        'info_dict': {
-            'title': 'SET FSMPIC',
-            'id': '2022/W/set',
-        },
-        'params': {
-            'noplaylist': False,
-        },
-        'playlist_count': 6,
-    }, ]
-
-    def _real_extract(self, url):
-        course_id = self._match_id(url)
-        webpage = self._download_webpage(url, course_id)
-
-        lecture_series_title = self._html_search_regex(r'(?si)<h1.*?>(.*)</h1>', webpage, 'title')
-
-        lecture_urls = []
-        for lecture_url in re.findall(r'(?i)href="/w/(.+)(?<!/cam)(?<!/pres)(?<!/chat)"', webpage):
-            lecture_urls.append(self.url_result('https://live.rbg.tum.de/w/' + lecture_url, ie=RbgTumIE.ie_key()))
-
-        return self.playlist_result(lecture_urls, course_id, lecture_series_title)
diff --git a/youtube_dl/extractor/redbulltv.py b/youtube_dl/extractor/redbulltv.py
index 6d000b372..3aae79f5d 100644
--- a/youtube_dl/extractor/redbulltv.py
+++ b/youtube_dl/extractor/redbulltv.py
@@ -133,10 +133,8 @@ class RedBullEmbedIE(RedBullTVIE):
         rrn_id = self._match_id(url)
         asset_id = self._download_json(
             'https://edge-graphql.crepo-production.redbullaws.com/v1/graphql',
-            rrn_id, headers={
-                'Accept': 'application/json',
-                'API-KEY': 'e90a1ff11335423998b100c929ecc866',
-            }, query={
+            rrn_id, headers={'API-KEY': 'e90a1ff11335423998b100c929ecc866'},
+            query={
                 'query': '''{
   resource(id: "%s", enforceGeoBlocking: false) {
     %s
diff --git a/youtube_dl/extractor/rutv.py b/youtube_dl/extractor/rutv.py
index 05f319396..d2713c19a 100644
--- a/youtube_dl/extractor/rutv.py
+++ b/youtube_dl/extractor/rutv.py
@@ -6,8 +6,7 @@ import re
 from .common import InfoExtractor
 from ..utils import (
     ExtractorError,
-    int_or_none,
-    str_to_int
+    int_or_none
 )
 
 
@@ -180,7 +179,7 @@ class RUTVIE(InfoExtractor):
                         'player_url': 'http://player.rutv.ru/flash3v/osmf.swf?i=22',
                         'rtmp_live': True,
                         'ext': 'flv',
-                        'vbr': str_to_int(quality),
+                        'vbr': int(quality),
                         'preference': preference,
                     }
                 elif transport == 'm3u8':
diff --git a/youtube_dl/extractor/s4c.py b/youtube_dl/extractor/s4c.py
deleted file mode 100644
index b152e6680..000000000
--- a/youtube_dl/extractor/s4c.py
+++ /dev/null
@@ -1,124 +0,0 @@
-# coding: utf-8
-
-from __future__ import unicode_literals
-
-from functools import partial as partial_f
-
-from .common import InfoExtractor
-from ..utils import (
-    float_or_none,
-    merge_dicts,
-    T,
-    traverse_obj,
-    txt_or_none,
-    url_or_none,
-)
-
-
-class S4CIE(InfoExtractor):
-    _VALID_URL = r'https?://(?:www\.)?s4c\.cymru/clic/programme/(?P<id>\d+)'
-    _TESTS = [{
-        'url': 'https://www.s4c.cymru/clic/programme/861362209',
-        'info_dict': {
-            'id': '861362209',
-            'ext': 'mp4',
-            'title': 'Y Swn',
-            'description': 'md5:f7681a30e4955b250b3224aa9fe70cf0',
-            'duration': 5340,
-            'thumbnail': 'https://www.s4c.cymru/amg/1920x1080/Y_Swn_2023S4C_099_ii.jpg',
-        },
-    }, {
-        'url': 'https://www.s4c.cymru/clic/programme/856636948',
-        'info_dict': {
-            'id': '856636948',
-            'ext': 'mp4',
-            'title': 'Am Dro',
-            'duration': 2880,
-            'description': 'md5:100d8686fc9a632a0cb2db52a3433ffe',
-            'thumbnail': 'https://www.s4c.cymru/amg/1920x1080/Am_Dro_2022-23S4C_P6_4005.jpg',
-        },
-    }]
-
-    def _real_extract(self, url):
-        video_id = self._match_id(url)
-        details = self._download_json(
-            'https://www.s4c.cymru/df/full_prog_details',
-            video_id, query={
-                'lang': 'e',
-                'programme_id': video_id,
-            }, fatal=False)
-
-        player_config = self._download_json(
-            'https://player-api.s4c-cdn.co.uk/player-configuration/prod', video_id, query={
-                'programme_id': video_id,
-                'signed': '0',
-                'lang': 'en',
-                'mode': 'od',
-                'appId': 'clic',
-                'streamName': '',
-            }, note='Downloading player config JSON')
-
-        m3u8_url = self._download_json(
-            'https://player-api.s4c-cdn.co.uk/streaming-urls/prod', video_id, query={
-                'mode': 'od',
-                'application': 'clic',
-                'region': 'WW',
-                'extra': 'false',
-                'thirdParty': 'false',
-                'filename': player_config['filename'],
-            }, note='Downloading streaming urls JSON')['hls']
-        formats = self._extract_m3u8_formats(m3u8_url, video_id, 'mp4', m3u8_id='hls', entry_protocol='m3u8_native')
-        self._sort_formats(formats)
-
-        subtitles = {}
-        for sub in traverse_obj(player_config, ('subtitles', lambda _, v: url_or_none(v['0']))):
-            subtitles.setdefault(sub.get('3', 'en'), []).append({
-                'url': sub['0'],
-                'name': sub.get('1'),
-            })
-
-        return merge_dicts({
-            'id': video_id,
-            'formats': formats,
-            'subtitles': subtitles,
-            'thumbnail': url_or_none(player_config.get('poster')),
-        }, traverse_obj(details, ('full_prog_details', 0, {
-            'title': (('programme_title', 'series_title'), T(txt_or_none)),
-            'description': ('full_billing', T(txt_or_none)),
-            'duration': ('duration', T(partial_f(float_or_none, invscale=60))),
-        }), get_all=False),
-            rev=True)
-
-
-class S4CSeriesIE(InfoExtractor):
-    _VALID_URL = r'https?://(?:www\.)?s4c\.cymru/clic/series/(?P<id>\d+)'
-    _TESTS = [{
-        'url': 'https://www.s4c.cymru/clic/series/864982911',
-        'playlist_mincount': 6,
-        'info_dict': {
-            'id': '864982911',
-            'title': 'Iaith ar Daith',
-        },
-    }, {
-        'url': 'https://www.s4c.cymru/clic/series/866852587',
-        'playlist_mincount': 8,
-        'info_dict': {
-            'id': '866852587',
-            'title': 'FFIT Cymru',
-        },
-    }]
-
-    def _real_extract(self, url):
-        series_id = self._match_id(url)
-        series_details = self._download_json(
-            'https://www.s4c.cymru/df/series_details', series_id, query={
-                'lang': 'e',
-                'series_id': series_id,
-                'show_prog_in_series': 'Y'
-            }, note='Downloading series details JSON')
-
-        return self.playlist_result(
-            (self.url_result('https://www.s4c.cymru/clic/programme/' + episode_id, S4CIE, episode_id)
-             for episode_id in traverse_obj(series_details, ('other_progs_in_series', Ellipsis, 'id'))),
-            playlist_id=series_id, playlist_title=traverse_obj(
-                series_details, ('full_prog_details', 0, 'series_title', T(txt_or_none))))
diff --git a/youtube_dl/extractor/senateisvp.py b/youtube_dl/extractor/senateisvp.py
index b8ac58713..db5ef8b57 100644
--- a/youtube_dl/extractor/senateisvp.py
+++ b/youtube_dl/extractor/senateisvp.py
@@ -47,7 +47,7 @@ class SenateISVPIE(InfoExtractor):
         ['vetaff', '76462', 'http://vetaff-f.akamaihd.net'],
         ['arch', '', 'http://ussenate-f.akamaihd.net/']
     ]
-    IE_NAME = 'senate.gov'
+    _IE_NAME = 'senate.gov'
     _VALID_URL = r'https?://(?:www\.)?senate\.gov/isvp/?\?(?P<qs>.+)'
     _TESTS = [{
         'url': 'http://www.senate.gov/isvp/?comm=judiciary&type=live&stt=&filename=judiciary031715&auto_play=false&wmode=transparent&poster=http%3A%2F%2Fwww.judiciary.senate.gov%2Fthemes%2Fjudiciary%2Fimages%2Fvideo-poster-flash-fit.png',
diff --git a/youtube_dl/extractor/shahid.py b/youtube_dl/extractor/shahid.py
index 88b938e05..b5e093bd2 100644
--- a/youtube_dl/extractor/shahid.py
+++ b/youtube_dl/extractor/shahid.py
@@ -21,7 +21,6 @@ from ..utils import (
 class ShahidBaseIE(AWSIE):
     _AWS_PROXY_HOST = 'api2.shahid.net'
     _AWS_API_KEY = '2RRtuMHx95aNI1Kvtn2rChEuwsCogUd4samGPjLh'
-    _VALID_URL_BASE = r'https?://shahid\.mbc\.net/[a-z]{2}/'
 
     def _handle_error(self, e):
         fail_data = self._parse_json(
@@ -50,7 +49,7 @@ class ShahidBaseIE(AWSIE):
 
 class ShahidIE(ShahidBaseIE):
     _NETRC_MACHINE = 'shahid'
-    _VALID_URL = ShahidBaseIE._VALID_URL_BASE + r'(?:serie|show|movie)s/[^/]+/(?P<type>episode|clip|movie)-(?P<id>\d+)'
+    _VALID_URL = r'https?://shahid\.mbc\.net/ar/(?:serie|show|movie)s/[^/]+/(?P<type>episode|clip|movie)-(?P<id>\d+)'
     _TESTS = [{
         'url': 'https://shahid.mbc.net/ar/shows/%D9%85%D8%AA%D8%AD%D9%81-%D8%A7%D9%84%D8%AF%D8%AD%D9%8A%D8%AD-%D8%A7%D9%84%D9%85%D9%88%D8%B3%D9%85-1-%D9%83%D9%84%D9%8A%D8%A8-1/clip-816924',
         'info_dict': {
@@ -74,9 +73,6 @@ class ShahidIE(ShahidBaseIE):
         # shahid plus subscriber only
         'url': 'https://shahid.mbc.net/ar/series/%D9%85%D8%B1%D8%A7%D9%8A%D8%A7-2011-%D8%A7%D9%84%D9%85%D9%88%D8%B3%D9%85-1-%D8%A7%D9%84%D8%AD%D9%84%D9%82%D8%A9-1/episode-90511',
         'only_matching': True
-    }, {
-        'url': 'https://shahid.mbc.net/en/shows/Ramez-Fi-Al-Shallal-season-1-episode-1/episode-359319',
-        'only_matching': True
     }]
 
     def _real_initialize(self):
@@ -172,7 +168,7 @@ class ShahidIE(ShahidBaseIE):
 
 
 class ShahidShowIE(ShahidBaseIE):
-    _VALID_URL = ShahidBaseIE._VALID_URL_BASE + r'(?:show|serie)s/[^/]+/(?:show|series)-(?P<id>\d+)'
+    _VALID_URL = r'https?://shahid\.mbc\.net/ar/(?:show|serie)s/[^/]+/(?:show|series)-(?P<id>\d+)'
     _TESTS = [{
         'url': 'https://shahid.mbc.net/ar/shows/%D8%B1%D8%A7%D9%85%D8%B2-%D9%82%D8%B1%D8%B4-%D8%A7%D9%84%D8%A8%D8%AD%D8%B1/show-79187',
         'info_dict': {
diff --git a/youtube_dl/extractor/shared.py b/youtube_dl/extractor/shared.py
index 93ab2a167..02295d1a4 100644
--- a/youtube_dl/extractor/shared.py
+++ b/youtube_dl/extractor/shared.py
@@ -86,10 +86,10 @@ class SharedIE(SharedBaseIE):
 
 class VivoIE(SharedBaseIE):
     IE_DESC = 'vivo.sx'
-    _VALID_URL = r'https?://vivo\.s[xt]/(?P<id>[\da-z]{10})'
+    _VALID_URL = r'https?://vivo\.sx/(?P<id>[\da-z]{10})'
     _FILE_NOT_FOUND = '>The file you have requested does not exists or has been removed'
 
-    _TESTS = [{
+    _TEST = {
         'url': 'http://vivo.sx/d7ddda0e78',
         'md5': '15b3af41be0b4fe01f4df075c2678b2c',
         'info_dict': {
@@ -98,10 +98,7 @@ class VivoIE(SharedBaseIE):
             'title': 'Chicken',
             'filesize': 515659,
         },
-    }, {
-        'url': 'http://vivo.st/d7ddda0e78',
-        'only_matching': True,
-    }]
+    }
 
     def _extract_title(self, webpage):
         title = self._html_search_regex(
diff --git a/youtube_dl/extractor/streamcz.py b/youtube_dl/extractor/streamcz.py
index 97b2eb7f8..58e0b4c80 100644
--- a/youtube_dl/extractor/streamcz.py
+++ b/youtube_dl/extractor/streamcz.py
@@ -1,126 +1,105 @@
 # coding: utf-8
 from __future__ import unicode_literals
 
-import json
-import re
+import hashlib
+import time
 
 from .common import InfoExtractor
 from ..utils import (
-    float_or_none,
     int_or_none,
-    merge_dicts,
-    parse_codecs,
-    urljoin,
+    sanitized_Request,
 )
 
 
+def _get_api_key(api_path):
+    if api_path.endswith('?'):
+        api_path = api_path[:-1]
+
+    api_key = 'fb5f58a820353bd7095de526253c14fd'
+    a = '{0:}{1:}{2:}'.format(api_key, api_path, int(round(time.time() / 24 / 3600)))
+    return hashlib.md5(a.encode('ascii')).hexdigest()
+
+
 class StreamCZIE(InfoExtractor):
-    _VALID_URL = r'https?://(?:www\.)?(?:stream|televizeseznam)\.cz/[^?#]+/(?P<display_id>[^?#]+)-(?P<id>[0-9]+)'
+    _VALID_URL = r'https?://(?:www\.)?stream\.cz/.+/(?P<id>[0-9]+)'
+    _API_URL = 'http://www.stream.cz/API'
+
     _TESTS = [{
-        'url': 'https://www.televizeseznam.cz/video/lajna/buh-57953890',
-        'md5': '40c41ade1464a390a0b447e333df4239',
+        'url': 'http://www.stream.cz/peklonataliri/765767-ecka-pro-deti',
+        'md5': '934bb6a6d220d99c010783c9719960d5',
         'info_dict': {
-            'id': '57953890',
+            'id': '765767',
             'ext': 'mp4',
-            'title': 'Bůh',
-            'display_id': 'buh',
-            'description': 'md5:8f5f09b9b7bc67df910486cdd88f7165',
-            'duration': 1369.6,
-            'view_count': int,
-        }
+            'title': 'Peklo na talíři: Éčka pro děti',
+            'description': 'Taška s grónskou pomazánkou a další pekelnosti ZDE',
+            'thumbnail': 're:^http://im.stream.cz/episode/52961d7e19d423f8f06f0100',
+            'duration': 256,
+        },
     }, {
-        'url': 'https://www.stream.cz/kdo-to-mluvi/kdo-to-mluvi-velke-odhaleni-prinasi-novy-porad-uz-od-25-srpna-64087937',
-        'md5': '41fd358000086a1ccdb068c77809b158',
+        'url': 'http://www.stream.cz/blanik/10002447-tri-roky-pro-mazanka',
+        'md5': '849a88c1e1ca47d41403c2ba5e59e261',
         'info_dict': {
-            'id': '64087937',
+            'id': '10002447',
             'ext': 'mp4',
-            'title': 'Kdo to mluví? Velké odhalení přináší nový pořad už od 25. srpna',
-            'display_id': 'kdo-to-mluvi-velke-odhaleni-prinasi-novy-porad-uz-od-25-srpna',
-            'description': 'md5:97a811000a6460266029d6c1c2ebcd59',
-            'duration': 50.2,
-            'view_count': int,
-        }
-    }, {
-        'url': 'https://www.stream.cz/tajemno/znicehonic-jim-skrz-strechu-prolitnul-zahadny-predmet-badatele-vse-objasnili-64147267',
-        'md5': '3ee4d0be040e8f4a543e67e509d55e3f',
-        'info_dict': {
-            'id': '64147267',
-            'ext': 'mp4',
-            'title': 'Zničehonic jim skrz střechu prolítnul záhadný předmět. Badatelé vše objasnili',
-            'display_id': 'znicehonic-jim-skrz-strechu-prolitnul-zahadny-predmet-badatele-vse-objasnili',
-            'description': 'md5:4b8ada6718d34bb011c4e04ca4bc19bf',
-            'duration': 442.84,
-            'view_count': int,
-        }
+            'title': 'Kancelář Blaník: Tři roky pro Mazánka',
+            'description': 'md5:3862a00ba7bf0b3e44806b544032c859',
+            'thumbnail': 're:^http://im.stream.cz/episode/537f838c50c11f8d21320000',
+            'duration': 368,
+        },
     }]
 
-    def _extract_formats(self, spl_url, video):
-        for ext, pref, streams in (
-                ('ts', -1, video.get('http_stream', {}).get('qualities', {})),
-                ('mp4', 1, video.get('mp4'))):
-            for format_id, stream in streams.items():
-                if not stream.get('url'):
-                    continue
-                yield merge_dicts({
-                    'format_id': '-'.join((format_id, ext)),
-                    'ext': ext,
-                    'source_preference': pref,
-                    'url': urljoin(spl_url, stream['url']),
-                    'tbr': float_or_none(stream.get('bandwidth'), scale=1000),
-                    'duration': float_or_none(stream.get('duration'), scale=1000),
-                    'width': stream.get('resolution', 2 * [0])[0] or None,
-                    'height': stream.get('resolution', 2 * [0])[1] or int_or_none(format_id.replace('p', '')),
-                }, parse_codecs(stream.get('codec')))
-
     def _real_extract(self, url):
-        display_id, video_id = re.match(self._VALID_URL, url).groups()
+        video_id = self._match_id(url)
+        api_path = '/episode/%s' % video_id
 
-        data = self._download_json(
-            'https://www.televizeseznam.cz/api/graphql', video_id, 'Downloading GraphQL result',
-            data=json.dumps({
-                'variables': {'urlName': video_id},
-                'query': '''
-                    query LoadEpisode($urlName : String){ episode(urlName: $urlName){ ...VideoDetailFragmentOnEpisode } }
-                    fragment VideoDetailFragmentOnEpisode on Episode {
-                        id
-                        spl
-                        urlName
-                        name
-                        perex
-                        duration
-                        views
-                    }'''
-            }).encode('utf-8'),
-            headers={'Content-Type': 'application/json;charset=UTF-8'}
-        )['data']['episode']
+        req = sanitized_Request(self._API_URL + api_path)
+        req.add_header('Api-Password', _get_api_key(api_path))
+        data = self._download_json(req, video_id)
 
-        spl_url = data['spl'] + 'spl2,3'
-        metadata = self._download_json(spl_url, video_id, 'Downloading playlist')
-        if 'Location' in metadata and 'data' not in metadata:
-            spl_url = metadata['Location']
-            metadata = self._download_json(spl_url, video_id, 'Downloading redirected playlist')
-        video = metadata['data']
+        formats = []
+        for quality, video in enumerate(data['video_qualities']):
+            for f in video['formats']:
+                typ = f['type'].partition('/')[2]
+                qlabel = video.get('quality_label')
+                formats.append({
+                    'format_note': '%s-%s' % (qlabel, typ) if qlabel else typ,
+                    'format_id': '%s-%s' % (typ, f['quality']),
+                    'url': f['source'],
+                    'height': int_or_none(f['quality'].rstrip('p')),
+                    'quality': quality,
+                })
+        self._sort_formats(formats)
+
+        image = data.get('image')
+        if image:
+            thumbnail = self._proto_relative_url(
+                image.replace('{width}', '1240').replace('{height}', '697'),
+                scheme='http:',
+            )
+        else:
+            thumbnail = None
+
+        stream = data.get('_embedded', {}).get('stream:show', {}).get('name')
+        if stream:
+            title = '%s: %s' % (stream, data['name'])
+        else:
+            title = data['name']
 
         subtitles = {}
-        for subs in video.get('subtitles', {}).values():
-            if not subs.get('language'):
-                continue
-            for ext, sub_url in subs.get('urls').items():
-                subtitles.setdefault(subs['language'], []).append({
-                    'ext': ext,
-                    'url': urljoin(spl_url, sub_url)
-                })
-
-        formats = list(self._extract_formats(spl_url, video))
-        self._sort_formats(formats)
+        srt_url = data.get('subtitles_srt')
+        if srt_url:
+            subtitles['cs'] = [{
+                'ext': 'srt',
+                'url': srt_url,
+            }]
 
         return {
             'id': video_id,
-            'display_id': display_id,
-            'title': data.get('name'),
-            'description': data.get('perex'),
-            'duration': float_or_none(data.get('duration')),
-            'view_count': int_or_none(data.get('views')),
+            'title': title,
+            'thumbnail': thumbnail,
             'formats': formats,
+            'description': data.get('web_site_text'),
+            'duration': int_or_none(data.get('duration')),
+            'view_count': int_or_none(data.get('views')),
             'subtitles': subtitles,
         }
diff --git a/youtube_dl/extractor/streamsb.py b/youtube_dl/extractor/streamsb.py
deleted file mode 100644
index bffcb3de1..000000000
--- a/youtube_dl/extractor/streamsb.py
+++ /dev/null
@@ -1,61 +0,0 @@
-# coding: utf-8
-from __future__ import unicode_literals
-
-import binascii
-import random
-import re
-import string
-
-from .common import InfoExtractor
-from ..utils import urljoin, url_basename
-
-
-def to_ascii_hex(str1):
-    return binascii.hexlify(str1.encode('utf-8')).decode('ascii')
-
-
-def generate_random_string(length):
-    return ''.join(random.choice(string.ascii_letters + string.digits) for _ in range(length))
-
-
-class StreamsbIE(InfoExtractor):
-    _DOMAINS = ('viewsb.com', )
-    _VALID_URL = r'https://(?P<domain>%s)/(?P<id>.+)' % '|'.join(_DOMAINS)
-    _TEST = {
-        'url': 'https://viewsb.com/dxfvlu4qanjx',
-        'md5': '488d111a63415369bf90ea83adc8a325',
-        'info_dict': {
-            'id': 'dxfvlu4qanjx',
-            'ext': 'mp4',
-            'title': 'Sintel'
-        }
-    }
-
-    def _real_extract(self, url):
-        domain, video_id = re.match(self._VALID_URL, url).group('domain', 'id')
-        webpage = self._download_webpage(url, video_id)
-
-        iframe_rel_url = self._search_regex(r'''(?i)<iframe\b[^>]+\bsrc\s*=\s*('|")(?P<path>/.*\.html)\1''', webpage, 'iframe', group='path')
-        iframe_url = urljoin('https://' + domain, iframe_rel_url)
-
-        iframe_data = self._download_webpage(iframe_url, video_id)
-        app_version = self._search_regex(r'''<script\b[^>]+\bsrc\s*=\s*["|'].*/app\.min\.(\d+)\.js''', iframe_data, 'app version', fatal=False) or '50'
-
-        video_code = url_basename(iframe_url).rsplit('.')[0]
-
-        length = 12
-        req = '||'.join((generate_random_string(length), video_code, generate_random_string(length), 'streamsb'))
-        ereq = 'https://{0}/sources{1}/{2}'.format(domain, app_version, to_ascii_hex(req))
-
-        video_data = self._download_webpage(ereq, video_id, headers={
-            'Referer': iframe_url,
-            'watchsb': 'sbstream',
-        })
-        player_data = self._parse_json(video_data, video_id)
-        title = player_data['stream_data']['title']
-        formats = self._extract_m3u8_formats(player_data['stream_data']['file'], video_id, ext='mp4', entry_protocol='m3u8_native', m3u8_id='hls', fatal=False)
-        return {
-            'id': video_id,
-            'formats': formats,
-            'title': title,
-        }
diff --git a/youtube_dl/extractor/svt.py b/youtube_dl/extractor/svt.py
index a5bb6daa7..aba9bb447 100644
--- a/youtube_dl/extractor/svt.py
+++ b/youtube_dl/extractor/svt.py
@@ -146,7 +146,7 @@ class SVTPlayIE(SVTPlayBaseIE):
                         )
                         (?P<svt_id>[^/?#&]+)|
                         https?://(?:www\.)?(?:svtplay|oppetarkiv)\.se/(?:video|klipp|kanaler)/(?P<id>[^/?#&]+)
-                        (?:.*?(?:modalId|id)=(?P<modal_id>[\da-zA-Z-]+))?
+                        (?:.*?modalId=(?P<modal_id>[\da-zA-Z-]+))?
                     )
                     '''
     _TESTS = [{
@@ -177,9 +177,6 @@ class SVTPlayIE(SVTPlayBaseIE):
     }, {
         'url': 'https://www.svtplay.se/video/30479064/husdrommar/husdrommar-sasong-8-designdrommar-i-stenungsund?modalId=8zVbDPA',
         'only_matching': True,
-    }, {
-        'url': 'https://www.svtplay.se/video/30684086/rapport/rapport-24-apr-18-00-7?id=e72gVpa',
-        'only_matching': True,
     }, {
         # geo restricted to Sweden
         'url': 'http://www.oppetarkiv.se/video/5219710/trollflojten',
@@ -262,7 +259,7 @@ class SVTPlayIE(SVTPlayBaseIE):
         if not svt_id:
             svt_id = self._search_regex(
                 (r'<video[^>]+data-video-id=["\']([\da-zA-Z-]+)',
-                 r'<[^>]+\bdata-rt=["\']top-area-play-button["\'][^>]+\bhref=["\'][^"\']*video/%s/[^"\']*\b(?:modalId|id)=([\da-zA-Z-]+)' % re.escape(video_id),
+                 r'<[^>]+\bdata-rt=["\']top-area-play-button["\'][^>]+\bhref=["\'][^"\']*video/%s/[^"\']*\bmodalId=([\da-zA-Z-]+)' % re.escape(video_id),
                  r'["\']videoSvtId["\']\s*:\s*["\']([\da-zA-Z-]+)',
                  r'["\']videoSvtId\\?["\']\s*:\s*\\?["\']([\da-zA-Z-]+)',
                  r'"content"\s*:\s*{.*?"id"\s*:\s*"([\da-zA-Z-]+)"',
diff --git a/youtube_dl/extractor/ted.py b/youtube_dl/extractor/ted.py
index f09f1a3f9..63e2455b2 100644
--- a/youtube_dl/extractor/ted.py
+++ b/youtube_dl/extractor/ted.py
@@ -123,10 +123,6 @@ class TEDIE(InfoExtractor):
         'params': {
             'skip_download': True,
         },
-    }, {
-        # with own formats and private Youtube external
-        'url': 'https://www.ted.com/talks/spencer_wells_a_family_tree_for_humanity',
-        'only_matching': True,
     }]
 
     _NATIVE_FORMATS = {
@@ -214,6 +210,16 @@ class TEDIE(InfoExtractor):
 
         player_talk = talk_info['player_talks'][0]
 
+        external = player_talk.get('external')
+        if isinstance(external, dict):
+            service = external.get('service')
+            if isinstance(service, compat_str):
+                ext_url = None
+                if service.lower() == 'youtube':
+                    ext_url = external.get('code')
+
+                return self.url_result(ext_url or external['uri'])
+
         resources_ = player_talk.get('resources') or talk_info.get('resources')
 
         http_url = None
@@ -288,16 +294,6 @@ class TEDIE(InfoExtractor):
                 'vcodec': 'none',
             })
 
-        if not formats:
-            external = player_talk.get('external')
-            if isinstance(external, dict):
-                service = external.get('service')
-                if isinstance(service, compat_str):
-                    ext_url = None
-                    if service.lower() == 'youtube':
-                        ext_url = external.get('code')
-                    return self.url_result(ext_url or external['uri'])
-
         self._sort_formats(formats)
 
         video_id = compat_str(talk_info['id'])
diff --git a/youtube_dl/extractor/tele5.py b/youtube_dl/extractor/tele5.py
index df02dfc47..3e1a7a9e6 100644
--- a/youtube_dl/extractor/tele5.py
+++ b/youtube_dl/extractor/tele5.py
@@ -1,16 +1,19 @@
 # coding: utf-8
 from __future__ import unicode_literals
 
+import re
+
+from .common import InfoExtractor
+from .jwplatform import JWPlatformIE
+from .nexx import NexxIE
 from ..compat import compat_urlparse
 from ..utils import (
-    ExtractorError,
-    extract_attributes,
+    NO_DEFAULT,
+    smuggle_url,
 )
 
-from .dplay import DPlayIE
 
-
-class Tele5IE(DPlayIE):
+class Tele5IE(InfoExtractor):
     _VALID_URL = r'https?://(?:www\.)?tele5\.de/(?:[^/]+/)*(?P<id>[^/?#&]+)'
     _GEO_COUNTRIES = ['DE']
     _TESTS = [{
@@ -25,7 +28,6 @@ class Tele5IE(DPlayIE):
         'params': {
             'skip_download': True,
         },
-        'skip': 'No longer available: "404 Seite nicht gefunden"',
     }, {
         # jwplatform, nexx unavailable
         'url': 'https://www.tele5.de/filme/ghoul-das-geheimnis-des-friedhofmonsters/',
@@ -40,20 +42,7 @@ class Tele5IE(DPlayIE):
         'params': {
             'skip_download': True,
         },
-        'skip': 'No longer available, redirects to Filme page',
-    }, {
-        'url': 'https://tele5.de/mediathek/angel-of-mine/',
-        'info_dict': {
-            'id': '1252360',
-            'ext': 'mp4',
-            'upload_date': '20220109',
-            'timestamp': 1641762000,
-            'title': 'Angel of Mine',
-            'description': 'md5:a72546a175e1286eb3251843a52d1ad7',
-        },
-        'params': {
-            'format': 'bestvideo',
-        },
+        'add_ie': [JWPlatformIE.ie_key()],
     }, {
         'url': 'https://www.tele5.de/kalkofes-mattscheibe/video-clips/politik-und-gesellschaft?ve_id=1551191',
         'only_matching': True,
@@ -75,18 +64,45 @@ class Tele5IE(DPlayIE):
     }]
 
     def _real_extract(self, url):
-        video_id = self._match_id(url)
-        webpage = self._download_webpage(url, video_id)
-        player_element = self._search_regex(r'(<hyoga-player\b[^>]+?>)', webpage, 'video player')
-        player_info = extract_attributes(player_element)
-        asset_id, country, realm = (player_info[x] for x in ('assetid', 'locale', 'realm', ))
-        endpoint = compat_urlparse.urlparse(player_info['endpoint']).hostname
-        source_type = player_info.get('sourcetype')
-        if source_type:
-            endpoint = '%s-%s' % (source_type, endpoint)
-        try:
-            return self._get_disco_api_info(url, asset_id, endpoint, realm, country)
-        except ExtractorError as e:
-            if getattr(e, 'message', '') == 'Missing deviceId in context':
-                raise ExtractorError('DRM protected', cause=e, expected=True)
-            raise
+        qs = compat_urlparse.parse_qs(compat_urlparse.urlparse(url).query)
+        video_id = (qs.get('vid') or qs.get('ve_id') or [None])[0]
+
+        NEXX_ID_RE = r'\d{6,}'
+        JWPLATFORM_ID_RE = r'[a-zA-Z0-9]{8}'
+
+        def nexx_result(nexx_id):
+            return self.url_result(
+                'https://api.nexx.cloud/v3/759/videos/byid/%s' % nexx_id,
+                ie=NexxIE.ie_key(), video_id=nexx_id)
+
+        nexx_id = jwplatform_id = None
+
+        if video_id:
+            if re.match(NEXX_ID_RE, video_id):
+                return nexx_result(video_id)
+            elif re.match(JWPLATFORM_ID_RE, video_id):
+                jwplatform_id = video_id
+
+        if not nexx_id:
+            display_id = self._match_id(url)
+            webpage = self._download_webpage(url, display_id)
+
+            def extract_id(pattern, name, default=NO_DEFAULT):
+                return self._html_search_regex(
+                    (r'id\s*=\s*["\']video-player["\'][^>]+data-id\s*=\s*["\'](%s)' % pattern,
+                     r'\s+id\s*=\s*["\']player_(%s)' % pattern,
+                     r'\bdata-id\s*=\s*["\'](%s)' % pattern), webpage, name,
+                    default=default)
+
+            nexx_id = extract_id(NEXX_ID_RE, 'nexx id', default=None)
+            if nexx_id:
+                return nexx_result(nexx_id)
+
+            if not jwplatform_id:
+                jwplatform_id = extract_id(JWPLATFORM_ID_RE, 'jwplatform id')
+
+        return self.url_result(
+            smuggle_url(
+                'jwplatform:%s' % jwplatform_id,
+                {'geo_countries': self._GEO_COUNTRIES}),
+            ie=JWPlatformIE.ie_key(), video_id=jwplatform_id)
diff --git a/youtube_dl/extractor/telegraaf.py b/youtube_dl/extractor/telegraaf.py
index 5174898f2..2dc020537 100644
--- a/youtube_dl/extractor/telegraaf.py
+++ b/youtube_dl/extractor/telegraaf.py
@@ -34,9 +34,7 @@ class TelegraafIE(InfoExtractor):
         article_id = self._match_id(url)
 
         video_id = self._download_json(
-            'https://app.telegraaf.nl/graphql', article_id,
-            headers={'User-Agent': 'De Telegraaf/6.8.11 (Android 11; en_US)'},
-            query={
+            'https://www.telegraaf.nl/graphql', article_id, query={
                 'query': '''{
   article(uid: %s) {
     videos {
diff --git a/youtube_dl/extractor/telewebion.py b/youtube_dl/extractor/telewebion.py
index 30192d74e..1207b1a1b 100644
--- a/youtube_dl/extractor/telewebion.py
+++ b/youtube_dl/extractor/telewebion.py
@@ -3,23 +3,17 @@ from __future__ import unicode_literals
 
 from .common import InfoExtractor
 
-from ..utils import (
-    float_or_none,
-    int_or_none,
-    url_or_none,
-)
-
 
 class TelewebionIE(InfoExtractor):
-    _VALID_URL = r'https?://(?:www\.)?telewebion\.com/(episode|clip)/(?P<id>[a-zA-Z0-9]+)'
+    _VALID_URL = r'https?://(?:www\.)?telewebion\.com/#!/episode/(?P<id>\d+)'
 
     _TEST = {
-        'url': 'http://www.telewebion.com/episode/0x1b3139c/',
+        'url': 'http://www.telewebion.com/#!/episode/1263668/',
         'info_dict': {
-            'id': '0x1b3139c',
+            'id': '1263668',
             'ext': 'mp4',
             'title': 'قرعه\u200cکشی لیگ قهرمانان اروپا',
-            'thumbnail': r're:^https?://static\.telewebion\.com/episodeImages/.*/default',
+            'thumbnail': r're:^https?://.*\.jpg',
             'view_count': int,
         },
         'params': {
@@ -31,24 +25,31 @@ class TelewebionIE(InfoExtractor):
     def _real_extract(self, url):
         video_id = self._match_id(url)
 
-        episode_details = self._download_json('https://gateway.telewebion.ir/kandoo/episode/getEpisodeDetail/?EpisodeId={0}'.format(video_id), video_id)
-        episode_details = episode_details['body']['queryEpisode'][0]
+        secure_token = self._download_webpage(
+            'http://m.s2.telewebion.com/op/op?action=getSecurityToken', video_id)
+        episode_details = self._download_json(
+            'http://m.s2.telewebion.com/op/op', video_id,
+            query={'action': 'getEpisodeDetails', 'episode_id': video_id})
 
-        channel_id = episode_details['channel']['descriptor']
-        episode_image_id = episode_details.get('image')
-        episode_image = 'https://static.telewebion.com/episodeImages/{0}/default'.format(episode_image_id) if episode_image_id else None
-
-        m3u8_url = 'https://cdna.telewebion.com/{0}/episode/{1}/playlist.m3u8'.format(channel_id, video_id)
+        m3u8_url = 'http://m.s1.telewebion.com/smil/%s.m3u8?filepath=%s&m3u8=1&secure_token=%s' % (
+            video_id, episode_details['file_path'], secure_token)
         formats = self._extract_m3u8_formats(
-            m3u8_url, video_id, ext='mp4', m3u8_id='hls',
-            entry_protocol='m3u8_native')
-        self._sort_formats(formats)
+            m3u8_url, video_id, ext='mp4', m3u8_id='hls')
+
+        picture_paths = [
+            episode_details.get('picture_path'),
+            episode_details.get('large_picture_path'),
+        ]
+
+        thumbnails = [{
+            'url': picture_path,
+            'preference': idx,
+        } for idx, picture_path in enumerate(picture_paths) if picture_path is not None]
 
         return {
             'id': video_id,
             'title': episode_details['title'],
             'formats': formats,
-            'thumbnail': url_or_none(episode_image),
-            'view_count': int_or_none(episode_details.get('view_count')),
-            'duration': float_or_none(episode_details.get('duration')),
+            'thumbnails': thumbnails,
+            'view_count': episode_details.get('view_count'),
         }
diff --git a/youtube_dl/extractor/thisvid.py b/youtube_dl/extractor/thisvid.py
deleted file mode 100644
index bc4bcb2d1..000000000
--- a/youtube_dl/extractor/thisvid.py
+++ /dev/null
@@ -1,218 +0,0 @@
-# coding: utf-8
-from __future__ import unicode_literals
-
-import re
-import itertools
-
-from .common import InfoExtractor
-from ..compat import (
-    compat_urlparse,
-)
-from ..utils import (
-    clean_html,
-    get_element_by_class,
-    int_or_none,
-    merge_dicts,
-    url_or_none,
-    urljoin,
-)
-
-
-class ThisVidIE(InfoExtractor):
-    _VALID_URL = r'https?://(?:www\.)?thisvid\.com/(?P<type>videos|embed)/(?P<id>[A-Za-z0-9-]+)'
-    _TESTS = [{
-        'url': 'https://thisvid.com/videos/sitting-on-ball-tight-jeans/',
-        'md5': '839becb572995687e11a69dc4358a386',
-        'info_dict': {
-            'id': '3533241',
-            'ext': 'mp4',
-            'title': 'Sitting on ball tight jeans',
-            'description': 'md5:372353bb995883d1b65fddf507489acd',
-            'thumbnail': r're:https?://\w+\.thisvid\.com/(?:[^/]+/)+3533241/preview\.jpg',
-            'uploader_id': '150629',
-            'uploader': 'jeanslevisjeans',
-            'age_limit': 18,
-        }
-    }, {
-        'url': 'https://thisvid.com/embed/3533241/',
-        'md5': '839becb572995687e11a69dc4358a386',
-        'info_dict': {
-            'id': '3533241',
-            'ext': 'mp4',
-            'title': 'Sitting on ball tight jeans',
-            'thumbnail': r're:https?://\w+\.thisvid\.com/(?:[^/]+/)+3533241/preview\.jpg',
-            'uploader_id': '150629',
-            'uploader': 'jeanslevisjeans',
-            'age_limit': 18,
-        }
-    }]
-
-    def _real_extract(self, url):
-        main_id, type_ = re.match(self._VALID_URL, url).group('id', 'type')
-        webpage = self._download_webpage(url, main_id)
-
-        title = self._html_search_regex(
-            r'<title\b[^>]*?>(?:Video:\s+)?(.+?)(?:\s+-\s+ThisVid(?:\.com| tube))?</title>',
-            webpage, 'title')
-
-        if type_ == 'embed':
-            # look for more metadata
-            video_alt_url = url_or_none(self._search_regex(
-                r'''video_alt_url\s*:\s+'(%s/)',''' % (self._VALID_URL, ),
-                webpage, 'video_alt_url', default=None))
-            if video_alt_url and video_alt_url != url:
-                webpage = self._download_webpage(
-                    video_alt_url, main_id,
-                    note='Redirecting embed to main page', fatal=False) or webpage
-
-        video_holder = get_element_by_class('video-holder', webpage) or ''
-        if '>This video is a private video' in video_holder:
-            self.raise_login_required(
-                (clean_html(video_holder) or 'Private video').split('\n', 1)[0])
-
-        uploader = self._html_search_regex(
-            r'''(?s)<span\b[^>]*>Added by:\s*</span><a\b[^>]+\bclass\s*=\s*["']author\b[^>]+\bhref\s*=\s*["']https://thisvid\.com/members/([0-9]+/.{3,}?)\s*</a>''',
-            webpage, 'uploader', default='')
-        uploader = re.split(r'''/["'][^>]*>\s*''', uploader)
-        if len(uploader) == 2:
-            # id must be non-empty, uploader could be ''
-            uploader_id, uploader = uploader
-            uploader = uploader or None
-        else:
-            uploader_id = uploader = None
-
-        return merge_dicts({
-            '_type': 'url_transparent',
-            'title': title,
-            'age_limit': 18,
-            'uploader': uploader,
-            'uploader_id': uploader_id,
-        }, self.url_result(url, ie='Generic'))
-
-
-class ThisVidMemberIE(InfoExtractor):
-    _VALID_URL = r'https?://thisvid\.com/members/(?P<id>\d+)'
-    _TESTS = [{
-        'url': 'https://thisvid.com/members/2140501/',
-        'info_dict': {
-            'id': '2140501',
-            'title': 'Rafflesia\'s Profile',
-        },
-        'playlist_mincount': 16,
-    }, {
-        'url': 'https://thisvid.com/members/2140501/favourite_videos/',
-        'info_dict': {
-            'id': '2140501',
-            'title': 'Rafflesia\'s Favourite Videos',
-        },
-        'playlist_mincount': 15,
-    }, {
-        'url': 'https://thisvid.com/members/636468/public_videos/',
-        'info_dict': {
-            'id': '636468',
-            'title': 'Happymouth\'s Public Videos',
-        },
-        'playlist_mincount': 196,
-    },
-    ]
-
-    def _urls(self, html):
-        for m in re.finditer(r'''<a\b[^>]+\bhref\s*=\s*["'](?P<url>%s\b)[^>]+>''' % (ThisVidIE._VALID_URL, ), html):
-            yield m.group('url')
-
-    def _real_extract(self, url):
-        pl_id = self._match_id(url)
-        webpage = self._download_webpage(url, pl_id)
-
-        title = re.split(
-            r'(?i)\s*\|\s*ThisVid\.com\s*$',
-            self._og_search_title(webpage, default=None) or self._html_search_regex(r'(?s)<title\b[^>]*>(.+?)</title', webpage, 'title', fatal=False) or '', 1)[0] or None
-
-        def entries(page_url, html=None):
-            for page in itertools.count(1):
-                if not html:
-                    html = self._download_webpage(
-                        page_url, pl_id, note='Downloading page %d' % (page, ),
-                        fatal=False) or ''
-                for u in self._urls(html):
-                    yield u
-                next_page = get_element_by_class('pagination-next', html) or ''
-                if next_page:
-                    # member list page
-                    next_page = urljoin(url, self._search_regex(
-                        r'''<a\b[^>]+\bhref\s*=\s*("|')(?P<url>(?!#)(?:(?!\1).)+)''',
-                        next_page, 'next page link', group='url', default=None))
-                # in case a member page should have pagination-next with empty link, not just `else:`
-                if next_page is None:
-                    # playlist page
-                    parsed_url = compat_urlparse.urlparse(page_url)
-                    base_path, num = parsed_url.path.rsplit('/', 1)
-                    num = int_or_none(num)
-                    if num is None:
-                        base_path, num = parsed_url.path.rstrip('/'), 1
-                    parsed_url = parsed_url._replace(path=base_path + ('/%d' % (num + 1, )))
-                    next_page = compat_urlparse.urlunparse(parsed_url)
-                    if page_url == next_page:
-                        next_page = None
-                if not next_page:
-                    break
-                page_url, html = next_page, None
-
-        return self.playlist_from_matches(
-            entries(url, webpage), playlist_id=pl_id, playlist_title=title, ie='ThisVid')
-
-
-class ThisVidPlaylistIE(ThisVidMemberIE):
-    _VALID_URL = r'https?://thisvid\.com/playlist/(?P<id>\d+)/video/(?P<video_id>[A-Za-z0-9-]+)'
-    _TESTS = [{
-        'url': 'https://thisvid.com/playlist/6615/video/big-italian-booty-28/',
-        'info_dict': {
-            'id': '6615',
-            'title': 'Underwear Stuff',
-        },
-        'playlist_mincount': 200,
-    }, {
-        'url': 'https://thisvid.com/playlist/6615/video/big-italian-booty-28/',
-        'info_dict': {
-            'id': '1072387',
-            'ext': 'mp4',
-            'title': 'Big Italian Booty 28',
-            'description': 'md5:1bccf7b13765e18fb27bf764dba7ede2',
-            'uploader_id': '367912',
-            'uploader': 'Jcmusclefun',
-            'age_limit': 18,
-        },
-        'params': {
-            'noplaylist': True,
-        },
-    }]
-
-    def _get_video_url(self, pl_url):
-        video_id = re.match(self._VALID_URL, pl_url).group('video_id')
-        return urljoin(pl_url, '/videos/%s/' % (video_id, ))
-
-    def _urls(self, html):
-        for m in re.finditer(r'''<a\b[^>]+\bhref\s*=\s*["'](?P<url>%s\b)[^>]+>''' % (self._VALID_URL, ), html):
-            yield self._get_video_url(m.group('url'))
-
-    def _real_extract(self, url):
-        pl_id = self._match_id(url)
-
-        if self._downloader.params.get('noplaylist'):
-            self.to_screen('Downloading just the featured video because of --no-playlist')
-            return self.url_result(self._get_video_url(url), 'ThisVid')
-
-        self.to_screen(
-            'Downloading playlist %s - add --no-playlist to download just the featured video' % (pl_id, ))
-        result = super(ThisVidPlaylistIE, self)._real_extract(url)
-
-        # rework title returned as `the title - the title`
-        title = result['title']
-        t_len = len(title)
-        if t_len > 5 and t_len % 2 != 0:
-            t_len = t_len // 2
-            if title[t_len] == '-':
-                title = [t.strip() for t in (title[:t_len], title[t_len + 1:])]
-                if title[0] and title[0] == title[1]:
-                    result['title'] = title[0]
-        return result
diff --git a/youtube_dl/extractor/tv2dk.py b/youtube_dl/extractor/tv2dk.py
index ec5cbdf03..8bda9348d 100644
--- a/youtube_dl/extractor/tv2dk.py
+++ b/youtube_dl/extractor/tv2dk.py
@@ -41,16 +41,8 @@ class TV2DKIE(InfoExtractor):
             'duration': 1347,
             'view_count': int,
         },
-        'add_ie': ['Kaltura'],
-    }, {
-        'url': 'https://www.tv2lorry.dk/gadekamp/gadekamp-6-hoejhuse-i-koebenhavn',
-        'info_dict': {
-            'id': '1_7iwll9n0',
-            'ext': 'mp4',
-            'upload_date': '20211027',
-            'title': 'Gadekamp #6 - Højhuse i København',
-            'uploader_id': 'tv2lorry',
-            'timestamp': 1635345229,
+        'params': {
+            'skip_download': True,
         },
         'add_ie': ['Kaltura'],
     }, {
@@ -82,12 +74,6 @@ class TV2DKIE(InfoExtractor):
         webpage = self._download_webpage(url, video_id)
 
         entries = []
-
-        def add_entry(partner_id, kaltura_id):
-            entries.append(self.url_result(
-                'kaltura:%s:%s' % (partner_id, kaltura_id), 'Kaltura',
-                video_id=kaltura_id))
-
         for video_el in re.findall(r'(?s)<[^>]+\bdata-entryid\s*=[^>]*>', webpage):
             video = extract_attributes(video_el)
             kaltura_id = video.get('data-entryid')
@@ -96,17 +82,9 @@ class TV2DKIE(InfoExtractor):
             partner_id = video.get('data-partnerid')
             if not partner_id:
                 continue
-            add_entry(partner_id, kaltura_id)
-        if not entries:
-            kaltura_id = self._search_regex(
-                (r'entry_id\s*:\s*["\']([0-9a-z_]+)',
-                 r'\\u002FentryId\\u002F(\w+)\\u002F'), webpage, 'kaltura id')
-            partner_id = self._search_regex(
-                (r'\\u002Fp\\u002F(\d+)\\u002F', r'/p/(\d+)/'), webpage,
-                'partner id')
-            add_entry(partner_id, kaltura_id)
-        if len(entries) == 1:
-            return entries[0]
+            entries.append(self.url_result(
+                'kaltura:%s:%s' % (partner_id, kaltura_id), 'Kaltura',
+                video_id=kaltura_id))
         return self.playlist_result(entries)
 
 
diff --git a/youtube_dl/extractor/tver.py b/youtube_dl/extractor/tver.py
index a4a30b1e6..a54f49319 100644
--- a/youtube_dl/extractor/tver.py
+++ b/youtube_dl/extractor/tver.py
@@ -9,6 +9,7 @@ from ..utils import (
     int_or_none,
     remove_start,
     smuggle_url,
+    strip_or_none,
     try_get,
 )
 
@@ -44,18 +45,32 @@ class TVerIE(InfoExtractor):
             query={'token': self._TOKEN})['main']
         p_id = main['publisher_id']
         service = remove_start(main['service'], 'ts_')
-
-        r_id = main['reference_id']
-        if service not in ('tx', 'russia2018', 'sebare2018live', 'gorin'):
-            r_id = 'ref:' + r_id
-        bc_url = smuggle_url(
-            self.BRIGHTCOVE_URL_TEMPLATE % (p_id, r_id),
-            {'geo_countries': ['JP']})
-
-        return {
+        info = {
             '_type': 'url_transparent',
             'description': try_get(main, lambda x: x['note'][0]['text'], compat_str),
             'episode_number': int_or_none(try_get(main, lambda x: x['ext']['episode_number'])),
-            'url': bc_url,
-            'ie_key': 'BrightcoveNew',
         }
+
+        if service == 'cx':
+            title = main['title']
+            subtitle = strip_or_none(main.get('subtitle'))
+            if subtitle:
+                title += ' - ' + subtitle
+            info.update({
+                'title': title,
+                'url': 'https://i.fod.fujitv.co.jp/plus7/web/%s/%s.html' % (p_id[:4], p_id),
+                'ie_key': 'FujiTVFODPlus7',
+            })
+        else:
+            r_id = main['reference_id']
+            if service not in ('tx', 'russia2018', 'sebare2018live', 'gorin'):
+                r_id = 'ref:' + r_id
+            bc_url = smuggle_url(
+                self.BRIGHTCOVE_URL_TEMPLATE % (p_id, r_id),
+                {'geo_countries': ['JP']})
+            info.update({
+                'url': bc_url,
+                'ie_key': 'BrightcoveNew',
+            })
+
+        return info
diff --git a/youtube_dl/extractor/twitch.py b/youtube_dl/extractor/twitch.py
index a378bd6dc..a7867f4d3 100644
--- a/youtube_dl/extractor/twitch.py
+++ b/youtube_dl/extractor/twitch.py
@@ -49,7 +49,6 @@ class TwitchBaseIE(InfoExtractor):
         'ChannelCollectionsContent': '07e3691a1bad77a36aba590c351180439a40baefc1c275356f40fc7082419a84',
         'StreamMetadata': '1c719a40e481453e5c48d9bb585d971b8b372f8ebb105b17076722264dfa5b3e',
         'ComscoreStreamingQuery': 'e1edae8122517d013405f237ffcc124515dc6ded82480a88daef69c83b53ac01',
-        'VideoAccessToken_Clip': '36b89d2507fce29e5ca551df756d27c1cfe079e2609642b4390aa4c35796eb11',
         'VideoPreviewOverlay': '3006e77e51b128d838fa4e835723ca4dc9a05c5efd4466c1085215c6e437e65c',
         'VideoMetadata': '226edb3e692509f727fd56821f5653c05740242c82b0388883e0c0e75dcbf687',
     }
@@ -894,25 +893,7 @@ class TwitchClipsIE(TwitchBaseIE):
     def _real_extract(self, url):
         video_id = self._match_id(url)
 
-        clip = self._download_gql(
-            video_id, [{
-                'operationName': 'VideoAccessToken_Clip',
-                'variables': {
-                    'slug': video_id,
-                },
-            }],
-            'Downloading clip access token GraphQL')[0]['data']['clip']
-
-        if not clip:
-            raise ExtractorError(
-                'This clip is no longer available', expected=True)
-
-        access_query = {
-            'sig': clip['playbackAccessToken']['signature'],
-            'token': clip['playbackAccessToken']['value'],
-        }
-
-        data = self._download_base_gql(
+        clip = self._download_base_gql(
             video_id, {
                 'query': '''{
   clip(slug: "%s") {
@@ -937,10 +918,11 @@ class TwitchClipsIE(TwitchBaseIE):
     }
     viewCount
   }
-}''' % video_id}, 'Downloading clip GraphQL', fatal=False)
+}''' % video_id}, 'Downloading clip GraphQL')['data']['clip']
 
-        if data:
-            clip = try_get(data, lambda x: x['data']['clip'], dict) or clip
+        if not clip:
+            raise ExtractorError(
+                'This clip is no longer available', expected=True)
 
         formats = []
         for option in clip.get('videoQualities', []):
@@ -950,7 +932,7 @@ class TwitchClipsIE(TwitchBaseIE):
             if not source:
                 continue
             formats.append({
-                'url': update_url_query(source, access_query),
+                'url': source,
                 'format_id': option.get('quality'),
                 'height': int_or_none(option.get('quality')),
                 'fps': int_or_none(option.get('frameRate')),
diff --git a/youtube_dl/extractor/twitter.py b/youtube_dl/extractor/twitter.py
index cfa7a7326..ed495f297 100644
--- a/youtube_dl/extractor/twitter.py
+++ b/youtube_dl/extractor/twitter.py
@@ -19,7 +19,6 @@ from ..utils import (
     strip_or_none,
     unified_timestamp,
     update_url_query,
-    url_or_none,
     xpath_text,
 )
 
@@ -53,9 +52,6 @@ class TwitterBaseIE(InfoExtractor):
             return [f]
 
     def _extract_formats_from_vmap_url(self, vmap_url, video_id):
-        vmap_url = url_or_none(vmap_url)
-        if not vmap_url:
-            return []
         vmap_data = self._download_xml(vmap_url, video_id)
         formats = []
         urls = []
diff --git a/youtube_dl/extractor/uktvplay.py b/youtube_dl/extractor/uktvplay.py
index 9ef9638cd..f28fd514d 100644
--- a/youtube_dl/extractor/uktvplay.py
+++ b/youtube_dl/extractor/uktvplay.py
@@ -5,7 +5,7 @@ from .common import InfoExtractor
 
 
 class UKTVPlayIE(InfoExtractor):
-    _VALID_URL = r'https?://uktvplay\.(?:uktv\.)?co\.uk/(?:.+?\?.*?\bvideo=|([^/]+/)*watch-online/)(?P<id>\d+)'
+    _VALID_URL = r'https?://uktvplay\.uktv\.co\.uk/(?:.+?\?.*?\bvideo=|([^/]+/)*watch-online/)(?P<id>\d+)'
     _TESTS = [{
         'url': 'https://uktvplay.uktv.co.uk/shows/world-at-war/c/200/watch-online/?video=2117008346001',
         'info_dict': {
diff --git a/youtube_dl/extractor/umg.py b/youtube_dl/extractor/umg.py
index 47948b6ce..d815cd9a6 100644
--- a/youtube_dl/extractor/umg.py
+++ b/youtube_dl/extractor/umg.py
@@ -28,7 +28,7 @@ class UMGDeIE(InfoExtractor):
     def _real_extract(self, url):
         video_id = self._match_id(url)
         video_data = self._download_json(
-            'https://graphql.universal-music.de/',
+            'https://api.universal-music.de/graphql',
             video_id, query={
                 'query': '''{
   universalMusic(channel:16) {
@@ -56,9 +56,11 @@ class UMGDeIE(InfoExtractor):
         formats = []
 
         def add_m3u8_format(format_id):
-            formats.extend(self._extract_m3u8_formats(
+            m3u8_formats = self._extract_m3u8_formats(
                 hls_url_template % format_id, video_id, 'mp4',
-                'm3u8_native', m3u8_id='hls', fatal=False))
+                'm3u8_native', m3u8_id='hls', fatal='False')
+            if m3u8_formats and m3u8_formats[0].get('height'):
+                formats.extend(m3u8_formats)
 
         for f in video_data.get('formats', []):
             f_url = f.get('url')
diff --git a/youtube_dl/extractor/uol.py b/youtube_dl/extractor/uol.py
index 59f8e5dc3..628adf219 100644
--- a/youtube_dl/extractor/uol.py
+++ b/youtube_dl/extractor/uol.py
@@ -95,6 +95,7 @@ class UOLIE(InfoExtractor):
                 if v:
                     query[k] = v
             f_url = update_url_query(f_url, query)
+            format_id = format_id
             if format_id == 'HLS':
                 m3u8_formats = self._extract_m3u8_formats(
                     f_url, media_id, 'mp4', 'm3u8_native',
diff --git a/youtube_dl/extractor/urplay.py b/youtube_dl/extractor/urplay.py
index abd2bee84..d6c79147e 100644
--- a/youtube_dl/extractor/urplay.py
+++ b/youtube_dl/extractor/urplay.py
@@ -4,11 +4,7 @@ from __future__ import unicode_literals
 from .common import InfoExtractor
 from ..utils import (
     dict_get,
-    ExtractorError,
     int_or_none,
-    ISO639Utils,
-    parse_age_limit,
-    try_get,
     unified_timestamp,
 )
 
@@ -27,10 +23,9 @@ class URPlayIE(InfoExtractor):
             'upload_date': '20171214',
             'series': 'UR Samtiden - Livet, universum och rymdens märkliga musik',
             'duration': 2269,
-            'categories': ['Vetenskap & teknik'],
+            'categories': ['Kultur & historia'],
             'tags': ['Kritiskt tänkande', 'Vetenskap', 'Vetenskaplig verksamhet'],
             'episode': 'Om vetenskap, kritiskt tänkande och motstånd',
-            'age_limit': 15,
         },
     }, {
         'url': 'https://urskola.se/Produkter/190031-Tripp-Trapp-Trad-Sovkudde',
@@ -55,19 +50,11 @@ class URPlayIE(InfoExtractor):
         video_id = self._match_id(url)
         url = url.replace('skola.se/Produkter', 'play.se/program')
         webpage = self._download_webpage(url, video_id)
-        urplayer_data = self._search_regex(
-            r'(?s)\bid\s*=\s*"__NEXT_DATA__"[^>]*>\s*({.+?})\s*</script',
-            webpage, 'urplayer next data', fatal=False) or {}
-        if urplayer_data:
-            urplayer_data = self._parse_json(urplayer_data, video_id, fatal=False)
-            urplayer_data = try_get(urplayer_data, lambda x: x['props']['pageProps']['program'], dict)
-            if not urplayer_data:
-                raise ExtractorError('Unable to parse __NEXT_DATA__')
-        else:
-            accessible_episodes = self._parse_json(self._html_search_regex(
-                r'data-react-class="routes/Product/components/ProgramContainer/ProgramContainer"[^>]+data-react-props="({.+?})"',
-                webpage, 'urplayer data'), video_id)['accessibleEpisodes']
-            urplayer_data = next(e for e in accessible_episodes if e.get('id') == int_or_none(video_id))
+        vid = int(video_id)
+        accessible_episodes = self._parse_json(self._html_search_regex(
+            r'data-react-class="routes/Product/components/ProgramContainer/ProgramContainer"[^>]+data-react-props="({.+?})"',
+            webpage, 'urplayer data'), video_id)['accessibleEpisodes']
+        urplayer_data = next(e for e in accessible_episodes if e.get('id') == vid)
         episode = urplayer_data['title']
         raw_streaming_info = urplayer_data['streamingInfo']['raw']
         host = self._download_json(
@@ -85,30 +72,6 @@ class URPlayIE(InfoExtractor):
                     video_id, skip_protocols=['f4m', 'rtmp', 'rtsp']))
         self._sort_formats(formats)
 
-        subtitles = {}
-
-        def parse_lang_code(code):
-            "3-character language code or None (utils candidate)"
-            if code is None:
-                return
-            lang = code.lower()
-            if not ISO639Utils.long2short(lang):
-                lang = ISO639Utils.short2long(lang)
-            return lang or None
-
-        for k, v in (urplayer_data['streamingInfo'].get('sweComplete') or {}).items():
-            if (k in ('sd', 'hd') or not isinstance(v, dict)):
-                continue
-            lang, sttl_url = (v.get(kk) for kk in ('language', 'location', ))
-            if not sttl_url:
-                continue
-            lang = parse_lang_code(lang)
-            if not lang:
-                continue
-            sttl = subtitles.get(lang) or []
-            sttl.append({'ext': k, 'url': sttl_url, })
-            subtitles[lang] = sttl
-
         image = urplayer_data.get('image') or {}
         thumbnails = []
         for k, v in image.items():
@@ -141,7 +104,4 @@ class URPlayIE(InfoExtractor):
             'season': series.get('label'),
             'episode': episode,
             'episode_number': int_or_none(urplayer_data.get('episodeNumber')),
-            'age_limit': parse_age_limit(min(try_get(a, lambda x: x['from'], int) or 0
-                                             for a in urplayer_data.get('ageRanges', []))),
-            'subtitles': subtitles,
         }
diff --git a/youtube_dl/extractor/ustream.py b/youtube_dl/extractor/ustream.py
index 1e29cbe22..9e860aeb7 100644
--- a/youtube_dl/extractor/ustream.py
+++ b/youtube_dl/extractor/ustream.py
@@ -75,7 +75,7 @@ class UstreamIE(InfoExtractor):
     @staticmethod
     def _extract_url(webpage):
         mobj = re.search(
-            r'<iframe[^>]+?src=(["\'])(?P<url>https?://(?:www\.)?(?:ustream\.tv|video\.ibm\.com)/embed/.+?)\1', webpage)
+            r'<iframe[^>]+?src=(["\'])(?P<url>http://(?:www\.)?(?:ustream\.tv|video\.ibm\.com)/embed/.+?)\1', webpage)
         if mobj is not None:
             return mobj.group('url')
 
diff --git a/youtube_dl/extractor/vbox7.py b/youtube_dl/extractor/vbox7.py
index 1c0b77074..8152acefd 100644
--- a/youtube_dl/extractor/vbox7.py
+++ b/youtube_dl/extractor/vbox7.py
@@ -2,22 +2,9 @@
 from __future__ import unicode_literals
 
 import re
-import time
 
 from .common import InfoExtractor
-from ..compat import compat_kwargs
-from ..utils import (
-    base_url,
-    determine_ext,
-    ExtractorError,
-    float_or_none,
-    merge_dicts,
-    T,
-    traverse_obj,
-    txt_or_none,
-    url_basename,
-    url_or_none,
-)
+from ..utils import ExtractorError
 
 
 class Vbox7IE(InfoExtractor):
@@ -33,27 +20,23 @@ class Vbox7IE(InfoExtractor):
                         )
                         (?P<id>[\da-fA-F]+)
                     '''
-    _EMBED_REGEX = [r'<iframe[^>]+src=(?P<q>["\'])(?P<url>(?:https?:)?//vbox7\.com/emb/external\.php.+?)(?P=q)']
     _GEO_COUNTRIES = ['BG']
     _TESTS = [{
-        # the http: URL just redirects here
-        'url': 'https://vbox7.com/play:0946fff23c',
-        'md5': '50ca1f78345a9c15391af47d8062d074',
+        'url': 'http://vbox7.com/play:0946fff23c',
+        'md5': 'a60f9ab3a3a2f013ef9a967d5f7be5bf',
         'info_dict': {
             'id': '0946fff23c',
             'ext': 'mp4',
             'title': 'Борисов: Притеснен съм за бъдещето на България',
             'description': 'По думите му е опасно страната ни да бъде обявена за "сигурна"',
+            'thumbnail': r're:^https?://.*\.jpg$',
             'timestamp': 1470982814,
             'upload_date': '20160812',
             'uploader': 'zdraveibulgaria',
-            'thumbnail': r're:^https?://.*\.jpg$',
-            'view_count': int,
-            'duration': 2640,
         },
-        'expected_warnings': [
-            'Unable to download webpage',
-        ],
+        'params': {
+            'proxy': '127.0.0.1:8118',
+        },
     }, {
         'url': 'http://vbox7.com/play:249bb972c2',
         'md5': '99f65c0c9ef9b682b97313e052734c3f',
@@ -61,15 +44,8 @@ class Vbox7IE(InfoExtractor):
             'id': '249bb972c2',
             'ext': 'mp4',
             'title': 'Смях! Чудо - чист за секунди - Скрита камера',
-            'description': 'Смях! Чудо - чист за секунди - Скрита камера',
-            'timestamp': 1360215023,
-            'upload_date': '20130207',
-            'uploader': 'svideteliat_ot_varshava',
-            'thumbnail': 'https://i49.vbox7.com/o/249/249bb972c20.jpg',
-            'view_count': int,
-            'duration': 83,
         },
-        'expected_warnings': ['Failed to download m3u8 information'],
+        'skip': 'georestricted',
     }, {
         'url': 'http://vbox7.com/emb/external.php?vid=a240d20f9c&autoplay=1',
         'only_matching': True,
@@ -78,127 +54,52 @@ class Vbox7IE(InfoExtractor):
         'only_matching': True,
     }]
 
-    @classmethod
-    def _extract_url(cls, webpage):
-        mobj = re.search(cls._EMBED_REGEX[0], webpage)
+    @staticmethod
+    def _extract_url(webpage):
+        mobj = re.search(
+            r'<iframe[^>]+src=(?P<q>["\'])(?P<url>(?:https?:)?//vbox7\.com/emb/external\.php.+?)(?P=q)',
+            webpage)
         if mobj:
             return mobj.group('url')
 
-    # specialisation to transform what looks like ld+json that
-    # may contain invalid character combinations
-
-    # transform_source=None, fatal=True
-    def _parse_json(self, json_string, video_id, *args, **kwargs):
-        if '"@context"' in json_string[:30]:
-            # this is ld+json, or that's the way to bet
-            transform_source = args[0] if len(args) > 0 else kwargs.get('transform_source')
-            if not transform_source:
-
-                def fix_chars(src):
-                    # fix malformed ld+json: replace raw CRLFs with escaped LFs
-                    return re.sub(
-                        r'"[^"]+"', lambda m: re.sub(r'\r?\n', r'\\n', m.group(0)), src)
-
-                if len(args) > 0:
-                    args = (fix_chars,) + args[1:]
-                else:
-                    kwargs['transform_source'] = fix_chars
-                    kwargs = compat_kwargs(kwargs)
-
-        return super(Vbox7IE, self)._parse_json(
-            json_string, video_id, *args, **kwargs)
-
     def _real_extract(self, url):
         video_id = self._match_id(url)
-        url = 'https://vbox7.com/play:%s' % (video_id,)
 
-        now = time.time()
         response = self._download_json(
-            'https://www.vbox7.com/aj/player/item/options', video_id,
-            query={'vid': video_id}, headers={'Referer': url})
-        # estimate time to which possible `ago` member is relative
-        now = now + 0.5 * (time.time() - now)
+            'https://www.vbox7.com/ajax/video/nextvideo.php?vid=%s' % video_id,
+            video_id)
 
-        if traverse_obj(response, 'error'):
+        if 'error' in response:
             raise ExtractorError(
                 '%s said: %s' % (self.IE_NAME, response['error']), expected=True)
 
-        src_url = traverse_obj(response, ('options', 'src', T(url_or_none))) or ''
+        video = response['options']
 
-        fmt_base = url_basename(src_url).rsplit('.', 1)[0].rsplit('_', 1)[0]
-        if fmt_base in ('na', 'vn'):
+        title = video['title']
+        video_url = video['src']
+
+        if '/na.mp4' in video_url:
             self.raise_geo_restricted(countries=self._GEO_COUNTRIES)
 
-        ext = determine_ext(src_url)
-        if ext == 'mpd':
-            # extract MPD
-            try:
-                formats, subtitles = self._extract_mpd_formats_and_subtitles(
-                    src_url, video_id, 'dash', fatal=False)
-            except KeyError:  # fatal doesn't catch this
-                self.report_warning('Failed to parse MPD manifest')
-                formats, subtitles = [], {}
-        elif ext != 'm3u8':
-            formats = [{
-                'url': src_url,
-            }] if src_url else []
-            subtitles = {}
+        uploader = video.get('uploader')
 
-        if src_url:
-            # possibly extract HLS, based on https://github.com/yt-dlp/yt-dlp/pull/9100
-            fmt_base = base_url(src_url) + fmt_base
-            # prepare for _extract_m3u8_formats_and_subtitles()
-            # hls_formats, hls_subs = self._extract_m3u8_formats_and_subtitles(
-            hls_formats = self._extract_m3u8_formats(
-                '{0}.m3u8'.format(fmt_base), video_id, m3u8_id='hls', fatal=False)
-            formats.extend(hls_formats)
-            # self._merge_subtitles(hls_subs, target=subtitles)
+        webpage = self._download_webpage(
+            'http://vbox7.com/play:%s' % video_id, video_id, fatal=None)
 
-            # In case MPD/HLS cannot be parsed, or anyway, get mp4 combined
-            # formats usually provided to Safari, iOS, and old Windows
-            video = response['options']
-            resolutions = (1080, 720, 480, 240, 144)
-            highest_res = traverse_obj(video, (
-                'highestRes', T(int))) or resolutions[0]
-            resolutions = traverse_obj(video, (
-                'resolutions', lambda _, r: highest_res >= int(r) > 0)) or resolutions
-            mp4_formats = traverse_obj(resolutions, (
-                Ellipsis, T(lambda res: {
-                    'url': '{0}_{1}.mp4'.format(fmt_base, res),
-                    'format_id': 'http-{0}'.format(res),
-                    'height': res,
-                })))
-            # if above formats are flaky, enable the line below
-            # self._check_formats(mp4_formats, video_id)
-            formats.extend(mp4_formats)
+        info = {}
 
-        self._sort_formats(formats)
+        if webpage:
+            info = self._search_json_ld(
+                webpage.replace('"/*@context"', '"@context"'), video_id,
+                fatal=False)
 
-        webpage = self._download_webpage(url, video_id, fatal=False) or ''
-
-        info = self._search_json_ld(
-            webpage.replace('"/*@context"', '"@context"'), video_id,
-            fatal=False) if webpage else {}
-
-        if not info.get('title'):
-            info['title'] = traverse_obj(response, (
-                'options', 'title', T(txt_or_none))) or self._og_search_title(webpage)
-
-        def if_missing(k):
-            return lambda x: None if k in info else x
-
-        info = merge_dicts(info, {
+        info.update({
             'id': video_id,
-            'formats': formats,
-            'subtitles': subtitles or None,
-        }, info, traverse_obj(response, ('options', {
-            'uploader': ('uploader', T(txt_or_none)),
-            'timestamp': ('ago', T(if_missing('timestamp')), T(lambda t: int(round((now - t) / 60.0)) * 60)),
-            'duration': ('duration', T(if_missing('duration')), T(float_or_none)),
-        })))
-        if 'thumbnail' not in info:
-            info['thumbnail'] = self._proto_relative_url(
+            'title': title,
+            'url': video_url,
+            'uploader': uploader,
+            'thumbnail': self._proto_relative_url(
                 info.get('thumbnail') or self._og_search_thumbnail(webpage),
-                'https:'),
-
+                'http:'),
+        })
         return info
diff --git a/youtube_dl/extractor/videa.py b/youtube_dl/extractor/videa.py
index 194b4b011..ab2c15cde 100644
--- a/youtube_dl/extractor/videa.py
+++ b/youtube_dl/extractor/videa.py
@@ -6,31 +6,20 @@ import re
 import string
 
 from .common import InfoExtractor
-from ..compat import (
-    compat_b64decode,
-    compat_ord,
-    compat_struct_pack,
-)
 from ..utils import (
     ExtractorError,
     int_or_none,
     mimetype2ext,
     parse_codecs,
-    parse_qs,
     update_url_query,
-    urljoin,
     xpath_element,
     xpath_text,
 )
-
-
-def compat_random_choices(population, *args, **kwargs):
-    # weights=None, *, cum_weights=None, k=1
-    # limited implementation needed here
-    weights = args[0] if args else kwargs.get('weights')
-    assert all(w is None for w in (weights, kwargs.get('cum_weights')))
-    k = kwargs.get('k', 1)
-    return ''.join(random.choice(population) for _ in range(k))
+from ..compat import (
+    compat_b64decode,
+    compat_ord,
+    compat_struct_pack,
+)
 
 
 class VideaIE(InfoExtractor):
@@ -44,7 +33,6 @@ class VideaIE(InfoExtractor):
                         )
                         (?P<id>[^?#&]+)
                     '''
-    _EMBED_REGEX = [r'<iframe[^>]+src=(["\'])(?P<url>(?:https?:)?//videa\.hu/player\?.*?\bv=.+?)\1']
     _TESTS = [{
         'url': 'http://videa.hu/videok/allatok/az-orult-kigyasz-285-kigyot-kigyo-8YfIAjxwWGwT8HVQ',
         'md5': '97a7af41faeaffd9f1fc864a7c7e7603',
@@ -54,30 +42,13 @@ class VideaIE(InfoExtractor):
             'title': 'Az őrült kígyász 285 kígyót enged szabadon',
             'thumbnail': r're:^https?://.*',
             'duration': 21,
-            'age_limit': 0,
         },
     }, {
         'url': 'http://videa.hu/videok/origo/jarmuvek/supercars-elozes-jAHDWfWSJH5XuFhH',
-        'md5': 'd57ccd8812c7fd491d33b1eab8c99975',
-        'info_dict': {
-            'id': 'jAHDWfWSJH5XuFhH',
-            'ext': 'mp4',
-            'title': 'Supercars előzés',
-            'thumbnail': r're:^https?://.*',
-            'duration': 64,
-            'age_limit': 0,
-        },
+        'only_matching': True,
     }, {
         'url': 'http://videa.hu/player?v=8YfIAjxwWGwT8HVQ',
-        'md5': '97a7af41faeaffd9f1fc864a7c7e7603',
-        'info_dict': {
-            'id': '8YfIAjxwWGwT8HVQ',
-            'ext': 'mp4',
-            'title': 'Az őrült kígyász 285 kígyót enged szabadon',
-            'thumbnail': r're:^https?://.*',
-            'duration': 21,
-            'age_limit': 0,
-        },
+        'only_matching': True,
     }, {
         'url': 'http://videa.hu/player/v/8YfIAjxwWGwT8HVQ?autoplay=1',
         'only_matching': True,
@@ -93,14 +64,11 @@ class VideaIE(InfoExtractor):
     }]
     _STATIC_SECRET = 'xHb0ZvME5q8CBcoQi6AngerDu3FGO9fkUlwPmLVY_RTzj2hJIS4NasXWKy1td7p'
 
-    @classmethod
-    def _extract_urls(cls, webpage):
-        def yield_urls():
-            for pattern in cls._EMBED_REGEX:
-                for m in re.finditer(pattern, webpage):
-                    yield m.group('url')
-
-        return list(yield_urls())
+    @staticmethod
+    def _extract_urls(webpage):
+        return [url for _, url in re.findall(
+            r'<iframe[^>]+src=(["\'])(?P<url>(?:https?:)?//videa\.hu/player\?.*?\bv=.+?)\1',
+            webpage)]
 
     @staticmethod
     def rc4(cipher_text, key):
@@ -123,20 +91,13 @@ class VideaIE(InfoExtractor):
             k = S[(S[i] + S[j]) % 256]
             res += compat_struct_pack('B', k ^ compat_ord(cipher_text[m]))
 
-        return res.decode('utf-8')
+        return res.decode()
 
     def _real_extract(self, url):
         video_id = self._match_id(url)
-        video_page = self._download_webpage(url, video_id)
-
-        if 'videa.hu/player' in url:
-            player_url = url
-            player_page = video_page
-        else:
-            player_url = self._search_regex(
-                r'<iframe.*?src="(/player\?[^"]+)"', video_page, 'player url')
-            player_url = urljoin(url, player_url)
-            player_page = self._download_webpage(player_url, video_id)
+        query = {'v': video_id}
+        player_page = self._download_webpage(
+            'https://videa.hu/player', video_id, query=query)
 
         nonce = self._search_regex(
             r'_xt\s*=\s*"([^"]+)"', player_page, 'nonce')
@@ -146,13 +107,12 @@ class VideaIE(InfoExtractor):
         for i in range(0, 32):
             result += s[i - (self._STATIC_SECRET.index(l[i]) - 31)]
 
-        query = parse_qs(player_url)
-        random_seed = ''.join(compat_random_choices(string.ascii_letters + string.digits, k=8))
+        random_seed = ''.join(random.choice(string.ascii_letters + string.digits) for _ in range(8))
         query['_s'] = random_seed
         query['_t'] = result[:16]
 
         b64_info, handle = self._download_webpage_handle(
-            'http://videa.hu/player/xml', video_id, query=query)
+            'http://videa.hu/videaplayer_get_xml.php', video_id, query=query)
         if b64_info.startswith('<?xml'):
             info = self._parse_xml(b64_info, video_id)
         else:
@@ -161,13 +121,13 @@ class VideaIE(InfoExtractor):
                 compat_b64decode(b64_info), key), video_id)
 
         video = xpath_element(info, './video', 'video')
-        if video is None:
+        if not video:
             raise ExtractorError(xpath_element(
                 info, './error', fatal=True), expected=True)
         sources = xpath_element(
             info, './video_sources', 'sources', fatal=True)
         hash_values = xpath_element(
-            info, './hash_values', 'hash values', fatal=False)
+            info, './hash_values', 'hash values', fatal=True)
 
         title = xpath_text(video, './title', fatal=True)
 
@@ -176,16 +136,15 @@ class VideaIE(InfoExtractor):
             source_url = source.text
             source_name = source.get('name')
             source_exp = source.get('exp')
-            if not (source_url and source_name):
+            if not (source_url and source_name and source_exp):
                 continue
-            hash_value = (
-                xpath_text(hash_values, 'hash_value_' + source_name)
-                if hash_values is not None else None)
-            if hash_value and source_exp:
-                source_url = update_url_query(source_url, {
-                    'md5': hash_value,
-                    'expires': source_exp,
-                })
+            hash_value = xpath_text(hash_values, 'hash_value_' + source_name)
+            if not hash_value:
+                continue
+            source_url = update_url_query(source_url, {
+                'md5': hash_value,
+                'expires': source_exp,
+            })
             f = parse_codecs(source.get('codecs'))
             f.update({
                 'url': self._proto_relative_url(source_url),
diff --git a/youtube_dl/extractor/vidlii.py b/youtube_dl/extractor/vidlii.py
index 47f328e87..f4774256b 100644
--- a/youtube_dl/extractor/vidlii.py
+++ b/youtube_dl/extractor/vidlii.py
@@ -4,7 +4,6 @@ from __future__ import unicode_literals
 import re
 
 from .common import InfoExtractor
-
 from ..utils import (
     float_or_none,
     get_element_by_id,
@@ -12,7 +11,6 @@ from ..utils import (
     strip_or_none,
     unified_strdate,
     urljoin,
-    str_to_int,
 )
 
 
@@ -37,26 +35,6 @@ class VidLiiIE(InfoExtractor):
             'categories': ['News & Politics'],
             'tags': ['Vidlii', 'Jan', 'Videogames'],
         }
-    }, {
-        # HD
-        'url': 'https://www.vidlii.com/watch?v=2Ng8Abj2Fkl',
-        'md5': '450e7da379c884788c3a4fa02a3ce1a4',
-        'info_dict': {
-            'id': '2Ng8Abj2Fkl',
-            'ext': 'mp4',
-            'title': 'test',
-            'description': 'md5:cc55a86032a7b6b3cbfd0f6b155b52e9',
-            'thumbnail': 'https://www.vidlii.com/usfi/thmp/2Ng8Abj2Fkl.jpg',
-            'uploader': 'VidLii',
-            'uploader_url': 'https://www.vidlii.com/user/VidLii',
-            'upload_date': '20200927',
-            'duration': 5,
-            'view_count': int,
-            'comment_count': int,
-            'average_rating': float,
-            'categories': ['Film & Animation'],
-            'tags': list,
-        },
     }, {
         'url': 'https://www.vidlii.com/embed?v=tJluaH4BJ3v&a=0',
         'only_matching': True,
@@ -68,32 +46,11 @@ class VidLiiIE(InfoExtractor):
         webpage = self._download_webpage(
             'https://www.vidlii.com/watch?v=%s' % video_id, video_id)
 
-        formats = []
+        video_url = self._search_regex(
+            r'src\s*:\s*(["\'])(?P<url>(?:https?://)?(?:(?!\1).)+)\1', webpage,
+            'video url', group='url')
 
-        def add_format(format_url, height=None):
-            height = int(self._search_regex(r'(\d+)\.mp4',
-                         format_url, 'height', default=360))
-
-            formats.append({
-                'url': format_url,
-                'format_id': '%dp' % height if height else None,
-                'height': height,
-            })
-
-        sources = re.findall(
-            r'src\s*:\s*(["\'])(?P<url>(?:https?://)?(?:(?!\1).)+)\1',
-            webpage)
-
-        formats = []
-        if len(sources) > 1:
-            add_format(sources[1][1])
-            self._check_formats(formats, video_id)
-        if len(sources) > 0:
-            add_format(sources[0][1])
-
-        self._sort_formats(formats)
-
-        title = self._html_search_regex(
+        title = self._search_regex(
             (r'<h1>([^<]+)</h1>', r'<title>([^<]+) - VidLii<'), webpage,
             'title')
 
@@ -125,9 +82,9 @@ class VidLiiIE(InfoExtractor):
             default=None) or self._search_regex(
             r'duration\s*:\s*(\d+)', webpage, 'duration', fatal=False))
 
-        view_count = str_to_int(self._html_search_regex(
-            (r'<strong>([\d,.]+)</strong> views',
-             r'Views\s*:\s*<strong>([\d,.]+)</strong>'),
+        view_count = int_or_none(self._search_regex(
+            (r'<strong>(\d+)</strong> views',
+             r'Views\s*:\s*<strong>(\d+)</strong>'),
             webpage, 'view count', fatal=False))
 
         comment_count = int_or_none(self._search_regex(
@@ -152,7 +109,7 @@ class VidLiiIE(InfoExtractor):
 
         return {
             'id': video_id,
-            'formats': formats,
+            'url': video_url,
             'title': title,
             'description': description,
             'thumbnail': thumbnail,
diff --git a/youtube_dl/extractor/viki.py b/youtube_dl/extractor/viki.py
index 2ddca0ca6..2e9cbf148 100644
--- a/youtube_dl/extractor/viki.py
+++ b/youtube_dl/extractor/viki.py
@@ -1,29 +1,38 @@
 # coding: utf-8
 from __future__ import unicode_literals
 
+import base64
 import hashlib
 import hmac
+import itertools
 import json
+import re
 import time
 
 from .common import InfoExtractor
+from ..compat import (
+    compat_parse_qs,
+    compat_urllib_parse_urlparse,
+)
 from ..utils import (
     ExtractorError,
     int_or_none,
     parse_age_limit,
     parse_iso8601,
+    sanitized_Request,
+    std_headers,
     try_get,
 )
 
 
 class VikiBaseIE(InfoExtractor):
     _VALID_URL_BASE = r'https?://(?:www\.)?viki\.(?:com|net|mx|jp|fr)/'
-    _API_URL_TEMPLATE = 'https://api.viki.io%s'
+    _API_QUERY_TEMPLATE = '/v4/%sapp=%s&t=%s&site=www.viki.com'
+    _API_URL_TEMPLATE = 'https://api.viki.io%s&sig=%s'
 
-    _DEVICE_ID = '112395910d'
     _APP = '100005a'
-    _APP_VERSION = '6.11.3'
-    _APP_SECRET = 'd96704b180208dbb2efa30fe44c48bd8690441af9f567ba8fd710a72badc85198f7472'
+    _APP_VERSION = '6.0.0'
+    _APP_SECRET = 'MM_d*yP@`&1@]@!AVrXf_o-HVEnoTnm$O-ti4[G~$JDI/Dc-&piU&z&5.;:}95=Iad'
 
     _GEO_BYPASS = False
     _NETRC_MACHINE = 'viki'
@@ -36,60 +45,43 @@ class VikiBaseIE(InfoExtractor):
         'paywall': 'Sorry, this content is only available to Viki Pass Plus subscribers',
     }
 
-    def _stream_headers(self, timestamp, sig):
-        return {
-            'X-Viki-manufacturer': 'vivo',
-            'X-Viki-device-model': 'vivo 1606',
-            'X-Viki-device-os-ver': '6.0.1',
-            'X-Viki-connection-type': 'WIFI',
-            'X-Viki-carrier': '',
-            'X-Viki-as-id': '100005a-1625321982-3932',
-            'timestamp': str(timestamp),
-            'signature': str(sig),
-            'x-viki-app-ver': self._APP_VERSION
-        }
-
-    def _api_query(self, path, version=4, **kwargs):
+    def _prepare_call(self, path, timestamp=None, post_data=None):
         path += '?' if '?' not in path else '&'
-        app = self._APP
-        query = '/v{version}/{path}app={app}'.format(**locals())
+        if not timestamp:
+            timestamp = int(time.time())
+        query = self._API_QUERY_TEMPLATE % (path, self._APP, timestamp)
         if self._token:
             query += '&token=%s' % self._token
-        return query + ''.join('&{name}={val}.format(**locals())' for name, val in kwargs.items())
-
-    def _sign_query(self, path):
-        timestamp = int(time.time())
-        query = self._api_query(path, version=5)
         sig = hmac.new(
             self._APP_SECRET.encode('ascii'),
-            '{query}&t={timestamp}'.format(**locals()).encode('ascii'),
-            hashlib.sha1).hexdigest()
-        return timestamp, sig, self._API_URL_TEMPLATE % query
+            query.encode('ascii'),
+            hashlib.sha1
+        ).hexdigest()
+        url = self._API_URL_TEMPLATE % (query, sig)
+        return sanitized_Request(
+            url, json.dumps(post_data).encode('utf-8')) if post_data else url
 
-    def _call_api(
-            self, path, video_id, note='Downloading JSON metadata', data=None, query=None, fatal=True):
-        if query is None:
-            timestamp, sig, url = self._sign_query(path)
-        else:
-            url = self._API_URL_TEMPLATE % self._api_query(path, version=4)
+    def _call_api(self, path, video_id, note, timestamp=None, post_data=None):
         resp = self._download_json(
-            url, video_id, note, fatal=fatal, query=query,
-            data=json.dumps(data).encode('utf-8') if data else None,
-            headers=({'x-viki-app-ver': self._APP_VERSION} if data
-                     else self._stream_headers(timestamp, sig) if query is None
-                     else None), expected_status=400) or {}
+            self._prepare_call(path, timestamp, post_data), video_id, note,
+            headers={'x-viki-app-ver': self._APP_VERSION})
+
+        error = resp.get('error')
+        if error:
+            if error == 'invalid timestamp':
+                resp = self._download_json(
+                    self._prepare_call(path, int(resp['current_timestamp']), post_data),
+                    video_id, '%s (retry)' % note)
+                error = resp.get('error')
+            if error:
+                self._raise_error(resp['error'])
 
-        self._raise_error(resp.get('error'), fatal)
         return resp
 
-    def _raise_error(self, error, fatal=True):
-        if error is None:
-            return
-        msg = '%s said: %s' % (self.IE_NAME, error)
-        if fatal:
-            raise ExtractorError(msg, expected=True)
-        else:
-            self.report_warning(msg)
+    def _raise_error(self, error):
+        raise ExtractorError(
+            '%s returned error: %s' % (self.IE_NAME, error),
+            expected=True)
 
     def _check_errors(self, data):
         for reason, status in (data.get('blocking') or {}).items():
@@ -98,10 +90,9 @@ class VikiBaseIE(InfoExtractor):
                 if reason == 'geo':
                     self.raise_geo_restricted(msg=message)
                 elif reason == 'paywall':
-                    if try_get(data, lambda x: x['paywallable']['tvod']):
-                        self._raise_error('This video is for rent only or TVOD (Transactional Video On demand)')
                     self.raise_login_required(message)
-                self._raise_error(message)
+                raise ExtractorError('%s said: %s' % (
+                    self.IE_NAME, message), expected=True)
 
     def _real_initialize(self):
         self._login()
@@ -111,39 +102,35 @@ class VikiBaseIE(InfoExtractor):
         if username is None:
             return
 
-        self._token = self._call_api(
-            'sessions.json', None, 'Logging in', fatal=False,
-            data={'username': username, 'password': password}).get('token')
+        login_form = {
+            'login_id': username,
+            'password': password,
+        }
+
+        login = self._call_api(
+            'sessions.json', None,
+            'Logging in', post_data=login_form)
+
+        self._token = login.get('token')
         if not self._token:
-            self.report_warning('Login Failed: Unable to get session token')
+            self.report_warning('Unable to get session token, login has probably failed')
 
     @staticmethod
-    def dict_selection(dict_obj, preferred_key):
+    def dict_selection(dict_obj, preferred_key, allow_fallback=True):
         if preferred_key in dict_obj:
-            return dict_obj[preferred_key]
-        return (list(filter(None, dict_obj.values())) or [None])[0]
+            return dict_obj.get(preferred_key)
+
+        if not allow_fallback:
+            return
+
+        filtered_dict = list(filter(None, [dict_obj.get(k) for k in dict_obj.keys()]))
+        return filtered_dict[0] if filtered_dict else None
 
 
 class VikiIE(VikiBaseIE):
     IE_NAME = 'viki'
     _VALID_URL = r'%s(?:videos|player)/(?P<id>[0-9]+v)' % VikiBaseIE._VALID_URL_BASE
     _TESTS = [{
-        'note': 'Free non-DRM video with storyboards in MPD',
-        'url': 'https://www.viki.com/videos/1175236v-choosing-spouse-by-lottery-episode-1',
-        'info_dict': {
-            'id': '1175236v',
-            'ext': 'mp4',
-            'title': 'Choosing Spouse by Lottery - Episode 1',
-            'timestamp': 1606463239,
-            'age_limit': 12,
-            'uploader': 'FCC',
-            'upload_date': '20201127',
-        },
-        'expected_warnings': ['Unknown MIME type image/jpeg in DASH manifest'],
-        'params': {
-            'format': 'bestvideo',
-        },
-    }, {
         'url': 'http://www.viki.com/videos/1023585v-heirs-episode-14',
         'info_dict': {
             'id': '1023585v',
@@ -159,7 +146,7 @@ class VikiIE(VikiBaseIE):
         'params': {
             'format': 'bestvideo',
         },
-        'skip': 'Content is only available to Viki Pass Plus subscribers',
+        'skip': 'Blocked in the US',
         'expected_warnings': ['Unknown MIME type image/jpeg in DASH manifest'],
     }, {
         # clip
@@ -191,11 +178,11 @@ class VikiIE(VikiBaseIE):
             'like_count': int,
             'age_limit': 13,
         },
-        'skip': 'Page not found!',
+        'skip': 'Blocked in the US',
     }, {
         # episode
         'url': 'http://www.viki.com/videos/44699v-boys-over-flowers-episode-1',
-        'md5': '670440c79f7109ca6564d4c7f24e3e81',
+        'md5': '0a53dc252e6e690feccd756861495a8c',
         'info_dict': {
             'id': '44699v',
             'ext': 'mp4',
@@ -206,7 +193,7 @@ class VikiIE(VikiBaseIE):
             'upload_date': '20100405',
             'uploader': 'group8',
             'like_count': int,
-            'age_limit': 15,
+            'age_limit': 13,
             'episode_number': 1,
         },
         'params': {
@@ -237,7 +224,7 @@ class VikiIE(VikiBaseIE):
     }, {
         # non-English description
         'url': 'http://www.viki.com/videos/158036v-love-in-magic',
-        'md5': '78bf49fdaa51f9e7f9150262a9ef9bdf',
+        'md5': '41faaba0de90483fb4848952af7c7d0d',
         'info_dict': {
             'id': '158036v',
             'ext': 'mp4',
@@ -245,8 +232,8 @@ class VikiIE(VikiBaseIE):
             'upload_date': '20111122',
             'timestamp': 1321985454,
             'description': 'md5:44b1e46619df3a072294645c770cef36',
-            'title': 'Love in Magic',
-            'age_limit': 15,
+            'title': 'Love In Magic',
+            'age_limit': 13,
         },
         'params': {
             'format': 'bestvideo',
@@ -257,53 +244,45 @@ class VikiIE(VikiBaseIE):
     def _real_extract(self, url):
         video_id = self._match_id(url)
 
-        video = self._call_api('videos/{0}.json'.format(video_id), video_id, 'Downloading video JSON', query={})
+        resp = self._download_json(
+            'https://www.viki.com/api/videos/' + video_id,
+            video_id, 'Downloading video JSON', headers={
+                'x-client-user-agent': std_headers['User-Agent'],
+                'x-viki-app-ver': '3.0.0',
+            })
+        video = resp['video']
 
         self._check_errors(video)
 
-        title = try_get(video, lambda x: x['titles']['en'], str)
+        title = self.dict_selection(video.get('titles', {}), 'en', allow_fallback=False)
         episode_number = int_or_none(video.get('number'))
         if not title:
             title = 'Episode %d' % episode_number if video.get('type') == 'episode' else video.get('id') or video_id
             container_titles = try_get(video, lambda x: x['container']['titles'], dict) or {}
             container_title = self.dict_selection(container_titles, 'en')
-            if container_title and title == video_id:
-                title = container_title
-            else:
-                title = '%s - %s' % (container_title, title)
-
-        resp = self._call_api(
-            'playback_streams/%s.json?drms=dt3&device_id=%s' % (video_id, self._DEVICE_ID),
-            video_id, 'Downloading video streams JSON')['main'][0]
-
-        mpd_url = resp['url']
-        # 720p is hidden in another MPD which can be found in the current manifest content
-        mpd_content = self._download_webpage(mpd_url, video_id, note='Downloading initial MPD manifest')
-        mpd_url = self._search_regex(
-            r'(?mi)<BaseURL>(http.+.mpd)', mpd_content, 'new manifest', default=mpd_url)
-        if 'mpdhd_high' not in mpd_url:
-            # Modify the URL to get 1080p
-            mpd_url = mpd_url.replace('mpdhd', 'mpdhd_high')
-        formats = self._extract_mpd_formats(mpd_url, video_id)
-        self._sort_formats(formats)
+            title = '%s - %s' % (container_title, title)
 
         description = self.dict_selection(video.get('descriptions', {}), 'en')
-        thumbnails = [{
-            'id': thumbnail_id,
-            'url': thumbnail['url'],
-        } for thumbnail_id, thumbnail in (video.get('images') or {}).items() if thumbnail.get('url')]
+
         like_count = int_or_none(try_get(video, lambda x: x['likes']['count']))
 
-        stream_id = try_get(resp, lambda x: x['properties']['track']['stream_id'])
-        subtitles = dict((lang, [{
-            'ext': ext,
-            'url': self._API_URL_TEMPLATE % self._api_query(
-                'videos/{0}/auth_subtitles/{1}.{2}'.format(video_id, lang, ext), stream_id=stream_id)
-        } for ext in ('srt', 'vtt')]) for lang in (video.get('subtitle_completions') or {}).keys())
+        thumbnails = []
+        for thumbnail_id, thumbnail in (video.get('images') or {}).items():
+            thumbnails.append({
+                'id': thumbnail_id,
+                'url': thumbnail.get('url'),
+            })
 
-        return {
+        subtitles = {}
+        for subtitle_lang, _ in (video.get('subtitle_completions') or {}).items():
+            subtitles[subtitle_lang] = [{
+                'ext': subtitles_format,
+                'url': self._prepare_call(
+                    'videos/%s/subtitles/%s.%s' % (video_id, subtitle_lang, subtitles_format)),
+            } for subtitles_format in ('srt', 'vtt')]
+
+        result = {
             'id': video_id,
-            'formats': formats,
             'title': title,
             'description': description,
             'duration': int_or_none(video.get('duration')),
@@ -317,6 +296,79 @@ class VikiIE(VikiBaseIE):
             'episode_number': episode_number,
         }
 
+        formats = []
+
+        def add_format(format_id, format_dict, protocol='http'):
+            # rtmps URLs does not seem to work
+            if protocol == 'rtmps':
+                return
+            format_url = format_dict.get('url')
+            if not format_url:
+                return
+            qs = compat_parse_qs(compat_urllib_parse_urlparse(format_url).query)
+            stream = qs.get('stream', [None])[0]
+            if stream:
+                format_url = base64.b64decode(stream).decode()
+            if format_id in ('m3u8', 'hls'):
+                m3u8_formats = self._extract_m3u8_formats(
+                    format_url, video_id, 'mp4',
+                    entry_protocol='m3u8_native',
+                    m3u8_id='m3u8-%s' % protocol, fatal=False)
+                # Despite CODECS metadata in m3u8 all video-only formats
+                # are actually video+audio
+                for f in m3u8_formats:
+                    if '_drm/index_' in f['url']:
+                        continue
+                    if f.get('acodec') == 'none' and f.get('vcodec') != 'none':
+                        f['acodec'] = None
+                    formats.append(f)
+            elif format_id in ('mpd', 'dash'):
+                formats.extend(self._extract_mpd_formats(
+                    format_url, video_id, 'mpd-%s' % protocol, fatal=False))
+            elif format_url.startswith('rtmp'):
+                mobj = re.search(
+                    r'^(?P<url>rtmp://[^/]+/(?P<app>.+?))/(?P<playpath>mp4:.+)$',
+                    format_url)
+                if not mobj:
+                    return
+                formats.append({
+                    'format_id': 'rtmp-%s' % format_id,
+                    'ext': 'flv',
+                    'url': mobj.group('url'),
+                    'play_path': mobj.group('playpath'),
+                    'app': mobj.group('app'),
+                    'page_url': url,
+                })
+            else:
+                formats.append({
+                    'url': format_url,
+                    'format_id': '%s-%s' % (format_id, protocol),
+                    'height': int_or_none(self._search_regex(
+                        r'^(\d+)[pP]$', format_id, 'height', default=None)),
+                })
+
+        for format_id, format_dict in (resp.get('streams') or {}).items():
+            add_format(format_id, format_dict)
+        if not formats:
+            streams = self._call_api(
+                'videos/%s/streams.json' % video_id, video_id,
+                'Downloading video streams JSON')
+
+            if 'external' in streams:
+                result.update({
+                    '_type': 'url_transparent',
+                    'url': streams['external']['url'],
+                })
+                return result
+
+            for format_id, stream_dict in streams.items():
+                for protocol, format_dict in stream_dict.items():
+                    add_format(format_id, format_dict, protocol)
+        self._sort_formats(formats)
+
+        result['formats'] = formats
+        return result
+
 
 class VikiChannelIE(VikiBaseIE):
     IE_NAME = 'viki:channel'
@@ -326,9 +378,9 @@ class VikiChannelIE(VikiBaseIE):
         'info_dict': {
             'id': '50c',
             'title': 'Boys Over Flowers',
-            'description': 'md5:f08b679c200e1a273c695fe9986f21d7',
+            'description': 'md5:804ce6e7837e1fd527ad2f25420f4d59',
         },
-        'playlist_mincount': 51,
+        'playlist_mincount': 71,
     }, {
         'url': 'http://www.viki.com/tv/1354c-poor-nastya-complete',
         'info_dict': {
@@ -349,38 +401,33 @@ class VikiChannelIE(VikiBaseIE):
         'only_matching': True,
     }]
 
-    _video_types = ('episodes', 'movies', 'clips', 'trailers')
-
-    def _entries(self, channel_id):
-        params = {
-            'app': self._APP, 'token': self._token, 'only_ids': 'true',
-            'direction': 'asc', 'sort': 'number', 'per_page': 30
-        }
-        video_types = self._video_types
-        for video_type in video_types:
-            if video_type not in self._video_types:
-                self.report_warning('Unknown video_type: ' + video_type)
-            page_num = 0
-            while True:
-                page_num += 1
-                params['page'] = page_num
-                res = self._call_api(
-                    'containers/{channel_id}/{video_type}.json'.format(**locals()), channel_id, query=params, fatal=False,
-                    note='Downloading %s JSON page %d' % (video_type.title(), page_num))
-
-                for video_id in res.get('response') or []:
-                    yield self.url_result('https://www.viki.com/videos/' + video_id, VikiIE.ie_key(), video_id)
-                if not res.get('more'):
-                    break
+    _PER_PAGE = 25
 
     def _real_extract(self, url):
         channel_id = self._match_id(url)
 
-        channel = self._call_api('containers/%s.json' % channel_id, channel_id, 'Downloading channel JSON')
+        channel = self._call_api(
+            'containers/%s.json' % channel_id, channel_id,
+            'Downloading channel JSON')
 
         self._check_errors(channel)
 
-        return self.playlist_result(
-            self._entries(channel_id), channel_id,
-            self.dict_selection(channel['titles'], 'en'),
-            self.dict_selection(channel['descriptions'], 'en'))
+        title = self.dict_selection(channel['titles'], 'en')
+
+        description = self.dict_selection(channel['descriptions'], 'en')
+
+        entries = []
+        for video_type in ('episodes', 'clips', 'movies'):
+            for page_num in itertools.count(1):
+                page = self._call_api(
+                    'containers/%s/%s.json?per_page=%d&sort=number&direction=asc&with_paging=true&page=%d'
+                    % (channel_id, video_type, self._PER_PAGE, page_num), channel_id,
+                    'Downloading %s JSON page #%d' % (video_type, page_num))
+                for video in page['response']:
+                    video_id = video['id']
+                    entries.append(self.url_result(
+                        'https://www.viki.com/videos/%s' % video_id, 'Viki'))
+                if not page['pagination']['next']:
+                    break
+
+        return self.playlist_result(entries, channel_id, title, description)
diff --git a/youtube_dl/extractor/vimeo.py b/youtube_dl/extractor/vimeo.py
index 47ec0a9b4..102687b82 100644
--- a/youtube_dl/extractor/vimeo.py
+++ b/youtube_dl/extractor/vimeo.py
@@ -261,33 +261,27 @@ class VimeoIE(VimeoBaseInfoExtractor):
 
     # _VALID_URL matches Vimeo URLs
     _VALID_URL = r'''(?x)
-                     https?://
-                         (?:
-                             (?:
-                                 www|
-                                 player
-                             )
-                             \.
-                         )?
-                         vimeo(?:pro)?\.com/
-                         (?:
-                             (?P<u>user)|
-                             (?!(?:channels|album|showcase)/[^/?#]+/?(?:$|[?#])|[^/]+/review/|ondemand/)
-                             (?:.*?/)??
-                             (?P<q>
-                                 (?:
-                                     play_redirect_hls|
-                                     moogaloop\.swf)\?clip_id=
-                             )?
-                             (?:videos?/)?
-                         )
-                         (?P<id>[0-9]+)
-                         (?(u)
-                             /(?!videos|likes)[^/?#]+/?|
-                             (?(q)|/(?P<unlisted_hash>[\da-f]{10}))?
-                         )
-                         (?:(?(q)[&]|(?(u)|/?)[?]).+?)?(?:[#].*)?$
-                 '''
+                    https?://
+                        (?:
+                            (?:
+                                www|
+                                player
+                            )
+                            \.
+                        )?
+                        vimeo(?:pro)?\.com/
+                        (?!(?:channels|album|showcase)/[^/?#]+/?(?:$|[?#])|[^/]+/review/|ondemand/)
+                        (?:.*?/)?
+                        (?:
+                            (?:
+                                play_redirect_hls|
+                                moogaloop\.swf)\?clip_id=
+                            )?
+                        (?:videos?/)?
+                        (?P<id>[0-9]+)
+                        (?:/(?P<unlisted_hash>[\da-f]{10}))?
+                        /?(?:[?&].*)?(?:[#].*)?$
+                    '''
     IE_NAME = 'vimeo'
     _TESTS = [
         {
@@ -523,34 +517,15 @@ class VimeoIE(VimeoBaseInfoExtractor):
             'url': 'https://vimeo.com/7809605',
             'only_matching': True,
         },
+        {
+            'url': 'https://vimeo.com/160743502/abd0e13fb4',
+            'only_matching': True,
+        },
         {
             # requires passing unlisted_hash(a52724358e) to load_download_config request
             'url': 'https://vimeo.com/392479337/a52724358e',
             'only_matching': True,
-        },
-        {
-            # similar, but all numeric: ID must be 581039021, not 9603038895
-            # issue #29690
-            'url': 'https://vimeo.com/581039021/9603038895',
-            'info_dict': {
-                'id': '581039021',
-                # these have to be provided but we don't care
-                'ext': 'mp4',
-                'timestamp': 1627621014,
-                'title': 're:.+',
-                'uploader_id': 're:.+',
-                'uploader': 're:.+',
-                'upload_date': r're:\d+',
-            },
-            'params': {
-                'skip_download': True,
-            },
-        },
-        {
-            # user playlist alias -> https://vimeo.com/258705797
-            'url': 'https://vimeo.com/user26785108/newspiritualguide',
-            'only_matching': True,
-        },
+        }
         # https://gettingthingsdone.com/workflowmap/
         # vimeo embed with check-password page protected by Referer header
     ]
@@ -672,9 +647,9 @@ class VimeoIE(VimeoBaseInfoExtractor):
                         expected=True)
             raise
 
-        if '//player.vimeo.com/video/' in url:
-            config = self._search_json(
-                r'\b(?:playerC|c)onfig\s*=', webpage, 'info section', video_id)
+        if '://player.vimeo.com/video/' in url:
+            config = self._parse_json(self._search_regex(
+                r'\bconfig\s*=\s*({.+?})\s*;', webpage, 'info section'), video_id)
             if config.get('view') == 4:
                 config = self._verify_player_video_password(
                     redirect_url, video_id, headers)
diff --git a/youtube_dl/extractor/vk.py b/youtube_dl/extractor/vk.py
index 6b3513ee0..00ec006c4 100644
--- a/youtube_dl/extractor/vk.py
+++ b/youtube_dl/extractor/vk.py
@@ -300,13 +300,6 @@ class VKIE(VKBaseIE):
             'only_matching': True,
         }]
 
-    @staticmethod
-    def _extract_sibnet_urls(webpage):
-        # https://help.sibnet.ru/?sibnet_video_embed
-        return [unescapeHTML(mobj.group('url')) for mobj in re.finditer(
-            r'<iframe\b[^>]+\bsrc=(["\'])(?P<url>(?:https?:)?//video\.sibnet\.ru/shell\.php\?.*?\bvideoid=\d+.*?)\1',
-            webpage)]
-
     def _real_extract(self, url):
         mobj = re.match(self._VALID_URL, url)
         video_id = mobj.group('videoid')
@@ -415,10 +408,6 @@ class VKIE(VKBaseIE):
         if odnoklassniki_url:
             return self.url_result(odnoklassniki_url, OdnoklassnikiIE.ie_key())
 
-        sibnet_urls = self._extract_sibnet_urls(info_page)
-        if sibnet_urls:
-            return self.url_result(sibnet_urls[0])
-
         m_opts = re.search(r'(?s)var\s+opts\s*=\s*({.+?});', info_page)
         if m_opts:
             m_opts_url = re.search(r"url\s*:\s*'((?!/\b)[^']+)", m_opts.group(1))
diff --git a/youtube_dl/extractor/vvvvid.py b/youtube_dl/extractor/vvvvid.py
index 6a0d4e8f0..bc196f8a0 100644
--- a/youtube_dl/extractor/vvvvid.py
+++ b/youtube_dl/extractor/vvvvid.py
@@ -64,18 +64,6 @@ class VVVVIDIE(InfoExtractor):
         'params': {
             'skip_download': True,
         },
-    }, {
-        # video_type == 'video/dash'
-        'url': 'https://www.vvvvid.it/show/683/made-in-abyss/1542/693786/nanachi',
-        'info_dict': {
-            'id': '693786',
-            'ext': 'mp4',
-            'title': 'Nanachi',
-        },
-        'params': {
-            'skip_download': True,
-            'format': 'mp4',
-        },
     }, {
         'url': 'https://www.vvvvid.it/show/434/perche-dovrei-guardarlo-di-dario-moccia/437/489048',
         'only_matching': True
@@ -217,9 +205,6 @@ class VVVVIDIE(InfoExtractor):
                 })
                 is_youtube = True
                 break
-            elif video_type == 'video/dash':
-                formats.extend(self._extract_m3u8_formats(
-                    embed_code, video_id, 'mp4', m3u8_id='hls', fatal=False))
             else:
                 formats.extend(self._extract_wowza_formats(
                     'http://sb.top-ix.org/videomg/_definst_/mp4:%s/playlist.m3u8' % embed_code, video_id))
diff --git a/youtube_dl/extractor/wat.py b/youtube_dl/extractor/wat.py
index b15e03768..f1bccc2d6 100644
--- a/youtube_dl/extractor/wat.py
+++ b/youtube_dl/extractor/wat.py
@@ -57,7 +57,7 @@ class WatIE(InfoExtractor):
         #     'http://www.wat.tv/interface/contentv4s/' + video_id, video_id)
         video_data = self._download_json(
             'https://mediainfo.tf1.fr/mediainfocombo/' + video_id,
-            video_id, query={'context': 'MYTF1', 'pver': '4001000'})
+            video_id, query={'context': 'MYTF1'})
         video_info = video_data['media']
 
         error_desc = video_info.get('error_desc')
diff --git a/youtube_dl/extractor/wdr.py b/youtube_dl/extractor/wdr.py
index 10db73148..2903d189e 100644
--- a/youtube_dl/extractor/wdr.py
+++ b/youtube_dl/extractor/wdr.py
@@ -10,7 +10,6 @@ from ..compat import (
 )
 from ..utils import (
     determine_ext,
-    dict_get,
     ExtractorError,
     js_to_json,
     strip_jsonp,
@@ -23,10 +22,9 @@ from ..utils import (
 
 
 class WDRIE(InfoExtractor):
-    __API_URL_TPL = '//deviceids-medp.wdr.de/ondemand/%s/%s'
-    _VALID_URL = (r'(?:https?:' + __API_URL_TPL) % (r'\d+', r'(?=\d+\.js)|wdr:)(?P<id>\d{6,})')
+    _VALID_URL = r'https?://deviceids-medp\.wdr\.de/ondemand/\d+/(?P<id>\d+)\.js'
     _GEO_COUNTRIES = ['DE']
-    _TESTS = [{
+    _TEST = {
         'url': 'http://deviceids-medp.wdr.de/ondemand/155/1557833.js',
         'info_dict': {
             'id': 'mdb-1557833',
@@ -34,20 +32,11 @@ class WDRIE(InfoExtractor):
             'title': 'Biathlon-Staffel verpasst Podest bei Olympia-Generalprobe',
             'upload_date': '20180112',
         },
-    },
-    ]
-
-    def _asset_url(self, wdr_id):
-        id_len = max(len(wdr_id), 5)
-        return ''.join(('https:', self.__API_URL_TPL % (wdr_id[:id_len - 4], wdr_id, ), '.js'))
+    }
 
     def _real_extract(self, url):
         video_id = self._match_id(url)
 
-        if url.startswith('wdr:'):
-            video_id = url[4:]
-            url = self._asset_url(video_id)
-
         metadata = self._download_json(
             url, video_id, transform_source=strip_jsonp)
 
@@ -126,10 +115,10 @@ class WDRIE(InfoExtractor):
         }
 
 
-class WDRPageIE(WDRIE):
-    _MAUS_REGEX = r'https?://(?:www\.)wdrmaus.de/(?:[^/]+/)*?(?P<maus_id>[^/?#.]+)(?:/?|/index\.php5|\.php5)$'
+class WDRPageIE(InfoExtractor):
+    _CURRENT_MAUS_URL = r'https?://(?:www\.)wdrmaus.de/(?:[^/]+/){1,2}[^/?#]+\.php5'
     _PAGE_REGEX = r'/(?:mediathek/)?(?:[^/]+/)*(?P<display_id>[^/]+)\.html'
-    _VALID_URL = r'https?://(?:www\d?\.)?(?:(?:kinder\.)?wdr\d?|sportschau)\.de' + _PAGE_REGEX + '|' + _MAUS_REGEX
+    _VALID_URL = r'https?://(?:www\d?\.)?(?:(?:kinder\.)?wdr\d?|sportschau)\.de' + _PAGE_REGEX + '|' + _CURRENT_MAUS_URL
 
     _TESTS = [
         {
@@ -170,11 +159,11 @@ class WDRPageIE(WDRIE):
         {
             'url': 'http://www1.wdr.de/mediathek/video/live/index.html',
             'info_dict': {
-                'id': 'mdb-2296252',
+                'id': 'mdb-1406149',
                 'ext': 'mp4',
-                'title': r're:^WDR Fernsehen im Livestream (?:\(nur in Deutschland erreichbar\) )?[0-9]{4}-[0-9]{2}-[0-9]{2} [0-9]{2}:[0-9]{2}$',
+                'title': r're:^WDR Fernsehen im Livestream \(nur in Deutschland erreichbar\) [0-9]{4}-[0-9]{2}-[0-9]{2} [0-9]{2}:[0-9]{2}$',
                 'alt_title': 'WDR Fernsehen Live',
-                'upload_date': '20201112',
+                'upload_date': '20150101',
                 'is_live': True,
             },
             'params': {
@@ -183,7 +172,7 @@ class WDRPageIE(WDRIE):
         },
         {
             'url': 'http://www1.wdr.de/mediathek/video/sendungen/aktuelle-stunde/aktuelle-stunde-120.html',
-            'playlist_mincount': 6,
+            'playlist_mincount': 7,
             'info_dict': {
                 'id': 'aktuelle-stunde-120',
             },
@@ -191,10 +180,10 @@ class WDRPageIE(WDRIE):
         {
             'url': 'http://www.wdrmaus.de/aktuelle-sendung/index.php5',
             'info_dict': {
-                'id': 'mdb-2627637',
+                'id': 'mdb-1552552',
                 'ext': 'mp4',
                 'upload_date': 're:^[0-9]{8}$',
-                'title': 're:^Die Sendung (?:mit der Maus )?vom [0-9.]{10}$',
+                'title': 're:^Die Sendung mit der Maus vom [0-9.]{10}$',
             },
             'skip': 'The id changes from week to week because of the new episode'
         },
@@ -207,7 +196,6 @@ class WDRPageIE(WDRIE):
                 'upload_date': '20130919',
                 'title': 'Sachgeschichte - Achterbahn ',
             },
-            'skip': 'HTTP Error 404: Not Found',
         },
         {
             'url': 'http://www1.wdr.de/radio/player/radioplayer116~_layout-popupVersion.html',
@@ -233,7 +221,6 @@ class WDRPageIE(WDRIE):
             'params': {
                 'skip_download': True,
             },
-            'skip': 'HTTP Error 404: Not Found',
         },
         {
             'url': 'http://www.sportschau.de/handballem2018/audio-vorschau---die-handball-em-startet-mit-grossem-favoritenfeld-100.html',
@@ -247,7 +234,7 @@ class WDRPageIE(WDRIE):
 
     def _real_extract(self, url):
         mobj = re.match(self._VALID_URL, url)
-        display_id = dict_get(mobj.groupdict(), ('display_id', 'maus_id'), 'wdrmaus')
+        display_id = mobj.group('display_id')
         webpage = self._download_webpage(url, display_id)
 
         entries = []
@@ -273,14 +260,6 @@ class WDRPageIE(WDRIE):
             jsonp_url = try_get(
                 media_link_obj, lambda x: x['mediaObj']['url'], compat_str)
             if jsonp_url:
-                # metadata, or player JS with ['ref'] giving WDR id, or just media, perhaps
-                clip_id = media_link_obj['mediaObj'].get('ref')
-                if jsonp_url.endswith('.assetjsonp'):
-                    asset = self._download_json(
-                        jsonp_url, display_id, fatal=False, transform_source=strip_jsonp)
-                    clip_id = try_get(asset, lambda x: x['trackerData']['trackerClipId'], compat_str)
-                if clip_id:
-                    jsonp_url = self._asset_url(clip_id[4:])
                 entries.append(self.url_result(jsonp_url, ie=WDRIE.ie_key()))
 
         # Playlist (e.g. https://www1.wdr.de/mediathek/video/sendungen/aktuelle-stunde/aktuelle-stunde-120.html)
@@ -300,14 +279,16 @@ class WDRPageIE(WDRIE):
 class WDRElefantIE(InfoExtractor):
     _VALID_URL = r'https?://(?:www\.)wdrmaus\.de/elefantenseite/#(?P<id>.+)'
     _TEST = {
-        'url': 'http://www.wdrmaus.de/elefantenseite/#elefantenkino_wippe',
-        # adaptive stream: unstable file MD5
+        'url': 'http://www.wdrmaus.de/elefantenseite/#folge_ostern_2015',
         'info_dict': {
-            'title': 'Wippe',
-            'id': 'mdb-1198320',
+            'title': 'Folge Oster-Spezial 2015',
+            'id': 'mdb-1088195',
             'ext': 'mp4',
             'age_limit': None,
-            'upload_date': '20071003'
+            'upload_date': '20150406'
+        },
+        'params': {
+            'skip_download': True,
         },
     }
 
@@ -342,7 +323,6 @@ class WDRMobileIE(InfoExtractor):
         /[0-9]+/[0-9]+/
         (?P<id>[0-9]+)_(?P<title>[0-9]+)'''
     IE_NAME = 'wdr:mobile'
-    _WORKING = False  # no such domain
     _TEST = {
         'url': 'http://mobile-ondemand.wdr.de/CMS2010/mdb/ondemand/weltweit/fsk0/42/421735/421735_4283021.mp4',
         'info_dict': {
diff --git a/youtube_dl/extractor/whyp.py b/youtube_dl/extractor/whyp.py
deleted file mode 100644
index 644eb4617..000000000
--- a/youtube_dl/extractor/whyp.py
+++ /dev/null
@@ -1,55 +0,0 @@
-# coding: utf-8
-from __future__ import unicode_literals
-
-from .common import InfoExtractor
-from ..utils import (
-    float_or_none,
-    merge_dicts,
-    str_or_none,
-    T,
-    traverse_obj,
-    url_or_none,
-)
-
-
-class WhypIE(InfoExtractor):
-    _VALID_URL = r'https?://(?:www\.)?whyp\.it/tracks/(?P<id>\d+)'
-    _TESTS = [{
-        'url': 'https://www.whyp.it/tracks/18337/home-page-example-track-b4kq7',
-        'md5': 'c1187b42ebf8605284e3dc92aeb33d16',
-        'info_dict': {
-            'url': 'https://cdn.whyp.it/50eb17cc-e9ff-4e18-b89b-dc9206a95cb1.mp3',
-            'id': '18337',
-            'title': 'Home Page Example Track',
-            'description': r're:(?s).+\bexample track\b',
-            'ext': 'mp3',
-            'duration': 52.82,
-            'uploader': 'Brad',
-            'uploader_id': '1',
-            'thumbnail': 'https://cdn.whyp.it/a537bb36-3373-4c61-96c8-27fc1b2f427a.jpg',
-        },
-    }, {
-        'url': 'https://www.whyp.it/tracks/18337',
-        'only_matching': True,
-    }]
-
-    def _real_extract(self, url):
-        unique_id = self._match_id(url)
-        webpage = self._download_webpage(url, unique_id)
-        data = self._search_nuxt_data(webpage, unique_id)['rawTrack']
-
-        return merge_dicts({
-            'url': data['audio_url'],
-            'id': unique_id,
-        }, traverse_obj(data, {
-            'title': 'title',
-            'description': 'description',
-            'duration': ('duration', T(float_or_none)),
-            'uploader': ('user', 'username'),
-            'uploader_id': ('user', 'id', T(str_or_none)),
-            'thumbnail': ('artwork_url', T(url_or_none)),
-        }), {
-            'ext': 'mp3',
-            'vcodec': 'none',
-            'http_headers': {'Referer': 'https://whyp.it/'},
-        }, rev=True)
diff --git a/youtube_dl/extractor/xfileshare.py b/youtube_dl/extractor/xfileshare.py
index 4dc3032e7..cbd5d1cbb 100644
--- a/youtube_dl/extractor/xfileshare.py
+++ b/youtube_dl/extractor/xfileshare.py
@@ -4,28 +4,20 @@ from __future__ import unicode_literals
 import re
 
 from .common import InfoExtractor
-from ..compat import (
-    compat_chr,
-    compat_zip as zip,
-)
+from ..compat import compat_chr
 from ..utils import (
-    clean_html,
     decode_packed_codes,
     determine_ext,
     ExtractorError,
-    get_element_by_id,
     int_or_none,
-    merge_dicts,
-    T,
-    traverse_obj,
-    url_or_none,
+    js_to_json,
     urlencode_postdata,
 )
 
 
 # based on openload_decode from 2bfeee69b976fe049761dd3012e30b637ee05a58
 def aa_decode(aa_code):
-    symbol_table = (
+    symbol_table = [
         ('7', '((ﾟｰﾟ) + (o^_^o))'),
         ('6', '((o^_^o) +(o^_^o))'),
         ('5', '((ﾟｰﾟ) + (ﾟΘﾟ))'),
@@ -34,180 +26,80 @@ def aa_decode(aa_code):
         ('3', '(o^_^o)'),
         ('1', '(ﾟΘﾟ)'),
         ('0', '(c^_^o)'),
-        ('+', ''),
-    )
+    ]
     delim = '(ﾟДﾟ)[ﾟεﾟ]+'
-
-    def chr_from_code(c):
+    ret = ''
+    for aa_char in aa_code.split(delim):
         for val, pat in symbol_table:
-            c = c.replace(pat, val)
-        if c.startswith(('u', 'U')):
-            base = 16
-            c = c[1:]
+            aa_char = aa_char.replace(pat, val)
+        aa_char = aa_char.replace('+ ', '')
+        m = re.match(r'^\d+', aa_char)
+        if m:
+            ret += compat_chr(int(m.group(0), 8))
         else:
-            base = 10
-        c = int_or_none(c, base=base)
-        return '' if c is None else compat_chr(c)
-
-    return ''.join(
-        chr_from_code(aa_char)
-        for aa_char in aa_code.split(delim))
+            m = re.match(r'^u([\da-f]+)', aa_char)
+            if m:
+                ret += compat_chr(int(m.group(1), 16))
+    return ret
 
 
 class XFileShareIE(InfoExtractor):
     _SITES = (
-        # status check 2024-02: site availability, G site: search
-        (r'aparat\.cam', 'Aparat'),  # Cloudflare says host error 522, apparently changed to wolfstreeam.tv
-        (r'filemoon\.sx/.', 'FileMoon'),
-        (r'gounlimited\.to', 'GoUnlimited'),  # no media pages listed
-        (r'govid\.me', 'GoVid'),  # no media pages listed
-        (r'highstream\.tv', 'HighStream'),  # clipwatching.com redirects here
-        (r'holavid\.com', 'HolaVid'),  # Cloudflare says host error 522
-        # (r'streamty\.com', 'Streamty'),  # no media pages listed, connection timeout
-        # (r'thevideobee\.to', 'TheVideoBee'),  # no pages listed, refuses connection
-        (r'uqload\.to', 'Uqload'),  # .com, .co redirect here
-        (r'(?:vedbam\.xyz|vadbam.net)', 'V?dB?m'),  # vidbom.com redirects here, but no valid media pages listed
-        (r'vidlo\.us', 'vidlo'),  # no valid media pages listed
-        (r'vidlocker\.xyz', 'VidLocker'),  # no media pages listed
-        (r'(?:w\d\.)?viidshar\.com', 'VidShare'),  # vidshare.tv redirects here
-        # (r'vup\.to', 'VUp'),  # domain not found
-        (r'wolfstream\.tv', 'WolfStream'),
-        (r'xvideosharing\.com', 'XVideoSharing'),  # just started showing 'maintenance mode'
+        (r'aparat\.cam', 'Aparat'),
+        (r'clipwatching\.com', 'ClipWatching'),
+        (r'gounlimited\.to', 'GoUnlimited'),
+        (r'govid\.me', 'GoVid'),
+        (r'holavid\.com', 'HolaVid'),
+        (r'streamty\.com', 'Streamty'),
+        (r'thevideobee\.to', 'TheVideoBee'),
+        (r'uqload\.com', 'Uqload'),
+        (r'vidbom\.com', 'VidBom'),
+        (r'vidlo\.us', 'vidlo'),
+        (r'vidlocker\.xyz', 'VidLocker'),
+        (r'vidshare\.tv', 'VidShare'),
+        (r'vup\.to', 'VUp'),
+        (r'xvideosharing\.com', 'XVideoSharing'),
     )
 
-    IE_DESC = 'XFileShare-based sites: %s' % ', '.join(list(zip(*_SITES))[1])
+    IE_DESC = 'XFileShare based sites: %s' % ', '.join(list(zip(*_SITES))[1])
     _VALID_URL = (r'https?://(?:www\.)?(?P<host>%s)/(?:embed-)?(?P<id>[0-9a-zA-Z]+)'
                   % '|'.join(site for site in list(zip(*_SITES))[0]))
-    _EMBED_REGEX = [r'<iframe\b[^>]+\bsrc=(["\'])(?P<url>(?:https?:)?//(?:%s)/embed-[0-9a-zA-Z]+.*?)\1' % '|'.join(site for site in list(zip(*_SITES))[0])]
 
     _FILE_NOT_FOUND_REGEXES = (
         r'>(?:404 - )?File Not Found<',
         r'>The file was removed by administrator<',
     )
-    _TITLE_REGEXES = (
-        r'style="z-index: [0-9]+;">([^<]+)</span>',
-        r'<td nowrap>([^<]+)</td>',
-        r'h4-fine[^>]*>([^<]+)<',
-        r'>Watch (.+)[ <]',
-        r'<h2 class="video-page-head">([^<]+)</h2>',
-        r'<h2 style="[^"]*color:#403f3d[^"]*"[^>]*>([^<]+)<',  # streamin.to (dead)
-        r'title\s*:\s*"([^"]+)"',  # govid.me
-    )
-    _SOURCE_URL_REGEXES = (
-        r'(?:file|src)\s*:\s*(["\'])(?P<url>http(?:(?!\1).)+\.(?:m3u8|mp4|flv)(?:(?!\1).)*)\1',
-        r'file_link\s*=\s*(["\'])(?P<url>http(?:(?!\1).)+)\1',
-        r'addVariable\((\\?["\'])file\1\s*,\s*(\\?["\'])(?P<url>http(?:(?!\2).)+)\2\)',
-        r'<embed[^>]+src=(["\'])(?P<url>http(?:(?!\1).)+\.(?:m3u8|mp4|flv)(?:(?!\1).)*)\1',
-    )
-    _THUMBNAIL_REGEXES = (
-        r'<video[^>]+poster="([^"]+)"',
-        r'(?:image|poster)\s*:\s*["\'](http[^"\']+)["\'],',
-    )
 
     _TESTS = [{
-        'note': 'link in `sources`',
-        'url': 'https://uqload.to/dcsu06gdb45o',
-        'md5': '7f8db187b254379440bf4fcad094ae86',
+        'url': 'http://xvideosharing.com/fq65f94nd2ve',
+        'md5': '4181f63957e8fe90ac836fa58dc3c8a6',
         'info_dict': {
-            'id': 'dcsu06gdb45o',
+            'id': 'fq65f94nd2ve',
             'ext': 'mp4',
-            'title': 'f2e31015957e74c8c8427982e161c3fc mp4',
-            'thumbnail': r're:https://.*\.jpg'
-        },
-        'params': {
-            'nocheckcertificate': True,
-        },
-        'expected_warnings': ['Unable to extract JWPlayer data'],
-    }, {
-        'note': 'link in decoded `sources`',
-        'url': 'https://xvideosharing.com/1tlg6agrrdgc',
-        'md5': '2608ce41932c1657ae56258a64e647d9',
-        'info_dict': {
-            'id': '1tlg6agrrdgc',
-            'ext': 'mp4',
-            'title': '0121',
-            'thumbnail': r're:https?://.*\.jpg',
-        },
-        'skip': 'This server is in maintenance mode.',
-    }, {
-        'note': 'JWPlayer link in un-p,a,c,k,e,d JS',
-        'url': 'https://filemoon.sx/e/dw40rxrzruqz',
-        'md5': '5a713742f57ac4aef29b74733e8dda01',
-        'info_dict': {
-            'id': 'dw40rxrzruqz',
-            'title': 'dw40rxrzruqz',
-            'ext': 'mp4'
-        },
-    }, {
-        'note': 'JWPlayer link in un-p,a,c,k,e,d JS',
-        'url': 'https://vadbam.net/6lnbkci96wly.html',
-        'md5': 'a1616800076177e2ac769203957c54bc',
-        'info_dict': {
-            'id': '6lnbkci96wly',
-            'title': 'Heart Crime S01 E03 weciima autos',
-            'ext': 'mp4'
-        },
-    }, {
-        'note': 'JWPlayer link in clear',
-        'url': 'https://w1.viidshar.com/nnibe0xf0h79.html',
-        'md5': 'f0a580ce9df06cc61b4a5c979d672367',
-        'info_dict': {
-            'id': 'nnibe0xf0h79',
-            'title': 'JaGa 68ar',
-            'ext': 'mp4'
-        },
-        'params': {
-            'skip_download': 'ffmpeg',
-        },
-        'expected_warnings': ['hlsnative has detected features it does not support'],
-    }, {
-        'note': 'JWPlayer link in clear',
-        'url': 'https://wolfstream.tv/a3drtehyrg52.html',
-        'md5': '1901d86a79c5e0c6a51bdc9a4cfd3769',
-        'info_dict': {
-            'id': 'a3drtehyrg52',
-            'title': 'NFL 2023 W04 DET@GB',
-            'ext': 'mp4'
+            'title': 'sample',
+            'thumbnail': r're:http://.*\.jpg',
         },
     }, {
         'url': 'https://aparat.cam/n4d6dh0wvlpr',
         'only_matching': True,
-    }, {
-        'url': 'https://uqload.to/ug5somm0ctnk.html',
-        'only_matching': True,
-    }, {
-        'url': 'https://highstream.tv/2owiyz3sjoux',
-        'only_matching': True,
-    }, {
-        'url': 'https://vedbam.xyz/6lnbkci96wly.html',
-        'only_matching': True,
     }]
 
-    @classmethod
-    def _extract_urls(cls, webpage):
-
-        def yield_urls():
-            for regex in cls._EMBED_REGEX:
-                for mobj in re.finditer(regex, webpage):
-                    yield mobj.group('url')
-
-        return list(yield_urls())
+    @staticmethod
+    def _extract_urls(webpage):
+        return [
+            mobj.group('url')
+            for mobj in re.finditer(
+                r'<iframe\b[^>]+\bsrc=(["\'])(?P<url>(?:https?:)?//(?:%s)/embed-[0-9a-zA-Z]+.*?)\1'
+                % '|'.join(site for site in list(zip(*XFileShareIE._SITES))[0]),
+                webpage)]
 
     def _real_extract(self, url):
-        host, video_id = self._match_valid_url(url).group('host', 'id')
+        host, video_id = re.match(self._VALID_URL, url).groups()
 
-        url = 'https://%s/%s' % (
-            host,
-            'embed-%s.html' % video_id if host in ('govid.me', 'vidlo.us') else video_id)
+        url = 'https://%s/' % host + ('embed-%s.html' % video_id if host in ('govid.me', 'vidlo.us') else video_id)
         webpage = self._download_webpage(url, video_id)
-        container_div = get_element_by_id('container', webpage) or webpage
-        if self._search_regex(
-                r'>This server is in maintenance mode\.', container_div,
-                'maint error', group=0, default=None):
-            raise ExtractorError(clean_html(container_div), expected=True)
-        if self._search_regex(
-                self._FILE_NOT_FOUND_REGEXES, container_div,
-                'missing video error', group=0, default=None):
+
+        if any(re.search(p, webpage) for p in self._FILE_NOT_FOUND_REGEXES):
             raise ExtractorError('Video %s does not exist' % video_id, expected=True)
 
         fields = self._hidden_inputs(webpage)
@@ -226,43 +118,59 @@ class XFileShareIE(InfoExtractor):
                     'Content-type': 'application/x-www-form-urlencoded',
                 })
 
-        title = (
-            self._search_regex(self._TITLE_REGEXES, webpage, 'title', default=None)
-            or self._og_search_title(webpage, default=None)
-            or video_id).strip()
+        title = (self._search_regex(
+            (r'style="z-index: [0-9]+;">([^<]+)</span>',
+             r'<td nowrap>([^<]+)</td>',
+             r'h4-fine[^>]*>([^<]+)<',
+             r'>Watch (.+)[ <]',
+             r'<h2 class="video-page-head">([^<]+)</h2>',
+             r'<h2 style="[^"]*color:#403f3d[^"]*"[^>]*>([^<]+)<',  # streamin.to
+             r'title\s*:\s*"([^"]+)"'),  # govid.me
+            webpage, 'title', default=None) or self._og_search_title(
+            webpage, default=None) or video_id).strip()
 
-        obf_code = True
-        while obf_code:
-            for regex, func in (
-                    (r'(?s)(?<!-)\b(eval\(function\(p,a,c,k,e,d\)\{(?:(?!</script>).)+\)\))',
-                     decode_packed_codes),
-                    (r'(ﾟ.+)', aa_decode)):
-                obf_code = self._search_regex(regex, webpage, 'obfuscated code', default=None)
-                if obf_code:
-                    webpage = webpage.replace(obf_code, func(obf_code))
-                    break
+        for regex, func in (
+                (r'(eval\(function\(p,a,c,k,e,d\){.+)', decode_packed_codes),
+                (r'(ﾟ.+)', aa_decode)):
+            obf_code = self._search_regex(regex, webpage, 'obfuscated code', default=None)
+            if obf_code:
+                webpage = webpage.replace(obf_code, func(obf_code))
 
-        jwplayer_data = self._find_jwplayer_data(
-            webpage.replace(r'\'', '\''), video_id)
-        result = self._parse_jwplayer_data(
-            jwplayer_data, video_id, require_title=False,
-            m3u8_id='hls', mpd_id='dash')
+        formats = []
 
-        if not traverse_obj(result, 'formats'):
+        jwplayer_data = self._search_regex(
+            [
+                r'jwplayer\("[^"]+"\)\.load\(\[({.+?})\]\);',
+                r'jwplayer\("[^"]+"\)\.setup\(({.+?})\);',
+            ], webpage,
+            'jwplayer data', default=None)
+        if jwplayer_data:
+            jwplayer_data = self._parse_json(
+                jwplayer_data.replace(r"\'", "'"), video_id, js_to_json)
             if jwplayer_data:
-                self.report_warning(
-                    'Failed to extract JWPlayer formats', video_id=video_id)
-            urls = set()
-            for regex in self._SOURCE_URL_REGEXES:
+                formats = self._parse_jwplayer_data(
+                    jwplayer_data, video_id, False,
+                    m3u8_id='hls', mpd_id='dash')['formats']
+
+        if not formats:
+            urls = []
+            for regex in (
+                    r'(?:file|src)\s*:\s*(["\'])(?P<url>http(?:(?!\1).)+\.(?:m3u8|mp4|flv)(?:(?!\1).)*)\1',
+                    r'file_link\s*=\s*(["\'])(?P<url>http(?:(?!\1).)+)\1',
+                    r'addVariable\((\\?["\'])file\1\s*,\s*(\\?["\'])(?P<url>http(?:(?!\2).)+)\2\)',
+                    r'<embed[^>]+src=(["\'])(?P<url>http(?:(?!\1).)+\.(?:m3u8|mp4|flv)(?:(?!\1).)*)\1'):
                 for mobj in re.finditer(regex, webpage):
-                    urls.add(mobj.group('url'))
+                    video_url = mobj.group('url')
+                    if video_url not in urls:
+                        urls.append(video_url)
 
             sources = self._search_regex(
                 r'sources\s*:\s*(\[(?!{)[^\]]+\])', webpage, 'sources', default=None)
-            urls.update(traverse_obj(sources, (T(lambda s: self._parse_json(s, video_id)), Ellipsis)))
+            if sources:
+                urls.extend(self._parse_json(sources, video_id))
 
             formats = []
-            for video_url in traverse_obj(urls, (Ellipsis, T(url_or_none))):
+            for video_url in urls:
                 if determine_ext(video_url) == 'm3u8':
                     formats.extend(self._extract_m3u8_formats(
                         video_url, video_id, 'mp4',
@@ -273,19 +181,17 @@ class XFileShareIE(InfoExtractor):
                         'url': video_url,
                         'format_id': 'sd',
                     })
-            result = {'formats': formats}
-
-        self._sort_formats(result['formats'])
+        self._sort_formats(formats)
 
         thumbnail = self._search_regex(
-            self._THUMBNAIL_REGEXES, webpage, 'thumbnail', default=None)
+            [
+                r'<video[^>]+poster="([^"]+)"',
+                r'(?:image|poster)\s*:\s*["\'](http[^"\']+)["\'],',
+            ], webpage, 'thumbnail', default=None)
 
-        if not (title or result.get('title')):
-            title = self._generic_title(url) or video_id
-
-        return merge_dicts(result, {
+        return {
             'id': video_id,
-            'title': title or None,
+            'title': title,
             'thumbnail': thumbnail,
-            'http_headers': {'Referer': url}
-        })
+            'formats': formats,
+        }
diff --git a/youtube_dl/extractor/xhamster.py b/youtube_dl/extractor/xhamster.py
index e17947fc6..f73b9778f 100644
--- a/youtube_dl/extractor/xhamster.py
+++ b/youtube_dl/extractor/xhamster.py
@@ -1,4 +1,3 @@
-# coding: utf-8
 from __future__ import unicode_literals
 
 import itertools
@@ -24,7 +23,7 @@ from ..utils import (
 
 
 class XHamsterIE(InfoExtractor):
-    _DOMAINS = r'(?:xhamster\.(?:com|one|desi)|xhms\.pro|xhamster\d+\.com|xhday\.com|xhvid\.com)'
+    _DOMAINS = r'(?:xhamster\.(?:com|one|desi)|xhms\.pro|xhamster\d+\.com)'
     _VALID_URL = r'''(?x)
                     https?://
                         (?:.+?\.)?%s/
@@ -35,7 +34,7 @@ class XHamsterIE(InfoExtractor):
                     ''' % _DOMAINS
     _TESTS = [{
         'url': 'https://xhamster.com/videos/femaleagent-shy-beauty-takes-the-bait-1509445',
-        'md5': '34e1ab926db5dc2750fed9e1f34304bb',
+        'md5': '98b4687efb1ffd331c4197854dc09e8f',
         'info_dict': {
             'id': '1509445',
             'display_id': 'femaleagent-shy-beauty-takes-the-bait',
@@ -44,7 +43,6 @@ class XHamsterIE(InfoExtractor):
             'timestamp': 1350194821,
             'upload_date': '20121014',
             'uploader': 'Ruseful2011',
-            'uploader_id': 'ruseful2011',
             'duration': 893,
             'age_limit': 18,
         },
@@ -74,7 +72,6 @@ class XHamsterIE(InfoExtractor):
             'timestamp': 1454948101,
             'upload_date': '20160208',
             'uploader': 'parejafree',
-            'uploader_id': 'parejafree',
             'duration': 72,
             'age_limit': 18,
         },
@@ -120,12 +117,6 @@ class XHamsterIE(InfoExtractor):
     }, {
         'url': 'http://de.xhamster.com/videos/skinny-girl-fucks-herself-hard-in-the-forest-xhnBJZx',
         'only_matching': True,
-    }, {
-        'url': 'https://xhday.com/videos/strapless-threesome-xhh7yVf',
-        'only_matching': True,
-    }, {
-        'url': 'https://xhvid.com/videos/lk-mm-xhc6wn6',
-        'only_matching': True,
     }]
 
     def _real_extract(self, url):
@@ -254,7 +245,6 @@ class XHamsterIE(InfoExtractor):
             else:
                 categories = None
 
-            uploader_url = url_or_none(try_get(video, lambda x: x['author']['pageURL']))
             return {
                 'id': video_id,
                 'display_id': display_id,
@@ -263,8 +253,6 @@ class XHamsterIE(InfoExtractor):
                 'timestamp': int_or_none(video.get('created')),
                 'uploader': try_get(
                     video, lambda x: x['author']['name'], compat_str),
-                'uploader_url': uploader_url,
-                'uploader_id': uploader_url.split('/')[-1] if uploader_url else None,
                 'thumbnail': video.get('thumbURL'),
                 'duration': int_or_none(video.get('duration')),
                 'view_count': int_or_none(video.get('views')),
@@ -273,7 +261,7 @@ class XHamsterIE(InfoExtractor):
                 'dislike_count': int_or_none(try_get(
                     video, lambda x: x['rating']['dislikes'], int)),
                 'comment_count': int_or_none(video.get('views')),
-                'age_limit': age_limit if age_limit is not None else 18,
+                'age_limit': age_limit,
                 'categories': categories,
                 'formats': formats,
             }
@@ -364,7 +352,6 @@ class XHamsterIE(InfoExtractor):
             'description': description,
             'upload_date': upload_date,
             'uploader': uploader,
-            'uploader_id': uploader.lower() if uploader else None,
             'thumbnail': thumbnail,
             'duration': duration,
             'view_count': view_count,
@@ -433,12 +420,6 @@ class XHamsterUserIE(InfoExtractor):
             'id': 'firatkaan',
         },
         'playlist_mincount': 1,
-    }, {
-        'url': 'https://xhday.com/users/mobhunter',
-        'only_matching': True,
-    }, {
-        'url': 'https://xhvid.com/users/pelushe21',
-        'only_matching': True,
     }]
 
     def _entries(self, user_id):
diff --git a/youtube_dl/extractor/xtube.py b/youtube_dl/extractor/xtube.py
index 7246409e3..18969058f 100644
--- a/youtube_dl/extractor/xtube.py
+++ b/youtube_dl/extractor/xtube.py
@@ -11,7 +11,6 @@ from ..utils import (
     parse_duration,
     sanitized_Request,
     str_to_int,
-    url_or_none,
 )
 
 
@@ -88,10 +87,10 @@ class XTubeIE(InfoExtractor):
                 'Cookie': 'age_verified=1; cookiesAccepted=1',
             })
 
-        title, thumbnail, duration, sources, media_definition = [None] * 5
+        title, thumbnail, duration = [None] * 3
 
         config = self._parse_json(self._search_regex(
-            r'playerConf\s*=\s*({.+?})\s*,\s*(?:\n|loaderConf|playerWrapper)', webpage, 'config',
+            r'playerConf\s*=\s*({.+?})\s*,\s*(?:\n|loaderConf)', webpage, 'config',
             default='{}'), video_id, transform_source=js_to_json, fatal=False)
         if config:
             config = config.get('mainRoll')
@@ -100,52 +99,20 @@ class XTubeIE(InfoExtractor):
                 thumbnail = config.get('poster')
                 duration = int_or_none(config.get('duration'))
                 sources = config.get('sources') or config.get('format')
-                media_definition = config.get('mediaDefinition')
 
-        if not isinstance(sources, dict) and not media_definition:
+        if not isinstance(sources, dict):
             sources = self._parse_json(self._search_regex(
                 r'(["\'])?sources\1?\s*:\s*(?P<sources>{.+?}),',
                 webpage, 'sources', group='sources'), video_id,
                 transform_source=js_to_json)
 
         formats = []
-        format_urls = set()
-
-        if isinstance(sources, dict):
-            for format_id, format_url in sources.items():
-                format_url = url_or_none(format_url)
-                if not format_url:
-                    continue
-                if format_url in format_urls:
-                    continue
-                format_urls.add(format_url)
-                formats.append({
-                    'url': format_url,
-                    'format_id': format_id,
-                    'height': int_or_none(format_id),
-                })
-
-        if isinstance(media_definition, list):
-            for media in media_definition:
-                video_url = url_or_none(media.get('videoUrl'))
-                if not video_url:
-                    continue
-                if video_url in format_urls:
-                    continue
-                format_urls.add(video_url)
-                format_id = media.get('format')
-                if format_id == 'hls':
-                    formats.extend(self._extract_m3u8_formats(
-                        video_url, video_id, 'mp4', entry_protocol='m3u8_native',
-                        m3u8_id='hls', fatal=False))
-                elif format_id == 'mp4':
-                    height = int_or_none(media.get('quality'))
-                    formats.append({
-                        'url': video_url,
-                        'format_id': '%s-%d' % (format_id, height) if height else format_id,
-                        'height': height,
-                    })
-
+        for format_id, format_url in sources.items():
+            formats.append({
+                'url': format_url,
+                'format_id': format_id,
+                'height': int_or_none(format_id),
+            })
         self._remove_duplicate_formats(formats)
         self._sort_formats(formats)
 
diff --git a/youtube_dl/extractor/xvideos.py b/youtube_dl/extractor/xvideos.py
index e63d4690d..8fc64914c 100644
--- a/youtube_dl/extractor/xvideos.py
+++ b/youtube_dl/extractor/xvideos.py
@@ -82,7 +82,7 @@ class XVideosIE(InfoExtractor):
         video_id = self._match_id(url)
 
         webpage = self._download_webpage(
-            'https://www.xvideos.com/video%s/0' % video_id, video_id)
+            'https://www.xvideos.com/video%s/' % video_id, video_id)
 
         mobj = re.search(r'<h1 class="inlineError">(.+?)</h1>', webpage)
         if mobj:
diff --git a/youtube_dl/extractor/yandexmusic.py b/youtube_dl/extractor/yandexmusic.py
index 8da5b430f..84969f8e1 100644
--- a/youtube_dl/extractor/yandexmusic.py
+++ b/youtube_dl/extractor/yandexmusic.py
@@ -106,25 +106,6 @@ class YandexMusicTrackIE(YandexMusicBaseIE):
     }, {
         'url': 'http://music.yandex.com/album/540508/track/4878838',
         'only_matching': True,
-    }, {
-        'url': 'https://music.yandex.ru/album/16302456/track/85430762',
-        'md5': '11b8d50ab03b57738deeaadf661a0a48',
-        'info_dict': {
-            'id': '85430762',
-            'ext': 'mp3',
-            'abr': 128,
-            'title': 'Haddadi Von Engst, Phonic Youth, Super Flu - Til The End (Super Flu Remix)',
-            'filesize': int,
-            'duration': 431.14,
-            'track': 'Til The End (Super Flu Remix)',
-            'album': 'Til The End',
-            'album_artist': 'Haddadi Von Engst, Phonic Youth',
-            'artist': 'Haddadi Von Engst, Phonic Youth, Super Flu',
-            'release_year': 2021,
-            'genre': 'house',
-            'disc_number': 1,
-            'track_number': 2,
-        }
     }]
 
     def _real_extract(self, url):
@@ -135,14 +116,10 @@ class YandexMusicTrackIE(YandexMusicBaseIE):
             'track', tld, url, track_id, 'Downloading track JSON',
             {'track': '%s:%s' % (track_id, album_id)})['track']
         track_title = track['title']
-        track_version = track.get('version')
-        if track_version:
-            track_title = '%s (%s)' % (track_title, track_version)
 
         download_data = self._download_json(
             'https://music.yandex.ru/api/v2.1/handlers/track/%s:%s/web-album_track-track-track-main/download/m' % (track_id, album_id),
             track_id, 'Downloading track location url JSON',
-            query={'hq': 1},
             headers={'X-Retpath-Y': url})
 
         fd_data = self._download_json(
diff --git a/youtube_dl/extractor/youporn.py b/youtube_dl/extractor/youporn.py
index ec6125a79..33114363d 100644
--- a/youtube_dl/extractor/youporn.py
+++ b/youtube_dl/extractor/youporn.py
@@ -1,38 +1,20 @@
-# coding: utf-8
 from __future__ import unicode_literals
 
-import itertools
 import re
-from time import sleep
 
 from .common import InfoExtractor
 from ..utils import (
-    clean_html,
-    extract_attributes,
-    ExtractorError,
-    get_element_by_class,
-    get_element_by_id,
     int_or_none,
-    merge_dicts,
-    parse_count,
-    parse_qs,
-    T,
-    traverse_obj,
+    str_to_int,
+    unescapeHTML,
     unified_strdate,
     url_or_none,
-    urljoin,
 )
+from ..aes import aes_decrypt_text
 
 
 class YouPornIE(InfoExtractor):
-    _VALID_URL = (
-        r'youporn:(?P<id>\d+)',
-        r'''(?x)
-            https?://(?:www\.)?youporn\.com/(?:watch|embed)/(?P<id>\d+)
-            (?:/(?:(?P<display_id>[^/?#&]+)/?)?)?(?:[#?]|$)
-    '''
-    )
-    _EMBED_REGEX = [r'<iframe[^>]+\bsrc=["\'](?P<url>(?:https?:)?//(?:www\.)?youporn\.com/embed/\d+)']
+    _VALID_URL = r'https?://(?:www\.)?youporn\.com/(?:watch|embed)/(?P<id>\d+)(?:/(?P<display_id>[^/?#&]+))?'
     _TESTS = [{
         'url': 'http://www.youporn.com/watch/505835/sex-ed-is-it-safe-to-masturbate-daily/',
         'md5': '3744d24c50438cf5b6f6d59feb5055c2',
@@ -52,7 +34,6 @@ class YouPornIE(InfoExtractor):
             'tags': list,
             'age_limit': 18,
         },
-        'skip': 'This video has been deactivated',
     }, {
         # Unknown uploader
         'url': 'http://www.youporn.com/watch/561726/big-tits-awesome-brunette-on-amazing-webcam-show/?from=related3&al=2&from_id=561726&pos=4',
@@ -84,103 +65,22 @@ class YouPornIE(InfoExtractor):
     }, {
         'url': 'https://www.youporn.com/watch/13922959/femdom-principal/',
         'only_matching': True,
-    }, {
-        'url': 'https://www.youporn.com/watch/16290308/tinderspecial-trailer1/',
-        'info_dict': {
-            'id': '16290308',
-            'age_limit': 18,
-            'categories': [],
-            'description': None,  # SEO spam using title removed
-            'display_id': 'tinderspecial-trailer1',
-            'duration': 298.0,
-            'ext': 'mp4',
-            'upload_date': '20201123',
-            'uploader': 'Ersties',
-            'tags': [],
-            'thumbnail': 'https://fi1.ypncdn.com/m=eaSaaTbWx/202011/23/16290308/original/3.jpg',
-            'timestamp': 1606147564,
-            'title': 'Tinder In Real Life',
-            'view_count': int,
-        }
     }]
 
-    @classmethod
-    def _extract_urls(cls, webpage):
-        def yield_urls():
-            for p in cls._EMBED_REGEX:
-                for m in re.finditer(p, webpage):
-                    yield m.group('url')
-
-        return list(yield_urls())
+    @staticmethod
+    def _extract_urls(webpage):
+        return re.findall(
+            r'<iframe[^>]+\bsrc=["\']((?:https?:)?//(?:www\.)?youporn\.com/embed/\d+)',
+            webpage)
 
     def _real_extract(self, url):
-        # A different video ID (data-video-id) is hidden in the page but
-        # never seems to be used
-        video_id, display_id = self._match_valid_url(url).group('id', 'display_id')
-        url = 'http://www.youporn.com/watch/%s' % (video_id,)
+        mobj = re.match(self._VALID_URL, url)
+        video_id = mobj.group('id')
+        display_id = mobj.group('display_id') or video_id
+
         webpage = self._download_webpage(
-            url, video_id, headers={'Cookie': 'age_verified=1'})
-
-        watchable = self._search_regex(
-            r'''(<div\s[^>]*\bid\s*=\s*('|")?watch-container(?(2)\2|(?!-)\b)[^>]*>)''',
-            webpage, 'watchability', default=None)
-        if not watchable:
-            msg = re.split(r'\s{4}', clean_html(get_element_by_id(
-                'mainContent', webpage)) or '')[0]
-            raise ExtractorError(
-                ('%s says: %s' % (self.IE_NAME, msg))
-                if msg else 'Video unavailable: no reason found',
-                expected=True)
-        # internal ID ?
-        # video_id = extract_attributes(watchable).get('data-video-id')
-
-        playervars = self._search_json(
-            r'\bplayervars\s*:', webpage, 'playervars', video_id)
-
-        def get_fmt(x):
-            v_url = url_or_none(x.get('videoUrl'))
-            if v_url:
-                x['videoUrl'] = v_url
-                return (x['format'], x)
-
-        defs_by_format = dict(traverse_obj(playervars, (
-            'mediaDefinitions', lambda _, v: v.get('format'), T(get_fmt))))
-
-        def get_format_data(f):
-            if f not in defs_by_format:
-                return []
-            return self._download_json(
-                defs_by_format[f]['videoUrl'], video_id, '{0}-formats'.format(f))
-
-        formats = []
-        # Try to extract only the actual master m3u8 first, avoiding the duplicate single resolution "master" m3u8s
-        for hls_url in traverse_obj(
-                get_format_data('hls'),
-                (lambda _, v: not isinstance(v['defaultQuality'], bool), 'videoUrl'),
-                (Ellipsis, 'videoUrl')):
-            formats.extend(self._extract_m3u8_formats(
-                hls_url, video_id, 'mp4', fatal=False, m3u8_id='hls',
-                entry_protocol='m3u8_native'))
-
-        for f in traverse_obj(get_format_data('mp4'), (
-                lambda _, v: v.get('videoUrl'), {
-                    'url': ('videoUrl', T(url_or_none)),
-                    'filesize': ('videoSize', T(int_or_none)),
-                    'height': ('quality', T(int_or_none)),
-                }, T(lambda x: x.get('videoUrl') and x))):
-            # Video URL's path looks like this:
-            #  /201012/17/505835/720p_1500k_505835/YouPorn%20-%20Sex%20Ed%20Is%20It%20Safe%20To%20Masturbate%20Daily.mp4
-            #  /201012/17/505835/vl_240p_240k_505835/YouPorn%20-%20Sex%20Ed%20Is%20It%20Safe%20To%20Masturbate%20Daily.mp4
-            #  /videos/201703/11/109285532/1080P_4000K_109285532.mp4
-            # We will benefit from it by extracting some metadata
-            mobj = re.search(r'(?P<height>\d{3,4})[pP]_(?P<bitrate>\d+)[kK]_\d+', f['videoUrl'])
-            if mobj:
-                if not f.get('height'):
-                    f['height'] = int(mobj.group('height'))
-                f['tbr'] = int(mobj.group('bitrate'))
-                f['format_id'] = '%dp-%dk' % (f['height'], f['tbr'])
-            formats.append(f)
-        self._sort_formats(formats)
+            'http://www.youporn.com/watch/%s' % video_id, display_id,
+            headers={'Cookie': 'age_verified=1'})
 
         title = self._html_search_regex(
             r'(?s)<div[^>]+class=["\']watchVideoTitle[^>]+>(.+?)</div>',
@@ -188,6 +88,65 @@ class YouPornIE(InfoExtractor):
             webpage, default=None) or self._html_search_meta(
             'title', webpage, fatal=True)
 
+        links = []
+
+        # Main source
+        definitions = self._parse_json(
+            self._search_regex(
+                r'mediaDefinition\s*[=:]\s*(\[.+?\])\s*[;,]', webpage,
+                'media definitions', default='[]'),
+            video_id, fatal=False)
+        if definitions:
+            for definition in definitions:
+                if not isinstance(definition, dict):
+                    continue
+                video_url = url_or_none(definition.get('videoUrl'))
+                if video_url:
+                    links.append(video_url)
+
+        # Fallback #1, this also contains extra low quality 180p format
+        for _, link in re.findall(r'<a[^>]+href=(["\'])(http(?:(?!\1).)+\.mp4(?:(?!\1).)*)\1[^>]+title=["\']Download [Vv]ideo', webpage):
+            links.append(link)
+
+        # Fallback #2 (unavailable as at 22.06.2017)
+        sources = self._search_regex(
+            r'(?s)sources\s*:\s*({.+?})', webpage, 'sources', default=None)
+        if sources:
+            for _, link in re.findall(r'[^:]+\s*:\s*(["\'])(http.+?)\1', sources):
+                links.append(link)
+
+        # Fallback #3 (unavailable as at 22.06.2017)
+        for _, link in re.findall(
+                r'(?:videoSrc|videoIpadUrl|html5PlayerSrc)\s*[:=]\s*(["\'])(http.+?)\1', webpage):
+            links.append(link)
+
+        # Fallback #4, encrypted links (unavailable as at 22.06.2017)
+        for _, encrypted_link in re.findall(
+                r'encryptedQuality\d{3,4}URL\s*=\s*(["\'])([\da-zA-Z+/=]+)\1', webpage):
+            links.append(aes_decrypt_text(encrypted_link, title, 32).decode('utf-8'))
+
+        formats = []
+        for video_url in set(unescapeHTML(link) for link in links):
+            f = {
+                'url': video_url,
+            }
+            # Video URL's path looks like this:
+            #  /201012/17/505835/720p_1500k_505835/YouPorn%20-%20Sex%20Ed%20Is%20It%20Safe%20To%20Masturbate%20Daily.mp4
+            #  /201012/17/505835/vl_240p_240k_505835/YouPorn%20-%20Sex%20Ed%20Is%20It%20Safe%20To%20Masturbate%20Daily.mp4
+            #  /videos/201703/11/109285532/1080P_4000K_109285532.mp4
+            # We will benefit from it by extracting some metadata
+            mobj = re.search(r'(?P<height>\d{3,4})[pP]_(?P<bitrate>\d+)[kK]_\d+', video_url)
+            if mobj:
+                height = int(mobj.group('height'))
+                bitrate = int(mobj.group('bitrate'))
+                f.update({
+                    'format_id': '%dp-%dk' % (height, bitrate),
+                    'height': height,
+                    'tbr': bitrate,
+                })
+            formats.append(f)
+        self._sort_formats(formats)
+
         description = self._html_search_regex(
             r'(?s)<div[^>]+\bid=["\']description["\'][^>]*>(.+?)</div>',
             webpage, 'description',
@@ -196,30 +155,28 @@ class YouPornIE(InfoExtractor):
         thumbnail = self._search_regex(
             r'(?:imageurl\s*=|poster\s*:)\s*(["\'])(?P<thumbnail>.+?)\1',
             webpage, 'thumbnail', fatal=False, group='thumbnail')
-        duration = traverse_obj(playervars, ('duration', T(int_or_none)))
-        if duration is None:
-            duration = int_or_none(self._html_search_meta(
-                'video:duration', webpage, 'duration', fatal=False))
+        duration = int_or_none(self._html_search_meta(
+            'video:duration', webpage, 'duration', fatal=False))
 
         uploader = self._html_search_regex(
             r'(?s)<div[^>]+class=["\']submitByLink["\'][^>]*>(.+?)</div>',
             webpage, 'uploader', fatal=False)
         upload_date = unified_strdate(self._html_search_regex(
-            (r'UPLOADED:\s*<span>([^<]+)',
+            [r'UPLOADED:\s*<span>([^<]+)',
              r'Date\s+[Aa]dded:\s*<span>([^<]+)',
-             r'''(?s)<div[^>]+class=["']videoInfo(?:Date|Time)\b[^>]*>(.+?)</div>''',
-             r'(?s)<label\b[^>]*>Uploaded[^<]*</label>\s*<span\b[^>]*>(.+?)</span>'),
+             r'(?s)<div[^>]+class=["\']videoInfo(?:Date|Time)["\'][^>]*>(.+?)</div>'],
             webpage, 'upload date', fatal=False))
 
         age_limit = self._rta_search(webpage)
 
-        view_count = None
-        views = self._search_regex(
-            r'(<div\s[^>]*\bdata-value\s*=[^>]+>)\s*<label>Views:</label>',
-            webpage, 'views', default=None)
-        if views:
-            view_count = parse_count(extract_attributes(views).get('data-value'))
-        comment_count = parse_count(self._search_regex(
+        average_rating = int_or_none(self._search_regex(
+            r'<div[^>]+class=["\']videoRatingPercentage["\'][^>]*>(\d+)%</div>',
+            webpage, 'average rating', fatal=False))
+
+        view_count = str_to_int(self._search_regex(
+            r'(?s)<div[^>]+class=(["\']).*?\bvideoInfoViews\b.*?\1[^>]*>.*?(?P<count>[\d,.]+)<',
+            webpage, 'view count', fatal=False, group='count'))
+        comment_count = str_to_int(self._search_regex(
             r'>All [Cc]omments? \(([\d,.]+)\)',
             webpage, 'comment count', default=None))
 
@@ -235,10 +192,7 @@ class YouPornIE(InfoExtractor):
             r'(?s)Tags:.*?</div>\s*<div[^>]+class=["\']tagBoxContent["\'][^>]*>(.+?)</div>',
             'tags')
 
-        data = self._search_json_ld(webpage, video_id, expected_type='VideoObject', fatal=False) or {}
-        data.pop('url', None)
-
-        result = merge_dicts(data, {
+        return {
             'id': video_id,
             'display_id': display_id,
             'title': title,
@@ -247,448 +201,11 @@ class YouPornIE(InfoExtractor):
             'duration': duration,
             'uploader': uploader,
             'upload_date': upload_date,
+            'average_rating': average_rating,
             'view_count': view_count,
             'comment_count': comment_count,
             'categories': categories,
             'tags': tags,
             'age_limit': age_limit,
             'formats': formats,
-        })
-        # Remove promotional non-description
-        if result.get('description', '').startswith(
-                'Watch %s online' % (result['title'],)):
-            del result['description']
-        return result
-
-
-class YouPornListBase(InfoExtractor):
-    # pattern in '.title-text' element of page section containing videos
-    _PLAYLIST_TITLEBAR_RE = r'\s+[Vv]ideos\s*$'
-    _PAGE_RETRY_COUNT = 0  # ie, no retry
-    _PAGE_RETRY_DELAY = 2  # seconds
-
-    def _get_next_url(self, url, pl_id, html):
-        return urljoin(url, self._search_regex(
-            r'''<a\s[^>]*?\bhref\s*=\s*("|')(?P<url>(?:(?!\1)[^>])+)\1''',
-            get_element_by_id('next', html) or '', 'next page',
-            group='url', default=None))
-
-    @classmethod
-    def _get_title_from_slug(cls, title_slug):
-        return re.sub(r'[_-]', ' ', title_slug)
-
-    def _entries(self, url, pl_id, html=None, page_num=None):
-
-        # separates page sections
-        PLAYLIST_SECTION_RE = (
-            r'''<div\s[^>]*\bclass\s*=\s*('|")(?:[\w$-]+\s+|\s)*?title-bar(?:\s+[\w$-]+|\s)*\1[^>]*>'''
-        )
-        # contains video link
-        VIDEO_URL_RE = r'''(?x)
-            <div\s[^>]*\bdata-video-id\s*=\s*('|")\d+\1[^>]*>\s*
-            (?:<div\b[\s\S]+?</div>\s*)*
-            <a\s[^>]*\bhref\s*=\s*('|")(?P<url>(?:(?!\2)[^>])+)\2
-        '''
-
-        def yield_pages(url, html=html, page_num=page_num):
-            fatal = not html
-            for pnum in itertools.count(start=page_num or 1):
-                if not html:
-                    html = self._download_webpage(
-                        url, pl_id, note='Downloading page %d' % pnum,
-                        fatal=fatal)
-                if not html:
-                    break
-                fatal = False
-                yield (url, html, pnum)
-                # explicit page: extract just that page
-                if page_num is not None:
-                    break
-                next_url = self._get_next_url(url, pl_id, html)
-                if not next_url or next_url == url:
-                    break
-                url, html = next_url, None
-
-        def retry_page(msg, tries_left, page_data):
-            if tries_left <= 0:
-                return
-            self.report_warning(msg, pl_id)
-            sleep(self._PAGE_RETRY_DELAY)
-            return next(
-                yield_pages(page_data[0], page_num=page_data[2]), None)
-
-        def yield_entries(html):
-            for frag in re.split(PLAYLIST_SECTION_RE, html):
-                if not frag:
-                    continue
-                t_text = get_element_by_class('title-text', frag or '')
-                if not (t_text and re.search(self._PLAYLIST_TITLEBAR_RE, t_text)):
-                    continue
-                for m in re.finditer(VIDEO_URL_RE, frag):
-                    video_url = urljoin(url, m.group('url'))
-                    if video_url:
-                        yield self.url_result(video_url)
-
-        last_first_url = None
-        for page_data in yield_pages(url, html=html, page_num=page_num):
-            # page_data: url, html, page_num
-            first_url = None
-            tries_left = self._PAGE_RETRY_COUNT + 1
-            while tries_left > 0:
-                tries_left -= 1
-                for from_ in yield_entries(page_data[1]):
-                    # may get the same page twice instead of empty page
-                    # or (site bug) intead of actual next page
-                    if not first_url:
-                        first_url = from_['url']
-                        if first_url == last_first_url:
-                            # sometimes (/porntags/) the site serves the previous page
-                            # instead but may provide the correct page after a delay
-                            page_data = retry_page(
-                                'Retrying duplicate page...', tries_left, page_data)
-                            if page_data:
-                                first_url = None
-                                break
-                            continue
-                    yield from_
-                else:
-                    if not first_url and 'no-result-paragarph1' in page_data[1]:
-                        page_data = retry_page(
-                            'Retrying empty page...', tries_left, page_data)
-                        if page_data:
-                            continue
-                    else:
-                        # success/failure
-                        break
-            # may get an infinite (?) sequence of empty pages
-            if not first_url:
-                break
-            last_first_url = first_url
-
-    def _real_extract(self, url, html=None):
-        # exceptionally, id may be None
-        m_dict = self._match_valid_url(url).groupdict()
-        pl_id, page_type, sort = (m_dict.get(k) for k in ('id', 'type', 'sort'))
-
-        qs = parse_qs(url)
-        for q, v in qs.items():
-            if v:
-                qs[q] = v[-1]
-            else:
-                del qs[q]
-
-        base_id = pl_id or 'YouPorn'
-        title = self._get_title_from_slug(base_id)
-        if page_type:
-            title = '%s %s' % (page_type.capitalize(), title)
-        base_id = [base_id.lower()]
-        if sort is None:
-            title += ' videos'
-        else:
-            title = '%s videos by %s' % (title, re.sub(r'[_-]', ' ', sort))
-            base_id.append(sort)
-        if qs:
-            ps = ['%s=%s' % item for item in sorted(qs.items())]
-            title += ' (%s)' % ','.join(ps)
-            base_id.extend(ps)
-        pl_id = '/'.join(base_id)
-
-        return self.playlist_result(
-            self._entries(url, pl_id, html=html,
-                          page_num=int_or_none(qs.get('page'))),
-            playlist_id=pl_id, playlist_title=title)
-
-
-class YouPornCategoryIE(YouPornListBase):
-    IE_DESC = 'YouPorn category, with sorting, filtering and pagination'
-    _VALID_URL = r'''(?x)
-        https?://(?:www\.)?youporn\.com/
-        (?P<type>category)/(?P<id>[^/?#&]+)
-        (?:/(?P<sort>popular|views|rating|time|duration))?/?(?:[#?]|$)
-    '''
-    _TESTS = [{
-        'note': 'Full list with pagination',
-        'url': 'https://www.youporn.com/category/lingerie/popular/',
-        'info_dict': {
-            'id': 'lingerie/popular',
-            'title': 'Category lingerie videos by popular',
-        },
-        'playlist_mincount': 39,
-    }, {
-        'note': 'Filtered paginated list with single page result',
-        'url': 'https://www.youporn.com/category/lingerie/duration/?min_minutes=10',
-        'info_dict': {
-            'id': 'lingerie/duration/min_minutes=10',
-            'title': 'Category lingerie videos by duration (min_minutes=10)',
-        },
-        'playlist_maxcount': 30,
-    }, {
-        'note': 'Single page of full list',
-        'url': 'https://www.youporn.com/category/lingerie/popular?page=1',
-        'info_dict': {
-            'id': 'lingerie/popular/page=1',
-            'title': 'Category lingerie videos by popular (page=1)',
-        },
-        'playlist_count': 30,
-    }]
-
-
-class YouPornChannelIE(YouPornListBase):
-    IE_DESC = 'YouPorn channel, with sorting and pagination'
-    _VALID_URL = r'''(?x)
-        https?://(?:www\.)?youporn\.com/
-        (?P<type>channel)/(?P<id>[^/?#&]+)
-        (?:/(?P<sort>rating|views|duration))?/?(?:[#?]|$)
-    '''
-    _TESTS = [{
-        'note': 'Full list with pagination',
-        'url': 'https://www.youporn.com/channel/x-feeds/',
-        'info_dict': {
-            'id': 'x-feeds',
-            'title': 'Channel X-Feeds videos',
-        },
-        'playlist_mincount': 37,
-    }, {
-        'note': 'Single page of full list (no filters here)',
-        'url': 'https://www.youporn.com/channel/x-feeds/duration?page=1',
-        'info_dict': {
-            'id': 'x-feeds/duration/page=1',
-            'title': 'Channel X-Feeds videos by duration (page=1)',
-        },
-        'playlist_count': 24,
-    }]
-
-    @staticmethod
-    def _get_title_from_slug(title_slug):
-        return re.sub(r'_', ' ', title_slug).title()
-
-
-class YouPornCollectionIE(YouPornListBase):
-    IE_DESC = 'YouPorn collection (user playlist), with sorting and pagination'
-    _VALID_URL = r'''(?x)
-        https?://(?:www\.)?youporn\.com/
-        (?P<type>collection)s/videos/(?P<id>\d+)
-        (?:/(?P<sort>rating|views|time|duration))?/?(?:[#?]|$)
-    '''
-    _PLAYLIST_TITLEBAR_RE = r'^\s*Videos\s+in\s'
-    _TESTS = [{
-        'note': 'Full list with pagination',
-        'url': 'https://www.youporn.com/collections/videos/33044251/',
-        'info_dict': {
-            'id': '33044251',
-            'title': 'Collection Sexy Lips videos',
-            'uploader': 'ph-littlewillyb',
-        },
-        'playlist_mincount': 50,
-    }, {
-        'note': 'Single page of full list (no filters here)',
-        'url': 'https://www.youporn.com/collections/videos/33044251/time?page=1',
-        'info_dict': {
-            'id': '33044251/time/page=1',
-            'title': 'Collection Sexy Lips videos by time (page=1)',
-            'uploader': 'ph-littlewillyb',
-        },
-        'playlist_count': 20,
-    }]
-
-    def _real_extract(self, url):
-        pl_id = self._match_id(url)
-        html = self._download_webpage(url, pl_id)
-        playlist = super(YouPornCollectionIE, self)._real_extract(url, html=html)
-        infos = re.sub(r'\s+', ' ', clean_html(get_element_by_class(
-            'collection-infos', html)) or '')
-        title, uploader = self._search_regex(
-            r'^\s*Collection: (?P<title>.+?) \d+ VIDEOS \d+ VIEWS \d+ days LAST UPDATED From: (?P<uploader>[\w_-]+)',
-            infos, 'title/uploader', group=('title', 'uploader'), default=(None, None))
-
-        return merge_dicts({
-            'title': playlist['title'].replace(playlist['id'].split('/')[0], title),
-            'uploader': uploader,
-        }, playlist) if title else playlist
-
-
-class YouPornTagIE(YouPornListBase):
-    IE_DESC = 'YouPorn tag (porntags), with sorting, filtering and pagination'
-    _VALID_URL = r'''(?x)
-        https?://(?:www\.)?youporn\.com/
-        porn(?P<type>tag)s/(?P<id>[^/?#&]+)
-        (?:/(?P<sort>views|rating|time|duration))?/?(?:[#?]|$)
-    '''
-    _PLAYLIST_TITLEBAR_RE = r'^\s*Videos\s+tagged\s'
-    _PAGE_RETRY_COUNT = 1
-    _TESTS = [{
-        'note': 'Full list with pagination',
-        'url': 'https://www.youporn.com/porntags/austrian',
-        'info_dict': {
-            'id': 'austrian',
-            'title': 'Tag austrian videos',
-        },
-        'playlist_mincount': 35,
-        'expected_warnings': ['Retrying duplicate page'],
-    }, {
-        'note': 'Filtered paginated list with single page result',
-        'url': 'https://www.youporn.com/porntags/austrian/duration/?min_minutes=10',
-        'info_dict': {
-            'id': 'austrian/duration/min_minutes=10',
-            'title': 'Tag austrian videos by duration (min_minutes=10)',
-        },
-        # number of videos per page is (row x col) 2x3 + 6x4 + 2, or + 3,
-        # or more, varying with number of ads; let's set max as 9x4
-        # NB col 1 may not be shown in non-JS page with site CSS and zoom 100%
-        'playlist_maxcount': 32,
-        'expected_warnings': ['Retrying duplicate page', 'Retrying empty page'],
-    }, {
-        'note': 'Single page of full list',
-        'url': 'https://www.youporn.com/porntags/austrian/?page=1',
-        'info_dict': {
-            'id': 'austrian/page=1',
-            'title': 'Tag austrian videos (page=1)',
-        },
-        'playlist_mincount': 32,
-        'playlist_maxcount': 34,
-        'expected_warnings': ['Retrying duplicate page', 'Retrying empty page'],
-    }]
-
-    # YP tag navigation is broken, loses sort
-    def _get_next_url(self, url, pl_id, html):
-        next_url = super(YouPornTagIE, self)._get_next_url(url, pl_id, html)
-        if next_url:
-            n = self._match_valid_url(next_url)
-            if n:
-                s = n.groupdict().get('sort')
-            if s:
-                u = self._match_valid_url(url)
-                if u:
-                    u = u.groupdict().get('sort')
-                    if s and not u:
-                        n = n.end('sort')
-                        next_url = next_url[:n] + '/' + u + next_url[n:]
-        return next_url
-
-
-class YouPornStarIE(YouPornListBase):
-    IE_DESC = 'YouPorn Pornstar, with description, sorting and pagination'
-    _VALID_URL = r'''(?x)
-        https?://(?:www\.)?youporn\.com/
-        (?P<type>pornstar)/(?P<id>[^/?#&]+)
-        (?:/(?P<sort>rating|views|duration))?/?(?:[#?]|$)
-    '''
-    _PLAYLIST_TITLEBAR_RE = r'^\s*Videos\s+[fF]eaturing\s'
-    _TESTS = [{
-        'note': 'Full list with pagination',
-        'url': 'https://www.youporn.com/pornstar/daynia/',
-        'info_dict': {
-            'id': 'daynia',
-            'title': 'Pornstar Daynia videos',
-            'description': r're:Daynia Rank \d+ Videos \d+ Views [\d,.]+ .+ Subscribers \d+',
-        },
-        'playlist_mincount': 45,
-    }, {
-        'note': 'Single page of full list (no filters here)',
-        'url': 'https://www.youporn.com/pornstar/daynia/?page=1',
-        'info_dict': {
-            'id': 'daynia/page=1',
-            'title': 'Pornstar Daynia videos (page=1)',
-            'description': 're:.{180,}',
-        },
-        'playlist_count': 26,
-    }]
-
-    @staticmethod
-    def _get_title_from_slug(title_slug):
-        return re.sub(r'_', ' ', title_slug).title()
-
-    def _real_extract(self, url):
-        pl_id = self._match_id(url)
-        html = self._download_webpage(url, pl_id)
-        playlist = super(YouPornStarIE, self)._real_extract(url, html=html)
-        INFO_ELEMENT_RE = r'''(?x)
-            <div\s[^>]*\bclass\s*=\s*('|")(?:[\w$-]+\s+|\s)*?pornstar-info-wrapper(?:\s+[\w$-]+|\s)*\1[^>]*>
-            (?P<info>[\s\S]+?)(?:</div>\s*){6,}
-        '''
-
-        infos = self._search_regex(INFO_ELEMENT_RE, html, 'infos', group='info', default='')
-        if infos:
-            infos = re.sub(
-                r'(?:\s*nl=nl)+\s*', ' ',
-                re.sub(r'(?u)\s+', ' ', clean_html(
-                    re.sub('\n', 'nl=nl', infos)))).replace('ribe Subsc', '')
-
-        return merge_dicts({
-            'description': infos.strip() or None,
-        }, playlist)
-
-
-class YouPornVideosIE(YouPornListBase):
-    IE_DESC = 'YouPorn video (browse) playlists, with sorting, filtering and pagination'
-    _VALID_URL = r'''(?x)
-        https?://(?:www\.)?youporn\.com/
-            (?:(?P<id>browse)/)?
-            (?P<sort>(?(id)
-                (?:duration|rating|time|views)|
-                (?:most_(?:favou?rit|view)ed|recommended|top_rated)?))
-            (?:[/#?]|$)
-    '''
-    _PLAYLIST_TITLEBAR_RE = r'\s+(?:[Vv]ideos|VIDEOS)\s*$'
-    _TESTS = [{
-        'note': 'Full list with pagination (too long for test)',
-        'url': 'https://www.youporn.com/',
-        'info_dict': {
-            'id': 'youporn',
-            'title': 'YouPorn videos',
-        },
-        'only_matching': True,
-    }, {
-        'note': 'Full list with pagination (too long for test)',
-        'url': 'https://www.youporn.com/recommended',
-        'info_dict': {
-            'id': 'youporn/recommended',
-            'title': 'YouPorn videos by recommended',
-        },
-        'only_matching': True,
-    }, {
-        'note': 'Full list with pagination (too long for test)',
-        'url': 'https://www.youporn.com/top_rated',
-        'info_dict': {
-            'id': 'youporn/top_rated',
-            'title': 'YouPorn videos by top rated',
-        },
-        'only_matching': True,
-    }, {
-        'note': 'Full list with pagination (too long for test)',
-        'url': 'https://www.youporn.com/browse/time',
-        'info_dict': {
-            'id': 'browse/time',
-            'title': 'YouPorn videos by time',
-        },
-        'only_matching': True,
-    }, {
-        'note': 'Filtered paginated list with single page result',
-        'url': 'https://www.youporn.com/most_favorited/?res=VR&max_minutes=2',
-        'info_dict': {
-            'id': 'youporn/most_favorited/max_minutes=2/res=VR',
-            'title': 'YouPorn videos by most favorited (max_minutes=2,res=VR)',
-        },
-        'playlist_mincount': 10,
-        'playlist_maxcount': 28,
-    }, {
-        'note': 'Filtered paginated list with several pages',
-        'url': 'https://www.youporn.com/most_favorited/?res=VR&max_minutes=5',
-        'info_dict': {
-            'id': 'youporn/most_favorited/max_minutes=5/res=VR',
-            'title': 'YouPorn videos by most favorited (max_minutes=5,res=VR)',
-        },
-        'playlist_mincount': 45,
-    }, {
-        'note': 'Single page of full list',
-        'url': 'https://www.youporn.com/browse/time?page=1',
-        'info_dict': {
-            'id': 'browse/time/page=1',
-            'title': 'YouPorn videos by time (page=1)',
-        },
-        'playlist_count': 36,
-    }]
-
-    @staticmethod
-    def _get_title_from_slug(title_slug):
-        return 'YouPorn' if title_slug == 'browse' else title_slug
+        }
diff --git a/youtube_dl/extractor/youtube.py b/youtube_dl/extractor/youtube.py
index b31798729..6b4c7912c 100644
--- a/youtube_dl/extractor/youtube.py
+++ b/youtube_dl/extractor/youtube.py
@@ -2,78 +2,52 @@
 
 from __future__ import unicode_literals
 
-import collections
-import hashlib
 import itertools
 import json
 import os.path
 import random
 import re
-import string
-import time
 import traceback
 
 from .common import InfoExtractor, SearchInfoExtractor
 from ..compat import (
     compat_chr,
     compat_HTTPError,
-    compat_map as map,
+    compat_parse_qs,
     compat_str,
-    compat_urllib_parse,
-    compat_urllib_parse_parse_qs as compat_parse_qs,
     compat_urllib_parse_unquote_plus,
+    compat_urllib_parse_urlencode,
     compat_urllib_parse_urlparse,
-    compat_zip as zip,
+    compat_urlparse,
 )
 from ..jsinterp import JSInterpreter
 from ..utils import (
-    bug_reports_message,
+    ExtractorError,
     clean_html,
     dict_get,
-    error_to_compat_str,
-    ExtractorError,
-    filter_dict,
     float_or_none,
-    get_first,
-    extract_attributes,
-    get_element_by_attribute,
     int_or_none,
-    join_nonempty,
-    js_to_json,
-    LazyList,
-    merge_dicts,
     mimetype2ext,
-    NO_DEFAULT,
     parse_codecs,
-    parse_count,
     parse_duration,
-    parse_qs,
     qualities,
-    remove_end,
     remove_start,
     smuggle_url,
     str_or_none,
     str_to_int,
-    T,
-    traverse_obj,
-    try_call,
     try_get,
-    txt_or_none,
     unescapeHTML,
     unified_strdate,
     unsmuggle_url,
-    update_url,
     update_url_query,
     url_or_none,
     urlencode_postdata,
     urljoin,
-    variadic,
 )
 
 
 class YoutubeBaseInfoExtractor(InfoExtractor):
     """Provide base functions for Youtube extractors"""
-
     _LOGIN_URL = 'https://accounts.google.com/ServiceLogin'
     _TWOFACTOR_URL = 'https://accounts.google.com/signin/challenge'
 
@@ -87,66 +61,14 @@ class YoutubeBaseInfoExtractor(InfoExtractor):
 
     _PLAYLIST_ID_RE = r'(?:(?:PL|LL|EC|UU|FL|RD|UL|TL|PU|OLAK5uy_)[0-9A-Za-z-_]{10,}|RDMM)'
 
-    _INNERTUBE_CLIENTS = {
-        'ios': {
-            'INNERTUBE_CONTEXT': {
-                'client': {
-                    'clientName': 'IOS',
-                    'clientVersion': '20.10.4',
-                    'deviceMake': 'Apple',
-                    'deviceModel': 'iPhone16,2',
-                    'userAgent': 'com.google.ios.youtube/20.10.4 (iPhone16,2; U; CPU iOS 18_3_2 like Mac OS X;)',
-                    'osName': 'iPhone',
-                    'osVersion': '18.3.2.22D82',
-                },
-            },
-            'INNERTUBE_CONTEXT_CLIENT_NAME': 5,
-            'REQUIRE_JS_PLAYER': False,
-            'REQUIRE_PO_TOKEN': True,
-        },
-        # mweb has 'ultralow' formats
-        # See: https://github.com/yt-dlp/yt-dlp/pull/557
-        'mweb': {
-            'INNERTUBE_CONTEXT': {
-                'client': {
-                    'clientName': 'MWEB',
-                    'clientVersion': '2.20250311.03.00',
-                    # mweb previously did not require PO Token with this UA
-                    'userAgent': 'Mozilla/5.0 (iPad; CPU OS 16_7_10 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/16.6 Mobile/15E148 Safari/604.1,gzip(gfe)',
-                },
-            },
-            'INNERTUBE_CONTEXT_CLIENT_NAME': 2,
-            'REQUIRE_PO_TOKEN': True,
-            'SUPPORTS_COOKIES': True,
-        },
-        'tv': {
-            'INNERTUBE_CONTEXT': {
-                'client': {
-                    'clientName': 'TVHTML5',
-                    'clientVersion': '7.20250312.16.00',
-                    'userAgent': 'Mozilla/5.0 (ChromiumStylePlatform) Cobalt/Version',
-                },
-            },
-            'INNERTUBE_CONTEXT_CLIENT_NAME': 7,
-            'SUPPORTS_COOKIES': True,
-        },
-        'web': {
-            'INNERTUBE_CONTEXT': {
-                'client': {
-                    'clientName': 'WEB',
-                    'clientVersion': '2.20250312.04.00',
-                },
-            },
-            'INNERTUBE_CONTEXT_CLIENT_NAME': 1,
-            'REQUIRE_PO_TOKEN': True,
-            'SUPPORTS_COOKIES': True,
-        },
-    }
+    def _ids_to_results(self, ids):
+        return [
+            self.url_result(vid_id, 'Youtube', video_id=vid_id)
+            for vid_id in ids]
 
     def _login(self):
         """
         Attempt to log in to YouTube.
-
         True is returned if successful or skipped.
         False is returned if login failed.
 
@@ -202,7 +124,7 @@ class YoutubeBaseInfoExtractor(InfoExtractor):
                 [2, 1, None, 1,
                  'https://accounts.google.com/ServiceLogin?passive=true&continue=https%3A%2F%2Fwww.youtube.com%2Fsignin%3Fnext%3D%252F%26action_handle_signin%3Dtrue%26hl%3Den%26app%3Ddesktop%26feature%3Dsign_in_button&hl=en&service=youtube&uilel=3&requestPath=%2FServiceLogin&Page=PasswordSeparationSignIn',
                  None, [], 4],
-                1, [None, None, []], None, None, None, True,
+                1, [None, None, []], None, None, None, True
             ],
             username,
         ]
@@ -224,7 +146,7 @@ class YoutubeBaseInfoExtractor(InfoExtractor):
             None, 1, None, [1, None, None, None, [password, None, True]],
             [
                 None, None, [2, 1, None, 1, 'https://accounts.google.com/ServiceLogin?passive=true&continue=https%3A%2F%2Fwww.youtube.com%2Fsignin%3Fnext%3D%252F%26action_handle_signin%3Dtrue%26hl%3Den%26app%3Ddesktop%26feature%3Dsign_in_button&hl=en&service=youtube&uilel=3&requestPath=%2FServiceLogin&Page=PasswordSeparationSignIn', None, [], 4],
-                1, [None, None, []], None, None, None, True,
+                1, [None, None, []], None, None, None, True
             ]]
 
         challenge_results = req(
@@ -277,7 +199,7 @@ class YoutubeBaseInfoExtractor(InfoExtractor):
                     user_hash, None, 2, None,
                     [
                         9, None, None, None, None, None, None, None,
-                        [None, tfa_code, True, 2],
+                        [None, tfa_code, True, 2]
                     ]]
 
                 tfa_results = req(
@@ -331,10 +253,16 @@ class YoutubeBaseInfoExtractor(InfoExtractor):
         cookies = self._get_cookies('https://www.youtube.com/')
         if cookies.get('__Secure-3PSID'):
             return
-        socs = cookies.get('SOCS')
-        if socs and not socs.value.startswith('CAA'):  # not consented
-            return
-        self._set_cookie('.youtube.com', 'SOCS', 'CAI', secure=True)  # accept all (required for mixes)
+        consent_id = None
+        consent = cookies.get('CONSENT')
+        if consent:
+            if 'YES' in consent.value:
+                return
+            consent_id = self._search_regex(
+                r'PENDING\+(\d+)', consent.value, 'consent', default=None)
+        if not consent_id:
+            consent_id = random.randint(100, 999)
+        self._set_cookie('.youtube.com', 'CONSENT', 'YES+cb.20210328-17-p0.en+FX+%s' % consent_id)
 
     def _real_initialize(self):
         self._initialize_consent()
@@ -343,57 +271,29 @@ class YoutubeBaseInfoExtractor(InfoExtractor):
         if not self._login():
             return
 
-    _DEFAULT_API_DATA = {'context': _INNERTUBE_CLIENTS['web']['INNERTUBE_CONTEXT']}
+    _DEFAULT_API_DATA = {
+        'context': {
+            'client': {
+                'clientName': 'WEB',
+                'clientVersion': '2.20201021.03.00',
+            }
+        },
+    }
 
     _YT_INITIAL_DATA_RE = r'(?:window\s*\[\s*["\']ytInitialData["\']\s*\]|ytInitialData)\s*=\s*({.+?})\s*;'
     _YT_INITIAL_PLAYER_RESPONSE_RE = r'ytInitialPlayerResponse\s*=\s*({.+?})\s*;'
     _YT_INITIAL_BOUNDARY_RE = r'(?:var\s+meta|</script|\n)'
 
-    _SAPISID = None
-
-    def _generate_sapisidhash_header(self, origin='https://www.youtube.com'):
-        time_now = round(time.time())
-        if self._SAPISID is None:
-            yt_cookies = self._get_cookies('https://www.youtube.com')
-            # Sometimes SAPISID cookie isn't present but __Secure-3PAPISID is.
-            # See: https://github.com/yt-dlp/yt-dlp/issues/393
-            sapisid_cookie = dict_get(
-                yt_cookies, ('__Secure-3PAPISID', 'SAPISID'))
-            if sapisid_cookie and sapisid_cookie.value:
-                self._SAPISID = sapisid_cookie.value
-                self.write_debug('Extracted SAPISID cookie')
-                # SAPISID cookie is required if not already present
-                if not yt_cookies.get('SAPISID'):
-                    self.write_debug('Copying __Secure-3PAPISID cookie to SAPISID cookie')
-                    self._set_cookie(
-                        '.youtube.com', 'SAPISID', self._SAPISID, secure=True, expire_time=time_now + 3600)
-            else:
-                self._SAPISID = False
-        if not self._SAPISID:
-            return None
-        # SAPISIDHASH algorithm from https://stackoverflow.com/a/32065323
-        sapisidhash = hashlib.sha1(
-            '{0} {1} {2}'.format(time_now, self._SAPISID, origin).encode('utf-8')).hexdigest()
-        return 'SAPISIDHASH {0}_{1}'.format(time_now, sapisidhash)
-
-    def _call_api(self, ep, query, video_id, fatal=True, headers=None,
-                  note='Downloading API JSON'):
+    def _call_api(self, ep, query, video_id, fatal=True):
         data = self._DEFAULT_API_DATA.copy()
         data.update(query)
-        real_headers = {'content-type': 'application/json'}
-        if headers:
-            real_headers.update(headers)
 
-        # was: 'AIzaSyAO_FJ2SlqU8Q4STEHLGCilw_Y9_11qcW8'
-        api_key = self.get_param('youtube_innertube_key')
         return self._download_json(
             'https://www.youtube.com/youtubei/v1/%s' % ep, video_id=video_id,
-            note=note, errnote='Unable to download API page',
+            note='Downloading API JSON', errnote='Unable to download API page',
             data=json.dumps(data).encode('utf8'), fatal=fatal,
-            headers=real_headers, query=filter_dict({
-                'key': api_key,
-                'prettyPrint': 'false',
-            }))
+            headers={'content-type': 'application/json'},
+            query={'key': 'AIzaSyAO_FJ2SlqU8Q4STEHLGCilw_Y9_11qcW8'})
 
     def _extract_yt_initial_data(self, video_id, webpage):
         return self._parse_json(
@@ -402,35 +302,18 @@ class YoutubeBaseInfoExtractor(InfoExtractor):
                  self._YT_INITIAL_DATA_RE), webpage, 'yt initial data'),
             video_id)
 
-    def _extract_visitor_data(self, *args):
-        """
-        Extract visitorData from an API response or ytcfg
-
-        Appears to be used to track session state
-        """
-        visitor_data = self.get_param('youtube_visitor_data')
-        if visitor_data:
-            return visitor_data
-
-        return get_first(
-            args, (('VISITOR_DATA',
-                    ('INNERTUBE_CONTEXT', 'client', 'visitorData'),
-                    ('responseContext', 'visitorData')),
-                   T(compat_str)))
-
     def _extract_ytcfg(self, video_id, webpage):
         return self._parse_json(
             self._search_regex(
                 r'ytcfg\.set\s*\(\s*({.+?})\s*\)\s*;', webpage, 'ytcfg',
-                default='{}'), video_id, fatal=False) or {}
+                default='{}'), video_id, fatal=False)
 
     def _extract_video(self, renderer):
         video_id = renderer['videoId']
         title = try_get(
             renderer,
             (lambda x: x['title']['runs'][0]['text'],
-             lambda x: x['title']['simpleText'],
-             lambda x: x['headline']['simpleText']), compat_str)
+             lambda x: x['title']['simpleText']), compat_str)
         description = try_get(
             renderer, lambda x: x['descriptionSnippet']['runs'][0]['text'],
             compat_str)
@@ -457,140 +340,6 @@ class YoutubeBaseInfoExtractor(InfoExtractor):
             'uploader': uploader,
         }
 
-    @staticmethod
-    def _extract_thumbnails(data, *path_list, **kw_final_key):
-        """
-        Extract thumbnails from thumbnails dict
-        @param path_list: path list to level that contains 'thumbnails' key
-        """
-        final_key = kw_final_key.get('final_key', 'thumbnails')
-
-        return traverse_obj(data, ((
-            tuple(variadic(path) + (final_key, Ellipsis)
-                  for path in path_list or [()])), {
-            'url': ('url', T(url_or_none),
-                    # Sometimes youtube gives a wrong thumbnail URL. See:
-                    # https://github.com/yt-dlp/yt-dlp/issues/233
-                    # https://github.com/ytdl-org/youtube-dl/issues/28023
-                    T(lambda u: update_url(u, query=None) if u and 'maxresdefault' in u else u)),
-            'height': ('height', T(int_or_none)),
-            'width': ('width', T(int_or_none)),
-        }, T(lambda t: t if t.get('url') else None)))
-
-    def _search_results(self, query, params):
-        data = {
-            'context': {
-                'client': {
-                    'clientName': 'WEB',
-                    'clientVersion': '2.20201021.03.00',
-                },
-            },
-            'query': query,
-        }
-        if params:
-            data['params'] = params
-        for page_num in itertools.count(1):
-            search = self._download_json(
-                'https://www.youtube.com/youtubei/v1/search',
-                video_id='query "%s"' % query,
-                note='Downloading page %s' % page_num,
-                errnote='Unable to download API page', fatal=False,
-                data=json.dumps(data).encode('utf8'),
-                query={
-                    # 'key': 'AIzaSyAO_FJ2SlqU8Q4STEHLGCilw_Y9_11qcW8',
-                    'prettyPrint': 'false',
-                },
-                headers={'content-type': 'application/json'})
-            if not search:
-                break
-            slr_contents = try_get(
-                search,
-                (lambda x: x['contents']['twoColumnSearchResultsRenderer']['primaryContents']['sectionListRenderer']['contents'],
-                 lambda x: x['onResponseReceivedCommands'][0]['appendContinuationItemsAction']['continuationItems']),
-                list)
-            if not slr_contents:
-                break
-            for slr_content in slr_contents:
-                isr_contents = try_get(
-                    slr_content,
-                    lambda x: x['itemSectionRenderer']['contents'],
-                    list)
-                if not isr_contents:
-                    continue
-                for content in isr_contents:
-                    if not isinstance(content, dict):
-                        continue
-                    video = content.get('videoRenderer')
-                    if not isinstance(video, dict):
-                        continue
-                    video_id = video.get('videoId')
-                    if not video_id:
-                        continue
-                    yield self._extract_video(video)
-            token = try_get(
-                slr_contents,
-                lambda x: x[-1]['continuationItemRenderer']['continuationEndpoint']['continuationCommand']['token'],
-                compat_str)
-            if not token:
-                break
-            data['continuation'] = token
-
-    @staticmethod
-    def _owner_endpoints_path():
-        return [
-            Ellipsis,
-            lambda k, _: k.endswith('SecondaryInfoRenderer'),
-            ('owner', 'videoOwner'), 'videoOwnerRenderer', 'title',
-            'runs', Ellipsis]
-
-    def _extract_channel_id(self, webpage, videodetails={}, metadata={}, renderers=[]):
-        channel_id = None
-        if any((videodetails, metadata, renderers)):
-            channel_id = (
-                traverse_obj(videodetails, 'channelId')
-                or traverse_obj(metadata, 'externalChannelId', 'externalId')
-                or traverse_obj(renderers,
-                                self._owner_endpoints_path() + [
-                                    'navigationEndpoint', 'browseEndpoint', 'browseId'],
-                                get_all=False)
-            )
-        return channel_id or self._html_search_meta(
-            'channelId', webpage, 'channel id', default=None)
-
-    def _extract_author_var(self, webpage, var_name,
-                            videodetails={}, metadata={}, renderers=[]):
-        result = None
-        paths = {
-            #       (HTML, videodetails, metadata, renderers)
-            'name': ('content', 'author', (('ownerChannelName', None), 'title'), ['text']),
-            'url': ('href', 'ownerProfileUrl', 'vanityChannelUrl',
-                    ['navigationEndpoint', 'browseEndpoint', 'canonicalBaseUrl']),
-        }
-        if any((videodetails, metadata, renderers)):
-            result = (
-                traverse_obj(videodetails, paths[var_name][1], get_all=False)
-                or traverse_obj(metadata, paths[var_name][2], get_all=False)
-                or traverse_obj(renderers,
-                                self._owner_endpoints_path() + paths[var_name][3],
-                                get_all=False)
-            )
-        return result or traverse_obj(
-            extract_attributes(self._search_regex(
-                r'''(?s)(<link\b[^>]+\bitemprop\s*=\s*("|')%s\2[^>]*>)'''
-                % re.escape(var_name),
-                get_element_by_attribute('itemprop', 'author', webpage or '') or '',
-                'author link', default='')),
-            paths[var_name][0])
-
-    @staticmethod
-    def _yt_urljoin(url_or_path):
-        return urljoin('https://www.youtube.com', url_or_path)
-
-    def _extract_uploader_id(self, uploader_url):
-        return self._search_regex(
-            r'/(?:(?:channel|user)/|(?=@))([^/?&#]+)', uploader_url or '',
-            'uploader id', default=None)
-
 
 class YoutubeIE(YoutubeBaseInfoExtractor):
     IE_DESC = 'YouTube.com'
@@ -605,41 +354,26 @@ class YoutubeIE(YoutubeBaseInfoExtractor):
         r'(?:www\.)?invidious\.13ad\.de',
         r'(?:www\.)?invidious\.mastodon\.host',
         r'(?:www\.)?invidious\.zapashcanon\.fr',
-        r'(?:www\.)?(?:invidious(?:-us)?|piped)\.kavin\.rocks',
-        r'(?:www\.)?invidious\.tinfoil-hat\.net',
-        r'(?:www\.)?invidious\.himiko\.cloud',
-        r'(?:www\.)?invidious\.reallyancient\.tech',
+        r'(?:www\.)?invidious\.kavin\.rocks',
         r'(?:www\.)?invidious\.tube',
         r'(?:www\.)?invidiou\.site',
         r'(?:www\.)?invidious\.site',
         r'(?:www\.)?invidious\.xyz',
         r'(?:www\.)?invidious\.nixnet\.xyz',
-        r'(?:www\.)?invidious\.048596\.xyz',
         r'(?:www\.)?invidious\.drycat\.fr',
-        r'(?:www\.)?inv\.skyn3t\.in',
         r'(?:www\.)?tube\.poal\.co',
         r'(?:www\.)?tube\.connect\.cafe',
         r'(?:www\.)?vid\.wxzm\.sx',
         r'(?:www\.)?vid\.mint\.lgbt',
-        r'(?:www\.)?vid\.puffyan\.us',
         r'(?:www\.)?yewtu\.be',
         r'(?:www\.)?yt\.elukerio\.org',
         r'(?:www\.)?yt\.lelux\.fi',
         r'(?:www\.)?invidious\.ggc-project\.de',
         r'(?:www\.)?yt\.maisputain\.ovh',
-        r'(?:www\.)?ytprivate\.com',
         r'(?:www\.)?invidious\.13ad\.de',
         r'(?:www\.)?invidious\.toot\.koeln',
         r'(?:www\.)?invidious\.fdn\.fr',
         r'(?:www\.)?watch\.nettohikari\.com',
-        r'(?:www\.)?invidious\.namazso\.eu',
-        r'(?:www\.)?invidious\.silkky\.cloud',
-        r'(?:www\.)?invidious\.exonip\.de',
-        r'(?:www\.)?invidious\.riverside\.rocks',
-        r'(?:www\.)?invidious\.blamefran\.net',
-        r'(?:www\.)?invidious\.moomoo\.de',
-        r'(?:www\.)?ytb\.trom\.tf',
-        r'(?:www\.)?yt\.cyberhost\.uk',
         r'(?:www\.)?kgg2m7yk5aybusll\.onion',
         r'(?:www\.)?qklhadlycap4cnod\.onion',
         r'(?:www\.)?axqzx4s6s54s32yentfqojs3x5i7faxza6xo3ehd4bzzsg2ii4fv2iid\.onion',
@@ -648,10 +382,6 @@ class YoutubeIE(YoutubeBaseInfoExtractor):
         r'(?:www\.)?invidious\.l4qlywnpwqsluw65ts7md3khrivpirse744un3x7mlskqauz5pyuzgqd\.onion',
         r'(?:www\.)?owxfohz4kjyv25fvlqilyxast7inivgiktls3th44jhk3ej3i7ya\.b32\.i2p',
         r'(?:www\.)?4l2dgddgsrkf2ous66i6seeyi6etzfgrue332grh2n7madpwopotugyd\.onion',
-        r'(?:www\.)?w6ijuptxiku4xpnnaetxvnkc5vqcdu7mgns2u77qefoixi63vbvnpnqd\.onion',
-        r'(?:www\.)?kbjggqkzv65ivcqj6bumvp337z6264huv5kpkwuv6gu5yjiskvan7fad\.onion',
-        r'(?:www\.)?grwp24hodrefzvjjuccrkw3mjq4tzhaaq32amf33dzpmuxe7ilepcmad\.onion',
-        r'(?:www\.)?hpniueoejy4opn7bc4ftgazyqjoeqwlvh2uiku2xqku6zpoa4bf5ruid\.onion',
     )
     _VALID_URL = r"""(?x)^
                      (
@@ -667,7 +397,6 @@ class YoutubeIE(YoutubeBaseInfoExtractor):
                          (?:.*?\#/)?                                          # handle anchor (#/) redirect urls
                          (?:                                                  # the various things that can precede the ID:
                              (?:(?:v|embed|e)/(?!videoseries))                # v/ or embed/ or e/
-                             |shorts/
                              |(?:                                             # or the v= param in all its forms
                                  (?:(?:watch|movie)(?:_popup)?(?:\.php)?/?)?  # preceding watch(_popup|.php) or nothing (like /?v=xxxx)
                                  (?:\?|\#!?)                                  # the params delimiter ? or # or #!
@@ -684,17 +413,24 @@ class YoutubeIE(YoutubeBaseInfoExtractor):
                          |(?:www\.)?cleanvideosearch\.com/media/action/yt/watch\?videoId=
                          )
                      )?                                                       # all until now is optional -> you can pass the naked ID
-                     (?P<id>[0-9A-Za-z_-]{11})                                # here is it! the YouTube video ID
+                     (?P<id>[0-9A-Za-z_-]{11})                                      # here is it! the YouTube video ID
+                     (?!.*?\blist=
+                        (?:
+                            %(playlist_id)s|                                  # combined list/video URLs are handled by the playlist IE
+                            WL                                                # WL are handled by the watch later IE
+                        )
+                     )
                      (?(1).+)?                                                # if we found the ID, everything can follow
                      $""" % {
+        'playlist_id': YoutubeBaseInfoExtractor._PLAYLIST_ID_RE,
         'invidious': '|'.join(_INVIDIOUS_SITES),
     }
     _PLAYER_INFO_RE = (
-        r'/s/player/(?P<id>[a-zA-Z0-9_-]{8,})/(?:tv-)?player',
-        r'/(?P<id>[a-zA-Z0-9_-]{8,})/player(?:_ias(?:_tce)?\.vflset(?:/[a-zA-Z]{2,3}_[a-zA-Z]{2,3})?|-plasma-ias-(?:phone|tablet)-[a-z]{2}_[A-Z]{2}\.vflset)/base\.js$',
-        r'\b(?P<id>vfl[a-zA-Z0-9_-]{6,})\b.*?\.js$',
+        r'/s/player/(?P<id>[a-zA-Z0-9_-]{8,})/player',
+        r'/(?P<id>[a-zA-Z0-9_-]{8,})/player(?:_ias\.vflset(?:/[a-zA-Z]{2,3}_[a-zA-Z]{2,3})?|-plasma-ias-(?:phone|tablet)-[a-z]{2}_[A-Z]{2}\.vflset)/base\.js$',
+        r'\b(?P<id>vfl[a-zA-Z0-9_-]+)\b.*?\.js$',
     )
-    _SUBTITLE_FORMATS = ('json3', 'srv1', 'srv2', 'srv3', 'ttml', 'vtt')
+    _SUBTITLE_FORMATS = ('srv1', 'srv2', 'srv3', 'ttml', 'vtt')
 
     _GEO_BYPASS = False
 
@@ -707,9 +443,8 @@ class YoutubeIE(YoutubeBaseInfoExtractor):
                 'ext': 'mp4',
                 'title': 'youtube-dl test video "\'/\\ä↭𝕐',
                 'uploader': 'Philipp Hagemeister',
-                'uploader_id': '@PhilippHagemeister',
-                'uploader_url': r're:https?://(?:www\.)?youtube\.com/@PhilippHagemeister',
-                'channel': 'Philipp Hagemeister',
+                'uploader_id': 'phihag',
+                'uploader_url': r're:https?://(?:www\.)?youtube\.com/user/phihag',
                 'channel_id': 'UCLqxVugv74EIW3VWh2NOa3Q',
                 'channel_url': r're:https?://(?:www\.)?youtube\.com/channel/UCLqxVugv74EIW3VWh2NOa3Q',
                 'upload_date': '20121002',
@@ -719,10 +454,10 @@ class YoutubeIE(YoutubeBaseInfoExtractor):
                 'duration': 10,
                 'view_count': int,
                 'like_count': int,
-                'thumbnail': 'https://i.ytimg.com/vi/BaW_jenozKc/maxresdefault.jpg',
+                'dislike_count': int,
                 'start_time': 1,
                 'end_time': 9,
-            },
+            }
         },
         {
             'url': '//www.YouTube.com/watch?v=yZIXLfi8CZQ',
@@ -748,8 +483,8 @@ class YoutubeIE(YoutubeBaseInfoExtractor):
                 'ext': 'mp4',
                 'title': 'youtube-dl test video "\'/\\ä↭𝕐',
                 'uploader': 'Philipp Hagemeister',
-                'uploader_id': '@PhilippHagemeister',
-                'uploader_url': r're:https?://(?:www\.)?youtube\.com/@PhilippHagemeister',
+                'uploader_id': 'phihag',
+                'uploader_url': r're:https?://(?:www\.)?youtube\.com/user/phihag',
                 'upload_date': '20121002',
                 'description': 'test chars:  "\'/\\ä↭𝕐\ntest URL: https://github.com/rg3/youtube-dl/issues/1892\n\nThis is a test video for youtube-dl.\n\nFor more information, contact phihag@phihag.de .',
                 'categories': ['Science & Technology'],
@@ -757,6 +492,7 @@ class YoutubeIE(YoutubeBaseInfoExtractor):
                 'duration': 10,
                 'view_count': int,
                 'like_count': int,
+                'dislike_count': int,
             },
             'params': {
                 'skip_download': True,
@@ -773,13 +509,13 @@ class YoutubeIE(YoutubeBaseInfoExtractor):
                 'uploader_url': r're:https?://(?:www\.)?youtube\.com/user/8KVIDEO',
                 'description': '',
                 'uploader': '8KVIDEO',
-                'title': 'UHDTV TEST 8K VIDEO.mp4',
+                'title': 'UHDTV TEST 8K VIDEO.mp4'
             },
             'params': {
                 'youtube_include_dash_manifest': True,
                 'format': '141',
             },
-            'skip': 'format 141 not served any more',
+            'skip': 'format 141 not served anymore',
         },
         # DASH manifest with encrypted signature
         {
@@ -791,7 +527,7 @@ class YoutubeIE(YoutubeBaseInfoExtractor):
                 'description': 'md5:8f5e2b82460520b619ccac1f509d43bf',
                 'duration': 244,
                 'uploader': 'AfrojackVEVO',
-                'uploader_id': '@AfrojackVEVO',
+                'uploader_id': 'AfrojackVEVO',
                 'upload_date': '20131011',
                 'abr': 129.495,
             },
@@ -809,15 +545,14 @@ class YoutubeIE(YoutubeBaseInfoExtractor):
                 'duration': 219,
                 'upload_date': '20100909',
                 'uploader': 'Amazing Atheist',
-                'uploader_id': '@theamazingatheist',
-                'uploader_url': r're:https?://(?:www\.)?youtube\.com/@theamazingatheist',
+                'uploader_id': 'TheAmazingAtheist',
+                'uploader_url': r're:https?://(?:www\.)?youtube\.com/user/TheAmazingAtheist',
                 'title': 'Burning Everyone\'s Koran',
                 'description': 'SUBSCRIBE: http://www.youtube.com/saturninefilms \r\n\r\nEven Obama has taken a stand against freedom on this issue: http://www.huffingtonpost.com/2010/09/09/obama-gma-interview-quran_n_710282.html',
-            },
+            }
         },
-        # Age-gated videos
+        # Normal age-gate video (No vevo, embed allowed), available via embed page
         {
-            'note': 'Age-gated video (No vevo, embed allowed)',
             'url': 'https://youtube.com/watch?v=HtVdAasjOgU',
             'info_dict': {
                 'id': 'HtVdAasjOgU',
@@ -826,101 +561,17 @@ class YoutubeIE(YoutubeBaseInfoExtractor):
                 'description': r're:(?s).{100,}About the Game\n.*?The Witcher 3: Wild Hunt.{100,}',
                 'duration': 142,
                 'uploader': 'The Witcher',
-                'uploader_id': '@thewitcher',
-                'uploader_url': r're:https?://(?:www\.)?youtube\.com/@thewitcher',
+                'uploader_id': 'WitcherGame',
+                'uploader_url': r're:https?://(?:www\.)?youtube\.com/user/WitcherGame',
                 'upload_date': '20140605',
-                'thumbnail': 'https://i.ytimg.com/vi/HtVdAasjOgU/maxresdefault.jpg',
                 'age_limit': 18,
-                'categories': ['Gaming'],
-                'tags': 'count:17',
-                'channel': 'The Witcher',
-                'channel_url': 'https://www.youtube.com/channel/UCzybXLxv08IApdjdN0mJhEg',
-                'channel_id': 'UCzybXLxv08IApdjdN0mJhEg',
-                'view_count': int,
-                'like_count': int,
             },
         },
         {
-            'note': 'Age-gated video with embed allowed in public site',
-            'url': 'https://youtube.com/watch?v=HsUATh_Nc2U',
-            'info_dict': {
-                'id': 'HsUATh_Nc2U',
-                'ext': 'mp4',
-                'title': 'Godzilla 2 (Official Video)',
-                'description': 'md5:bf77e03fcae5529475e500129b05668a',
-                'duration': 177,
-                'uploader': 'FlyingKitty',
-                'uploader_id': '@FlyingKitty900',
-                'upload_date': '20200408',
-                'thumbnail': 'https://i.ytimg.com/vi/HsUATh_Nc2U/maxresdefault.jpg',
-                'age_limit': 18,
-                'categories': ['Entertainment'],
-                'tags': ['Flyingkitty', 'godzilla 2'],
-                'channel': 'FlyingKitty',
-                'channel_url': 'https://www.youtube.com/channel/UCYQT13AtrJC0gsM1far_zJg',
-                'channel_id': 'UCYQT13AtrJC0gsM1far_zJg',
-                'view_count': int,
-                'like_count': int,
-            },
-        },
-        {
-            'note': 'Age-gated video embeddable only with clientScreen=EMBED',
-            'url': 'https://youtube.com/watch?v=Tq92D6wQ1mg',
-            'info_dict': {
-                'id': 'Tq92D6wQ1mg',
-                'ext': 'mp4',
-                'title': '[MMD] Adios - EVERGLOW [+Motion DL]',
-                'description': 'md5:17eccca93a786d51bc67646756894066',
-                'duration': 106,
-                'uploader': 'Projekt Melody',
-                'uploader_id': '@ProjektMelody',
-                'upload_date': '20191227',
-                'age_limit': 18,
-                'thumbnail': 'https://i.ytimg.com/vi/Tq92D6wQ1mg/sddefault.jpg',
-                'tags': ['mmd', 'dance', 'mikumikudance', 'kpop', 'vtuber'],
-                'categories': ['Entertainment'],
-                'channel': 'Projekt Melody',
-                'channel_url': 'https://www.youtube.com/channel/UC1yoRdFoFJaCY-AGfD9W0wQ',
-                'channel_id': 'UC1yoRdFoFJaCY-AGfD9W0wQ',
-                'view_count': int,
-                'like_count': int,
-            },
-        },
-        {
-            'note': 'Non-Age-gated non-embeddable video',
-            'url': 'https://youtube.com/watch?v=MeJVWBSsPAY',
-            'info_dict': {
-                'id': 'MeJVWBSsPAY',
-                'ext': 'mp4',
-                'title': 'OOMPH! - Such Mich Find Mich (Lyrics)',
-                'description': 'Fan Video. Music & Lyrics by OOMPH!.',
-                'duration': 210,
-                'upload_date': '20130730',
-                'uploader': 'Herr Lurik',
-                'uploader_id': '@HerrLurik',
-                'uploader_url': 'http://www.youtube.com/@HerrLurik',
-                'age_limit': 0,
-                'thumbnail': 'https://i.ytimg.com/vi/MeJVWBSsPAY/hqdefault.jpg',
-                'tags': ['oomph', 'such mich find mich', 'lyrics', 'german industrial', 'musica industrial'],
-                'categories': ['Music'],
-                'channel': 'Herr Lurik',
-                'channel_url': 'https://www.youtube.com/channel/UCdR3RSDPqub28LjZx0v9-aA',
-                'channel_id': 'UCdR3RSDPqub28LjZx0v9-aA',
-                'artist': 'OOMPH!',
-                'view_count': int,
-                'like_count': int,
-            },
-        },
-        {
-            'note': 'Non-bypassable age-gated video',
-            'url': 'https://youtube.com/watch?v=Cr381pDsSsA',
-            'only_matching': True,
-        },
-        {
-            'note': 'Age-gated video only available with authentication (not via embed workaround)',
+            # Age-gated video only available with authentication (unavailable
+            # via embed page workaround)
             'url': 'XgnwCQzjau8',
             'only_matching': True,
-            'skip': '''This video has been removed for violating YouTube's Community Guidelines''',
         },
         # video_info is None (https://github.com/ytdl-org/youtube-dl/issues/4421)
         # YouTube Red ad is not captured for creator
@@ -931,8 +582,8 @@ class YoutubeIE(YoutubeBaseInfoExtractor):
                 'ext': 'mp4',
                 'duration': 266,
                 'upload_date': '20100430',
-                'uploader_id': '@deadmau5',
-                'uploader_url': r're:https?://(?:www\.)?youtube\.com/@deadmau5',
+                'uploader_id': 'deadmau5',
+                'uploader_url': r're:https?://(?:www\.)?youtube\.com/user/deadmau5',
                 'creator': 'deadmau5',
                 'description': 'md5:6cbcd3a92ce1bc676fc4d6ab4ace2336',
                 'uploader': 'deadmau5',
@@ -941,7 +592,7 @@ class YoutubeIE(YoutubeBaseInfoExtractor):
             },
             'expected_warnings': [
                 'DASH manifest missing',
-            ],
+            ]
         },
         # Olympics (https://github.com/ytdl-org/youtube-dl/issues/4431)
         {
@@ -949,23 +600,17 @@ class YoutubeIE(YoutubeBaseInfoExtractor):
             'info_dict': {
                 'id': 'lqQg6PlCWgI',
                 'ext': 'mp4',
-                'title': 'Hockey - Women -  GER-AUS - London 2012 Olympic Games',
-                'description': r're:(?s)(?:.+\s)?HO09  - Women -  GER-AUS - Hockey - 31 July 2012 - London 2012 Olympic Games\s*',
                 'duration': 6085,
                 'upload_date': '20150827',
-                'uploader_id': '@Olympics',
-                'uploader_url': r're:https?://(?:www\.)?youtube\.com/@Olympics',
-                'uploader': r're:Olympics?',
-                'age_limit': 0,
-                'thumbnail': 'https://i.ytimg.com/vi/lqQg6PlCWgI/maxresdefault.jpg',
-                'categories': ['Sports'],
-                'tags': ['Hockey', '2012-07-31', '31 July 2012', 'Riverbank Arena', 'Session', 'Olympics', 'Olympic Games', 'London 2012', '2012 Summer Olympics', 'Summer Games'],
-                'channel': 'Olympics',
-                'channel_url': 'https://www.youtube.com/channel/UCTl3QQTvqHFjurroKxexy2Q',
-                'channel_id': 'UCTl3QQTvqHFjurroKxexy2Q',
-                'view_count': int,
-                'like_count': int,
+                'uploader_id': 'olympic',
+                'uploader_url': r're:https?://(?:www\.)?youtube\.com/user/olympic',
+                'description': 'HO09  - Women -  GER-AUS - Hockey - 31 July 2012 - London 2012 Olympic Games',
+                'uploader': 'Olympic',
+                'title': 'Hockey - Women -  GER-AUS - London 2012 Olympic Games',
             },
+            'params': {
+                'skip_download': 'requires avconv',
+            }
         },
         # Non-square pixels
         {
@@ -976,8 +621,8 @@ class YoutubeIE(YoutubeBaseInfoExtractor):
                 'stretched_ratio': 16 / 9.,
                 'duration': 85,
                 'upload_date': '20110310',
-                'uploader_id': '@AllenMeow',
-                'uploader_url': r're:https?://(?:www\.)?youtube\.com/@AllenMeow',
+                'uploader_id': 'AllenMeow',
+                'uploader_url': r're:https?://(?:www\.)?youtube\.com/user/AllenMeow',
                 'description': 'made by Wacom from Korea | 字幕&加油添醋 by TY\'s Allen | 感謝heylisa00cavey1001同學熱情提供梗及翻譯',
                 'uploader': '孫ᄋᄅ',
                 'title': '[A-made] 變態妍字幕版 太妍 我就是這樣的人',
@@ -1015,7 +660,7 @@ class YoutubeIE(YoutubeBaseInfoExtractor):
                 'uploader': 'dorappi2000',
                 'formats': 'mincount:31',
             },
-            'skip': 'not actual any more',
+            'skip': 'not actual anymore',
         },
         # DASH manifest with segment_list
         {
@@ -1096,7 +741,6 @@ class YoutubeIE(YoutubeBaseInfoExtractor):
             'params': {
                 'skip_download': True,
             },
-            'skip': 'Not multifeed any more',
         },
         {
             # Multifeed video with comma in title (see https://github.com/ytdl-org/youtube-dl/issues/8536)
@@ -1106,7 +750,7 @@ class YoutubeIE(YoutubeBaseInfoExtractor):
                 'title': 'DevConf.cz 2016 Day 2 Workshops 1 14:00 - 15:30',
             },
             'playlist_count': 2,
-            'skip': 'Not multifeed any more',
+            'skip': 'Not multifeed anymore',
         },
         {
             'url': 'https://vid.plus/FlRa-iH7PGw',
@@ -1126,16 +770,16 @@ class YoutubeIE(YoutubeBaseInfoExtractor):
                 'id': 'lsguqyKfVQg',
                 'ext': 'mp4',
                 'title': '{dark walk}; Loki/AC/Dishonored; collab w/Elflover21',
-                'alt_title': 'Dark Walk',
+                'alt_title': 'Dark Walk - Position Music',
                 'description': 'md5:8085699c11dc3f597ce0410b0dcbb34a',
                 'duration': 133,
                 'upload_date': '20151119',
-                'uploader_id': '@IronSoulElf',
-                'uploader_url': r're:https?://(?:www\.)?youtube\.com/@IronSoulElf',
+                'uploader_id': 'IronSoulElf',
+                'uploader_url': r're:https?://(?:www\.)?youtube\.com/user/IronSoulElf',
                 'uploader': 'IronSoulElf',
-                'creator': r're:Todd Haberman[;,]\s+Daniel Law Heath and Aaron Kaplan',
-                'track': 'Dark Walk',
-                'artist': r're:Todd Haberman[;,]\s+Daniel Law Heath and Aaron Kaplan',
+                'creator': 'Todd Haberman,  Daniel Law Heath and Aaron Kaplan',
+                'track': 'Dark Walk - Position Music',
+                'artist': 'Todd Haberman,  Daniel Law Heath and Aaron Kaplan',
                 'album': 'Position Music - Production Music Vol. 143 - Dark Walk',
             },
             'params': {
@@ -1164,11 +808,6 @@ class YoutubeIE(YoutubeBaseInfoExtractor):
             },
             'skip': 'This video does not exist.',
         },
-        {
-            # Video with incomplete 'yt:stretch=16:'
-            'url': 'https://www.youtube.com/watch?v=FRhJzUSJbGI',
-            'only_matching': True,
-        },
         {
             # Video licensed under Creative Commons
             'url': 'https://www.youtube.com/watch?v=M4gD1WSo5mA',
@@ -1179,8 +818,8 @@ class YoutubeIE(YoutubeBaseInfoExtractor):
                 'description': 'md5:a677553cf0840649b731a3024aeff4cc',
                 'duration': 721,
                 'upload_date': '20150127',
-                'uploader_id': '@BKCHarvard',
-                'uploader_url': r're:https?://(?:www\.)?youtube\.com/@BKCHarvard',
+                'uploader_id': 'BerkmanCenter',
+                'uploader_url': r're:https?://(?:www\.)?youtube\.com/user/BerkmanCenter',
                 'uploader': 'The Berkman Klein Center for Internet & Society',
                 'license': 'Creative Commons Attribution license (reuse allowed)',
             },
@@ -1199,8 +838,8 @@ class YoutubeIE(YoutubeBaseInfoExtractor):
                 'duration': 4060,
                 'upload_date': '20151119',
                 'uploader': 'Bernie Sanders',
-                'uploader_id': '@BernieSanders',
-                'uploader_url': r're:https?://(?:www\.)?youtube\.com/@BernieSanders',
+                'uploader_id': 'UCH1dpzjCEiGAt8CXkryhkZg',
+                'uploader_url': r're:https?://(?:www\.)?youtube\.com/channel/UCH1dpzjCEiGAt8CXkryhkZg',
                 'license': 'Creative Commons Attribution license (reuse allowed)',
             },
             'params': {
@@ -1246,8 +885,8 @@ class YoutubeIE(YoutubeBaseInfoExtractor):
                 'duration': 2085,
                 'upload_date': '20170118',
                 'uploader': 'Vsauce',
-                'uploader_id': '@Vsauce',
-                'uploader_url': r're:https?://(?:www\.)?youtube\.com/@Vsauce',
+                'uploader_id': 'Vsauce',
+                'uploader_url': r're:https?://(?:www\.)?youtube\.com/user/Vsauce',
                 'series': 'Mind Field',
                 'season_number': 1,
                 'episode_number': 1,
@@ -1326,7 +965,7 @@ class YoutubeIE(YoutubeBaseInfoExtractor):
                 'skip_download': True,
                 'youtube_include_dash_manifest': False,
             },
-            'skip': 'not actual any more',
+            'skip': 'not actual anymore',
         },
         {
             # Youtube Music Auto-generated description
@@ -1383,8 +1022,8 @@ class YoutubeIE(YoutubeBaseInfoExtractor):
                 'title': 'IMG 3456',
                 'description': '',
                 'upload_date': '20170613',
-                'uploader': "l'Or Vert asbl",
-                'uploader_id': '@ElevageOrVert',
+                'uploader_id': 'ElevageOrVert',
+                'uploader': 'ElevageOrVert',
             },
             'params': {
                 'skip_download': True,
@@ -1402,8 +1041,8 @@ class YoutubeIE(YoutubeBaseInfoExtractor):
                 'title': 'Part 77   Sort a list of simple types in c#',
                 'description': 'md5:b8746fa52e10cdbf47997903f13b20dc',
                 'upload_date': '20130831',
+                'uploader_id': 'kudvenkat',
                 'uploader': 'kudvenkat',
-                'uploader_id': '@Csharp-video-tutorialsBlogspot',
             },
             'params': {
                 'skip_download': True,
@@ -1455,24 +1094,8 @@ class YoutubeIE(YoutubeBaseInfoExtractor):
                 'description': 'md5:ea770e474b7cd6722b4c95b833c03630',
                 'upload_date': '20201120',
                 'uploader': 'Walk around Japan',
-                'uploader_id': '@walkaroundjapan7124',
-                'uploader_url': r're:https?://(?:www\.)?youtube\.com/@walkaroundjapan7124',
-            },
-            'params': {
-                'skip_download': True,
-            },
-        },
-        {
-            # YT 'Shorts'
-            'url': 'https://youtube.com/shorts/4L2J27mJ3Dc',
-            'info_dict': {
-                'id': '4L2J27mJ3Dc',
-                'ext': 'mp4',
-                'title': 'Midwest Squid Game #Shorts',
-                'description': 'md5:976512b8a29269b93bbd8a61edc45a6d',
-                'upload_date': '20211025',
-                'uploader': 'Charlie Berens',
-                'uploader_id': '@CharlieBerens',
+                'uploader_id': 'UC3o_t8PzBmXf5S9b7GLx1Mw',
+                'uploader_url': r're:https?://(?:www\.)?youtube\.com/channel/UC3o_t8PzBmXf5S9b7GLx1Mw',
             },
             'params': {
                 'skip_download': True,
@@ -1585,158 +1208,59 @@ class YoutubeIE(YoutubeBaseInfoExtractor):
         '397': {'acodec': 'none', 'vcodec': 'av01.0.05M.08'},
     }
 
-    _PLAYER_JS_VARIANT_MAP = (
-        ('main', 'player_ias.vflset/en_US/base.js'),
-        ('tce', 'player_ias_tce.vflset/en_US/base.js'),
-        ('tv', 'tv-player-ias.vflset/tv-player-ias.js'),
-        ('tv_es6', 'tv-player-es6.vflset/tv-player-es6.js'),
-        ('phone', 'player-plasma-ias-phone-en_US.vflset/base.js'),
-        ('tablet', 'player-plasma-ias-tablet-en_US.vflset/base.js'),
-    )
-
-    @classmethod
-    def suitable(cls, url):
-        if parse_qs(url).get('list', [None])[0]:
-            return False
-        return super(YoutubeIE, cls).suitable(url)
-
     def __init__(self, *args, **kwargs):
         super(YoutubeIE, self).__init__(*args, **kwargs)
         self._code_cache = {}
         self._player_cache = {}
 
-    # *ytcfgs, webpage=None
-    def _extract_player_url(self, *ytcfgs, **kw_webpage):
-        if ytcfgs and not isinstance(ytcfgs[0], dict):
-            webpage = kw_webpage.get('webpage') or ytcfgs[0]
-        if webpage:
-            player_url = self._search_regex(
-                r'"(?:PLAYER_JS_URL|jsUrl)"\s*:\s*"([^"]+)"',
-                webpage or '', 'player URL', fatal=False)
-            if player_url:
-                ytcfgs = ytcfgs + ({'PLAYER_JS_URL': player_url},)
-        return traverse_obj(
-            ytcfgs, (Ellipsis, 'PLAYER_JS_URL'), (Ellipsis, 'WEB_PLAYER_CONTEXT_CONFIGS', Ellipsis, 'jsUrl'),
-            get_all=False, expected_type=lambda u: urljoin('https://www.youtube.com', u))
-
-    def _download_player_url(self, video_id, fatal=False):
-        res = self._download_webpage(
-            'https://www.youtube.com/iframe_api',
-            note='Downloading iframe API JS', video_id=video_id, fatal=fatal)
-        player_version = self._search_regex(
-            r'player\\?/([0-9a-fA-F]{8})\\?/', res or '', 'player version', fatal=fatal,
-            default=NO_DEFAULT if res else None)
-        if player_version:
-            return 'https://www.youtube.com/s/player/{0}/player_ias.vflset/en_US/base.js'.format(player_version)
-
     def _signature_cache_id(self, example_sig):
         """ Return a string representation of a signature """
         return '.'.join(compat_str(len(part)) for part in example_sig.split('.'))
 
-    def _extract_player_info(self, player_url):
-        try:
-            return self._search_regex(
-                self._PLAYER_INFO_RE, player_url, 'player info', group='id')
-        except ExtractorError as e:
-            raise ExtractorError(
-                'Cannot identify player %r' % (player_url,), cause=e)
-
-    def _player_js_cache_key(self, player_url, extra_id=None, _cache={}):
-        if player_url not in _cache:
-            player_id = self._extract_player_info(player_url)
-            player_path = remove_start(
-                compat_urllib_parse.urlparse(player_url).path,
-                '/s/player/{0}/'.format(player_id))
-            variant = next((k for k, v in self._PLAYER_JS_VARIANT_MAP
-                           if v == player_path), None)
-            if not variant:
-                variant = next(
-                    (k for k, v in self._PLAYER_JS_VARIANT_MAP
-                     if re.match(re.escape(v).replace('en_US', r'\w+') + '$', player_path)),
-                    None)
-            if not variant:
-                self.write_debug(
-                    'Unable to determine player JS variant\n'
-                    '        player = {0}'.format(player_url), only_once=True)
-                variant = re.sub(r'[^a-zA-Z0-9]', '_', remove_end(player_path, '.js'))
-            _cache[player_url] = join_nonempty(player_id, variant)
-
-        if extra_id:
-            extra_id = '-'.join((_cache[player_url], extra_id))
-            assert os.path.basename(extra_id) == extra_id
-            return extra_id
-        return _cache[player_url]
-
-    def _load_player(self, video_id, player_url, fatal=True):
-        player_js_key = self._player_js_cache_key(player_url)
-        if player_js_key not in self._code_cache:
-            code = self._download_webpage(
-                player_url, video_id, fatal=fatal,
-                note='Downloading player {0}'.format(player_js_key),
-                errnote='Download of {0} failed'.format(player_url))
-            if code:
-                self._code_cache[player_js_key] = code
-        return self._code_cache.get(player_js_key)
-
-    def _load_player_data_from_cache(self, name, player_url, extra_id=None):
-        cache_id = ('youtube-{0}'.format(name), self._player_js_cache_key(player_url, extra_id))
-        data = self._player_cache.get(cache_id)
-        if data:
-            return data
-
-        data = self.cache.load(*cache_id, min_ver='2025.04.07')
-        if data:
-            self._player_cache[cache_id] = data
-        return data
-
-    def _store_player_data_to_cache(self, name, player_url, data, extra_id=None):
-        cache_id = ('youtube-{0}'.format(name), self._player_js_cache_key(player_url, extra_id))
-
-        if cache_id not in self._player_cache:
-            self.cache.store(cache_id[0], cache_id[1], data)
-            self._player_cache[cache_id] = data
-
-    def _remove_player_data_from_cache(self, name, player_url, extra_id=None):
-        cache_id = ('youtube-{0}'.format(name), self._player_js_cache_key(player_url, extra_id))
-
-        if cache_id in self._player_cache:
-            self.cache.clear(*cache_id)
-            self._player_cache.pop(cache_id, None)
+    @classmethod
+    def _extract_player_info(cls, player_url):
+        for player_re in cls._PLAYER_INFO_RE:
+            id_m = re.search(player_re, player_url)
+            if id_m:
+                break
+        else:
+            raise ExtractorError('Cannot identify player %r' % player_url)
+        return id_m.group('id')
 
     def _extract_signature_function(self, video_id, player_url, example_sig):
-        # player_id = self._extract_player_info(player_url)
+        player_id = self._extract_player_info(player_url)
 
         # Read from filesystem cache
-        extra_id = self._signature_cache_id(example_sig)
-        self.write_debug('Extracting signature function {0}-{1}'.format(player_url, extra_id))
-        cache_spec, code = self._load_player_data_from_cache(
-            'sigfuncs', player_url, extra_id=extra_id), None
+        func_id = 'js_%s_%s' % (
+            player_id, self._signature_cache_id(example_sig))
+        assert os.path.basename(func_id) == func_id
 
-        if not cache_spec:
-            code = self._load_player(video_id, player_url)
-            if code:
-                res = self._parse_sig_js(code)
-                test_string = ''.join(map(compat_chr, range(len(example_sig))))
-                cache_spec = [ord(c) for c in res(test_string)]
-                self._store_player_data_to_cache(
-                    'sigfuncs', player_url, cache_spec, extra_id=extra_id)
-            else:
-                self.report_warning(
-                    'Failed to compute signature function {0}-{1}'.format(
-                        player_url, extra_id))
+        cache_spec = self._downloader.cache.load('youtube-sigfuncs', func_id)
+        if cache_spec is not None:
+            return lambda s: ''.join(s[i] for i in cache_spec)
 
-        return lambda s: ''.join(s[i] for i in cache_spec)
+        if player_id not in self._code_cache:
+            self._code_cache[player_id] = self._download_webpage(
+                player_url, video_id,
+                note='Downloading player ' + player_id,
+                errnote='Download of %s failed' % player_url)
+        code = self._code_cache[player_id]
+        res = self._parse_sig_js(code)
+
+        test_string = ''.join(map(compat_chr, range(len(example_sig))))
+        cache_res = res(test_string)
+        cache_spec = [ord(c) for c in cache_res]
+
+        self._downloader.cache.store('youtube-sigfuncs', func_id, cache_spec)
+        return res
 
     def _print_sig_code(self, func, example_sig):
-        if not self.get_param('youtube_print_sig_code'):
-            return
-
         def gen_sig_code(idxs):
             def _genslice(start, end, step):
                 starts = '' if start == 0 else str(start)
                 ends = (':%d' % (end + step)) if end + step >= 0 else ':'
                 steps = '' if step == 1 else (':%d' % step)
-                return 's[{0}{1}{2}]'.format(starts, ends, steps)
+                return 's[%s%s%s]' % (starts, ends, steps)
 
             step = None
             # Quelch pyflakes warnings - start will be set when step is set
@@ -1769,277 +1293,56 @@ class YoutubeIE(YoutubeBaseInfoExtractor):
                 '    return %s\n') % (signature_id_tuple, expr_code)
         self.to_screen('Extracted signature function:\n' + code)
 
-    def _extract_sig_fn(self, jsi, funcname):
-        var_ay = self._search_regex(
-            r'''(?x)
-                (?:\*/|\{|\n|^)\s*(?:'[^']+'\s*;\s*)
-                    (var\s*[\w$]+\s*=\s*(?:
-                        ('|")(?:\\\2|(?!\2).)+\2\s*\.\s*split\(\s*('|")\W+\3\s*\)|
-                        \[\s*(?:('|")(?:\\\4|(?!\4).)*\4\s*(?:(?=\])|,\s*))+\]
-                    ))(?=\s*[,;])
-            ''', jsi.code, 'useful values', default='')
-
-        sig_fn = jsi.extract_function_code(funcname)
-
-        if var_ay:
-            sig_fn = (sig_fn[0], ';\n'.join((var_ay, sig_fn[1])))
-
-        return sig_fn
-
     def _parse_sig_js(self, jscode):
-        # Examples where `sig` is funcname:
-        # sig=function(a){a=a.split(""); ... ;return a.join("")};
-        # ;c&&(c=sig(decodeURIComponent(c)),a.set(b,encodeURIComponent(c)));return a};
-        # {var l=f,m=h.sp,n=sig(decodeURIComponent(h.s));l.set(m,encodeURIComponent(n))}
-        # sig=function(J){J=J.split(""); ... ;return J.join("")};
-        # ;N&&(N=sig(decodeURIComponent(N)),J.set(R,encodeURIComponent(N)));return J};
-        # {var H=u,k=f.sp,v=sig(decodeURIComponent(f.s));H.set(k,encodeURIComponent(v))}
         funcname = self._search_regex(
-            (r'\b(?P<var>[\w$]+)&&\((?P=var)=(?P<sig>[\w$]{2,})\(decodeURIComponent\((?P=var)\)\)',
-             r'(?P<sig>[\w$]+)\s*=\s*function\(\s*(?P<arg>[\w$]+)\s*\)\s*{\s*(?P=arg)\s*=\s*(?P=arg)\.split\(\s*""\s*\)\s*;\s*[^}]+;\s*return\s+(?P=arg)\.join\(\s*""\s*\)',
-             r'(?:\b|[^\w$])(?P<sig>[\w$]{2,})\s*=\s*function\(\s*a\s*\)\s*{\s*a\s*=\s*a\.split\(\s*""\s*\)(?:;[\w$]{2}\.[\w$]{2}\(a,\d+\))?',
-             # Old patterns
-             r'\b[cs]\s*&&\s*[adf]\.set\([^,]+\s*,\s*encodeURIComponent\s*\(\s*(?P<sig>[\w$]+)\(',
-             r'\b[\w]+\s*&&\s*[\w]+\.set\([^,]+\s*,\s*encodeURIComponent\s*\(\s*(?P<sig>[\w$]+)\(',
-             r'\bm=(?P<sig>[\w$]{2,})\(decodeURIComponent\(h\.s\)\)',
+            (r'\b[cs]\s*&&\s*[adf]\.set\([^,]+\s*,\s*encodeURIComponent\s*\(\s*(?P<sig>[a-zA-Z0-9$]+)\(',
+             r'\b[a-zA-Z0-9]+\s*&&\s*[a-zA-Z0-9]+\.set\([^,]+\s*,\s*encodeURIComponent\s*\(\s*(?P<sig>[a-zA-Z0-9$]+)\(',
+             r'\bm=(?P<sig>[a-zA-Z0-9$]{2})\(decodeURIComponent\(h\.s\)\)',
+             r'\bc&&\(c=(?P<sig>[a-zA-Z0-9$]{2})\(decodeURIComponent\(c\)\)',
+             r'(?:\b|[^a-zA-Z0-9$])(?P<sig>[a-zA-Z0-9$]{2})\s*=\s*function\(\s*a\s*\)\s*{\s*a\s*=\s*a\.split\(\s*""\s*\);[a-zA-Z0-9$]{2}\.[a-zA-Z0-9$]{2}\(a,\d+\)',
+             r'(?:\b|[^a-zA-Z0-9$])(?P<sig>[a-zA-Z0-9$]{2})\s*=\s*function\(\s*a\s*\)\s*{\s*a\s*=\s*a\.split\(\s*""\s*\)',
+             r'(?P<sig>[a-zA-Z0-9$]+)\s*=\s*function\(\s*a\s*\)\s*{\s*a\s*=\s*a\.split\(\s*""\s*\)',
              # Obsolete patterns
-             r'("|\')signature\1\s*,\s*(?P<sig>[\w$]+)\(',
-             r'\.sig\|\|(?P<sig>[\w$]+)\(',
-             r'yt\.akamaized\.net/\)\s*\|\|\s*.*?\s*[cs]\s*&&\s*[adf]\.set\([^,]+\s*,\s*(?:encodeURIComponent\s*\()?\s*(?P<sig>[\w$]+)\(',
-             r'\b[cs]\s*&&\s*[adf]\.set\([^,]+\s*,\s*(?P<sig>[\w$]+)\(',
-             r'\bc\s*&&\s*[\w]+\.set\([^,]+\s*,\s*\([^)]*\)\s*\(\s*(?P<sig>[\w$]+)\('),
+             r'(["\'])signature\1\s*,\s*(?P<sig>[a-zA-Z0-9$]+)\(',
+             r'\.sig\|\|(?P<sig>[a-zA-Z0-9$]+)\(',
+             r'yt\.akamaized\.net/\)\s*\|\|\s*.*?\s*[cs]\s*&&\s*[adf]\.set\([^,]+\s*,\s*(?:encodeURIComponent\s*\()?\s*(?P<sig>[a-zA-Z0-9$]+)\(',
+             r'\b[cs]\s*&&\s*[adf]\.set\([^,]+\s*,\s*(?P<sig>[a-zA-Z0-9$]+)\(',
+             r'\b[a-zA-Z0-9]+\s*&&\s*[a-zA-Z0-9]+\.set\([^,]+\s*,\s*(?P<sig>[a-zA-Z0-9$]+)\(',
+             r'\bc\s*&&\s*a\.set\([^,]+\s*,\s*\([^)]*\)\s*\(\s*(?P<sig>[a-zA-Z0-9$]+)\(',
+             r'\bc\s*&&\s*[a-zA-Z0-9]+\.set\([^,]+\s*,\s*\([^)]*\)\s*\(\s*(?P<sig>[a-zA-Z0-9$]+)\(',
+             r'\bc\s*&&\s*[a-zA-Z0-9]+\.set\([^,]+\s*,\s*\([^)]*\)\s*\(\s*(?P<sig>[a-zA-Z0-9$]+)\('),
             jscode, 'Initial JS player signature function name', group='sig')
 
         jsi = JSInterpreter(jscode)
-
-        initial_function = self._extract_sig_fn(jsi, funcname)
-
-        func = jsi.extract_function_from_code(*initial_function)
-
-        return lambda s: func([s])
-
-    def _cached(self, func, *cache_id):
-        def inner(*args, **kwargs):
-            if cache_id not in self._player_cache:
-                try:
-                    self._player_cache[cache_id] = func(*args, **kwargs)
-                except ExtractorError as e:
-                    self._player_cache[cache_id] = e
-                except Exception as e:
-                    self._player_cache[cache_id] = ExtractorError(traceback.format_exc(), cause=e)
-
-            ret = self._player_cache[cache_id]
-            if isinstance(ret, Exception):
-                raise ret
-            return ret
-        return inner
+        initial_function = jsi.extract_function(funcname)
+        return lambda s: initial_function([s])
 
     def _decrypt_signature(self, s, video_id, player_url):
         """Turn the encrypted s field into a working signature"""
-        extract_sig = self._cached(
-            self._extract_signature_function, 'sig', player_url, self._signature_cache_id(s))
-        func = extract_sig(video_id, player_url, s)
-        self._print_sig_code(func, s)
-        return func(s)
 
-    # from yt-dlp
-    # See also:
-    # 1. https://github.com/ytdl-org/youtube-dl/issues/29326#issuecomment-894619419
-    # 2. https://code.videolan.org/videolan/vlc/-/blob/4fb284e5af69aa9ac2100ccbdd3b88debec9987f/share/lua/playlist/youtube.lua#L116
-    # 3. https://github.com/ytdl-org/youtube-dl/issues/30097#issuecomment-950157377
-    def _decrypt_nsig(self, n, video_id, player_url):
-        """Turn the encrypted n field into a working signature"""
         if player_url is None:
-            raise ExtractorError('Cannot decrypt nsig without player_url')
+            raise ExtractorError('Cannot decrypt signature without player_url')
 
+        if player_url.startswith('//'):
+            player_url = 'https:' + player_url
+        elif not re.match(r'https?://', player_url):
+            player_url = compat_urlparse.urljoin(
+                'https://www.youtube.com', player_url)
         try:
-            jsi, player_id, func_code = self._extract_n_function_code(video_id, player_url)
-        except ExtractorError as e:
-            raise ExtractorError('Unable to extract nsig function code', cause=e)
-        if self.get_param('youtube_print_sig_code'):
-            self.to_screen('Extracted nsig function from {0}:\n{1}\n'.format(
-                player_id, func_code[1]))
-
-        try:
-            extract_nsig = self._cached(self._extract_n_function_from_code, 'nsig func', player_url)
-            ret = extract_nsig(jsi, func_code)(n)
-        except JSInterpreter.Exception as e:
-            self.report_warning(
-                '%s (%s %s)' % (
-                    'Unable to decode n-parameter: expect download to be blocked or throttled',
-                    error_to_compat_str(e),
-                    traceback.format_exc()),
-                video_id=video_id)
-            return
-
-        self.write_debug('Decrypted nsig {0} => {1}'.format(n, ret))
-        return ret
-
-    def _extract_n_function_name(self, jscode):
-        func_name, idx = None, None
-
-        def generic_n_function_search(func_name=None):
-            return self._search_regex(
-                r'''(?xs)
-                    (?:(?<=[^\w$])|^)       # instead of \b, which ignores $
-                    (?P<name>%s)\s*=\s*function\((?!\d)[a-zA-Z\d_$]+\)
-                    \s*\{(?:(?!};).)+?(?:
-                        ["']enhanced_except_ |
-                        return\s*(?P<q>"|')[a-zA-Z\d-]+_w8_(?P=q)\s*\+\s*[\w$]+
-                    )
-                ''' % (func_name or r'(?!\d)[a-zA-Z\d_$]+',), jscode,
-                'Initial JS player n function name', group='name',
-                default=None if func_name else NO_DEFAULT)
-
-        # these special cases are redundant and probably obsolete (2025-04):
-        # they make the tests run ~10% faster without fallback warnings
-        r"""
-        func_name, idx = self._search_regex(
-            # (y=NuD(),Mw(k),q=k.Z[y]||null)&&(q=narray[idx](q),k.set(y,q),k.V||NuD(''))}};
-            # (R="nn"[+J.Z],mW(J),N=J.K[R]||null)&&(N=narray[idx](N),J.set(R,N))}};
-            # or:  (b=String.fromCharCode(110),c=a.get(b))&&c=narray[idx](c)
-            # or:  (b="nn"[+a.D],c=a.get(b))&&(c=narray[idx](c)
-            # or:  (PL(a),b=a.j.n||null)&&(b=narray[idx](b)
-            # or:  (b="nn"[+a.D],vL(a),c=a.j[b]||null)&&(c=narray[idx](c),a.set(b,c),narray.length||nfunc("")
-            # old: (b=a.get("n"))&&(b=narray[idx](b)(?P<c>[a-z])\s*=\s*[a-z]\s*
-            # older: (b=a.get("n"))&&(b=nfunc(b)
-            r'''(?x)
-                # (expr, ...,
-                \((?:(?:\s*[\w$]+\s*=)?(?:[\w$"+\.\s(\[]+(?:[)\]]\s*)?),)*
-                  # b=...
-                  (?P<b>[\w$]+)\s*=\s*(?!(?P=b)[^\w$])[\w$]+\s*(?:(?:
-                    \.\s*[\w$]+ |
-                    \[\s*[\w$]+\s*\] |
-                    \.\s*get\s*\(\s*[\w$"]+\s*\)
-                  )\s*){,2}(?:\s*\|\|\s*null(?=\s*\)))?\s*
-                \)\s*&&\s*\(        # ...)&&(
-                # b = nfunc, b = narray[idx]
-                (?P=b)\s*=\s*(?P<nfunc>[\w$]+)\s*
-                    (?:\[\s*(?P<idx>[\w$]+)\s*\]\s*)?
-                    # (...)
-                    \(\s*[\w$]+\s*\)
-            ''', jscode, 'Initial JS player n function name', group=('nfunc', 'idx'),
-            default=(None, None))
-        """
-
-        if not func_name:
-            # nfunc=function(x){...}|function nfunc(x); ...
-            # ... var y=[nfunc]|y[idx]=nfunc);
-            # obvious REs hang, so use a two-stage tactic
-            for m in re.finditer(r'''(?x)
-                    [\n;]var\s(?:(?:(?!,).)+,|\s)*?(?!\d)[\w$]+(?:\[(?P<idx>\d+)\])?\s*=\s*
-                        (?(idx)|\[\s*)(?P<nfunc>(?!\d)[\w$]+)(?(idx)|\s*\])
-                    \s*?[;\n]
-                    ''', jscode):
-                fn = self._search_regex(
-                    r'[;,]\s*(function\s+)?({0})(?(1)|\s*=\s*function)\s*\((?!\d)[\w$]+\)\s*\{1}(?!\s*return\s)'.format(
-                        re.escape(m.group('nfunc')), '{'),
-                    jscode, 'Initial JS player n function name (2)', group=2, default=None)
-                if fn:
-                    func_name = fn
-                    idx = m.group('idx')
-                    if generic_n_function_search(func_name):
-                        # don't look any further
-                        break
-
-        # thx bashonly: yt-dlp/yt-dlp/pull/10611
-        if not func_name:
-            self.report_warning('Falling back to generic n function search', only_once=True)
-            return generic_n_function_search()
-
-        if not idx:
-            return func_name
-
-        return self._search_json(
-            r'(?<![\w-])var\s(?:(?:(?!,).)+,|\s)*?{0}\s*='.format(re.escape(func_name)), jscode,
-            'Initial JS player n function list ({0}.{1})'.format(func_name, idx),
-            func_name, contains_pattern=r'\[.+\]', end_pattern='[,;]',
-            transform_source=js_to_json)[int(idx)]
-
-    def _extract_n_function_code(self, video_id, player_url):
-        player_id = self._extract_player_info(player_url)
-        func_code = self._load_player_data_from_cache('nsig', player_url)
-        jscode = func_code or self._load_player(video_id, player_url)
-        jsi = JSInterpreter(jscode)
-
-        if func_code:
-            return jsi, player_id, func_code
-
-        return self._extract_n_function_code_jsi(video_id, jsi, player_id, player_url)
-
-    def _extract_n_function_code_jsi(self, video_id, jsi, player_id=None, player_url=None):
-        func_name = self._extract_n_function_name(jsi.code)
-
-        func_code = self._extract_sig_fn(jsi, func_name)
-        if player_url:
-            self._store_player_data_to_cache('nsig', player_url, func_code)
-        return jsi, player_id, func_code
-
-    def _extract_n_function_from_code(self, jsi, func_code):
-        func = jsi.extract_function_from_code(*func_code)
-
-        def extract_nsig(s):
-            try:
-                ret = func([s], kwargs={'_ytdl_do_not_return': s})
-            except JSInterpreter.Exception:
-                raise
-            except Exception as e:
-                raise JSInterpreter.Exception(traceback.format_exc(), cause=e)
-
-            if ret.startswith('enhanced_except_') or ret.endswith(s):
-                raise JSInterpreter.Exception('Signature function returned an exception')
-            return ret
-
-        return extract_nsig
-
-    def _unthrottle_format_urls(self, video_id, player_url, *formats):
-
-        def decrypt_nsig(n):
-            return self._cached(self._decrypt_nsig, 'nsig', n, player_url)
-
-        for fmt in formats:
-            parsed_fmt_url = compat_urllib_parse.urlparse(fmt['url'])
-            n_param = compat_parse_qs(parsed_fmt_url.query).get('n')
-            if not n_param:
-                continue
-            n_param = n_param[-1]
-            n_response = decrypt_nsig(n_param)(n_param, video_id, player_url)
-            if n_response is None:
-                # give up and forget cached data if descrambling failed
-                self._remove_player_data_from_cache('nsig', player_url)
-                break
-            fmt['url'] = update_url_query(fmt['url'], {'n': n_response})
-
-    # from yt-dlp, with tweaks
-    def _extract_signature_timestamp(self, video_id, player_url, ytcfg=None, fatal=False):
-        """
-        Extract signatureTimestamp (sts)
-        Required to tell API what sig/player version is in use.
-        """
-        sts = traverse_obj(ytcfg, 'STS', expected_type=int)
-        if sts:
-            return sts
-
-        if not player_url:
-            error_msg = 'Cannot extract signature timestamp without player url'
-            if fatal:
-                raise ExtractorError(error_msg)
-            self.report_warning(error_msg)
-            return None
-
-        sts = self._load_player_data_from_cache('sts', player_url)
-        if sts:
-            return sts
-
-        # Attempt to extract from player
-        code = self._load_player(video_id, player_url, fatal=fatal)
-        sts = int_or_none(self._search_regex(
-            r'(?:signatureTimestamp|sts)\s*:\s*(?P<sts>[0-9]{5})', code or '',
-            'JS player signature timestamp', group='sts', fatal=fatal))
-        if sts:
-            self._store_player_data_to_cache('sts', player_url, sts)
-
-        return sts
+            player_id = (player_url, self._signature_cache_id(s))
+            if player_id not in self._player_cache:
+                func = self._extract_signature_function(
+                    video_id, player_url, s
+                )
+                self._player_cache[player_id] = func
+            func = self._player_cache[player_id]
+            if self._downloader.params.get('youtube_print_sig_code'):
+                self._print_sig_code(func, s)
+            return func(s)
+        except Exception as e:
+            tb = traceback.format_exc()
+            raise ExtractorError(
+                'Signature extraction failed: ' + tb, cause=e)
 
     def _mark_watched(self, video_id, player_response):
         playback_url = url_or_none(try_get(
@@ -2047,23 +1350,20 @@ class YoutubeIE(YoutubeBaseInfoExtractor):
             lambda x: x['playbackTracking']['videostatsPlaybackUrl']['baseUrl']))
         if not playback_url:
             return
+        parsed_playback_url = compat_urlparse.urlparse(playback_url)
+        qs = compat_urlparse.parse_qs(parsed_playback_url.query)
 
         # cpn generation algorithm is reverse engineered from base.js.
         # In fact it works even with dummy cpn.
-        CPN_ALPHABET = string.ascii_letters + string.digits + '-_'
-        cpn = ''.join(CPN_ALPHABET[random.randint(0, 256) & 63] for _ in range(16))
+        CPN_ALPHABET = 'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789-_'
+        cpn = ''.join((CPN_ALPHABET[random.randint(0, 256) & 63] for _ in range(0, 16)))
 
-        # more consistent results setting it to right before the end
-        qs = parse_qs(playback_url)
-        video_length = '{0}'.format(float((qs.get('len') or ['1.5'])[0]) - 1)
-
-        playback_url = update_url_query(
-            playback_url, {
-                'ver': '2',
-                'cpn': cpn,
-                'cmt': video_length,
-                'el': 'detailpage',  # otherwise defaults to "shorts"
-            })
+        qs.update({
+            'ver': ['2'],
+            'cpn': [cpn],
+        })
+        playback_url = compat_urlparse.urlunparse(
+            parsed_playback_url._replace(query=compat_urllib_parse_urlencode(qs, True)))
 
         self._download_webpage(
             playback_url, video_id, 'Marking watched',
@@ -2111,7 +1411,8 @@ class YoutubeIE(YoutubeBaseInfoExtractor):
         mobj = re.match(cls._VALID_URL, url, re.VERBOSE)
         if mobj is None:
             raise ExtractorError('Invalid URL: %s' % url)
-        return mobj.group(2)
+        video_id = mobj.group(2)
+        return video_id
 
     def _extract_chapters_from_json(self, data, video_id, duration):
         chapters_list = try_get(
@@ -2167,150 +1468,28 @@ class YoutubeIE(YoutubeBaseInfoExtractor):
             webpage_url + '&bpctr=9999999999&has_verified=1', video_id, fatal=False)
 
         player_response = None
-        player_url = None
         if webpage:
             player_response = self._extract_yt_initial_variable(
                 webpage, self._YT_INITIAL_PLAYER_RESPONSE_RE,
                 video_id, 'initial player response')
-        is_live = traverse_obj(player_response, ('videoDetails', 'isLive'))
-
-        if False and not player_response:
+        if not player_response:
             player_response = self._call_api(
                 'player', {'videoId': video_id}, video_id)
-        if True or not player_response:
-            origin = 'https://www.youtube.com'
-            pb_context = {'html5Preference': 'HTML5_PREF_WANTS'}
 
-            player_url = self._extract_player_url(webpage)
-            ytcfg = self._extract_ytcfg(video_id, webpage or '')
-            sts = self._extract_signature_timestamp(video_id, player_url, ytcfg)
-            if sts:
-                pb_context['signatureTimestamp'] = sts
-
-            client_names = traverse_obj(self._INNERTUBE_CLIENTS, (
-                T(dict.items), lambda _, k_v: not k_v[1].get('REQUIRE_PO_TOKEN'),
-                0))[:1]
-            if 'web' not in client_names:
-                # webpage links won't download: ignore links and playability
-                player_response = filter_dict(
-                    player_response or {},
-                    lambda k, _: k not in ('streamingData', 'playabilityStatus'))
-
-            if is_live and 'ios' not in client_names:
-                client_names.append('ios')
-
-            headers = {
-                'Sec-Fetch-Mode': 'navigate',
-                'Origin': origin,
-                'X-Goog-Visitor-Id': self._extract_visitor_data(ytcfg) or '',
-            }
-            auth = self._generate_sapisidhash_header(origin)
-            if auth is not None:
-                headers['Authorization'] = auth
-                headers['X-Origin'] = origin
-
-            for client in traverse_obj(self._INNERTUBE_CLIENTS, (client_names, T(dict))):
-
-                query = {
-                    'playbackContext': {
-                        'contentPlaybackContext': pb_context,
-                    },
-                    'contentCheckOk': True,
-                    'racyCheckOk': True,
-                    'context': {
-                        'client': merge_dicts(
-                            traverse_obj(client, ('INNERTUBE_CONTEXT', 'client')), {
-                                'hl': 'en',
-                                'timeZone': 'UTC',
-                                'utcOffsetMinutes': 0,
-                            }),
-                    },
-                    'videoId': video_id,
-                }
-
-                api_headers = merge_dicts(headers, traverse_obj(client, {
-                    'X-YouTube-Client-Name': 'INNERTUBE_CONTEXT_CLIENT_NAME',
-                    'X-YouTube-Client-Version': (
-                        'INNERTUBE_CONTEXT', 'client', 'clientVersion'),
-                    'User-Agent': (
-                        'INNERTUBE_CONTEXT', 'client', 'userAgent'),
-                }))
-
-                api_player_response = self._call_api(
-                    'player', query, video_id, fatal=False, headers=api_headers,
-                    note=join_nonempty(
-                        'Downloading', traverse_obj(query, (
-                            'context', 'client', 'clientName')),
-                        'API JSON', delim=' '))
-
-                hls = traverse_obj(
-                    (player_response, api_player_response),
-                    (Ellipsis, 'streamingData', 'hlsManifestUrl', T(url_or_none)))
-                if len(hls) == 2 and not hls[0] and hls[1]:
-                    player_response['streamingData']['hlsManifestUrl'] = hls[1]
-                else:
-                    video_details = merge_dicts(*traverse_obj(
-                        (player_response, api_player_response),
-                        (Ellipsis, 'videoDetails', T(dict))))
-                    player_response.update(filter_dict(
-                        api_player_response or {}, cndn=lambda k, _: k != 'captions'))
-                    player_response['videoDetails'] = video_details
-
-        def is_agegated(playability):
-            if not isinstance(playability, dict):
-                return
-
-            if playability.get('desktopLegacyAgeGateReason'):
-                return True
-
-            reasons = filter(None, (playability.get(r) for r in ('status', 'reason')))
-            AGE_GATE_REASONS = (
-                'confirm your age', 'age-restricted', 'inappropriate',  # reason
-                'age_verification_required', 'age_check_required',  # status
-            )
-            return any(expected in reason for expected in AGE_GATE_REASONS for reason in reasons)
-
-        def get_playability_status(response):
-            return try_get(response, lambda x: x['playabilityStatus'], dict) or {}
-
-        playability_status = get_playability_status(player_response)
-        if (is_agegated(playability_status)
-                and int_or_none(self._downloader.params.get('age_limit'), default=18) >= 18):
-
-            self.report_age_confirmation()
-
-            # Thanks: https://github.com/yt-dlp/yt-dlp/pull/3233
-            pb_context = {'html5Preference': 'HTML5_PREF_WANTS'}
-
-            # Use signatureTimestamp if available
-            # Thanks https://github.com/ytdl-org/youtube-dl/issues/31034#issuecomment-1160718026
-            player_url = self._extract_player_url(webpage)
-            ytcfg = self._extract_ytcfg(video_id, webpage)
-            sts = self._extract_signature_timestamp(video_id, player_url, ytcfg)
-            if sts:
-                pb_context['signatureTimestamp'] = sts
-
-            query = {
-                'playbackContext': {'contentPlaybackContext': pb_context},
-                'contentCheckOk': True,
-                'racyCheckOk': True,
-                'context': {
-                    'client': {'clientName': 'TVHTML5_SIMPLY_EMBEDDED_PLAYER', 'clientVersion': '2.0', 'hl': 'en', 'clientScreen': 'EMBED'},
-                    'thirdParty': {'embedUrl': 'https://google.com'},
-                },
-                'videoId': video_id,
-            }
-            headers = {
-                'X-YouTube-Client-Name': '85',
-                'X-YouTube-Client-Version': '2.0',
-                'Origin': 'https://www.youtube.com',
-            }
-
-            video_info = self._call_api('player', query, video_id, fatal=False, headers=headers)
-            age_gate_status = get_playability_status(video_info)
-            if age_gate_status.get('status') == 'OK':
-                player_response = video_info
-                playability_status = age_gate_status
+        playability_status = player_response.get('playabilityStatus') or {}
+        if playability_status.get('reason') == 'Sign in to confirm your age':
+            pr = self._parse_json(try_get(compat_parse_qs(
+                self._download_webpage(
+                    base_url + 'get_video_info', video_id,
+                    'Refetching age-gated info webpage',
+                    'unable to download video info webpage', query={
+                        'video_id': video_id,
+                        'eurl': 'https://youtube.googleapis.com/v/' + video_id,
+                    }, fatal=False)),
+                lambda x: x['player_response'][0],
+                compat_str) or '{}', video_id)
+            if pr:
+                player_response = pr
 
         trailer_video_id = try_get(
             playability_status,
@@ -2332,8 +1511,8 @@ class YoutubeIE(YoutubeBaseInfoExtractor):
             return ''.join([r['text'] for r in runs if isinstance(r.get('text'), compat_str)])
 
         search_meta = (
-            (lambda x: self._html_search_meta(x, webpage, default=None))
-            if webpage else lambda _: None)
+            lambda x: self._html_search_meta(x, webpage, default=None)) \
+            if webpage else lambda x: None
 
         video_details = player_response.get('videoDetails') or {}
         microformat = try_get(
@@ -2389,186 +1568,113 @@ class YoutubeIE(YoutubeBaseInfoExtractor):
             else:
                 self.to_screen('Downloading just video %s because of --no-playlist' % video_id)
 
-        if not player_url:
-            player_url = self._extract_player_url(webpage)
-
         formats = []
-        itags = collections.defaultdict(set)
+        itags = []
         itag_qualities = {}
+        player_url = None
         q = qualities(['tiny', 'small', 'medium', 'large', 'hd720', 'hd1080', 'hd1440', 'hd2160', 'hd2880', 'highres'])
-        CHUNK_SIZE = 10 << 20
-        is_live = video_details.get('isLive')
-
         streaming_data = player_response.get('streamingData') or {}
         streaming_formats = streaming_data.get('formats') or []
         streaming_formats.extend(streaming_data.get('adaptiveFormats') or [])
-
-        def build_fragments(f):
-            return LazyList({
-                'url': update_url_query(f['url'], {
-                    'range': '{0}-{1}'.format(range_start, min(range_start + CHUNK_SIZE - 1, f['filesize'])),
-                })
-            } for range_start in range(0, f['filesize'], CHUNK_SIZE))
-
-        lower = lambda s: s.lower()
-
         for fmt in streaming_formats:
-            if fmt.get('targetDurationSec'):
+            if fmt.get('targetDurationSec') or fmt.get('drmFamilies'):
                 continue
 
             itag = str_or_none(fmt.get('itag'))
-            audio_track = traverse_obj(fmt, ('audioTrack', T(dict))) or {}
-
-            quality = traverse_obj(fmt, ((
-                # The 3gp format (17) in android client has a quality of "small",
-                # but is actually worse than other formats
-                T(lambda _: 'tiny' if itag == 17 else None),
-                ('quality', T(lambda q: q if q and q != 'tiny' else None)),
-                ('audioQuality', T(lower)),
-                'quality'), T(txt_or_none)), get_all=False)
-            if quality and itag:
+            quality = fmt.get('quality')
+            if itag and quality:
                 itag_qualities[itag] = quality
             # FORMAT_STREAM_TYPE_OTF(otf=1) requires downloading the init fragment
             # (adding `&sq=0` to the URL) and parsing emsg box to determine the
-            # number of fragments that would subsequently be requested with (`&sq=N`)
+            # number of fragment that would subsequently requested with (`&sq=N`)
             if fmt.get('type') == 'FORMAT_STREAM_TYPE_OTF':
                 continue
 
             fmt_url = fmt.get('url')
             if not fmt_url:
                 sc = compat_parse_qs(fmt.get('signatureCipher'))
-                fmt_url = traverse_obj(sc, ('url', -1, T(url_or_none)))
-                encrypted_sig = traverse_obj(sc, ('s', -1))
-                if not (fmt_url and encrypted_sig):
+                fmt_url = url_or_none(try_get(sc, lambda x: x['url'][0]))
+                encrypted_sig = try_get(sc, lambda x: x['s'][0])
+                if not (sc and fmt_url and encrypted_sig):
                     continue
-                player_url = player_url or self._extract_player_url(webpage)
+                if not player_url:
+                    if not webpage:
+                        continue
+                    player_url = self._search_regex(
+                        r'"(?:PLAYER_JS_URL|jsUrl)"\s*:\s*"([^"]+)"',
+                        webpage, 'player URL', fatal=False)
                 if not player_url:
                     continue
-                try:
-                    fmt_url = update_url_query(fmt_url, {
-                        traverse_obj(sc, ('sp', -1)) or 'signature':
-                            [self._decrypt_signature(encrypted_sig, video_id, player_url)],
-                    })
-                except ExtractorError as e:
-                    self.report_warning('Signature extraction failed: Some formats may be missing',
-                                        video_id=video_id, only_once=True)
-                    self.write_debug(error_to_compat_str(e), only_once=True)
-                    continue
+                signature = self._decrypt_signature(sc['s'][0], video_id, player_url)
+                sp = try_get(sc, lambda x: x['sp'][0]) or 'signature'
+                fmt_url += '&' + sp + '=' + signature
 
-            language_preference = (
-                10 if audio_track.get('audioIsDefault')
-                else -10 if 'descriptive' in (traverse_obj(audio_track, ('displayName', T(lower))) or '')
-                else -1)
-            name = (
-                traverse_obj(fmt, ('qualityLabel', T(txt_or_none)))
-                or quality.replace('audio_quality_', ''))
+            if itag:
+                itags.append(itag)
+            tbr = float_or_none(
+                fmt.get('averageBitrate') or fmt.get('bitrate'), 1000)
             dct = {
-                'format_id': join_nonempty(itag, fmt.get('isDrc') and 'drc'),
-                'url': fmt_url,
-                # Format 22 is likely to be damaged: see https://github.com/yt-dlp/yt-dlp/issues/3372
-                'source_preference': ((-5 if itag == '22' else -1)
-                                      + (100 if 'Premium' in name else 0)),
+                'asr': int_or_none(fmt.get('audioSampleRate')),
+                'filesize': int_or_none(fmt.get('contentLength')),
+                'format_id': itag,
+                'format_note': fmt.get('qualityLabel') or quality,
+                'fps': int_or_none(fmt.get('fps')),
+                'height': int_or_none(fmt.get('height')),
                 'quality': q(quality),
-                'language': join_nonempty(audio_track.get('id', '').split('.')[0],
-                                          'desc' if language_preference < -1 else '') or None,
-                'language_preference': language_preference,
-                # Strictly de-prioritize 3gp formats
-                'preference': -2 if itag == '17' else None,
+                'tbr': tbr,
+                'url': fmt_url,
+                'width': fmt.get('width'),
             }
-            if itag:
-                itags[itag].add(('https', dct.get('language')))
-            self._unthrottle_format_urls(video_id, player_url, dct)
-            dct.update(traverse_obj(fmt, {
-                'asr': ('audioSampleRate', T(int_or_none)),
-                'filesize': ('contentLength', T(int_or_none)),
-                'format_note': ('qualityLabel', T(lambda x: x or quality)),
-                # for some formats, fps is wrongly returned as 1
-                'fps': ('fps', T(int_or_none), T(lambda f: f if f > 1 else None)),
-                'audio_channels': ('audioChannels', T(int_or_none)),
-                'height': ('height', T(int_or_none)),
-                'has_drm': ('drmFamilies', T(bool)),
-                'tbr': (('averageBitrate', 'bitrate'), T(lambda t: float_or_none(t, 1000))),
-                'width': ('width', T(int_or_none)),
-                '_duration_ms': ('approxDurationMs', T(int_or_none)),
-            }, get_all=False))
-            mime_mobj = re.match(
-                r'((?:[^/]+)/(?:[^;]+))(?:;\s*codecs="([^"]+)")?', fmt.get('mimeType') or '')
-            if mime_mobj:
-                dct['ext'] = mimetype2ext(mime_mobj.group(1))
-                dct.update(parse_codecs(mime_mobj.group(2)))
-            single_stream = 'none' in (dct.get(c) for c in ('acodec', 'vcodec'))
-            if single_stream and dct.get('ext'):
-                dct['container'] = dct['ext'] + '_dash'
-            if single_stream or itag == '17':
-                # avoid Youtube throttling
-                dct.update({
-                    'protocol': 'http_dash_segments',
-                    'fragments': build_fragments(dct),
-                } if dct['filesize'] else {
-                    'downloader_options': {'http_chunk_size': CHUNK_SIZE},  # No longer useful?
-                })
-
+            mimetype = fmt.get('mimeType')
+            if mimetype:
+                mobj = re.match(
+                    r'((?:[^/]+)/(?:[^;]+))(?:;\s*codecs="([^"]+)")?', mimetype)
+                if mobj:
+                    dct['ext'] = mimetype2ext(mobj.group(1))
+                    dct.update(parse_codecs(mobj.group(2)))
+            no_audio = dct.get('acodec') == 'none'
+            no_video = dct.get('vcodec') == 'none'
+            if no_audio:
+                dct['vbr'] = tbr
+            if no_video:
+                dct['abr'] = tbr
+            if no_audio or no_video:
+                dct['downloader_options'] = {
+                    # Youtube throttles chunks >~10M
+                    'http_chunk_size': 10485760,
+                }
+                if dct.get('ext'):
+                    dct['container'] = dct['ext'] + '_dash'
             formats.append(dct)
 
-        def process_manifest_format(f, proto, client_name, itag, all_formats=False):
-            key = (proto, f.get('language'))
-            if not all_formats and key in itags[itag]:
-                return False
-            itags[itag].add(key)
-
-            if itag:
-                f['format_id'] = (
-                    '{0}-{1}'.format(itag, proto)
-                    if all_formats or any(p != proto for p, _ in itags[itag])
-                    else itag)
-
-            if f.get('source_preference') is None:
-                f['source_preference'] = -1
-
-            if itag in ('616', '235'):
-                f['format_note'] = join_nonempty(f.get('format_note'), 'Premium', delim=' ')
-                f['source_preference'] += 100
-
-            f['quality'] = q(traverse_obj(f, (
-                'format_id', T(lambda s: itag_qualities[s.split('-')[0]])), default=-1))
-            if try_call(lambda: f['fps'] <= 1):
-                del f['fps']
-
-            if proto == 'hls' and f.get('has_drm'):
-                f['has_drm'] = 'maybe'
-                f['source_preference'] -= 5
-            return True
-
         hls_manifest_url = streaming_data.get('hlsManifestUrl')
         if hls_manifest_url:
             for f in self._extract_m3u8_formats(
-                    hls_manifest_url, video_id, 'mp4',
-                    entry_protocol='m3u8_native', live=is_live, fatal=False):
-                if process_manifest_format(
-                        f, 'hls', None, self._search_regex(
-                            r'/itag/(\d+)', f['url'], 'itag', default=None)):
-                    formats.append(f)
+                    hls_manifest_url, video_id, 'mp4', fatal=False):
+                itag = self._search_regex(
+                    r'/itag/(\d+)', f['url'], 'itag', default=None)
+                if itag:
+                    f['format_id'] = itag
+                formats.append(f)
 
         if self._downloader.params.get('youtube_include_dash_manifest', True):
             dash_manifest_url = streaming_data.get('dashManifestUrl')
             if dash_manifest_url:
                 for f in self._extract_mpd_formats(
                         dash_manifest_url, video_id, fatal=False):
-                    if process_manifest_format(
-                            f, 'dash', None, f['format_id']):
-                        f['filesize'] = traverse_obj(f, (
-                            ('fragment_base_url', 'url'), T(lambda u: self._search_regex(
-                                r'/clen/(\d+)', u, 'file size', default=None)),
-                            T(int_or_none)), get_all=False)
-                        formats.append(f)
+                    itag = f['format_id']
+                    if itag in itags:
+                        continue
+                    if itag in itag_qualities:
+                        f['quality'] = q(itag_qualities[itag])
+                    filesize = int_or_none(self._search_regex(
+                        r'/clen/(\d+)', f.get('fragment_base_url')
+                        or f['url'], 'file size', default=None))
+                    if filesize:
+                        f['filesize'] = filesize
+                    formats.append(f)
 
-        playable_formats = [f for f in formats if not f.get('has_drm')]
-        if formats:
-            if not playable_formats:
-                # If there are no formats that definitely don't have DRM, all have DRM
-                self.report_drm(video_id)
-            formats[:] = playable_formats
-        else:
+        if not formats:
             if streaming_data.get('licenseInfos'):
                 raise ExtractorError(
                     'This video is DRM protected.', expected=True)
@@ -2600,28 +1706,25 @@ class YoutubeIE(YoutubeBaseInfoExtractor):
                 for m in re.finditer(self._meta_regex('og:video:tag'), webpage)]
         for keyword in keywords:
             if keyword.startswith('yt:stretch='):
-                mobj = re.search(r'(\d+)\s*:\s*(\d+)', keyword)
-                if mobj:
-                    # NB: float is intentional for forcing float division
-                    w, h = (float(v) for v in mobj.groups())
-                    if w > 0 and h > 0:
-                        ratio = w / h
-                        for f in formats:
-                            if f.get('vcodec') != 'none':
-                                f['stretched_ratio'] = ratio
-                        break
+                w, h = keyword.split('=')[1].split(':')
+                w, h = int(w), int(h)
+                if w > 0 and h > 0:
+                    ratio = w / h
+                    for f in formats:
+                        if f.get('vcodec') != 'none':
+                            f['stretched_ratio'] = ratio
 
         thumbnails = []
         for container in (video_details, microformat):
-            for thumbnail in try_get(
+            for thumbnail in (try_get(
                     container,
-                    lambda x: x['thumbnail']['thumbnails'], list) or []:
-                thumbnail_url = url_or_none(thumbnail.get('url'))
+                    lambda x: x['thumbnail']['thumbnails'], list) or []):
+                thumbnail_url = thumbnail.get('url')
                 if not thumbnail_url:
                     continue
                 thumbnails.append({
                     'height': int_or_none(thumbnail.get('height')),
-                    'url': update_url(thumbnail_url, query=None, fragment=None),
+                    'url': thumbnail_url,
                     'width': int_or_none(thumbnail.get('width')),
                 })
             if thumbnails:
@@ -2632,28 +1735,15 @@ class YoutubeIE(YoutubeBaseInfoExtractor):
                 thumbnails = [{'url': thumbnail}]
 
         category = microformat.get('category') or search_meta('genre')
-        channel_id = self._extract_channel_id(
-            webpage, videodetails=video_details, metadata=microformat)
+        channel_id = video_details.get('channelId') \
+            or microformat.get('externalChannelId') \
+            or search_meta('channelId')
         duration = int_or_none(
             video_details.get('lengthSeconds')
             or microformat.get('lengthSeconds')) \
             or parse_duration(search_meta('duration'))
-
-        for f in formats:
-            # Some formats may have much smaller duration than others (possibly damaged during encoding)
-            # but avoid false positives with small duration differences.
-            # Ref: https://github.com/yt-dlp/yt-dlp/issues/2823
-            if try_call(lambda x: float(x.pop('_duration_ms')) / duration < 500, args=(f,)):
-                self.report_warning(
-                    '{0}: Some possibly damaged formats will be deprioritized'.format(video_id), only_once=True)
-                # Strictly de-prioritize damaged formats
-                f['preference'] = -10
-
-        owner_profile_url = self._yt_urljoin(self._extract_author_var(
-            webpage, 'url', videodetails=video_details, metadata=microformat))
-
-        uploader = self._extract_author_var(
-            webpage, 'name', videodetails=video_details, metadata=microformat)
+        is_live = video_details.get('isLive')
+        owner_profile_url = microformat.get('ownerProfileUrl')
 
         info = {
             'id': video_id,
@@ -2664,8 +1754,11 @@ class YoutubeIE(YoutubeBaseInfoExtractor):
             'upload_date': unified_strdate(
                 microformat.get('uploadDate')
                 or search_meta('uploadDate')),
-            'uploader': uploader,
+            'uploader': video_details['author'],
+            'uploader_id': self._search_regex(r'/(?:channel|user)/([^/?&#]+)', owner_profile_url, 'uploader id') if owner_profile_url else None,
+            'uploader_url': owner_profile_url,
             'channel_id': channel_id,
+            'channel_url': 'https://www.youtube.com/channel/' + channel_id if channel_id else None,
             'duration': duration,
             'view_count': int_or_none(
                 video_details.get('viewCount')
@@ -2682,9 +1775,9 @@ class YoutubeIE(YoutubeBaseInfoExtractor):
             'is_live': is_live,
         }
 
-        pctr = traverse_obj(
-            (player_response, api_player_response),
-            (Ellipsis, 'captions', 'playerCaptionsTracklistRenderer', T(dict)))
+        pctr = try_get(
+            player_response,
+            lambda x: x['captions']['playerCaptionsTracklistRenderer'], dict)
         if pctr:
             def process_language(container, base_url, lang_code, query):
                 lang_subs = []
@@ -2698,35 +1791,31 @@ class YoutubeIE(YoutubeBaseInfoExtractor):
                     })
                 container[lang_code] = lang_subs
 
-            def process_subtitles():
-                subtitles = {}
-                for caption_track in traverse_obj(pctr, (
-                        Ellipsis, 'captionTracks', lambda _, v: (
-                            v.get('baseUrl') and v.get('languageCode')))):
-                    base_url = self._yt_urljoin(caption_track['baseUrl'])
-                    if not base_url:
+            subtitles = {}
+            for caption_track in (pctr.get('captionTracks') or []):
+                base_url = caption_track.get('baseUrl')
+                if not base_url:
+                    continue
+                if caption_track.get('kind') != 'asr':
+                    lang_code = caption_track.get('languageCode')
+                    if not lang_code:
                         continue
-                    lang_code = caption_track['languageCode']
-                    if caption_track.get('kind') != 'asr':
-                        process_language(
-                            subtitles, base_url, lang_code, {})
-                        continue
-                    automatic_captions = {}
                     process_language(
-                        automatic_captions, base_url, lang_code, {})
-                    for translation_language in traverse_obj(pctr, (
-                            Ellipsis, 'translationLanguages', lambda _, v: v.get('languageCode'))):
-                        translation_language_code = translation_language['languageCode']
-                        process_language(
-                            automatic_captions, base_url, translation_language_code,
-                            {'tlang': translation_language_code})
-                    info['automatic_captions'] = automatic_captions
-                info['subtitles'] = subtitles
-
-            process_subtitles()
+                        subtitles, base_url, lang_code, {})
+                    continue
+                automatic_captions = {}
+                for translation_language in (pctr.get('translationLanguages') or []):
+                    translation_language_code = translation_language.get('languageCode')
+                    if not translation_language_code:
+                        continue
+                    process_language(
+                        automatic_captions, base_url, translation_language_code,
+                        {'tlang': translation_language_code})
+                info['automatic_captions'] = automatic_captions
+            info['subtitles'] = subtitles
 
         parsed_url = compat_urllib_parse_urlparse(url)
-        for component in (parsed_url.fragment, parsed_url.query):
+        for component in [parsed_url.fragment, parsed_url.query]:
             query = compat_parse_qs(component)
             for k, v in query.items():
                 for d_k, s_ks in [('start', ('start', 't')), ('end', ('end',))]:
@@ -2735,7 +1824,6 @@ class YoutubeIE(YoutubeBaseInfoExtractor):
                         info[d_k] = parse_duration(query[k][0])
 
         if video_description:
-            # Youtube Music Auto-generated description
             mobj = re.search(r'(?s)(?P<track>[^·\n]+)·(?P<artist>[^\n]+)\n+(?P<album>[^\n]+)(?:.+?℗\s*(?P<release_year>\d{4})(?!\d))?(?:.+?Released on\s*:\s*(?P<release_date>\d{4}-\d{2}-\d{2}))?(.+?\nArtist\s*:\s*(?P<clean_artist>[^\n]+))?.+\nAuto-generated by YouTube\.\s*$', video_description)
             if mobj:
                 release_year = mobj.group('release_year')
@@ -2799,13 +1887,6 @@ class YoutubeIE(YoutubeBaseInfoExtractor):
                 initial_data,
                 lambda x: x['contents']['twoColumnWatchNextResults']['results']['results']['contents'],
                 list) or []
-            if not info['channel_id']:
-                channel_id = self._extract_channel_id('', renderers=contents)
-            if not info['uploader']:
-                info['uploader'] = self._extract_author_var('', 'name', renderers=contents)
-            if not owner_profile_url:
-                owner_profile_url = self._yt_urljoin(self._extract_author_var('', 'url', renderers=contents))
-
             for content in contents:
                 vpir = content.get('videoPrimaryInfoRenderer')
                 if vpir:
@@ -2817,8 +1898,7 @@ class YoutubeIE(YoutubeBaseInfoExtractor):
                                 lambda x: x['superTitleIcon']['iconType']) == 'LOCATION_PIN':
                             info['location'] = stl
                         else:
-                            # •? doesn't match, but [•]? does; \xa0 = non-breaking space
-                            mobj = re.search(r'([^\xa0\s].*?)[\xa0\s]*S(\d+)[\xa0\s]*[•]?[\xa0\s]*E(\d+)', stl)
+                            mobj = re.search(r'(.+?)\s*S(\d+)\s*•\s*E(\d+)', stl)
                             if mobj:
                                 info.update({
                                     'series': mobj.group(1),
@@ -2829,7 +1909,7 @@ class YoutubeIE(YoutubeBaseInfoExtractor):
                             vpir,
                             lambda x: x['videoActions']['menuRenderer']['topLevelButtons'],
                             list) or []):
-                        tbr = traverse_obj(tlb, ('segmentedLikeDislikeButtonRenderer', 'likeButton', 'toggleButtonRenderer'), 'toggleButtonRenderer') or {}
+                        tbr = tlb.get('toggleButtonRenderer') or {}
                         for getter, regex in [(
                                 lambda x: x['defaultText']['accessibility']['accessibilityData'],
                                 r'(?P<count>[\d,]+)\s*(?P<type>(?:dis)?like)'), ([
@@ -2845,22 +1925,17 @@ class YoutubeIE(YoutubeBaseInfoExtractor):
                     sbr_tooltip = try_get(
                         vpir, lambda x: x['sentimentBar']['sentimentBarRenderer']['tooltip'])
                     if sbr_tooltip:
-                        # however dislike_count was hidden by YT, as if there could ever be dislikable content on YT
                         like_count, dislike_count = sbr_tooltip.split(' / ')
                         info.update({
                             'like_count': str_to_int(like_count),
                             'dislike_count': str_to_int(dislike_count),
                         })
-                    else:
-                        info['like_count'] = traverse_obj(vpir, (
-                            'videoActions', 'menuRenderer', 'topLevelButtons', Ellipsis,
-                            'segmentedLikeDislikeButtonViewModel', 'likeButtonViewModel', 'likeButtonViewModel',
-                            'toggleButtonViewModel', 'toggleButtonViewModel', 'defaultButtonViewModel',
-                            'buttonViewModel', (('title', ('accessibilityText', T(lambda s: s.split()), Ellipsis))), T(parse_count)),
-                            get_all=False)
-
                 vsir = content.get('videoSecondaryInfoRenderer')
                 if vsir:
+                    info['channel'] = get_text(try_get(
+                        vsir,
+                        lambda x: x['owner']['videoOwnerRenderer']['title'],
+                        dict))
                     rows = try_get(
                         vsir,
                         lambda x: x['metadataRowContainer']['metadataRowContainerRenderer']['rows'],
@@ -2887,30 +1962,6 @@ class YoutubeIE(YoutubeBaseInfoExtractor):
                             elif mrr_title == 'Song':
                                 info['track'] = mrr_contents_text
 
-            # this is not extraction but spelunking!
-            carousel_lockups = traverse_obj(
-                initial_data,
-                ('engagementPanels', Ellipsis, 'engagementPanelSectionListRenderer',
-                 'content', 'structuredDescriptionContentRenderer', 'items', Ellipsis,
-                 'videoDescriptionMusicSectionRenderer', 'carouselLockups', Ellipsis),
-                expected_type=dict) or []
-            # try to reproduce logic from metadataRowContainerRenderer above (if it still is)
-            fields = (('ALBUM', 'album'), ('ARTIST', 'artist'), ('SONG', 'track'), ('LICENSES', 'license'))
-            # multiple_songs ?
-            if len(carousel_lockups) > 1:
-                fields = fields[-1:]
-            for info_row in traverse_obj(
-                    carousel_lockups,
-                    (0, 'carouselLockupRenderer', 'infoRows', Ellipsis, 'infoRowRenderer'),
-                    expected_type=dict):
-                row_title = traverse_obj(info_row, ('title', 'simpleText'))
-                row_text = traverse_obj(info_row, 'defaultMetadata', 'expandedMetadata', expected_type=get_text)
-                if not row_text:
-                    continue
-                for name, field in fields:
-                    if name == row_title and not info.get(field):
-                        info[field] = row_text
-
         for s_k, d_k in [('artist', 'creator'), ('track', 'alt_title')]:
             v = info.get(s_k)
             if v:
@@ -2918,14 +1969,7 @@ class YoutubeIE(YoutubeBaseInfoExtractor):
 
         self.mark_watched(video_id, player_response)
 
-        return merge_dicts(
-            info, {
-                'uploader_id': self._extract_uploader_id(owner_profile_url),
-                'uploader_url': owner_profile_url,
-                'channel_id': channel_id,
-                'channel_url': channel_id and self._yt_urljoin('/channel/' + channel_id),
-                'channel': info['uploader'],
-            })
+        return info
 
 
 class YoutubeTabIE(YoutubeBaseInfoExtractor):
@@ -2940,43 +1984,20 @@ class YoutubeTabIE(YoutubeBaseInfoExtractor):
                         (?:
                             (?:channel|c|user|feed|hashtag)/|
                             (?:playlist|watch)\?.*?\blist=|
-                            (?!(?:watch|embed|v|e|results)\b)
+                            (?!(?:watch|embed|v|e)\b)
                         )
                         (?P<id>[^/?\#&]+)
                     '''
     IE_NAME = 'youtube:tab'
 
     _TESTS = [{
-        # Shorts
-        'url': 'https://www.youtube.com/@SuperCooperShorts/shorts',
-        'playlist_mincount': 5,
-        'info_dict': {
-            'description': 'Short clips from Super Cooper Sundays!',
-            'id': 'UCKMA8kHZ8bPYpnMNaUSxfEQ',
-            'title': 'Super Cooper Shorts - Shorts',
-            'uploader': 'Super Cooper Shorts',
-            'uploader_id': '@SuperCooperShorts',
-        },
-    }, {
-        # Channel that does not have a Shorts tab. Test should just download videos on Home tab instead
-        'url': 'https://www.youtube.com/@emergencyawesome/shorts',
-        'info_dict': {
-            'description': 'md5:592c080c06fef4de3c902c4a8eecd850',
-            'id': 'UCDiFRMQWpcp8_KD4vwIVicw',
-            'title': 'Emergency Awesome - Home',
-        },
-        'playlist_mincount': 5,
-        'skip': 'new test page needed to replace `Emergency Awesome - Shorts`',
-    }, {
         # playlists, multipage
         'url': 'https://www.youtube.com/c/ИгорьКлейнер/playlists?view=1&flow=grid',
         'playlist_mincount': 94,
         'info_dict': {
             'id': 'UCqj7Cz7revf5maW9g5pgNcg',
-            'title': r're:Igor Kleiner(?: Ph\.D\.)? - Playlists',
+            'title': 'Игорь Клейнер - Playlists',
             'description': 'md5:be97ee0f14ee314f1f002cf187166ee2',
-            'uploader': 'Igor Kleiner',
-            'uploader_id': '@IgorDataScience',
         },
     }, {
         # playlists, multipage, different order
@@ -2984,21 +2005,8 @@ class YoutubeTabIE(YoutubeBaseInfoExtractor):
         'playlist_mincount': 94,
         'info_dict': {
             'id': 'UCqj7Cz7revf5maW9g5pgNcg',
-            'title': r're:Igor Kleiner(?: Ph\.D\.)? - Playlists',
+            'title': 'Игорь Клейнер - Playlists',
             'description': 'md5:be97ee0f14ee314f1f002cf187166ee2',
-            'uploader': 'Igor Kleiner',
-            'uploader_id': '@IgorDataScience',
-        },
-    }, {
-        # playlists, series
-        'url': 'https://www.youtube.com/c/3blue1brown/playlists?view=50&sort=dd&shelf_id=3',
-        'playlist_mincount': 5,
-        'info_dict': {
-            'id': 'UCYO_jab_esuFRV4b17AJtAw',
-            'title': '3Blue1Brown - Playlists',
-            'description': 'md5:e1384e8a133307dd10edee76e875d62f',
-            'uploader': '3Blue1Brown',
-            'uploader_id': '@3blue1brown',
         },
     }, {
         # playlists, singlepage
@@ -3008,9 +2016,7 @@ class YoutubeTabIE(YoutubeBaseInfoExtractor):
             'id': 'UCAEtajcuhQ6an9WEzY9LEMQ',
             'title': 'ThirstForScience - Playlists',
             'description': 'md5:609399d937ea957b0f53cbffb747a14c',
-            'uploader': 'ThirstForScience',
-            'uploader_id': '@ThirstForScience',
-        },
+        }
     }, {
         'url': 'https://www.youtube.com/c/ChristophLaimer/playlists',
         'only_matching': True,
@@ -3018,22 +2024,20 @@ class YoutubeTabIE(YoutubeBaseInfoExtractor):
         # basic, single video playlist
         'url': 'https://www.youtube.com/playlist?list=PL4lCao7KL_QFVb7Iudeipvc2BCavECqzc',
         'info_dict': {
+            'uploader_id': 'UCmlqkdCBesrv2Lak1mF_MxA',
+            'uploader': 'Sergey M.',
             'id': 'PL4lCao7KL_QFVb7Iudeipvc2BCavECqzc',
             'title': 'youtube-dl public playlist',
-            'uploader': 'Sergey M.',
-            'uploader_id': '@sergeym.6173',
-            'channel_id': 'UCmlqkdCBesrv2Lak1mF_MxA',
         },
         'playlist_count': 1,
     }, {
         # empty playlist
         'url': 'https://www.youtube.com/playlist?list=PL4lCao7KL_QFodcLWhDpGCYnngnHtQ-Xf',
         'info_dict': {
+            'uploader_id': 'UCmlqkdCBesrv2Lak1mF_MxA',
+            'uploader': 'Sergey M.',
             'id': 'PL4lCao7KL_QFodcLWhDpGCYnngnHtQ-Xf',
             'title': 'youtube-dl empty playlist',
-            'uploader': 'Sergey M.',
-            'uploader_id': '@sergeym.6173',
-            'channel_id': 'UCmlqkdCBesrv2Lak1mF_MxA',
         },
         'playlist_count': 0,
     }, {
@@ -3043,8 +2047,6 @@ class YoutubeTabIE(YoutubeBaseInfoExtractor):
             'id': 'UCKfVa3S1e4PHvxWcwyMMg8w',
             'title': 'lex will - Home',
             'description': 'md5:2163c5d0ff54ed5f598d6a7e6211e488',
-            'uploader': 'lex will',
-            'uploader_id': '@lexwill718',
         },
         'playlist_mincount': 2,
     }, {
@@ -3054,8 +2056,6 @@ class YoutubeTabIE(YoutubeBaseInfoExtractor):
             'id': 'UCKfVa3S1e4PHvxWcwyMMg8w',
             'title': 'lex will - Videos',
             'description': 'md5:2163c5d0ff54ed5f598d6a7e6211e488',
-            'uploader': 'lex will',
-            'uploader_id': '@lexwill718',
         },
         'playlist_mincount': 975,
     }, {
@@ -3065,8 +2065,6 @@ class YoutubeTabIE(YoutubeBaseInfoExtractor):
             'id': 'UCKfVa3S1e4PHvxWcwyMMg8w',
             'title': 'lex will - Videos',
             'description': 'md5:2163c5d0ff54ed5f598d6a7e6211e488',
-            'uploader': 'lex will',
-            'uploader_id': '@lexwill718',
         },
         'playlist_mincount': 199,
     }, {
@@ -3076,8 +2074,6 @@ class YoutubeTabIE(YoutubeBaseInfoExtractor):
             'id': 'UCKfVa3S1e4PHvxWcwyMMg8w',
             'title': 'lex will - Playlists',
             'description': 'md5:2163c5d0ff54ed5f598d6a7e6211e488',
-            'uploader': 'lex will',
-            'uploader_id': '@lexwill718',
         },
         'playlist_mincount': 17,
     }, {
@@ -3087,8 +2083,6 @@ class YoutubeTabIE(YoutubeBaseInfoExtractor):
             'id': 'UCKfVa3S1e4PHvxWcwyMMg8w',
             'title': 'lex will - Community',
             'description': 'md5:2163c5d0ff54ed5f598d6a7e6211e488',
-            'uploader': 'lex will',
-            'uploader_id': '@lexwill718',
         },
         'playlist_mincount': 18,
     }, {
@@ -3096,23 +2090,10 @@ class YoutubeTabIE(YoutubeBaseInfoExtractor):
         'url': 'https://www.youtube.com/channel/UCKfVa3S1e4PHvxWcwyMMg8w/channels',
         'info_dict': {
             'id': 'UCKfVa3S1e4PHvxWcwyMMg8w',
-            'title': r're:lex will - (?:Home|Channels)',
+            'title': 'lex will - Channels',
             'description': 'md5:2163c5d0ff54ed5f598d6a7e6211e488',
-            'uploader': 'lex will',
-            'uploader_id': '@lexwill718',
         },
-        'playlist_mincount': 75,
-    }, {
-        # Releases tab
-        'url': 'https://www.youtube.com/@daftpunk/releases',
-        'info_dict': {
-            'id': 'UC_kRDKYrUlrbtrSiyu5Tflg',
-            'title': 'Daft Punk - Releases',
-            'description': 'Daft Punk (1993 - 2021) - Official YouTube Channel',
-            'uploader_id': '@daftpunk',
-            'uploader': 'Daft Punk',
-        },
-        'playlist_mincount': 36,
+        'playlist_mincount': 138,
     }, {
         'url': 'https://invidio.us/channel/UCmlqkdCBesrv2Lak1mF_MxA',
         'only_matching': True,
@@ -3129,8 +2110,7 @@ class YoutubeTabIE(YoutubeBaseInfoExtractor):
             'title': '29C3: Not my department',
             'id': 'PLwP_SiAcdui0KVebT0mU9Apz359a4ubsC',
             'uploader': 'Christiaan008',
-            'uploader_id': '@ChRiStIaAn008',
-            'channel_id': 'UCEPzS1rYsrkqzSLNp76nrcg',
+            'uploader_id': 'UCEPzS1rYsrkqzSLNp76nrcg',
         },
         'playlist_count': 96,
     }, {
@@ -3140,8 +2120,7 @@ class YoutubeTabIE(YoutubeBaseInfoExtractor):
             'title': 'Uploads from Cauchemar',
             'id': 'UUBABnxM4Ar9ten8Mdjj1j0Q',
             'uploader': 'Cauchemar',
-            'uploader_id': '@Cauchemar89',
-            'channel_id': 'UCBABnxM4Ar9ten8Mdjj1j0Q',
+            'uploader_id': 'UCBABnxM4Ar9ten8Mdjj1j0Q',
         },
         'playlist_mincount': 1123,
     }, {
@@ -3155,8 +2134,7 @@ class YoutubeTabIE(YoutubeBaseInfoExtractor):
             'title': 'Uploads from Interstellar Movie',
             'id': 'UUXw-G3eDE9trcvY2sBMM_aA',
             'uploader': 'Interstellar Movie',
-            'uploader_id': '@InterstellarMovie',
-            'channel_id': 'UCXw-G3eDE9trcvY2sBMM_aA',
+            'uploader_id': 'UCXw-G3eDE9trcvY2sBMM_aA',
         },
         'playlist_mincount': 21,
     }, {
@@ -3165,9 +2143,8 @@ class YoutubeTabIE(YoutubeBaseInfoExtractor):
         'info_dict': {
             'title': 'Data Analysis with Dr Mike Pound',
             'id': 'PLzH6n4zXuckpfMu_4Ff8E7Z1behQks5ba',
+            'uploader_id': 'UC9-y-6csu5WGm29I7JiwpnA',
             'uploader': 'Computerphile',
-            'uploader_id': '@Computerphile',
-            'channel_id': 'UC9-y-6csu5WGm29I7JiwpnA',
         },
         'playlist_mincount': 11,
     }, {
@@ -3190,6 +2167,7 @@ class YoutubeTabIE(YoutubeBaseInfoExtractor):
             'tags': list,
             'view_count': int,
             'like_count': int,
+            'dislike_count': int,
         },
         'params': {
             'skip_download': True,
@@ -3205,17 +2183,18 @@ class YoutubeTabIE(YoutubeBaseInfoExtractor):
     }, {
         'url': 'https://www.youtube.com/channel/UCoMdktPbSTixAyNGwb-UYkQ/live',
         'info_dict': {
-            'id': r're:[\da-zA-Z_-]{8,}',
+            'id': '9Auq9mYxFEE',
             'ext': 'mp4',
-            'title': r're:(?s)[A-Z].{20,}',
+            'title': 'Watch Sky News live',
             'uploader': 'Sky News',
-            'uploader_id': '@SkyNews',
-            'uploader_url': r're:https?://(?:www\.)?youtube\.com/@SkyNews',
-            'upload_date': r're:\d{8}',
-            'description': r're:(?s)(?:.*\n)+SUBSCRIBE to our YouTube channel for more videos: http://www\.youtube\.com/skynews *\n.*',
+            'uploader_id': 'skynews',
+            'uploader_url': r're:https?://(?:www\.)?youtube\.com/user/skynews',
+            'upload_date': '20191102',
+            'description': 'md5:78de4e1c2359d0ea3ed829678e38b662',
             'categories': ['News & Politics'],
             'tags': list,
             'like_count': int,
+            'dislike_count': int,
         },
         'params': {
             'skip_download': True,
@@ -3235,6 +2214,7 @@ class YoutubeTabIE(YoutubeBaseInfoExtractor):
             'categories': ['News & Politics'],
             'tags': ['Cenk Uygur (TV Program Creator)', 'The Young Turks (Award-Winning Work)', 'Talk Show (TV Genre)'],
             'like_count': int,
+            'dislike_count': int,
         },
         'params': {
             'skip_download': True,
@@ -3295,56 +2275,42 @@ class YoutubeTabIE(YoutubeBaseInfoExtractor):
             'title': '#cctv9',
         },
         'playlist_mincount': 350,
-    }, {
-        'url': 'https://www.youtube.com/watch?list=PLW4dVinRY435CBE_JD3t-0SRXKfnZHS1P&feature=youtu.be&v=M9cJMXmQ_ZU',
-        'only_matching': True,
-    }, {
-        'note': 'Search tab',
-        'url': 'https://www.youtube.com/c/3blue1brown/search?query=linear%20algebra',
-        'playlist_mincount': 20,
-        'info_dict': {
-            'id': 'UCYO_jab_esuFRV4b17AJtAw',
-            'title': '3Blue1Brown - Search - linear algebra',
-            'description': 'md5:e1384e8a133307dd10edee76e875d62f',
-            'uploader': '3Blue1Brown',
-            'uploader_id': '@3blue1brown',
-            'channel_id': 'UCYO_jab_esuFRV4b17AJtAw',
-        },
     }]
 
     @classmethod
     def suitable(cls, url):
-        return not YoutubeIE.suitable(url) and super(
+        return False if YoutubeIE.suitable(url) else super(
             YoutubeTabIE, cls).suitable(url)
 
+    def _extract_channel_id(self, webpage):
+        channel_id = self._html_search_meta(
+            'channelId', webpage, 'channel id', default=None)
+        if channel_id:
+            return channel_id
+        channel_url = self._html_search_meta(
+            ('og:url', 'al:ios:url', 'al:android:url', 'al:web:url',
+             'twitter:url', 'twitter:app:url:iphone', 'twitter:app:url:ipad',
+             'twitter:app:url:googleplay'), webpage, 'channel url')
+        return self._search_regex(
+            r'https?://(?:www\.)?youtube\.com/channel/([^/?#&])+',
+            channel_url, 'channel id')
+
     @staticmethod
     def _extract_grid_item_renderer(item):
-        assert isinstance(item, dict)
-        for key, renderer in item.items():
-            if not key.startswith('grid') or not key.endswith('Renderer'):
-                continue
-            if not isinstance(renderer, dict):
-                continue
-            return renderer
-
-    @staticmethod
-    def _get_text(r, k):
-        return traverse_obj(
-            r, (k, 'runs', 0, 'text'), (k, 'simpleText'),
-            expected_type=txt_or_none)
+        for item_kind in ('Playlist', 'Video', 'Channel'):
+            renderer = item.get('grid%sRenderer' % item_kind)
+            if renderer:
+                return renderer
 
     def _grid_entries(self, grid_renderer):
-        for item in traverse_obj(grid_renderer, ('items', Ellipsis, T(dict))):
-            lockup_view_model = traverse_obj(item, ('lockupViewModel', T(dict)))
-            if lockup_view_model:
-                entry = self._extract_lockup_view_model(lockup_view_model)
-                if entry:
-                    yield entry
+        for item in grid_renderer['items']:
+            if not isinstance(item, dict):
                 continue
             renderer = self._extract_grid_item_renderer(item)
             if not isinstance(renderer, dict):
                 continue
-            title = self._get_text(renderer, 'title')
+            title = try_get(
+                renderer, lambda x: x['title']['runs'][0]['text'], compat_str)
             # playlist
             playlist_id = renderer.get('playlistId')
             if playlist_id:
@@ -3352,30 +2318,18 @@ class YoutubeTabIE(YoutubeBaseInfoExtractor):
                     'https://www.youtube.com/playlist?list=%s' % playlist_id,
                     ie=YoutubeTabIE.ie_key(), video_id=playlist_id,
                     video_title=title)
-                continue
             # video
             video_id = renderer.get('videoId')
             if video_id:
                 yield self._extract_video(renderer)
-                continue
             # channel
             channel_id = renderer.get('channelId')
             if channel_id:
-                title = self._get_text(renderer, 'title')
+                title = try_get(
+                    renderer, lambda x: x['title']['simpleText'], compat_str)
                 yield self.url_result(
                     'https://www.youtube.com/channel/%s' % channel_id,
                     ie=YoutubeTabIE.ie_key(), video_title=title)
-                continue
-            # generic endpoint URL support
-            ep_url = urljoin('https://www.youtube.com/', try_get(
-                renderer, lambda x: x['navigationEndpoint']['commandMetadata']['webCommandMetadata']['url'],
-                compat_str))
-            if ep_url:
-                for ie in (YoutubeTabIE, YoutubePlaylistIE, YoutubeIE):
-                    if ie.suitable(ep_url):
-                        yield self.url_result(
-                            ep_url, ie=ie.ie_key(), video_id=ie._match_id(ep_url), video_title=title)
-                        break
 
     def _shelf_entries_from_content(self, shelf_renderer):
         content = shelf_renderer.get('content')
@@ -3423,39 +2377,6 @@ class YoutubeTabIE(YoutubeBaseInfoExtractor):
                 continue
             yield self._extract_video(renderer)
 
-    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'):
-            self.report_warning(
-                'Unsupported lockup view model content type "{0}"{1}'.format(content_type, bug_reports_message()), only_once=True)
-            return
-        return merge_dicts(self.url_result(
-            update_url_query('https://www.youtube.com/playlist', {'list': content_id}),
-            ie=YoutubeTabIE.ie_key(), video_id=content_id), {
-                'title': traverse_obj(view_model, (
-                    'metadata', 'lockupMetadataViewModel', 'title', 'content', T(compat_str))),
-                'thumbnails': self._extract_thumbnails(view_model, (
-                    'contentImage', 'collectionThumbnailViewModel', 'primaryThumbnail',
-                    'thumbnailViewModel', 'image'), final_key='sources'),
-        })
-
-    def _extract_shorts_lockup_view_model(self, view_model):
-        content_id = traverse_obj(view_model, (
-            'onTap', 'innertubeCommand', 'reelWatchEndpoint', 'videoId',
-            T(lambda v: v if YoutubeIE.suitable(v) else None)))
-        if not content_id:
-            return
-        return merge_dicts(self.url_result(
-            content_id, ie=YoutubeIE.ie_key(), video_id=content_id), {
-                'title': traverse_obj(view_model, (
-                    'overlayMetadata', 'primaryText', 'content', T(compat_str))),
-                'thumbnails': self._extract_thumbnails(
-                    view_model, 'thumbnail', final_key='sources'),
-        })
-
     def _video_entry(self, video_renderer):
         video_id = video_renderer.get('videoId')
         if video_id:
@@ -3502,32 +2423,12 @@ class YoutubeTabIE(YoutubeBaseInfoExtractor):
                 yield entry
 
     def _rich_grid_entries(self, contents):
-        for content in traverse_obj(
-                contents, (Ellipsis, 'richItemRenderer', 'content'),
-                expected_type=dict):
-            video_renderer = traverse_obj(
-                content, 'videoRenderer', 'reelItemRenderer',
-                expected_type=dict)
+        for content in contents:
+            video_renderer = try_get(content, lambda x: x['richItemRenderer']['content']['videoRenderer'], dict)
             if video_renderer:
                 entry = self._video_entry(video_renderer)
                 if entry:
                     yield entry
-            # shorts item
-            shorts_lockup_view_model = content.get('shortsLockupViewModel')
-            if shorts_lockup_view_model:
-                entry = self._extract_shorts_lockup_view_model(shorts_lockup_view_model)
-                if entry:
-                    yield entry
-            # playlist
-            renderer = traverse_obj(
-                content, 'playlistRenderer', expected_type=dict) or {}
-            title = self._get_text(renderer, 'title')
-            playlist_id = renderer.get('playlistId')
-            if playlist_id:
-                yield self.url_result(
-                    'https://www.youtube.com/playlist?list=%s' % playlist_id,
-                    ie=YoutubeTabIE.ie_key(), video_id=playlist_id,
-                    video_title=title)
 
     @staticmethod
     def _build_continuation_query(continuation, ctp=None):
@@ -3556,17 +2457,25 @@ class YoutubeTabIE(YoutubeBaseInfoExtractor):
         next_continuation = cls._extract_next_continuation_data(renderer)
         if next_continuation:
             return next_continuation
-        for command in traverse_obj(renderer, (
-                ('contents', 'items', 'rows'), Ellipsis, 'continuationItemRenderer',
-                ('continuationEndpoint', ('button', 'buttonRenderer', 'command')),
-                (('commandExecutorCommand', 'commands', Ellipsis), None), T(dict))):
-            continuation = traverse_obj(command, ('continuationCommand', 'token', T(compat_str)))
+        contents = []
+        for key in ('contents', 'items'):
+            contents.extend(try_get(renderer, lambda x: x[key], list) or [])
+        for content in contents:
+            if not isinstance(content, dict):
+                continue
+            continuation_ep = try_get(
+                content, lambda x: x['continuationItemRenderer']['continuationEndpoint'],
+                dict)
+            if not continuation_ep:
+                continue
+            continuation = try_get(
+                continuation_ep, lambda x: x['continuationCommand']['token'], compat_str)
             if not continuation:
                 continue
-            ctp = command.get('clickTrackingParams')
-            return cls._build_continuation_query(continuation, ctp)
+            ctp = continuation_ep.get('clickTrackingParams')
+            return YoutubeTabIE._build_continuation_query(continuation, ctp)
 
-    def _entries(self, tab, item_id, webpage):
+    def _entries(self, tab, identity_token):
         tab_content = try_get(tab, lambda x: x['content'], dict)
         if not tab_content:
             return
@@ -3613,13 +2522,6 @@ class YoutubeTabIE(YoutubeBaseInfoExtractor):
                         entry = self._video_entry(renderer)
                         if entry:
                             yield entry
-                    renderer = isr_content.get('richGridRenderer')
-                    if renderer:
-                        for from_ in self._rich_grid_entries(
-                                traverse_obj(renderer, ('contents', Ellipsis, T(dict)))):
-                            yield from_
-                        continuation = self._extract_continuation(renderer)
-                        continue
 
                 if not continuation:
                     continuation = self._extract_continuation(is_renderer)
@@ -3629,46 +2531,33 @@ class YoutubeTabIE(YoutubeBaseInfoExtractor):
             rich_grid_renderer = tab_content.get('richGridRenderer')
             if not rich_grid_renderer:
                 return
-            for from_ in self._rich_grid_entries(
-                    traverse_obj(rich_grid_renderer, ('contents', Ellipsis, T(dict)))):
-                yield from_
-
+            for entry in self._rich_grid_entries(rich_grid_renderer.get('contents') or []):
+                yield entry
             continuation = self._extract_continuation(rich_grid_renderer)
 
-        ytcfg = self._extract_ytcfg(item_id, webpage)
-        client_version = try_get(
-            ytcfg, lambda x: x['INNERTUBE_CLIENT_VERSION'], compat_str) or '2.20210407.08.00'
-
         headers = {
             'x-youtube-client-name': '1',
-            'x-youtube-client-version': client_version,
+            'x-youtube-client-version': '2.20201112.04.01',
             'content-type': 'application/json',
         }
-
-        context = try_get(ytcfg, lambda x: x['INNERTUBE_CONTEXT'], dict) or {
-            'client': {
-                'clientName': 'WEB',
-                'clientVersion': client_version,
-            },
-        }
-        visitor_data = try_get(context, lambda x: x['client']['visitorData'], compat_str)
-
-        identity_token = self._extract_identity_token(ytcfg, webpage)
         if identity_token:
             headers['x-youtube-identity-token'] = identity_token
 
         data = {
-            'context': context,
+            'context': {
+                'client': {
+                    'clientName': 'WEB',
+                    'clientVersion': '2.20201021.03.00',
+                }
+            },
         }
 
         for page_num in itertools.count(1):
             if not continuation:
                 break
-            if visitor_data:
-                headers['X-Goog-Visitor-Id'] = visitor_data
             data['continuation'] = continuation['continuation']
             data['clickTracking'] = {
-                'clickTrackingParams': continuation['itct'],
+                'clickTrackingParams': continuation['itct']
             }
             count = 0
             retries = 3
@@ -3677,12 +2566,8 @@ class YoutubeTabIE(YoutubeBaseInfoExtractor):
                     # Downloading page may result in intermittent 5xx HTTP error
                     # that is usually worked around with a retry
                     response = self._download_json(
-                        'https://www.youtube.com/youtubei/v1/browse',
+                        'https://www.youtube.com/youtubei/v1/browse?key=AIzaSyAO_FJ2SlqU8Q4STEHLGCilw_Y9_11qcW8',
                         None, 'Downloading page %d%s' % (page_num, ' (retry #%d)' % count if count else ''),
-                        query={
-                            # 'key': 'AIzaSyAO_FJ2SlqU8Q4STEHLGCilw_Y9_11qcW8',
-                            'prettyPrint': 'false',
-                        },
                         headers=headers, data=json.dumps(data).encode('utf8'))
                     break
                 except ExtractorError as e:
@@ -3694,9 +2579,6 @@ class YoutubeTabIE(YoutubeBaseInfoExtractor):
             if not response:
                 break
 
-            visitor_data = try_get(
-                response, lambda x: x['responseContext']['visitorData'], compat_str) or visitor_data
-
             continuation_contents = try_get(
                 response, lambda x: x['continuationContents'], dict)
             if continuation_contents:
@@ -3759,78 +2641,93 @@ class YoutubeTabIE(YoutubeBaseInfoExtractor):
     @staticmethod
     def _extract_selected_tab(tabs):
         for tab in tabs:
-            renderer = dict_get(tab, ('tabRenderer', 'expandableTabRenderer')) or {}
-            if renderer.get('selected') is True:
-                return renderer
+            if try_get(tab, lambda x: x['tabRenderer']['selected'], bool):
+                return tab['tabRenderer']
         else:
             raise ExtractorError('Unable to find selected tab')
 
-    def _extract_uploader(self, metadata, data):
+    @staticmethod
+    def _extract_uploader(data):
         uploader = {}
-        renderers = traverse_obj(data,
-                                 ('sidebar', 'playlistSidebarRenderer', 'items'))
-        uploader['channel_id'] = self._extract_channel_id('', metadata=metadata, renderers=renderers)
-        uploader['uploader'] = (
-            self._extract_author_var('', 'name', renderers=renderers)
-            or self._extract_author_var('', 'name', metadata=metadata))
-        uploader['uploader_url'] = self._yt_urljoin(
-            self._extract_author_var('', 'url', metadata=metadata, renderers=renderers))
-        uploader['uploader_id'] = self._extract_uploader_id(uploader['uploader_url'])
-        uploader['channel'] = uploader['uploader']
+        sidebar_renderer = try_get(
+            data, lambda x: x['sidebar']['playlistSidebarRenderer']['items'], list)
+        if sidebar_renderer:
+            for item in sidebar_renderer:
+                if not isinstance(item, dict):
+                    continue
+                renderer = item.get('playlistSidebarSecondaryInfoRenderer')
+                if not isinstance(renderer, dict):
+                    continue
+                owner = try_get(
+                    renderer, lambda x: x['videoOwner']['videoOwnerRenderer']['title']['runs'][0], dict)
+                if owner:
+                    uploader['uploader'] = owner.get('text')
+                    uploader['uploader_id'] = try_get(
+                        owner, lambda x: x['navigationEndpoint']['browseEndpoint']['browseId'], compat_str)
+                    uploader['uploader_url'] = urljoin(
+                        'https://www.youtube.com/',
+                        try_get(owner, lambda x: x['navigationEndpoint']['browseEndpoint']['canonicalBaseUrl'], compat_str))
         return uploader
 
-    @classmethod
-    def _extract_alert(cls, data):
+    @staticmethod
+    def _extract_alert(data):
         alerts = []
-        for alert in traverse_obj(data, ('alerts', Ellipsis), expected_type=dict):
-            alert_text = traverse_obj(
-                alert, (None, lambda x: x['alertRenderer']['text']), get_all=False)
+        for alert in try_get(data, lambda x: x['alerts'], list) or []:
+            if not isinstance(alert, dict):
+                continue
+            alert_text = try_get(
+                alert, lambda x: x['alertRenderer']['text'], dict)
             if not alert_text:
                 continue
-            text = cls._get_text(alert_text, 'text')
+            text = try_get(
+                alert_text,
+                (lambda x: x['simpleText'], lambda x: x['runs'][0]['text']),
+                compat_str)
             if text:
                 alerts.append(text)
         return '\n'.join(alerts)
 
-    def _extract_from_tabs(self, item_id, webpage, data, tabs):
+    def _extract_from_tabs(self, item_id, webpage, data, tabs, identity_token):
         selected_tab = self._extract_selected_tab(tabs)
-        renderer = traverse_obj(data, ('metadata', 'channelMetadataRenderer'),
-                                expected_type=dict) or {}
+        renderer = try_get(
+            data, lambda x: x['metadata']['channelMetadataRenderer'], dict)
         playlist_id = item_id
         title = description = None
         if renderer:
-            channel_title = txt_or_none(renderer.get('title')) or item_id
-            tab_title = txt_or_none(selected_tab.get('title'))
-            title = join_nonempty(
-                channel_title or item_id, tab_title,
-                txt_or_none(selected_tab.get('expandedText')),
-                delim=' - ')
-            description = txt_or_none(renderer.get('description'))
-            playlist_id = txt_or_none(renderer.get('externalId')) or playlist_id
+            channel_title = renderer.get('title') or item_id
+            tab_title = selected_tab.get('title')
+            title = channel_title or item_id
+            if tab_title:
+                title += ' - %s' % tab_title
+            description = renderer.get('description')
+            playlist_id = renderer.get('externalId')
         else:
-            renderer = traverse_obj(data,
-                                    ('metadata', 'playlistMetadataRenderer'),
-                                    ('header', 'hashtagHeaderRenderer'),
-                                    expected_type=dict) or {}
-            title = traverse_obj(renderer, 'title', ('hashtag', 'simpleText'),
-                                 expected_type=txt_or_none)
+            renderer = try_get(
+                data, lambda x: x['metadata']['playlistMetadataRenderer'], dict)
+            if renderer:
+                title = renderer.get('title')
+            else:
+                renderer = try_get(
+                    data, lambda x: x['header']['hashtagHeaderRenderer'], dict)
+                if renderer:
+                    title = try_get(renderer, lambda x: x['hashtag']['simpleText'])
         playlist = self.playlist_result(
-            self._entries(selected_tab, item_id, webpage),
+            self._entries(selected_tab, identity_token),
             playlist_id=playlist_id, playlist_title=title,
             playlist_description=description)
-        return merge_dicts(playlist, self._extract_uploader(renderer, data))
+        playlist.update(self._extract_uploader(data))
+        return playlist
 
     def _extract_from_playlist(self, item_id, url, data, playlist):
-        title = traverse_obj((playlist, data),
-                             (0, 'title'), (1, 'titleText', 'simpleText'),
-                             expected_type=txt_or_none)
-        playlist_id = txt_or_none(playlist.get('playlistId')) or item_id
+        title = playlist.get('title') or try_get(
+            data, lambda x: x['titleText']['simpleText'], compat_str)
+        playlist_id = playlist.get('playlistId') or item_id
         # Inline playlist rendition continuation does not always work
         # at Youtube side, so delegating regular tab-based playlist URL
         # processing whenever possible.
-        playlist_url = urljoin(url, traverse_obj(
-            playlist, ('endpoint', 'commandMetadata', 'webCommandMetadata', 'url'),
-            expected_type=url_or_none))
+        playlist_url = urljoin(url, try_get(
+            playlist, lambda x: x['endpoint']['commandMetadata']['webCommandMetadata']['url'],
+            compat_str))
         if playlist_url and playlist_url != url:
             return self.url_result(
                 playlist_url, ie=YoutubeTabIE.ie_key(), video_id=playlist_id,
@@ -3839,7 +2736,8 @@ class YoutubeTabIE(YoutubeBaseInfoExtractor):
             self._playlist_entries(playlist), playlist_id=playlist_id,
             playlist_title=title)
 
-    def _extract_identity_token(self, ytcfg, webpage):
+    def _extract_identity_token(self, webpage, item_id):
+        ytcfg = self._extract_ytcfg(item_id, webpage)
         if ytcfg:
             token = try_get(ytcfg, lambda x: x['ID_TOKEN'], compat_str)
             if token:
@@ -3850,35 +2748,24 @@ class YoutubeTabIE(YoutubeBaseInfoExtractor):
 
     def _real_extract(self, url):
         item_id = self._match_id(url)
-        url = update_url(url, netloc='www.youtube.com')
-        qs = parse_qs(url)
-
-        def qs_get(key, default=None):
-            return qs.get(key, [default])[-1]
-
-        # Go around for /feeds/videos.xml?playlist_id={pl_id}
-        if item_id == 'feeds' and '/feeds/videos.xml?' in url:
-            playlist_id = qs_get('playlist_id')
-            if playlist_id:
-                return self.url_result(
-                    update_url_query('https://www.youtube.com/playlist', {
-                        'list': playlist_id,
-                    }), ie=self.ie_key(), video_id=playlist_id)
-
+        url = compat_urlparse.urlunparse(
+            compat_urlparse.urlparse(url)._replace(netloc='www.youtube.com'))
         # Handle both video/playlist URLs
-        video_id = qs_get('v')
-        playlist_id = qs_get('list')
+        qs = compat_urlparse.parse_qs(compat_urlparse.urlparse(url).query)
+        video_id = qs.get('v', [None])[0]
+        playlist_id = qs.get('list', [None])[0]
         if video_id and playlist_id:
             if self._downloader.params.get('noplaylist'):
                 self.to_screen('Downloading just video %s because of --no-playlist' % video_id)
                 return self.url_result(video_id, ie=YoutubeIE.ie_key(), video_id=video_id)
             self.to_screen('Downloading playlist %s - add --no-playlist to just download video %s' % (playlist_id, video_id))
         webpage = self._download_webpage(url, item_id)
+        identity_token = self._extract_identity_token(webpage, item_id)
         data = self._extract_yt_initial_data(item_id, webpage)
         tabs = try_get(
             data, lambda x: x['contents']['twoColumnBrowseResultsRenderer']['tabs'], list)
         if tabs:
-            return self._extract_from_tabs(item_id, webpage, data, tabs)
+            return self._extract_from_tabs(item_id, webpage, data, tabs, identity_token)
         playlist = try_get(
             data, lambda x: x['contents']['twoColumnWatchNextResults']['playlist']['playlist'], dict)
         if playlist:
@@ -3919,9 +2806,8 @@ class YoutubePlaylistIE(InfoExtractor):
         'info_dict': {
             'title': '[OLD]Team Fortress 2 (Class-based LP)',
             'id': 'PLBB231211A4F62143',
-            'uploader': 'Wickman',
-            'uploader_id': '@WickmanVT',
-            'channel_id': 'UCKSpbfbl5kRQpTdL7kMc-1Q',
+            'uploader': 'Wickydoo',
+            'uploader_id': 'UCKSpbfbl5kRQpTdL7kMc-1Q',
         },
         'playlist_mincount': 29,
     }, {
@@ -3935,26 +2821,22 @@ class YoutubePlaylistIE(InfoExtractor):
     }, {
         'note': 'embedded',
         'url': 'https://www.youtube.com/embed/videoseries?list=PL6IaIsEjSbf96XFRuNccS_RuEXwNdsoEu',
-        # TODO: full playlist requires _reload_with_unavailable_videos()
-        # 'playlist_count': 4,
-        'playlist_mincount': 1,
+        'playlist_count': 4,
         'info_dict': {
             'title': 'JODA15',
             'id': 'PL6IaIsEjSbf96XFRuNccS_RuEXwNdsoEu',
             'uploader': 'milan',
-            'uploader_id': '@milan5503',
-            'channel_id': 'UCEI1-PVPcYXjB73Hfelbmaw',
-        },
+            'uploader_id': 'UCEI1-PVPcYXjB73Hfelbmaw',
+        }
     }, {
         'url': 'http://www.youtube.com/embed/_xDOZElKyNU?list=PLsyOSbh5bs16vubvKePAQ1x3PhKavfBIl',
-        'playlist_mincount': 455,
+        'playlist_mincount': 982,
         'info_dict': {
             'title': '2018 Chinese New Singles (11/6 updated)',
             'id': 'PLsyOSbh5bs16vubvKePAQ1x3PhKavfBIl',
             'uploader': 'LBK',
-            'uploader_id': '@music_king',
-            'channel_id': 'UC21nz3_MesPLqtDqwdvnoxA',
-        },
+            'uploader_id': 'UC21nz3_MesPLqtDqwdvnoxA',
+        }
     }, {
         'url': 'TLGGrESM50VT6acwMjAyMjAxNw',
         'only_matching': True,
@@ -3966,15 +2848,12 @@ class YoutubePlaylistIE(InfoExtractor):
 
     @classmethod
     def suitable(cls, url):
-        if YoutubeTabIE.suitable(url):
-            return False
-        if parse_qs(url).get('v', [None])[0]:
-            return False
-        return super(YoutubePlaylistIE, cls).suitable(url)
+        return False if YoutubeTabIE.suitable(url) else super(
+            YoutubePlaylistIE, cls).suitable(url)
 
     def _real_extract(self, url):
         playlist_id = self._match_id(url)
-        qs = parse_qs(url)
+        qs = compat_urlparse.parse_qs(compat_urlparse.urlparse(url).query)
         if not qs:
             qs = {'list': playlist_id}
         return self.url_result(
@@ -3991,13 +2870,14 @@ class YoutubeYtBeIE(InfoExtractor):
             'ext': 'mp4',
             'title': 'Small Scale Baler and Braiding Rugs',
             'uploader': 'Backus-Page House Museum',
-            'uploader_id': '@backuspagemuseum',
-            'uploader_url': r're:https?://(?:www\.)?youtube\.com/@backuspagemuseum',
+            'uploader_id': 'backuspagemuseum',
+            'uploader_url': r're:https?://(?:www\.)?youtube\.com/user/backuspagemuseum',
             'upload_date': '20161008',
             'description': 'md5:800c0c78d5eb128500bffd4f0b4f2e8a',
             'categories': ['Nonprofits & Activism'],
             'tags': list,
             'like_count': int,
+            'dislike_count': int,
         },
         'params': {
             'noplaylist': True,
@@ -4055,68 +2935,111 @@ class YoutubeFavouritesIE(YoutubeBaseInfoExtractor):
 
 class YoutubeSearchIE(SearchInfoExtractor, YoutubeBaseInfoExtractor):
     IE_DESC = 'YouTube.com searches'
+    # there doesn't appear to be a real limit, for example if you search for
+    # 'python' you get more than 8.000.000 results
+    _MAX_RESULTS = float('inf')
     IE_NAME = 'youtube:search'
     _SEARCH_KEY = 'ytsearch'
-    _SEARCH_PARAMS = 'EgIQAQ%3D%3D'  # Videos only
-    _MAX_RESULTS = float('inf')
-    _TESTS = [{
-        'url': 'ytsearch10:youtube-dl test video',
-        'playlist_count': 10,
-        'info_dict': {
-            'id': 'youtube-dl test video',
-            'title': 'youtube-dl test video',
-        },
-    }]
+    _SEARCH_PARAMS = None
+    _TESTS = []
+
+    def _entries(self, query, n):
+        data = {
+            'context': {
+                'client': {
+                    'clientName': 'WEB',
+                    'clientVersion': '2.20201021.03.00',
+                }
+            },
+            'query': query,
+        }
+        if self._SEARCH_PARAMS:
+            data['params'] = self._SEARCH_PARAMS
+        total = 0
+        for page_num in itertools.count(1):
+            search = self._download_json(
+                'https://www.youtube.com/youtubei/v1/search?key=AIzaSyAO_FJ2SlqU8Q4STEHLGCilw_Y9_11qcW8',
+                video_id='query "%s"' % query,
+                note='Downloading page %s' % page_num,
+                errnote='Unable to download API page', fatal=False,
+                data=json.dumps(data).encode('utf8'),
+                headers={'content-type': 'application/json'})
+            if not search:
+                break
+            slr_contents = try_get(
+                search,
+                (lambda x: x['contents']['twoColumnSearchResultsRenderer']['primaryContents']['sectionListRenderer']['contents'],
+                 lambda x: x['onResponseReceivedCommands'][0]['appendContinuationItemsAction']['continuationItems']),
+                list)
+            if not slr_contents:
+                break
+            for slr_content in slr_contents:
+                isr_contents = try_get(
+                    slr_content,
+                    lambda x: x['itemSectionRenderer']['contents'],
+                    list)
+                if not isr_contents:
+                    continue
+                for content in isr_contents:
+                    if not isinstance(content, dict):
+                        continue
+                    video = content.get('videoRenderer')
+                    if not isinstance(video, dict):
+                        continue
+                    video_id = video.get('videoId')
+                    if not video_id:
+                        continue
+                    yield self._extract_video(video)
+                    total += 1
+                    if total == n:
+                        return
+            token = try_get(
+                slr_contents,
+                lambda x: x[-1]['continuationItemRenderer']['continuationEndpoint']['continuationCommand']['token'],
+                compat_str)
+            if not token:
+                break
+            data['continuation'] = token
 
     def _get_n_results(self, query, n):
         """Get a specified number of results for a query"""
-        entries = itertools.islice(self._search_results(query, self._SEARCH_PARAMS), 0, None if n == float('inf') else n)
-        return self.playlist_result(entries, query, query)
+        return self.playlist_result(self._entries(query, n), query)
 
 
 class YoutubeSearchDateIE(YoutubeSearchIE):
     IE_NAME = YoutubeSearchIE.IE_NAME + ':date'
     _SEARCH_KEY = 'ytsearchdate'
     IE_DESC = 'YouTube.com searches, newest videos first'
-    _SEARCH_PARAMS = 'CAISAhAB'  # Videos only, sorted by date
-    _TESTS = [{
-        'url': 'ytsearchdate10:youtube-dl test video',
-        'playlist_count': 10,
-        'info_dict': {
-            'id': 'youtube-dl test video',
-            'title': 'youtube-dl test video',
-        },
-    }]
+    _SEARCH_PARAMS = 'CAI%3D'
 
 
-class YoutubeSearchURLIE(YoutubeBaseInfoExtractor):
-    IE_DESC = 'YouTube search URLs with sorting and filter support'
-    IE_NAME = YoutubeSearchIE.IE_NAME + '_url'
-    _VALID_URL = r'https?://(?:www\.)?youtube\.com/results\?(.*?&)?(?:search_query|q)=(?:[^&]+)(?:[&]|$)'
+r"""
+class YoutubeSearchURLIE(YoutubeSearchIE):
+    IE_DESC = 'YouTube.com search URLs'
+    IE_NAME = 'youtube:search_url'
+    _VALID_URL = r'https?://(?:www\.)?youtube\.com/results\?(.*?&)?(?:search_query|q)=(?P<query>[^&]+)(?:[&]|$)'
     _TESTS = [{
         'url': 'https://www.youtube.com/results?baz=bar&search_query=youtube-dl+test+video&filters=video&lclk=video',
         'playlist_mincount': 5,
         'info_dict': {
-            'id': 'youtube-dl test video',
             'title': 'youtube-dl test video',
-        },
-        'params': {'playlistend': 5},
+        }
     }, {
         'url': 'https://www.youtube.com/results?q=test&sp=EgQIBBgB',
         'only_matching': True,
     }]
 
     def _real_extract(self, url):
-        qs = parse_qs(url)
-        query = (qs.get('search_query') or qs.get('q'))[-1]
-        params = qs.get('sp', ('',))[-1]
-        return self.playlist_result(self._search_results(query, params), query, query)
+        mobj = re.match(self._VALID_URL, url)
+        query = compat_urllib_parse_unquote_plus(mobj.group('query'))
+        webpage = self._download_webpage(url, query)
+        return self.playlist_result(self._process_page(webpage), playlist_title=query)
+"""
 
 
 class YoutubeFeedsInfoExtractor(YoutubeTabIE):
     """
     Base class for feed extractors
-
     Subclasses must define the _FEED_NAME property.
     """
     _LOGIN_REQUIRED = True
diff --git a/youtube_dl/extractor/zdf.py b/youtube_dl/extractor/zdf.py
index fcc63ef52..4dd56f66d 100644
--- a/youtube_dl/extractor/zdf.py
+++ b/youtube_dl/extractor/zdf.py
@@ -7,15 +7,13 @@ from .common import InfoExtractor
 from ..compat import compat_str
 from ..utils import (
     determine_ext,
-    ExtractorError,
-    extract_attributes,
     float_or_none,
     int_or_none,
     merge_dicts,
     NO_DEFAULT,
+    orderedSet,
     parse_codecs,
     qualities,
-    str_or_none,
     try_get,
     unified_timestamp,
     update_url_query,
@@ -58,39 +56,28 @@ class ZDFBaseIE(InfoExtractor):
         format_urls.add(format_url)
         mime_type = meta.get('mimeType')
         ext = determine_ext(format_url)
-
-        join_nonempty = lambda s, l: s.join(filter(None, l))
-        meta_map = lambda t: map(lambda x: str_or_none(meta.get(x)), t)
-
         if mime_type == 'application/x-mpegURL' or ext == 'm3u8':
-            new_formats = self._extract_m3u8_formats(
+            formats.extend(self._extract_m3u8_formats(
                 format_url, video_id, 'mp4', m3u8_id='hls',
-                entry_protocol='m3u8_native', fatal=False)
+                entry_protocol='m3u8_native', fatal=False))
         elif mime_type == 'application/f4m+xml' or ext == 'f4m':
-            new_formats = self._extract_f4m_formats(
-                update_url_query(format_url, {'hdcore': '3.7.0'}), video_id, f4m_id='hds', fatal=False)
+            formats.extend(self._extract_f4m_formats(
+                update_url_query(format_url, {'hdcore': '3.7.0'}), video_id, f4m_id='hds', fatal=False))
         else:
             f = parse_codecs(meta.get('mimeCodec'))
-            if not f:
-                data = meta.get('type', '').split('_')
-                if try_get(data, lambda x: x[2]) == ext:
-                    f = dict(zip(('vcodec', 'acodec'), data[1]))
-
             format_id = ['http']
-            format_id.extend(join_nonempty('-', meta_map(('type', 'quality'))))
+            for p in (meta.get('type'), meta.get('quality')):
+                if p and isinstance(p, compat_str):
+                    format_id.append(p)
             f.update({
                 'url': format_url,
                 'format_id': '-'.join(format_id),
-                'tbr': int_or_none(self._search_regex(r'_(\d+)k_', format_url, 'tbr', default=None))
+                'format_note': meta.get('quality'),
+                'language': meta.get('language'),
+                'quality': qualities(self._QUALITIES)(meta.get('quality')),
+                'preference': -10,
             })
-            new_formats = [f]
-
-        formats.extend(merge_dicts(f, {
-            'format_note': join_nonempty(',', meta_map(('quality', 'class'))),
-            'language': meta.get('language'),
-            'language_preference': 10 if meta.get('class') == 'main' else -10 if meta.get('class') == 'ad' else -1,
-            'quality': qualities(self._QUALITIES)(meta.get('quality')),
-        }) for f in new_formats)
+            formats.append(f)
 
     def _extract_ptmd(self, ptmd_url, video_id, api_token, referrer):
         ptmd = self._call_api(
@@ -119,7 +106,6 @@ class ZDFBaseIE(InfoExtractor):
                                 'type': f.get('type'),
                                 'mimeType': f.get('mimeType'),
                                 'quality': quality.get('quality'),
-                                'class': track.get('class'),
                                 'language': track.get('language'),
                             })
         self._sort_formats(formats)
@@ -159,7 +145,6 @@ class ZDFIE(ZDFBaseIE):
             'timestamp': 1613948400,
             'upload_date': '20210221',
         },
-        'skip': 'No longer available: "Diese Seite wurde leider nicht gefunden"',
     }, {
         # Same as https://www.3sat.de/film/ab-18/10-wochen-sommer-108.html
         'url': 'https://www.zdf.de/dokumentation/ab-18/10-wochen-sommer-102.html',
@@ -173,7 +158,6 @@ class ZDFIE(ZDFBaseIE):
             'timestamp': 1608604200,
             'upload_date': '20201222',
         },
-        'skip': 'No longer available: "Diese Seite wurde leider nicht gefunden"',
     }, {
         'url': 'https://www.zdf.de/dokumentation/terra-x/die-magie-der-farben-von-koenigspurpur-und-jeansblau-100.html',
         'info_dict': {
@@ -184,20 +168,6 @@ class ZDFIE(ZDFBaseIE):
             'duration': 2615,
             'timestamp': 1465021200,
             'upload_date': '20160604',
-            'thumbnail': 'https://www.zdf.de/assets/mauve-im-labor-100~768x432?cb=1464909117806',
-        },
-    }, {
-        'url': 'https://www.zdf.de/funk/druck-11790/funk-alles-ist-verzaubert-102.html',
-        'md5': '1b93bdec7d02fc0b703c5e7687461628',
-        'info_dict': {
-            'ext': 'mp4',
-            'id': 'video_funk_1770473',
-            'duration': 1278,
-            'description': 'Die Neue an der Schule verdreht Ismail den Kopf.',
-            'title': 'Alles ist verzaubert',
-            'timestamp': 1635520560,
-            'upload_date': '20211029',
-            'thumbnail': 'https://www.zdf.de/assets/teaser-funk-alles-ist-verzaubert-100~1920x1080?cb=1636466431799',
         },
     }, {
         # Same as https://www.phoenix.de/sendungen/dokumentationen/gesten-der-maechtigen-i-a-89468.html?ref=suche
@@ -220,30 +190,6 @@ class ZDFIE(ZDFBaseIE):
     }, {
         'url': 'https://www.zdf.de/dokumentation/planet-e/planet-e-uebersichtsseite-weitere-dokumentationen-von-planet-e-100.html',
         'only_matching': True,
-    }, {
-        'url': 'https://www.zdf.de/arte/todliche-flucht/page-video-artede-toedliche-flucht-16-100.html',
-        'info_dict': {
-            'id': 'video_artede_083871-001-A',
-            'ext': 'mp4',
-            'title': 'Tödliche Flucht (1/6)',
-            'description': 'md5:e34f96a9a5f8abd839ccfcebad3d5315',
-            'duration': 3193.0,
-            'timestamp': 1641355200,
-            'upload_date': '20220105',
-        },
-        'skip': 'No longer available "Diese Seite wurde leider nicht gefunden"'
-    }, {
-        'url': 'https://www.zdf.de/serien/soko-stuttgart/das-geld-anderer-leute-100.html',
-        'info_dict': {
-            'id': '191205_1800_sendung_sok8',
-            'ext': 'mp4',
-            'title': 'Das Geld anderer Leute',
-            'description': 'md5:cb6f660850dc5eb7d1ab776ea094959d',
-            'duration': 2581.0,
-            'timestamp': 1654790700,
-            'upload_date': '20220609',
-            'thumbnail': 'https://epg-image.zdf.de/fotobase-webdelivery/images/e2d7e55a-09f0-424e-ac73-6cac4dd65f35?layout=2400x1350',
-        },
     }]
 
     def _extract_entry(self, url, player, content, video_id):
@@ -251,18 +197,12 @@ class ZDFIE(ZDFBaseIE):
 
         t = content['mainVideoContent']['http://zdf.de/rels/target']
 
-        def get_ptmd_path(d):
-            return (
-                d.get('http://zdf.de/rels/streams/ptmd')
-                or d.get('http://zdf.de/rels/streams/ptmd-template',
-                         '').replace('{playerId}', 'ngplayer_2_4'))
-
-        ptmd_path = get_ptmd_path(try_get(t, lambda x: x['streams']['default'], dict) or {})
-        if not ptmd_path:
-            ptmd_path = get_ptmd_path(t)
+        ptmd_path = t.get('http://zdf.de/rels/streams/ptmd')
 
         if not ptmd_path:
-            raise ExtractorError('Could not extract ptmd_path')
+            ptmd_path = t[
+                'http://zdf.de/rels/streams/ptmd-template'].replace(
+                '{playerId}', 'ngplayer_2_4')
 
         info = self._extract_ptmd(
             urljoin(url, ptmd_path), video_id, player['apiToken'], url)
@@ -305,16 +245,15 @@ class ZDFIE(ZDFBaseIE):
             'https://zdf-cdn.live.cellular.de/mediathekV2/document/%s' % video_id,
             video_id)
 
-        formats = []
-        formitaeten = try_get(video, lambda x: x['document']['formitaeten'], list)
-        document = formitaeten and video['document']
-        if formitaeten:
-            title = document['titel']
-            content_id = document['basename']
+        document = video['document']
 
-            format_urls = set()
-            for f in formitaeten or []:
-                self._extract_format(content_id, formats, format_urls, f)
+        title = document['titel']
+        content_id = document['basename']
+
+        formats = []
+        format_urls = set()
+        for f in document['formitaeten']:
+            self._extract_format(content_id, formats, format_urls, f)
         self._sort_formats(formats)
 
         thumbnails = []
@@ -361,9 +300,9 @@ class ZDFChannelIE(ZDFBaseIE):
         'url': 'https://www.zdf.de/sport/das-aktuelle-sportstudio',
         'info_dict': {
             'id': 'das-aktuelle-sportstudio',
-            'title': 'das aktuelle sportstudio',
+            'title': 'das aktuelle sportstudio | ZDF',
         },
-        'playlist_mincount': 18,
+        'playlist_mincount': 23,
     }, {
         'url': 'https://www.zdf.de/dokumentation/planet-e',
         'info_dict': {
@@ -371,14 +310,6 @@ class ZDFChannelIE(ZDFBaseIE):
             'title': 'planet e.',
         },
         'playlist_mincount': 50,
-    }, {
-        'url': 'https://www.zdf.de/gesellschaft/aktenzeichen-xy-ungeloest',
-        'info_dict': {
-            'id': 'aktenzeichen-xy-ungeloest',
-            'title': 'Aktenzeichen XY... ungelöst',
-            'entries': "lambda x: not any('xy580-fall1-kindermoerder-gesucht-100' in e['url'] for e in x)",
-        },
-        'playlist_mincount': 2,
     }, {
         'url': 'https://www.zdf.de/filme/taunuskrimi/',
         'only_matching': True,
@@ -388,36 +319,60 @@ class ZDFChannelIE(ZDFBaseIE):
     def suitable(cls, url):
         return False if ZDFIE.suitable(url) else super(ZDFChannelIE, cls).suitable(url)
 
-    def _og_search_title(self, webpage, fatal=False):
-        title = super(ZDFChannelIE, self)._og_search_title(webpage, fatal=fatal)
-        return re.split(r'\s+[-|]\s+ZDF(?:mediathek)?$', title or '')[0] or None
-
     def _real_extract(self, url):
         channel_id = self._match_id(url)
 
         webpage = self._download_webpage(url, channel_id)
 
-        matches = re.finditer(
-            r'''<div\b[^>]*?\sdata-plusbar-id\s*=\s*(["'])(?P<p_id>[\w-]+)\1[^>]*?\sdata-plusbar-url=\1(?P<url>%s)\1''' % ZDFIE._VALID_URL,
-            webpage)
+        entries = [
+            self.url_result(item_url, ie=ZDFIE.ie_key())
+            for item_url in orderedSet(re.findall(
+                r'data-plusbar-url=["\'](http.+?\.html)', webpage))]
 
-        if self._downloader.params.get('noplaylist', False):
-            entry = next(
-                (self.url_result(m.group('url'), ie=ZDFIE.ie_key()) for m in matches),
-                None)
-            self.to_screen('Downloading just the main video because of --no-playlist')
-            if entry:
-                return entry
-        else:
-            self.to_screen('Downloading playlist %s - add --no-playlist to download just the main video' % (channel_id, ))
+        return self.playlist_result(
+            entries, channel_id, self._og_search_title(webpage, fatal=False))
 
-        def check_video(m):
-            v_ref = self._search_regex(
-                r'''(<a\b[^>]*?\shref\s*=[^>]+?\sdata-target-id\s*=\s*(["'])%s\2[^>]*>)''' % (m.group('p_id'), ),
-                webpage, 'check id', default='')
-            v_ref = extract_attributes(v_ref)
-            return v_ref.get('data-target-video-type') != 'novideo'
+        r"""
+        player = self._extract_player(webpage, channel_id)
 
-        return self.playlist_from_matches(
-            (m.group('url') for m in matches if check_video(m)),
-            channel_id, self._og_search_title(webpage, fatal=False))
+        channel_id = self._search_regex(
+            r'docId\s*:\s*(["\'])(?P<id>(?!\1).+?)\1', webpage,
+            'channel id', group='id')
+
+        channel = self._call_api(
+            'https://api.zdf.de/content/documents/%s.json' % channel_id,
+            player, url, channel_id)
+
+        items = []
+        for module in channel['module']:
+            for teaser in try_get(module, lambda x: x['teaser'], list) or []:
+                t = try_get(
+                    teaser, lambda x: x['http://zdf.de/rels/target'], dict)
+                if not t:
+                    continue
+                items.extend(try_get(
+                    t,
+                    lambda x: x['resultsWithVideo']['http://zdf.de/rels/search/results'],
+                    list) or [])
+            items.extend(try_get(
+                module,
+                lambda x: x['filterRef']['resultsWithVideo']['http://zdf.de/rels/search/results'],
+                list) or [])
+
+        entries = []
+        entry_urls = set()
+        for item in items:
+            t = try_get(item, lambda x: x['http://zdf.de/rels/target'], dict)
+            if not t:
+                continue
+            sharing_url = t.get('http://zdf.de/rels/sharing-url')
+            if not sharing_url or not isinstance(sharing_url, compat_str):
+                continue
+            if sharing_url in entry_urls:
+                continue
+            entry_urls.add(sharing_url)
+            entries.append(self.url_result(
+                sharing_url, ie=ZDFIE.ie_key(), video_id=t.get('id')))
+
+        return self.playlist_result(entries, channel_id, channel.get('title'))
+        """
diff --git a/youtube_dl/jsinterp.py b/youtube_dl/jsinterp.py
index 7630e2099..7bda59610 100644
--- a/youtube_dl/jsinterp.py
+++ b/youtube_dl/jsinterp.py
@@ -1,1515 +1,262 @@
-# coding: utf-8
 from __future__ import unicode_literals
 
-import calendar
-import itertools
 import json
 import operator
 import re
-import time
-
-from functools import update_wrapper, wraps
 
 from .utils import (
-    error_to_compat_str,
     ExtractorError,
-    float_or_none,
-    int_or_none,
-    js_to_json,
     remove_quotes,
-    str_or_none,
-    unified_timestamp,
-    variadic,
-    write_string,
-)
-from .compat import (
-    compat_basestring,
-    compat_chr,
-    compat_collections_chain_map as ChainMap,
-    compat_contextlib_suppress,
-    compat_filter as filter,
-    compat_int,
-    compat_integer_types,
-    compat_itertools_zip_longest as zip_longest,
-    compat_map as map,
-    compat_numeric_types,
-    compat_str,
 )
 
-
-# name JS functions
-class function_with_repr(object):
-    # from yt_dlp/utils.py, but in this module
-    # repr_ is always set
-    def __init__(self, func, repr_):
-        update_wrapper(self, func)
-        self.func, self.__repr = func, repr_
-
-    def __call__(self, *args, **kwargs):
-        return self.func(*args, **kwargs)
-
-    def __repr__(self):
-        return self.__repr
-
-
-# name JS operators
-def wraps_op(op):
-
-    def update_and_rename_wrapper(w):
-        f = update_wrapper(w, op)
-        # fn names are str in both Py 2/3
-        f.__name__ = str('JS_') + f.__name__
-        return f
-
-    return update_and_rename_wrapper
-
-
-# NB In principle NaN cannot be checked by membership.
-# Here all NaN values are actually this one, so _NaN is _NaN,
-# although _NaN != _NaN. Ditto Infinity.
-
-_NaN = float('nan')
-_Infinity = float('inf')
-
-
-class JS_Undefined(object):
-    pass
-
-
-def _js_bit_op(op, is_shift=False):
-
-    def zeroise(x, is_shift_arg=False):
-        if isinstance(x, compat_integer_types):
-            return (x % 32) if is_shift_arg else (x & 0xffffffff)
-        try:
-            x = float(x)
-            if is_shift_arg:
-                x = int(x % 32)
-            elif x < 0:
-                x = -compat_int(-x % 0xffffffff)
-            else:
-                x = compat_int(x % 0xffffffff)
-        except (ValueError, TypeError):
-            # also here for int(NaN), including float('inf') % 32
-            x = 0
-        return x
-
-    @wraps_op(op)
-    def wrapped(a, b):
-        return op(zeroise(a), zeroise(b, is_shift)) & 0xffffffff
-
-    return wrapped
-
-
-def _js_arith_op(op, div=False):
-
-    @wraps_op(op)
-    def wrapped(a, b):
-        if JS_Undefined in (a, b):
-            return _NaN
-        # null, "" --> 0
-        a, b = (float_or_none(
-            (x.strip() if isinstance(x, compat_basestring) else x) or 0,
-            default=_NaN) for x in (a, b))
-        if _NaN in (a, b):
-            return _NaN
-        try:
-            return op(a, b)
-        except ZeroDivisionError:
-            return _NaN if not (div and (a or b)) else _Infinity
-
-    return wrapped
-
-
-_js_arith_add = _js_arith_op(operator.add)
-
-
-def _js_add(a, b):
-    if not (isinstance(a, compat_basestring) or isinstance(b, compat_basestring)):
-        return _js_arith_add(a, b)
-    if not isinstance(a, compat_basestring):
-        a = _js_toString(a)
-    elif not isinstance(b, compat_basestring):
-        b = _js_toString(b)
-    return operator.concat(a, b)
-
-
-_js_mod = _js_arith_op(operator.mod)
-__js_exp = _js_arith_op(operator.pow)
-
-
-def _js_exp(a, b):
-    if not b:
-        return 1  # even 0 ** 0 !!
-    return __js_exp(a, b)
-
-
-def _js_to_primitive(v):
-    return (
-        ','.join(map(_js_toString, v)) if isinstance(v, list)
-        else '[object Object]' if isinstance(v, dict)
-        else compat_str(v) if not isinstance(v, (
-            compat_numeric_types, compat_basestring))
-        else v
-    )
-
-
-# more exact: yt-dlp/yt-dlp#12110
-def _js_toString(v):
-    return (
-        'undefined' if v is JS_Undefined
-        else 'Infinity' if v == _Infinity
-        else 'NaN' if v is _NaN
-        else 'null' if v is None
-        # bool <= int: do this first
-        else ('false', 'true')[v] if isinstance(v, bool)
-        else re.sub(r'(?<=\d)\.?0*$', '', '{0:.7f}'.format(v)) if isinstance(v, compat_numeric_types)
-        else _js_to_primitive(v))
-
-
-_nullish = frozenset((None, JS_Undefined))
-
-
-def _js_eq(a, b):
-    # NaN != any
-    if _NaN in (a, b):
-        return False
-    # Object is Object
-    if isinstance(a, type(b)) and isinstance(b, (dict, list)):
-        return operator.is_(a, b)
-    # general case
-    if a == b:
-        return True
-    # null == undefined
-    a_b = set((a, b))
-    if a_b & _nullish:
-        return a_b <= _nullish
-    a, b = _js_to_primitive(a), _js_to_primitive(b)
-    if not isinstance(a, compat_basestring):
-        a, b = b, a
-    # Number to String: convert the string to a number
-    # Conversion failure results in ... false
-    if isinstance(a, compat_basestring):
-        return float_or_none(a) == b
-    return a == b
-
-
-def _js_neq(a, b):
-    return not _js_eq(a, b)
-
-
-def _js_id_op(op):
-
-    @wraps_op(op)
-    def wrapped(a, b):
-        if _NaN in (a, b):
-            return op(_NaN, None)
-        if not isinstance(a, (compat_basestring, compat_numeric_types)):
-            a, b = b, a
-        # strings are === if ==
-        # why 'a' is not 'a': https://stackoverflow.com/a/1504848
-        if isinstance(a, (compat_basestring, compat_numeric_types)):
-            return a == b if op(0, 0) else a != b
-        return op(a, b)
-
-    return wrapped
-
-
-def _js_comp_op(op):
-
-    @wraps_op(op)
-    def wrapped(a, b):
-        if JS_Undefined in (a, b):
-            return False
-        if isinstance(a, compat_basestring):
-            b = compat_str(b or 0)
-        elif isinstance(b, compat_basestring):
-            a = compat_str(a or 0)
-        return op(a or 0, b or 0)
-
-    return wrapped
-
-
-def _js_ternary(cndn, if_true=True, if_false=False):
-    """Simulate JS's ternary operator (cndn?if_true:if_false)"""
-    if cndn in (False, None, 0, '', JS_Undefined, _NaN):
-        return if_false
-    return if_true
-
-
-def _js_unary_op(op):
-
-    @wraps_op(op)
-    def wrapped(a, _):
-        return op(a)
-
-    return wrapped
-
-
-# https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Operators/typeof
-def _js_typeof(expr):
-    with compat_contextlib_suppress(TypeError, KeyError):
-        return {
-            JS_Undefined: 'undefined',
-            _NaN: 'number',
-            _Infinity: 'number',
-            True: 'boolean',
-            False: 'boolean',
-            None: 'object',
-        }[expr]
-    for t, n in (
-        (compat_basestring, 'string'),
-        (compat_numeric_types, 'number'),
-    ):
-        if isinstance(expr, t):
-            return n
-    if callable(expr):
-        return 'function'
-    # TODO: Symbol, BigInt
-    return 'object'
-
-
-# (op, definition) in order of binding priority, tightest first
-# avoid dict to maintain order
-# definition None => Defined in JSInterpreter._operator
-_OPERATORS = (
-    ('>>', _js_bit_op(operator.rshift, True)),
-    ('<<', _js_bit_op(operator.lshift, True)),
-    ('+', _js_add),
-    ('-', _js_arith_op(operator.sub)),
-    ('*', _js_arith_op(operator.mul)),
-    ('%', _js_mod),
-    ('/', _js_arith_op(operator.truediv, div=True)),
-    ('**', _js_exp),
-)
-
-_LOG_OPERATORS = (
-    ('|', _js_bit_op(operator.or_)),
-    ('^', _js_bit_op(operator.xor)),
-    ('&', _js_bit_op(operator.and_)),
-)
-
-_SC_OPERATORS = (
-    ('?', None),
-    ('??', None),
-    ('||', None),
-    ('&&', None),
-)
-
-_UNARY_OPERATORS_X = (
-    ('void', _js_unary_op(lambda _: JS_Undefined)),
-    ('typeof', _js_unary_op(_js_typeof)),
-    # avoid functools.partial here since Py2 update_wrapper(partial) -> no __module__
-    ('!', _js_unary_op(lambda x: _js_ternary(x, if_true=False, if_false=True))),
-)
-
-_COMP_OPERATORS = (
-    ('===', _js_id_op(operator.is_)),
-    ('!==', _js_id_op(operator.is_not)),
-    ('==', _js_eq),
-    ('!=', _js_neq),
-    ('<=', _js_comp_op(operator.le)),
-    ('>=', _js_comp_op(operator.ge)),
-    ('<', _js_comp_op(operator.lt)),
-    ('>', _js_comp_op(operator.gt)),
-)
-
-_OPERATOR_RE = '|'.join(map(lambda x: re.escape(x[0]), _OPERATORS + _LOG_OPERATORS + _SC_OPERATORS))
-
-_NAME_RE = r'[a-zA-Z_$][\w$]*'
-_MATCHING_PARENS = dict(zip(*zip('()', '{}', '[]')))
-_QUOTES = '\'"/'
-_NESTED_BRACKETS = r'[^[\]]+(?:\[[^[\]]+(?:\[[^\]]+\])?\])?'
-
-
-class JS_Break(ExtractorError):
-    def __init__(self):
-        ExtractorError.__init__(self, 'Invalid break')
-
-
-class JS_Continue(ExtractorError):
-    def __init__(self):
-        ExtractorError.__init__(self, 'Invalid continue')
-
-
-class JS_Throw(ExtractorError):
-    def __init__(self, e):
-        self.error = e
-        ExtractorError.__init__(self, 'Uncaught exception ' + error_to_compat_str(e))
-
-
-class LocalNameSpace(ChainMap):
-    def __getitem__(self, key):
-        try:
-            return super(LocalNameSpace, self).__getitem__(key)
-        except KeyError:
-            return JS_Undefined
-
-    def __setitem__(self, key, value):
-        for scope in self.maps:
-            if key in scope:
-                scope[key] = value
-                return
-        self.maps[0][key] = value
-
-    def __delitem__(self, key):
-        raise NotImplementedError('Deleting is not supported')
-
-    def __repr__(self):
-        return 'LocalNameSpace({0!r})'.format(self.maps)
-
-
-class Debugger(object):
-    ENABLED = False
-
-    @staticmethod
-    def write(*args, **kwargs):
-        level = kwargs.get('level', 100)
-
-        def truncate_string(s, left, right=0):
-            if s is None or len(s) <= left + right:
-                return s
-            return '...'.join((s[:left - 3], s[-right:] if right else ''))
-
-        write_string('[debug] JS: {0}{1}\n'.format(
-            '  ' * (100 - level),
-            ' '.join(truncate_string(compat_str(x), 50, 50) for x in args)))
-
-    @classmethod
-    def wrap_interpreter(cls, f):
-        if not cls.ENABLED:
-            return f
-
-        @wraps(f)
-        def interpret_statement(self, stmt, local_vars, allow_recursion, *args, **kwargs):
-            if cls.ENABLED and stmt.strip():
-                cls.write(stmt, level=allow_recursion)
-            try:
-                ret, should_ret = f(self, stmt, local_vars, allow_recursion, *args, **kwargs)
-            except Exception as e:
-                if cls.ENABLED:
-                    if isinstance(e, ExtractorError):
-                        e = e.orig_msg
-                    cls.write('=> Raises:', e, '<-|', stmt, level=allow_recursion)
-                raise
-            if cls.ENABLED and stmt.strip():
-                if should_ret or repr(ret) != stmt:
-                    cls.write(['->', '=>'][bool(should_ret)], repr(ret), '<-|', stmt, level=allow_recursion)
-            return ret, should_ret
-        return interpret_statement
+_OPERATORS = [
+    ('|', operator.or_),
+    ('^', operator.xor),
+    ('&', operator.and_),
+    ('>>', operator.rshift),
+    ('<<', operator.lshift),
+    ('-', operator.sub),
+    ('+', operator.add),
+    ('%', operator.mod),
+    ('/', operator.truediv),
+    ('*', operator.mul),
+]
+_ASSIGN_OPERATORS = [(op + '=', opfunc) for op, opfunc in _OPERATORS]
+_ASSIGN_OPERATORS.append(('=', lambda cur, right: right))
+
+_NAME_RE = r'[a-zA-Z_$][a-zA-Z_$0-9]*'
 
 
 class JSInterpreter(object):
-    __named_object_counter = 0
-
-    _OBJ_NAME = '__youtube_dl_jsinterp_obj'
-
-    OP_CHARS = None
-
     def __init__(self, code, objects=None):
-        self.code, self._functions = code, {}
-        self._objects = {} if objects is None else objects
-        if type(self).OP_CHARS is None:
-            type(self).OP_CHARS = self.OP_CHARS = self.__op_chars()
+        if objects is None:
+            objects = {}
+        self.code = code
+        self._functions = {}
+        self._objects = objects
 
-    class Exception(ExtractorError):
-        def __init__(self, msg, *args, **kwargs):
-            expr = kwargs.pop('expr', None)
-            msg = str_or_none(msg, default='"None"')
-            if expr is not None:
-                msg = '{0} in: {1!r:.100}'.format(msg.rstrip(), expr)
-            super(JSInterpreter.Exception, self).__init__(msg, *args, **kwargs)
-
-    class JS_Object(object):
-        def __getitem__(self, key):
-            if hasattr(self, key):
-                return getattr(self, key)
-            raise KeyError(key)
-
-        def dump(self):
-            """Serialise the instance"""
-            raise NotImplementedError
-
-    class JS_RegExp(JS_Object):
-        RE_FLAGS = {
-            # special knowledge: Python's re flags are bitmask values, current max 128
-            # invent new bitmask values well above that for literal parsing
-            # JS 'u' flag is effectively always set (surrogate pairs aren't seen),
-            # but \u{...} and \p{...} escapes aren't handled); no additional JS 'v'
-            # features are supported
-            # TODO: execute matches with these flags (remaining: d, y)
-            'd': 1024,  # Generate indices for substring matches
-            'g': 2048,  # Global search
-            'i': re.I,  # Case-insensitive search
-            'm': re.M,  # Multi-line search
-            's': re.S,  # Allows . to match newline characters
-            'u': re.U,  # Treat a pattern as a sequence of unicode code points
-            'v': re.U,  # Like 'u' with extended character class and \p{} syntax
-            'y': 4096,  # Perform a "sticky" search that matches starting at the current position in the target string
-        }
-
-        def __init__(self, pattern_txt, flags=0):
-            if isinstance(flags, compat_str):
-                flags, _ = self.regex_flags(flags)
-            self.__self = None
-            pattern_txt = str_or_none(pattern_txt) or '(?:)'
-            # escape unintended embedded flags
-            pattern_txt = re.sub(
-                r'(\(\?)([aiLmsux]*)(-[imsx]+:|(?<!\?)\))',
-                lambda m: ''.join(
-                    (re.escape(m.group(1)), m.group(2), re.escape(m.group(3)))
-                    if m.group(3) == ')'
-                    else ('(?:', m.group(2), m.group(3))),
-                pattern_txt)
-            # Avoid https://github.com/python/cpython/issues/74534
-            self.source = pattern_txt.replace('[[', r'[\[')
-            self.__flags = flags
-
-        def __instantiate(self):
-            if self.__self:
-                return
-            self.__self = re.compile(self.source, self.__flags)
-            # Thx: https://stackoverflow.com/questions/44773522/setattr-on-python2-sre-sre-pattern
-            for name in dir(self.__self):
-                # Only these? Obviously __class__, __init__.
-                # PyPy creates a __weakref__ attribute with value None
-                # that can't be setattr'd but also can't need to be copied.
-                if name in ('__class__', '__init__', '__weakref__'):
-                    continue
-                if name == 'flags':
-                    setattr(self, name, getattr(self.__self, name, self.__flags))
-                else:
-                    setattr(self, name, getattr(self.__self, name))
-
-        def __getattr__(self, name):
-            self.__instantiate()
-            if name == 'pattern':
-                self.pattern = self.source
-                return self.pattern
-            elif hasattr(self.__self, name):
-                v = getattr(self.__self, name)
-                setattr(self, name, v)
-                return v
-            elif name in ('groupindex', 'groups'):
-                return 0 if name == 'groupindex' else {}
-            else:
-                flag_attrs = (  # order by 2nd elt
-                    ('hasIndices', 'd'),
-                    ('global', 'g'),
-                    ('ignoreCase', 'i'),
-                    ('multiline', 'm'),
-                    ('dotAll', 's'),
-                    ('unicode', 'u'),
-                    ('unicodeSets', 'v'),
-                    ('sticky', 'y'),
-                )
-                for k, c in flag_attrs:
-                    if name == k:
-                        return bool(self.RE_FLAGS[c] & self.__flags)
-                else:
-                    if name == 'flags':
-                        return ''.join(
-                            (c if self.RE_FLAGS[c] & self.__flags else '')
-                            for _, c in flag_attrs)
-
-            raise AttributeError('{0} has no attribute named {1}'.format(self, name))
-
-        @classmethod
-        def regex_flags(cls, expr):
-            flags = 0
-            if not expr:
-                return flags, expr
-            for idx, ch in enumerate(expr):
-                if ch not in cls.RE_FLAGS:
-                    break
-                flags |= cls.RE_FLAGS[ch]
-            return flags, expr[idx + 1:]
-
-        def dump(self):
-            return '(/{0}/{1})'.format(
-                re.sub(r'(?<!\\)/', r'\/', self.source),
-                self.flags)
-
-        @staticmethod
-        def escape(string_):
-            return re.escape(string_)
-
-    class JS_Date(JS_Object):
-        _t = None
-
-        @staticmethod
-        def __ymd_etc(*args, **kw_is_utc):
-            # args: year, monthIndex, day, hours, minutes, seconds, milliseconds
-            is_utc = kw_is_utc.get('is_utc', False)
-
-            args = list(args[:7])
-            args += [0] * (9 - len(args))
-            args[1] += 1  # month 0..11 -> 1..12
-            ms = args[6]
-            for i in range(6, 9):
-                args[i] = -1  # don't know
-            if is_utc:
-                args[-1] = 1
-            # TODO: [MDN] When a segment overflows or underflows its expected
-            # range, it usually "carries over to" or "borrows from" the higher segment.
-            try:
-                mktime = calendar.timegm if is_utc else time.mktime
-                return mktime(time.struct_time(args)) * 1000 + ms
-            except (OverflowError, ValueError):
-                return None
-
-        @classmethod
-        def UTC(cls, *args):
-            t = cls.__ymd_etc(*args, is_utc=True)
-            return _NaN if t is None else t
-
-        @staticmethod
-        def parse(date_str, **kw_is_raw):
-            is_raw = kw_is_raw.get('is_raw', False)
-
-            t = unified_timestamp(str_or_none(date_str), False)
-            return int(t * 1000) if t is not None else t if is_raw else _NaN
-
-        @staticmethod
-        def now(**kw_is_raw):
-            is_raw = kw_is_raw.get('is_raw', False)
-
-            t = time.time()
-            return int(t * 1000) if t is not None else t if is_raw else _NaN
-
-        def __init__(self, *args):
-            if not args:
-                args = [self.now(is_raw=True)]
-            if len(args) == 1:
-                if isinstance(args[0], JSInterpreter.JS_Date):
-                    self._t = int_or_none(args[0].valueOf(), default=None)
-                else:
-                    arg_type = _js_typeof(args[0])
-                    if arg_type == 'string':
-                        self._t = self.parse(args[0], is_raw=True)
-                    elif arg_type == 'number':
-                        self._t = int(args[0])
-            else:
-                self._t = self.__ymd_etc(*args)
-
-        def toString(self):
-            try:
-                return time.strftime('%a %b %0d %Y %H:%M:%S %Z%z', self._t).rstrip()
-            except TypeError:
-                return "Invalid Date"
-
-        def valueOf(self):
-            return _NaN if self._t is None else self._t
-
-        def dump(self):
-            return '(new Date({0}))'.format(self.toString())
-
-    @classmethod
-    def __op_chars(cls):
-        op_chars = set(';,[')
-        for op in cls._all_operators():
-            if op[0].isalpha():
-                continue
-            op_chars.update(op[0])
-        return op_chars
-
-    def _named_object(self, namespace, obj):
-        self.__named_object_counter += 1
-        name = '%s%d' % (self._OBJ_NAME, self.__named_object_counter)
-        if callable(obj) and not isinstance(obj, function_with_repr):
-            obj = function_with_repr(obj, 'F<%s>' % (self.__named_object_counter, ))
-        namespace[name] = obj
-        return name
-
-    @classmethod
-    def _separate(cls, expr, delim=',', max_split=None, skip_delims=None):
-        if not expr:
-            return
-        # collections.Counter() is ~10% slower in both 2.7 and 3.9
-        counters = dict((k, 0) for k in _MATCHING_PARENS.values())
-        start, splits, pos, delim_len = 0, 0, 0, len(delim) - 1
-        in_quote, escaping, after_op, in_regex_char_group = None, False, True, False
-        skipping = 0
-        if skip_delims:
-            skip_delims = variadic(skip_delims)
-        skip_txt = None
-        for idx, char in enumerate(expr):
-            if skip_txt and idx <= skip_txt[1]:
-                continue
-            paren_delta = 0
-            if not in_quote:
-                if char == '/' and expr[idx:idx + 2] == '/*':
-                    # skip a comment
-                    skip_txt = expr[idx:].find('*/', 2)
-                    skip_txt = [idx, idx + skip_txt + 1] if skip_txt >= 2 else None
-                    if skip_txt:
-                        continue
-                if char in _MATCHING_PARENS:
-                    counters[_MATCHING_PARENS[char]] += 1
-                    paren_delta = 1
-                elif char in counters:
-                    counters[char] -= 1
-                    paren_delta = -1
-            if not escaping:
-                if char in _QUOTES and in_quote in (char, None):
-                    if in_quote or after_op or char != '/':
-                        in_quote = None if in_quote and not in_regex_char_group else char
-                elif in_quote == '/' and char in '[]':
-                    in_regex_char_group = char == '['
-            escaping = not escaping and in_quote and char == '\\'
-            after_op = not in_quote and (char in cls.OP_CHARS or paren_delta > 0 or (after_op and char.isspace()))
-
-            if char != delim[pos] or any(counters.values()) or in_quote:
-                pos = skipping = 0
-                continue
-            elif skipping > 0:
-                skipping -= 1
-                continue
-            elif pos == 0 and skip_delims:
-                here = expr[idx:]
-                for s in skip_delims:
-                    if here.startswith(s) and s:
-                        skipping = len(s) - 1
-                        break
-                if skipping > 0:
-                    continue
-            if pos < delim_len:
-                pos += 1
-                continue
-            if skip_txt and skip_txt[0] >= start and skip_txt[1] <= idx - delim_len:
-                yield expr[start:skip_txt[0]] + expr[skip_txt[1] + 1: idx - delim_len]
-            else:
-                yield expr[start: idx - delim_len]
-            skip_txt = None
-            start, pos = idx + 1, 0
-            splits += 1
-            if max_split and splits >= max_split:
-                break
-        if skip_txt and skip_txt[0] >= start:
-            yield expr[start:skip_txt[0]] + expr[skip_txt[1] + 1:]
-        else:
-            yield expr[start:]
-
-    @classmethod
-    def _separate_at_paren(cls, expr, delim=None):
-        if delim is None:
-            delim = expr and _MATCHING_PARENS[expr[0]]
-        separated = list(cls._separate(expr, delim, 1))
-        if len(separated) < 2:
-            raise cls.Exception('No terminating paren {delim} in {expr!r:.5500}'.format(**locals()))
-        return separated[0][1:].strip(), separated[1].strip()
-
-    @staticmethod
-    def _all_operators(_cached=[]):
-        if not _cached:
-            _cached.extend(itertools.chain(
-                # Ref: https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Operators/Operator_Precedence
-                _SC_OPERATORS, _LOG_OPERATORS, _COMP_OPERATORS, _OPERATORS, _UNARY_OPERATORS_X))
-        return _cached
-
-    def _separate_at_op(self, expr, max_split=None):
-
-        for op, _ in self._all_operators():
-            # hackety: </> have higher priority than <</>>, but don't confuse them
-            skip_delim = (op + op) if op in '<>*?' else None
-            if op == '?':
-                skip_delim = (skip_delim, '?.')
-            separated = list(self._separate(expr, op, skip_delims=skip_delim))
-            if len(separated) < 2:
-                continue
-
-            right_expr = separated.pop()
-            # handle operators that are both unary and binary, minimal BODMAS
-            if op in ('+', '-'):
-                # simplify/adjust consecutive instances of these operators
-                undone = 0
-                separated = [s.strip() for s in separated]
-                while len(separated) > 1 and not separated[-1]:
-                    undone += 1
-                    separated.pop()
-                if op == '-' and undone % 2 != 0:
-                    right_expr = op + right_expr
-                elif op == '+':
-                    while len(separated) > 1 and set(separated[-1]) <= self.OP_CHARS:
-                        right_expr = separated.pop() + right_expr
-                    if separated[-1][-1:] in self.OP_CHARS:
-                        right_expr = separated.pop() + right_expr
-                # hanging op at end of left => unary + (strip) or - (push right)
-                separated.append(right_expr)
-                dm_ops = ('*', '%', '/', '**')
-                dm_chars = set(''.join(dm_ops))
-
-                def yield_terms(s):
-                    skip = False
-                    for i, term in enumerate(s[:-1]):
-                        if skip:
-                            skip = False
-                            continue
-                        if not (dm_chars & set(term)):
-                            yield term
-                            continue
-                        for dm_op in dm_ops:
-                            bodmas = list(self._separate(term, dm_op, skip_delims=skip_delim))
-                            if len(bodmas) > 1 and not bodmas[-1].strip():
-                                bodmas[-1] = (op if op == '-' else '') + s[i + 1]
-                                yield dm_op.join(bodmas)
-                                skip = True
-                                break
-                        else:
-                            if term:
-                                yield term
-
-                    if not skip and s[-1]:
-                        yield s[-1]
-
-                separated = list(yield_terms(separated))
-                right_expr = separated.pop() if len(separated) > 1 else None
-                expr = op.join(separated)
-            if right_expr is None:
-                continue
-            return op, separated, right_expr
-
-    def _operator(self, op, left_val, right_expr, expr, local_vars, allow_recursion):
-        if op in ('||', '&&'):
-            if (op == '&&') ^ _js_ternary(left_val):
-                return left_val  # short circuiting
-        elif op == '??':
-            if left_val not in (None, JS_Undefined):
-                return left_val
-        elif op == '?':
-            right_expr = _js_ternary(left_val, *self._separate(right_expr, ':', 1))
-
-        right_val = self.interpret_expression(right_expr, local_vars, allow_recursion) if right_expr else left_val
-        opfunc = op and next((v for k, v in self._all_operators() if k == op), None)
-        if not opfunc:
-            return right_val
-
-        try:
-            # print('Eval:', opfunc.__name__, left_val, right_val)
-            return opfunc(left_val, right_val)
-        except Exception as e:
-            raise self.Exception('Failed to evaluate {left_val!r:.50} {op} {right_val!r:.50}'.format(**locals()), expr, cause=e)
-
-    def _index(self, obj, idx, allow_undefined=None):
-        if idx == 'length' and isinstance(obj, list):
-            return len(obj)
-        try:
-            return obj[int(idx)] if isinstance(obj, list) else obj[compat_str(idx)]
-        except (TypeError, KeyError, IndexError, ValueError) as e:
-            # allow_undefined is None gives correct behaviour
-            if allow_undefined or (
-                    allow_undefined is None and not isinstance(e, TypeError)):
-                return JS_Undefined
-            raise self.Exception('Cannot get index {idx!r:.100}'.format(**locals()), expr=repr(obj), cause=e)
-
-    def _dump(self, obj, namespace):
-        if obj is JS_Undefined:
-            return 'undefined'
-        try:
-            return json.dumps(obj)
-        except TypeError:
-            return self._named_object(namespace, obj)
-
-    # used below
-    _VAR_RET_THROW_RE = re.compile(r'''(?x)
-        (?:(?P<var>var|const|let)\s+|(?P<ret>return)(?:\s+|(?=["'])|$)|(?P<throw>throw)\s+)
-        ''')
-    _COMPOUND_RE = re.compile(r'''(?x)
-        (?P<try>try)\s*\{|
-        (?P<if>if)\s*\(|
-        (?P<switch>switch)\s*\(|
-        (?P<for>for)\s*\(|
-        (?P<while>while)\s*\(
-        ''')
-    _FINALLY_RE = re.compile(r'finally\s*\{')
-    _SWITCH_RE = re.compile(r'switch\s*\(')
-
-    def _eval_operator(self, op, left_expr, right_expr, expr, local_vars, allow_recursion):
-        left_val = self.interpret_expression(left_expr, local_vars, allow_recursion)
-        return self._operator(op, left_val, right_expr, expr, local_vars, allow_recursion)
-
-    @Debugger.wrap_interpreter
     def interpret_statement(self, stmt, local_vars, allow_recursion=100):
         if allow_recursion < 0:
-            raise self.Exception('Recursion limit reached')
-        allow_recursion -= 1
+            raise ExtractorError('Recursion limit reached')
 
-        # print('At: ' + stmt[:60])
-        should_return = False
-        # fails on (eg) if (...) stmt1; else stmt2;
-        sub_statements = list(self._separate(stmt, ';')) or ['']
-        expr = stmt = sub_statements.pop().strip()
-
-        for sub_stmt in sub_statements:
-            ret, should_return = self.interpret_statement(sub_stmt, local_vars, allow_recursion)
-            if should_return:
-                return ret, should_return
-
-        m = self._VAR_RET_THROW_RE.match(stmt)
-        if m:
-            expr = stmt[len(m.group(0)):].strip()
-            if m.group('throw'):
-                raise JS_Throw(self.interpret_expression(expr, local_vars, allow_recursion))
-            should_return = 'return' if m.group('ret') else False
-        if not expr:
-            return None, should_return
-
-        if expr[0] in _QUOTES:
-            inner, outer = self._separate(expr, expr[0], 1)
-            if expr[0] == '/':
-                flags, outer = self.JS_RegExp.regex_flags(outer)
-                inner = self.JS_RegExp(inner[1:], flags=flags)
+        should_abort = False
+        stmt = stmt.lstrip()
+        stmt_m = re.match(r'var\s', stmt)
+        if stmt_m:
+            expr = stmt[len(stmt_m.group(0)):]
+        else:
+            return_m = re.match(r'return(?:\s+|$)', stmt)
+            if return_m:
+                expr = stmt[len(return_m.group(0)):]
+                should_abort = True
             else:
-                inner = json.loads(js_to_json(inner + expr[0]))  # , strict=True))
-            if not outer:
-                return inner, should_return
-            expr = self._named_object(local_vars, inner) + outer
+                # Try interpreting it as an expression
+                expr = stmt
 
-        new_kw, _, obj = expr.partition('new ')
-        if not new_kw:
-            for klass, konstr in (('Date', lambda *x: self.JS_Date(*x).valueOf()),
-                                  ('RegExp', self.JS_RegExp),
-                                  ('Error', self.Exception)):
-                if not obj.startswith(klass + '('):
-                    continue
-                left, right = self._separate_at_paren(obj[len(klass):])
-                argvals = self.interpret_iter(left, local_vars, allow_recursion)
-                expr = konstr(*argvals)
-                if expr is None:
-                    raise self.Exception('Failed to parse {klass} {left!r:.100}'.format(**locals()), expr=expr)
-                expr = self._dump(expr, local_vars) + right
-                break
-            else:
-                raise self.Exception('Unsupported object {obj:.100}'.format(**locals()), expr=expr)
-
-        # apply unary operators (see new above)
-        for op, _ in _UNARY_OPERATORS_X:
-            if not expr.startswith(op):
-                continue
-            operand = expr[len(op):]
-            if not operand or (op.isalpha() and operand[0] != ' '):
-                continue
-            separated = self._separate_at_op(operand, max_split=1)
-            if separated:
-                next_op, separated, right_expr = separated
-                separated.append(right_expr)
-                operand = next_op.join(separated)
-            return self._eval_operator(op, operand, '', expr, local_vars, allow_recursion), should_return
-
-        if expr.startswith('{'):
-            inner, outer = self._separate_at_paren(expr)
-            # try for object expression (Map)
-            sub_expressions = [list(self._separate(sub_expr.strip(), ':', 1)) for sub_expr in self._separate(inner)]
-            if all(len(sub_expr) == 2 for sub_expr in sub_expressions):
-                return dict(
-                    (key_expr if re.match(_NAME_RE, key_expr) else key_expr,
-                     self.interpret_expression(val_expr, local_vars, allow_recursion))
-                    for key_expr, val_expr in sub_expressions), should_return
-            # or statement list
-            inner, should_abort = self.interpret_statement(inner, local_vars, allow_recursion)
-            if not outer or should_abort:
-                return inner, should_abort or should_return
-            else:
-                expr = self._dump(inner, local_vars) + outer
-
-        if expr.startswith('('):
-            m = re.match(r'\((?P<d>[a-z])%(?P<e>[a-z])\.length\+(?P=e)\.length\)%(?P=e)\.length', expr)
-            if m:
-                # short-cut eval of frequently used `(d%e.length+e.length)%e.length`, worth ~6% on `pytest -k test_nsig`
-                outer = None
-                inner, should_abort = self._offset_e_by_d(m.group('d'), m.group('e'), local_vars)
-            else:
-                inner, outer = self._separate_at_paren(expr)
-                inner, should_abort = self.interpret_statement(inner, local_vars, allow_recursion)
-            if not outer or should_abort:
-                return inner, should_abort or should_return
-            else:
-                expr = self._dump(inner, local_vars) + outer
-
-        if expr.startswith('['):
-            inner, outer = self._separate_at_paren(expr)
-            name = self._named_object(local_vars, [
-                self.interpret_expression(item, local_vars, allow_recursion)
-                for item in self._separate(inner)])
-            expr = name + outer
-
-        m = self._COMPOUND_RE.match(expr)
-        md = m.groupdict() if m else {}
-        if md.get('if'):
-            cndn, expr = self._separate_at_paren(expr[m.end() - 1:])
-            if expr.startswith('{'):
-                if_expr, expr = self._separate_at_paren(expr)
-            else:
-                # may lose ... else ... because of ll.368-374
-                if_expr, expr = self._separate_at_paren(' %s;' % (expr,), delim=';')
-            else_expr = None
-            m = re.match(r'else\s*(?P<block>\{)?', expr)
-            if m:
-                if m.group('block'):
-                    else_expr, expr = self._separate_at_paren(expr[m.end() - 1:])
-                else:
-                    # handle subset ... else if (...) {...} else ...
-                    # TODO: make interpret_statement do this properly, if possible
-                    exprs = list(self._separate(expr[m.end():], delim='}', max_split=2))
-                    if len(exprs) > 1:
-                        if re.match(r'\s*if\s*\(', exprs[0]) and re.match(r'\s*else\b', exprs[1]):
-                            else_expr = exprs[0] + '}' + exprs[1]
-                            expr = (exprs[2] + '}') if len(exprs) == 3 else None
-                        else:
-                            else_expr = exprs[0]
-                            exprs.append('')
-                            expr = '}'.join(exprs[1:])
-                    else:
-                        else_expr = exprs[0]
-                        expr = None
-                    else_expr = else_expr.lstrip() + '}'
-            cndn = _js_ternary(self.interpret_expression(cndn, local_vars, allow_recursion))
-            ret, should_abort = self.interpret_statement(
-                if_expr if cndn else else_expr, local_vars, allow_recursion)
-            if should_abort:
-                return ret, True
-
-        elif md.get('try'):
-            try_expr, expr = self._separate_at_paren(expr[m.end() - 1:])
-            err = None
-            try:
-                ret, should_abort = self.interpret_statement(try_expr, local_vars, allow_recursion)
-                if should_abort:
-                    return ret, True
-            except Exception as e:
-                # XXX: This works for now, but makes debugging future issues very hard
-                err = e
-
-            pending = (None, False)
-            m = re.match(r'catch\s*(?P<err>\(\s*{_NAME_RE}\s*\))?\{{'.format(**globals()), expr)
-            if m:
-                sub_expr, expr = self._separate_at_paren(expr[m.end() - 1:])
-                if err:
-                    catch_vars = {}
-                    if m.group('err'):
-                        catch_vars[m.group('err')] = err.error if isinstance(err, JS_Throw) else err
-                    catch_vars = local_vars.new_child(m=catch_vars)
-                    err, pending = None, self.interpret_statement(sub_expr, catch_vars, allow_recursion)
-
-            m = self._FINALLY_RE.match(expr)
-            if m:
-                sub_expr, expr = self._separate_at_paren(expr[m.end() - 1:])
-                ret, should_abort = self.interpret_statement(sub_expr, local_vars, allow_recursion)
-                if should_abort:
-                    return ret, True
-
-            ret, should_abort = pending
-            if should_abort:
-                return ret, True
-
-            if err:
-                raise err
-
-        elif md.get('for') or md.get('while'):
-            init_or_cond, remaining = self._separate_at_paren(expr[m.end() - 1:])
-            if remaining.startswith('{'):
-                body, expr = self._separate_at_paren(remaining)
-            else:
-                switch_m = self._SWITCH_RE.match(remaining)  # FIXME
-                if switch_m:
-                    switch_val, remaining = self._separate_at_paren(remaining[switch_m.end() - 1:])
-                    body, expr = self._separate_at_paren(remaining, '}')
-                    body = 'switch(%s){%s}' % (switch_val, body)
-                else:
-                    body, expr = remaining, ''
-            if md.get('for'):
-                start, cndn, increment = self._separate(init_or_cond, ';')
-                self.interpret_expression(start, local_vars, allow_recursion)
-            else:
-                cndn, increment = init_or_cond, None
-            while _js_ternary(self.interpret_expression(cndn, local_vars, allow_recursion)):
-                try:
-                    ret, should_abort = self.interpret_statement(body, local_vars, allow_recursion)
-                    if should_abort:
-                        return ret, True
-                except JS_Break:
-                    break
-                except JS_Continue:
-                    pass
-                if increment:
-                    self.interpret_expression(increment, local_vars, allow_recursion)
-
-        elif md.get('switch'):
-            switch_val, remaining = self._separate_at_paren(expr[m.end() - 1:])
-            switch_val = self.interpret_expression(switch_val, local_vars, allow_recursion)
-            body, expr = self._separate_at_paren(remaining, '}')
-            items = body.replace('default:', 'case default:').split('case ')[1:]
-            for default in (False, True):
-                matched = False
-                for item in items:
-                    case, stmt = (i.strip() for i in self._separate(item, ':', 1))
-                    if default:
-                        matched = matched or case == 'default'
-                    elif not matched:
-                        matched = (case != 'default'
-                                   and switch_val == self.interpret_expression(case, local_vars, allow_recursion))
-                    if not matched:
-                        continue
-                    try:
-                        ret, should_abort = self.interpret_statement(stmt, local_vars, allow_recursion)
-                        if should_abort:
-                            return ret
-                    except JS_Break:
-                        break
-                if matched:
-                    break
-
-        if md:
-            ret, should_abort = self.interpret_statement(expr, local_vars, allow_recursion)
-            return ret, should_abort or should_return
-
-        # Comma separated statements
-        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)
-                if should_abort:
-                    return ret, True
-            return ret, False
-
-        for m in re.finditer(r'''(?x)
-                (?P<pre_sign>\+\+|--)(?P<var1>{_NAME_RE})|
-                (?P<var2>{_NAME_RE})(?P<post_sign>\+\+|--)'''.format(**globals()), expr):
-            var = m.group('var1') or m.group('var2')
-            start, end = m.span()
-            sign = m.group('pre_sign') or m.group('post_sign')
-            ret = local_vars[var]
-            local_vars[var] = _js_add(ret, 1 if sign[0] == '+' else -1)
-            if m.group('pre_sign'):
-                ret = local_vars[var]
-            expr = expr[:start] + self._dump(ret, local_vars) + expr[end:]
-
-        if not expr:
-            return None, should_return
-
-        m = re.match(r'''(?x)
-            (?P<assign>
-                (?P<out>{_NAME_RE})(?P<out_idx>(?:\[{_NESTED_BRACKETS}\])+)?\s*
-                (?P<op>{_OPERATOR_RE})?
-                =(?!=)(?P<expr>.*)$
-            )|(?P<return>
-                (?!if|return|true|false|null|undefined|NaN|Infinity)(?P<name>{_NAME_RE})$
-            )|(?P<attribute>
-                (?P<var>{_NAME_RE})(?:
-                    (?P<nullish>\?)?\.(?P<member>[^(]+)|
-                    \[(?P<member2>{_NESTED_BRACKETS})\]
-                )\s*
-            )|(?P<indexing>
-                (?P<in>{_NAME_RE})(?P<in_idx>\[.+\])$
-            )|(?P<function>
-                (?P<fname>{_NAME_RE})\((?P<args>.*)\)$
-            )'''.format(**globals()), expr)
-        md = m.groupdict() if m else {}
-        if md.get('assign'):
-            left_val = local_vars.get(m.group('out'))
-
-            if not m.group('out_idx'):
-                local_vars[m.group('out')] = self._operator(
-                    m.group('op'), left_val, m.group('expr'), expr, local_vars, allow_recursion)
-                return local_vars[m.group('out')], should_return
-            elif left_val in (None, JS_Undefined):
-                raise self.Exception('Cannot index undefined variable ' + m.group('out'), expr=expr)
-
-            indexes = md['out_idx']
-            while indexes:
-                idx, indexes = self._separate_at_paren(indexes)
-                idx = self.interpret_expression(idx, local_vars, allow_recursion)
-                if indexes:
-                    left_val = self._index(left_val, idx)
-            if isinstance(idx, float):
-                idx = int(idx)
-            if isinstance(left_val, list) and len(left_val) <= int_or_none(idx, default=-1):
-                # JS Array is a sparsely assignable list
-                # TODO: handle extreme sparsity without memory bloat, eg using auxiliary dict
-                left_val.extend((idx - len(left_val) + 1) * [JS_Undefined])
-            left_val[idx] = self._operator(
-                m.group('op'), self._index(left_val, idx) if m.group('op') else None,
-                m.group('expr'), expr, local_vars, allow_recursion)
-            return left_val[idx], should_return
-
-        elif expr.isdigit():
-            return int(expr), should_return
-
-        elif expr == 'break':
-            raise JS_Break()
-        elif expr == 'continue':
-            raise JS_Continue()
-        elif expr == 'undefined':
-            return JS_Undefined, should_return
-        elif expr == 'NaN':
-            return _NaN, should_return
-        elif expr == 'Infinity':
-            return _Infinity, should_return
-
-        elif md.get('return'):
-            ret = local_vars[m.group('name')]
-            # challenge may try to force returning the original value
-            # use an optional internal var to block this
-            if should_return == 'return':
-                if '_ytdl_do_not_return' not in local_vars:
-                    return ret, True
-                return (ret, True) if ret != local_vars['_ytdl_do_not_return'] else (ret, False)
-            else:
-                return ret, should_return
-
-        with compat_contextlib_suppress(ValueError):
-            ret = json.loads(js_to_json(expr))  # strict=True)
-            if not md.get('attribute'):
-                return ret, should_return
-
-        if md.get('indexing'):
-            val = local_vars[m.group('in')]
-            indexes = m.group('in_idx')
-            while indexes:
-                idx, indexes = self._separate_at_paren(indexes)
-                idx = self.interpret_expression(idx, local_vars, allow_recursion)
-                val = self._index(val, idx)
-            return val, should_return
-
-        separated = self._separate_at_op(expr)
-        if separated:
-            op, separated, right_expr = separated
-            return self._eval_operator(op, op.join(separated), right_expr, expr, local_vars, allow_recursion), should_return
-
-        if md.get('attribute'):
-            variable, member, nullish = m.group('var', 'member', 'nullish')
-            if not member:
-                member = self.interpret_expression(m.group('member2'), local_vars, allow_recursion)
-            arg_str = expr[m.end():]
-            if arg_str.startswith('('):
-                arg_str, remaining = self._separate_at_paren(arg_str)
-            else:
-                arg_str, remaining = None, arg_str
-
-            def assertion(cndn, msg):
-                """ assert, but without risk of getting optimized out """
-                if not cndn:
-                    memb = member
-                    raise self.Exception('{memb} {msg}'.format(**locals()), expr=expr)
-
-            def eval_method(variable, member):
-                if (variable, member) == ('console', 'debug'):
-                    if Debugger.ENABLED:
-                        Debugger.write(self.interpret_expression('[{0}]'.format(arg_str), local_vars, allow_recursion))
-                    return
-                types = {
-                    'String': compat_str,
-                    'Math': float,
-                    'Array': list,
-                    'Date': self.JS_Date,
-                    'RegExp': self.JS_RegExp,
-                    # 'Error': self.Exception,  # has no std static methods
-                }
-                obj = local_vars.get(variable)
-                if obj in (JS_Undefined, None):
-                    obj = types.get(variable, JS_Undefined)
-                if obj is JS_Undefined:
-                    try:
-                        if variable not in self._objects:
-                            self._objects[variable] = self.extract_object(variable, local_vars)
-                        obj = self._objects[variable]
-                    except self.Exception:
-                        if not nullish:
-                            raise
-
-                if nullish and obj is JS_Undefined:
-                    return JS_Undefined
-
-                # Member access
-                if arg_str is None:
-                    return self._index(obj, member, nullish)
-
-                # Function call
-                argvals = [
-                    self.interpret_expression(v, local_vars, allow_recursion)
-                    for v in self._separate(arg_str)]
-
-                # Fixup prototype call
-                if isinstance(obj, type):
-                    new_member, rest = member.partition('.')[0::2]
-                    if new_member == 'prototype':
-                        new_member, func_prototype = rest.partition('.')[0::2]
-                        assertion(argvals, 'takes one or more arguments')
-                        assertion(isinstance(argvals[0], obj), 'must bind to type {0}'.format(obj))
-                        if func_prototype == 'call':
-                            obj = argvals.pop(0)
-                        elif func_prototype == 'apply':
-                            assertion(len(argvals) == 2, 'takes two arguments')
-                            obj, argvals = argvals
-                            assertion(isinstance(argvals, list), 'second argument must be a list')
-                        else:
-                            raise self.Exception('Unsupported Function method ' + func_prototype, expr)
-                        member = new_member
-
-                if obj is compat_str:
-                    if member == 'fromCharCode':
-                        assertion(argvals, 'takes one or more arguments')
-                        return ''.join(compat_chr(int(n)) for n in argvals)
-                    raise self.Exception('Unsupported string method ' + member, expr=expr)
-                elif obj is float:
-                    if member == 'pow':
-                        assertion(len(argvals) == 2, 'takes two arguments')
-                        return argvals[0] ** argvals[1]
-                    raise self.Exception('Unsupported Math method ' + member, expr=expr)
-                elif obj is self.JS_Date:
-                    return getattr(obj, member)(*argvals)
-
-                if member == 'split':
-                    assertion(len(argvals) <= 2, 'takes at most two arguments')
-                    if len(argvals) > 1:
-                        limit = argvals[1]
-                        assertion(isinstance(limit, int) and limit >= 0, 'integer limit >= 0')
-                        if limit == 0:
-                            return []
-                    else:
-                        limit = 0
-                    if len(argvals) == 0:
-                        argvals = [JS_Undefined]
-                    elif isinstance(argvals[0], self.JS_RegExp):
-                        # avoid re.split(), similar but not enough
-
-                        def where():
-                            for m in argvals[0].finditer(obj):
-                                yield m.span(0)
-                            yield (None, None)
-
-                        def splits(limit=limit):
-                            i = 0
-                            for j, jj in where():
-                                if j == jj == 0:
-                                    continue
-                                if j is None and i >= len(obj):
-                                    break
-                                yield obj[i:j]
-                                if jj is None or limit == 1:
-                                    break
-                                limit -= 1
-                                i = jj
-
-                        return list(splits())
-                    return (
-                        obj.split(argvals[0], limit - 1) if argvals[0] and argvals[0] != JS_Undefined
-                        else list(obj)[:limit or None])
-                elif member == 'join':
-                    assertion(isinstance(obj, list), 'must be applied on a list')
-                    assertion(len(argvals) <= 1, 'takes at most one argument')
-                    return (',' if len(argvals) == 0 or argvals[0] in (None, JS_Undefined)
-                            else argvals[0]).join(
-                                ('' if x in (None, JS_Undefined) else _js_toString(x))
-                                for x in obj)
-                elif member == 'reverse':
-                    assertion(not argvals, 'does not take any arguments')
-                    obj.reverse()
-                    return obj
-                elif member == 'slice':
-                    assertion(isinstance(obj, (list, compat_str)), 'must be applied on a list or string')
-                    # From [1]:
-                    # .slice() - like [:]
-                    # .slice(n) - like [n:] (not [slice(n)]
-                    # .slice(m, n) - like [m:n] or [slice(m, n)]
-                    # [1] https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/slice
-                    assertion(len(argvals) <= 2, 'takes between 0 and 2 arguments')
-                    if len(argvals) < 2:
-                        argvals += (None,)
-                    return obj[slice(*argvals)]
-                elif member == 'splice':
-                    assertion(isinstance(obj, list), 'must be applied on a list')
-                    assertion(argvals, 'takes one or more arguments')
-                    index, how_many = map(int, (argvals + [len(obj)])[:2])
-                    if index < 0:
-                        index += len(obj)
-                    res = [obj.pop(index)
-                           for _ in range(index, min(index + how_many, len(obj)))]
-                    obj[index:index] = argvals[2:]
-                    return res
-                elif member in ('shift', 'pop'):
-                    assertion(isinstance(obj, list), 'must be applied on a list')
-                    assertion(not argvals, 'does not take any arguments')
-                    return obj.pop(0 if member == 'shift' else -1) if len(obj) > 0 else JS_Undefined
-                elif member == 'unshift':
-                    assertion(isinstance(obj, list), 'must be applied on a list')
-                    # not enforced: assertion(argvals, 'takes one or more arguments')
-                    obj[0:0] = argvals
-                    return len(obj)
-                elif member == 'push':
-                    # not enforced: assertion(argvals, 'takes one or more arguments')
-                    obj.extend(argvals)
-                    return len(obj)
-                elif member == 'forEach':
-                    assertion(argvals, 'takes one or more arguments')
-                    assertion(len(argvals) <= 2, 'takes at most 2 arguments')
-                    f, this = (argvals + [''])[:2]
-                    return [f((item, idx, obj), {'this': this}, allow_recursion) for idx, item in enumerate(obj)]
-                elif member == 'indexOf':
-                    assertion(argvals, 'takes one or more arguments')
-                    assertion(len(argvals) <= 2, 'takes at most 2 arguments')
-                    idx, start = (argvals + [0])[:2]
-                    try:
-                        return obj.index(idx, start)
-                    except ValueError:
-                        return -1
-                elif member == 'charCodeAt':
-                    assertion(isinstance(obj, compat_str), 'must be applied on a string')
-                    # assertion(len(argvals) == 1, 'takes exactly one argument') # but not enforced
-                    idx = argvals[0] if len(argvals) > 0 and isinstance(argvals[0], int) else 0
-                    if idx >= len(obj):
-                        return None
-                    return ord(obj[idx])
-                elif member in ('replace', 'replaceAll'):
-                    assertion(isinstance(obj, compat_str), 'must be applied on a string')
-                    assertion(len(argvals) == 2, 'takes exactly two arguments')
-                    # TODO: argvals[1] callable, other Py vs JS edge cases
-                    if isinstance(argvals[0], self.JS_RegExp):
-                        # access JS member with Py reserved name
-                        count = 0 if self._index(argvals[0], 'global') else 1
-                        assertion(member != 'replaceAll' or count == 0,
-                                  'replaceAll must be called with a global RegExp')
-                        return argvals[0].sub(argvals[1], obj, count=count)
-                    count = ('replaceAll', 'replace').index(member)
-                    return re.sub(re.escape(argvals[0]), argvals[1], obj, count=count)
-
-                idx = int(member) if isinstance(obj, list) else member
-                return obj[idx](argvals, allow_recursion=allow_recursion)
-
-            if remaining:
-                ret, should_abort = self.interpret_statement(
-                    self._named_object(local_vars, eval_method(variable, member)) + remaining,
-                    local_vars, allow_recursion)
-                return ret, should_return or should_abort
-            else:
-                return eval_method(variable, member), should_return
-
-        elif md.get('function'):
-            fname = m.group('fname')
-            argvals = [self.interpret_expression(v, local_vars, allow_recursion)
-                       for v in self._separate(m.group('args'))]
-            if fname in local_vars:
-                return local_vars[fname](argvals, allow_recursion=allow_recursion), should_return
-            elif fname not in self._functions:
-                self._functions[fname] = self.extract_function(fname)
-            return self._functions[fname](argvals, allow_recursion=allow_recursion), should_return
-
-        raise self.Exception(
-            'Unsupported JS expression ' + (expr[:40] if expr != stmt else ''), expr=stmt)
+        v = self.interpret_expression(expr, local_vars, allow_recursion)
+        return v, should_abort
 
     def interpret_expression(self, expr, local_vars, allow_recursion):
-        ret, should_return = self.interpret_statement(expr, local_vars, allow_recursion)
-        if should_return:
-            raise self.Exception('Cannot return from an expression', expr)
-        return ret
+        expr = expr.strip()
+        if expr == '':  # Empty expression
+            return None
 
-    def interpret_iter(self, list_txt, local_vars, allow_recursion):
-        for v in self._separate(list_txt):
-            yield self.interpret_expression(v, local_vars, allow_recursion)
+        if expr.startswith('('):
+            parens_count = 0
+            for m in re.finditer(r'[()]', expr):
+                if m.group(0) == '(':
+                    parens_count += 1
+                else:
+                    parens_count -= 1
+                    if parens_count == 0:
+                        sub_expr = expr[1:m.start()]
+                        sub_result = self.interpret_expression(
+                            sub_expr, local_vars, allow_recursion)
+                        remaining_expr = expr[m.end():].strip()
+                        if not remaining_expr:
+                            return sub_result
+                        else:
+                            expr = json.dumps(sub_result) + remaining_expr
+                        break
+            else:
+                raise ExtractorError('Premature end of parens in %r' % expr)
 
-    def extract_object(self, objname, *global_stack):
-        _FUNC_NAME_RE = r'''(?:{n}|"{n}"|'{n}')'''.format(n=_NAME_RE)
+        for op, opfunc in _ASSIGN_OPERATORS:
+            m = re.match(r'''(?x)
+                (?P<out>%s)(?:\[(?P<index>[^\]]+?)\])?
+                \s*%s
+                (?P<expr>.*)$''' % (_NAME_RE, re.escape(op)), expr)
+            if not m:
+                continue
+            right_val = self.interpret_expression(
+                m.group('expr'), local_vars, allow_recursion - 1)
+
+            if m.groupdict().get('index'):
+                lvar = local_vars[m.group('out')]
+                idx = self.interpret_expression(
+                    m.group('index'), local_vars, allow_recursion)
+                assert isinstance(idx, int)
+                cur = lvar[idx]
+                val = opfunc(cur, right_val)
+                lvar[idx] = val
+                return val
+            else:
+                cur = local_vars.get(m.group('out'))
+                val = opfunc(cur, right_val)
+                local_vars[m.group('out')] = val
+                return val
+
+        if expr.isdigit():
+            return int(expr)
+
+        var_m = re.match(
+            r'(?!if|return|true|false)(?P<name>%s)$' % _NAME_RE,
+            expr)
+        if var_m:
+            return local_vars[var_m.group('name')]
+
+        try:
+            return json.loads(expr)
+        except ValueError:
+            pass
+
+        m = re.match(
+            r'(?P<in>%s)\[(?P<idx>.+)\]$' % _NAME_RE, expr)
+        if m:
+            val = local_vars[m.group('in')]
+            idx = self.interpret_expression(
+                m.group('idx'), local_vars, allow_recursion - 1)
+            return val[idx]
+
+        m = re.match(
+            r'(?P<var>%s)(?:\.(?P<member>[^(]+)|\[(?P<member2>[^]]+)\])\s*(?:\(+(?P<args>[^()]*)\))?$' % _NAME_RE,
+            expr)
+        if m:
+            variable = m.group('var')
+            member = remove_quotes(m.group('member') or m.group('member2'))
+            arg_str = m.group('args')
+
+            if variable in local_vars:
+                obj = local_vars[variable]
+            else:
+                if variable not in self._objects:
+                    self._objects[variable] = self.extract_object(variable)
+                obj = self._objects[variable]
+
+            if arg_str is None:
+                # Member access
+                if member == 'length':
+                    return len(obj)
+                return obj[member]
+
+            assert expr.endswith(')')
+            # Function call
+            if arg_str == '':
+                argvals = tuple()
+            else:
+                argvals = tuple([
+                    self.interpret_expression(v, local_vars, allow_recursion)
+                    for v in arg_str.split(',')])
+
+            if member == 'split':
+                assert argvals == ('',)
+                return list(obj)
+            if member == 'join':
+                assert len(argvals) == 1
+                return argvals[0].join(obj)
+            if member == 'reverse':
+                assert len(argvals) == 0
+                obj.reverse()
+                return obj
+            if member == 'slice':
+                assert len(argvals) == 1
+                return obj[argvals[0]:]
+            if member == 'splice':
+                assert isinstance(obj, list)
+                index, howMany = argvals
+                res = []
+                for i in range(index, min(index + howMany, len(obj))):
+                    res.append(obj.pop(index))
+                return res
+
+            return obj[member](argvals)
+
+        for op, opfunc in _OPERATORS:
+            m = re.match(r'(?P<x>.+?)%s(?P<y>.+)' % re.escape(op), expr)
+            if not m:
+                continue
+            x, abort = self.interpret_statement(
+                m.group('x'), local_vars, allow_recursion - 1)
+            if abort:
+                raise ExtractorError(
+                    'Premature left-side return of %s in %r' % (op, expr))
+            y, abort = self.interpret_statement(
+                m.group('y'), local_vars, allow_recursion - 1)
+            if abort:
+                raise ExtractorError(
+                    'Premature right-side return of %s in %r' % (op, expr))
+            return opfunc(x, y)
+
+        m = re.match(
+            r'^(?P<func>%s)\((?P<args>[a-zA-Z0-9_$,]*)\)$' % _NAME_RE, expr)
+        if m:
+            fname = m.group('func')
+            argvals = tuple([
+                int(v) if v.isdigit() else local_vars[v]
+                for v in m.group('args').split(',')]) if len(m.group('args')) > 0 else tuple()
+            if fname not in self._functions:
+                self._functions[fname] = self.extract_function(fname)
+            return self._functions[fname](argvals)
+
+        raise ExtractorError('Unsupported JS expression %r' % expr)
+
+    def extract_object(self, objname):
+        _FUNC_NAME_RE = r'''(?:[a-zA-Z$0-9]+|"[a-zA-Z$0-9]+"|'[a-zA-Z$0-9]+')'''
         obj = {}
-        fields = next(filter(None, (
-            obj_m.group('fields') for obj_m in re.finditer(
-                r'''(?xs)
-                    {0}\s*\.\s*{1}|{1}\s*=\s*\{{\s*
-                        (?P<fields>({2}\s*:\s*function\s*\(.*?\)\s*\{{.*?}}(?:,\s*)?)*)
-                    }}\s*;
-                '''.format(_NAME_RE, re.escape(objname), _FUNC_NAME_RE),
-                self.code))), None)
-        if not fields:
-            raise self.Exception('Could not find object ' + objname)
+        obj_m = re.search(
+            r'''(?x)
+                (?<!this\.)%s\s*=\s*{\s*
+                    (?P<fields>(%s\s*:\s*function\s*\(.*?\)\s*{.*?}(?:,\s*)?)*)
+                }\s*;
+            ''' % (re.escape(objname), _FUNC_NAME_RE),
+            self.code)
+        fields = obj_m.group('fields')
         # Currently, it only supports function definitions
-        for f in re.finditer(
-                r'''(?x)
-                    (?P<key>%s)\s*:\s*function\s*\((?P<args>(?:%s|,)*)\){(?P<code>[^}]+)}
-                ''' % (_FUNC_NAME_RE, _NAME_RE),
-                fields):
-            argnames = self.build_arglist(f.group('args'))
-            name = remove_quotes(f.group('key'))
-            obj[name] = function_with_repr(
-                self.build_function(argnames, f.group('code'), *global_stack), 'F<{0}>'.format(name))
+        fields_m = re.finditer(
+            r'''(?x)
+                (?P<key>%s)\s*:\s*function\s*\((?P<args>[a-z,]+)\){(?P<code>[^}]+)}
+            ''' % _FUNC_NAME_RE,
+            fields)
+        for f in fields_m:
+            argnames = f.group('args').split(',')
+            obj[remove_quotes(f.group('key'))] = self.build_function(argnames, f.group('code'))
 
         return obj
 
-    @staticmethod
-    def _offset_e_by_d(d, e, local_vars):
-        """ Short-cut eval: (d%e.length+e.length)%e.length """
-        try:
-            d = local_vars[d]
-            e = local_vars[e]
-            e = len(e)
-            return _js_mod(_js_mod(d, e) + e, e), False
-        except Exception:
-            return None, True
-
-    def extract_function_code(self, funcname):
-        """ @returns argnames, code """
+    def extract_function(self, funcname):
         func_m = re.search(
-            r'''(?xs)
-                (?:
-                    function\s+%(name)s|
-                    [{;,]\s*%(name)s\s*=\s*function|
-                    (?:var|const|let)\s+%(name)s\s*=\s*function
-                )\s*
+            r'''(?x)
+                (?:function\s+%s|[{;,]\s*%s\s*=\s*function|var\s+%s\s*=\s*function)\s*
                 \((?P<args>[^)]*)\)\s*
-                (?P<code>{.+})''' % {'name': re.escape(funcname)},
+                \{(?P<code>[^}]+)\}''' % (
+                re.escape(funcname), re.escape(funcname), re.escape(funcname)),
             self.code)
         if func_m is None:
-            raise self.Exception('Could not find JS function "{funcname}"'.format(**locals()))
-        code, _ = self._separate_at_paren(func_m.group('code'))  # refine the match
-        return self.build_arglist(func_m.group('args')), code
+            raise ExtractorError('Could not find JS function %r' % funcname)
+        argnames = func_m.group('args').split(',')
 
-    def extract_function(self, funcname, *global_stack):
-        return function_with_repr(
-            self.extract_function_from_code(*itertools.chain(
-                self.extract_function_code(funcname), global_stack)),
-            'F<%s>' % (funcname,))
+        return self.build_function(argnames, func_m.group('code'))
 
-    def extract_function_from_code(self, argnames, code, *global_stack):
-        local_vars = {}
+    def call_function(self, funcname, *args):
+        f = self.extract_function(funcname)
+        return f(args)
 
-        start = None
-        while True:
-            mobj = re.search(r'function\((?P<args>[^)]*)\)\s*{', code[start:])
-            if mobj is None:
-                break
-            start, body_start = ((start or 0) + x for x in mobj.span())
-            body, remaining = self._separate_at_paren(code[body_start - 1:])
-            name = self._named_object(local_vars, self.extract_function_from_code(
-                [x.strip() for x in mobj.group('args').split(',')],
-                body, local_vars, *global_stack))
-            code = code[:start] + name + remaining
-
-        return self.build_function(argnames, code, local_vars, *global_stack)
-
-    def call_function(self, funcname, *args, **kw_global_vars):
-        return self.extract_function(funcname)(args, kw_global_vars)
-
-    @classmethod
-    def build_arglist(cls, arg_text):
-        if not arg_text:
-            return []
-
-        def valid_arg(y):
-            y = y.strip()
-            if not y:
-                raise cls.Exception('Missing arg in "%s"' % (arg_text, ))
-            return y
-
-        return [valid_arg(x) for x in cls._separate(arg_text)]
-
-    def build_function(self, argnames, code, *global_stack):
-        global_stack = list(global_stack) or [{}]
-        argnames = tuple(argnames)
-
-        def resf(args, kwargs=None, allow_recursion=100):
-            kwargs = kwargs or {}
-            global_stack[0].update(zip_longest(argnames, args, fillvalue=JS_Undefined))
-            global_stack[0].update(kwargs)
-            var_stack = LocalNameSpace(*global_stack)
-            ret, should_abort = self.interpret_statement(code.replace('\n', ' '), var_stack, allow_recursion - 1)
-            if should_abort:
-                return ret
+    def build_function(self, argnames, code):
+        def resf(args):
+            local_vars = dict(zip(argnames, args))
+            for stmt in code.split(';'):
+                res, abort = self.interpret_statement(stmt, local_vars)
+                if abort:
+                    break
+            return res
         return resf
diff --git a/youtube_dl/options.py b/youtube_dl/options.py
index 61705d1f0..241cf110f 100644
--- a/youtube_dl/options.py
+++ b/youtube_dl/options.py
@@ -11,7 +11,6 @@ from .compat import (
     compat_get_terminal_size,
     compat_getenv,
     compat_kwargs,
-    compat_open as open,
     compat_shlex_split,
 )
 from .utils import (
@@ -42,11 +41,14 @@ def _hide_login_info(opts):
 def parseOpts(overrideArguments=None):
     def _readOptions(filename_bytes, default=[]):
         try:
-            optionf = open(filename_bytes, encoding=preferredencoding())
+            optionf = open(filename_bytes)
         except IOError:
             return default  # silently skip if file is not present
         try:
+            # FIXME: https://github.com/ytdl-org/youtube-dl/commit/dfe5fa49aed02cf36ba9f743b11b0903554b5e56
             contents = optionf.read()
+            if sys.version_info < (3,):
+                contents = contents.decode(preferredencoding())
             res = compat_shlex_split(contents, comments=True)
         finally:
             optionf.close()
@@ -268,11 +270,11 @@ def parseOpts(overrideArguments=None):
     selection.add_option(
         '--match-title',
         dest='matchtitle', metavar='REGEX',
-        help='Download only matching titles (case-insensitive regex or alphanumeric sub-string)')
+        help='Download only matching titles (regex or caseless sub-string)')
     selection.add_option(
         '--reject-title',
         dest='rejecttitle', metavar='REGEX',
-        help='Skip download for matching titles (case-insensitive regex or alphanumeric sub-string)')
+        help='Skip download for matching titles (regex or caseless sub-string)')
     selection.add_option(
         '--max-downloads',
         dest='max_downloads', metavar='NUMBER', type=int, default=None,
@@ -533,10 +535,6 @@ def parseOpts(overrideArguments=None):
         '--no-check-certificate',
         action='store_true', dest='no_check_certificate', default=False,
         help='Suppress HTTPS certificate validation')
-    workarounds.add_option(
-        '--no-check-extensions',
-        action='store_true', dest='no_check_extensions', default=False,
-        help='Suppress file extension validation')
     workarounds.add_option(
         '--prefer-insecure',
         '--prefer-unsecure', action='store_true', dest='prefer_insecure',
@@ -548,14 +546,12 @@ def parseOpts(overrideArguments=None):
     workarounds.add_option(
         '--referer',
         metavar='URL', dest='referer', default=None,
-        help='Specify a custom Referer: use if the video access is restricted to one domain',
+        help='Specify a custom referer, use if the video access is restricted to one domain',
     )
     workarounds.add_option(
         '--add-header',
         metavar='FIELD:VALUE', dest='headers', action='append',
-        help=('Specify a custom HTTP header and its value, separated by a colon \':\'. You can use this option multiple times. '
-              'NB Use --cookies rather than adding a Cookie header if its contents may be sensitive; '
-              'data from a Cookie header will be sent to all domains, not just the one intended')
+        help='Specify a custom HTTP header and its value, separated by a colon \':\'. You can use this option multiple times',
     )
     workarounds.add_option(
         '--bidi-workaround',
@@ -737,13 +733,9 @@ def parseOpts(overrideArguments=None):
         '--no-part',
         action='store_true', dest='nopart', default=False,
         help='Do not use .part files - write directly into output file')
-    filesystem.add_option(
-        '--mtime',
-        action='store_true', dest='updatetime', default=True,
-        help='Use the Last-modified header to set the file modification time (default)')
     filesystem.add_option(
         '--no-mtime',
-        action='store_false', dest='updatetime',
+        action='store_false', dest='updatetime', default=True,
         help='Do not use the Last-modified header to set the file modification time')
     filesystem.add_option(
         '--write-description',
@@ -776,7 +768,7 @@ def parseOpts(overrideArguments=None):
         action='store_true', dest='rm_cachedir',
         help='Delete all filesystem cache files')
 
-    thumbnail = optparse.OptionGroup(parser, 'Thumbnail Options')
+    thumbnail = optparse.OptionGroup(parser, 'Thumbnail images')
     thumbnail.add_option(
         '--write-thumbnail',
         action='store_true', dest='writethumbnail', default=False,
@@ -809,7 +801,7 @@ def parseOpts(overrideArguments=None):
     postproc.add_option(
         '--postprocessor-args',
         dest='postprocessor_args', metavar='ARGS',
-        help='Give these arguments to the postprocessor (if postprocessing is required)')
+        help='Give these arguments to the postprocessor')
     postproc.add_option(
         '-k', '--keep-video',
         action='store_true', dest='keepvideo', default=False,
diff --git a/youtube_dl/postprocessor/embedthumbnail.py b/youtube_dl/postprocessor/embedthumbnail.py
index b6c60e127..3990908b6 100644
--- a/youtube_dl/postprocessor/embedthumbnail.py
+++ b/youtube_dl/postprocessor/embedthumbnail.py
@@ -13,13 +13,10 @@ from ..utils import (
     encodeFilename,
     PostProcessingError,
     prepend_extension,
-    process_communicate_or_kill,
     replace_extension,
-    shell_quote,
+    shell_quote
 )
 
-from ..compat import compat_open as open
-
 
 class EmbedThumbnailPPError(PostProcessingError):
     pass
@@ -112,7 +109,7 @@ class EmbedThumbnailPP(FFmpegPostProcessor):
                 self._downloader.to_screen('[debug] AtomicParsley command line: %s' % shell_quote(cmd))
 
             p = subprocess.Popen(cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
-            stdout, stderr = process_communicate_or_kill(p)
+            stdout, stderr = p.communicate()
 
             if p.returncode != 0:
                 msg = stderr.decode('utf-8', 'replace').strip()
diff --git a/youtube_dl/postprocessor/ffmpeg.py b/youtube_dl/postprocessor/ffmpeg.py
index 214825aa9..5f7298345 100644
--- a/youtube_dl/postprocessor/ffmpeg.py
+++ b/youtube_dl/postprocessor/ffmpeg.py
@@ -1,5 +1,6 @@
 from __future__ import unicode_literals
 
+import io
 import os
 import subprocess
 import time
@@ -8,7 +9,6 @@ import re
 
 from .common import AudioConversionError, PostProcessor
 
-from ..compat import compat_open as open
 from ..utils import (
     encodeArgument,
     encodeFilename,
@@ -16,7 +16,6 @@ from ..utils import (
     is_outdated_version,
     PostProcessingError,
     prepend_extension,
-    process_communicate_or_kill,
     shell_quote,
     subtitles_filename,
     dfxp2srt,
@@ -74,11 +73,8 @@ class FFmpegPostProcessor(PostProcessor):
         return FFmpegPostProcessor(downloader)._versions
 
     def _determine_executables(self):
-        # ordered to match prefer_ffmpeg!
-        convs = ['ffmpeg', 'avconv']
-        probes = ['ffprobe', 'avprobe']
+        programs = ['avprobe', 'avconv', 'ffmpeg', 'ffprobe']
         prefer_ffmpeg = True
-        programs = convs + probes
 
         def get_ffmpeg_version(path):
             ver = get_exe_version(path, args=['-version'])
@@ -99,7 +95,6 @@ class FFmpegPostProcessor(PostProcessor):
 
         self._paths = None
         self._versions = None
-        location = None
         if self._downloader:
             prefer_ffmpeg = self._downloader.params.get('prefer_ffmpeg', True)
             location = self._downloader.params.get('ffmpeg_location')
@@ -122,21 +117,33 @@ class FFmpegPostProcessor(PostProcessor):
                     location = os.path.dirname(os.path.abspath(location))
                     if basename in ('ffmpeg', 'ffprobe'):
                         prefer_ffmpeg = True
-        self._paths = dict(
-            (p, p if location is None else os.path.join(location, p))
-            for p in programs)
-        self._versions = dict(
-            x for x in (
-                (p, get_ffmpeg_version(self._paths[p])) for p in programs)
-            if x[1] is not None)
 
-        basenames = [None, None]
-        for i, progs in enumerate((convs, probes)):
-            for p in progs[::-1 if prefer_ffmpeg is False else 1]:
-                if self._versions.get(p):
-                    basenames[i] = p
-                    break
-        self.basename, self.probe_basename = basenames
+                self._paths = dict(
+                    (p, os.path.join(location, p)) for p in programs)
+                self._versions = dict(
+                    (p, get_ffmpeg_version(self._paths[p])) for p in programs)
+        if self._versions is None:
+            self._versions = dict(
+                (p, get_ffmpeg_version(p)) for p in programs)
+            self._paths = dict((p, p) for p in programs)
+
+        if prefer_ffmpeg is False:
+            prefs = ('avconv', 'ffmpeg')
+        else:
+            prefs = ('ffmpeg', 'avconv')
+        for p in prefs:
+            if self._versions[p]:
+                self.basename = p
+                break
+
+        if prefer_ffmpeg is False:
+            prefs = ('avprobe', 'ffprobe')
+        else:
+            prefs = ('ffprobe', 'avprobe')
+        for p in prefs:
+            if self._versions[p]:
+                self.probe_basename = p
+                break
 
     @property
     def available(self):
@@ -173,7 +180,7 @@ class FFmpegPostProcessor(PostProcessor):
             handle = subprocess.Popen(
                 cmd, stderr=subprocess.PIPE,
                 stdout=subprocess.PIPE, stdin=subprocess.PIPE)
-            stdout_data, stderr_data = process_communicate_or_kill(handle)
+            stdout_data, stderr_data = handle.communicate()
             expected_ret = 0 if self.probe_available else 1
             if handle.wait() != expected_ret:
                 return None
@@ -221,13 +228,10 @@ class FFmpegPostProcessor(PostProcessor):
         if self._downloader.params.get('verbose', False):
             self._downloader.to_screen('[debug] ffmpeg command line: %s' % shell_quote(cmd))
         p = subprocess.Popen(cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE, stdin=subprocess.PIPE)
-        stdout, stderr = process_communicate_or_kill(p)
+        stdout, stderr = p.communicate()
         if p.returncode != 0:
             stderr = stderr.decode('utf-8', 'replace')
-            msgs = stderr.strip().split('\n')
-            msg = msgs[-1]
-            if self._downloader.params.get('verbose', False):
-                self._downloader.to_screen('[debug] ' + '\n'.join(msgs[:-1]))
+            msg = stderr.strip().split('\n')[-1]
             raise FFmpegPostProcessorError(msg)
         self.try_utime(out_path, oldest_mtime, oldest_mtime)
 
@@ -485,7 +489,7 @@ class FFmpegMetadataPP(FFmpegPostProcessor):
         chapters = info.get('chapters', [])
         if chapters:
             metadata_filename = replace_extension(filename, 'meta')
-            with open(metadata_filename, 'w', encoding='utf-8') as f:
+            with io.open(metadata_filename, 'wt', encoding='utf-8') as f:
                 def ffmpeg_escape(text):
                     return re.sub(r'(=|;|#|\\|\n)', r'\\\1', text)
 
@@ -628,7 +632,7 @@ class FFmpegSubtitlesConvertorPP(FFmpegPostProcessor):
                 with open(dfxp_file, 'rb') as f:
                     srt_data = dfxp2srt(f.read())
 
-                with open(srt_file, 'w', encoding='utf-8') as f:
+                with io.open(srt_file, 'wt', encoding='utf-8') as f:
                     f.write(srt_data)
                 old_file = srt_file
 
@@ -644,7 +648,7 @@ class FFmpegSubtitlesConvertorPP(FFmpegPostProcessor):
 
             self.run_ffmpeg(old_file, new_file, ['-f', new_format])
 
-            with open(new_file, 'r', encoding='utf-8') as f:
+            with io.open(new_file, 'rt', encoding='utf-8') as f:
                 subs[lang] = {
                     'ext': new_ext,
                     'data': f.read(),
diff --git a/youtube_dl/postprocessor/metadatafromtitle.py b/youtube_dl/postprocessor/metadatafromtitle.py
index 6cd5bb70f..f5c14d974 100644
--- a/youtube_dl/postprocessor/metadatafromtitle.py
+++ b/youtube_dl/postprocessor/metadatafromtitle.py
@@ -40,8 +40,6 @@ class MetadataFromTitlePP(PostProcessor):
                 % self._titleformat)
             return [], info
         for attribute, value in match.groupdict().items():
-            if value is None:
-                continue
             info[attribute] = value
             self._downloader.to_screen(
                 '[fromtitle] parsed %s: %s'
diff --git a/youtube_dl/swfinterp.py b/youtube_dl/swfinterp.py
index e79e0b17f..0c7158575 100644
--- a/youtube_dl/swfinterp.py
+++ b/youtube_dl/swfinterp.py
@@ -727,7 +727,7 @@ class SWFInterpreter(object):
                             stack.append(res)
                             continue
 
-                        assert isinstance(obj, (dict, _ScopeDict)), \
+                        assert isinstance(obj, (dict, _ScopeDict)),\
                             'Accessing member %r on %r' % (pname, obj)
                         res = obj.get(pname, undefined)
                         stack.append(res)
diff --git a/youtube_dl/traversal.py b/youtube_dl/traversal.py
deleted file mode 100644
index 834cfef7f..000000000
--- a/youtube_dl/traversal.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# coding: utf-8
-
-# TODO: move these utils.fns here and move import to utils
-# flake8: noqa
-from .utils import (
-    dict_get,
-    get_first,
-    T,
-    traverse_obj,
-)
diff --git a/youtube_dl/update.py b/youtube_dl/update.py
index a147b5253..84c964617 100644
--- a/youtube_dl/update.py
+++ b/youtube_dl/update.py
@@ -1,5 +1,6 @@
 from __future__ import unicode_literals
 
+import io
 import json
 import traceback
 import hashlib
@@ -8,10 +9,7 @@ import subprocess
 import sys
 from zipimport import zipimporter
 
-from .compat import (
-    compat_open as open,
-    compat_realpath,
-)
+from .compat import compat_realpath
 from .utils import encode_compat_str
 
 from .version import __version__
@@ -129,7 +127,7 @@ def update_self(to_screen, verbose, opener):
 
         try:
             bat = os.path.join(directory, 'youtube-dl-updater.bat')
-            with open(bat, 'w') as batfile:
+            with io.open(bat, 'w') as batfile:
                 batfile.write('''
 @echo off
 echo Waiting for file handle to be closed ...
diff --git a/youtube_dl/utils.py b/youtube_dl/utils.py
index c4262936e..8e4d144c9 100644
--- a/youtube_dl/utils.py
+++ b/youtube_dl/utils.py
@@ -15,7 +15,7 @@ import email.utils
 import email.header
 import errno
 import functools
-import inspect
+import gzip
 import io
 import itertools
 import json
@@ -33,7 +33,6 @@ import sys
 import tempfile
 import time
 import traceback
-import unicodedata
 import xml.etree.ElementTree
 import zlib
 
@@ -41,40 +40,29 @@ from .compat import (
     compat_HTMLParseError,
     compat_HTMLParser,
     compat_basestring,
-    compat_brotli as brotli,
-    compat_casefold,
     compat_chr,
-    compat_collections_abc,
-    compat_contextlib_suppress,
     compat_cookiejar,
     compat_ctypes_WINFUNCTYPE,
-    compat_datetime_timedelta_total_seconds,
-    compat_etree_Element,
     compat_etree_fromstring,
-    compat_etree_iterfind,
     compat_expanduser,
     compat_html_entities,
     compat_html_entities_html5,
     compat_http_client,
-    compat_http_cookies,
     compat_integer_types,
     compat_kwargs,
-    compat_ncompress as ncompress,
     compat_os_name,
-    compat_re_Match,
-    compat_re_Pattern,
+    compat_parse_qs,
     compat_shlex_quote,
     compat_str,
     compat_struct_pack,
     compat_struct_unpack,
     compat_urllib_error,
-    compat_urllib_HTTPError,
     compat_urllib_parse,
-    compat_urllib_parse_parse_qs as compat_parse_qs,
     compat_urllib_parse_urlencode,
     compat_urllib_parse_urlparse,
     compat_urllib_parse_unquote_plus,
     compat_urllib_request,
+    compat_urlparse,
     compat_xpath,
 )
 
@@ -89,12 +77,12 @@ def register_socks_protocols():
     # In Python < 2.6.5, urlsplit() suffers from bug https://bugs.python.org/issue7904
     # URLs with protocols not in urlparse.uses_netloc are not handled correctly
     for scheme in ('socks', 'socks4', 'socks4a', 'socks5'):
-        if scheme not in compat_urllib_parse.uses_netloc:
-            compat_urllib_parse.uses_netloc.append(scheme)
+        if scheme not in compat_urlparse.uses_netloc:
+            compat_urlparse.uses_netloc.append(scheme)
 
 
-# Unfavoured alias
-compiled_regex_type = compat_re_Pattern
+# This is not clearly defined otherwise
+compiled_regex_type = type(re.compile(''))
 
 
 def random_user_agent():
@@ -1682,7 +1670,9 @@ def random_user_agent():
 
 std_headers = {
     'User-Agent': random_user_agent(),
+    'Accept-Charset': 'ISO-8859-1,utf-8;q=0.7,*;q=0.7',
     'Accept': 'text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8',
+    'Accept-Encoding': 'gzip, deflate',
     'Accept-Language': 'en-us,en;q=0.5',
 }
 
@@ -1693,7 +1683,6 @@ USER_AGENTS = {
 
 
 NO_DEFAULT = object()
-IDENTITY = lambda x: x
 
 ENGLISH_MONTH_NAMES = [
     'January', 'February', 'March', 'April', 'May', 'June',
@@ -1706,16 +1695,20 @@ MONTH_NAMES = {
         'juillet', 'août', 'septembre', 'octobre', 'novembre', 'décembre'],
 }
 
-# Timezone names for RFC2822 obs-zone
-# From https://github.com/python/cpython/blob/3.11/Lib/email/_parseaddr.py#L36-L42
-TIMEZONE_NAMES = {
-    'UT': 0, 'UTC': 0, 'GMT': 0, 'Z': 0,
-    'AST': -4, 'ADT': -3,  # Atlantic (used in Canada)
-    'EST': -5, 'EDT': -4,  # Eastern
-    'CST': -6, 'CDT': -5,  # Central
-    'MST': -7, 'MDT': -6,  # Mountain
-    'PST': -8, 'PDT': -7   # Pacific
-}
+KNOWN_EXTENSIONS = (
+    'mp4', 'm4a', 'm4p', 'm4b', 'm4r', 'm4v', 'aac',
+    'flv', 'f4v', 'f4a', 'f4b',
+    'webm', 'ogg', 'ogv', 'oga', 'ogx', 'spx', 'opus',
+    'mkv', 'mka', 'mk3d',
+    'avi', 'divx',
+    'mov',
+    'asf', 'wmv', 'wma',
+    '3gp', '3g2',
+    'mp3',
+    'flac',
+    'ape',
+    'wav',
+    'f4f', 'f4m', 'm3u8', 'smil')
 
 # needed for sanitizing filenames in restricted mode
 ACCENT_CHARS = dict(zip('ÂÃÄÀÁÅÆÇÈÉÊËÌÍÎÏÐÑÒÓÔÕÖŐØŒÙÚÛÜŰÝÞßàáâãäåæçèéêëìíîïðñòóôõöőøœùúûüűýþÿ',
@@ -1741,17 +1734,12 @@ DATE_FORMATS = (
     '%b %dth %Y %I:%M',
     '%Y %m %d',
     '%Y-%m-%d',
-    '%Y.%m.%d.',
     '%Y/%m/%d',
     '%Y/%m/%d %H:%M',
     '%Y/%m/%d %H:%M:%S',
-    '%Y%m%d%H%M',
-    '%Y%m%d%H%M%S',
-    '%Y%m%d',
     '%Y-%m-%d %H:%M',
     '%Y-%m-%d %H:%M:%S',
     '%Y-%m-%d %H:%M:%S.%f',
-    '%Y-%m-%d %H:%M:%S:%f',
     '%d.%m.%Y %H:%M',
     '%d.%m.%Y %H.%M',
     '%Y-%m-%dT%H:%M:%SZ',
@@ -1764,7 +1752,6 @@ DATE_FORMATS = (
     '%b %d %Y at %H:%M:%S',
     '%B %d %Y at %H:%M',
     '%B %d %Y at %H:%M:%S',
-    '%H:%M %d-%b-%Y',
 )
 
 DATE_FORMATS_DAY_FIRST = list(DATE_FORMATS)
@@ -1775,7 +1762,6 @@ DATE_FORMATS_DAY_FIRST.extend([
     '%d/%m/%Y',
     '%d/%m/%y',
     '%d/%m/%Y %H:%M:%S',
-    '%d-%m-%Y %H:%M',
 ])
 
 DATE_FORMATS_MONTH_FIRST = list(DATE_FORMATS)
@@ -1813,11 +1799,11 @@ def write_json_file(obj, fn):
     if sys.version_info < (3, 0) and sys.platform != 'win32':
         encoding = get_filesystem_encoding()
         # os.path.basename returns a bytes object, but NamedTemporaryFile
-        # will fail if the filename contains non-ascii characters unless we
+        # will fail if the filename contains non ascii characters unless we
         # use a unicode object
-        path_basename = lambda f: os.path.basename(f).decode(encoding)
+        path_basename = lambda f: os.path.basename(fn).decode(encoding)
         # the same for os.path.dirname
-        path_dirname = lambda f: os.path.dirname(f).decode(encoding)
+        path_dirname = lambda f: os.path.dirname(fn).decode(encoding)
     else:
         path_basename = os.path.basename
         path_dirname = os.path.dirname
@@ -1844,18 +1830,25 @@ def write_json_file(obj, fn):
     try:
         with tf:
             json.dump(obj, tf)
-        with compat_contextlib_suppress(OSError):
-            if sys.platform == 'win32':
-                # Need to remove existing file on Windows, else os.rename raises
-                # WindowsError or FileExistsError.
+        if sys.platform == 'win32':
+            # Need to remove existing file on Windows, else os.rename raises
+            # WindowsError or FileExistsError.
+            try:
                 os.unlink(fn)
+            except OSError:
+                pass
+        try:
             mask = os.umask(0)
             os.umask(mask)
             os.chmod(tf.name, 0o666 & ~mask)
+        except OSError:
+            pass
         os.rename(tf.name, fn)
     except Exception:
-        with compat_contextlib_suppress(OSError):
+        try:
             os.remove(tf.name)
+        except OSError:
+            pass
         raise
 
 
@@ -1874,10 +1867,10 @@ else:
                 return f
         return None
 
-
 # On python2.6 the xml.etree.ElementTree.Element methods don't support
 # the namespace parameter
 
+
 def xpath_with_ns(path, ns_map):
     components = [c.split(':') for c in path.split('/')]
     replaced = []
@@ -1894,7 +1887,7 @@ def xpath_element(node, xpath, name=None, fatal=False, default=NO_DEFAULT):
     def _find_xpath(xpath):
         return node.find(compat_xpath(xpath))
 
-    if isinstance(xpath, compat_basestring):
+    if isinstance(xpath, (str, compat_str)):
         n = _find_xpath(xpath)
     else:
         for xp in xpath:
@@ -2015,13 +2008,14 @@ def extract_attributes(html_element):
     NB HTMLParser is stricter in Python 2.6 & 3.2 than in later versions,
     but the cases in the unit test will work for all of 2.6, 2.7, 3.2-3.5.
     """
-    ret = None
-    # Older Python may throw HTMLParseError in case of malformed HTML (and on .close()!)
-    with compat_contextlib_suppress(compat_HTMLParseError):
-        with contextlib.closing(HTMLAttributeParser()) as parser:
-            parser.feed(html_element)
-            ret = parser.attrs
-    return ret or {}
+    parser = HTMLAttributeParser()
+    try:
+        parser.feed(html_element)
+        parser.close()
+    # Older Python may throw HTMLParseError in case of malformed HTML
+    except compat_HTMLParseError:
+        pass
+    return parser.attrs
 
 
 def clean_html(html):
@@ -2102,13 +2096,9 @@ def sanitize_filename(s, restricted=False, is_id=False):
         if restricted and (char in '!&\'()[]{}$;`^,#' or char.isspace()):
             return '_'
         if restricted and ord(char) > 127:
-            return '' if unicodedata.category(char)[0] in 'CM' else '_'
-
+            return '_'
         return char
 
-    # Replace look-alike Unicode glyphs
-    if restricted and not is_id:
-        s = unicodedata.normalize('NFKC', s)
     # Handle timestamps
     s = re.sub(r'[0-9]+(?::[0-9]+)+', lambda m: m.group(0).replace(':', '_'), s)
     result = ''.join(map(replace_insane, s))
@@ -2163,28 +2153,8 @@ def sanitize_url(url):
     return url
 
 
-def extract_basic_auth(url):
-    parts = compat_urllib_parse.urlsplit(url)
-    if parts.username is None:
-        return url, None
-    url = compat_urllib_parse.urlunsplit(parts._replace(netloc=(
-        parts.hostname if parts.port is None
-        else '%s:%d' % (parts.hostname, parts.port))))
-    auth_payload = base64.b64encode(
-        ('%s:%s' % (parts.username, parts.password or '')).encode('utf-8'))
-    return url, 'Basic {0}'.format(auth_payload.decode('ascii'))
-
-
 def sanitized_Request(url, *args, **kwargs):
-    url, auth_header = extract_basic_auth(escape_url(sanitize_url(url)))
-    if auth_header is not None:
-        headers = args[1] if len(args) > 1 else kwargs.get('headers')
-        headers = headers or {}
-        headers['Authorization'] = auth_header
-        if len(args) <= 1 and kwargs.get('headers') is None:
-            kwargs['headers'] = headers
-            kwargs = compat_kwargs(kwargs)
-    return compat_urllib_request.Request(url, *args, **kwargs)
+    return compat_urllib_request.Request(sanitize_url(url), *args, **kwargs)
 
 
 def expand_path(s):
@@ -2222,8 +2192,7 @@ def _htmlentity_transform(entity_with_semicolon):
             numstr = '0%s' % numstr
         else:
             base = 10
-        # See https://github.com/ytdl-org/youtube-dl/issues/7518\
-        # Also, weirdly, compat_contextlib_suppress fails here in 2.6
+        # See https://github.com/ytdl-org/youtube-dl/issues/7518
         try:
             return compat_chr(int(numstr, base))
         except ValueError:
@@ -2236,21 +2205,12 @@ def _htmlentity_transform(entity_with_semicolon):
 def unescapeHTML(s):
     if s is None:
         return None
-    assert isinstance(s, compat_str)
+    assert type(s) == compat_str
 
     return re.sub(
         r'&([^&;]+;)', lambda m: _htmlentity_transform(m.group(1)), s)
 
 
-def process_communicate_or_kill(p, *args, **kwargs):
-    try:
-        return p.communicate(*args, **kwargs)
-    except BaseException:  # Including KeyboardInterrupt
-        p.kill()
-        p.wait()
-        raise
-
-
 def get_subprocess_encoding():
     if sys.platform == 'win32' and sys.getwindowsversion()[0] >= 5:
         # For subprocess calls, encode with locale encoding
@@ -2263,32 +2223,39 @@ def get_subprocess_encoding():
     return encoding
 
 
-# Jython assumes filenames are Unicode strings though reported as Python 2.x compatible
-if sys.version_info < (3, 0) and not sys.platform.startswith('java'):
+def encodeFilename(s, for_subprocess=False):
+    """
+    @param s The name of the file
+    """
 
-    def encodeFilename(s, for_subprocess=False):
-        """
-        @param s The name of the file
-        """
-
-        # Pass '' directly to use Unicode APIs on Windows 2000 and up
-        # (Detecting Windows NT 4 is tricky because 'major >= 4' would
-        # match Windows 9x series as well. Besides, NT 4 is obsolete.)
-        if (not for_subprocess
-                and sys.platform == 'win32'
-                and sys.getwindowsversion()[0] >= 5
-                and isinstance(s, compat_str)):
-            return s
-
-        return _encode_compat_str(s, get_subprocess_encoding(), 'ignore')
-
-    def decodeFilename(b, for_subprocess=False):
-        return _decode_compat_str(b, get_subprocess_encoding(), 'ignore')
-
-else:
+    assert type(s) == compat_str
 
     # Python 3 has a Unicode API
-    encodeFilename = decodeFilename = lambda *s, **k: s[0]
+    if sys.version_info >= (3, 0):
+        return s
+
+    # Pass '' directly to use Unicode APIs on Windows 2000 and up
+    # (Detecting Windows NT 4 is tricky because 'major >= 4' would
+    # match Windows 9x series as well. Besides, NT 4 is obsolete.)
+    if not for_subprocess and sys.platform == 'win32' and sys.getwindowsversion()[0] >= 5:
+        return s
+
+    # Jython assumes filenames are Unicode strings though reported as Python 2.x compatible
+    if sys.platform.startswith('java'):
+        return s
+
+    return s.encode(get_subprocess_encoding(), 'ignore')
+
+
+def decodeFilename(b, for_subprocess=False):
+
+    if sys.version_info >= (3, 0):
+        return b
+
+    if not isinstance(b, bytes):
+        return b
+
+    return b.decode(get_subprocess_encoding(), 'ignore')
 
 
 def encodeArgument(s):
@@ -2307,7 +2274,11 @@ def decodeArgument(b):
 def decodeOption(optval):
     if optval is None:
         return optval
-    return _decode_compat_str(optval)
+    if isinstance(optval, bytes):
+        optval = optval.decode(preferredencoding())
+
+    assert isinstance(optval, compat_str)
+    return optval
 
 
 def formatSeconds(secs):
@@ -2320,63 +2291,39 @@ def formatSeconds(secs):
 
 
 def make_HTTPS_handler(params, **kwargs):
-
-    # https://www.rfc-editor.org/info/rfc7301
-    ALPN_PROTOCOLS = ['http/1.1']
-
-    def set_alpn_protocols(ctx):
-        # From https://github.com/yt-dlp/yt-dlp/commit/2c6dcb65fb612fc5bc5c61937bf438d3c473d8d0
-        # Thanks @coletdjnz
-        # Some servers may (wrongly) reject requests if ALPN extension is not sent. See:
-        # https://github.com/python/cpython/issues/85140
-        # https://github.com/yt-dlp/yt-dlp/issues/3878
-        with compat_contextlib_suppress(AttributeError, NotImplementedError):
-            # fails for Python < 2.7.10, not ssl.HAS_ALPN
-            ctx.set_alpn_protocols(ALPN_PROTOCOLS)
-
     opts_no_check_certificate = params.get('nocheckcertificate', False)
     if hasattr(ssl, 'create_default_context'):  # Python >= 3.4 or 2.7.9
         context = ssl.create_default_context(ssl.Purpose.SERVER_AUTH)
-        set_alpn_protocols(context)
         if opts_no_check_certificate:
             context.check_hostname = False
             context.verify_mode = ssl.CERT_NONE
-
-        with compat_contextlib_suppress(TypeError):
-            # Fails with Python 2.7.8 (create_default_context present
-            # but HTTPSHandler has no context=)
+        try:
             return YoutubeDLHTTPSHandler(params, context=context, **kwargs)
+        except TypeError:
+            # Python 2.7.8
+            # (create_default_context present but HTTPSHandler has no context=)
+            pass
 
     if sys.version_info < (3, 2):
         return YoutubeDLHTTPSHandler(params, **kwargs)
-    else:  # Python3 < 3.4
+    else:  # Python < 3.4
         context = ssl.SSLContext(ssl.PROTOCOL_TLSv1)
         context.verify_mode = (ssl.CERT_NONE
                                if opts_no_check_certificate
                                else ssl.CERT_REQUIRED)
         context.set_default_verify_paths()
-        set_alpn_protocols(context)
         return YoutubeDLHTTPSHandler(params, context=context, **kwargs)
 
 
-def bug_reports_message(before=';'):
+def bug_reports_message():
     if ytdl_is_updateable():
         update_cmd = 'type  youtube-dl -U  to update'
     else:
-        update_cmd = 'see  https://github.com/ytdl-org/youtube-dl/#user-content-installation  on how to update'
-
-    msg = (
-        'please report this issue on https://github.com/ytdl-org/youtube-dl/issues ,'
-        ' using the appropriate issue template.'
-        ' Make sure you are using the latest version; %s.'
-        ' Be sure to call youtube-dl with the --verbose option and include the complete output.'
-    ) % update_cmd
-
-    before = (before or '').rstrip()
-    if not before or before.endswith(('.', '!', '?')):
-        msg = msg[0].title() + msg[1:]
-
-    return (before + ' ' if before else '') + msg
+        update_cmd = 'see  https://yt-dl.org/update  on how to update'
+    msg = '; please report this issue on https://yt-dl.org/bug .'
+    msg += ' Make sure you are using the latest version; %s.' % update_cmd
+    msg += ' Be sure to call youtube-dl with the --verbose flag and include its complete output.'
+    return msg
 
 
 class YoutubeDLError(Exception):
@@ -2391,7 +2338,7 @@ class ExtractorError(YoutubeDLError):
         """ tb, if given, is the original traceback (so that it can be printed out).
         If expected is set, this is a normal error message and most likely not a bug in youtube-dl.
         """
-        self.orig_msg = msg
+
         if sys.exc_info()[0] in (compat_urllib_error.URLError, socket.timeout, UnavailableVideoError):
             expected = True
         if video_id is not None:
@@ -2592,7 +2539,7 @@ def handle_youtubedl_headers(headers):
     filtered_headers = headers
 
     if 'Youtubedl-no-compression' in filtered_headers:
-        filtered_headers = filter_dict(filtered_headers, cndn=lambda k, _: k.lower() != 'accept-encoding')
+        filtered_headers = dict((k, v) for k, v in filtered_headers.items() if k.lower() != 'accept-encoding')
         del filtered_headers['Youtubedl-no-compression']
 
     return filtered_headers
@@ -2610,8 +2557,7 @@ class YoutubeDLHandler(compat_urllib_request.HTTPHandler):
 
     Part of this code was copied from:
 
-    http://techknack.net/python-urllib2-handlers/, archived at
-    https://web.archive.org/web/20130527205558/http://techknack.net/python-urllib2-handlers/
+    http://techknack.net/python-urllib2-handlers/
 
     Andrew Rowls, the author of that code, agreed to release it to the
     public domain.
@@ -2634,91 +2580,23 @@ class YoutubeDLHandler(compat_urllib_request.HTTPHandler):
             req)
 
     @staticmethod
-    def deflate_gz(data):
+    def deflate(data):
         try:
-            # format:zlib,gzip + windowsize:32768
-            return data and zlib.decompress(data, 32 + zlib.MAX_WBITS)
-        except zlib.error:
-            # raw zlib * windowsize:32768 (RFC 9110: "non-conformant")
             return zlib.decompress(data, -zlib.MAX_WBITS)
-
-    @staticmethod
-    def gzip(data):
-
-        from gzip import GzipFile
-
-        def _gzip(data):
-            with io.BytesIO(data) as data_buf:
-                gz = GzipFile(fileobj=data_buf, mode='rb')
-                return gz.read()
-
-        try:
-            return _gzip(data)
-        except IOError as original_ioerror:
-            # There may be junk at the end of the file
-            # See http://stackoverflow.com/q/4928560/35070 for details
-            for i in range(1, 1024):
-                try:
-                    return _gzip(data[:-i])
-                except IOError:
-                    continue
-            else:
-                raise original_ioerror
-
-    @staticmethod
-    def brotli(data):
-        return data and brotli.decompress(data)
-
-    @staticmethod
-    def compress(data):
-        return data and ncompress.decompress(data)
-
-    @staticmethod
-    def _fix_path(url):
-        # an embedded /../ or /./ sequence is not automatically handled by urllib2
-        # see https://github.com/yt-dlp/yt-dlp/issues/3355
-        parsed_url = compat_urllib_parse.urlsplit(url)
-        path = parsed_url.path
-        if not path.endswith('/'):
-            path += '/'
-        parts = path.partition('/./')
-        if not parts[1]:
-            parts = path.partition('/../')
-        if parts[1]:
-            path = compat_urllib_parse.urljoin(
-                parts[0] + parts[1][:1],
-                parts[1][1:] + (parts[2] if parsed_url.path.endswith('/') else parts[2][:-1]))
-            url = parsed_url._replace(path=path).geturl()
-        if '/.' in url:
-            # worse, URL path may have initial /../ against RFCs: work-around
-            # by stripping such prefixes, like eg Firefox
-            path = parsed_url.path + '/'
-            while path.startswith('/.'):
-                if path.startswith('/../'):
-                    path = path[3:]
-                elif path.startswith('/./'):
-                    path = path[2:]
-                else:
-                    break
-            path = path[:-1]
-            if not path.startswith('/') and parsed_url.path.startswith('/'):
-                path = '/' + path
-            url = parsed_url._replace(path=path).geturl()
-        return url
+        except zlib.error:
+            return zlib.decompress(data)
 
     def http_request(self, req):
-        url = req.get_full_url()
-        # resolve embedded . and ..
-        url_fixed = self._fix_path(url)
-        # According to RFC 3986, URLs can not contain non-ASCII characters; however this is not
-        # always respected by websites: some tend to give out URLs with non percent-encoded
+        # According to RFC 3986, URLs can not contain non-ASCII characters, however this is not
+        # always respected by websites, some tend to give out URLs with non percent-encoded
         # non-ASCII characters (see telemb.py, ard.py [#3412])
         # urllib chokes on URLs with non-ASCII characters (see http://bugs.python.org/issue3991)
         # To work around aforementioned issue we will replace request's original URL with
         # percent-encoded one
         # Since redirects are also affected (e.g. http://www.southpark.de/alle-episoden/s18e09)
         # the code of this workaround has been moved here from YoutubeDL.urlopen()
-        url_escaped = escape_url(url_fixed)
+        url = req.get_full_url()
+        url_escaped = escape_url(url)
 
         # Substitute URL if any change after escaping
         if url != url_escaped:
@@ -2730,82 +2608,44 @@ class YoutubeDLHandler(compat_urllib_request.HTTPHandler):
             if h.capitalize() not in req.headers:
                 req.add_header(h, v)
 
-        # Similarly, 'Accept-encoding'
-        if 'Accept-encoding' not in req.headers:
-            req.add_header(
-                'Accept-Encoding', join_nonempty(
-                    'gzip', 'deflate', brotli and 'br', ncompress and 'compress',
-                    delim=', '))
-
         req.headers = handle_youtubedl_headers(req.headers)
 
-        if sys.version_info < (2, 7):
-            # avoid possible race where __r_type may be unset
-            req.get_type()
-            if '#' in req.get_full_url():
-                # Python 2.6 is brain-dead when it comes to fragments
-                req._Request__original = req._Request__original.partition('#')[0]
-                req._Request__r_type = req._Request__r_type.partition('#')[0]
+        if sys.version_info < (2, 7) and '#' in req.get_full_url():
+            # Python 2.6 is brain-dead when it comes to fragments
+            req._Request__original = req._Request__original.partition('#')[0]
+            req._Request__r_type = req._Request__r_type.partition('#')[0]
 
-        # Use the totally undocumented AbstractHTTPHandler per
-        # https://github.com/yt-dlp/yt-dlp/pull/4158
-        return compat_urllib_request.AbstractHTTPHandler.do_request_(self, req)
+        return req
 
     def http_response(self, req, resp):
         old_resp = resp
-
-        # Content-Encoding header lists the encodings in order that they were applied [1].
-        # To decompress, we simply do the reverse.
-        # [1]: https://datatracker.ietf.org/doc/html/rfc9110#name-content-encoding
-        decoded_response = None
-        decoders = {
-            'gzip': self.deflate_gz,
-            'deflate': self.deflate_gz,
-        }
-        if brotli:
-            decoders['br'] = self.brotli
-        if ncompress:
-            decoders['compress'] = self.compress
-        if sys.platform.startswith('java'):
-            # Jython zlib implementation misses gzip
-            decoders['gzip'] = self.gzip
-
-        def encodings(hdrs):
-            # A header field that allows multiple values can have multiple instances [2].
-            # [2]: https://datatracker.ietf.org/doc/html/rfc9110#name-fields
-            for e in reversed(','.join(hdrs).split(',')):
-                if e:
-                    yield e.strip()
-
-        encodings_left = []
-        try:
-            resp.headers.get_all
-            hdrs = resp.headers
-        except AttributeError:
-            # Py2 has no get_all() method: headers are rfc822.Message
-            from email.message import Message
-            hdrs = Message()
-            for k, v in resp.headers.items():
-                hdrs[k] = v
-
-        decoder, decoded_response = True, None
-        for encoding in encodings(hdrs.get_all('Content-Encoding', [])):
-            # "SHOULD consider" x-compress, x-gzip as compress, gzip
-            decoder = decoder and decoders.get(remove_start(encoding, 'x-'))
-            if not decoder:
-                encodings_left.insert(0, encoding)
-                continue
-            decoded_response = decoder(decoded_response or resp.read())
-        if decoded_response is not None:
-            resp = compat_urllib_request.addinfourl(
-                io.BytesIO(decoded_response), old_resp.headers, old_resp.url, old_resp.code)
+        # gzip
+        if resp.headers.get('Content-encoding', '') == 'gzip':
+            content = resp.read()
+            gz = gzip.GzipFile(fileobj=io.BytesIO(content), mode='rb')
+            try:
+                uncompressed = io.BytesIO(gz.read())
+            except IOError as original_ioerror:
+                # There may be junk add the end of the file
+                # See http://stackoverflow.com/q/4928560/35070 for details
+                for i in range(1, 1024):
+                    try:
+                        gz = gzip.GzipFile(fileobj=io.BytesIO(content[:-i]), mode='rb')
+                        uncompressed = io.BytesIO(gz.read())
+                    except IOError:
+                        continue
+                    break
+                else:
+                    raise original_ioerror
+            resp = compat_urllib_request.addinfourl(uncompressed, old_resp.headers, old_resp.url, old_resp.code)
             resp.msg = old_resp.msg
-            del resp.headers['Content-Length']
-            resp.headers['Content-Length'] = '%d' % len(decoded_response)
-        del resp.headers['Content-Encoding']
-        if encodings_left:
-            resp.headers['Content-Encoding'] = ', '.join(encodings_left)
-
+            del resp.headers['Content-encoding']
+        # deflate
+        if resp.headers.get('Content-encoding', '') == 'deflate':
+            gz = io.BytesIO(self.deflate(resp.read()))
+            resp = compat_urllib_request.addinfourl(gz, old_resp.headers, old_resp.url, old_resp.code)
+            resp.msg = old_resp.msg
+            del resp.headers['Content-encoding']
         # Percent-encode redirect URL of Location HTTP header to satisfy RFC 3986 (see
         # https://github.com/ytdl-org/youtube-dl/issues/6457).
         if 300 <= resp.code < 400:
@@ -2813,14 +2653,13 @@ class YoutubeDLHandler(compat_urllib_request.HTTPHandler):
             if location:
                 # As of RFC 2616 default charset is iso-8859-1 that is respected by python 3
                 if sys.version_info >= (3, 0):
-                    location = location.encode('iso-8859-1')
-                location = location.decode('utf-8')
-                # resolve embedded . and ..
-                location_fixed = self._fix_path(location)
-                location_escaped = escape_url(location_fixed)
+                    location = location.encode('iso-8859-1').decode('utf-8')
+                else:
+                    location = location.decode('utf-8')
+                location_escaped = escape_url(location)
                 if location != location_escaped:
                     del resp.headers['Location']
-                    if not isinstance(location_escaped, str):  # Py 2 case
+                    if sys.version_info < (3, 0):
                         location_escaped = location_escaped.encode('utf-8')
                     resp.headers['Location'] = location_escaped
         return resp
@@ -2833,7 +2672,7 @@ def make_socks_conn_class(base_class, socks_proxy):
     assert issubclass(base_class, (
         compat_http_client.HTTPConnection, compat_http_client.HTTPSConnection))
 
-    url_components = compat_urllib_parse.urlparse(socks_proxy)
+    url_components = compat_urlparse.urlparse(socks_proxy)
     if url_components.scheme.lower() == 'socks5':
         socks_type = ProxyType.SOCKS5
     elif url_components.scheme.lower() in ('socks', 'socks4'):
@@ -3014,19 +2853,6 @@ class YoutubeDLCookieJar(compat_cookiejar.MozillaCookieJar):
                 cookie.expires = None
                 cookie.discard = True
 
-    def get_cookie_header(self, url):
-        """Generate a Cookie HTTP header for a given url"""
-        cookie_req = sanitized_Request(url)
-        self.add_cookie_header(cookie_req)
-        return cookie_req.get_header('Cookie')
-
-    def get_cookies_for_url(self, url):
-        """Generate a list of Cookie objects for a given url"""
-        # Policy `_now` attribute must be set before calling `_cookies_for_request`
-        # Ref: https://github.com/python/cpython/blob/3.7/Lib/http/cookiejar.py#L1360
-        self._policy._now = self._now = int(time.time())
-        return self._cookies_for_request(sanitized_Request(url))
-
 
 class YoutubeDLCookieProcessor(compat_urllib_request.HTTPCookieProcessor):
     def __init__(self, cookiejar=None):
@@ -3053,93 +2879,20 @@ class YoutubeDLCookieProcessor(compat_urllib_request.HTTPCookieProcessor):
 
 
 class YoutubeDLRedirectHandler(compat_urllib_request.HTTPRedirectHandler):
-    """YoutubeDL redirect handler
-
-    The code is based on HTTPRedirectHandler implementation from CPython [1].
-
-    This redirect handler fixes and improves the logic to better align with RFC7261
-    and what browsers tend to do [2][3]
-
-    1. https://github.com/python/cpython/blob/master/Lib/urllib/request.py
-    2. https://datatracker.ietf.org/doc/html/rfc7231
-    3. https://github.com/python/cpython/issues/91306
-    """
-
-    # Supply possibly missing alias
-    http_error_308 = compat_urllib_request.HTTPRedirectHandler.http_error_302
-
-    def redirect_request(self, req, fp, code, msg, headers, newurl):
-        """Return a Request or None in response to a redirect.
-
-        This is called by the http_error_30x methods when a
-        redirection response is received.  If a redirection should
-        take place, return a new Request to allow http_error_30x to
-        perform the redirect.  Otherwise, raise HTTPError if no-one
-        else should try to handle this url.  Return None if you can't
-        but another Handler might.
-        """
-        if code not in (301, 302, 303, 307, 308):
-            raise compat_urllib_HTTPError(req.full_url, code, msg, headers, fp)
-
-        new_method = req.get_method()
-        new_data = req.data
-
-        # On python 2 urlh.geturl() may sometimes return redirect URL
-        # as a byte string instead of unicode. This workaround forces
-        # it to return unicode.
-        newurl = _decode_compat_str(newurl)
-
-        # Be conciliant with URIs containing a space.  This is mainly
-        # redundant with the more complete encoding done in http_error_302(),
-        # but it is kept for compatibility with other callers.
-        newurl = newurl.replace(' ', '%20')
-
-        # Technically the Cookie header should be in unredirected_hdrs;
-        # however in practice some may set it in normal headers anyway.
-        # We will remove it here to prevent any leaks.
-        remove_headers = ['Cookie']
-
-        # A 303 must either use GET or HEAD for subsequent request
-        # https://datatracker.ietf.org/doc/html/rfc7231#section-6.4.4
-        if code == 303 and req.get_method() != 'HEAD':
-            new_method = 'GET'
-        # 301 and 302 redirects are commonly turned into a GET from a POST
-        # for subsequent requests by browsers, so we'll do the same.
-        # https://datatracker.ietf.org/doc/html/rfc7231#section-6.4.2
-        # https://datatracker.ietf.org/doc/html/rfc7231#section-6.4.3
-        elif code in (301, 302) and req.get_method() == 'POST':
-            new_method = 'GET'
-
-        # only remove payload if method changed (e.g. POST to GET)
-        if new_method != req.get_method():
-            new_data = None
-            remove_headers.extend(['Content-Length', 'Content-Type'])
-
-        new_headers = filter_dict(req.headers, cndn=lambda k, _: k.title() not in remove_headers)
-
-        return compat_urllib_request.Request(
-            newurl, headers=new_headers, origin_req_host=req.origin_req_host,
-            unverifiable=True, method=new_method, data=new_data)
+    if sys.version_info[0] < 3:
+        def redirect_request(self, req, fp, code, msg, headers, newurl):
+            # On python 2 urlh.geturl() may sometimes return redirect URL
+            # as byte string instead of unicode. This workaround allows
+            # to force it always return unicode.
+            return compat_urllib_request.HTTPRedirectHandler.redirect_request(self, req, fp, code, msg, headers, compat_str(newurl))
 
 
 def extract_timezone(date_str):
     m = re.search(
-        r'''(?x)
-            ^.{8,}?                                              # >=8 char non-TZ prefix, if present
-            (?P<tz>Z|                                            # just the UTC Z, or
-                (?:(?<=.\b\d{4}|\b\d{2}:\d\d)|                   # preceded by 4 digits or hh:mm or
-                   (?<!.\b[a-zA-Z]{3}|[a-zA-Z]{4}|..\b\d\d))     # not preceded by 3 alpha word or >= 4 alpha or 2 digits
-                   [ ]?                                          # optional space
-                (?P<sign>\+|-)                                   # +/-
-                (?P<hours>[0-9]{2}):?(?P<minutes>[0-9]{2})       # hh[:]mm
-            $)
-        ''', date_str)
+        r'^.{8,}?(?P<tz>Z$| ?(?P<sign>\+|-)(?P<hours>[0-9]{2}):?(?P<minutes>[0-9]{2})$)',
+        date_str)
     if not m:
-        m = re.search(r'\d{1,2}:\d{1,2}(?:\.\d+)?(?P<tz>\s*[A-Z]+)$', date_str)
-        timezone = TIMEZONE_NAMES.get(m and m.group('tz').strip())
-        if timezone is not None:
-            date_str = date_str[:-len(m.group('tz'))]
-        timezone = datetime.timedelta(hours=timezone or 0)
+        timezone = datetime.timedelta()
     else:
         date_str = date_str[:-len(m.group('tz'))]
         if not m.group('sign'):
@@ -3163,10 +2916,12 @@ def parse_iso8601(date_str, delimiter='T', timezone=None):
     if timezone is None:
         timezone, date_str = extract_timezone(date_str)
 
-    with compat_contextlib_suppress(ValueError):
+    try:
         date_format = '%Y-%m-%d{0}%H:%M:%S'.format(delimiter)
         dt = datetime.datetime.strptime(date_str, date_format) - timezone
         return calendar.timegm(dt.timetuple())
+    except ValueError:
+        pass
 
 
 def date_formats(day_first=True):
@@ -3186,13 +2941,17 @@ def unified_strdate(date_str, day_first=True):
     _, date_str = extract_timezone(date_str)
 
     for expression in date_formats(day_first):
-        with compat_contextlib_suppress(ValueError):
+        try:
             upload_date = datetime.datetime.strptime(date_str, expression).strftime('%Y%m%d')
+        except ValueError:
+            pass
     if upload_date is None:
         timetuple = email.utils.parsedate_tz(date_str)
         if timetuple:
-            with compat_contextlib_suppress(ValueError):
+            try:
                 upload_date = datetime.datetime(*timetuple[:6]).strftime('%Y%m%d')
+            except ValueError:
+                pass
     if upload_date is not None:
         return compat_str(upload_date)
 
@@ -3201,8 +2960,7 @@ def unified_timestamp(date_str, day_first=True):
     if date_str is None:
         return None
 
-    date_str = re.sub(r'\s+', ' ', re.sub(
-        r'(?i)[,|]|(mon|tues?|wed(nes)?|thu(rs)?|fri|sat(ur)?)(day)?', '', date_str))
+    date_str = re.sub(r'[,|]', '', date_str)
 
     pm_delta = 12 if re.search(r'(?i)PM', date_str) else 0
     timezone, date_str = extract_timezone(date_str)
@@ -3221,12 +2979,14 @@ def unified_timestamp(date_str, day_first=True):
         date_str = m.group(1)
 
     for expression in date_formats(day_first):
-        with compat_contextlib_suppress(ValueError):
+        try:
             dt = datetime.datetime.strptime(date_str, expression) - timezone + datetime.timedelta(hours=pm_delta)
             return calendar.timegm(dt.timetuple())
+        except ValueError:
+            pass
     timetuple = email.utils.parsedate_tz(date_str)
     if timetuple:
-        return calendar.timegm(timetuple) + pm_delta * 3600 - compat_datetime_timedelta_total_seconds(timezone)
+        return calendar.timegm(timetuple) + pm_delta * 3600
 
 
 def determine_ext(url, default_ext='unknown_video'):
@@ -3315,15 +3075,15 @@ class DateRange(object):
     def __str__(self):
         return '%s - %s' % (self.start.isoformat(), self.end.isoformat())
 
-    def __eq__(self, other):
-        return (isinstance(other, DateRange)
-                and self.start == other.start and self.end == other.end)
-
 
 def platform_name():
     """ Returns the platform name as a compat_str """
     res = platform.platform()
-    return _decode_compat_str(res)
+    if isinstance(res, bytes):
+        res = res.decode(preferredencoding())
+
+    assert isinstance(res, compat_str)
+    return res
 
 
 def _windows_write_string(s, out):
@@ -3404,7 +3164,7 @@ def _windows_write_string(s, out):
 def write_string(s, out=None, encoding=None):
     if out is None:
         out = sys.stderr
-    assert isinstance(s, compat_str)
+    assert type(s) == compat_str
 
     if sys.platform == 'win32' and encoding is None and hasattr(out, 'fileno'):
         if _windows_write_string(s, out):
@@ -3553,8 +3313,9 @@ def shell_quote(args):
     quoted_args = []
     encoding = get_filesystem_encoding()
     for a in args:
-        # We may get a filename encoded with 'encodeFilename'
-        a = _decode_compat_str(a, encoding)
+        if isinstance(a, bytes):
+            # We may get a filename encoded with 'encodeFilename'
+            a = a.decode(encoding)
         quoted_args.append(compat_shlex_quote(a))
     return ' '.join(quoted_args)
 
@@ -3718,9 +3479,8 @@ def parse_resolution(s):
 
 
 def parse_bitrate(s):
-    s = txt_or_none(s)
-    if not s:
-        return None
+    if not isinstance(s, compat_str):
+        return
     mobj = re.search(r'\b(\d+)\s*kbps', s)
     if mobj:
         return int(mobj.group(1))
@@ -3799,7 +3559,7 @@ def remove_quotes(s):
 
 
 def url_basename(url):
-    path = compat_urllib_parse.urlparse(url).path
+    path = compat_urlparse.urlparse(url).path
     return path.strip('/').split('/')[-1]
 
 
@@ -3808,17 +3568,18 @@ def base_url(url):
 
 
 def urljoin(base, path):
-    path = _decode_compat_str(path, encoding='utf-8', or_none=True)
-    if not path:
+    if isinstance(path, bytes):
+        path = path.decode('utf-8')
+    if not isinstance(path, compat_str) or not path:
         return None
     if re.match(r'^(?:[a-zA-Z][a-zA-Z0-9+-.]*:)?//', path):
         return path
-    base = _decode_compat_str(base, encoding='utf-8', or_none=True)
-    if not base:
+    if isinstance(base, bytes):
+        base = base.decode('utf-8')
+    if not isinstance(base, compat_str) or not re.match(
+            r'^(?:https?:)?//', base):
         return None
-    return (
-        re.match(r'^(?:https?:)?//', base)
-        and compat_urllib_parse.urljoin(base, path))
+    return compat_urlparse.urljoin(base, path)
 
 
 class HEADRequest(compat_urllib_request.Request):
@@ -3831,16 +3592,17 @@ class PUTRequest(compat_urllib_request.Request):
         return 'PUT'
 
 
-def int_or_none(v, scale=1, default=None, get_attr=None, invscale=1, base=None):
+def int_or_none(v, scale=1, default=None, get_attr=None, invscale=1):
     if get_attr:
         if v is not None:
             v = getattr(v, get_attr, None)
-    if v in (None, ''):
+    if v == '':
+        v = None
+    if v is None:
         return default
     try:
-        # like int, raise if base is specified and v is not a string
-        return (int(v) if base is None else int(v, base=base)) * invscale // scale
-    except (ValueError, TypeError, OverflowError):
+        return int(v) * invscale // scale
+    except (ValueError, TypeError):
         return default
 
 
@@ -3874,11 +3636,6 @@ def strip_or_none(v, default=None):
     return v.strip() if isinstance(v, compat_str) else default
 
 
-def txt_or_none(v, default=None):
-    """ Combine str/strip_or_none, disallow blank value (for traverse_obj) """
-    return default if v is None else (compat_str(v).strip() or default)
-
-
 def url_or_none(url):
     if not url or not isinstance(url, compat_str):
         return None
@@ -3944,30 +3701,26 @@ def parse_duration(s):
     return duration
 
 
-def _change_extension(prepend, filename, ext, expected_real_ext=None):
+def prepend_extension(filename, ext, expected_real_ext=None):
     name, real_ext = os.path.splitext(filename)
-    sanitize_extension = _UnsafeExtensionError.sanitize_extension
-
-    if not expected_real_ext or real_ext.partition('.')[0::2] == ('', expected_real_ext):
-        filename = name
-        if prepend and real_ext:
-            sanitize_extension(ext, prepend=prepend)
-            return ''.join((filename, '.', ext, real_ext))
-
-    # Mitigate path traversal and file impersonation attacks
-    return '.'.join((filename, sanitize_extension(ext)))
+    return (
+        '{0}.{1}{2}'.format(name, ext, real_ext)
+        if not expected_real_ext or real_ext[1:] == expected_real_ext
+        else '{0}.{1}'.format(filename, ext))
 
 
-prepend_extension = functools.partial(_change_extension, True)
-replace_extension = functools.partial(_change_extension, False)
+def replace_extension(filename, ext, expected_real_ext=None):
+    name, real_ext = os.path.splitext(filename)
+    return '{0}.{1}'.format(
+        name if not expected_real_ext or real_ext[1:] == expected_real_ext else filename,
+        ext)
 
 
 def check_executable(exe, args=[]):
     """ Checks if the given binary is installed somewhere in PATH, and returns its name.
     args can be a list of arguments for a short output (like -version) """
     try:
-        process_communicate_or_kill(subprocess.Popen(
-            [exe] + args, stdout=subprocess.PIPE, stderr=subprocess.PIPE))
+        subprocess.Popen([exe] + args, stdout=subprocess.PIPE, stderr=subprocess.PIPE).communicate()
     except OSError:
         return False
     return exe
@@ -3981,13 +3734,14 @@ def get_exe_version(exe, args=['--version'],
         # STDIN should be redirected too. On UNIX-like systems, ffmpeg triggers
         # SIGTTOU if youtube-dl is run in the background.
         # See https://github.com/ytdl-org/youtube-dl/issues/955#issuecomment-209789656
-        out, _ = process_communicate_or_kill(subprocess.Popen(
+        out, _ = subprocess.Popen(
             [encodeArgument(exe)] + args,
             stdin=subprocess.PIPE,
-            stdout=subprocess.PIPE, stderr=subprocess.STDOUT))
+            stdout=subprocess.PIPE, stderr=subprocess.STDOUT).communicate()
     except OSError:
         return False
-    out = _decode_compat_str(out, 'ascii', 'ignore')
+    if isinstance(out, bytes):  # Python 2.x
+        out = out.decode('ascii', 'ignore')
     return detect_exe_version(out, version_re, unrecognized)
 
 
@@ -4002,105 +3756,6 @@ def detect_exe_version(output, version_re=None, unrecognized='present'):
         return unrecognized
 
 
-class LazyList(compat_collections_abc.Iterable):
-    """Lazy immutable list from an iterable
-    Note that slices of a LazyList are lists and not LazyList"""
-
-    class IndexError(IndexError):
-        def __init__(self, cause=None):
-            if cause:
-                # reproduce `raise from`
-                self.__cause__ = cause
-            super(IndexError, self).__init__()
-
-    def __init__(self, iterable, **kwargs):
-        # kwarg-only
-        reverse = kwargs.get('reverse', False)
-        _cache = kwargs.get('_cache')
-
-        self._iterable = iter(iterable)
-        self._cache = [] if _cache is None else _cache
-        self._reversed = reverse
-
-    def __iter__(self):
-        if self._reversed:
-            # We need to consume the entire iterable to iterate in reverse
-            for item in self.exhaust():
-                yield item
-            return
-        for item in self._cache:
-            yield item
-        for item in self._iterable:
-            self._cache.append(item)
-            yield item
-
-    def _exhaust(self):
-        self._cache.extend(self._iterable)
-        self._iterable = []  # Discard the emptied iterable to make it pickle-able
-        return self._cache
-
-    def exhaust(self):
-        """Evaluate the entire iterable"""
-        return self._exhaust()[::-1 if self._reversed else 1]
-
-    @staticmethod
-    def _reverse_index(x):
-        return None if x is None else ~x
-
-    def __getitem__(self, idx):
-        if isinstance(idx, slice):
-            if self._reversed:
-                idx = slice(self._reverse_index(idx.start), self._reverse_index(idx.stop), -(idx.step or 1))
-            start, stop, step = idx.start, idx.stop, idx.step or 1
-        elif isinstance(idx, int):
-            if self._reversed:
-                idx = self._reverse_index(idx)
-            start, stop, step = idx, idx, 0
-        else:
-            raise TypeError('indices must be integers or slices')
-        if ((start or 0) < 0 or (stop or 0) < 0
-                or (start is None and step < 0)
-                or (stop is None and step > 0)):
-            # We need to consume the entire iterable to be able to slice from the end
-            # Obviously, never use this with infinite iterables
-            self._exhaust()
-            try:
-                return self._cache[idx]
-            except IndexError as e:
-                raise self.IndexError(e)
-        n = max(start or 0, stop or 0) - len(self._cache) + 1
-        if n > 0:
-            self._cache.extend(itertools.islice(self._iterable, n))
-        try:
-            return self._cache[idx]
-        except IndexError as e:
-            raise self.IndexError(e)
-
-    def __bool__(self):
-        try:
-            self[-1] if self._reversed else self[0]
-        except self.IndexError:
-            return False
-        return True
-
-    def __len__(self):
-        self._exhaust()
-        return len(self._cache)
-
-    def __reversed__(self):
-        return type(self)(self._iterable, reverse=not self._reversed, _cache=self._cache)
-
-    def __copy__(self):
-        return type(self)(self._iterable, reverse=self._reversed, _cache=self._cache)
-
-    def __repr__(self):
-        # repr and str should mimic a list. So we exhaust the iterable
-        return repr(self.exhaust())
-
-    def __str__(self):
-        return repr(self.exhaust())
-
-
 class PagedList(object):
     def __len__(self):
         # This is only useful for tests
@@ -4204,16 +3859,11 @@ def lowercase_escape(s):
         s)
 
 
-def escape_rfc3986(s, safe=None):
+def escape_rfc3986(s):
     """Escape non-ASCII characters as suggested by RFC 3986"""
-    if sys.version_info < (3, 0):
-        s = _encode_compat_str(s, 'utf-8')
-        if safe is not None:
-            safe = _encode_compat_str(safe, 'utf-8')
-    if safe is None:
-        safe = b"%/;:@&=+$,!~*'()?#[]"
-    # ensure unicode: after quoting, it can always be converted
-    return compat_str(compat_urllib_parse.quote(s, safe))
+    if sys.version_info < (3, 0) and isinstance(s, compat_str):
+        s = s.encode('utf-8')
+    return compat_urllib_parse.quote(s, b"%/;:@&=+$,!~*'()?#[]")
 
 
 def escape_url(url):
@@ -4228,13 +3878,10 @@ def escape_url(url):
     ).geturl()
 
 
-def parse_qs(url, **kwargs):
-    return compat_parse_qs(compat_urllib_parse.urlparse(url).query, **kwargs)
-
-
 def read_batch_urls(batch_fd):
     def fixup(url):
-        url = _decode_compat_str(url, 'utf-8', 'replace')
+        if not isinstance(url, compat_str):
+            url = url.decode('utf-8', 'replace')
         BOM_UTF8 = '\xef\xbb\xbf'
         if url.startswith(BOM_UTF8):
             url = url[len(BOM_UTF8):]
@@ -4251,38 +3898,28 @@ def urlencode_postdata(*args, **kargs):
     return compat_urllib_parse_urlencode(*args, **kargs).encode('ascii')
 
 
-def update_url(url, **kwargs):
-    """Replace URL components specified by kwargs
-       url: compat_str or parsed URL tuple
-       if query_update is in kwargs, update query with
-       its value instead of replacing (overrides any `query`)
-       NB: query_update expects parse_qs() format: [key: value_list, ...]
-       returns: compat_str
-    """
-    if not kwargs:
-        return compat_urllib_parse.urlunparse(url) if isinstance(url, tuple) else url
-    if not isinstance(url, tuple):
-        url = compat_urllib_parse.urlparse(url)
-    query = kwargs.pop('query_update', None)
-    if query:
-        qs = compat_parse_qs(url.query)
-        qs.update(query)
-        kwargs['query'] = compat_urllib_parse_urlencode(qs, True)
-        kwargs = compat_kwargs(kwargs)
-    return compat_urllib_parse.urlunparse(url._replace(**kwargs))
-
-
 def update_url_query(url, query):
-    return update_url(url, query_update=query)
+    if not query:
+        return url
+    parsed_url = compat_urlparse.urlparse(url)
+    qs = compat_parse_qs(parsed_url.query)
+    qs.update(query)
+    return compat_urlparse.urlunparse(parsed_url._replace(
+        query=compat_urllib_parse_urlencode(qs, True)))
 
 
 def update_Request(req, url=None, data=None, headers={}, query={}):
     req_headers = req.headers.copy()
     req_headers.update(headers)
-    req_data = data if data is not None else req.data
+    req_data = data or req.data
     req_url = update_url_query(url or req.get_full_url(), query)
-    req_type = {'HEAD': HEADRequest, 'PUT': PUTRequest}.get(
-        req.get_method(), compat_urllib_request.Request)
+    req_get_method = req.get_method()
+    if req_get_method == 'HEAD':
+        req_type = HEADRequest
+    elif req_get_method == 'PUT':
+        req_type = PUTRequest
+    else:
+        req_type = compat_urllib_request.Request
     new_req = req_type(
         req_url, data=req_data, headers=req_headers,
         origin_req_host=req.origin_req_host, unverifiable=req.unverifiable)
@@ -4297,8 +3934,10 @@ def _multipart_encode_impl(data, boundary):
     out = b''
     for k, v in data.items():
         out += b'--' + boundary.encode('ascii') + b'\r\n'
-        k = _encode_compat_str(k, 'utf-8')
-        v = _encode_compat_str(v, 'utf-8')
+        if isinstance(k, compat_str):
+            k = k.encode('utf-8')
+        if isinstance(v, compat_str):
+            v = v.encode('utf-8')
         # RFC 2047 requires non-ASCII field names to be encoded, while RFC 7578
         # suggests sending UTF-8 directly. Firefox sends UTF-8, too
         content = b'Content-Disposition: form-data; name="' + k + b'"\r\n\r\n' + v + b'\r\n'
@@ -4341,39 +3980,14 @@ def multipart_encode(data, boundary=None):
     return out, content_type
 
 
-def is_iterable_like(x, allowed_types=compat_collections_abc.Iterable, blocked_types=NO_DEFAULT):
-    if blocked_types is NO_DEFAULT:
-        blocked_types = (compat_str, bytes, compat_collections_abc.Mapping)
-    return isinstance(x, allowed_types) and not isinstance(x, blocked_types)
-
-
-def variadic(x, allowed_types=NO_DEFAULT):
-    if isinstance(allowed_types, compat_collections_abc.Iterable):
-        allowed_types = tuple(allowed_types)
-    return x if is_iterable_like(x, blocked_types=allowed_types) else (x,)
-
-
 def dict_get(d, key_or_keys, default=None, skip_false_values=True):
-    exp = (lambda x: x or None) if skip_false_values else IDENTITY
-    return traverse_obj(d, *variadic(key_or_keys), expected_type=exp,
-                        default=default, get_all=False)
-
-
-def try_call(*funcs, **kwargs):
-
-    # parameter defaults
-    expected_type = kwargs.get('expected_type')
-    fargs = kwargs.get('args', [])
-    fkwargs = kwargs.get('kwargs', {})
-
-    for f in funcs:
-        try:
-            val = f(*fargs, **fkwargs)
-        except (AttributeError, KeyError, TypeError, IndexError, ZeroDivisionError):
-            pass
-        else:
-            if expected_type is None or isinstance(val, expected_type):
-                return val
+    if isinstance(key_or_keys, (list, tuple)):
+        for key in key_or_keys:
+            if key not in d or d[key] is None or skip_false_values and not d[key]:
+                continue
+            return d[key]
+        return default
+    return d.get(key_or_keys, default)
 
 
 def try_get(src, getter, expected_type=None):
@@ -4389,67 +4003,22 @@ def try_get(src, getter, expected_type=None):
                 return v
 
 
-def filter_dict(dct, cndn=lambda _, v: v is not None):
-    # NB: don't use dict comprehension for python 2.6 compatibility
-    return dict((k, v) for k, v in dct.items() if cndn(k, v))
-
-
-def merge_dicts(*dicts, **kwargs):
-    """
-        Merge the `dict`s in `dicts` using the first valid value for each key.
-        Normally valid: not None and not an empty string
-
-        Keyword-only args:
-        unblank:    allow empty string if False (default True)
-        rev:        merge dicts in reverse order (default False)
-
-        merge_dicts(dct1, dct2, ..., unblank=False, rev=True)
-        matches {**dct1, **dct2, ...}
-
-        However, merge_dicts(dct1, dct2, ..., rev=True) may often be better.
-    """
-
-    unblank = kwargs.get('unblank', True)
-    rev = kwargs.get('rev', False)
-
-    if unblank:
-        def can_merge_str(k, v, to_dict):
-            return (isinstance(v, compat_str) and v
-                    and isinstance(to_dict[k], compat_str)
-                    and not to_dict[k])
-    else:
-        can_merge_str = lambda k, v, to_dict: False
-
+def merge_dicts(*dicts):
     merged = {}
-    for a_dict in reversed(dicts) if rev else dicts:
+    for a_dict in dicts:
         for k, v in a_dict.items():
             if v is None:
                 continue
-            if (k not in merged) or can_merge_str(k, v, merged):
+            if (k not in merged
+                    or (isinstance(v, compat_str) and v
+                        and isinstance(merged[k], compat_str)
+                        and not merged[k])):
                 merged[k] = v
     return merged
 
 
-# very poor choice of name, as if Python string encodings weren't confusing enough
-def encode_compat_str(s, encoding=preferredencoding(), errors='strict'):
-    assert isinstance(s, compat_basestring)
-    return s if isinstance(s, compat_str) else compat_str(s, encoding, errors)
-
-
-# what it could have been
-def _decode_compat_str(s, encoding=preferredencoding(), errors='strict', or_none=False):
-    if not or_none:
-        assert isinstance(s, compat_basestring)
-    return (
-        s if isinstance(s, compat_str)
-        else compat_str(s, encoding, errors) if isinstance(s, compat_basestring)
-        else None)
-
-
-# the real encode_compat_str, but only for internal use
-def _encode_compat_str(s, encoding=preferredencoding(), errors='strict'):
-    assert isinstance(s, compat_basestring)
-    return s.encode(encoding, errors) if isinstance(s, compat_str) else s
+def encode_compat_str(string, encoding=preferredencoding(), errors='strict'):
+    return string if isinstance(string, compat_str) else compat_str(string, encoding, errors)
 
 
 US_RATINGS = {
@@ -4472,10 +4041,8 @@ TV_PARENTAL_GUIDELINES = {
 
 
 def parse_age_limit(s):
-    if not isinstance(s, bool):
-        age = int_or_none(s)
-        if age is not None:
-            return age if 0 <= age <= 21 else None
+    if type(s) == int:
+        return s if 0 <= s <= 21 else None
     if not isinstance(s, compat_basestring):
         return None
     m = re.match(r'^(?P<age>\d{1,2})\+?$', s)
@@ -4499,108 +4066,46 @@ def strip_jsonp(code):
         r'\g<callback_data>', code)
 
 
-def js_to_json(code, *args, **kwargs):
-
-    # vars is a dict of (var, val) pairs to substitute
-    vars = args[0] if len(args) > 0 else kwargs.get('vars', {})
-    strict = kwargs.get('strict', False)
-
-    STRING_QUOTES = '\'"`'
-    STRING_RE = '|'.join(r'{0}(?:\\.|[^\\{0}])*{0}'.format(q) for q in STRING_QUOTES)
-    COMMENT_RE = r'/\*(?:(?!\*/).)*?\*/|//[^\n]*\n'
+def js_to_json(code):
+    COMMENT_RE = r'/\*(?:(?!\*/).)*?\*/|//[^\n]*'
     SKIP_RE = r'\s*(?:{comment})?\s*'.format(comment=COMMENT_RE)
     INTEGER_TABLE = (
         (r'(?s)^(0[xX][0-9a-fA-F]+){skip}:?$'.format(skip=SKIP_RE), 16),
         (r'(?s)^(0+[0-7]+){skip}:?$'.format(skip=SKIP_RE), 8),
-        (r'(?s)^(\d+){skip}:?$'.format(skip=SKIP_RE), 10),
     )
-    # compat candidate
-    JSONDecodeError = json.JSONDecodeError if 'JSONDecodeError' in dir(json) else ValueError
-
-    def process_escape(match):
-        JSON_PASSTHROUGH_ESCAPES = r'"\bfnrtu'
-        escape = match.group(1) or match.group(2)
-
-        return ('\\' + escape if escape in JSON_PASSTHROUGH_ESCAPES
-                else '\\u00' if escape == 'x'
-                else '' if escape == '\n'
-                else escape)
-
-    def template_substitute(match):
-        evaluated = js_to_json(match.group(1), vars, strict=strict)
-        if evaluated[0] == '"':
-            return json.loads(evaluated)
-        return evaluated
 
     def fix_kv(m):
         v = m.group(0)
         if v in ('true', 'false', 'null'):
             return v
-        elif v in ('undefined', 'void 0'):
-            return 'null'
-        elif v.startswith('/*') or v.startswith('//') or v == ',':
-            return ''
+        elif v.startswith('/*') or v.startswith('//') or v.startswith('!') or v == ',':
+            return ""
 
-        if v[0] in STRING_QUOTES:
-            v = re.sub(r'(?s)\${([^}]+)}', template_substitute, v[1:-1]) if v[0] == '`' else v[1:-1]
-            escaped = re.sub(r'(?s)(")|\\(.)', process_escape, v)
-            return '"{0}"'.format(escaped)
+        if v[0] in ("'", '"'):
+            v = re.sub(r'(?s)\\.|"', lambda m: {
+                '"': '\\"',
+                "\\'": "'",
+                '\\\n': '',
+                '\\x': '\\u00',
+            }.get(m.group(0), m.group(0)), v[1:-1])
+        else:
+            for regex, base in INTEGER_TABLE:
+                im = re.match(regex, v)
+                if im:
+                    i = int(im.group(1), base)
+                    return '"%d":' % i if v.endswith(':') else '%d' % i
 
-        inv = IDENTITY
-        im = re.split(r'^!+', v)
-        if len(im) > 1 and not im[-1].endswith(':'):
-            if (len(v) - len(im[1])) % 2 == 1:
-                inv = lambda x: 'true' if x == 0 else 'false'
-            else:
-                inv = lambda x: 'false' if x == 0 else 'true'
-        if not any(x for x in im):
-            return
-        v = im[-1]
-
-        for regex, base in INTEGER_TABLE:
-            im = re.match(regex, v)
-            if im:
-                i = int(im.group(1), base)
-                return ('"%s":' if v.endswith(':') else '%s') % inv(i)
-
-        if v in vars:
-            try:
-                if not strict:
-                    json.loads(vars[v])
-            except JSONDecodeError:
-                return inv(json.dumps(vars[v]))
-            else:
-                return inv(vars[v])
-
-        if not strict:
-            v = try_call(inv, args=(v,), default=v)
-            if v in ('true', 'false'):
-                return v
-            return '"{0}"'.format(v)
-
-        raise ValueError('Unknown value: ' + v)
-
-    def create_map(mobj):
-        return json.dumps(dict(json.loads(js_to_json(mobj.group(1) or '[]', vars=vars))))
-
-    code = re.sub(r'new Map\((\[.*?\])?\)', create_map, code)
-    if not strict:
-        code = re.sub(r'new Date\((".+")\)', r'\g<1>', code)
-        code = re.sub(r'new \w+\((.*?)\)', lambda m: json.dumps(m.group(0)), code)
-        code = re.sub(r'parseInt\([^\d]+(\d+)[^\d]+\)', r'\1', code)
-        code = re.sub(r'\(function\([^)]*\)\s*\{[^}]*\}\s*\)\s*\(\s*(["\'][^)]*["\'])\s*\)', r'\1', code)
+        return '"%s"' % v
 
     return re.sub(r'''(?sx)
-        {str_}|
-        {comment}|
-        ,(?={skip}[\]}}])|
-        void\s0|
-        !*(?:(?<!\d)[eE]|[a-df-zA-DF-Z_$])[.a-zA-Z_$0-9]*|
-        (?:\b|!+)0(?:[xX][\da-fA-F]+|[0-7]+)(?:{skip}:)?|
-        !+\d+(?:\.\d*)?(?:{skip}:)?|
-        [0-9]+(?:{skip}:)|
+        "(?:[^"\\]*(?:\\\\|\\['"nurtbfx/\n]))*[^"\\]*"|
+        '(?:[^'\\]*(?:\\\\|\\['"nurtbfx/\n]))*[^'\\]*'|
+        {comment}|,(?={skip}[\]}}])|
+        (?:(?<![0-9])[eE]|[a-df-zA-DF-Z_])[.a-zA-Z_0-9]*|
+        \b(?:0[xX][0-9a-fA-F]+|0+[0-7]+)(?:{skip}:)?|
+        [0-9]+(?={skip}:)|
         !+
-        '''.format(comment=COMMENT_RE, skip=SKIP_RE, str_=STRING_RE), fix_kv, code)
+        '''.format(comment=COMMENT_RE, skip=SKIP_RE), fix_kv, code)
 
 
 def qualities(quality_ids):
@@ -4652,7 +4157,12 @@ def args_to_str(args):
 
 
 def error_to_compat_str(err):
-    return _decode_compat_str(str(err))
+    err_str = str(err)
+    # On python 2 error byte string must be decoded with proper
+    # encoding rather than ascii
+    if sys.version_info[0] < 3:
+        err_str = err_str.decode(preferredencoding())
+    return err_str
 
 
 def mimetype2ext(mt):
@@ -5842,7 +5352,7 @@ class PerRequestProxyHandler(compat_urllib_request.ProxyHandler):
 
         if proxy == '__noproxy__':
             return None  # No Proxy
-        if compat_urllib_parse.urlparse(proxy).scheme.lower() in ('socks', 'socks4', 'socks4a', 'socks5'):
+        if compat_urlparse.urlparse(proxy).scheme.lower() in ('socks', 'socks4', 'socks4a', 'socks5'):
             req.add_header('Ytdl-socks-proxy', proxy)
             # youtube-dl's http/https handlers do wrapping the socket with socks
             return None
@@ -6166,7 +5676,7 @@ def write_xattr(path, key, value):
                         cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE, stdin=subprocess.PIPE)
                 except EnvironmentError as e:
                     raise XAttrMetadataError(e.errno, e.strerror)
-                stdout, stderr = process_communicate_or_kill(p)
+                stdout, stderr = p.communicate()
                 stderr = stderr.decode('utf-8', 'replace')
                 if p.returncode != 0:
                     raise XAttrMetadataError(p.returncode, stderr)
@@ -6213,509 +5723,3 @@ def clean_podcast_url(url):
                 st\.fm # https://podsights.com/docs/
             )/e
         )/''', '', url)
-
-
-if __debug__:
-    # Raise TypeError if args can't be bound
-    # needs compat owing to unstable inspect API, thanks PSF :-(
-    try:
-        inspect.signature
-
-        def _try_bind_args(fn, *args, **kwargs):
-            inspect.signature(fn).bind(*args, **kwargs)
-    except AttributeError:
-        # Py < 3.3
-        def _try_bind_args(fn, *args, **kwargs):
-            fn_args = inspect.getargspec(fn)
-            # Py2: ArgInfo(args, varargs, keywords, defaults)
-            # Py3: ArgSpec(args, varargs, keywords, defaults)
-            if not fn_args.keywords:
-                for k in kwargs:
-                    if k not in (fn_args.args or []):
-                        raise TypeError("got an unexpected keyword argument: '{0}'".format(k))
-            if not fn_args.varargs:
-                args_to_bind = len(args)
-                bindable = len(fn_args.args or [])
-                if args_to_bind > bindable:
-                    raise TypeError('too many positional arguments')
-                bindable -= len(fn_args.defaults or [])
-                if args_to_bind < bindable:
-                    if kwargs:
-                        bindable -= len(set(fn_args.args or []) & set(kwargs))
-                    if bindable > args_to_bind:
-                        raise TypeError("missing a required argument: '{0}'".format(fn_args.args[args_to_bind]))
-
-
-def traverse_obj(obj, *paths, **kwargs):
-    """
-    Safely traverse nested `dict`s and `Iterable`s, etc
-
-    >>> obj = [{}, {"key": "value"}]
-    >>> traverse_obj(obj, (1, "key"))
-    'value'
-
-    Each of the provided `paths` is tested and the first producing a valid result will be returned.
-    The next path will also be tested if the path branched but no results could be found.
-    Supported values for traversal are `Mapping`, `Iterable`, `re.Match`, `xml.etree.ElementTree`
-    (xpath) and `http.cookies.Morsel`.
-    Unhelpful values (`{}`, `None`) are treated as the absence of a value and discarded.
-
-    The paths will be wrapped in `variadic`, so that `'key'` is conveniently the same as `('key', )`.
-
-    The keys in the path can be one of:
-        - `None`:           Return the current object.
-        - `set`:            Requires the only item in the set to be a type or function,
-                            like `{type}`/`{type, type, ...}`/`{func}`. If one or more `type`s,
-                            return only values that have one of the types. If a function,
-                            return `func(obj)`.
-        - `str`/`int`:      Return `obj[key]`. For `re.Match`, return `obj.group(key)`.
-        - `slice`:          Branch out and return all values in `obj[key]`.
-        - `Ellipsis`:       Branch out and return a list of all values.
-        - `tuple`/`list`:   Branch out and return a list of all matching values.
-                            Read as: `[traverse_obj(obj, branch) for branch in branches]`.
-        - `function`:       Branch out and return values filtered by the function.
-                            Read as: `[value for key, value in obj if function(key, value)]`.
-                            For `Sequence`s, `key` is the index of the value.
-                            For `Iterable`s, `key` is the enumeration count of the value.
-                            For `re.Match`es, `key` is the group number (0 = full match)
-                            as well as additionally any group names, if given.
-        - `dict`:           Transform the current object and return a matching dict.
-                            Read as: `{key: traverse_obj(obj, path) for key, path in dct.items()}`.
-        - `any`-builtin:    Take the first matching object and return it, resetting branching.
-        - `all`-builtin:    Take all matching objects and return them as a list, resetting branching.
-
-        `tuple`, `list`, and `dict` all support nested paths and branches.
-
-    @params paths           Paths which to traverse by.
-    Keyword arguments:
-    @param default          Value to return if the paths do not match.
-                            If the last key in the path is a `dict`, it will apply to each value inside
-                            the dict instead, depth first. Try to avoid if using nested `dict` keys.
-    @param expected_type    If a `type`, only accept final values of this type.
-                            If any other callable, try to call the function on each result.
-                            If the last key in the path is a `dict`, it will apply to each value inside
-                            the dict instead, recursively. This does respect branching paths.
-    @param get_all          If `False`, return the first matching result, otherwise all matching ones.
-    @param casesense        If `False`, consider string dictionary keys as case insensitive.
-
-    The following is only meant to be used by YoutubeDL.prepare_outtmpl and is not part of the API
-
-    @param _traverse_string  Whether to traverse into objects as strings.
-                            If `True`, any non-compatible object will first be
-                            converted into a string and then traversed into.
-                            The return value of that path will be a string instead,
-                            not respecting any further branching.
-
-
-    @returns                The result of the object traversal.
-                            If successful, `get_all=True`, and the path branches at least once,
-                            then a list of results is returned instead.
-                            A list is always returned if the last path branches and no `default` is given.
-                            If a path ends on a `dict` that result will always be a `dict`.
-    """
-
-    # parameter defaults
-    default = kwargs.get('default', NO_DEFAULT)
-    expected_type = kwargs.get('expected_type')
-    get_all = kwargs.get('get_all', True)
-    casesense = kwargs.get('casesense', True)
-    _traverse_string = kwargs.get('_traverse_string', False)
-
-    # instant compat
-    str = compat_str
-
-    casefold = lambda k: compat_casefold(k) if isinstance(k, str) else k
-
-    if isinstance(expected_type, type):
-        type_test = lambda val: val if isinstance(val, expected_type) else None
-    else:
-        type_test = lambda val: try_call(expected_type or IDENTITY, args=(val,))
-
-    def lookup_or_none(v, k, getter=None):
-        with compat_contextlib_suppress(LookupError):
-            return getter(v, k) if getter else v[k]
-
-    def from_iterable(iterables):
-        # chain.from_iterable(['ABC', 'DEF']) --> A B C D E F
-        for it in iterables:
-            for item in it:
-                yield item
-
-    def apply_key(key, obj, is_last):
-        branching = False
-
-        if obj is None and _traverse_string:
-            if key is Ellipsis or callable(key) or isinstance(key, slice):
-                branching = True
-                result = ()
-            else:
-                result = None
-
-        elif key is None:
-            result = obj
-
-        elif isinstance(key, set):
-            assert len(key) >= 1, 'At least one item is required in a `set` key'
-            if all(isinstance(item, type) for item in key):
-                result = obj if isinstance(obj, tuple(key)) else None
-            else:
-                item = next(iter(key))
-                assert len(key) == 1, 'Multiple items in a `set` key must all be types'
-                result = try_call(item, args=(obj,)) if not isinstance(item, type) else None
-
-        elif isinstance(key, (list, tuple)):
-            branching = True
-            result = from_iterable(
-                apply_path(obj, branch, is_last)[0] for branch in key)
-
-        elif key is Ellipsis:
-            branching = True
-            if isinstance(obj, compat_http_cookies.Morsel):
-                obj = dict(obj, key=obj.key, value=obj.value)
-            if isinstance(obj, compat_collections_abc.Mapping):
-                result = obj.values()
-            elif is_iterable_like(obj, (compat_collections_abc.Iterable, compat_etree_Element)):
-                result = obj
-            elif isinstance(obj, compat_re_Match):
-                result = obj.groups()
-            elif _traverse_string:
-                branching = False
-                result = str(obj)
-            else:
-                result = ()
-
-        elif callable(key):
-            branching = True
-            if isinstance(obj, compat_http_cookies.Morsel):
-                obj = dict(obj, key=obj.key, value=obj.value)
-            if isinstance(obj, compat_collections_abc.Mapping):
-                iter_obj = obj.items()
-            elif is_iterable_like(obj, (compat_collections_abc.Iterable, compat_etree_Element)):
-                iter_obj = enumerate(obj)
-            elif isinstance(obj, compat_re_Match):
-                iter_obj = itertools.chain(
-                    enumerate(itertools.chain((obj.group(),), obj.groups())),
-                    obj.groupdict().items())
-            elif _traverse_string:
-                branching = False
-                iter_obj = enumerate(str(obj))
-            else:
-                iter_obj = ()
-
-            result = (v for k, v in iter_obj if try_call(key, args=(k, v)))
-            if not branching:  # string traversal
-                result = ''.join(result)
-
-        elif isinstance(key, dict):
-            iter_obj = ((k, _traverse_obj(obj, v, False, is_last)) for k, v in key.items())
-            result = dict((k, v if v is not None else default) for k, v in iter_obj
-                          if v is not None or default is not NO_DEFAULT) or None
-
-        elif isinstance(obj, compat_collections_abc.Mapping):
-            if isinstance(obj, compat_http_cookies.Morsel):
-                obj = dict(obj, key=obj.key, value=obj.value)
-            result = (try_call(obj.get, args=(key,))
-                      if casesense or try_call(obj.__contains__, args=(key,))
-                      else next((v for k, v in obj.items() if casefold(k) == key), None))
-
-        elif isinstance(obj, compat_re_Match):
-            result = None
-            if isinstance(key, int) or casesense:
-                # Py 2.6 doesn't have methods in the Match class/type
-                result = lookup_or_none(obj, key, getter=lambda _, k: obj.group(k))
-
-            elif isinstance(key, str):
-                result = next((v for k, v in obj.groupdict().items()
-                              if casefold(k) == key), None)
-
-        else:
-            result = None
-            if isinstance(key, (int, slice)):
-                if is_iterable_like(obj, (compat_collections_abc.Sequence, compat_etree_Element)):
-                    branching = isinstance(key, slice)
-                    result = lookup_or_none(obj, key)
-                elif _traverse_string:
-                    result = lookup_or_none(str(obj), key)
-
-            elif isinstance(obj, compat_etree_Element) and isinstance(key, str):
-                xpath, _, special = key.rpartition('/')
-                if not special.startswith('@') and not special.endswith('()'):
-                    xpath = key
-                    special = None
-
-                # Allow abbreviations of relative paths, absolute paths error
-                if xpath.startswith('/'):
-                    xpath = '.' + xpath
-                elif xpath and not xpath.startswith('./'):
-                    xpath = './' + xpath
-
-                def apply_specials(element):
-                    if special is None:
-                        return element
-                    if special == '@':
-                        return element.attrib
-                    if special.startswith('@'):
-                        return try_call(element.attrib.get, args=(special[1:],))
-                    if special == 'text()':
-                        return element.text
-                    raise SyntaxError('apply_specials is missing case for {0!r}'.format(special))
-
-                if xpath:
-                    result = list(map(apply_specials, compat_etree_iterfind(obj, xpath)))
-                else:
-                    result = apply_specials(obj)
-
-        return branching, result if branching else (result,)
-
-    def lazy_last(iterable):
-        iterator = iter(iterable)
-        prev = next(iterator, NO_DEFAULT)
-        if prev is NO_DEFAULT:
-            return
-
-        for item in iterator:
-            yield False, prev
-            prev = item
-
-        yield True, prev
-
-    def apply_path(start_obj, path, test_type):
-        objs = (start_obj,)
-        has_branched = False
-
-        key = None
-        for last, key in lazy_last(variadic(path, (str, bytes, dict, set))):
-            if not casesense and isinstance(key, str):
-                key = compat_casefold(key)
-
-            if key in (any, all):
-                has_branched = False
-                filtered_objs = (obj for obj in objs if obj not in (None, {}))
-                if key is any:
-                    objs = (next(filtered_objs, None),)
-                else:
-                    objs = (list(filtered_objs),)
-                continue
-
-            if __debug__ and callable(key):
-                # Verify function signature
-                _try_bind_args(key, None, None)
-
-            new_objs = []
-            for obj in objs:
-                branching, results = apply_key(key, obj, last)
-                has_branched |= branching
-                new_objs.append(results)
-
-            objs = from_iterable(new_objs)
-
-        if test_type and not isinstance(key, (dict, list, tuple)):
-            objs = map(type_test, objs)
-
-        return objs, has_branched, isinstance(key, dict)
-
-    def _traverse_obj(obj, path, allow_empty, test_type):
-        results, has_branched, is_dict = apply_path(obj, path, test_type)
-        results = LazyList(x for x in results if x not in (None, {}))
-
-        if get_all and has_branched:
-            if results:
-                return results.exhaust()
-            if allow_empty:
-                return [] if default is NO_DEFAULT else default
-            return None
-
-        return results[0] if results else {} if allow_empty and is_dict else None
-
-    for index, path in enumerate(paths, 1):
-        result = _traverse_obj(obj, path, index == len(paths), True)
-        if result is not None:
-            return result
-
-    return None if default is NO_DEFAULT else default
-
-
-def T(*x):
-    """ For use in yt-dl instead of {type, ...} or set((type, ...)) """
-    return set(x)
-
-
-def get_first(obj, keys, **kwargs):
-    return traverse_obj(obj, (Ellipsis,) + tuple(variadic(keys)), get_all=False, **kwargs)
-
-
-def join_nonempty(*values, **kwargs):
-
-    # parameter defaults
-    delim = kwargs.get('delim', '-')
-    from_dict = kwargs.get('from_dict')
-
-    if from_dict is not None:
-        values = (traverse_obj(from_dict, variadic(v)) for v in values)
-    return delim.join(map(compat_str, filter(None, values)))
-
-
-class Namespace(object):
-    """Immutable namespace"""
-
-    def __init__(self, **kw_attr):
-        self.__dict__.update(kw_attr)
-
-    def __iter__(self):
-        return iter(self.__dict__.values())
-
-    @property
-    def items_(self):
-        return self.__dict__.items()
-
-
-MEDIA_EXTENSIONS = Namespace(
-    common_video=('avi', 'flv', 'mkv', 'mov', 'mp4', 'webm'),
-    video=('3g2', '3gp', 'f4v', 'mk3d', 'divx', 'mpg', 'ogv', 'm4v', 'wmv'),
-    common_audio=('aiff', 'alac', 'flac', 'm4a', 'mka', 'mp3', 'ogg', 'opus', 'wav'),
-    audio=('aac', 'ape', 'asf', 'f4a', 'f4b', 'm4b', 'm4p', 'm4r', 'oga', 'ogx', 'spx', 'vorbis', 'wma', 'weba'),
-    thumbnails=('jpg', 'png', 'webp'),
-    # storyboards=('mhtml', ),
-    subtitles=('srt', 'vtt', 'ass', 'lrc', 'ttml'),
-    manifests=('f4f', 'f4m', 'm3u8', 'smil', 'mpd'),
-)
-MEDIA_EXTENSIONS.video = MEDIA_EXTENSIONS.common_video + MEDIA_EXTENSIONS.video
-MEDIA_EXTENSIONS.audio = MEDIA_EXTENSIONS.common_audio + MEDIA_EXTENSIONS.audio
-
-KNOWN_EXTENSIONS = (
-    MEDIA_EXTENSIONS.video + MEDIA_EXTENSIONS.audio
-    + MEDIA_EXTENSIONS.manifests
-)
-
-
-class _UnsafeExtensionError(Exception):
-    """
-    Mitigation exception for unwanted file overwrite/path traversal
-
-    Ref: https://github.com/yt-dlp/yt-dlp/security/advisories/GHSA-79w7-vh3h-8g4j
-    """
-    _ALLOWED_EXTENSIONS = frozenset(itertools.chain(
-        (   # internal
-            'description',
-            'json',
-            'meta',
-            'orig',
-            'part',
-            'temp',
-            'uncut',
-            'unknown_video',
-            'ytdl',
-        ),
-        # video
-        MEDIA_EXTENSIONS.video, (
-            'asx',
-            'ismv',
-            'm2t',
-            'm2ts',
-            'm2v',
-            'm4s',
-            'mng',
-            'mp2v',
-            'mp4v',
-            'mpe',
-            'mpeg',
-            'mpeg1',
-            'mpeg2',
-            'mpeg4',
-            'mxf',
-            'ogm',
-            'qt',
-            'rm',
-            'swf',
-            'ts',
-            'vob',
-            'vp9',
-        ),
-        # audio
-        MEDIA_EXTENSIONS.audio, (
-            '3ga',
-            'ac3',
-            'adts',
-            'aif',
-            'au',
-            'dts',
-            'isma',
-            'it',
-            'mid',
-            'mod',
-            'mpga',
-            'mp1',
-            'mp2',
-            'mp4a',
-            'mpa',
-            'ra',
-            'shn',
-            'xm',
-        ),
-        # image
-        MEDIA_EXTENSIONS.thumbnails, (
-            'avif',
-            'bmp',
-            'gif',
-            'ico',
-            'heic',
-            'jng',
-            'jpeg',
-            'jxl',
-            'svg',
-            'tif',
-            'tiff',
-            'wbmp',
-        ),
-        # subtitle
-        MEDIA_EXTENSIONS.subtitles, (
-            'dfxp',
-            'fs',
-            'ismt',
-            'json3',
-            'sami',
-            'scc',
-            'srv1',
-            'srv2',
-            'srv3',
-            'ssa',
-            'tt',
-            'xml',
-        ),
-        # others
-        MEDIA_EXTENSIONS.manifests,
-        (
-            # not used in yt-dl
-            # *MEDIA_EXTENSIONS.storyboards,
-            # 'desktop',
-            # 'ism',
-            # 'm3u',
-            # 'sbv',
-            # 'swp',
-            # 'url',
-            # 'webloc',
-        )))
-
-    def __init__(self, extension):
-        super(_UnsafeExtensionError, self).__init__('unsafe file extension: {0!r}'.format(extension))
-        self.extension = extension
-
-    # support --no-check-extensions
-    lenient = False
-
-    @classmethod
-    def sanitize_extension(cls, extension, **kwargs):
-        # ... /, *, prepend=False
-        prepend = kwargs.get('prepend', False)
-
-        if '/' in extension or '\\' in extension:
-            raise cls(extension)
-
-        if not prepend:
-            last = extension.rpartition('.')[-1]
-            if last == 'bin':
-                extension = last = 'unknown_video'
-            if not (cls.lenient or last.lower() in cls._ALLOWED_EXTENSIONS):
-                raise cls(extension)
-
-        return extension
diff --git a/youtube_dl/version.py b/youtube_dl/version.py
index c70d9d2af..a6b1b8dce 100644
--- a/youtube_dl/version.py
+++ b/youtube_dl/version.py
@@ -1,3 +1,3 @@
 from __future__ import unicode_literals
 
-__version__ = '2025.04.07'
+__version__ = '2021.04.07'