shaka-player 3.2.8 → 3.2.11

package/.github/workflows/build-and-test.yaml

@@ -38,23 +38,34 @@ jobs:
     needs: lint
     strategy:
       matrix:
-        os: ["ubuntu-latest", "macos-latest", "windows-latest"]
-        browser: ["Chrome", "Firefox", "Edge", "Safari", "Safari-14"]
-        exclude:
-          - os: ubuntu-latest
-            browser: Edge
-          - os: windows-latest
-            browser: Safari
-          - os: windows-latest
-            browser: Safari-14
-          - os: ubuntu-latest
-            browser: Safari
-          - os: ubuntu-latest
-            browser: Safari-14
         include:
           # Run Linux browsers with xvfb, so they're in a headless X session.
+          # Additionally, generate a code coverage report from Linux Chrome.
+          - os: ubuntu-latest
+            browser: Chrome
+            extra_flags: "--use-xvfb --html-coverage-report"
           - os: ubuntu-latest
+            browser: Firefox
             extra_flags: "--use-xvfb"
+
+          - os: macos-latest
+            browser: Chrome
+          - os: macos-latest
+            browser: Firefox
+          - os: macos-latest
+            browser: Edge
+          - os: macos-latest
+            browser: Safari
+          - os: macos-latest
+            browser: Safari-14
+
+          - os: windows-latest
+            browser: Chrome
+          - os: windows-latest
+            browser: Firefox
+          - os: windows-latest
+            browser: Edge
+
       # Disable fail-fast so that one matrix-job failing doesn't make the other
       # ones end early.
       fail-fast: false
@@ -86,10 +97,11 @@ jobs:
         run: |
           # Download Safari 14
           # See also https://www.macupdate.com/app/mac/15675/apple-safari/old-versions
-          curl -Lv https://www.macupdate.com/action/download/63550 > safari-14.1.2.pkg
+          curl -Lv https://www.macupdate.com/action/download/62946 > Safari14.0CatalinaAuto.pkg.zip
 
           # Install Safari 14 to homedir specifically.
-          installer -pkg safari-14.1.2.pkg -target CurrentUserHomeDirectory
+          unzip Safari14.0CatalinaAuto.pkg.zip
+          installer -pkg Safari14.0CatalinaAuto.pkg -target CurrentUserHomeDirectory
 
           # Install a launcher that can execute a shell script to launch this
           npm install karma-script-launcher --save-dev
@@ -113,6 +125,46 @@ jobs:
             --reporters spec --spec-hide-passed \
             ${{ matrix.extra_flags }}
 
+      - name: Find coverage reports
+        id: coverage
+        if: always() # Even on failure of an earlier step.
+        shell: bash
+        run: |
+          # If the "coverage" directory exists...
+          if [ -d coverage ]; then
+            # Find the path to the coverage output folder.  It includes the
+            # exact browser version in the path, so it will vary.
+            coverage_folder="$( (ls -d coverage/* || true) | head -1 )"
+
+            # Build a folder to stage all the coverage artifacts with
+            # predictable paths.  The resulting zip file will not have any
+            # internal directories.
+            mkdir coverage/staging/
+            cp "$coverage_folder"/coverage.json coverage/staging/
+            cp "$coverage_folder"/coverage-details.json coverage/staging/
+            echo "${{ github.event.number }}" > coverage/staging/pr-number.json
+
+            echo "::set-output name=coverage_found::true"
+            echo "Coverage report staged."
+          else
+            echo "No coverage report generated."
+          fi
+
+      - name: Upload coverage reports
+        uses: actions/upload-artifact@v3
+        if: ${{ always() && steps.coverage.outputs.coverage_found }}
+        with:
+          name: coverage
+          # This will create a download called coverage.zip containing all of
+          # these files, with no internal folders.
+          path: |
+            coverage/staging/coverage.json
+            coverage/staging/coverage-details.json
+            coverage/staging/pr-number.json
+          # Since we've already filtered this step for instances where there is
+          # an environment variable set, the file should definitely be there.
+          if-no-files-found: error
+
   build_in_docker:
     # Don't waste time doing a full matrix of test runs when there was an
     # obvious linter error.

package/.github/workflows/compute-incremental-coverage.py

