shaka-project · avelad · Jul 2, 2024 · Jul 2, 2024
diff --git a/demo/common/assets.js b/demo/common/assets.js
@@ -41,6 +41,7 @@ shakaAssets.Source = {
   EZDRM: 'EZDRM',
   THEO_PLAYER: 'THEOplayer',
   JWPLAYER: 'JW Player',
+  BBC: 'BBC',
 };
 
 
@@ -1686,5 +1687,39 @@ shakaAssets.testAssets = [
         defaultVrProjectionMode: 'equirectangular',
       }),
   // }}}
+
+  // BBC assets {{{
+  /* BBC Contents */
+  new ShakaDemoAssetInfo(
+      /* name= */ 'On-demand Testcard - WOFF Font Download signalled with supplemental property descriptor',
+      /* iconUri= */ '',
+      /* manifestUri= */ 'https://rdmedia.bbc.co.uk/testcard/vod/manifests/avc-ctv-stereo-en-sfdt-woff.mpd',
+      /* source= */ shakaAssets.Source.BBC)
+      .addFeature(shakaAssets.Feature.HIGH_DEFINITION)
+      .addFeature(shakaAssets.Feature.MP4),
+  new ShakaDemoAssetInfo(
+      /* name= */ 'On-demand Testcard - WOFF Font Download signalled with essential property descriptor',
+      /* iconUri= */ '',
+      /* manifestUri= */ 'https://rdmedia.bbc.co.uk/testcard/vod/manifests/avc-ctv-stereo-en-efdt-woff.mpd',
+      /* source= */ shakaAssets.Source.BBC)
+      .addFeature(shakaAssets.Feature.HIGH_DEFINITION)
+      .addFeature(shakaAssets.Feature.MP4),
+  new ShakaDemoAssetInfo(
+      /* name= */ 'Live Testcard - WOFF Font Download signalled with supplemental property descriptor',
+      /* iconUri= */ '',
+      /* manifestUri= */ 'https://rdmedia.bbc.co.uk/testcard/simulcast/manifests/avc-ctv-stereo-en-sfdt-woff.mpd',
+      /* source= */ shakaAssets.Source.BBC)
+      .addFeature(shakaAssets.Feature.HIGH_DEFINITION)
+      .addFeature(shakaAssets.Feature.MP4)
+      .addFeature(shakaAssets.Feature.LIVE),
+  new ShakaDemoAssetInfo(
+      /* name= */ 'Live Testcard - WOFF Font Download signalled with essential property descriptor',
+      /* iconUri= */ '',
+      /* manifestUri= */ 'https://rdmedia.bbc.co.uk/testcard/simulcast/manifests/avc-ctv-stereo-en-efdt-woff.mpd',
+      /* source= */ shakaAssets.Source.BBC)
+      .addFeature(shakaAssets.Feature.HIGH_DEFINITION)
+      .addFeature(shakaAssets.Feature.MP4)
+      .addFeature(shakaAssets.Feature.LIVE),
+  // }}}
 ];
 /* eslint-enable max-len */
diff --git a/externs/font_face_set.js b/externs/font_face_set.js
@@ -0,0 +1,17 @@
+/*! @license
+ * Shaka Player
+ * Copyright 2016 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/**
+ * @fileoverview Externs for FontFaceSet which were missing in the
+ * Closure compiler.
+ *
+ * @externs
+ */
+
+/**
+ * @return {!Array.<FontFace>}
+ */
+FontFaceSet.prototype.values = function() {};
diff --git a/externs/shaka/manifest_parser.js b/externs/shaka/manifest_parser.js
@@ -139,7 +139,8 @@ shaka.extern.ManifestParser = class {
  *   getBandwidthEstimate: function():number,
  *   onMetadata: function(string, number, ?number,
  *                        !Array.<shaka.extern.MetadataFrame>),
- *   disableStream: function(!shaka.extern.Stream)
+ *   disableStream: function(!shaka.extern.Stream),
+ *   addFont: function(string, string)
  * }}
  *
  * @description
