Skip to content

Commit

Permalink
Update DASH-IF livesim URLs (#1736)
Browse files Browse the repository at this point in the history
 - Changed livesim assets to new host URLs https://livesim.dashif.org.
 - Added SegmentTimeline with $Number$ in addition to SegmentTimeline with $Time$.
 - Added startOver URLS: interval [-20s, 20s] compared to wall-clock. These turn into static at interval end.
 - Corrected some information.

Backported to v2.4.x
  • Loading branch information
tobbee authored and joeyparrish committed Jan 18, 2019
1 parent 2b608c0 commit 99fdc76
Showing 1 changed file with 52 additions and 11 deletions.
63 changes: 52 additions & 11 deletions demo/common/assets.js
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,8 @@ shakaAssets.Feature = {
SEGMENT_LIST_TIMELINE: 'SegmentList w/ SegmentTimeline',
SEGMENT_TEMPLATE_DURATION: 'SegmentTemplate w/ @duration',
SEGMENT_TEMPLATE_TIMELINE: 'SegmentTemplate w/ SegmentTimeline',
SEGMENT_TEMPLATE_TIMELINE_TIME: 'SegmentTemplate w/ SegmentTimeline $Time$',
SEGMENT_TEMPLATE_TIMELINE_NUMBER: 'SegmentTemplate w/ SegTimeline $Number$',

PSSH: 'embedded PSSH',
MULTIKEY: 'multiple keys',
Expand Down Expand Up @@ -822,33 +824,72 @@ shakaAssets.testAssets = [
},
{
name: 'Live sim (2s segments)',
manifestUri: 'https://vm2.dashif.org/livesim/utc_head/testpic_2s/Manifest.mpd',
manifestUri: 'https://livesim.dashif.org/livesim/utc_head/testpic_2s/Manifest.mpd',

encoder: shakaAssets.Encoder.UNKNOWN,
source: shakaAssets.Source.DASH_IF,
drm: [],
features: [
shakaAssets.Feature.LIVE,
shakaAssets.Feature.MP4,
shakaAssets.Feature.SEGMENT_TEMPLATE_TIMELINE
]
shakaAssets.Feature.SEGMENT_TEMPLATE_DURATION,
],
},
{
name: 'Live sim (6s segments)',
manifestUri: 'https://vm2.dashif.org/livesim/utc_head/testpic_6s/Manifest.mpd',
name: 'Live sim SegmentTimeline w $Time$ (6s segments)',
manifestUri: 'https://livesim.dashif.org/livesim/segtimeline_1/utc_head/testpic_6s/Manifest.mpd',

encoder: shakaAssets.Encoder.UNKNOWN,
source: shakaAssets.Source.DASH_IF,
drm: [],
features: [
shakaAssets.Feature.LIVE,
shakaAssets.Feature.MP4,
shakaAssets.Feature.SEGMENT_TEMPLATE_TIMELINE
]
shakaAssets.Feature.SEGMENT_TEMPLATE_TIMELINE_TIME,
],
},
{
name: 'Live sim SegmentTimeline w $Number$ (6s segments)',
manifestUri: 'https://livesim.dashif.org/livesim/segtimelinenr_1/utc_head/testpic_6s/Manifest.mpd',

encoder: shakaAssets.Encoder.UNKNOWN,
source: shakaAssets.Source.DASH_IF,
drm: [],
features: [
shakaAssets.Feature.LIVE,
shakaAssets.Feature.MP4,
shakaAssets.Feature.SEGMENT_TEMPLATE_TIMELINE_NUMBER,
],
},
{
name: 'Live sim SegmentTimeline StartOver [-20s, +20s] (2s segments)',
manifestUri: 'https://livesim.dashif.org/livesim/segtimeline_1/startrel_-20/stoprel_20/timeoffset_0/testpic_2s/Manifest.mpd',

encoder: shakaAssets.Encoder.UNKNOWN,
source: shakaAssets.Source.DASH_IF,
drm: [],
features: [
shakaAssets.Feature.LIVE,
shakaAssets.Feature.MP4,
shakaAssets.Feature.SEGMENT_TEMPLATE_TIMELINE_TIME,
],
},
{
name: 'Live sim (multi-period)',
manifestUri: 'https://vm2.dashif.org/livesim/utc_head/periods_20/testpic_2s/Manifest.mpd',
name: 'Live sim StartOver SegTmpl Duration [-20s, +20s] (2s segments)',
manifestUri: 'https://livesim.dashif.org/livesim/startrel_-20/stoprel_20/timeoffset_0/testpic_2s/Manifest.mpd',

encoder: shakaAssets.Encoder.UNKNOWN,
source: shakaAssets.Source.DASH_IF,
drm: [],
features: [
shakaAssets.Feature.LIVE,
shakaAssets.Feature.MP4,
shakaAssets.Feature.SEGMENT_TEMPLATE_DURATION,
],
},
{
name: 'Live sim SegTmpl Duration (multi-period 60s)',
manifestUri: 'https://livesim.dashif.org/livesim/utc_head/periods_60/testpic_2s/Manifest.mpd',

encoder: shakaAssets.Encoder.UNKNOWN,
source: shakaAssets.Source.DASH_IF,
Expand All @@ -857,8 +898,8 @@ shakaAssets.testAssets = [
shakaAssets.Feature.LIVE,
shakaAssets.Feature.MP4,
shakaAssets.Feature.MULTIPERIOD,
shakaAssets.Feature.SEGMENT_TEMPLATE_TIMELINE
]
shakaAssets.Feature.SEGMENT_TEMPLATE_DURATION,
],
},
// }}}

Expand Down

0 comments on commit 99fdc76

Please sign in to comment.