@@ -0,0 +1,251 @@
+#!/usr/bin/env python3
+#
+# Copyright 2022 Google LLC
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+import argparse
+import io
+import json
+import re
+import subprocess
+import zipfile
+
+# TODO(joeyparrish): Figure out how to get karma to output relative paths only.
+def StripGitDir(path):
+  # Strip the path to the git clone, leaving only the source path within the
+  # repo.
+  return re.sub(r'.*?/(lib|ui)/', r'\1/', path)
+
+def RunCommand(args, text=True):
+  proc = subprocess.run(args, capture_output=True, text=text)
+  if proc.returncode != 0:
+    raise RuntimeError("Command failed:", args, proc.stdout, proc.stderr)
+  return proc.stdout
+
+def GitHubApi(repo, path, text=True):
+  args = ["gh", "api", "/repos/%s/%s" % (repo, path)]
+  output = RunCommand(args, text)
+  if text:
+    return json.loads(output)
+  else:
+    return output
+
+def GetCoverageArtifacts(repo, run_id):
+  # Fetch all artifacts from this run ID.
+  api_path = "actions/runs/%s/artifacts" % run_id
+  results = GitHubApi(repo, api_path)["artifacts"]
+  # Get the one that is named "coverage" (should be the only one).
+  artifact = list(filter(lambda x: x["name"] == "coverage", results))[0]
+
+  # Fetch and open the zip file containing the artifacts.
+  api_path = "actions/artifacts/%s/zip" % artifact["id"]
+  zip_data = GitHubApi(repo, api_path, text=False)
+  return zipfile.ZipFile(io.BytesIO(zip_data), 'r')
+
+def CoverageLines(coverage_range):
+  start_line = coverage_range["start"]["line"]
+  end_line = coverage_range["end"]["line"]
+
+  lines = set()
+  for line in range(start_line, end_line + 1):
+    lines.add(line)
+  return lines
+
+class CoverageDetails(object):
+  def __init__(self, file_data):
+    json_data = json.loads(file_data)
+
+    self.files = {}
+
+    # The structure is something like:
+    # {
+    #   "/path/to/lib/player.js": {
+    #     "statementMap": { ... },
+    #     "fnMap": { ... },
+    #     "s": { ... }
+    #   }
+    # }
+    for path, path_data in json_data.items():
+      path = StripGitDir(path)
+
+      statement_to_lines = {}
+      instrumented_lines = set()
+
+      # The function map is a structure to map where each function is in a
+      # source file:
+      # {
+      #   "0": {
+      #     "loc": {
+      #       "start": {
+      #         "line": 7,
+      #         "column": 0
+      #       },
+      #       "end": {
+      #         "line": 8,
+      #         "column": 29
+      #       }
+      #     }
+      #   },
+      #   ...
+      # }
+      # We extract function locations and remove them from statement spans
+      # below, so that we don't count (for example) class declaration statements
+      # as containing all the lines of every method in the class.
+      function_locations = []
+      for key, value in path_data["fnMap"].items():
+        lines = CoverageLines(value["loc"])
+        function_locations.append(lines)
+
+      # The statement map is a structure to map where each statement is in a
+      # source file:
+      # {
+      #   "0": {
+      #     "start": {
+      #       "line": 7,
+      #       "column": 0
+      #     },
+      #     "end": {
+      #       "line": 8,
+      #       "column": 29
+      #     }
+      #   },
+      #   ...
+      # }
+      for key, value in path_data["statementMap"].items():
+        # All the lines of the statement, which may include other functions or
+        # statements.
+        lines = CoverageLines(value)
+
+        # Subtract from that the lines of any function that is a subset of
+        # these lines.  By excluding entire methods before adding back their
+        # child statements, we exclude empty lines in class methods.
+        for function_lines in function_locations:
+          if function_lines < lines:  # strict subset
+            lines -= function_lines  # set subtraction
+
+        # If this statement is inside the range of another statement, remove
+        # this inner range from that outer one.  This is important because loops
+        # and conditional statements contain their inner branches.
+        for older_key, older_lines in statement_to_lines.items():
+          # Check for a proper subset (lines contains all elements of
+          # child_lines, but child_lines is not an equal set).
+          if lines < older_lines:  # strict subset
+            statement_to_lines[older_key] -= lines  # set subtraction
+
+        statement_to_lines[key] = lines
+
+      # Whatever is left in any statement, we count as instrumented.
+      for key, lines in statement_to_lines.items():
+        for line in lines:
+          instrumented_lines.add(line)
+
+      # The "s" field is a map from statement numbers to number of times
+      # executed.
+      executed_lines = set()
+      for key, executed in path_data["s"].items():
+        if executed:
+          for line in statement_to_lines[key]:
+            executed_lines.add(line)
+
+      self.files[path] = {
+        "instrumented": instrumented_lines,
+        "executed": executed_lines,
+      }
+
+class PullRequest(object):
+  def __init__(self, repo, number):
+    data = GitHubApi(repo, "pulls/%d" % number)
+    sha = data["merge_commit_sha"]
+
+    self.number = number
+    self.changes = {}
+
+    files = GitHubApi(repo, "commits/%s" % sha)["files"]
+
+    for file_data in files:
+      # The patch field is missing for binary files.  Skip those.
+      if "patch" not in file_data:
+        continue
+
+      filename = file_data["filename"]
+      patch = file_data["patch"]
+
+      # Parse through the unified diff in "patch" to find the touched line
+      # numbers.
+      touched_lines = []
+      line_number = None
+      for line in patch.split("\n"):
+        if line[0] == "@":
+          # Turns a header like "@@ -749,7 +757,19 @@ foo" into line number 757.
+          # Note that the last part of the new file range could be omitted:
+          # "@@ -0,0 +1 @@ foo"
+          new_file_range = line.split("+")[1].split(" @@")[0]
+          line_number = int(new_file_range.split(",")[0])
+        elif line[0] == " ":
+          line_number += 1
+        elif line[0] == "+":
+          touched_lines.append(line_number)
+          line_number += 1
+
+      self.changes[filename] = touched_lines
+
+def IncrementalCoverage(pr, coverage_details):
+  num_changed = 0
+  num_covered = 0
+
+  for path in pr.changes:
+    if path in coverage_details.files:
+      changed_lines = pr.changes[path]
+      instrumented_lines = coverage_details.files[path]["instrumented"]
+      executed_lines = coverage_details.files[path]["executed"]
+
+      for line in changed_lines:
+        # Only count the instrumented lines, not whitespace or comments.
+        if line in instrumented_lines:
+          num_changed += 1
+          if line in executed_lines:
+            num_covered += 1
+
+  if num_changed == 0:
+    return None
+  return num_covered / num_changed
+
+def main():
+  parser = argparse.ArgumentParser(
+      description="Compute incremental code coverage for a PR",
+      formatter_class=argparse.ArgumentDefaultsHelpFormatter)
+  parser.add_argument(
+      "--repo",
+      required=True,
+      help="The GitHub repo, such as shaka-project/shaka-player")
+  parser.add_argument(
+      "--run-id",
+      required=True,
+      help="The workflow run ID to download coverage data from")
+  args = parser.parse_args()
+
+  artifacts = GetCoverageArtifacts(args.repo, args.run_id)
+  coverage_details = CoverageDetails(artifacts.read("coverage-details.json"))
+  pr_number = json.loads(artifacts.read("pr-number.json"))
+  pr = PullRequest(args.repo, pr_number)
+  coverage = IncrementalCoverage(pr, coverage_details)
+
+  print("::set-output name=pr_number::%d" % pr_number)
+  if coverage is None:
+    print("::set-output name=coverage::No instrumented code was changed.")
+  else:
+    print("::set-output name=coverage::%.2f%%" % (coverage * 100.0))
+
+if __name__ == "__main__":
+  main()