@@ -184,6 +185,8 @@ shaka.extern.ManifestParser = class {
  * @property {function(!shaka.extern.Stream)} disableStream
  *   Called to temporarily disable a stream i.e. disabling all variant
  *   containing said stream.
+ * @property {function(string, string)} addFont
+ *   Called when a new font needs to be added.
  * @exportDoc
  */
 shaka.extern.ManifestParser.PlayerInterface;

diff --git a/lib/dash/dash_parser.js b/lib/dash/dash_parser.js
@@ -1672,6 +1672,12 @@ shaka.dash.DashParser = class {
       } else if (schemeId == 'urn:mpeg:dash:ssr:2023' &&
           this.config_.dash.enableFastSwitching) {
         isFastSwitching = true;
+      } else if (schemeId == 'urn:dvb:dash:fontdownload:2014') {
+        const fontFamily = prop.attributes['dvb:fontFamily'];
+        const fontUrl = prop.attributes['dvb:url'];
+        if (fontFamily && fontUrl) {
+          this.playerInterface_.addFont(fontFamily, fontUrl);
+        }
       } else {
         unrecognizedEssentialProperty = true;
       }
@@ -1693,6 +1699,12 @@ shaka.dash.DashParser = class {
         colorGamut = getColorGamutFromColourPrimariesCICP(
             parseInt(prop.attributes['value'], 10),
         );
+      } else if (schemeId == 'urn:dvb:dash:fontdownload:2014') {
+        const fontFamily = prop.attributes['dvb:fontFamily'];
+        const fontUrl = prop.attributes['dvb:url'];
+        if (fontFamily && fontUrl) {
+          this.playerInterface_.addFont(fontFamily, fontUrl);
+        }
       }
     }
 

diff --git a/lib/offline/storage.js b/lib/offline/storage.js
@@ -1180,6 +1180,7 @@ shaka.offline.Storage = class {
       getBandwidthEstimate: () => config.abr.defaultBandwidthEstimate,
       onMetadata: () => {},
       disableStream: (stream) => {},
+      addFont: (name, url) => {},
     };
 
     parser.configure(config.manifest);

diff --git a/lib/player.js b/lib/player.js
@@ -2109,6 +2109,7 @@ shaka.Player = class extends shaka.util.FakeEventTarget {
       },
       disableStream: (stream) => this.disableStream(
           stream, this.config_.streaming.maxDisabledTime),
+      addFont: (name, url) => this.addFont(name, url),
     };
     const regionTimeline =
         new shaka.media.RegionTimeline(() => this.seekRange());
@@ -7322,6 +7323,30 @@ shaka.Player = class extends shaka.util.FakeEventTarget {
     }
   }
 
+  /**
+   * Load a new font on the page. If the font was already loaded, it does
+   * nothing.
+   *
+   * @param {string} name
+   * @param {string} url
+   */
+  async addFont(name, url) {
+    if ('fonts' in document && 'FontFace' in window ) {
+      await document.fonts.ready;
+      if (!('values' in document.fonts)) {
+        return;
+      }
+      for (const fontFace of document.fonts.values()) {
+        if (fontFace.family == name && fontFace.display == 'swap') {
+          // Font already loaded.
+          return;
+        }
+      }
+      const fontFace = new FontFace(name, `url(${url})`, {display: 'swap'});
+      document.fonts.add(fontFace);
+    }
+  }
+
   /**
    * When we fire region events, we need to copy the information out of the
    * region to break the connection with the player's internal data. We do the

diff --git a/test/cast/cast_utils_unit.js b/test/cast/cast_utils_unit.js
@@ -33,6 +33,7 @@ describe('CastUtils', () => {
       'preload',
       'destroyAllPreloads',
       'getNonDefaultConfiguration',
+      'addFont',
 
       // Test helper methods (not @export'd)
       'createDrmEngine',

diff --git a/test/dash/dash_parser_content_protection_unit.js b/test/dash/dash_parser_content_protection_unit.js
@@ -48,6 +48,7 @@ describe('DashParser ContentProtection', () => {
       getBandwidthEstimate: () => 1e6,
       onMetadata: () => {},
       disableStream: (stream) => {},
+      addFont: (name, url) => {},
     };
 
     const actual = await dashParser.start(

diff --git a/test/dash/dash_parser_live_unit.js b/test/dash/dash_parser_live_unit.js
@@ -40,6 +40,7 @@ describe('DashParser Live', () => {
       getBandwidthEstimate: () => 1e6,
       onMetadata: () => {},
       disableStream: (stream) => {},
+      addFont: (name, url) => {},
     };
   });
 

diff --git a/test/dash/dash_parser_manifest_unit.js b/test/dash/dash_parser_manifest_unit.js
@@ -16,6 +16,8 @@ describe('DashParser Manifest', () => {
   let parser;
   /** @type {!jasmine.Spy} */
   let onEventSpy;
