Skip to content

Commit b1a9212

Browse files
authored
Replace the fondue video in demo (#591)
1 parent be67017 commit b1a9212

File tree

7 files changed

+11
-10
lines changed

7 files changed

+11
-10
lines changed

pillarbox-core-business/src/test/java/ch/srgssr/pillarbox/core/business/tracker/commandersact/CommandersActTrackerIntegrationTest.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -827,7 +827,7 @@ class CommandersActTrackerIntegrationTest {
827827
}
828828

829829
private companion object {
830-
private const val URL = "https://swi-vod.akamaized.net/videoJson/47603186/master.m3u8"
830+
private const val URL = "https://rts-vod-amd.akamaized.net/ww/14970442/7510ee63-05a4-3d48-8d26-1f1b3a82f6be/master.m3u8"
831831
private const val URN_AUDIO = "urn:rts:audio:13598743"
832832
private const val URN_LIVE_VIDEO = "urn:rts:video:8841634"
833833
private const val URN_NOT_LIVE_VIDEO = "urn:rsi:video:15916771"

pillarbox-core-business/src/test/java/ch/srgssr/pillarbox/core/business/tracker/comscore/ComScoreTrackerIntegrationTest.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -728,7 +728,7 @@ class ComScoreTrackerIntegrationTest {
728728
// endregion
729729

730730
private companion object {
731-
private const val URL = "https://swi-vod.akamaized.net/videoJson/47603186/master.m3u8"
731+
private const val URL = "https://rts-vod-amd.akamaized.net/ww/14970442/7510ee63-05a4-3d48-8d26-1f1b3a82f6be/master.m3u8"
732732
private const val URN_AUDIO = "urn:rts:audio:13598743"
733733
private const val URN_LIVE_VIDEO = "urn:rts:video:8841634"
734734
private const val URN_NOT_LIVE_VIDEO = "urn:rsi:video:15916771"

pillarbox-demo-shared/src/main/java/ch/srgssr/pillarbox/demo/shared/data/DemoItem.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -77,8 +77,8 @@ data class DemoItem(
7777

7878
val OnDemandHLS = DemoItem(
7979
title = "VOD - HLS",
80-
description = "Switzerland says sorry! The fondue invasion",
81-
uri = "https://swi-vod.akamaized.net/videoJson/47603186/master.m3u8"
80+
description = "Sacha part à la rencontre d'univers atypiques",
81+
uri = "https://rts-vod-amd.akamaized.net/ww/14970442/7510ee63-05a4-3d48-8d26-1f1b3a82f6be/master.m3u8"
8282
)
8383

8484
val ShortOnDemandVideoHLS = DemoItem(

pillarbox-demo-shared/src/main/java/ch/srgssr/pillarbox/demo/shared/data/Playlist.kt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -46,10 +46,10 @@ data class Playlist(val title: String, val items: List<DemoItem>, val descriptio
4646
title = "SRG SSR streams (URLs)",
4747
items = listOf(
4848
DemoItem(
49-
title = "Switzerland says sorry! The fondue invasion",
50-
uri = "https://swi-vod.akamaized.net/videoJson/47603186/master.m3u8",
49+
title = "Sacha part à la rencontre d'univers atypiques",
50+
uri = "https://rts-vod-amd.akamaized.net/ww/14970442/7510ee63-05a4-3d48-8d26-1f1b3a82f6be/master.m3u8",
5151
description = "VOD - HLS",
52-
imageUrl = "https://cdn.prod.swi-services.ch/video-delivery/images/14e4562f-725d-4e41-a200-7fcaa77df2fe/5rwf1Bq_m3GC5secOZcIcgbbrbZPf4nI/16x9"
52+
imageUrl = "https://www.rts.ch/2024/06/13/11/34/14970435.image/16x9"
5353
),
5454
DemoItem(
5555
title = "Des violents orages ont touché Ajaccio, chef-lieu de la Corse, jeudi",

pillarbox-demo-shared/src/main/java/ch/srgssr/pillarbox/demo/shared/source/CustomAssetLoader.kt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ import androidx.media3.exoplayer.source.ForwardingTimeline
1313
import androidx.media3.exoplayer.source.MediaSource
1414
import androidx.media3.exoplayer.source.TimelineWithUpdatedMediaItem
1515
import androidx.media3.exoplayer.source.WrappingMediaSource
16+
import ch.srgssr.pillarbox.demo.shared.data.DemoItem
1617
import ch.srgssr.pillarbox.player.asset.Asset
1718
import ch.srgssr.pillarbox.player.asset.AssetLoader
1819

@@ -27,7 +28,7 @@ class CustomAssetLoader(context: Context) : AssetLoader(DefaultMediaSourceFactor
2728
}
2829

2930
override suspend fun loadAsset(mediaItem: MediaItem): Asset {
30-
val mediaSource = mediaSourceFactory.createMediaSource(MediaItem.fromUri("https://swi-vod.akamaized.net/videoJson/47603186/master.m3u8"))
31+
val mediaSource = mediaSourceFactory.createMediaSource(MediaItem.fromUri(DemoItem.OnDemandHLS.uri))
3132
return Asset(
3233
mediaMetadata = MediaMetadata.Builder()
3334
.setTitle("${mediaItem.mediaMetadata.title}:NotSeekable")

pillarbox-player/src/androidTest/java/ch/srgssr/pillarbox/player/utils/ContentUrls.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
package ch.srgssr.pillarbox.player.utils
66

77
object ContentUrls {
8-
const val VOD_HLS = "https://swi-vod.akamaized.net/videoJson/47603186/master.m3u8"
8+
const val VOD_HLS = "https://rts-vod-amd.akamaized.net/ww/14970442/7510ee63-05a4-3d48-8d26-1f1b3a82f6be/master.m3u8"
99
// From urn:swi:video:48940210
1010
const val VOD_MP4 = "https://cdn.prod.swi-services.ch/video-projects/141b30ce-3850-424b-9063-a20d5619d342/localised-videos/ENG/renditions/ENG.mp4"
1111
const val VOD_DASH_H264 = "https://storage.googleapis.com/wvmedia/clear/h264/tears/tears.mpd"

pillarbox-player/src/test/java/ch/srgssr/pillarbox/player/PlayerCallbackFlowTest.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -234,7 +234,7 @@ class PlayerCallbackFlowTest {
234234
}
235235

236236
private companion object {
237-
private const val VOD = "https://swi-vod.akamaized.net/videoJson/47603186/master.m3u8"
237+
private const val VOD = "https://rts-vod-amd.akamaized.net/ww/14970442/7510ee63-05a4-3d48-8d26-1f1b3a82f6be/master.m3u8"
238238
private const val LIVE = "https://rtsc3video.akamaized.net/hls/live/2042837/c3video/3/playlist.m3u8?dw=0"
239239
private const val LIVE_DVR = "https://rtsc3video.akamaized.net/hls/live/2042837/c3video/3/playlist.m3u8"
240240
}

0 commit comments

Comments
 (0)