shaka-player 3.3.17 → 3.3.19

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

@@ -16,7 +16,7 @@ on:
 # old one.  If a PR is updated and a new test run is started, the old test run
 # will be cancelled automatically to conserve resources.
 concurrency:
-  group: ${{ github.workflow }}-${{ github.event.inputs.ref || github.ref }}
+  group: ${{ github.workflow }}-${{ inputs.ref || github.ref }}
   cancel-in-progress: true
 
 jobs:
@@ -27,7 +27,7 @@ jobs:
       - name: Checkout code
         uses: actions/checkout@v3
         with:
-          ref: ${{ github.event.inputs.ref || github.ref }}
+          ref: ${{ inputs.ref || github.ref }}
 
       - name: Lint
         run: python build/check.py
@@ -103,7 +103,7 @@ jobs:
       - name: Checkout code
         uses: actions/checkout@v3
         with:
-          ref: ${{ github.event.inputs.ref || github.ref }}
+          ref: ${{ inputs.ref || github.ref }}
 
       # Older versions of Safari can be installed, but not to the root, and it
       # can't replace the standard version, at least not on GitHub's VMs.  If
@@ -206,7 +206,7 @@ jobs:
       - name: Checkout code
         uses: actions/checkout@v3
         with:
-          ref: ${{ github.event.inputs.ref || github.ref }}
+          ref: ${{ inputs.ref || github.ref }}
 
       - name: Docker
         run: |

package/.github/workflows/demo-version-index.yaml

