Skip to content

Commit

Permalink
chore(Demo): Simplify low latency assets config (shaka-project#8178)
Browse files Browse the repository at this point in the history
  • Loading branch information
avelad authored Feb 27, 2025
1 parent 62310cc commit 34c3b72
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 43 deletions.
6 changes: 5 additions & 1 deletion demo/common/asset.js
Original file line number Diff line number Diff line change
Expand Up @@ -500,7 +500,7 @@ const ShakaDemoAssetInfo = class {
*/
getConfiguration(forStorage = false) {
const config = /** @type {shaka.extern.PlayerConfiguration} */(
{drm: {advanced: {}}, manifest: {dash: {}, hls: {}}});
{drm: {advanced: {}}, manifest: {dash: {}, hls: {}}, streaming: {}});

if (this.extraConfig) {
for (const key in this.extraConfig) {
Expand Down Expand Up @@ -528,6 +528,10 @@ const ShakaDemoAssetInfo = class {
});
}

if (this.features.includes(shakaAssets.Feature.LOW_LATENCY)) {
config.streaming.lowLatencyMode = true;
}

// Windows Edge only support persistent licenses with
// `com.microsoft.playready.recommendation` keySystem.
if (forStorage &&
Expand Down
49 changes: 7 additions & 42 deletions demo/common/assets.js
Original file line number Diff line number Diff line change
Expand Up @@ -966,12 +966,7 @@ shakaAssets.testAssets = [
.addFeature(shakaAssets.Feature.DASH)
.addFeature(shakaAssets.Feature.LIVE)
.addFeature(shakaAssets.Feature.MP4)
.addFeature(shakaAssets.Feature.LOW_LATENCY)
.setExtraConfig({
streaming: {
lowLatencyMode: true,
},
}),
.addFeature(shakaAssets.Feature.LOW_LATENCY),
new ShakaDemoAssetInfo(
/* name= */ 'Live sim (CBCS single key)',
/* iconUri= */ 'https://storage.googleapis.com/shaka-asset-icons/dash_if_test_pattern.png',
Expand Down Expand Up @@ -1017,12 +1012,7 @@ shakaAssets.testAssets = [
.addFeature(shakaAssets.Feature.DASH)
.addFeature(shakaAssets.Feature.LIVE)
.addFeature(shakaAssets.Feature.MP4)
.addFeature(shakaAssets.Feature.LOW_LATENCY)
.setExtraConfig({
streaming: {
lowLatencyMode: true,
},
}),
.addFeature(shakaAssets.Feature.LOW_LATENCY),
new ShakaDemoAssetInfo(
/* name= */ 'DASH-IF THUMBNAILS - Single adaptation set, 7 tiles at 10x1, each thumb 320x180',
/* iconUri= */ 'https://storage.googleapis.com/shaka-asset-icons/dash_if_test_pattern.png',
Expand Down Expand Up @@ -1396,12 +1386,7 @@ shakaAssets.testAssets = [
.addFeature(shakaAssets.Feature.HLS)
.addFeature(shakaAssets.Feature.LIVE)
.addFeature(shakaAssets.Feature.MP4)
.addFeature(shakaAssets.Feature.LOW_LATENCY)
.setExtraConfig({
streaming: {
lowLatencyMode: true,
},
}),
.addFeature(shakaAssets.Feature.LOW_LATENCY),
new ShakaDemoAssetInfo(
/* name= */ 'Audio only HLS with raw AAC',
/* iconUri= */ 'https://storage.googleapis.com/shaka-asset-icons/apple_test_pattern.png',
Expand Down Expand Up @@ -1749,12 +1734,7 @@ shakaAssets.testAssets = [
.addFeature(shakaAssets.Feature.MP4)
.addFeature(shakaAssets.Feature.LIVE)
.addFeature(shakaAssets.Feature.LOW_LATENCY)
.addFeature(shakaAssets.Feature.CMSD)
.setExtraConfig({
streaming: {
lowLatencyMode: true,
},
}),
.addFeature(shakaAssets.Feature.CMSD),
new ShakaDemoAssetInfo(
/* name= */ 'Live low latency (SegmentTimeline, CMSD)',
/* iconUri= */ 'https://storage.googleapis.com/shaka-asset-icons/spring.png',
Expand All @@ -1765,12 +1745,7 @@ shakaAssets.testAssets = [
.addFeature(shakaAssets.Feature.MP4)
.addFeature(shakaAssets.Feature.LIVE)
.addFeature(shakaAssets.Feature.LOW_LATENCY)
.addFeature(shakaAssets.Feature.CMSD)
.setExtraConfig({
streaming: {
lowLatencyMode: true,
},
}),
.addFeature(shakaAssets.Feature.CMSD),
// }}}

// EZDRM assets {{{
Expand Down Expand Up @@ -1939,12 +1914,7 @@ shakaAssets.testAssets = [
.addFeature(shakaAssets.Feature.SUBTITLES)
.addFeature(shakaAssets.Feature.SURROUND)
.addFeature(shakaAssets.Feature.LIVE)
.addFeature(shakaAssets.Feature.LOW_LATENCY)
.setExtraConfig({
streaming: {
lowLatencyMode: true,
},
}),
.addFeature(shakaAssets.Feature.LOW_LATENCY),
new ShakaDemoAssetInfo(
/* name= */ 'Low-Latency Live Testcard - 4 Chunks per Segment, Multiple Languages, HEVC Video',
/* iconUri= */ 'https://storage.googleapis.com/shaka-asset-icons/bbc.png',
Expand All @@ -1957,12 +1927,7 @@ shakaAssets.testAssets = [
.addFeature(shakaAssets.Feature.SUBTITLES)
.addFeature(shakaAssets.Feature.SURROUND)
.addFeature(shakaAssets.Feature.LIVE)
.addFeature(shakaAssets.Feature.LOW_LATENCY)
.setExtraConfig({
streaming: {
lowLatencyMode: true,
},
}),
.addFeature(shakaAssets.Feature.LOW_LATENCY),
new ShakaDemoAssetInfo(
/* name= */ 'On-demand Elephant\'s Dream - with EBU-TT-D Subtitle Track in English',
/* iconUri= */ 'https://storage.googleapis.com/shaka-asset-icons/elephant.png',
Expand Down

0 comments on commit 34c3b72

Please sign in to comment.