package/.github/workflows/report-incremental-coverage.yaml

@@ -0,0 +1,39 @@
+name: Report Incremental Coverage
+
+# Runs when the build and test workflow completes.  This will run with full
+# privileges, even if the other workflow doesn't.  That allows us to leave PR
+# comments, when we would not be able to do so otherwise.
+on:
+  workflow_run:
+    workflows: [Build and Test PR]
+    types: [completed]
+
+jobs:
+  report:
+    if: ${{ github.event.workflow_run.event == 'pull_request' }}
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v2
+
+      - name: Compute incremental code coverage
+        id: compute
+        shell: bash
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        # Fetches the coverage data from the run that triggered the report,
+        # parses it, compares it to the changed lines in the PR, and computes
+        # the incremental code coverage.
+        run: |
+          python .github/workflows/compute-incremental-coverage.py \
+              --repo ${{ github.repository }} \
+              --run-id ${{ github.event.workflow_run.id }}
+
+      - name: Report incremental code coverage
+        uses: thollander/actions-comment-pull-request@686ab1cab89e0f715a44a0d04b9fdfdd4f33d751
+        with:
+          message: "Incremental code coverage: ${{ steps.compute.outputs.coverage }}"
+          comment_includes: "Incremental code coverage: "
+          pr_number: ${{ steps.compute.outputs.pr_number }}
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

