Skip to content

Update couleur3 mp3 url #1113

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
MGaetan89 merged 4 commits into from
Jul 23, 2025
Merged

Update couleur3 mp3 url #1113

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
50bf52b
Update couleur3 mp3 url
StaehliJ Jul 21, 2025
cf1b658
Update Couleur3 Live DVR URL
MGaetan89 Jul 22, 2025
bd26d57
Fix `media-composition.json`
MGaetan89 Jul 22, 2025
595a657
Fix `Android Lint` check on GitHub Actions (#1118)
MGaetan89 Jul 23, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 12 additions & 7 deletions .github/workflows/quality.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,15 @@ jobs:
env:
USERNAME: ${{ github.actor }}
GITHUB_TOKEN: ${{ github.token }}
strategy:
matrix:
include:
- module: 'pillarbox-demo'
task: 'lintProdDebug'
- module: 'pillarbox-demo-tv'
task: 'lintProdDebug'
- module: 'pillarbox-player-testutils'
task: 'lintDebug'
steps:
- name: Checkout
uses: actions/checkout@v4
Expand All @@ -31,17 +40,13 @@ jobs:
with:
cache-encryption-key: ${{ secrets.GRADLE_CACHE_ENCRYPTION_KEY }}
- name: Run Android Lint
run: >
./gradlew
:pillarbox-demo:lintProdDebug
:pillarbox-demo-tv:lintProdDebug
:pillarbox-player-testutils:lintDebug
run: ./gradlew :${{ matrix.module }}:${{ matrix.task }}
- name: Upload Android Lint results
uses: github/codeql-action/upload-sarif@v3
if: success() || failure()
with:
sarif_file: build/reports/android-lint/
category: android-lint
sarif_file: build/reports/android-lint/${{ matrix.module }}.sarif
category: android-lint-${{ matrix.module }}

detekt:
name: Detekt
Expand Down
274 changes: 12 additions & 262 deletions pillarbox-core-business/src/test/assets/media-compositions.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,38 +3,13 @@
"chapterUrn": "urn:rts:audio:3262363",
"episode": {
"publishedDate": "2024-10-15T15:51:18+02:00",
"imageUrl": "https://img.rts.ch/articles/2024/image/6uz53b-28609823.image",
"imageTitle": "RTS Couleur 3 en direct",
"imageUrl": "https://img.rts.ch/articles/2024/image/6uz53b-28609823.image",
"title": "RTS Couleur 3 en direct",
"id": "e293edd5-8599-3b27-ad67-e74691654311"
},
"show": {
"id": "bade447d-095f-3ab4-a647-08938e96a929",
"vendor": "RTS",
"transmission": "RADIO",
"urn": "urn:rts:show:radio:bade447d-095f-3ab4-a647-08938e96a929",
"title": "RTS Couleur 3",
"imageUrl": "https://img.rts.ch/articles/2024/image/6uz53b-28609823.image/16x9",
"imageTitle": "RTS Couleur 3",
"posterImageUrl": "https://il.srgssr.ch/image-service/dynamic/4d02e478.jpg",
"posterImageIsFallbackUrl": true,
"podcastImageUrl": "https://il.srgssr.ch/image-service/dynamic/8278255.jpg",
"podcastImageIsFallbackUrl": true,
"primaryChannelId": "8ceb28d9b3f1dd876d1df1780f908578cbefc3d7",
"primaryChannelUrn": "urn:rts:channel:radio:8ceb28d9b3f1dd876d1df1780f908578cbefc3d7",
"numberOfEpisodes": 1,
"allowIndexing": false
},
"channel": {
"id": "8ceb28d9b3f1dd876d1df1780f908578cbefc3d7",
"vendor": "RTS",
"urn": "urn:rts:channel:radio:8ceb28d9b3f1dd876d1df1780f908578cbefc3d7",
"title": "RTS Couleur 3",
"imageUrl": "https://img.rts.ch/articles/2020/image/9gpl81-26142286.image",
"imageUrlRaw": "https://il.srgssr.ch/image-service/dynamic/a9f904.svg",
"imageTitle": "RTS Couleur 3",
"transmission": "RADIO"
},
"show": {},
"channel": {},
"chapterList": [
{
"id": "3262363",
Expand All @@ -51,19 +26,8 @@
"displayable": true,
"position": -1,
"noEmbed": false,
"analyticsMetadata": {
"media_urn": "urn:rts:audio:3262363",
"media_segment_length": "0",
"media_episode_length": "0",
"media_segment_id": "3262363",
"media_type": "Audio",
"media_duration_category": "infinit.livestream",
"media_segment": "Livestream",
"media_is_geoblocked": "false",
"media_sub_set_id": "LIVESTREAM",
"media_signlanguage_on": "false"
},
"eventData": "$13f4cc3993d3abea$bf6ebed870d2324e5403c7eb79efc16ebb8ca2070ffaa6dc6e5ce528838c351f960ba6ba4cf1bc898ddf65d867a5245825569b3bacb9111b5d4fc0c3cc82cc313a3eb8689129419c846b1f359dc8fc6bfd17d64bfeab8788d542ed28a7615a8feaf13952a36093610d1083716913208b5619c76ff23460c5cfb53fac7ea3f50c7c7577b5ec713d528265038cf0e6a171e149b2f3587d805b68840adae72f499cf2e83a833f36607418c108d70d8da2c9cdef9aed929fb0e2de6ddd65e8d096ca333e3e7f21dafb17c93ae9b8d97a9c42c7834fc0d6711c050725a1f0e62361130520de1a8719e4ca601d1b5f501dd426d4fce6ad79454582791a26ef92c4a1fddb6c5afc21c7f0ade63c6b6caedefb5d85645f266a2108eceeef266169a4af23eb1c729efbe13452b5d69961b1da456b704cd7b8cf92f236c2ded469b0b4c0751232bc9f5b3a0b406b48897556f53194057928baadf686b10e8b9b63c81379bc035e5694623d0d61a34a0b93d56e16ca72911da862bd18bb8264a9c5b6500dcea2cf195189bc6d63b7e90861990aa926132bbc8183299740c47e25369cabce18",
"analyticsMetadata": {},
"eventData": "$bc111a1b3094a64c$3a7f358a795927d5574bf3c2f92a4887e1f16b5537eb505462492f05e4f879b1721cb51d6a9226edbbfa014cb1ed95a98cdf3124b0941bd2167f08b78a52f02fef2398654f36c35310efdc6fa5e36f2a5ad0e5c5640dab6c3bd0212b252237c63c70e1c6b50172506a4b0334f6a0dffa9eff39d9b626b5b4d02e979ac2ad5fefed9731d21bbc437c8339041b8674e159c7a867321c6579db6082d721e248a6b95fb0a37600b95c25511d4c7f23a93d9da3b649a642846d2dbc2eed056dbacffd707f6dc267a82dee0d91694f7553801a75bb7b002b4a95c1ac071e45a9fe8c378e399e7a6d68e526d96e609e0e8a1b58884bab792aba79ad1c60a11b014b9865450b718e40746802df3fa5da2d0a97f6eeba51c25636d9e79320f07c2189d8084428a69b7557db3718c4dcabf3330ca2478509a6604247f72e6b2a05f8f3b9fb9cd8bba7ce1ac23962ddb3c56771abd86bcb587da9b1f2324f6dcbf9bbb0dce4b02e3dcf25121a910d20abcfcd170368c3cb147b52b85238f5e5af3d5556ce55d018fe2cb1dc4390f180c1c16b4d4c6ff2368c3b333d2249fe5fa674ebb9b612",
"resourceList": [
{
"url": "https://stxt-audiostreaming.akamaized.net/hls/live/2117380/couleur3/master.m3u8",
Expand All @@ -87,7 +51,7 @@
"streamOffset": 55000
},
{
"url": "https://stream.srg-ssr.ch/m/couleur3/mp3_128",
"url": "https://stream.srg-ssr.ch/srgssr/couleur3/mp3/128",
"quality": "HD",
"protocol": "HTTPS",
"encoding": "MP3",
Expand All @@ -101,7 +65,7 @@
"videoCodec": "NONE",
"tokenType": "NONE",
"analyticsMetadata": {
"media_url": "https://stream.srg-ssr.ch/m/couleur3/mp3_128",
"media_url": "https://stream.srg-ssr.ch/srgssr/couleur3/mp3/128",
"media_streaming_quality": "HD",
"media_special_format": "DEFAULT"
}
Expand All @@ -117,21 +81,21 @@
"ns_st_tm": "15:51",
"ns_st_tep": "*null",
"ns_st_stc": "*null",
"ns_st_tpr": "15095466"
"ns_st_tpr": "1"
},
"analyticsMetadata": {
"media_episode_id": "e293edd5-8599-3b27-ad67-e74691654311",
"media_show_id": "15095466",
"media_show": "Youpi Midi",
"media_show_id": "1",
"media_show": "RTS Couleur 3",
"media_episode": "RTS Couleur 3 en direct",
"media_is_livestream": "true",
"media_full_length": "full",
"media_enterprise_units": "RTS",
"media_content_group": "",
"media_channel_id": "8ceb28d9b3f1dd876d1df1780f908578cbefc3d7",
"media_channel_name": "RTS Couleur 3",
"media_since_publication_d": "243",
"media_since_publication_h": "5850",
"media_since_publication_d": "278",
"media_since_publication_h": "6691",
"media_thumbnail": "https://img.rts.ch/articles/2024/image/6uz53b-28609823.image",
"media_publication_date": "2024-10-15",
"media_publication_time": "15:51:18",
Expand All @@ -141,219 +105,5 @@
"media_is_web_only": "false",
"media_signlanguage_on": "false"
}
},
{
"chapterUrn": "urn:rts:video:8841634",
"episode": {
"id": "8741989",
"title": "Couleur 3 en direct",
"publishedDate": "2017-01-14T15:08:55+01:00",
"imageUrl": "https://www.rts.ch/2023/11/16/13/27/14474730.image/16x9",
"imageTitle": "Studio Couleur 3. [RTS]"
},
"show": {
"id": "8483936",
"vendor": "RTS",
"transmission": "RADIO",
"urn": "urn:rts:show:radio:8483936",
"title": "Couleur 3 en vidéos",
"imageUrl": "https://www.rts.ch/2020/05/18/14/20/11333286.image/16x9",
"imageTitle": "Chaîne Couleur 3",
"bannerImageUrl": "https://www.rts.ch/2020/05/18/14/20/11333286.image/3x1",
"posterImageUrl": "https://ws.srf.ch/asset/image/audio/e0322b37-5697-474d-93ac-19a4044a6a24/POSTER.jpg",
"posterImageIsFallbackUrl": true,
"primaryChannelId": "8ceb28d9b3f1dd876d1df1780f908578cbefc3d7",
"primaryChannelUrn": "urn:rts:channel:radio:8ceb28d9b3f1dd876d1df1780f908578cbefc3d7",
"audioDescriptionAvailable": false,
"subtitlesAvailable": false,
"multiAudioLanguagesAvailable": false,
"topicList": [
{
"id": "16208",
"vendor": "RTS",
"transmission": "TV",
"urn": "urn:rts:topic:tv:16208",
"title": "Couleur 3"
}
],
"allowIndexing": false
},
"channel": {
"id": "8ceb28d9b3f1dd876d1df1780f908578cbefc3d7",
"vendor": "RTS",
"urn": "urn:rts:channel:radio:8ceb28d9b3f1dd876d1df1780f908578cbefc3d7",
"title": "Couleur 3",
"imageUrl": "https://www.rts.ch/2020/05/18/14/20/11333286.image/16x9",
"imageUrlRaw": "https://il.srgssr.ch/image-service/dynamic/a9f904.svg",
"imageTitle": "Chaîne Couleur 3",
"transmission": "RADIO"
},
"chapterList": [
{
"id": "8841634",
"mediaType": "VIDEO",
"vendor": "RTS",
"urn": "urn:rts:video:8841634",
"title": "Couleur 3 en direct",
"imageUrl": "https://www.rts.ch/2023/11/16/13/27/14474730.image/16x9",
"imageTitle": "Studio Couleur 3. [RTS]",
"type": "LIVESTREAM",
"date": "2017-01-14T15:08:55+01:00",
"duration": 0,
"playableAbroad": false,
"displayable": true,
"position": 0,
"noEmbed": true,
"analyticsData": {
"ns_st_ep": "Livestream",
"ns_st_ty": "Video",
"ns_st_ci": "8841634",
"ns_st_el": "0",
"ns_st_cl": "0",
"ns_st_sl": "0",
"srg_mgeobl": "true",
"ns_st_tp": "1",
"ns_st_cn": "1",
"ns_st_ct": "vc13",
"ns_st_pn": "1",
"ns_st_cdm": "to",
"ns_st_cmt": "fc"
},
"analyticsMetadata": {
"media_segment": "Livestream",
"media_type": "Video",
"media_segment_id": "8841634",
"media_episode_length": "0",
"media_segment_length": "0",
"media_number_of_segment_selected": "1",
"media_number_of_segments_total": "1",
"media_duration_category": "infinit.livestream",
"media_is_geoblocked": "true",
"media_is_web_only": "false",
"media_production_source": "produced.for.broadcasting",
"media_urn": "urn:rts:video:8841634",
"media_sub_set_id": "LIVESTREAM",
"media_topic_list": "urn:rts:topic:tv:16208",
"media_signlanguage_on": "false"
},
"fullLengthMarkIn": 0,
"fullLengthMarkOut": 0,
"resourceList": [
{
"url": "https://rtsc3video.akamaized.net/hls/live/2042837/c3video/3/playlist.m3u8?",
"quality": "HD",
"protocol": "HLS-DVR",
"encoding": "H264",
"mimeType": "application/x-mpegURL",
"presentation": "DEFAULT",
"streaming": "HLS",
"dvr": true,
"live": true,
"mediaContainer": "MPEG2_TS",
"audioCodec": "AAC",
"videoCodec": "H264",
"tokenType": "NONE",
"analyticsData": {
"srg_mqual": "HD",
"srg_mpres": "DEFAULT"
},
"analyticsMetadata": {
"media_streaming_quality": "HD",
"media_special_format": "DEFAULT",
"media_url": "https://rtsc3video.akamaized.net/hls/live/2042837/c3video/3/playlist.m3u8?"
},
"streamOffset": 30000
},
{
"url": "https://rtsc3video.akamaized.net/hls/live/2042837/c3video/3/playlist.m3u8?dw=0",
"quality": "HD",
"protocol": "HLS",
"encoding": "H264",
"mimeType": "application/x-mpegURL",
"presentation": "DEFAULT",
"streaming": "HLS",
"dvr": false,
"live": true,
"mediaContainer": "MPEG2_TS",
"audioCodec": "AAC",
"videoCodec": "H264",
"tokenType": "NONE",
"analyticsData": {
"srg_mqual": "HD",
"srg_mpres": "DEFAULT"
},
"analyticsMetadata": {
"media_streaming_quality": "HD",
"media_special_format": "DEFAULT",
"media_url": "https://rtsc3video.akamaized.net/hls/live/2042837/c3video/3/playlist.m3u8?dw=0"
}
}
],
"aspectRatio": "16:9"
}
],
"topicList": [
{
"id": "16208",
"vendor": "RTS",
"transmission": "TV",
"urn": "urn:rts:topic:tv:16208",
"title": "Couleur 3"
}
],
"analyticsData": {
"srg_pr_id": "8741989",
"srg_plid": "8483936",
"ns_st_pl": "Livestream",
"ns_st_pr": "Couleur 3 en direct",
"ns_st_dt": "2017-01-14",
"ns_st_ddt": "2017-01-14",
"ns_st_tdt": "2017-01-14",
"ns_st_tm": "15:08",
"ns_st_tep": "*null",
"ns_st_li": "1",
"ns_st_stc": "0867",
"ns_st_st": "Couleur 3",
"ns_st_tpr": "14986950",
"ns_st_en": "*null",
"ns_st_ge": "*null",
"ns_st_ia": "*null",
"ns_st_ce": "1",
"ns_st_cdm": "to",
"ns_st_cmt": "fc",
"srg_unit": "RTS",
"srg_c1": "live",
"srg_c2": "rts.ch_video_couleur3",
"srg_c3": "COULEUR 3",
"srg_tv_id": "3f1e4c4e-0f1e-479b-92b7-16a9f064a2e3"
},
"analyticsMetadata": {
"media_episode_id": "8741989",
"media_show_id": "14986950",
"media_show": "Tout.e Nu.e",
"media_episode": "Couleur 3 en direct",
"media_is_livestream": "true",
"media_full_length": "full",
"media_enterprise_units": "RTS",
"media_joker1": "live",
"media_joker2": "rts.ch_video_couleur3",
"media_joker3": "COULEUR 3",
"media_is_web_only": "false",
"media_production_source": "produced.for.broadcasting",
"media_thumbnail": "https://www.rts.ch/2023/11/16/13/27/14474730.image/16x9",
"media_publication_date": "2017-01-14",
"media_publication_time": "15:08:55",
"media_publication_datetime": "2017-01-14T15:08:55+01:00",
"media_tv_date": "2017-01-14",
"media_tv_time": "15:08:55",
"media_tv_datetime": "2017-01-14T15:08:55+01:00",
"media_content_group": "Couleur 3",
"media_channel_id": "8ceb28d9b3f1dd876d1df1780f908578cbefc3d7",
"media_channel_cs": "0867",
"media_channel_name": "Couleur 3",
"media_since_publication_d": "2734",
"media_since_publication_h": "65637",
"media_signlanguage_on": "false"
}
}
]
4 changes: 2 additions & 2 deletions ...rbox-demo-shared/src/main/java/ch/srgssr/pillarbox/demo/shared/data/samples/SamplesSRG.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,15 +63,15 @@ object SamplesSRG {

val LiveAudioMP3 = DemoItem.URL(
title = "Couleur 3 (live)",
uri = "https://stream.srg-ssr.ch/m/couleur3/mp3_128",
uri = "https://stream.srg-ssr.ch/srgssr/couleur3/mp3/128",
description = "Audio livestream - MP3",
imageUri = "https://www.rts.ch/2020/05/18/14/20/11333286.image/16x9",
languageTag = "fr-CH",
)

val DvrAudioHLS = DemoItem.URL(
title = "Couleur 3 (DVR)",
uri = "https://lsaplus.swisstxt.ch/audio/couleur3_96.stream/playlist.m3u8",
uri = "https://stxt-audiostreaming.akamaized.net/hls/live/2117380/couleur3/master.m3u8",
description = "Audio livestream - HLS",
imageUri = "https://www.rts.ch/2020/05/18/14/20/11333286.image/16x9",
languageTag = "fr-CH",
Expand Down
2 changes: 1 addition & 1 deletion pillarbox-player/src/androidTest/java/ch/srgssr/pillarbox/player/utils/ContentUrls.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,5 +17,5 @@ object ContentUrls {
const val AOD_MP3 =
"https://download-media.srf.ch/world/audio/Echo_der_Zeit_radio/2025/01/Echo_der_Zeit_radio_AUDI20250119_RS_0069_8a020b8274994bfdbc724cb0c6ed520c.mp3"
const val AUDIO_LIVE_MP3 = "https://stream.srg-ssr.ch/m/la-1ere/mp3_128"
const val AUDIO_LIVE_DVR_HLS = "https://lsaplus.swisstxt.ch/audio/couleur3_96.stream/playlist.m3u8"
const val AUDIO_LIVE_DVR_HLS = "https://stxt-audiostreaming.akamaized.net/hls/live/2117380/couleur3/master.m3u8"
}