From ec9a38f39d40cbee4312be9c71a24b43be21cab3 Mon Sep 17 00:00:00 2001 From: Caitlin O'Callaghan <38890251+CaitlinOCallaghan@users.noreply.github.com> Date: Thu, 29 Apr 2021 09:51:11 -0700 Subject: [PATCH] feat(demo): DASH and HLS demo content from MetaCDN (#3350) --- demo/common/assets.js | 40 ++++++++++++++++++++++++++++++++++++++ demo/common/message_ids.js | 1 + demo/locales/en.json | 1 + demo/locales/source.json | 4 ++++ 4 files changed, 46 insertions(+) diff --git a/demo/common/assets.js b/demo/common/assets.js index c85bd3adc4..2e277be115 100644 --- a/demo/common/assets.js +++ b/demo/common/assets.js @@ -30,6 +30,7 @@ shakaAssets.Source = { UNIFIED_STREAMING: shakaDemo.MessageIds.UNIFIED_STREAMING, DASH_IF: shakaDemo.MessageIds.DASH_IF, BITCODIN: shakaDemo.MessageIds.BITCODIN, + METACDN: shakaDemo.MessageIds.METACDN, NIMBLE_STREAMER: shakaDemo.MessageIds.NIMBLE_STREAMER, AZURE_MEDIA_SERVICES: shakaDemo.MessageIds.AZURE_MEDIA_SERVICES, GPAC: shakaDemo.MessageIds.GPAC, @@ -876,6 +877,45 @@ shakaAssets.testAssets = [ .addFeature(shakaAssets.Feature.OFFLINE), // End bitcodin assets }}} + // MetaCDN assets {{{ + new ShakaDemoAssetInfo( + /* name= */ 'Car Ride (DASH, VOD, 180 Degrees)', + /* iconUri= */ 'https://lab.streamshark.io:10433/streams/balmain_360/.png?scale=300:210', + /* manifestUri= */ 'https://lab.streamshark.io:10433/streams/balmain_360/Feature.DASH/.mpd', + /* source= */ shakaAssets.Source.METACDN) + .addFeature(shakaAssets.Feature.DASH) + .addFeature(shakaAssets.Feature.HIGH_DEFINITION) + .addFeature(shakaAssets.Feature.MP4) + .addFeature(shakaAssets.Feature.VOD), + new ShakaDemoAssetInfo( + /* name= */ 'Car Ride (HLS, VOD, 180 Degrees)', + /* iconUri= */ 'https://lab.streamshark.io:10433/streams/balmain_360/.png?scale=300:210', + /* manifestUri= */ 'https://lab.streamshark.io:10433/streams/balmain_360/Feature.HLS/.m3u8', + /* source= */ shakaAssets.Source.METACDN) + .addFeature(shakaAssets.Feature.HIGH_DEFINITION) + .addFeature(shakaAssets.Feature.HLS) + .addFeature(shakaAssets.Feature.MP2TS) + .addFeature(shakaAssets.Feature.VOD), + new ShakaDemoAssetInfo( + /* name= */ 'Queensland, Australia Landscape (DASH)', + /* iconUri= */ 'https://lab.streamshark.io:10433/streams/sharkahouse/.png?scale=300:210', + /* manifestUri= */ 'https://lab.streamshark.io:10433/streams/sharkahouse/Feature.DASH/.mpd', + /* source= */ shakaAssets.Source.METACDN) + .addFeature(shakaAssets.Feature.DASH) + .addFeature(shakaAssets.Feature.HIGH_DEFINITION) + .addFeature(shakaAssets.Feature.MP4) + .addFeature(shakaAssets.Feature.VOD), + new ShakaDemoAssetInfo( + /* name= */ 'Queensland, Australia Landscape (HLS)', + /* iconUri= */ 'https://lab.streamshark.io:10433/streams/sharkahouse/.png?scale=300:210', + /* manifestUri= */ 'https://lab.streamshark.io:10433/streams/sharkahouse/Feature.HLS/.m3u8', + /* source= */ shakaAssets.Source.METACDN) + .addFeature(shakaAssets.Feature.HIGH_DEFINITION) + .addFeature(shakaAssets.Feature.HLS) + .addFeature(shakaAssets.Feature.MP2TS) + .addFeature(shakaAssets.Feature.VOD), + // End MetaCDN assets }}} + // Nimble Streamer assets {{{ // Src: https://wmspanel.com/nimble/demo new ShakaDemoAssetInfo( diff --git a/demo/common/message_ids.js b/demo/common/message_ids.js index 34b0261ab0..0fc82bbebd 100644 --- a/demo/common/message_ids.js +++ b/demo/common/message_ids.js @@ -45,6 +45,7 @@ shakaDemo.MessageIds = { DASH_IF: 'DEMO_DASH_IF', GPAC: 'DEMO_GPAC', IRT: 'DEMO_IRT', + METACDN: 'DEMO_METACDN', MICROSOFT: 'DEMO_MICROSOFT', NIMBLE_STREAMER: 'DEMO_NIMBLE_STREAMER', SHAKA: 'DEMO_SHAKA', diff --git a/demo/locales/en.json b/demo/locales/en.json index 5e7ebecb1c..109aff8190 100644 --- a/demo/locales/en.json +++ b/demo/locales/en.json @@ -128,6 +128,7 @@ "DEMO_MAX_SMALL_GAP_SIZE": "Maximum Small Gap Size", "DEMO_MAX_WIDTH": "Max Width", "DEMO_USE_MEDIA_CAPABILITIES": "Use MediaCapabilities", + "DEMO_METACDN": "MetaCDN", "DEMO_MICROSOFT": "Microsoft", "DEMO_MIN_BANDWIDTH": "Min Bandwidth", "DEMO_MIN_FRAMERATE": "Min Framerate", diff --git a/demo/locales/source.json b/demo/locales/source.json index 446fc49c1f..d3b52f8db8 100644 --- a/demo/locales/source.json +++ b/demo/locales/source.json @@ -515,6 +515,10 @@ "description": "The name of a configuration value.", "message": "Use [JARGON:MediaCapabilities]" }, + "DEMO_METACDN": { + "description": "Text that describes an asset that comes from the MetaCDN asset library.", + "message": "[PROPER_NAME:MetaCDN]" + }, "DEMO_MICROSOFT": { "description": "Text that describes an asset that comes from the Microsoft.", "message": "[PROPER_NAME:Microsoft]"