@@ -11,6 +11,12 @@ on:
       - app-engine/demo-version-index/**
   release:
     types: [published]
+  # NOTE: So long as releases are made without a personal access token (PAT),
+  # they will not activate this workflow's release trigger.  For now, the
+  # schedule trigger will compensate for that by updating the index nightly.
+  schedule:
+    # Run every night at 10pm PST / 6am UTC.
+    - cron: '0 6 * * *'
 
 jobs:
   appspot:

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

@@ -9,8 +9,31 @@ on:
         description: "A PR number to build and test in the lab.  If empty, will build and test from main."
         required: false
       test_filter:
-        description: "A filter to run a subset of the tests.  If empty, all tests will run."
+        description: "A regex filter to run a subset of the tests.  If empty, all tests will run."
         required: false
+      browser_filter:
+        description: "A list of browsers to run the tests.  If empty, all browsers will run."
+        required: false
+  workflow_call:
+    # Allows for reuse from other workflows, such as "Update All Screenshots"
+    # workflow.
+    inputs:
+      pr:
+        description: "A PR number to build and test in the lab.  If empty, will build and test from main."
+        required: false
+        type: string
+      test_filter:
+        description: "A regex filter to run a subset of the tests.  If empty, all tests will run."
+        required: false
+        type: string
+      browser_filter:
+        description: "A list of browsers to run the tests.  If empty, all browsers will run."
+        required: false
+        type: string
+      ignore_test_status:
+        description: "If true, ignore test success or failure, never set the commit status, and always upload screenshots."
+        required: false
+        type: boolean
   schedule:
     # Runs every night at 2am PST / 10am UTC, testing against the main branch.
     - cron: '0 10 * * *'
@@ -30,12 +53,12 @@ jobs:
       - name: Compute ref
         id: compute
         run: |
-          if [[ "${{ github.event.inputs.pr }}" != "" ]]; then
-            LAB_TEST_REF="refs/pull/${{ github.event.inputs.pr }}/head"
+          if [[ "${{ inputs.pr }}" != "" ]]; then
+            LAB_TEST_REF="refs/pull/${{ inputs.pr }}/head"
           else
             LAB_TEST_REF="main"
           fi
-          echo "REF=$LAB_TEST_REF" >> $GITHUB_OUTPUT
+          echo "REF=$LAB_TEST_REF" | tee -a $GITHUB_OUTPUT
 
   # Configure the build matrix based on our grid's YAML config.
   # The matrix contents will be computed by this first job and deserialized
@@ -63,6 +86,14 @@ jobs:
           const yaml = require(
               '${{ github.workspace }}/node_modules/js-yaml/index.js');
 
+          // Convert the input "browser_filter" into a set of strings.  Take
+          // care to filter so that the empty string turns into an empty set.
+          const browserFilter = new Set( "${{ inputs.browser_filter }}"
+                  .split(/\s+/)
+                  .map(x => x.toLowerCase())
+                  .filter(x => !!x)
+          );
+
           const gridBrowserYaml =
               fs.readFileSync('build/shaka-lab.yaml', 'utf8');
           const gridBrowserMetadata = yaml.load(gridBrowserYaml);
@@ -74,7 +105,14 @@ jobs:
               // Skip variable defs in the YAML file
               continue;
             }
-            if (!gridBrowserMetadata[name].disabled) {
+
+            // A browser is enabled if it's not disabled and (either the browser
+            // filter is empty or it contains the browser name).
+            const enabled = !gridBrowserMetadata[name].disabled &&
+                (browserFilter.size == 0 ||
+                 browserFilter.has(name.toLowerCase()));
+
+            if (enabled) {
               include.push({browser: name});
             }
           }
@@ -100,6 +138,7 @@ jobs:
           ref: ${{ needs.compute-ref.outputs.REF }}
 
       - name: Set commit status to pending
+        if: ${{ inputs.ignore_test_status == false }}
         uses: ./.github/workflows/custom-actions/set-commit-status
         with:
           context: Selenium / Build
@@ -117,8 +156,9 @@ jobs:
           retention-days: 1
 
       - name: Report final commit status
-        # Will run on success or failure, but not if the workflow is cancelled.
-        if: ${{ success() || failure() }}
+        # Will run on success or failure, but not if the workflow is cancelled
+        # or if we were asked to ignore the test status.
+        if: ${{ (success() || failure()) && inputs.ignore_test_status == false }}
         uses: ./.github/workflows/custom-actions/set-commit-status
         with:
           context: Selenium / Build
@@ -142,6 +182,7 @@ jobs:
           ref: ${{ needs.compute-ref.outputs.REF }}
 
       - name: Set commit status to pending
+        if: ${{ inputs.ignore_test_status == false }}
         uses: ./.github/workflows/custom-actions/set-commit-status
         with:
           context: Selenium / ${{ matrix.browser }}
@@ -185,20 +226,28 @@ jobs:
       # the container.
       - name: Test Player
         run: |
+          # Use of an array keeps elements intact, and allows an element to
+          # contain spaces without being expanded into multiple arguments in a
+          # shell command.
+          extra_flags=()
+
           # Generate a coverage report from uncompiled code on ChromeLinux.
           # It should be the uncompiled build, or else we won't execute any
           # coverage instrumentation on full-stack player integration tests.
           if [[ "${{ matrix.browser }}" == "ChromeLinux" ]]; then
-            extra_flags="--html-coverage-report --uncompiled"
-          else
-            extra_flags=""
+            extra_flags+=(--html-coverage-report --uncompiled)
           fi
 
-          filter="${{ github.event.inputs.test_filter }}"
-          if [[ "$filter" != "" ]]; then
-            extra_flags="$extra_flags --filter $filter"
+          if [[ "${{ inputs.test_filter }}" != "" ]]; then
+            echo "Adding filter: ${{ inputs.test_filter }}"
+            extra_flags+=(--filter "${{ inputs.test_filter }}")
           fi
 
+          # Do not automatically fail when a command fails.  This allows us to
+          # implement the ignore_test_status input by capturing the exit code
+          # and examining it.
+          set +e
+          # Run the tests with any extra flags.
           python3 build/test.py \
               --no-build \
               --reporters spec --spec-hide-passed \
@@ -208,7 +257,18 @@ jobs:
               --grid-config build/shaka-lab.yaml \
               --grid-address selenium-grid.lab:4444 \
               --browsers ${{ matrix.browser }} \
-              $extra_flags
+              "${extra_flags[@]}"
+          # Capture the test exit code immediately after running the tests.
+          # There cannot be any other command between test.py and here.
+          exit_code=$?
+
+          # If ignoring test status, treat this as an exit code of 0 (success).
+          if [[ "${{ inputs.ignore_test_status }}" == "true" ]]; then
+            exit_code=0
+          fi
+
+          # Report the captured (and possibly overridden) exit status.
+          exit $exit_code
 
       - name: Find coverage report (ChromeLinux only)
         id: coverage
@@ -252,7 +312,7 @@ jobs:
       # Upload new screenshots and diffs on failure; ignore if missing
       - name: Upload screenshots
         uses: actions/upload-artifact@v3
-        if: ${{ failure() }}
+        if: ${{ failure() || inputs.ignore_test_status }}
         with:
           # In this workflow, "browser" is the selenium node name, which can
           # contain both browser and OS, such as "ChromeLinux".
@@ -264,8 +324,9 @@ jobs:
           retention-days: 5
 
       - name: Report final commit status
-        # Will run on success or failure, but not if the workflow is cancelled.
-        if: ${{ success() || failure() }}
+        # Will run on success or failure, but not if the workflow is cancelled
+        # or if we were asked to ignore the test status.
+        if: ${{ (success() || failure()) && inputs.ignore_test_status == false }}
         uses: ./.github/workflows/custom-actions/set-commit-status
         with:
           context: Selenium / ${{ matrix.browser }}

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

@@ -0,0 +1,142 @@
+name: Update All Screenshots
+# Updates all screenshots on an existing PR, assuming permission has been given
+# to maintainers to make edits.
+
+on:
+  workflow_dispatch:
+    # Allows for manual triggering on PRs.  They should be reviewed first, to
+    # avoid malicious code executing in the lab.
+    inputs:
+      pr:
+        description: "A PR number to build and test in the lab, then update all the screenshots."
+        required: true
+
+jobs:
+  set-pending-status:
+    name: Set Pending Status
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+        with:
+          ref: refs/pull/${{ inputs.pr }}/head
+
+      - name: Set commit status to pending
+        uses: ./.github/workflows/custom-actions/set-commit-status
+        with:
+          context: Update All Screenshots
+          state: pending
+          token: ${{ secrets.GITHUB_TOKEN }}
+
+  run-lab-tests:
+    name: Get Selenium Lab Screenshots
+    needs: [set-pending-status]
+    uses: ./.github/workflows/selenium-lab-tests.yaml
+    with:
+      pr: ${{ inputs.pr }}
+      test_filter: layout
+      ignore_test_status: true
+
+  update-pr:
+    name: Update PR
+    runs-on: ubuntu-latest
+    needs: [run-lab-tests]
+    steps:
+      - uses: actions/checkout@v3
+        with:
+          ref: refs/pull/${{ inputs.pr }}/head
+
+      - name: Set commit status to pending
+        uses: ./.github/workflows/custom-actions/set-commit-status
+        with:
+          context: Update All Screenshots
+          state: pending
+          token: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Get artifacts
+        uses: actions/download-artifact@v3
+        with:
+          path: new-screenshots
+
+      - name: Move screenshots
+        run: |
+          # The download-artifact action puts zip file contents into folders by
+          # the name of the artifact, so we can't have them downloaded directly
+          # to the screenshots folder.  Here we move them into the correct
+          # locations.
+          cd new-screenshots
+
+          # "$i" is a folder for an artifact (eg "screenshots-ChromeAndroid"),
+          # and it contains a single folder with the name we use in our
+          # screenshots (eg "chrome-Android").  We want the contents of that
+          # inner folder to be copied to test/test/assets/screenshots/, where a
+          # folder with the same name (eg "chrome-Android") already exists.
+          for i in screenshots*; do
+            cp -a $i/* ../test/test/assets/screenshots/
+          done
+
+      - name: Update screenshots
+        run: |
+          # Install prerequisites.
+          npm ci
+
+          # Update the official screenshots for any that have visibly changed.
+          # This is not a byte-for-byte comparison, but based on pixel diffs.
+          ./build/updateScreenshots.py
+
+          # Emulate the actions bot.
+          git config user.name "github-actions[bot]"
+          git config user.email "41898282+github-actions[bot]@users.noreply.github.com"
+
+          # Commit the changes.  Ignore failure, in case there are no changes.
+          git add test/test/assets/screenshots/*/*.png || true
+          git commit -m ':robot: Update all screenshots' || true
+
+      - name: Update PR
+        env:
+          GH_TOKEN: ${{ github.token }}
+        run: |
+          # Update the PR.
+          PR_API_URL="/repos/${{ github.repository }}/pulls/${{ inputs.pr }}"
+          REMOTE=$(gh api $PR_API_URL | jq -r .head.repo.html_url)
+          BRANCH=$(gh api $PR_API_URL | jq -r .head.ref)
+
+          # If there were no changes, this will do nothing, but succeed.
+          git push "$REMOTE" HEAD:"$BRANCH"
+
+      - name: Debug
+        uses: mxschmitt/action-tmate@v3.6
+        with:
+          limit-access-to-actor: true
+        if: failure()
+
+  set-final-status:
+    name: Set Final Status
+    runs-on: ubuntu-latest
+    needs: [run-lab-tests, update-pr]
+    # Will run on success or failure, but not if the workflow is cancelled.
+    if: ${{ success() || failure() }}
+    steps:
+      - uses: actions/checkout@v3
+        with:
+          ref: refs/pull/${{ inputs.pr }}/head
+
+      - name: Compute final status
+        id: compute
+        run: |
+          LAB_TEST_STATUS="${{ needs.run-lab-tests.status }}"
+          UPDATE_PR_STATUS="${{ needs.update-pr.status }}"
+
+          # If run-lab-tests succeeded, use the status of update-pr, otherwise
+          # use run-lab-tests (which is "failed" or "error").
+          if [ "$LAB_TEST_STATUS" == "success" ]; then
+            echo "status=$UPDATE_PR_STATUS" >> $GITHUB_OUTPUT
+          else
+            echo "status=$LAST_TEST_STATUS" >> $GITHUB_OUTPUT
+          fi
+
+      - name: Report final status
+        uses: ./.github/workflows/custom-actions/set-commit-status
+        with:
+          context: Update All Screenshots
+          state: ${{ steps.compute.outputs.status }}
+          token: ${{ secrets.GITHUB_TOKEN }}