+  /** @type {!jasmine.Spy} */
+  let addFontSpy;
   /** @type {shaka.extern.ManifestParser.PlayerInterface} */
   let playerInterface;
   /** @type {!ArrayBuffer} */
@@ -40,6 +42,7 @@ describe('DashParser Manifest', () => {
     fakeNetEngine = new shaka.test.FakeNetworkingEngine();
     parser = shaka.test.Dash.makeDashParser();
     onEventSpy = jasmine.createSpy('onEvent');
+    addFontSpy = jasmine.createSpy('addFont');
     playerInterface = {
       networkingEngine: fakeNetEngine,
       modifyManifestRequest: (request, manifestInfo) => {},
@@ -58,6 +61,7 @@ describe('DashParser Manifest', () => {
       getBandwidthEstimate: () => 1e6,
       onMetadata: () => {},
       disableStream: (stream) => {},
+      addFont: shaka.test.Util.spyFunc(addFontSpy),
     };
   });
 
@@ -3190,4 +3194,39 @@ describe('DashParser Manifest', () => {
     const manifest = await parser.start('dummy://foo', playerInterface);
     expect(manifest.gapCount).toBe(1);
   });
+
+  it('supports dvb fonts', async () => {
+    const manifestText = [
+      '<MPD type="static">',
+      '  <Period id="1" duration="PT30S">',
+      '    <AdaptationSet id="2" mimeType="video/mp4">',
+      '      <SupplementalProperty',
+      '         schemeIdUri="urn:dvb:dash:fontdownload:2014"',
+      '         value="1" dvb:url="foo.woff"',
+      '         dvb:mimeType="application/font-woff" dvb:fontFamily="foo"/>',
+      '      <Representation id="video" bandwidth="1">',
+      '        <SegmentBase indexRange="100-200" />',
+      '      </Representation>',
+      '    </AdaptationSet>',
+      '  </Period>',
+      '  <Period id="2" start="PT31S" duration="PT30S">',
+      '    <AdaptationSet id="2" mimeType="video/mp4">',
+      '      <EssentialProperty schemeIdUri="urn:dvb:dash:fontdownload:2014"',
+      '         value="1" dvb:url="foo2.woff"',
+      '         dvb:mimeType="application/font-woff" dvb:fontFamily="foo2"/>',
+      '      <Representation id="video" bandwidth="1">',
+      '        <SegmentBase indexRange="100-200" />',
+      '      </Representation>',
+      '    </AdaptationSet>',
+      '  </Period>',
+      '</MPD>',
+    ].join('\n');
+
+    fakeNetEngine.setResponseText('dummy://foo', manifestText);
+
+    await parser.start('dummy://foo', playerInterface);
+    expect(addFontSpy).toHaveBeenCalledTimes(2);
+    expect(addFontSpy).toHaveBeenCalledWith('foo', 'foo.woff');
+    expect(addFontSpy).toHaveBeenCalledWith('foo2', 'foo2.woff');
+  });
 });
diff --git a/test/dash/dash_parser_patch_unit.js b/test/dash/dash_parser_patch_unit.js
@@ -51,6 +51,7 @@ describe('DashParser Patch', () => {
       getBandwidthEstimate: () => 1e6,
       onMetadata: () => {},
       disableStream: (stream) => {},
+      addFont: (name, url) => {},
     };
     Date.now = () => publishTime.getTime() + 10;
 

diff --git a/test/dash/dash_parser_segment_base_unit.js b/test/dash/dash_parser_segment_base_unit.js
@@ -44,6 +44,7 @@ describe('DashParser SegmentBase', () => {
       getBandwidthEstimate: () => 1e6,
       onMetadata: () => {},
       disableStream: (stream) => {},
+      addFont: (name, url) => {},
     };
   });
 

