Skip to content

Commit

Permalink
feat(demo): DASH and HLS demo content from MetaCDN (shaka-project#3350)
Browse files Browse the repository at this point in the history
  • Loading branch information
CaitlinOCallaghan authored Apr 29, 2021
1 parent 8d9a975 commit ec9a38f
Show file tree
Hide file tree
Showing 4 changed files with 46 additions and 0 deletions.
40 changes: 40 additions & 0 deletions demo/common/assets.js
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -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(
Expand Down
1 change: 1 addition & 0 deletions demo/common/message_ids.js
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand Down
1 change: 1 addition & 0 deletions demo/locales/en.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
4 changes: 4 additions & 0 deletions demo/locales/source.json
Original file line number Diff line number Diff line change
Expand Up @@ -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]"
Expand Down

0 comments on commit ec9a38f

Please sign in to comment.