shaka-player 4.3.10 → 4.3.12

package/.github/workflows/deflake.yaml

@@ -1,16 +1,19 @@
 name: Deflake Tests
 
-# Runs when the Selenum nightly test workflow completes.  This will run with
-# full privileges, even if the other workflow doesn't.  That allows us to
-# trigger re-runs if we think the results might be flaky.
+# Runs when the Selenum lab test or PR test workflows complete.  This will run
+# with full privileges, even if the other workflow doesn't.  That allows us to
+# trigger re-runs if we think the results might be flaky.  A test run will be
+# given up to 3 runs to succeed.
 on:
   workflow_run:
-    workflows: [Selenium Lab Tests]
+    workflows:
+      - Selenium Lab Tests
+      - Build and Test PR
     types: [completed]
 
 jobs:
   deflake:
-    if: ${{ github.event.workflow_run.event == 'schedule' && github.event.workflow_run.conclusion == 'failure' }}
+    if: ${{ github.event.workflow_run.conclusion == 'failure' }}
     runs-on: ubuntu-latest
 
     steps:

package/.github/workflows/release-please.yaml

@@ -21,10 +21,16 @@ jobs:
           release-type: node
           # Make sure we create the PR against the correct branch.
           default-branch: ${{ github.ref_name }}
+          # Use a special shaka-bot access token for releases.
+          token: ${{ secrets.RELEASE_PLEASE_TOKEN }}
 
       # If we didn't create a release, we may have created or updated a PR.
+      # Check out the code, then update the Player version in the PR.
       - uses: actions/checkout@v3
         if: steps.release.outputs.release_created == false
+        with:
+          # Use a special shaka-bot access token for releases.
+          token: ${{ secrets.RELEASE_PLEASE_TOKEN }}
       - name: Custom update Player version
         if: steps.release.outputs.release_created == false
         run: |
@@ -38,9 +44,9 @@ jobs:
           sed -e "s/^\\(shaka.Player.version =\\).*/\\1 '$VERSION';/" \
               -i lib/player.js
           git add lib/player.js
-          # Emulate the actions bot.
-          git config user.name "github-actions[bot]"
-          git config user.email "41898282+github-actions[bot]@users.noreply.github.com"
+          # Set missing git config for the commit.
+          git config user.name "shaka-bot"
+          git config user.email "shaka-bot@users.noreply.github.com"
           # Update the PR.
           git commit --amend --no-edit
           git push -f
@@ -55,12 +61,16 @@ jobs:
     steps:
       - uses: actions/checkout@v3
         with:
+          # Check out the origin repo, and do it at main, not the PR branch.
           ref: main
+          # Use a special shaka-bot access token for releases.
+          token: ${{ secrets.RELEASE_PLEASE_TOKEN }}
       - name: Tag the main branch
         run: |
-          # Emulate the actions bot.
-          git config user.name "github-actions[bot]"
-          git config user.email "41898282+github-actions[bot]@users.noreply.github.com"
+          # Set missing git config for the tag.
+          git config user.name "shaka-bot"
+          git config user.email "shaka-bot@users.noreply.github.com"
+          # Tag the main branch.
           VERSION=${{ needs.release.outputs.tag_name }}
           git tag -m "$VERSION-main" "$VERSION-main"
           git push origin "$VERSION-main"
@@ -80,10 +90,52 @@ jobs:
           node-version: 16
           registry-url: 'https://registry.npmjs.org'
 
+      - name: Compute NPM tags
+        run: |
+          # NPM publish always sets a tag.  If you don't provide an explicit
+          # tag, you get the "latest" tag by default, but we want "latest" to
+          # always point to the highest version number.  So we set an explicit
+          # tag on every "publish" command, then follow up with a command to
+          # set "latest" only if this release was the highest version yet.
+
+          # The explicit tag is based on the branch.  If the git tag is v4.4.1,
+          # the branch was v4.4.x, and the explicit NPM tag should be
+          # v4.4-latest.
+          GIT_TAG_NAME=${{ needs.release.outputs.tag_name }}
+          NPM_TAG=$(echo "$GIT_TAG_NAME" | cut -f 1-2 -d .)-latest
+          echo "NPM_TAG=$NPM_TAG" >> $GITHUB_ENV
+
+          # We only tag the NPM package as "latest" if this release is the
+          # highest version to date.
+          RELEASE_TAGS=$(git tag | grep ^v[0-9] | grep -Ev -- '-(master|main)')
+          LATEST_RELEASE=$(echo "$RELEASE_TAGS" | sort --version-sort | tail -1)
+
+          if [[ "$GIT_TAG_NAME" == "$LATEST_RELEASE" ]]; then
+            NPM_LATEST=true
+          else
+            NPM_LATEST=false
+          fi
+          echo NPM_LATEST=$NPM_LATEST >> $GITHUB_ENV
+
+          # Debug the decisions made here.
+          echo "Latest release: $LATEST_RELEASE"
+          echo "This release: $GIT_TAG_NAME"
+          echo "NPM tag: $NPM_TAG"
+          echo "NPM latest: $NPM_LATEST"
+
       - run: npm ci