package/.github/workflows/selenium-lab-tests.yaml

@@ -80,7 +80,50 @@ jobs:
               --hostname karma.shakalab.rocks \
               --port 61731 \
               --grid-config build/shaka-lab.yaml \
-              --grid-address selenium-grid.lab:4444
+              --grid-address selenium-grid.lab:4444 \
+              --html-coverage-report
+
+      - name: Find coverage report
+        id: coverage
+        if: always() # Even on failure of an earlier step.
+        shell: bash
+        run: |
+          # If the directory exists...
+          if [ -d coverage ]; then
+            # Find the path to the coverage report specifically for Chrome on
+            # Linux.  It includes the exact browser version in the path, so it
+            # will vary.  Having a single path will make the artifact zip
+            # simpler, whereas using a wildcard in the upload step will result
+            # in a zip file with internal directories.
+            coverage_report="$( (ls coverage/Chrome*Linux*/coverage.json || true) | head -1 )"
+
+            # Show what's there, for debugging purposes.
+            ls -l coverage/
+
+            if [ -f "$coverage_report" ]; then
+              echo "Found coverage report: $coverage_report"
+              echo "::set-output name=coverage_report::$coverage_report"
+            else
+              echo "Could not locate coverage report!"
+              exit 1
+            fi
+          else
+            echo "No coverage report generated."
+          fi
+
+      - uses: actions/upload-artifact@v3
+        # If there's a coverage report, upload it, even if a previous step
+        # failed.
+        if: ${{ always() && steps.coverage.outputs.coverage_report }}
+        with:
+          # This will create a download called coverage.zip containing only
+          # coverage.json.
+          path: ${{ steps.coverage.outputs.coverage_report }}
+          name: coverage
+          # Since we've already filtered this step for instances where there is
+          # an environment variable set for this, the file should definitely be
+          # there.
+          if-no-files-found: error
 
       - name: Report Final Commit Status
         # Will run on success or failure, but not if the workflow is cancelled.

package/AUTHORS

@@ -76,4 +76,4 @@ uStudio Inc. <*@ustudio.com>
 Verizon Digital Media Services <*@verizondigitalmedia.com>
 Vincent Valot <valot.vince@gmail.com>
 Wayne Morgan <wayne.morgan.dev@gmail.com>
-
+Raymond Cheng <raycheng100@gmail.com>

package/CHANGELOG.md

@@ -1,5 +1,42 @@
 # Changelog
 