diff --git a/test/dash/dash_parser_segment_list_unit.js b/test/dash/dash_parser_segment_list_unit.js
@@ -354,6 +354,7 @@ describe('DashParser SegmentList', () => {
       getBandwidthEstimate: () => 1e6,
       onMetadata: () => {},
       disableStream: (stream) => {},
+      addFont: (name, url) => {},
     };
     try {
       const manifest = await dashParser.start('dummy://foo', playerInterface);

diff --git a/test/dash/dash_parser_segment_template_unit.js b/test/dash/dash_parser_segment_template_unit.js
@@ -53,6 +53,7 @@ describe('DashParser SegmentTemplate', () => {
       getBandwidthEstimate: () => 1e6,
       onMetadata: () => {},
       disableStream: (stream) => {},
+      addFont: (name, url) => {},
     };
   });
 

diff --git a/test/hls/hls_live_unit.js b/test/hls/hls_live_unit.js
@@ -83,6 +83,7 @@ describe('HlsParser live', () => {
       getBandwidthEstimate: () => 1e6,
       onMetadata: () => {},
       disableStream: (stream) => {},
+      addFont: (name, url) => {},
     };
 
     parser = new shaka.hls.HlsParser();

diff --git a/test/hls/hls_parser_unit.js b/test/hls/hls_parser_unit.js
@@ -97,6 +97,7 @@ describe('HlsParser', () => {
       getBandwidthEstimate: () => 1e6,
       onMetadata: shaka.test.Util.spyFunc(onMetadataSpy),
       disableStream: (stream) => {},
+      addFont: (name, url) => {},
     };
 
     parser = new shaka.hls.HlsParser();

diff --git a/test/mss/mss_parser_unit.js b/test/mss/mss_parser_unit.js
@@ -83,6 +83,7 @@ describe('MssParser Manifest', () => {
       getBandwidthEstimate: () => 1e6,
       onMetadata: () => {},
       disableStream: (stream) => {},
+      addFont: (name, url) => {},
     };
   });
 

diff --git a/test/test/util/dash_parser_util.js b/test/test/util/dash_parser_util.js
@@ -49,6 +49,7 @@ shaka.test.Dash = class {
       getBandwidthEstimate: () => 1e6,
       onMetadata: () => {},
       disableStream: (stream) => {},
+      addFont: (name, url) => {},
     };
     try {
       const manifest = await dashParser.start('dummy://foo', playerInterface);
@@ -93,6 +94,7 @@ shaka.test.Dash = class {
       getBandwidthEstimate: () => 1e6,
       onMetadata: () => {},
       disableStream: (stream) => {},
+      addFont: (name, url) => {},
     };
 
     try {

diff --git a/test/test/util/mss_parser_util.js b/test/test/util/mss_parser_util.js
@@ -49,6 +49,7 @@ shaka.test.Mss = class {
       getBandwidthEstimate: () => 1e6,
       onMetadata: () => {},
       disableStream: (stream) => {},
+      addFont: (name, url) => {},
     };
     const manifest = await mssParser.start('dummy://foo', playerInterface);
     const stream = manifest.variants[0].audio;
@@ -89,6 +90,7 @@ shaka.test.Mss = class {
       getBandwidthEstimate: () => 1e6,
       onMetadata: () => {},
       disableStream: (stream) => {},
+      addFont: (name, url) => {},
     };
     const p = mssParser.start('dummy://foo', playerInterface);
     await expectAsync(p).toBeRejectedWith(

diff --git a/test/util/content_steering_manager_unit.js b/test/util/content_steering_manager_unit.js
@@ -31,6 +31,7 @@ describe('ContentSteeringManager', () => {
       getBandwidthEstimate: () => 1e6,
       onMetadata: () => {},
       disableStream: (stream) => {},
+      addFont: (name, url) => {},
     };
     const config = shaka.util.PlayerConfiguration.createDefault().manifest;
     manager = new shaka.util.ContentSteeringManager(playerInterface);