-      - run: npm publish
+      - name: Publish
         env:
           NODE_AUTH_TOKEN: ${{secrets.NPM_TOKEN}}
+        run: |
+          # Publish with an explicit tag.
+          npm publish --tag "$NPM_TAG"
+
+          # Add the "latest" tag if needed.
+          if [[ "$NPM_LATEST" == "true" ]]; then
+            NPM_VERSION=$(npm version --json | jq -r '."shaka-player"')
+            npm dist-tag add "shaka-player@$NPM_VERSION" latest
+          fi
 
       - run: npm pack
       - uses: svenstaro/upload-release-action@483c1e56f95e88835747b1c7c60581215016cbf2
@@ -124,10 +176,11 @@ jobs:
           TAG_NAME=${{ needs.release.outputs.tag_name }}
 
           if [[ "$TAG_NAME" == "$LATEST_RELEASE" ]]; then
-            echo APPSPOT_PROMOTE=true >> $GITHUB_ENV
+            APPSPOT_PROMOTE=true
           else
-            echo APPSPOT_PROMOTE=false >> $GITHUB_ENV
+            APPSPOT_PROMOTE=false
           fi
+          APPSPOT_PROMOTE=$APPSPOT_PROMOTE >> $GITHUB_ENV
 
           # Debug the decisions made here.
           echo "Subdomain: $APPSPOT_SUBDOMAIN"
@@ -155,6 +208,8 @@ jobs:
       - uses: actions/checkout@v3
         with:
           fetch-depth: 0
+          # Use a special shaka-bot access token for releases.
+          token: ${{ secrets.RELEASE_PLEASE_TOKEN }}
 
       - name: Create release branch
         run: |

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

@@ -21,7 +21,7 @@ jobs:
         id: compute
         shell: bash
         env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          GITHUB_TOKEN: ${{ secrets.SHAKA_BOT_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.
@@ -36,4 +36,4 @@ jobs:
           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 }}
+          GITHUB_TOKEN: ${{ secrets.SHAKA_BOT_TOKEN }}

package/.github/workflows/shaka-bot-commands/command-help.sh

@@ -0,0 +1,27 @@
+# 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.
+
+# The help command implementation.
+# Assumes that lib.sh has been loaded and all required variables are set.
+
+# Using single quotes to avoid executing the things in backticks, which are
+# really markdown.
+(
+  echo 'I honor the following commands from anyone:'
+  echo ' - `@shaka-bot help`: Show this help message'
+  echo ''
+  echo 'I honor the following commands from maintainers only:'
+  echo ' - `@shaka-bot test`: Start lab tests on all devices'
+  echo ' - `@shaka-bot test ce`: Start lab tests on CE devices only (no desktop browsers)'
+) | reply_from_pipe

package/.github/workflows/shaka-bot-commands/command-test.sh

