shaka-player 4.3.11 → 4.3.13

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

@@ -29,8 +29,6 @@ jobs:
       - uses: actions/checkout@v3
         if: steps.release.outputs.release_created == false
         with:
-          # Checkout the fork, where the PR is generated from.
-          repository: shaka-bot/${{ github.event.repository.name }}
           # Use a special shaka-bot access token for releases.
           token: ${{ secrets.RELEASE_PLEASE_TOKEN }}
       - name: Custom update Player version
@@ -63,8 +61,7 @@ jobs:
     steps:
       - uses: actions/checkout@v3
         with:
-          # Check out the origin repo, not the fork, and do it at main, not the
-          # PR branch.
+          # 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 }}
@@ -93,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
@@ -137,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"

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

@@ -25,7 +25,7 @@ WORKFLOW_ARGS=( "pr=$PR_NUMBER" )
 
 case "${SHAKA_BOT_ARGUMENTS[0]}" in
   # CE devices only.
-  ce) WORKFLOW_ARGS+=( "browser_filter=Tizen Chromecast ChromeAndroid" ) ;;
+  ce) WORKFLOW_ARGS+=( "browser_filter=Tizen ChromecastUltra ChromecastGTV ChromeAndroid" ) ;;
 
   # No command argument, no extra workflow arguments.
   "") ;;

package/CHANGELOG.md

@@ -1,5 +1,39 @@
 # Changelog
 
