Skip to content

Commit

Permalink
Update all URLs to Livesim. Use Livesim2 instead of Livesim1 (#4267)
Browse files Browse the repository at this point in the history
  • Loading branch information
@dsilhavy
dsilhavy committed Oct 12, 2023
1 parent 3f66a52 commit ee8d5f0
Show file tree
Hide file tree
Showing 18 changed files with 48 additions and 53 deletions.
2 changes: 1 addition & 1 deletion samples/ad-insertion/js/scte.js
View file
Expand Up @@ -4,7 +4,7 @@
(function() {
var player = dashjs.MediaPlayer().create();
playerAd = dashjs.MediaPlayer().create();
contentUrl = 'https://livesim.dashif.org/livesim/scte35_1/testpic_2s/Manifest.mpd ',
contentUrl = 'https://livesim2.dashif.org/livesim2/scte35_2/testpic_2s/Manifest.mpd',
adUrl = 'https://dash.akamaized.net/fokus/adinsertion-samples/scte/dash.mpd',
currentlyAd = false;

Expand Down
4 changes: 2 additions & 2 deletions samples/advanced/listening-to-SCTE-EMSG-events.html
View file
Expand Up @@ -25,8 +25,8 @@

<script class="code">
var player;
const mpd = "https://livesim.dashif.org/livesim/scte35_2/testpic_2s/Manifest.mpd";
const SCHEMEIDURI = "urn:scte:scte35:2013:xml";
const mpd = "https://livesim2.dashif.org/livesim2/scte35_2/testpic_2s/Manifest.mpd";
const SCHEMEIDURI = "urn:scte:scte35:2013:bin";
const EVENT_MODE_ON_START = dashjs.MediaPlayer.events.EVENT_MODE_ON_START;
const EVENT_MODE_ON_RECEIVE = dashjs.MediaPlayer.events.EVENT_MODE_ON_RECEIVE;

Expand Down
2 changes: 1 addition & 1 deletion samples/advanced/load-with-starttime.html
View file
Expand Up @@ -21,7 +21,7 @@
function init() {
var video,
player,
url = "https://livesim.dashif.org/livesim/testpic_2s/Manifest.mpd";
url = "https://livesim2.dashif.org/livesim2/testpic_2s/Manifest.mpd";

player = dashjs.MediaPlayer().create();
video = document.querySelector("video");
Expand Down
2 changes: 1 addition & 1 deletion samples/audio-only/index.html
View file
Expand Up @@ -21,7 +21,7 @@
function init() {
var audio,
player,
url = "https://livesim.dashif.org/dash/vod/testpic_2s/audio.mpd";
url = "https://livesim2.dashif.org/vod/testpic_2s/audio.mpd";

audio = document.querySelector("audio");
player = dashjs.MediaPlayer().create();
Expand Down
2 changes: 1 addition & 1 deletion samples/captioning/cea608.html
View file
Expand Up @@ -25,7 +25,7 @@
</style>

<script class="code">
var CAPTION_URL = "https://livesim.dashif.org/dash/vod/testpic_2s/cea608.mpd",
var CAPTION_URL = "https://livesim2.dashif.org/vod/testpic_2s/cea608.mpd",
video,
player;

Expand Down
4 changes: 2 additions & 2 deletions samples/captioning/multi-track-captions.html
View file
Expand Up @@ -26,7 +26,7 @@

<script class="code">
var EXTERNAL_CAPTION_URL = "https://dash.akamaized.net/dash264/TestCases/4b/qualcomm/1/ED_OnDemand_5SecSeg_Subtitles.mpd", /* need to manually seek to get stream to start... issue with MPD but only sample with multi adaptations for external sidecar caption text xml */
FRAGMENTED_CAPTION_URL = "https://livesim.dashif.org/dash/vod/testpic_2s/multi_subs.mpd",
FRAGMENTED_CAPTION_URL = "https://livesim2.dashif.org/vod/testpic_2s/multi_subs.mpd",
videoElement,
controlbar,
player;
Expand Down Expand Up @@ -172,7 +172,7 @@ <h4>Settings</h4>
<option value="">-- unset initial lang and role --</option>
<option value="en-subtitle">eng - subtitles</option>
<option value="en-caption">eng - captions</option>
<option value="se">swe - subtitles</option>
<option value="sv">swe - subtitles</option>
<option value="qb">qbb - subtitles</option>
<option value="no">nor - subtitles</option>
</select>
Expand Down
5 changes: 0 additions & 5 deletions samples/captioning/ttml-ebutt-sample.html
View file
Expand Up @@ -25,11 +25,6 @@
</style>

<script class="code">
/* TEST CONTENT.
https://livesim.dashif.org/dash/vod/testpic_2s/multi_subs.mpd
https://livesim.dashif.org/dash/vod/testpic_2s/xml_subs.mpd
https://livesim.dashif.org/livesim/testpic_2s/multi_subs.mpd
*/
var CAPTION_URL = "https://rdmedia.bbc.co.uk/elephants_dream/1/client_manifest-all.mpd",
video,
player;
Expand Down
50 changes: 25 additions & 25 deletions samples/dash-if-reference-player/app/sources.json
View file
Expand Up @@ -215,42 +215,42 @@
"name": "LIVE (Dynamic MPD)",
"submenu": [
{
"url": "https://livesim.dashif.org/livesim/testpic_2s/Manifest.mpd",
"url": "https://livesim2.dashif.org/livesim2/testpic_2s/Manifest.mpd",
"name": "SegmentTemplate without manifest updates (livesim)",
"provider": "dashif"
},
{
"url": "https://livesim.dashif.org/livesim/mup_30/testpic_2s/Manifest.mpd",
"url": "https://livesim2.dashif.org/livesim2/mup_30/testpic_2s/Manifest.mpd",
"name": "SegmentTemplate with manifest updates every 30s (livesim)",
"provider": "dashif"
},
{
"url": "https://livesim.dashif.org/livesim/segtimeline_1/testpic_2s/Manifest.mpd",
"url": "https://livesim2.dashif.org/livesim2/segtimeline_1/testpic_2s/Manifest.mpd",
"name": "SegmentTimeline with $time (livesim)",
"provider": "dashif"
},
{
"url": "https://livesim.dashif.org/livesim/segtimelinenr_1/testpic_2s/Manifest.mpd",
"url": "https://livesim2.dashif.org/livesim2/segtimelinenr_1/testpic_2s/Manifest.mpd",
"name": "SegmentTimeline with $number (livesim)",
"provider": "dashif"
},
{
"url": "https://livesim.dashif.org/livesim/periods_60/continuous_1/testpic_2s/Manifest.mpd",
"url": "https://livesim2.dashif.org/livesim2/periods_60/continuous_1/testpic_2s/Manifest.mpd",
"name": "Multiperiod SegmentTemplate. New period every minute (livesim)",
"provider": "dashif"
},
{
"url": " https://livesim.dashif.org/livesim/ato_10/testpic_2s/Manifest.mpd",
"url": " https://livesim2.dashif.org/livesim2/ato_10/testpic_2s/Manifest.mpd",
"name": "10 seconds availabilityTimeOffset (livesim)",
"provider": "dashif"
},
{
"url": "https://livesim.dashif.org/livesim/ato_inf/testpic_2s/Manifest.mpd",
"url": "https://livesim2.dashif.org/livesim2/ato_inf/testpic_2s/Manifest.mpd",
"name": "Infinite offset - all segments available at availability start (livesim)",
"provider": "dashif"
},
{
"url": "https://livesim.dashif.org/livesim/scte35_2/testpic_2s/Manifest.mpd",
"url": "https://livesim2.dashif.org/livesim2/scte35_2/testpic_2s/Manifest.mpd",
"name": "SCTE35 events",
"provider": "dashif"
},
Expand Down Expand Up @@ -287,7 +287,7 @@
},
{
"name": "LiveSIM Caminandes 02, Gran Dillama (25fps, 25gop, 2sec, multi MOOF/MDAT, 1080p, KID=1236) v2",
"url": "http://refapp.hbbtv.org/livesim/02_llamav2/manifest.mpd",
"url": "http://refapp.hbbtv.org/livesim2/02_llamav2/manifest.mpd",
"provider": "hbbtv"
}
]
Expand All @@ -306,12 +306,12 @@
"provider": "akamai"
},
{
"url": "https://livesim.dashif.org/livesim/chunkdur_1/ato_7/testpic4_8s/Manifest300.mpd",
"url": "https://livesim2.dashif.org/livesim2/chunkdur_1/ato_7/testpic4_8s/Manifest300.mpd",
"name": "Low Latency (Single-Rate) (livesim-chunked)",
"provider": "dashif"
},
{
"url": "https://livesim.dashif.org/livesim/chunkdur_1/ato_7/testpic4_8s/Manifest.mpd",
"url": "https://livesim2.dashif.org/livesim2/chunkdur_1/ato_7/testpic4_8s/Manifest.mpd",
"name": "Low Latency (Multi-Rate) (livesim-chunked)",
"provider": "dashif"
},
Expand All @@ -337,49 +337,49 @@
},
{
"name": "TTML Segmented Subtitles VoD",
"url": "https://livesim.dashif.org/dash/vod/testpic_2s/multi_subs.mpd",
"url": "https://livesim2.dashif.org/vod/testpic_2s/multi_subs.mpd",
"provider": "dashif"
},
{
"name": "TTML Segmented Subtitles Live (livesim)",
"url": "https://livesim.dashif.org/livesim/testpic_2s/multi_subs.mpd",
"url": "https://livesim2.dashif.org/livesim2/testpic_2s/multi_subs.mpd",
"provider": "dashif"
},
{
"name": "TTML Sideloaded XML Subtitles",
"url": "https://livesim.dashif.org/dash/vod/testpic_2s/xml_subs.mpd",
"url": "https://livesim2.dashif.org/vod/testpic_2s/xml_subs.mpd",
"provider": "dashif"
},
{
"name": "Embedded CEA-608 Closed Captions",
"url": "https://livesim.dashif.org/dash/vod/testpic_2s/cea608.mpd",
"url": "https://livesim2.dashif.org/vod/testpic_2s/cea608.mpd",
"provider": "dashif"
},
{
"name": "Embedded CEA-608 Closed Captions (livesim)",
"url": "https://livesim.dashif.org/livesim/testpic_2s/cea608.mpd",
"url": "https://livesim2.dashif.org/livesim2/testpic_2s/cea608.mpd",
"provider": "dashif"
},
{
"name": "Embedded CEA-608 Closed Captions and TTML segments VoD",
"url": "https://livesim.dashif.org/dash/vod/testpic_2s/cea608_and_segs.mpd",
"url": "https://livesim2.dashif.org/vod/testpic_2s/cea608_and_segs.mpd",
"provider": "dashif"
},
{
"name": "Embedded CEA-608 Closed Captions and TTML segments Live (livesim)",
"url": "https://livesim.dashif.org/livesim/testpic_2s/cea608_and_segs.mpd",
"url": "https://livesim2.dashif.org/livesim2/testpic_2s/cea608_and_segs.mpd",
"provider": "dashif"
},
{
"url": "https://livesim.dashif.org/dash/vod/testpic_2s/imsc1_img.mpd",
"url": "https://livesim2.dashif.org/vod/testpic_2s/imsc1_img.mpd",
"name": "IMSC1 (CMAF) Image Subtitles",
"moreInfo": "https://livesim.dashif.org/dash/vod/testpic_2s/imsc1_img_subs_info.html",
"moreInfo": "https://livesim2.dashif.org/vod/testpic_2s/imsc1_img_subs_info.html",
"provider": "dashif"
},
{
"name": "TTML Image Subtitles embedded (VoD)",
"url": "https://livesim.dashif.org/dash/vod/testpic_2s/img_subs.mpd",
"moreInfo": "https://livesim.dashif.org/dash/vod/testpic_2s/img_subs_info.html",
"url": "https://livesim2.dashif.org/vod/testpic_2s/img_subs.mpd",
"moreInfo": "https://livesim2.dashif.org/vod/testpic_2s/img_subs_info.html",
"provider": "dashif"
},
{
Expand Down Expand Up @@ -1216,7 +1216,7 @@
},
{
"name": "Live stream, Single adaptation set, 1x1 tiles (livesim)",
"url": "//livesim.dashif.org/livesim/testpic_2s/Manifest_thumbs.mpd",
"url": "https://livesim2.dashif.org/livesim2/testpic_2s/Manifest_thumbs.mpd",
"provider": "dashif"
},
{
Expand All @@ -1236,12 +1236,12 @@
"submenu": [
{
"name": "48k AAC-LC Stereo Beeps (Live)",
"url": "https://livesim.dashif.org/livesim/testpic_2s/audio.mpd",
"url": "https://livesim2.dashif.org/livesim2/testpic_2s/audio.mpd",
"provider": "dashif"
},
{
"name": "48k AAC-LC Stereo Beeps (Ondemand)",
"url": "https://livesim.dashif.org/dash/vod/testpic_2s/audio.mpd",
"url": "https://livesim2.dashif.org/vod/testpic_2s/audio.mpd",
"provider": "dashif"
},
{
Expand Down
2 changes: 1 addition & 1 deletion samples/getting-started/listening-to-events.html
View file
Expand Up @@ -84,7 +84,7 @@

function load(button)
{
var url = "https://livesim.dashif.org/livesim/scte35_2/testpic_2s/Manifest.mpd";
var url = "https://livesim2.dashif.org/livesim2/scte35_2/testpic_2s/Manifest.mpd";

if (!firstLoad)
{
Expand Down
2 changes: 1 addition & 1 deletion samples/live-streaming/availability-time-offset.html
View file
Expand Up @@ -24,7 +24,7 @@
function init() {
var video,
player,
url = " https://livesim.dashif.org/livesim/ato_10/testpic_2s/Manifest.mpd";
url = " https://livesim2.dashif.org/livesim2/ato_10/testpic_2s/Manifest.mpd";

setInterval(function () {
if (player && player.isReady()) {
Expand Down
2 changes: 1 addition & 1 deletion samples/live-streaming/live-delay-comparison-custom-manifest.html
View file
Expand Up @@ -142,7 +142,7 @@ <h3><i class="bi bi-info-square"></i> Live delay comparison custom manifest</h3>
<div class="input-group mb-3">
<span class="input-group-text" id="basic-addon1">Manifest URL</span>
<input type="text" id="manifest" class="form-control" placeholder="MPD URL"
value="https://livesim.dashif.org/livesim/testpic_2s/Manifest.mpd" aria-label="Username"
value="https://livesim2.dashif.org/livesim2/testpic_2s/Manifest.mpd" aria-label="Username"
aria-describedby="basic-addon1">
<button type="button" id="loadButton" class="btn btn-success" onclick="load(this)">Load stream
</button>
Expand Down
4 changes: 2 additions & 2 deletions samples/live-streaming/live-delay-comparison-using-fragmentCount.html
View file
Expand Up @@ -14,8 +14,8 @@
<script class="code">
function init() {
var player1, player2, player3, player4, player5, player6, video;
var MPD_2S_SEGMENTS = 'https://livesim.dashif.org/livesim/testpic_2s/Manifest.mpd';
var MPD_6S_SEGMENTS = 'https://livesim.dashif.org/livesim/testpic_6s/Manifest.mpd';
var MPD_2S_SEGMENTS = 'https://livesim2.dashif.org/livesim2/testpic_2s/Manifest.mpd';
var MPD_6S_SEGMENTS = 'https://livesim2.dashif.org/livesim2/testpic_6s/Manifest.mpd';


video = document.querySelector('#video1');
Expand Down
4 changes: 2 additions & 2 deletions samples/live-streaming/live-delay-comparison-using-setLiveDelay.html
View file
Expand Up @@ -14,8 +14,8 @@
<script class="code">
function init() {
var player1, player2, player3, player4, player5, player6, video;
var MPD_2S_SEGMENTS = 'https://livesim.dashif.org/livesim/testpic_2s/Manifest.mpd';
var MPD_6S_SEGMENTS = 'https://livesim.dashif.org/livesim/testpic_6s/Manifest.mpd';
var MPD_2S_SEGMENTS = 'https://livesim2.dashif.org/livesim2/testpic_2s/Manifest.mpd';
var MPD_6S_SEGMENTS = 'https://livesim2.dashif.org/livesim2/testpic_6s/Manifest.mpd';


video = document.querySelector('#video1');
Expand Down
2 changes: 1 addition & 1 deletion samples/live-streaming/synchronized-live-playback.html
View file
Expand Up @@ -15,7 +15,7 @@

function init() {
var player1, player2, video;
var MPD_2S_SEGMENTS = 'https://livesim.dashif.org/livesim/testpic_2s/Manifest.mpd';
var MPD_2S_SEGMENTS = 'https://livesim2.dashif.org/livesim2/testpic_2s/Manifest.mpd';
var settings = {
streaming: {
delay: {
Expand Down
2 changes: 1 addition & 1 deletion samples/multiperiod/live.html
View file
Expand Up @@ -20,7 +20,7 @@
function init() {
var video,
player,
url = "https://livesim.dashif.org/livesim/periods_60/continuous_1/testpic_2s/Manifest.mpd";
url = "https://livesim2.dashif.org/livesim2/periods_60/continuous_1/testpic_2s/Manifest.mpd";

video = document.querySelector("video");
player = dashjs.MediaPlayer().create();
Expand Down
2 changes: 1 addition & 1 deletion samples/offline/app/main.js
View file
Expand Up @@ -58,7 +58,7 @@ app.controller('DashController', function ($scope, $timeout, $q, sources, contri


$scope.selectedItem = {
url: 'https://livesim.dashif.org/dash/vod/testpic_2s/multi_subs.mpd'
url: 'https://livesim2.dashif.org/vod/testpic_2s/multi_subs.mpd'
};

sources.query(function (data) {
Expand Down
8 changes: 4 additions & 4 deletions test/functional/config/smokeVectors.json
View file
Expand Up @@ -19,7 +19,7 @@
"description": "Segment Timeline, time based"
},
{
"url": "https://livesim.dashif.org/dash/vod/testpic_2s/multi_subs.mpd",
"url": "https://livesim2.dashif.org/vod/testpic_2s/multi_subs.mpd",
"name": "TTML Segmented Subtitles VoD",
"description": "TTML Segmented Subtitles VoD"
},
Expand Down Expand Up @@ -74,17 +74,17 @@
"name": "Live content",
"submenu": [
{
"url": "https://livesim.dashif.org/livesim/testpic_2s/Manifest.mpd",
"url": "https://livesim2.dashif.org/livesim2/testpic_2s/Manifest.mpd",
"name": "Segment Template without manifest updates",
"description": "Segment Template without manifest updates"
},
{
"url": "https://livesim.dashif.org/livesim/segtimeline_1/testpic_2s/Manifest.mpd",
"url": "https://livesim2.dashif.org/livesim2/segtimeline_1/testpic_2s/Manifest.mpd",
"name": "Segment Timeline",
"description": "Segment Timeline"
},
{
"url": "https://livesim.dashif.org/livesim/periods_60/continuous_1/testpic_2s/Manifest.mpd",
"url": "https://livesim2.dashif.org/livesim2/periods_60/continuous_1/testpic_2s/Manifest.mpd",
"name": "Multiperiod Segment Template",
"description": "Multiperiod Segment Template"
}
Expand Down
2 changes: 1 addition & 1 deletion test/functional/readme.md
View file
Expand Up @@ -134,7 +134,7 @@ Windows example command:

Mac example command:
```
node test/functional/runTests.js --selenium=local --os=mac --browsers=chrome --app=local --protocol=http --reporters=junit --testSuites="textSwitch" --mpd="https://livesim.dashif.org/dash/vod/testpic_2s/multi_subs.mpd"
node test/functional/runTests.js --selenium=local --os=mac --browsers=chrome --app=local --protocol=http --reporters=junit --testSuites="textSwitch" --mpd="https://livesim2.dashif.org/vod/testpic_2s/multi_subs.mpd"
```

#### Troubleshooting
Expand Down

0 comments on commit ee8d5f0

Please sign in to comment.