@@ -0,0 +1,56 @@
+# 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.
+
+# The test command implementation.
+# Assumes that lib.sh has been loaded and all required variables are set.
+
+if ! check_permissions; then
+  reply "Only maintainers may start lab tests."
+  exit 0
+fi
+
+# These are passed to the lab testing workflow.
+WORKFLOW_ARGS=( "pr=$PR_NUMBER" )
+
+case "${SHAKA_BOT_ARGUMENTS[0]}" in
+  # CE devices only.
+  ce) WORKFLOW_ARGS+=( "browser_filter=Tizen ChromecastUltra ChromecastGTV ChromeAndroid" ) ;;
+
+  # No command argument, no extra workflow arguments.
+  "") ;;
+
+  *)
+    reply "Unrecognized test argument: ${SHAKA_BOT_ARGUMENTS[0]}"
+    exit 1
+    ;;
+esac
+
+if start_workflow selenium-lab-tests.yaml "${WORKFLOW_ARGS[@]}"; then
+  (
+    echo "Lab tests started with arguments:"
+    for arg in "${WORKFLOW_ARGS[@]}"; do
+      echo " - \`$arg\`"
+    done
+  ) | reply_from_pipe
+else
+  (
+    echo "I failed to start the lab test workflow."
+    echo ""
+    echo "Please check GitHub Actions logs for details."
+  ) | reply_from_pipe
+
+  # Fail this workflow to make it easier to find the right run
+  # and its logs.
+  exit 1
+fi

package/.github/workflows/shaka-bot-commands/lib.sh

@@ -0,0 +1,83 @@
+# 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.
+
+# Utilities for handling @shaka-bot commands.
+
+# Ignore case in all string comparisons.
+shopt -s nocasematch
+
+function check_required_variable() {
+  local VAR_NAME="$1"
+
+  # The ! syntax here is Bash variable indirection.
+  if [[ -z "${!VAR_NAME}" ]]; then
+    echo "Missing environment variable: $VAR_NAME"
+    exit 1
+  fi
+}
+
+# Leaving a comment requires a token with "repo" scope.
+function reply() {
+  echo "@$COMMENTER: $@" | \
+      gh issue comment "$PR_NUMBER" -R "$THIS_REPO" -F -
+}
+
+# Leaving a comment requires a token with "repo" scope.
+function reply_from_pipe() {
+  (echo -n "@$COMMENTER: "; cat /dev/stdin) | \
+      gh issue comment "$PR_NUMBER" -R "$THIS_REPO" -F -
+}
+
+# Checking permissions requires a token with "repo" and "org:read" scopes, and
+# write access.
+function check_permissions() {
+  # Check permissions: this API call fails if the commenter has no special
+  # permissions on the repo.
+  gh api "/repos/$THIS_REPO/collaborators/$COMMENTER"
+}
+
+# Starting a workflow requires a token with "repo" scope and write access.
+# $1 is the workflow filename.  Subsequent arguments are key=value pairs to be
+# passed as input to the workflow_dispatch event.
+function start_workflow() {
+  local WORKFLOW="$1"
+  shift
+
+  # The gh command wants -f before each key-value pair.  The caller shouldn't
+  # have to know that, so we rebuild the argument array with -f here.
+  local GH_ARGS=()
+  for arg in "$@"; do
+    GH_ARGS+=( "-f" "$arg" )
+  done
+
+  gh workflow run "$WORKFLOW" -R "$THIS_REPO" "${GH_ARGS[@]}"
+}
+
+# Outputs to global variables SHAKA_BOT_COMMAND and SHAKA_BOT_ARGUMENTS (array).
+function parse_command() {
+  # Tokenize the comment by whitespace.
+  local TOKENS=( $COMMENT_BODY )
+
+  local INDEX
+  for (( INDEX=0; INDEX < ${#TOKENS[@]}; INDEX++ )); do
+    if [[ "${TOKENS[i]}" == "@shaka-bot" ]]; then
+      SHAKA_BOT_COMMAND="${TOKENS[i+1]}"
+      # A slice of all tokens starting with index i+2.
+      SHAKA_BOT_ARGUMENTS=( "${TOKENS[@]:i+2}" )
+      return 0
+    fi
+  done
+
+  return 1
+}

package/.github/workflows/shaka-bot-commands/main.sh

@@ -0,0 +1,51 @@
+# 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.
+
+# Handle @shaka-bot commands commented on PRs.
+
+# Run everything from the folder in which this script lives.
+cd "$(dirname "$0")"
+
+# Load utils.
+. lib.sh
+
+# Check required environment variables passed from the workflow.
+# If running this manually while testing changes, supply these.
+check_required_variable GH_TOKEN      # With repo & org:read scope, write access
+check_required_variable THIS_REPO     # like shaka-project/shaka-player
+check_required_variable COMMENTER     # like joeyparrish
+check_required_variable PR_NUMBER     # like 1234
+check_required_variable COMMENT_BODY  # like "@shaka-bot howdy"
+
+if [[ "$COMMENTER" == "shaka-bot" ]]; then
+  # Exclude comments by shaka-bot, who will sometimes use its own name.
+  exit 0
+fi
+
+# Parse the command.  Outputs to globals SHAKA_BOT_COMMAND and
+# SHAKA_BOT_ARGUMENTS (array).
+parse_command
+
+if [[ "$SHAKA_BOT_COMMAND" == "" ]]; then
+  # No command found.
+  exit 0
+fi
+
+echo "PR $PR_NUMBER, detected command $SHAKA_BOT_COMMAND"
+
+case "$SHAKA_BOT_COMMAND" in
+  help) . command-help.sh ;;
+  test) . command-test.sh ;;
+  *) echo "Unknown command!" ;;
+esac

