mirror of
https://github.com/NiciDieNase/chaosflix
synced 2024-11-23 12:53:08 +00:00
add instrumentation tests
This commit is contained in:
Felix
parent
bd13518270
commit
0f285db904
5 changed files with 1014 additions and 0 deletions
|
|
@ -76,5 +76,8 @@ dependencies {
|
|||
androidTestCompile 'com.squareup.okhttp3:mockwebserver:3.6.0'
|
||||
androidTestCompile group: 'commons-io', name: 'commons-io', version: '2.0.1'
|
||||
testCompile 'org.mockito:mockito-core:1.10.19'
|
||||
androidTestCompile 'com.android.support.test.espresso:espresso-core:2.2.2', {
|
||||
exclude group: 'com.android.support', module: 'support-annotations'
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -0,0 +1,54 @@
|
|||
package de.nicidienase.chaosflix;
|
||||
|
||||
|
||||
import android.content.Intent;
|
||||
import android.support.test.rule.ActivityTestRule;
|
||||
import android.support.test.runner.AndroidJUnit4;
|
||||
import android.test.suitebuilder.annotation.LargeTest;
|
||||
|
||||
import org.junit.Before;
|
||||
import org.junit.Rule;
|
||||
import org.junit.Test;
|
||||
import org.junit.runner.RunWith;
|
||||
import de.nicidienase.chaosflix.test.R;
|
||||
|
||||
import java.io.IOException;
|
||||
import java.util.concurrent.TimeoutException;
|
||||
|
||||
import de.nicidienase.chaosflix.activities.ConferencesActivity;
|
||||
import de.nicidienase.chaosflix.network.MediaApiService;
|
||||
import okhttp3.mockwebserver.MockWebServer;
|
||||
|
||||
@LargeTest
|
||||
@RunWith(AndroidJUnit4.class)
|
||||
public class ConferencesActivityTest {
|
||||
|
||||
@Rule
|
||||
public ActivityTestRule<ConferencesActivity> mActivityTestRule
|
||||
= new ActivityTestRule<>(ConferencesActivity.class, false, false);
|
||||
private static MockWebServer server;
|
||||
|
||||
|
||||
@Before
|
||||
public void setup() throws IOException, TimeoutException {
|
||||
server = new MockWebServer();
|
||||
server.start();
|
||||
String serverUrl = server.url("").toString();
|
||||
|
||||
server.enqueue(TestHelper.getResponseForRaw(R.raw.conferences_json));
|
||||
server.enqueue(TestHelper.getResponseForRaw(R.raw.conferences_101_33c3_json));
|
||||
|
||||
Intent i = new Intent();
|
||||
i.putExtra("server_url",serverUrl);
|
||||
mActivityTestRule.launchActivity(i);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void conferencesActivityTest() throws InterruptedException {
|
||||
while(true){
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
948
app/src/androidTest/res/raw/example_streams_v1_json
Normal file
948
app/src/androidTest/res/raw/example_streams_v1_json
Normal file
|
|
@ -0,0 +1,948 @@
|
|||
[
|
||||
{
|
||||
"conference": "32C3",
|
||||
"group": "Lecture Rooms",
|
||||
"rooms": [
|
||||
{
|
||||
"slug": "hall1",
|
||||
"schedulename": "Hall 1",
|
||||
"thumb": "https://streaming.media.ccc.de/32c3/../thumbs/s1.png",
|
||||
"link": "https://streaming.media.ccc.de/32c3/hall1/",
|
||||
"display": "Hall 1",
|
||||
"streams": [
|
||||
{
|
||||
"slug": "hd-native",
|
||||
"display": "Hall 1 FullHD Video",
|
||||
"type": "video",
|
||||
"isTranslated": false,
|
||||
"videoSize": [
|
||||
1920,
|
||||
1080
|
||||
],
|
||||
"urls": {
|
||||
"webm": {
|
||||
"display": "WebM",
|
||||
"tech": "1920x1080, VP8+Vorbis in WebM, 2.8 MBit/s",
|
||||
"url": "http://cdn.c3voc.de/s1_native_hd.webm"
|
||||
},
|
||||
"hls": {
|
||||
"display": "HLS",
|
||||
"tech": "1920x1080, h264+AAC im MPEG-TS-Container via HTTP, 3 MBit/s",
|
||||
"url": "http://cdn.c3voc.de/hls/s1_native_hd.m3u8"
|
||||
}
|
||||
}
|
||||
},
|
||||
{
|
||||
"slug": "hd-translated",
|
||||
"display": "Hall 1 FullHD Video (Translation)",
|
||||
"type": "video",
|
||||
"isTranslated": true,
|
||||
"videoSize": [
|
||||
1920,
|
||||
1080
|
||||
],
|
||||
"urls": {
|
||||
"webm": {
|
||||
"display": "WebM",
|
||||
"tech": "1920x1080, VP8+Vorbis in WebM, 2.8 MBit/s",
|
||||
"url": "http://cdn.c3voc.de/s1_translated_hd.webm"
|
||||
},
|
||||
"hls": {
|
||||
"display": "HLS",
|
||||
"tech": "1920x1080, h264+AAC im MPEG-TS-Container via HTTP, 3 MBit/s",
|
||||
"url": "http://cdn.c3voc.de/hls/s1_translated_hd.m3u8"
|
||||
}
|
||||
}
|
||||
},
|
||||
{
|
||||
"slug": "sd-native",
|
||||
"display": "Hall 1 SD Video",
|
||||
"type": "video",
|
||||
"isTranslated": false,
|
||||
"videoSize": [
|
||||
1024,
|
||||
576
|
||||
],
|
||||
"urls": {
|
||||
"webm": {
|
||||
"display": "WebM",
|
||||
"tech": "1024x576, VP8+Vorbis in WebM, 800 kBit/s",
|
||||
"url": "http://cdn.c3voc.de/s1_native_sd.webm"
|
||||
},
|
||||
"hls": {
|
||||
"display": "HLS",
|
||||
"tech": "1024x576, h264+AAC im MPEG-TS-Container via HTTP, 800 kBit/s",
|
||||
"url": "http://cdn.c3voc.de/hls/s1_native_sd.m3u8"
|
||||
}
|
||||
}
|
||||
},
|
||||
{
|
||||
"slug": "sd-translated",
|
||||
"display": "Hall 1 SD Video (Translation)",
|
||||
"type": "video",
|
||||
"isTranslated": true,
|
||||
"videoSize": [
|
||||
1024,
|
||||
576
|
||||
],
|
||||
"urls": {
|
||||
"webm": {
|
||||
"display": "WebM",
|
||||
"tech": "1024x576, VP8+Vorbis in WebM, 800 kBit/s",
|
||||
"url": "http://cdn.c3voc.de/s1_translated_sd.webm"
|
||||
},
|
||||
"hls": {
|
||||
"display": "HLS",
|
||||
"tech": "1024x576, h264+AAC im MPEG-TS-Container via HTTP, 800 kBit/s",
|
||||
"url": "http://cdn.c3voc.de/hls/s1_translated_sd.m3u8"
|
||||
}
|
||||
}
|
||||
},
|
||||
{
|
||||
"slug": "slides-native",
|
||||
"display": "Hall 1 Slides",
|
||||
"type": "slides",
|
||||
"isTranslated": false,
|
||||
"videoSize": [
|
||||
1024,
|
||||
576
|
||||
],
|
||||
"urls": {
|
||||
"webm": {
|
||||
"display": "WebM",
|
||||
"tech": "1024x576, VP8+Vorbis in WebM, XXX kBit/s",
|
||||
"url": "http://cdn.c3voc.de/s1_native_slides.webm"
|
||||
},
|
||||
"hls": {
|
||||
"display": "HLS",
|
||||
"tech": "1024x576, h264+AAC im MPEG-TS-Container via HTTP, XXX kBit/s",
|
||||
"url": "http://cdn.c3voc.de/hls/s1_native_slides.m3u8"
|
||||
}
|
||||
}
|
||||
},
|
||||
{
|
||||
"slug": "slides-translated",
|
||||
"display": "Hall 1 Slides (Translation)",
|
||||
"type": "slides",
|
||||
"isTranslated": true,
|
||||
"videoSize": [
|
||||
1024,
|
||||
576
|
||||
],
|
||||
"urls": {
|
||||
"webm": {
|
||||
"display": "WebM",
|
||||
"tech": "1024x576, VP8+Vorbis in WebM, XXX kBit/s",
|
||||
"url": "http://cdn.c3voc.de/s1_translated_slides.webm"
|
||||
},
|
||||
"hls": {
|
||||
"display": "HLS",
|
||||
"tech": "1024x576, h264+AAC im MPEG-TS-Container via HTTP, XXX kBit/s",
|
||||
"url": "http://cdn.c3voc.de/hls/s1_translated_slides.m3u8"
|
||||
}
|
||||
}
|
||||
},
|
||||
{
|
||||
"slug": "audio-native",
|
||||
"display": "Hall 1 Audio",
|
||||
"type": "audio",
|
||||
"isTranslated": false,
|
||||
"videoSize": null,
|
||||
"urls": {
|
||||
"mp3": {
|
||||
"display": "MP3",
|
||||
"tech": "MP3-Audio, 96 kBit/s",
|
||||
"url": "http://cdn.c3voc.de/s1_native.mp3"
|
||||
},
|
||||
"opus": {
|
||||
"display": "Opus",
|
||||
"tech": "Opus-Audio, 64 kBit/s",
|
||||
"url": "http://cdn.c3voc.de/s1_native.opus"
|
||||
}
|
||||
}
|
||||
},
|
||||
{
|
||||
"slug": "audio-translated",
|
||||
"display": "Hall 1 Audio (Translation)",
|
||||
"type": "audio",
|
||||
"isTranslated": true,
|
||||
"videoSize": null,
|
||||
"urls": {
|
||||
"mp3": {
|
||||
"display": "MP3",
|
||||
"tech": "MP3-Audio, 96 kBit/s",
|
||||
"url": "http://cdn.c3voc.de/s1_translated.mp3"
|
||||
},
|
||||
"opus": {
|
||||
"display": "Opus",
|
||||
"tech": "Opus-Audio, 64 kBit/s",
|
||||
"url": "http://cdn.c3voc.de/s1_translated.opus"
|
||||
}
|
||||
}
|
||||
}
|
||||
]
|
||||
},
|
||||
{
|
||||
"slug": "hall2",
|
||||
"schedulename": "Hall 2",
|
||||
"thumb": "https://streaming.media.ccc.de/32c3/../thumbs/s2.png",
|
||||
"link": "https://streaming.media.ccc.de/32c3/hall2/",
|
||||
"display": "Hall 2",
|
||||
"streams": [
|
||||
{
|
||||
"slug": "hd-native",
|
||||
"display": "Hall 2 FullHD Video",
|
||||
"type": "video",
|
||||
"isTranslated": false,
|
||||
"videoSize": [
|
||||
1920,
|
||||
1080
|
||||
],
|
||||
"urls": {
|
||||
"webm": {
|
||||
"display": "WebM",
|
||||
"tech": "1920x1080, VP8+Vorbis in WebM, 2.8 MBit/s",
|
||||
"url": "http://cdn.c3voc.de/s2_native_hd.webm"
|
||||
},
|
||||
"hls": {
|
||||
"display": "HLS",
|
||||
"tech": "1920x1080, h264+AAC im MPEG-TS-Container via HTTP, 3 MBit/s",
|
||||
"url": "http://cdn.c3voc.de/hls/s2_native_hd.m3u8"
|
||||
}
|
||||
}
|
||||
},
|
||||
{
|
||||
"slug": "hd-translated",
|
||||
"display": "Hall 2 FullHD Video (Translation)",
|
||||
"type": "video",
|
||||
"isTranslated": true,
|
||||
"videoSize": [
|
||||
1920,
|
||||
1080
|
||||
],
|
||||
"urls": {
|
||||
"webm": {
|
||||
"display": "WebM",
|
||||
"tech": "1920x1080, VP8+Vorbis in WebM, 2.8 MBit/s",
|
||||
"url": "http://cdn.c3voc.de/s2_translated_hd.webm"
|
||||
},
|
||||
"hls": {
|
||||
"display": "HLS",
|
||||
"tech": "1920x1080, h264+AAC im MPEG-TS-Container via HTTP, 3 MBit/s",
|
||||
"url": "http://cdn.c3voc.de/hls/s2_translated_hd.m3u8"
|
||||
}
|
||||
}
|
||||
},
|
||||
{
|
||||
"slug": "sd-native",
|
||||
"display": "Hall 2 SD Video",
|
||||
"type": "video",
|
||||
"isTranslated": false,
|
||||
"videoSize": [
|
||||
1024,
|
||||
576
|
||||
],
|
||||
"urls": {
|
||||
"webm": {
|
||||
"display": "WebM",
|
||||
"tech": "1024x576, VP8+Vorbis in WebM, 800 kBit/s",
|
||||
"url": "http://cdn.c3voc.de/s2_native_sd.webm"
|
||||
},
|
||||
"hls": {
|
||||
"display": "HLS",
|
||||
"tech": "1024x576, h264+AAC im MPEG-TS-Container via HTTP, 800 kBit/s",
|
||||
"url": "http://cdn.c3voc.de/hls/s2_native_sd.m3u8"
|
||||
}
|
||||
}
|
||||
},
|
||||
{
|
||||
"slug": "sd-translated",
|
||||
"display": "Hall 2 SD Video (Translation)",
|
||||
"type": "video",
|
||||
"isTranslated": true,
|
||||
"videoSize": [
|
||||
1024,
|
||||
576
|
||||
],
|
||||
"urls": {
|
||||
"webm": {
|
||||
"display": "WebM",
|
||||
"tech": "1024x576, VP8+Vorbis in WebM, 800 kBit/s",
|
||||
"url": "http://cdn.c3voc.de/s2_translated_sd.webm"
|
||||
},
|
||||
"hls": {
|
||||
"display": "HLS",
|
||||
"tech": "1024x576, h264+AAC im MPEG-TS-Container via HTTP, 800 kBit/s",
|
||||
"url": "http://cdn.c3voc.de/hls/s2_translated_sd.m3u8"
|
||||
}
|
||||
}
|
||||
},
|
||||
{
|
||||
"slug": "slides-native",
|
||||
"display": "Hall 2 Slides",
|
||||
"type": "slides",
|
||||
"isTranslated": false,
|
||||
"videoSize": [
|
||||
1024,
|
||||
576
|
||||
],
|
||||
"urls": {
|
||||
"webm": {
|
||||
"display": "WebM",
|
||||
"tech": "1024x576, VP8+Vorbis in WebM, XXX kBit/s",
|
||||
"url": "http://cdn.c3voc.de/s2_native_slides.webm"
|
||||
},
|
||||
"hls": {
|
||||
"display": "HLS",
|
||||
"tech": "1024x576, h264+AAC im MPEG-TS-Container via HTTP, XXX kBit/s",
|
||||
"url": "http://cdn.c3voc.de/hls/s2_native_slides.m3u8"
|
||||
}
|
||||
}
|
||||
},
|
||||
{
|
||||
"slug": "slides-translated",
|
||||
"display": "Hall 2 Slides (Translation)",
|
||||
"type": "slides",
|
||||
"isTranslated": true,
|
||||
"videoSize": [
|
||||
1024,
|
||||
576
|
||||
],
|
||||
"urls": {
|
||||
"webm": {
|
||||
"display": "WebM",
|
||||
"tech": "1024x576, VP8+Vorbis in WebM, XXX kBit/s",
|
||||
"url": "http://cdn.c3voc.de/s2_translated_slides.webm"
|
||||
},
|
||||
"hls": {
|
||||
"display": "HLS",
|
||||
"tech": "1024x576, h264+AAC im MPEG-TS-Container via HTTP, XXX kBit/s",
|
||||
"url": "http://cdn.c3voc.de/hls/s2_translated_slides.m3u8"
|
||||
}
|
||||
}
|
||||
},
|
||||
{
|
||||
"slug": "audio-native",
|
||||
"display": "Hall 2 Audio",
|
||||
"type": "audio",
|
||||
"isTranslated": false,
|
||||
"videoSize": null,
|
||||
"urls": {
|
||||
"mp3": {
|
||||
"display": "MP3",
|
||||
"tech": "MP3-Audio, 96 kBit/s",
|
||||
"url": "http://cdn.c3voc.de/s2_native.mp3"
|
||||
},
|
||||
"opus": {
|
||||
"display": "Opus",
|
||||
"tech": "Opus-Audio, 64 kBit/s",
|
||||
"url": "http://cdn.c3voc.de/s2_native.opus"
|
||||
}
|
||||
}
|
||||
},
|
||||
{
|
||||
"slug": "audio-translated",
|
||||
"display": "Hall 2 Audio (Translation)",
|
||||
"type": "audio",
|
||||
"isTranslated": true,
|
||||
"videoSize": null,
|
||||
"urls": {
|
||||
"mp3": {
|
||||
"display": "MP3",
|
||||
"tech": "MP3-Audio, 96 kBit/s",
|
||||
"url": "http://cdn.c3voc.de/s2_translated.mp3"
|
||||
},
|
||||
"opus": {
|
||||
"display": "Opus",
|
||||
"tech": "Opus-Audio, 64 kBit/s",
|
||||
"url": "http://cdn.c3voc.de/s2_translated.opus"
|
||||
}
|
||||
}
|
||||
}
|
||||
]
|
||||
},
|
||||
{
|
||||
"slug": "hallg",
|
||||
"schedulename": "Hall G",
|
||||
"thumb": "https://streaming.media.ccc.de/32c3/../thumbs/s3.png",
|
||||
"link": "https://streaming.media.ccc.de/32c3/hallg/",
|
||||
"display": "Hall G",
|
||||
"streams": [
|
||||
{
|
||||
"slug": "hd-native",
|
||||
"display": "Hall G FullHD Video",
|
||||
"type": "video",
|
||||
"isTranslated": false,
|
||||
"videoSize": [
|
||||
1920,
|
||||
1080
|
||||
],
|
||||
"urls": {
|
||||
"webm": {
|
||||
"display": "WebM",
|
||||
"tech": "1920x1080, VP8+Vorbis in WebM, 2.8 MBit/s",
|
||||
"url": "http://cdn.c3voc.de/s3_native_hd.webm"
|
||||
},
|
||||
"hls": {
|
||||
"display": "HLS",
|
||||
"tech": "1920x1080, h264+AAC im MPEG-TS-Container via HTTP, 3 MBit/s",
|
||||
"url": "http://cdn.c3voc.de/hls/s3_native_hd.m3u8"
|
||||
}
|
||||
}
|
||||
},
|
||||
{
|
||||
"slug": "hd-translated",
|
||||
"display": "Hall G FullHD Video (Translation)",
|
||||
"type": "video",
|
||||
"isTranslated": true,
|
||||
"videoSize": [
|
||||
1920,
|
||||
1080
|
||||
],
|
||||
"urls": {
|
||||
"webm": {
|
||||
"display": "WebM",
|
||||
"tech": "1920x1080, VP8+Vorbis in WebM, 2.8 MBit/s",
|
||||
"url": "http://cdn.c3voc.de/s3_translated_hd.webm"
|
||||
},
|
||||
"hls": {
|
||||
"display": "HLS",
|
||||
"tech": "1920x1080, h264+AAC im MPEG-TS-Container via HTTP, 3 MBit/s",
|
||||
"url": "http://cdn.c3voc.de/hls/s3_translated_hd.m3u8"
|
||||
}
|
||||
}
|
||||
},
|
||||
{
|
||||
"slug": "sd-native",
|
||||
"display": "Hall G SD Video",
|
||||
"type": "video",
|
||||
"isTranslated": false,
|
||||
"videoSize": [
|
||||
1024,
|
||||
576
|
||||
],
|
||||
"urls": {
|
||||
"webm": {
|
||||
"display": "WebM",
|
||||
"tech": "1024x576, VP8+Vorbis in WebM, 800 kBit/s",
|
||||
"url": "http://cdn.c3voc.de/s3_native_sd.webm"
|
||||
},
|
||||
"hls": {
|
||||
"display": "HLS",
|
||||
"tech": "1024x576, h264+AAC im MPEG-TS-Container via HTTP, 800 kBit/s",
|
||||
"url": "http://cdn.c3voc.de/hls/s3_native_sd.m3u8"
|
||||
}
|
||||
}
|
||||
},
|
||||
{
|
||||
"slug": "sd-translated",
|
||||
"display": "Hall G SD Video (Translation)",
|
||||
"type": "video",
|
||||
"isTranslated": true,
|
||||
"videoSize": [
|
||||
1024,
|
||||
576
|
||||
],
|
||||
"urls": {
|
||||
"webm": {
|
||||
"display": "WebM",
|
||||
"tech": "1024x576, VP8+Vorbis in WebM, 800 kBit/s",
|
||||
"url": "http://cdn.c3voc.de/s3_translated_sd.webm"
|
||||
},
|
||||
"hls": {
|
||||
"display": "HLS",
|
||||
"tech": "1024x576, h264+AAC im MPEG-TS-Container via HTTP, 800 kBit/s",
|
||||
"url": "http://cdn.c3voc.de/hls/s3_translated_sd.m3u8"
|
||||
}
|
||||
}
|
||||
},
|
||||
{
|
||||
"slug": "slides-native",
|
||||
"display": "Hall G Slides",
|
||||
"type": "slides",
|
||||
"isTranslated": false,
|
||||
"videoSize": [
|
||||
1024,
|
||||
576
|
||||
],
|
||||
"urls": {
|
||||
"webm": {
|
||||
"display": "WebM",
|
||||
"tech": "1024x576, VP8+Vorbis in WebM, XXX kBit/s",
|
||||
"url": "http://cdn.c3voc.de/s3_native_slides.webm"
|
||||
},
|
||||
"hls": {
|
||||
"display": "HLS",
|
||||
"tech": "1024x576, h264+AAC im MPEG-TS-Container via HTTP, XXX kBit/s",
|
||||
"url": "http://cdn.c3voc.de/hls/s3_native_slides.m3u8"
|
||||
}
|
||||
}
|
||||
},
|
||||
{
|
||||
"slug": "slides-translated",
|
||||
"display": "Hall G Slides (Translation)",
|
||||
"type": "slides",
|
||||
"isTranslated": true,
|
||||
"videoSize": [
|
||||
1024,
|
||||
576
|
||||
],
|
||||
"urls": {
|
||||
"webm": {
|
||||
"display": "WebM",
|
||||
"tech": "1024x576, VP8+Vorbis in WebM, XXX kBit/s",
|
||||
"url": "http://cdn.c3voc.de/s3_translated_slides.webm"
|
||||
},
|
||||
"hls": {
|
||||
"display": "HLS",
|
||||
"tech": "1024x576, h264+AAC im MPEG-TS-Container via HTTP, XXX kBit/s",
|
||||
"url": "http://cdn.c3voc.de/hls/s3_translated_slides.m3u8"
|
||||
}
|
||||
}
|
||||
},
|
||||
{
|
||||
"slug": "audio-native",
|
||||
"display": "Hall G Audio",
|
||||
"type": "audio",
|
||||
"isTranslated": false,
|
||||
"videoSize": null,
|
||||
"urls": {
|
||||
"mp3": {
|
||||
"display": "MP3",
|
||||
"tech": "MP3-Audio, 96 kBit/s",
|
||||
"url": "http://cdn.c3voc.de/s3_native.mp3"
|
||||
},
|
||||
"opus": {
|
||||
"display": "Opus",
|
||||
"tech": "Opus-Audio, 64 kBit/s",
|
||||
"url": "http://cdn.c3voc.de/s3_native.opus"
|
||||
}
|
||||
}
|
||||
},
|
||||
{
|
||||
"slug": "audio-translated",
|
||||
"display": "Hall G Audio (Translation)",
|
||||
"type": "audio",
|
||||
"isTranslated": true,
|
||||
"videoSize": null,
|
||||
"urls": {
|
||||
"mp3": {
|
||||
"display": "MP3",
|
||||
"tech": "MP3-Audio, 96 kBit/s",
|
||||
"url": "http://cdn.c3voc.de/s3_translated.mp3"
|
||||
},
|
||||
"opus": {
|
||||
"display": "Opus",
|
||||
"tech": "Opus-Audio, 64 kBit/s",
|
||||
"url": "http://cdn.c3voc.de/s3_translated.opus"
|
||||
}
|
||||
}
|
||||
}
|
||||
]
|
||||
},
|
||||
{
|
||||
"slug": "hall6",
|
||||
"schedulename": "Hall 6",
|
||||
"thumb": "https://streaming.media.ccc.de/32c3/../thumbs/s4.png",
|
||||
"link": "https://streaming.media.ccc.de/32c3/hall6/",
|
||||
"display": "Hall 6",
|
||||
"streams": [
|
||||
{
|
||||
"slug": "hd-native",
|
||||
"display": "Hall 6 FullHD Video",
|
||||
"type": "video",
|
||||
"isTranslated": false,
|
||||
"videoSize": [
|
||||
1920,
|
||||
1080
|
||||
],
|
||||
"urls": {
|
||||
"webm": {
|
||||
"display": "WebM",
|
||||
"tech": "1920x1080, VP8+Vorbis in WebM, 2.8 MBit/s",
|
||||
"url": "http://cdn.c3voc.de/s4_native_hd.webm"
|
||||
},
|
||||
"hls": {
|
||||
"display": "HLS",
|
||||
"tech": "1920x1080, h264+AAC im MPEG-TS-Container via HTTP, 3 MBit/s",
|
||||
"url": "http://cdn.c3voc.de/hls/s4_native_hd.m3u8"
|
||||
}
|
||||
}
|
||||
},
|
||||
{
|
||||
"slug": "hd-translated",
|
||||
"display": "Hall 6 FullHD Video (Translation)",
|
||||
"type": "video",
|
||||
"isTranslated": true,
|
||||
"videoSize": [
|
||||
1920,
|
||||
1080
|
||||
],
|
||||
"urls": {
|
||||
"webm": {
|
||||
"display": "WebM",
|
||||
"tech": "1920x1080, VP8+Vorbis in WebM, 2.8 MBit/s",
|
||||
"url": "http://cdn.c3voc.de/s4_translated_hd.webm"
|
||||
},
|
||||
"hls": {
|
||||
"display": "HLS",
|
||||
"tech": "1920x1080, h264+AAC im MPEG-TS-Container via HTTP, 3 MBit/s",
|
||||
"url": "http://cdn.c3voc.de/hls/s4_translated_hd.m3u8"
|
||||
}
|
||||
}
|
||||
},
|
||||
{
|
||||
"slug": "sd-native",
|
||||
"display": "Hall 6 SD Video",
|
||||
"type": "video",
|
||||
"isTranslated": false,
|
||||
"videoSize": [
|
||||
1024,
|
||||
576
|
||||
],
|
||||
"urls": {
|
||||
"webm": {
|
||||
"display": "WebM",
|
||||
"tech": "1024x576, VP8+Vorbis in WebM, 800 kBit/s",
|
||||
"url": "http://cdn.c3voc.de/s4_native_sd.webm"
|
||||
},
|
||||
"hls": {
|
||||
"display": "HLS",
|
||||
"tech": "1024x576, h264+AAC im MPEG-TS-Container via HTTP, 800 kBit/s",
|
||||
"url": "http://cdn.c3voc.de/hls/s4_native_sd.m3u8"
|
||||
}
|
||||
}
|
||||
},
|
||||
{
|
||||
"slug": "sd-translated",
|
||||
"display": "Hall 6 SD Video (Translation)",
|
||||
"type": "video",
|
||||
"isTranslated": true,
|
||||
"videoSize": [
|
||||
1024,
|
||||
576
|
||||
],
|
||||
"urls": {
|
||||
"webm": {
|
||||
"display": "WebM",
|
||||
"tech": "1024x576, VP8+Vorbis in WebM, 800 kBit/s",
|
||||
"url": "http://cdn.c3voc.de/s4_translated_sd.webm"
|
||||
},
|
||||
"hls": {
|
||||
"display": "HLS",
|
||||
"tech": "1024x576, h264+AAC im MPEG-TS-Container via HTTP, 800 kBit/s",
|
||||
"url": "http://cdn.c3voc.de/hls/s4_translated_sd.m3u8"
|
||||
}
|
||||
}
|
||||
},
|
||||
{
|
||||
"slug": "slides-native",
|
||||
"display": "Hall 6 Slides",
|
||||
"type": "slides",
|
||||
"isTranslated": false,
|
||||
"videoSize": [
|
||||
1024,
|
||||
576
|
||||
],
|
||||
"urls": {
|
||||
"webm": {
|
||||
"display": "WebM",
|
||||
"tech": "1024x576, VP8+Vorbis in WebM, XXX kBit/s",
|
||||
"url": "http://cdn.c3voc.de/s4_native_slides.webm"
|
||||
},
|
||||
"hls": {
|
||||
"display": "HLS",
|
||||
"tech": "1024x576, h264+AAC im MPEG-TS-Container via HTTP, XXX kBit/s",
|
||||
"url": "http://cdn.c3voc.de/hls/s4_native_slides.m3u8"
|
||||
}
|
||||
}
|
||||
},
|
||||
{
|
||||
"slug": "slides-translated",
|
||||
"display": "Hall 6 Slides (Translation)",
|
||||
"type": "slides",
|
||||
"isTranslated": true,
|
||||
"videoSize": [
|
||||
1024,
|
||||
576
|
||||
],
|
||||
"urls": {
|
||||
"webm": {
|
||||
"display": "WebM",
|
||||
"tech": "1024x576, VP8+Vorbis in WebM, XXX kBit/s",
|
||||
"url": "http://cdn.c3voc.de/s4_translated_slides.webm"
|
||||
},
|
||||
"hls": {
|
||||
"display": "HLS",
|
||||
"tech": "1024x576, h264+AAC im MPEG-TS-Container via HTTP, XXX kBit/s",
|
||||
"url": "http://cdn.c3voc.de/hls/s4_translated_slides.m3u8"
|
||||
}
|
||||
}
|
||||
},
|
||||
{
|
||||
"slug": "audio-native",
|
||||
"display": "Hall 6 Audio",
|
||||
"type": "audio",
|
||||
"isTranslated": false,
|
||||
"videoSize": null,
|
||||
"urls": {
|
||||
"mp3": {
|
||||
"display": "MP3",
|
||||
"tech": "MP3-Audio, 96 kBit/s",
|
||||
"url": "http://cdn.c3voc.de/s4_native.mp3"
|
||||
},
|
||||
"opus": {
|
||||
"display": "Opus",
|
||||
"tech": "Opus-Audio, 64 kBit/s",
|
||||
"url": "http://cdn.c3voc.de/s4_native.opus"
|
||||
}
|
||||
}
|
||||
},
|
||||
{
|
||||
"slug": "audio-translated",
|
||||
"display": "Hall 6 Audio (Translation)",
|
||||
"type": "audio",
|
||||
"isTranslated": true,
|
||||
"videoSize": null,
|
||||
"urls": {
|
||||
"mp3": {
|
||||
"display": "MP3",
|
||||
"tech": "MP3-Audio, 96 kBit/s",
|
||||
"url": "http://cdn.c3voc.de/s4_translated.mp3"
|
||||
},
|
||||
"opus": {
|
||||
"display": "Opus",
|
||||
"tech": "Opus-Audio, 64 kBit/s",
|
||||
"url": "http://cdn.c3voc.de/s4_translated.opus"
|
||||
}
|
||||
}
|
||||
}
|
||||
]
|
||||
}
|
||||
]
|
||||
},
|
||||
{
|
||||
"conference": "32C3",
|
||||
"group": "Live Music",
|
||||
"rooms": [
|
||||
{
|
||||
"slug": "lounge",
|
||||
"schedulename": "lounge",
|
||||
"thumb": "https://streaming.media.ccc.de/32c3/../thumbs/lounge.png",
|
||||
"link": "https://streaming.media.ccc.de/32c3/lounge/",
|
||||
"display": "Lounge",
|
||||
"streams": [
|
||||
{
|
||||
"slug": "music-native",
|
||||
"display": "Lounge Radio",
|
||||
"type": "music",
|
||||
"isTranslated": false,
|
||||
"videoSize": null,
|
||||
"urls": {
|
||||
"mp3": {
|
||||
"display": "MP3",
|
||||
"tech": "MP3-Audio, 192 kBit/s",
|
||||
"url": "http://cdn.c3voc.de/lounge.mp3"
|
||||
},
|
||||
"opus": {
|
||||
"display": "Opus",
|
||||
"tech": "Opus-Audio, 96 kBit/s",
|
||||
"url": "http://cdn.c3voc.de/lounge.opus"
|
||||
}
|
||||
}
|
||||
}
|
||||
]
|
||||
},
|
||||
{
|
||||
"slug": "ambient",
|
||||
"schedulename": "ambient",
|
||||
"thumb": "https://streaming.media.ccc.de/32c3/../thumbs/ambient.png",
|
||||
"link": "https://streaming.media.ccc.de/32c3/ambient/",
|
||||
"display": "Ambient",
|
||||
"streams": [
|
||||
{
|
||||
"slug": "music-native",
|
||||
"display": "Ambient Radio",
|
||||
"type": "music",
|
||||
"isTranslated": false,
|
||||
"videoSize": null,
|
||||
"urls": {
|
||||
"mp3": {
|
||||
"display": "MP3",
|
||||
"tech": "MP3-Audio, 192 kBit/s",
|
||||
"url": "http://cdn.c3voc.de/ambient.mp3"
|
||||
},
|
||||
"opus": {
|
||||
"display": "Opus",
|
||||
"tech": "Opus-Audio, 96 kBit/s",
|
||||
"url": "http://cdn.c3voc.de/ambient.opus"
|
||||
}
|
||||
}
|
||||
}
|
||||
]
|
||||
},
|
||||
{
|
||||
"slug": "dome",
|
||||
"schedulename": "dome",
|
||||
"thumb": "https://streaming.media.ccc.de/32c3/../thumbs/dome.png",
|
||||
"link": "https://streaming.media.ccc.de/32c3/dome/",
|
||||
"display": "Dome",
|
||||
"streams": [
|
||||
{
|
||||
"slug": "music-native",
|
||||
"display": "Dome Radio",
|
||||
"type": "music",
|
||||
"isTranslated": false,
|
||||
"videoSize": null,
|
||||
"urls": {
|
||||
"mp3": {
|
||||
"display": "MP3",
|
||||
"tech": "MP3-Audio, 192 kBit/s",
|
||||
"url": "http://cdn.c3voc.de/dome.mp3"
|
||||
},
|
||||
"opus": {
|
||||
"display": "Opus",
|
||||
"tech": "Opus-Audio, 96 kBit/s",
|
||||
"url": "http://cdn.c3voc.de/dome.opus"
|
||||
}
|
||||
}
|
||||
}
|
||||
]
|
||||
},
|
||||
{
|
||||
"slug": "chaos-west",
|
||||
"schedulename": "chaos-west",
|
||||
"thumb": "https://streaming.media.ccc.de/32c3/../thumbs/chaos-west.png",
|
||||
"link": "https://streaming.media.ccc.de/32c3/chaos-west/",
|
||||
"display": "Chaos-West",
|
||||
"streams": [
|
||||
{
|
||||
"slug": "music-native",
|
||||
"display": "Chaos-West Radio",
|
||||
"type": "music",
|
||||
"isTranslated": false,
|
||||
"videoSize": null,
|
||||
"urls": {
|
||||
"mp3": {
|
||||
"display": "MP3",
|
||||
"tech": "MP3-Audio, 192 kBit/s",
|
||||
"url": "http://cdn.c3voc.de/chaos-west.mp3"
|
||||
},
|
||||
"opus": {
|
||||
"display": "Opus",
|
||||
"tech": "Opus-Audio, 96 kBit/s",
|
||||
"url": "http://cdn.c3voc.de/chaos-west.opus"
|
||||
}
|
||||
}
|
||||
}
|
||||
]
|
||||
}
|
||||
]
|
||||
},
|
||||
{
|
||||
"conference": "32C3",
|
||||
"group": "Live Podcasts",
|
||||
"rooms": [
|
||||
{
|
||||
"slug": "sendezentrum",
|
||||
"schedulename": "Bühne",
|
||||
"thumb": "https://streaming.media.ccc.de/32c3/../thumbs/s5.png",
|
||||
"link": "https://streaming.media.ccc.de/32c3/sendezentrum/",
|
||||
"display": "Sendezentrum",
|
||||
"streams": [
|
||||
{
|
||||
"slug": "hd-stereo",
|
||||
"display": "Sendezentrum FullHD Video",
|
||||
"type": "video",
|
||||
"isTranslated": false,
|
||||
"videoSize": [
|
||||
1920,
|
||||
1080
|
||||
],
|
||||
"urls": {
|
||||
"webm": {
|
||||
"display": "WebM",
|
||||
"tech": "1920x1080, VP8+Vorbis in WebM, 2.8 MBit/s",
|
||||
"url": "http://cdn.c3voc.de/s5_stereo_hd.webm"
|
||||
},
|
||||
"hls": {
|
||||
"display": "HLS",
|
||||
"tech": "1920x1080, h264+AAC im MPEG-TS-Container via HTTP, 3 MBit/s",
|
||||
"url": "http://cdn.c3voc.de/hls/s5_stereo_hd.m3u8"
|
||||
}
|
||||
}
|
||||
},
|
||||
{
|
||||
"slug": "sd-stereo",
|
||||
"display": "Sendezentrum SD Video",
|
||||
"type": "video",
|
||||
"isTranslated": false,
|
||||
"videoSize": [
|
||||
1024,
|
||||
576
|
||||
],
|
||||
"urls": {
|
||||
"webm": {
|
||||
"display": "WebM",
|
||||
"tech": "1024x576, VP8+Vorbis in WebM, 800 kBit/s",
|
||||
"url": "http://cdn.c3voc.de/s5_stereo_sd.webm"
|
||||
},
|
||||
"hls": {
|
||||
"display": "HLS",
|
||||
"tech": "1024x576, h264+AAC im MPEG-TS-Container via HTTP, 800 kBit/s",
|
||||
"url": "http://cdn.c3voc.de/hls/s5_stereo_sd.m3u8"
|
||||
}
|
||||
}
|
||||
},
|
||||
{
|
||||
"slug": "audio-stereo",
|
||||
"display": "Sendezentrum Audio",
|
||||
"type": "audio",
|
||||
"isTranslated": false,
|
||||
"videoSize": null,
|
||||
"urls": {
|
||||
"mp3": {
|
||||
"display": "MP3",
|
||||
"tech": "MP3-Audio, 96 kBit/s",
|
||||
"url": "http://cdn.c3voc.de/s5_stereo.mp3"
|
||||
},
|
||||
"opus": {
|
||||
"display": "Opus",
|
||||
"tech": "Opus-Audio, 64 kBit/s",
|
||||
"url": "http://cdn.c3voc.de/s5_stereo.opus"
|
||||
}
|
||||
}
|
||||
}
|
||||
]
|
||||
},
|
||||
{
|
||||
"slug": "podcastertisch",
|
||||
"schedulename": "Podcaster-Tisch",
|
||||
"thumb": "https://streaming.media.ccc.de/32c3/../thumbs/podcastertisch.png",
|
||||
"link": "https://streaming.media.ccc.de/32c3/podcastertisch/",
|
||||
"display": "Sendezentrum - Podcastertisch",
|
||||
"streams": [
|
||||
{
|
||||
"slug": "music-native",
|
||||
"display": "Sendezentrum - Podcastertisch Radio",
|
||||
"type": "music",
|
||||
"isTranslated": false,
|
||||
"videoSize": null,
|
||||
"urls": {
|
||||
"mp3": {
|
||||
"display": "MP3",
|
||||
"tech": "MP3-Audio, 192 kBit/s",
|
||||
"url": "http://cdn.c3voc.de/podcastertisch.mp3"
|
||||
},
|
||||
"opus": {
|
||||
"display": "Opus",
|
||||
"tech": "Opus-Audio, 96 kBit/s",
|
||||
"url": "http://cdn.c3voc.de/podcastertisch.opus"
|
||||
}
|
||||
}
|
||||
}
|
||||
]
|
||||
}
|
||||
]
|
||||
}
|
||||
]
|
||||
|
|
@ -22,10 +22,12 @@ public class AbstractServiceConnectedAcitivty extends Activity {
|
|||
private MediaApiService mMediaApiService = null;
|
||||
private ServiceConnection conn;
|
||||
private boolean mConnected = false;
|
||||
private String serverUrl = null;
|
||||
|
||||
@Override
|
||||
public void onCreate(@Nullable Bundle savedInstanceState, @Nullable PersistableBundle persistentState) {
|
||||
super.onCreate(savedInstanceState, persistentState);
|
||||
serverUrl = getIntent().getStringExtra("server_url");
|
||||
}
|
||||
|
||||
@Override
|
||||
|
|
@ -40,6 +42,10 @@ public class AbstractServiceConnectedAcitivty extends Activity {
|
|||
|
||||
public Single<MediaApiService> getmApiServiceObservable() {
|
||||
Intent s = new Intent(this, MediaApiService.class);
|
||||
if(serverUrl != null){
|
||||
s.putExtra(MediaApiService.RECORDING_URL,serverUrl);
|
||||
s.putExtra(MediaApiService.STREAMING_URL,serverUrl);
|
||||
}
|
||||
return Single.create(e -> {
|
||||
if(mMediaApiService != null){
|
||||
e.onSuccess(mMediaApiService);
|
||||
|
|
|
|||
|
|
@ -6,6 +6,7 @@ import android.os.Binder;
|
|||
import android.os.Bundle;
|
||||
import android.os.IBinder;
|
||||
import android.support.annotation.Nullable;
|
||||
import android.util.Log;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
|
|
@ -30,6 +31,7 @@ public class MediaApiService extends Service {
|
|||
|
||||
public static final String RECORDING_URL = "recording_url";
|
||||
public static final String STREAMING_URL = "streaming_url";
|
||||
private static final String TAG = MediaApiService.class.getSimpleName();
|
||||
|
||||
private final IBinder mBinder = new LocalBinder();
|
||||
private RecordingService mRecordingApiService = null;
|
||||
|
|
@ -79,6 +81,7 @@ public class MediaApiService extends Service {
|
|||
recordingUrl = extras.getString(RECORDING_URL);
|
||||
streamingUrl = extras.getString(STREAMING_URL);
|
||||
}
|
||||
Log.d(TAG,"starting with urls: " + recordingUrl + " " + streamingUrl);
|
||||
setupApiServices(streamingUrl, recordingUrl);
|
||||
}
|
||||
return mBinder;
|
||||
|
|
|
|||
Loading…
Reference in a new issue