+## [3.2.11](https://github.com/shaka-project/shaka-player/compare/v3.2.10...v3.2.11) (2022-08-17)
+
+
+### Bug Fixes
+
+* add strictMissingProperties suppressions to unblock strict missing properties on union types. ([#4371](https://github.com/shaka-project/shaka-player/issues/4371)) ([c5678fb](https://github.com/shaka-project/shaka-player/commit/c5678fbad3a63bb93eac1abbf70e9e23b79911f6))
+* Fix key ID byteswapping for PlayReady on PS4 ([#4377](https://github.com/shaka-project/shaka-player/issues/4377)) ([bbb0640](https://github.com/shaka-project/shaka-player/commit/bbb0640e2c6230732f6d0789ea82a2721a2a975c))
+* Fix MediaCapabilities polyfill on Tizen and WebOS ([#4396](https://github.com/shaka-project/shaka-player/issues/4396)) ([f5fb3e5](https://github.com/shaka-project/shaka-player/commit/f5fb3e5d4670b177db001b28d13cb25a6e947ffa)), closes [#4383](https://github.com/shaka-project/shaka-player/issues/4383) [#4357](https://github.com/shaka-project/shaka-player/issues/4357)
+* Fix TextDecoder fallback and browser support check ([#4403](https://github.com/shaka-project/shaka-player/issues/4403)) ([e67b64a](https://github.com/shaka-project/shaka-player/commit/e67b64af4c0e357fb0f3fae67dba00d4bd7c6bf5))
+* Fix VP9 codec checks on Mac Firefox ([#4391](https://github.com/shaka-project/shaka-player/issues/4391)) ([136348d](https://github.com/shaka-project/shaka-player/commit/136348d2215a951f8395a79d63f930fc95d9593f))
+* **text:** Fix cue region rendering in UI ([#4412](https://github.com/shaka-project/shaka-player/issues/4412)) ([3f65d3b](https://github.com/shaka-project/shaka-player/commit/3f65d3b60fce1398e3a078b2cbbafec351e7e249)), closes [#4381](https://github.com/shaka-project/shaka-player/issues/4381)
+* **text:** Fix TTML render timing and line break issues ([#4407](https://github.com/shaka-project/shaka-player/issues/4407)) ([0e626c0](https://github.com/shaka-project/shaka-player/commit/0e626c0836b4ea0070e29c0a51e49845a36f8ef3)), closes [#4381](https://github.com/shaka-project/shaka-player/issues/4381)
+
+## [3.2.10](https://github.com/shaka-project/shaka-player/compare/v3.2.9...v3.2.10) (2022-07-14)
+
+
+### Bug Fixes
+
+* Add fallback to TextDecoder and TextEncoder ([#4324](https://github.com/shaka-project/shaka-player/issues/4324)) ([54095c2](https://github.com/shaka-project/shaka-player/commit/54095c2185b9b0137a2db448c2263cda463bb75b))
+* Fix EOS set-top box being identified as Apple. ([#4310](https://github.com/shaka-project/shaka-player/issues/4310)) ([981fe9d](https://github.com/shaka-project/shaka-player/commit/981fe9dcf38a174911e915968f50f9d6fe62ad22))
+* Fix getVideoPlaybackQuality in WebOS 3 ([#4316](https://github.com/shaka-project/shaka-player/issues/4316)) ([e88469d](https://github.com/shaka-project/shaka-player/commit/e88469dd921f9d9e0b62c7ded856c240882c691a))
+* Fix MediaCapabilities polyfill on Playstation 4 ([#4320](https://github.com/shaka-project/shaka-player/issues/4320)) ([ae8255a](https://github.com/shaka-project/shaka-player/commit/ae8255a4a5520ad07489fcc196b20b6d49f382a1))
+* Fix segment index assertions with DAI ([49e6e33](https://github.com/shaka-project/shaka-player/commit/49e6e33011a29508e3c30c43f41616d9d2a0fd98))
+* VTT Cue Parsing On PlayStation 4 ([#4340](https://github.com/shaka-project/shaka-player/issues/4340)) ([88fd5f9](https://github.com/shaka-project/shaka-player/commit/88fd5f9ab5d3397b7051e8e39787dd961e54c849)), closes [#4321](https://github.com/shaka-project/shaka-player/issues/4321)
+
+## [3.2.9](https://github.com/shaka-project/shaka-player/compare/v3.2.8...v3.2.9) (2022-06-14)
+
+
+### Bug Fixes
+
+* **demo:** allow switch between UITextDisplayer and SimpleTextDisplayer ([#4275](https://github.com/shaka-project/shaka-player/issues/4275)) ([76cd039](https://github.com/shaka-project/shaka-player/commit/76cd0398ff0115cf2c4c8369a50eee7fa12975cf))
+* **demo:** erroneous FairPlay keysystem in demo ([#4276](https://github.com/shaka-project/shaka-player/issues/4276)) ([bfdeb73](https://github.com/shaka-project/shaka-player/commit/bfdeb738aa5e9c464e79cdb787be11215eff6cc9))
+* New EME polyfill fixes EME/MCap issues on some smart TVs ([#4279](https://github.com/shaka-project/shaka-player/issues/4279)) ([312570f](https://github.com/shaka-project/shaka-player/commit/312570f3bbdbbabdc20a76f1afcba85aabc9c744))
+* Populate track's spatialAudio property ([#4291](https://github.com/shaka-project/shaka-player/issues/4291)) ([ab1b442](https://github.com/shaka-project/shaka-player/commit/ab1b442f057a305a4592f93062fb479fa72839d4))
+* Remove IE 11 from default browsers for Windows ([#4272](https://github.com/shaka-project/shaka-player/issues/4272)) ([3f2cb2e](https://github.com/shaka-project/shaka-player/commit/3f2cb2e761d8b78672935852903b5c6ecaa6a5c8)), closes [#4271](https://github.com/shaka-project/shaka-player/issues/4271)
+* Use middle segment when guessing MIME type on HLS ([#4269](https://github.com/shaka-project/shaka-player/issues/4269)) ([#4270](https://github.com/shaka-project/shaka-player/issues/4270)) ([51af232](https://github.com/shaka-project/shaka-player/commit/51af23244bd7307ff656e02b53383f4913cf1249))
+
 ## [3.2.8](https://github.com/shaka-project/shaka-player/compare/v3.2.7...v3.2.8) (2022-06-02)
 
 

package/CONTRIBUTORS

@@ -24,6 +24,7 @@
 
 Aaron Vaage <vaage@google.com>
 Adrián Gómez Llorente <adgllorente@gmail.com>
+Agajan Jumakuliyev <agajan.tm@gmail.com>
 Aidan Ridley <aidan.ridley@charter.com>
 Alex Jones <alexedwardjones@gmail.com>
 Alvaro Velad Galvan <alvaro.velad@mirada.tv>
@@ -53,6 +54,7 @@ Giorgio Gamberoni <giorgio.gamberoni@gmail.com>
 Giuseppe Samela <giuseppe.samela@gmail.com>
 Hichem Taoufik <hichem@code-it.fr>
 Itay Kinnrot <itay.kinnrot@kaltura.com>
+Isaac Ramirez <isaac.ramirez.herrera@gmail.com>
 Jacob Trimble <modmaker@google.com>
 Jason Palmer <jason@jason-palmer.com>
 Jeffrey Swan <jeffdswan@gmail.com>
@@ -112,4 +114,5 @@ Vasanth Polipelli <vasanthap@google.com>
 Vignesh Venkatasubramanian <vigneshv@google.com>
 Vincent Valot <valot.vince@gmail.com>
 Wayne Morgan <wayne.morgan.dev@gmail.com>
-Yohann Connell <robinconnell@google.com>
+Yohann Connell <robinconnell@google.com>
+Raymond Cheng <raycheng100@gmail.com>

package/README.md

@@ -24,6 +24,12 @@ For details on what's coming next, see our [development roadmap](roadmap.md).
 [offline storage and playback]: https://shaka-player-demo.appspot.com/docs/api/tutorial-offline.html
 
 
+## Maintained branches
+
+See [maintained-branches.md](https://github.com/shaka-project/shaka-player/blob/main/maintained-branches.md)
+for the up-to-date list of maintained branches of Shaka Player.
+
+
 ## Platform and browser support matrix
 
 |Browser    |Windows   |Mac      |Linux    |Android  |iOS >= 12 |ChromeOS|Other|
@@ -39,6 +45,8 @@ For details on what's coming next, see our [development roadmap](roadmap.md).
 |Tizen TV³  | -        | -       | -       | -       | -        | -      |**Y**|
 |WebOS⁶     | -        | -       | -       | -       | -        | -      |**Y**|
 |Xbox One   | -        | -       | -       | -       | -        | -      |**Y**|
+|Playstation 4⁷| -        | -       | -       | -       | -        | -      |**Y**|
+|Playstation 5⁷| -        | -       | -       | -       | -        | -      |**Y**|
 
 NOTES:
  - ¹: On macOS, only Safari 12+ is supported.  On iOS, only iOS 12+ is
@@ -53,6 +61,8 @@ NOTES:
    us.
      - Official support for LG WebOS TV:
        https://github.com/shaka-project/shaka-player/issues/1330
+ - ⁷: These are expected to work, but are community-supported and untested by
+   us.
 
 We support iOS 12+ through Apple's native HLS player.  We provide the same
 top-level API, but we just set the video's `src` element to the manifest/media.
@@ -117,7 +127,7 @@ HLS features supported:
  - Low-latency streaming with partial segments, preload hints, and delta updates
  - Discontinuity
  - ISO-BMFF / MP4 / CMAF support
- - MPEG-2 TS support (transmuxing provided by [mux.js][] v6.1.0+, must be
+ - MPEG-2 TS support (transmuxing provided by [mux.js][] v6.2.0+, must be
    separately included)
  - WebVTT and TTML
  - CEA-608/708 captions
@@ -148,6 +158,8 @@ HLS features **not** supported:
 |Tizen TV  |**Y**     |**Y**    | -       |untested⁵ |
 |WebOS⁷    |untested⁷ |untested⁷| -       |untested⁷ |
 |Xbox One  | -        |**Y**    | -       | -        |
+|Playstation 4⁷| -        |untested⁷| -       |untested⁷ |
+|Playstation 5⁷| -        |untested⁷| -       |untested⁷ |
 
 Other DRM systems should work out of the box if they are interoperable and
 compliant to the EME spec.
@@ -188,7 +200,7 @@ Shaka Player supports:
       SegmentTemplate@index
     - Not supported in HLS
   - MPEG-2 TS
-    - With help from [mux.js][] v6.1.0+, can be played on any browser which
+    - With help from [mux.js][] v6.2.0+, can be played on any browser which
       supports MP4
     - Can find and parse timestamps to find segment start time in HLS
   - WebVTT
@@ -197,10 +209,10 @@ Shaka Player supports:
     - Supported in both XML form and embedded in MP4
   - CEA-608
     - Supported embedded in MP4
-    - With help from [mux.js][] v6.1.0+, supported embedded in TS
+    - With help from [mux.js][] v6.2.0+, supported embedded in TS
   - CEA-708
     - Supported embedded in MP4
-    - With help from [mux.js][] v6.1.0+, supported embedded in TS
+    - With help from [mux.js][] v6.2.0+, supported embedded in TS
   - SubRip (SRT)
     - UTF-8 encoding only
   - LyRiCs (LRC)
@@ -228,8 +240,10 @@ attributes.
  * [Hosted builds on jsDelivr](https://www.jsdelivr.com/package/npm/shaka-player)
  * [Development roadmap](roadmap.md)
  * [Announcement list](https://groups.google.com/forum/#!forum/shaka-player-users)
-     ([join](docs/announcement-list-join-group.png) for release and survey
-      announcements)
+     ([join](docs/announcement-list-join-group.png) for infrequent
+      announcements and surveys)
+ * Subscribe to releases by following
+     [instructions from this blog](https://www.jessesquires.com/blog/2020/07/30/github-tip-watching-releases/)
 
 
 ## FAQ ##

package/demo/common/assets.js

@@ -80,7 +80,7 @@ shakaAssets.identifierForKeySystem = (keySystem) => {
   const KeySystem = shakaAssets.KeySystem;
   switch (keySystem) {
     case KeySystem.CLEAR_KEY: return 'org.w3.clearkey';
-    case KeySystem.FAIRPLAY: return 'com.apple.fps.1_0';
+    case KeySystem.FAIRPLAY: return 'com.apple.fps';
     case KeySystem.PLAYREADY: return 'com.microsoft.playready';
     case KeySystem.WIDEVINE: return 'com.widevine.alpha';
     default: return 'no drm protection';

package/demo/index.html

@@ -50,8 +50,6 @@
     <script defer src="../node_modules/tippy.js/umd/index.min.js"></script>
     <!-- Improved PWA capability on mobile Safari is enabled by loading pwacompat: -->
     <script defer src="../node_modules/pwacompat/pwacompat.min.js"></script>
-    <!-- TextDecoder polyfill, required for legacy Edge. -->
-    <script defer src="../node_modules/fastestsmallesttextencoderdecoder/EncoderDecoderTogether.min.js"></script>
 
     <!-- Include IMA SDK to enable client-side ad insertion: -->
     <script type="text/javascript" src="https://imasdk.googleapis.com/js/sdkloader/ima3.js"></script>

package/demo/main.js

@@ -1227,9 +1227,6 @@ shakaDemo.Main = class {
       // The currently-selected asset changed, so update asset cards.
       this.dispatchEventWithName_('shaka-main-selected-asset-changed');
 
-      await this.drmConfiguration_(asset);
-      this.controls_.getCastProxy().setAppData({'asset': asset});
-
       // Enable the correct set of controls before loading.
       // The video container influences the TextDisplayer used.
       if (this.nativeControlsEnabled_) {
@@ -1244,6 +1241,9 @@ shakaDemo.Main = class {
         this.player_.setVideoContainer(this.container_);
       }
 
+      await this.drmConfiguration_(asset);
+      this.controls_.getCastProxy().setAppData({'asset': asset});
+
       // Finally, the asset can be loaded.
       let manifestUri = asset.manifestUri;
       // If we have an offline copy, use that.  If the offlineUri field is null,