package/.github/workflows/talk-to-shaka-bot.yaml

@@ -0,0 +1,29 @@
+name: Talk to Shaka Bot (PRs)
+
+# Runs when comments are created or edited.  Jobs below will be filtered to
+# only run on PRs, not regular issues.
+on:
+  issue_comment:
+    types: [created, edited]
+
+jobs:
+  handle_command:
+    # Only runs on PRs that contain '@shaka-bot' comments, but not comments
+    # made by shaka-bot itself, who will sometimes use its own name.
+    # Note that contains() is not case sensitive.
+    if: github.event.issue.pull_request && contains(github.event.comment.body, '@shaka-bot') && github.event.comment.user.login != 'shaka-bot'
+    runs-on: [ubuntu-latest]
+    env:
+      # This token must have "repo" scope, "org:read" scope, and write access.
+      GH_TOKEN: ${{ secrets.SHAKA_BOT_TOKEN }}
+      THIS_REPO: ${{ github.repository }}
+      COMMENTER: ${{ github.event.comment.user.login }}
+      PR_NUMBER: ${{ github.event.issue.number }}
+      COMMENT_BODY: ${{ github.event.comment.body }}
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v3
+
+      - name: Handle command
+        shell: bash
+        run: .github/workflows/shaka-bot-commands/main.sh

package/.github/workflows/update-issues.yaml

@@ -23,7 +23,8 @@ jobs:
 
       - name: Update Issues
         env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          # Use SHAKA_BOT_TOKEN if found, otherwise the default GITHUB_TOKEN.
+          GITHUB_TOKEN: ${{ secrets.SHAKA_BOT_TOKEN || secrets.GITHUB_TOKEN }}
         run: |
           cd update-issues
           npm ci

package/.github/workflows/validate-pr-title.yaml

@@ -1,19 +1,11 @@
 name: Validate PR Title
 
-# We recommend that maintainers use this Chrome/Firefox extension so that
-# squashed PRs will have the merged commit message default to the PR title and
-# description:  https://github.com/zachwhaley/squashed-merge-message
-#
-# This avoids the need to amend commits after the fact to match the desired PR
-# syntax.  As long as the PR itself is properly-formatted, this extension will
-# help you commit the right format to the repo, too.  This, in turn, feeds the
-# changelog and release workflows.
-
 on:
   # NOTE: The automated PRs from release-please-action do not seem to trigger
   # any of the default PR triggers (opened, synchronize, reopened).  So we need
   # additional types.  This is a good set that makes it easy to trigger the
-  # workflow manually if needed.
+  # workflow manually if needed.  This is not neccessary if your release-please
+  # workflow uses a personal access token (PAT) from Shaka Bot.
   pull_request_target:
     types:
       - opened
@@ -30,6 +22,6 @@ jobs:
     name: Validate PR Title
     runs-on: ubuntu-latest
     steps:
-      - uses: amannn/action-semantic-pull-request@v4
+      - uses: amannn/action-semantic-pull-request@v5
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

package/CHANGELOG.md

@@ -1,5 +1,25 @@
 # Changelog
 