+## [4.3.13](https://github.com/shaka-project/shaka-player/compare/v4.3.12...v4.3.13) (2023-10-04)
+
+
+### Bug Fixes
+
+* Allow PID change in TsParser ([#5681](https://github.com/shaka-project/shaka-player/issues/5681)) ([2fcc812](https://github.com/shaka-project/shaka-player/commit/2fcc8129db517ac41745785c70af3406a725c0b4))
+* **CMCD:** Fix CMCD for some mimetypes in src= ([#5699](https://github.com/shaka-project/shaka-player/issues/5699)) ([28bb5d1](https://github.com/shaka-project/shaka-player/commit/28bb5d139d2bbcfe5bb58b7691d9543868cce0be))
+* **Demo:** Fix url of "Low Latency HLS Live" asset ([#5708](https://github.com/shaka-project/shaka-player/issues/5708)) ([728cbfc](https://github.com/shaka-project/shaka-player/commit/728cbfc7b3b028cd5f9ba958e959c9a40234091b))
+* Fix creation of new Stream object for each manifest request in DASH Live when using CEA ([#5674](https://github.com/shaka-project/shaka-player/issues/5674)) ([d9223ee](https://github.com/shaka-project/shaka-player/commit/d9223eef8255e8ac698f23cd7115ef6a388e613c))
+* **HLS:** Fix audio and video out of sync ([#5658](https://github.com/shaka-project/shaka-player/issues/5658)) ([cb9789e](https://github.com/shaka-project/shaka-player/commit/cb9789e6ab084dd7ba77a232bb90f0fdb1c9bc53))
+* **HLS:** Fix display CEA-708 in HLS ([#5694](https://github.com/shaka-project/shaka-player/issues/5694)) ([b639b55](https://github.com/shaka-project/shaka-player/commit/b639b550b692e466c8513f2801d5a7c36b125643))
+* **HLS:** Fix presentation delay for small live playlists (eg: 3-4 segments) ([#5687](https://github.com/shaka-project/shaka-player/issues/5687)) ([ef827a0](https://github.com/shaka-project/shaka-player/commit/ef827a07abe5c0b6514a89d121294fc562d8c17f))
+* **HLS:** Skip segments without duration and without partial segments ([#5705](https://github.com/shaka-project/shaka-player/issues/5705)) ([96dfcc6](https://github.com/shaka-project/shaka-player/commit/96dfcc609ae40b64d79c27a4f75b34c212fc714d))
+* **HLS:** Support AES-128 in init segment according the RFC ([#5677](https://github.com/shaka-project/shaka-player/issues/5677)) ([d30c571](https://github.com/shaka-project/shaka-player/commit/d30c5719ba3e8ee5d53e02100178fdb8ab34df10))
+* **WebVTT:** Fix text displayed out of picture and with overlapping lines ([#5662](https://github.com/shaka-project/shaka-player/issues/5662)) ([ee898e9](https://github.com/shaka-project/shaka-player/commit/ee898e9eceb5fe6bbc27e72d11318962f7a574eb)), closes [#5661](https://github.com/shaka-project/shaka-player/issues/5661)
+
+
+### Performance Improvements
+
+* Optimization to resolve uris ([#5657](https://github.com/shaka-project/shaka-player/issues/5657)) ([0ad925b](https://github.com/shaka-project/shaka-player/commit/0ad925b9eadfe844ce65b341cab5403889786309))
+
+## [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)
 
 

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/common/asset.js

@@ -165,6 +165,11 @@ const ShakaDemoAssetInfo = class {
     return this.drm.length == 1 && this.drm[0] == shakaAssets.KeySystem.CLEAR;
   }
 
+  /** @return {boolean} */
+  isAes128() {
+    return this.drm.length == 1 && this.drm[0] == shakaAssets.KeySystem.AES128;
+  }
+
   /**
    * @param {string} mediaPlaylistFullMimeType
    * @return {!ShakaDemoAssetInfo}

package/demo/common/assets.js

@@ -50,6 +50,7 @@ shakaAssets.KeySystem = {
   FAIRPLAY: shakaDemo.MessageIds.FAIRPLAY,
   PLAYREADY: shakaDemo.MessageIds.PLAYREADY,
   WIDEVINE: shakaDemo.MessageIds.WIDEVINE,
+  AES128: shakaDemo.MessageIds.AES128,
   CLEAR: shakaDemo.MessageIds.CLEAR,
 };
 
@@ -88,6 +89,7 @@ shakaAssets.identifierForKeySystem = (keySystem) => {
     case KeySystem.FAIRPLAY: return 'com.apple.fps';
     case KeySystem.PLAYREADY: return 'com.microsoft.playready';
     case KeySystem.WIDEVINE: return 'com.widevine.alpha';
+    case KeySystem.AES128: return 'aes128';
     default: return 'no drm protection';
   }
 };
@@ -355,6 +357,7 @@ shakaAssets.testAssets = [
       /* iconUri= */ 'https://storage.googleapis.com/shaka-asset-icons/sintel.png',
       /* manifestUri= */ 'https://storage.googleapis.com/shaka-demo-assets/sintel-ts-aes-key-rotation/master.m3u8',
       /* source= */ shakaAssets.Source.SHAKA)
+      .addKeySystem(shakaAssets.KeySystem.AES128)
       .addFeature(shakaAssets.Feature.HLS)
       .addFeature(shakaAssets.Feature.MP2TS)
       .addFeature(shakaAssets.Feature.OFFLINE),
@@ -363,6 +366,7 @@ shakaAssets.testAssets = [
       /* iconUri= */ 'https://storage.googleapis.com/shaka-asset-icons/sintel.png',
       /* manifestUri= */ 'https://storage.googleapis.com/shaka-demo-assets/sintel-fmp4-aes/master.m3u8',
       /* source= */ shakaAssets.Source.SHAKA)
+      .addKeySystem(shakaAssets.KeySystem.AES128)
       .addFeature(shakaAssets.Feature.HLS)
       .addFeature(shakaAssets.Feature.MP4)
       .addFeature(shakaAssets.Feature.OFFLINE),
@@ -931,6 +935,7 @@ shakaAssets.testAssets = [
       /* iconUri= */ 'https://storage.googleapis.com/shaka-asset-icons/art_of_motion.png',
       /* manifestUri= */ 'https://bitmovin-a.akamaihd.net/content/art-of-motion_drm/m3u8s/11331.m3u8',
       /* source= */ shakaAssets.Source.BITCODIN)
+      .addKeySystem(shakaAssets.KeySystem.AES128)
       .addFeature(shakaAssets.Feature.HIGH_DEFINITION)
       .addFeature(shakaAssets.Feature.HLS)
       .addFeature(shakaAssets.Feature.MP2TS)
@@ -1060,6 +1065,16 @@ shakaAssets.testAssets = [
         kind: 'subtitle',
         mime: 'text/vtt',
       }),
+  new ShakaDemoAssetInfo(
+      /* name= */ 'Sintel (DASH, AES-128)',
+      /* iconUri= */ 'https://storage.googleapis.com/shaka-asset-icons/sintel.png',
+      /* manifestUri= */ 'https://amssamples.streaming.mediaservices.windows.net/49b57c87-f5f3-48b3-ba22-c55cfdffa9cb/Sintel.ism/manifest(format=mpd-time-csf)',
+      /* source= */ shakaAssets.Source.AZURE_MEDIA_SERVICES)
+      .addKeySystem(shakaAssets.KeySystem.AES128)
+      .addFeature(shakaAssets.Feature.DASH)
+      .addFeature(shakaAssets.Feature.MP4)
+      .addFeature(shakaAssets.Feature.HIGH_DEFINITION)
+      .addFeature(shakaAssets.Feature.OFFLINE),
   // End Azure Media Services assets }}}
 
   // GPAC assets {{{
@@ -1227,7 +1242,7 @@ shakaAssets.testAssets = [
   new ShakaDemoAssetInfo(
       /* name= */ 'Low Latency HLS Live',
       /* iconUri= */ 'https://storage.googleapis.com/shaka-asset-icons/apple_test_pattern.png',
-      /* manifestUri= */ 'https://ll-hls-test.apple.com/cmaf/master.m3u8',
+      /* manifestUri= */ 'https://ll-hls-test.cdn-apple.com/llhls4/ll-hls-test-04/multi.m3u8',
       /* source= */ shakaAssets.Source.APPLE)
       .addFeature(shakaAssets.Feature.HLS)
       .addFeature(shakaAssets.Feature.LIVE)

package/demo/common/message_ids.js

@@ -33,6 +33,7 @@ shakaDemo.MessageIds = {
   WEBM: 'DEMO_WEBM',
   XLINK: 'DEMO_XLINK',
   /* Key systems. */
+  AES128: 'DEMO_AES128',
   CLEAR: 'DEMO_CLEAR',
   CLEAR_KEY: 'DEMO_CLEAR_KEY',
   FAIRPLAY: 'DEMO_FAIRPLAY',

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/demo/locales/en.json

@@ -5,6 +5,7 @@
   "DEMO_AD_SEARCH": "Filters for assets that have advertisements.",
   "DEMO_AD_TAG_URL": "Ad Tag URL",
   "DEMO_ADS_TAB": "Ads",
+  "DEMO_AES128": "AES-128 protection",
   "DEMO_ALL_CONTENT": "ALL CONTENT",
   "DEMO_ALWAYS_STREAM_TEXT": "Always Stream Text",
   "DEMO_ALWAYS_STREAM_TEXT_WARNING": "Text must always be streamed while native controls are enabled, for captions to work.",

package/demo/locales/source.json

@@ -23,6 +23,10 @@
     "description": "The label on a field that allows users to provide a Ad Tag URL for a custom asset.",
     "message": "Ad Tag URL"
   },
+  "DEMO_AES128": {
+    "description": "Text that describes an asset that is not protected with any Digital Rights Management system but it is protected with AES-128.",
+    "message": "[JARGON:AES-128] protection"
+  },
   "DEMO_ALL_CONTENT": {
     "description": "A link in the header, that switches to a page for browsing or searching through the entire content library.",
     "message": "ALL CONTENT"

package/demo/main.js

@@ -715,7 +715,7 @@ shakaDemo.Main = class {
       return shakaDemo.MessageIds.UNSUPPORTED_NO_DOWNLOAD;
     }
 
-    if (!asset.isClear()) {
+    if (!asset.isClear() && !asset.isAes128()) {
       const hasSupportedDRM = asset.drm.some((drm) => {
         return this.support_.drm[shakaAssets.identifierForKeySystem(drm)];
       });