package/AUTHORS

@@ -17,7 +17,7 @@ Adrián Gómez Llorente <adgllorente@gmail.com>
 AdsWizz <*@adswizz.com>
 Alex Jones <alexedwardjones@gmail.com>
 Alugha GmbH <*@alugha.com>
-Alvaro Velad Galvan <alvaro.velad@mirada.tv>
+Alvaro Velad Galvan <ladvan91@hotmail.com>
 Amila Sampath <lucksy@gmail.com>
 Anthony Stansbridge <github@anthonystansbridge.co.uk>
 Benjamin Wallberg <me@bwallberg.com>
@@ -85,3 +85,4 @@ Vincent Valot <valot.vince@gmail.com>
 Wayne Morgan <wayne.morgan.dev@gmail.com>
 Raymond Cheng <raycheng100@gmail.com>
 Blue Billywig <*@bluebillywig.com>
+Xperi <*@xperi.com>

package/CHANGELOG.md

@@ -1,5 +1,49 @@
 # Changelog
 
+## [3.3.19](https://github.com/shaka-project/shaka-player/compare/v3.3.18...v3.3.19) (2023-04-27)
+
+
+### Bug Fixes
+
+* `config.streaming.preferNativeHls` only applies to HLS streams ([#5167](https://github.com/shaka-project/shaka-player/issues/5167)) ([1dacefc](https://github.com/shaka-project/shaka-player/commit/1dacefc93c4bab4e1200c85f085dba09b0ff09c7)), closes [#5166](https://github.com/shaka-project/shaka-player/issues/5166)
+* **ads:** Fix ads starting muted behavior ([#5153](https://github.com/shaka-project/shaka-player/issues/5153)) ([cbfaa70](https://github.com/shaka-project/shaka-player/commit/cbfaa7074316e00ddd072b107dccd27ef926072d)), closes [#5125](https://github.com/shaka-project/shaka-player/issues/5125)
+* **Ads:** Fix usage of EventManager on CS ([#5084](https://github.com/shaka-project/shaka-player/issues/5084)) ([d412b08](https://github.com/shaka-project/shaka-player/commit/d412b08a83b865a358f46d851ea48825d4125950))
+* **DASH:** Fix seeking on multiperiod content after variant change ([#5110](https://github.com/shaka-project/shaka-player/issues/5110)) ([2ee97e2](https://github.com/shaka-project/shaka-player/commit/2ee97e2873f87968c9403718f55e1b4f85e48668))
+* Fix fetch plugin with old implementations ([#5091](https://github.com/shaka-project/shaka-player/issues/5091)) ([8ddc98e](https://github.com/shaka-project/shaka-player/commit/8ddc98e3d0db4d6582c8814423ef0a38ce829d86))
+* Fix handling of CC when switching between codecs ([#5160](https://github.com/shaka-project/shaka-player/issues/5160)) ([3ea3fb4](https://github.com/shaka-project/shaka-player/commit/3ea3fb4abc8cfc9d52447dab67aa5a8dd3152dc0))
+* Fix HEAD request exception ([#5194](https://github.com/shaka-project/shaka-player/issues/5194)) ([29d6b4c](https://github.com/shaka-project/shaka-player/commit/29d6b4ce7fd9383ab213039e59bfee86e495c00b)), closes [#5164](https://github.com/shaka-project/shaka-player/issues/5164)
+* Fix missing originalUri in response filters ([#5114](https://github.com/shaka-project/shaka-player/issues/5114)) ([626ef1f](https://github.com/shaka-project/shaka-player/commit/626ef1f9c117cc98795c5974b3522f6f35fe3867))
+* Fix race that allows multiple text streams to be loaded ([#5129](https://github.com/shaka-project/shaka-player/issues/5129)) ([1942d1d](https://github.com/shaka-project/shaka-player/commit/1942d1d1ca491c47d6f39cbd60e647a19c84c044))
+* Fix selectVariantsByLabel using src= ([#5154](https://github.com/shaka-project/shaka-player/issues/5154)) ([68c6e7a](https://github.com/shaka-project/shaka-player/commit/68c6e7a299d8feadd6f981d172f81b0b35fa12a9))
+* Handle empty media segments for Mp4VttParser ([#5131](https://github.com/shaka-project/shaka-player/issues/5131)) ([29b7a30](https://github.com/shaka-project/shaka-player/commit/29b7a30b13cc5fea1d9aa79b15eb0ac42cc4e85c)), closes [#4429](https://github.com/shaka-project/shaka-player/issues/4429)
+* **HLS:** Adding support for DTS Express in HLS fMP4 ([#5112](https://github.com/shaka-project/shaka-player/issues/5112)) ([#5117](https://github.com/shaka-project/shaka-player/issues/5117)) ([07e1737](https://github.com/shaka-project/shaka-player/commit/07e173720d1aa098ae3f3d2ea3731205feb39e6f))
+* **net:** Fix HEAD requests in new Chromium ([#5180](https://github.com/shaka-project/shaka-player/issues/5180)) ([ec301e6](https://github.com/shaka-project/shaka-player/commit/ec301e637d1314643f0b2fdfe4c8bcd68ec27f3b)), closes [#5164](https://github.com/shaka-project/shaka-player/issues/5164)
+* PERIOD_FLATTENING_FAILED error with shaka 3.3.x that did not occur with shaka 3.1.2 ([#5188](https://github.com/shaka-project/shaka-player/issues/5188)) ([2cefcf4](https://github.com/shaka-project/shaka-player/commit/2cefcf434dcd729469df94a20673ab9fe7d8d72b)), closes [#5183](https://github.com/shaka-project/shaka-player/issues/5183)
+* Prevent bad calls to MediaSource.endOfStream ([#5071](https://github.com/shaka-project/shaka-player/issues/5071)) ([9824474](https://github.com/shaka-project/shaka-player/commit/98244742ec6add0a7514966b214e0411648e53a9)), closes [#5070](https://github.com/shaka-project/shaka-player/issues/5070)
+* Tizen video error fixed by checking the extended MIME type ([#4973](https://github.com/shaka-project/shaka-player/issues/4973)) ([b663e99](https://github.com/shaka-project/shaka-player/commit/b663e99b9447c5f65746876b4e58ec7e04ee7b7f)), closes [#4634](https://github.com/shaka-project/shaka-player/issues/4634)
+
+## [3.3.18](https://github.com/shaka-project/shaka-player/compare/v3.3.17...v3.3.18) (2023-03-01)
+
+
+### Bug Fixes
+
+* **Ads:** Fix CS volume ad ([#5016](https://github.com/shaka-project/shaka-player/issues/5016)) ([b0bb23c](https://github.com/shaka-project/shaka-player/commit/b0bb23c493d69d88de87b7789e867223fd2919ff))
+* **Ads:** Fix usage of EventManager on CS ([#5017](https://github.com/shaka-project/shaka-player/issues/5017)) ([83f9153](https://github.com/shaka-project/shaka-player/commit/83f915353ff5a180b86a80472a59fa89e0485d15))
+* **ads:** Fix VMAP ads stay muted on muted autoplay ([#4995](https://github.com/shaka-project/shaka-player/issues/4995)) ([1d74f6e](https://github.com/shaka-project/shaka-player/commit/1d74f6e75cf74c90fca720e7769784904a7c2841))
+* Allow the playback of TS without mux.js ([#5041](https://github.com/shaka-project/shaka-player/issues/5041)) ([5784250](https://github.com/shaka-project/shaka-player/commit/578425003e471828ae012025a9a5225f14a1a11a))
+* Caption can not turn off at iOS Safari ([#4978](https://github.com/shaka-project/shaka-player/issues/4978)) ([35f420e](https://github.com/shaka-project/shaka-player/commit/35f420e8283dfc9d8dacbe1a317c4e69e5974cbb))
+* **Demo:** Allow manifest type for DAI custom assets ([#4977](https://github.com/shaka-project/shaka-player/issues/4977)) ([d341f93](https://github.com/shaka-project/shaka-player/commit/d341f93c9091d371eba7d37faad2c76914d31a58))
+* Failed to set 'currentTime' property on 'HTMLMediaElement' on a Hisense TV ([#4962](https://github.com/shaka-project/shaka-player/issues/4962)) ([bda4e50](https://github.com/shaka-project/shaka-player/commit/bda4e50f72d44865e76716894b48f34db225feab))
+* Fallback to isTypeSupported when cast namespace is undefined ([#5012](https://github.com/shaka-project/shaka-player/issues/5012)) ([141f0e3](https://github.com/shaka-project/shaka-player/commit/141f0e384ebe9d31b5df899ef2c4c5d4217a31c9))
+* Fix video/mp2t mimetype conversion. ([#5039](https://github.com/shaka-project/shaka-player/issues/5039)) ([4fd078e](https://github.com/shaka-project/shaka-player/commit/4fd078e23c4148a46a2ddf34165e14c0f8056e97))
+* **HLS:** Add `.tsa` and .`tsv` file extensions as valid MPEG2-TS. ([#5034](https://github.com/shaka-project/shaka-player/issues/5034)) ([a080996](https://github.com/shaka-project/shaka-player/commit/a080996cbc4185a1bec8c08e5fc6a23a75f3e31e))
+* Increase IndexedDB timeout ([#4984](https://github.com/shaka-project/shaka-player/issues/4984)) ([a7bc000](https://github.com/shaka-project/shaka-player/commit/a7bc00056cff3d400f62018948e48acf6d0a9804))
+* **MCap:** Remove robustness when robustness value is default ([#4953](https://github.com/shaka-project/shaka-player/issues/4953)) ([762b1e7](https://github.com/shaka-project/shaka-player/commit/762b1e7b8b0a9f1443cd82ef388e5a3ce04a3f5e))
+* Prevent content from being restarted after Postroll ads ([#4979](https://github.com/shaka-project/shaka-player/issues/4979)) ([acebfa1](https://github.com/shaka-project/shaka-player/commit/acebfa13f04bc15f0d65e2c47a1a7bdbbeea9e1e)), closes [#4445](https://github.com/shaka-project/shaka-player/issues/4445)
+* Reject TS content on Edge ([#5043](https://github.com/shaka-project/shaka-player/issues/5043)) ([982d7bc](https://github.com/shaka-project/shaka-player/commit/982d7bc389d7e9f3a380b64101b7aaa0cccce39e))
+* **VTT:** Fix spacing between text lines ([#4961](https://github.com/shaka-project/shaka-player/issues/4961)) ([a44fe84](https://github.com/shaka-project/shaka-player/commit/a44fe84eddc851faea5276fd25dbbce78ddf3d7a))
+* **WebVTT:** Tags in the WebVTT subtitle are not parsed ([#4960](https://github.com/shaka-project/shaka-player/issues/4960)) ([15afb4b](https://github.com/shaka-project/shaka-player/commit/15afb4b36350da68074a2a1e67e6bb86f9eeddd1))
+
 ## [3.3.17](https://github.com/shaka-project/shaka-player/compare/v3.3.16...v3.3.17) (2023-01-31)
 
 

package/CONTRIBUTORS

@@ -27,7 +27,7 @@ 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>
+Alvaro Velad Galvan <ladvan91@hotmail.com>
 Amila Sampath <lucksy@gmail.com>
 Andy Hochhaus <ahochhaus@samegoal.com>
 Anthony Stansbridge <github@anthonystansbridge.co.uk>
@@ -120,6 +120,9 @@ Vasanth Polipelli <vasanthap@google.com>
 Vignesh Venkatasubramanian <vigneshv@google.com>
 Vincent Valot <valot.vince@gmail.com>
 Wayne Morgan <wayne.morgan.dev@gmail.com>
+Wen Ren <renwen0615@gmail.com>
+Will Harris <will.harris@paramount.com>
 Yohann Connell <robinconnell@google.com>
 Raymond Cheng <raycheng100@gmail.com>
 Janroel Koppen <j.koppen@bluebillywig.com>
+Ashley Manners <ashley.manners@xperi.com>

package/demo/common/asset.js

@@ -76,6 +76,8 @@ const ShakaDemoAssetInfo = class {
     /** @type {?string} */
     this.imaContentSrcId = null;
     /** @type {?string} */
+    this.imaManifestType = null;
+    /** @type {?string} */
     this.mimeType = null;
 
 
@@ -256,6 +258,19 @@ const ShakaDemoAssetInfo = class {
     return this;
   }
 
+  /**
+   * @param {string} type
+   * @return {!ShakaDemoAssetInfo}
+   */
+  setIMAManifestType(type) {
+    this.imaManifestType = type;
+    if (!this.features.includes(shakaAssets.Feature.ADS)) {
+      this.addFeature(shakaAssets.Feature.ADS);
+    }
+
+    return this;
+  }
+
   /**
    * @param {string} headerName
    * @param {string} headerValue

package/demo/common/assets.js

@@ -509,7 +509,8 @@ shakaAssets.testAssets = [
       .addFeature(shakaAssets.Feature.MP4)
       .addFeature(shakaAssets.Feature.OFFLINE)
       .setIMAContentSourceId('2528370')
-      .setIMAVideoId('tears-of-steel'),
+      .setIMAVideoId('tears-of-steel')
+      .setIMAManifestType('HLS'),
   new ShakaDemoAssetInfo(
       /* name= */ 'Tears of Steel (live, DASH, Server Side ads)',
       /* iconUri= */ 'https://storage.googleapis.com/shaka-asset-icons/tears_of_steel.png',
@@ -519,7 +520,8 @@ shakaAssets.testAssets = [
       .addFeature(shakaAssets.Feature.MP4)
       .addFeature(shakaAssets.Feature.SUBTITLES)
       .addFeature(shakaAssets.Feature.LIVE)
-      .setIMAAssetKey('PSzZMzAkSXCmlJOWDmRj8Q'),
+      .setIMAAssetKey('PSzZMzAkSXCmlJOWDmRj8Q')
+      .setIMAManifestType('DASH'),
   new ShakaDemoAssetInfo(
       /* name= */ 'Tears of Steel (multicodec, surround + stereo)',
       /* iconUri= */ 'https://storage.googleapis.com/shaka-asset-icons/tears_of_steel.png',

package/demo/common/message_ids.js

@@ -96,6 +96,7 @@ shakaDemo.MessageIds = {
   ADS_TAB: 'DEMO_ADS_TAB',
   IMA_ASSET_KEY: 'DEMO_IMA_ASSET_KEY',
   IMA_CONTENT_SRC_ID: 'DEMO_IMA_CONTENT_SRC_ID',
+  IMA_MANIFEST_TYPE: 'DEMO_IMA_MANIFEST_TYPE',
   IMA_VIDEO_ID: 'DEMO_IMA_VIDEO_ID',
   CANCEL_BUTTON: 'DEMO_CANCEL_BUTTON',
   CUSTOM_INTRO_ONE: 'DEMO_CUSTOM_INTRO_ONE',

package/demo/custom.js

@@ -328,6 +328,25 @@ shakaDemo.Custom = class {
     this.makeField_(
         container, assetKeyName, assetKeySetup, assetKeyChange);
 
+    // Make the manifest type field.
+    const manifestTypeSetup = (input, container) => {
+      if (assetInProgress.imaManifestType) {
+        input.value = assetInProgress.imaManifestType;
+      }
+
+      this.manifestField_.required =
+        this.checkManifestRequired_(assetInProgress);
+    };
+    const manifestTypeChange = (input) => {
+      assetInProgress.imaManifestType = input.value;
+      this.manifestField_.required =
+        this.checkManifestRequired_(assetInProgress);
+    };
+    const manifestTypeName = shakaDemoMain.getLocalizedString(
+        shakaDemo.MessageIds.IMA_MANIFEST_TYPE);
+    this.makeField_(
+        container, manifestTypeName, manifestTypeSetup, manifestTypeChange);
+
     return adsDiv;
   }
 

package/demo/locales/en.json

@@ -97,6 +97,7 @@
   "DEMO_IGNORE_HLS_TEXT_FAILURES": "Ignore HLS Text Stream Failures",
   "DEMO_IMA_ASSET_KEY": "Asset key (for LIVE DAI Content)",
   "DEMO_IMA_CONTENT_SRC_ID": "Content source ID (for VOD DAI Content)",
+  "DEMO_IMA_MANIFEST_TYPE": "Manifest type (for DAI Content)",
   "DEMO_IMA_VIDEO_ID": "Video ID (for VOD DAI Content)",
   "DEMO_IGNORE_MIN_BUFFER_TIME": "Ignore Min Buffer Time",
   "DEMO_IGNORE_TEXT_FAILURES": "Ignore Text Stream Failures",

package/demo/locales/source.json

@@ -391,6 +391,10 @@
     "description": "The label on a field that allows users to provide a content source id for a custom asset.",
     "message": "Asset key (for VOD DAI Content)"
   },
+  "DEMO_IMA_MANIFEST_TYPE": {
+    "description": "The label on a field that allows users to provide a manifest type for a custom asset.",
+    "message": "Manifest type (for DAI Content)"
+  },
   "DEMO_IMA_VIDEO_ID": {
     "description": "The label on a field that allows users to provide a video id for a custom asset.",
     "message": "Video ID (for VOD DAI Content)"

package/demo/main.js

@@ -1502,6 +1502,20 @@ shakaDemo.Main = class {
         request.contentSourceId = asset.imaContentSrcId;
         request.videoId = asset.imaVideoId;
       }
+      switch (asset.imaManifestType) {
+        case 'DASH':
+        case 'dash':
+        case 'MPD':
+        case 'mpd':
+          request.format = google.ima.dai.api.StreamRequest.StreamFormat.DASH;
+          break;
+        case 'HLS':
+        case 'hls':
+        case 'M3U8':
+        case 'm3u8':
+          request.format = google.ima.dai.api.StreamRequest.StreamFormat.HLS;
+          break;
+      }
 
       const uri = await adManager.requestServerSideStream(
           request, /* backupUri= */ asset.manifestUri);

package/dist/controls.css

@@ -51,4 +51,4 @@
  * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
- */.shaka-tooltips-on{overflow:visible}.shaka-tooltips-on>[class*=shaka-tooltip]{position:relative}.shaka-tooltips-on>[class*=shaka-tooltip]:active:after,.shaka-tooltips-on>[class*=shaka-tooltip]:focus-visible:after,.shaka-tooltips-on>[class*=shaka-tooltip]:hover:after{content:attr(aria-label);font-family:Roboto-Regular,Roboto,sans-serif;line-height:calc(32px / 2);white-space:nowrap;font-size:13px;background:rgba(35 35 35 / 90%);color:#fff;border-radius:3px;padding:5px 10px;position:absolute;bottom:calc(32px + 5px);left:calc(32px / 2);-webkit-transform:translateX(-50%);-moz-transform:translateX(-50%);-ms-transform:translateX(-50%);-o-transform:translateX(-50%);transform:translateX(-50%)}.shaka-tooltips-on>.shaka-tooltip-status:active:after,.shaka-tooltips-on>.shaka-tooltip-status:focus-visible:after,.shaka-tooltips-on>.shaka-tooltip-status:hover:after{content:attr(aria-label) " (" attr(shaka-status) ")"}.shaka-tooltips-on button:first-child:active:after,.shaka-tooltips-on button:first-child:focus-visible:after,.shaka-tooltips-on button:first-child:hover:after{left:0;-webkit-transform:translateX(0);-moz-transform:translateX(0);-ms-transform:translateX(0);-o-transform:translateX(0);transform:translateX(0)}.shaka-tooltips-on button:last-child:active:after,.shaka-tooltips-on button:last-child:focus-visible:after,.shaka-tooltips-on button:last-child:hover:after{left:32px;-webkit-transform:translateX(-100%);-moz-transform:translateX(-100%);-ms-transform:translateX(-100%);-o-transform:translateX(-100%);transform:translateX(-100%)}@font-face{font-family:Roboto;font-style:normal;font-weight:400;src:url(https://fonts.gstatic.com/s/roboto/v30/KFOmCnqEu92Fr1Mu4mxP.ttf) format('truetype')}@font-face{font-family:'Material Icons Round';font-style:normal;font-weight:400;src:url(https://fonts.gstatic.com/s/materialiconsround/v107/LDItaoyNOAY6Uewc665JcIzCKsKc_M9flwmM.otf) format('opentype')}.material-icons-round{font-family:'Material Icons Round';font-weight:400;font-style:normal;font-size:24px;line-height:1;letter-spacing:normal;text-transform:none;display:inline-block;white-space:nowrap;word-wrap:normal;direction:ltr}/*# sourceMappingURL=controls.css.map */
+ */.shaka-tooltips-on{overflow:visible}.shaka-tooltips-on>[class*=shaka-tooltip]{position:relative}.shaka-tooltips-on>[class*=shaka-tooltip]:active:after,.shaka-tooltips-on>[class*=shaka-tooltip]:focus-visible:after,.shaka-tooltips-on>[class*=shaka-tooltip]:hover:after{content:attr(aria-label);font-family:Roboto-Regular,Roboto,sans-serif;line-height:calc(32px / 2);white-space:nowrap;font-size:13px;background:rgba(35 35 35 / 90%);color:#fff;border-radius:3px;padding:5px 10px;position:absolute;bottom:calc(32px + 5px);left:calc(32px / 2);-webkit-transform:translateX(-50%);-moz-transform:translateX(-50%);-ms-transform:translateX(-50%);-o-transform:translateX(-50%);transform:translateX(-50%)}.shaka-tooltips-on>.shaka-tooltip-status:active:after,.shaka-tooltips-on>.shaka-tooltip-status:focus-visible:after,.shaka-tooltips-on>.shaka-tooltip-status:hover:after{content:attr(aria-label) " (" attr(shaka-status) ")"}.shaka-tooltips-on button:first-child:active:after,.shaka-tooltips-on button:first-child:focus-visible:after,.shaka-tooltips-on button:first-child:hover:after{left:0;-webkit-transform:translateX(0);-moz-transform:translateX(0);-ms-transform:translateX(0);-o-transform:translateX(0);transform:translateX(0)}.shaka-tooltips-on button:last-child:active:after,.shaka-tooltips-on button:last-child:focus-visible:after,.shaka-tooltips-on button:last-child:hover:after{left:32px;-webkit-transform:translateX(-100%);-moz-transform:translateX(-100%);-ms-transform:translateX(-100%);-o-transform:translateX(-100%);transform:translateX(-100%)}@font-face{font-family:Roboto;font-style:normal;font-weight:400;src:url(https://fonts.gstatic.com/s/roboto/v30/KFOmCnqEu92Fr1Mu4mxP.ttf) format('truetype')}@font-face{font-family:'Material Icons Round';font-style:normal;font-weight:400;src:url(https://fonts.gstatic.com/s/materialiconsround/v108/LDItaoyNOAY6Uewc665JcIzCKsKc_M9flwmM.otf) format('opentype')}.material-icons-round{font-family:'Material Icons Round';font-weight:400;font-style:normal;font-size:24px;line-height:1;letter-spacing:normal;text-transform:none;display:inline-block;white-space:nowrap;word-wrap:normal;direction:ltr}/*# sourceMappingURL=controls.css.map */