+## [4.3.12](https://github.com/shaka-project/shaka-player/compare/v4.3.11...v4.3.12) (2023-09-13)
+
+
+### Bug Fixes
+
+* com.apple.fps should work with the default initDataTransform when using legacy Apple Media Keys ([#5603](https://github.com/shaka-project/shaka-player/issues/5603)) ([8017636](https://github.com/shaka-project/shaka-player/commit/8017636821c030822cf426bb8d494246c372cb93))
+* Compute correctly the positionAlign in UITextDisplayer ([#5630](https://github.com/shaka-project/shaka-player/issues/5630)) ([154131a](https://github.com/shaka-project/shaka-player/commit/154131a81c57d8866499676c7c68683f807dfac5))
+* **Demo:** Allow com.apple.fps.1_0 in the custom DRM System field ([#5600](https://github.com/shaka-project/shaka-player/issues/5600)) ([4853af8](https://github.com/shaka-project/shaka-player/commit/4853af8f39a92a57c3e2f5f899a01e76e130c4df))
+* fix preferred track selection on Safari ([#5601](https://github.com/shaka-project/shaka-player/issues/5601)) ([a85174a](https://github.com/shaka-project/shaka-player/commit/a85174a667ee20451742e1acd8d9e89262a4c51e))
+* **TTML:** Fix wrong writing-mode in nested cues ([#5646](https://github.com/shaka-project/shaka-player/issues/5646)) ([e125e53](https://github.com/shaka-project/shaka-player/commit/e125e539cda726cd9c2674211246673008d3fda0))
+* **WebVTT:** Fix support for line:0 vertical alignment ([#5632](https://github.com/shaka-project/shaka-player/issues/5632)) ([5074de7](https://github.com/shaka-project/shaka-player/commit/5074de721f2669c70054a970526cffea295567c5))
+* **WebVTT:** Fix wrong writing-mode in nested cues ([#5641](https://github.com/shaka-project/shaka-player/issues/5641)) ([ba9a852](https://github.com/shaka-project/shaka-player/commit/ba9a852fc68adf0081e5c9d921bd374404113e34))
+
+## [4.3.11](https://github.com/shaka-project/shaka-player/compare/v4.3.10...v4.3.11) (2023-09-02)
+
+
+### Bug Fixes
+
+* **HLS:** Allow audio groups on audio-only content ([#5578](https://github.com/shaka-project/shaka-player/issues/5578)) ([9028495](https://github.com/shaka-project/shaka-player/commit/90284959bda3c0cadcacbd7acbe0425d3028d9d5))
+
 ## [4.3.10](https://github.com/shaka-project/shaka-player/compare/v4.3.9...v4.3.10) (2023-08-30)
 
 

package/CONTRIBUTORS

@@ -74,6 +74,7 @@ Julian Domingo <juliandomingo@google.com>
 Jun Hong Chong <chongjunhong@gmail.com>
 Jürgen Kartnaller <kartnaller@lovelysystems.com>
 Leandro Ribeiro Moreira <leandro.ribeiro.moreira@gmail.com>
+Loïc Raux <loicraux@gmail.com>
 Lucas Gabriel Sánchez <unkiwii@gmail.com>
 Martin Stark <martin.stark@eyevinn.se>
 Matias Russitto <russitto@gmail.com>

package/demo/custom.js

@@ -407,14 +407,14 @@ shakaDemo.Custom = class {
       const licenseServerURL = licenseServerUrlInput.value;
       const customDRMSystem = customDrmSystemInput.value;
       if (licenseServerURL) {
-        // Make a license server entry for every common DRM plugin.
         assetInProgress.licenseServers.clear();
-        for (const drmSystem of shakaDemo.Main.commonDrmSystems) {
-          assetInProgress.licenseServers.set(drmSystem, licenseServerURL);
-        }
         if (customDRMSystem) {
-          // Make a custom entry too.
           assetInProgress.licenseServers.set(customDRMSystem, licenseServerURL);
+        } else {
+          // Make a license server entry for every common DRM plugin.
+          for (const drmSystem of shakaDemo.Main.commonDrmSystems) {
+            assetInProgress.licenseServers.set(drmSystem, licenseServerURL);
+          }
         }
       } else {
         assetInProgress.licenseServers.clear();

package/dist/demo.compiled.debug.js

@@ -248,9 +248,9 @@ f)},q=>{n(q.value,g)});p=shakaDemoMain.getLocalizedString(shakaDemo.MessageIds.L
 const d=shakaDemoMain.getLocalizedString(shakaDemo.MessageIds.HLS_FULL_MIME_TYPE);this.makeField_(c,d,(e,f)=>{a.mediaPlaylistFullMimeType&&(e.value=a.mediaPlaylistFullMimeType);f=shaka.util.PlayerConfiguration.createDefault();e.placeholder=f.manifest.hls.mediaPlaylistFullMimeType},e=>{a.setMediaPlaylistFullMimeType(e.value)});return b}makeAssetDialogContentsAds_(a,b){b=document.createElement("div");const c=new shakaDemo.InputContainer(b,null,shakaDemo.InputContainer.Style.VERTICAL,null);var d=shakaDemoMain.getLocalizedString(shakaDemo.MessageIds.AD_TAG_URL);
 this.makeField_(c,d,(e,f)=>{a.adTagUri&&(e.value=a.adTagUri)},e=>{a.adTagUri=e.value});d=shakaDemoMain.getLocalizedString(shakaDemo.MessageIds.IMA_CONTENT_SRC_ID);this.makeField_(c,d,(e,f)=>{a.imaContentSrcId&&(e.value=a.imaContentSrcId);this.manifestField_.required=this.checkManifestRequired_(a)},e=>{a.imaContentSrcId=e.value;this.manifestField_.required=this.checkManifestRequired_(a)});d=shakaDemoMain.getLocalizedString(shakaDemo.MessageIds.IMA_VIDEO_ID);this.makeField_(c,d,(e,f)=>{a.imaVideoId&&
 (e.value=a.imaVideoId);this.manifestField_.required=this.checkManifestRequired_(a)},e=>{a.imaVideoId=e.value;this.manifestField_.required=this.checkManifestRequired_(a)});d=shakaDemoMain.getLocalizedString(shakaDemo.MessageIds.IMA_ASSET_KEY);this.makeField_(c,d,(e,f)=>{a.imaAssetKey&&(e.value=a.imaAssetKey);this.manifestField_.required=this.checkManifestRequired_(a)},e=>{a.imaAssetKey=e.value;this.manifestField_.required=this.checkManifestRequired_(a)});d=shakaDemoMain.getLocalizedString(shakaDemo.MessageIds.IMA_MANIFEST_TYPE);
-this.makeField_(c,d,(e,f)=>{a.imaManifestType&&(e.value=a.imaManifestType);this.manifestField_.required=this.checkManifestRequired_(a)},e=>{a.imaManifestType=e.value;this.manifestField_.required=this.checkManifestRequired_(a)});return b}makeAssetDialogContentsDrm_(a,b){b=document.createElement("div");const c=new shakaDemo.InputContainer(b,null,shakaDemo.InputContainer.Style.VERTICAL,null);let d,e;const f=()=>{const h=d.value,k=e.value;if(h){a.licenseServers.clear();for(const l of shakaDemo.Main.commonDrmSystems)a.licenseServers.set(l,
-h);k&&a.licenseServers.set(k,h)}else a.licenseServers.clear()};var g=shakaDemoMain.getLocalizedString(shakaDemo.MessageIds.LICENSE_SERVER_URL);this.makeField_(c,g,(h,k)=>{d=h;(k=a.licenseServers.keys().next())&&k.value&&(h.value=a.licenseServers.get(k.value))},h=>{f()});g=shakaDemoMain.getLocalizedString(shakaDemo.MessageIds.LICENSE_CERTIFICATE_URL);this.makeField_(c,g,(h,k)=>{a.certificateUri&&(h.value=a.certificateUri)},h=>{a.certificateUri=h.value});g=shakaDemoMain.getLocalizedString(shakaDemo.MessageIds.DRM_SYSTEM);
-this.makeField_(c,g,(h,k)=>{e=h;k=a.licenseServers.keys();for(const l of k)if(!shakaDemo.Main.commonDrmSystems.includes(l)){h.value=l;break}},h=>{f()});return b}makeAssetDialogContentsExtra_(a,b){const c=document.createElement("div"),d=new shakaDemo.InputContainer(c,null,shakaDemo.InputContainer.Style.FLEX,null);d.getClassList().add("wide-input");d.setDefaultRowClass("wide-input");const e=shakaDemoMain.getLocalizedString(shakaDemo.MessageIds.EXTRA_SHAKA_PLAYER_CONFIG);this.makeField_(d,e,(f,g)=>{f.setAttribute("rows",
+this.makeField_(c,d,(e,f)=>{a.imaManifestType&&(e.value=a.imaManifestType);this.manifestField_.required=this.checkManifestRequired_(a)},e=>{a.imaManifestType=e.value;this.manifestField_.required=this.checkManifestRequired_(a)});return b}makeAssetDialogContentsDrm_(a,b){b=document.createElement("div");const c=new shakaDemo.InputContainer(b,null,shakaDemo.InputContainer.Style.VERTICAL,null);let d,e;const f=()=>{const h=d.value,k=e.value;if(h)if(a.licenseServers.clear(),k)a.licenseServers.set(k,h);else for(const l of shakaDemo.Main.commonDrmSystems)a.licenseServers.set(l,
+h);else a.licenseServers.clear()};var g=shakaDemoMain.getLocalizedString(shakaDemo.MessageIds.LICENSE_SERVER_URL);this.makeField_(c,g,(h,k)=>{d=h;(k=a.licenseServers.keys().next())&&k.value&&(h.value=a.licenseServers.get(k.value))},h=>{f()});g=shakaDemoMain.getLocalizedString(shakaDemo.MessageIds.LICENSE_CERTIFICATE_URL);this.makeField_(c,g,(h,k)=>{a.certificateUri&&(h.value=a.certificateUri)},h=>{a.certificateUri=h.value});g=shakaDemoMain.getLocalizedString(shakaDemo.MessageIds.DRM_SYSTEM);this.makeField_(c,
+g,(h,k)=>{e=h;k=a.licenseServers.keys();for(const l of k)if(!shakaDemo.Main.commonDrmSystems.includes(l)){h.value=l;break}},h=>{f()});return b}makeAssetDialogContentsExtra_(a,b){const c=document.createElement("div"),d=new shakaDemo.InputContainer(c,null,shakaDemo.InputContainer.Style.FLEX,null);d.getClassList().add("wide-input");d.setDefaultRowClass("wide-input");const e=shakaDemoMain.getLocalizedString(shakaDemo.MessageIds.EXTRA_SHAKA_PLAYER_CONFIG);this.makeField_(d,e,(f,g)=>{f.setAttribute("rows",
 10);a.extraConfig&&(f.value=JSON.stringify(a.extraConfig,null,2));b.push(f);f=document.createElement("span");f.classList.add("mdl-textfield__error");f.textContent=shakaDemoMain.getLocalizedString(shakaDemo.MessageIds.INVALID_JSON_CONFIG_ERROR);g.appendChild(f)},(f,g)=>{try{if(f.value){const h=JSON.parse(f.value);a.extraConfig=h}else a.extraConfig=null;g.setValid(!0)}catch(h){g.setValid(!1)}},!0);return c}makeAssetDialogContentsMain_(a,b,c){const d=document.createElement("div"),e=new shakaDemo.InputContainer(d,
 null,shakaDemo.InputContainer.Style.VERTICAL,null);var f=shakaDemoMain.getLocalizedString(shakaDemo.MessageIds.MANIFEST_URL);this.makeField_(e,f,(g,h)=>{g.value=a.manifestUri;b.push(g);const k=document.createElement("span");k.classList.add("mdl-textfield__error");k.textContent=shakaDemoMain.getLocalizedString(shakaDemo.MessageIds.MANIFEST_URL_ERROR);h.appendChild(k);g.required=this.checkManifestRequired_(a);g.pattern="^(?!([\r\n\t\f\v ]+)$).*$";this.manifestField_=g},g=>{a.manifestUri=g.value.trim()});
 f=shakaDemoMain.getLocalizedString(shakaDemo.MessageIds.NAME);this.makeField_(e,f,(g,h)=>{g.value=a.name;b.push(g);const k=document.createElement("span");k.classList.add("mdl-textfield__error");k.textContent=shakaDemoMain.getLocalizedString(shakaDemo.MessageIds.NAME_ERROR);h.appendChild(k);g.required=!0;g.pattern="^(?!( *";for(const l of this.assets_)l!=a&&(g.pattern+="|"+l.name.replace(/[.*+?^${}()|[\]\\]/g,"\\$&"));g.pattern+=")$).*$"},g=>{a.name=g.value});f=shakaDemoMain.getLocalizedString(shakaDemo.MessageIds.ICON_URL);