Dynamically configure CtsMediaTestCases
bug:23625592
bug:20952984
Change-Id: I7e9e027a9184ad75f8c488bd1199a3925fac652f
diff --git a/tests/tests/media/AndroidTest.xml b/tests/tests/media/AndroidTest.xml
index c08c993..07f5e3f 100644
--- a/tests/tests/media/AndroidTest.xml
+++ b/tests/tests/media/AndroidTest.xml
@@ -18,6 +18,11 @@
<option name="cleanup-apks" value="true" />
<option name="test-file-name" value="CtsMediaTestCases.apk" />
</target_preparer>
+ <target_preparer class="com.android.compatibility.common.tradefed.targetprep.DynamicConfigPusher">
+ <option name="target" value="device" />
+ <option name="config-filename" value="CtsMediaTestCases" />
+ <option name="version" value="7.0"/>
+ </target_preparer>
<test class="com.android.tradefed.testtype.AndroidJUnitTest" >
<option name="package" value="android.media.cts" />
<!-- test-timeout unit is ms, value = 30 min -->
diff --git a/tests/tests/media/DynamicConfig.xml b/tests/tests/media/DynamicConfig.xml
index 1299440..ebc87de 100644
--- a/tests/tests/media/DynamicConfig.xml
+++ b/tests/tests/media/DynamicConfig.xml
@@ -14,40 +14,40 @@
-->
<dynamicConfig>
- <entry key="DecoderTest-VIDEO_URL">
+ <entry key="decoder_test_audio_url">
<value>http://redirector.gvt1.com/videoplayback?id=c80658495af60617&itag=18&source=youtube&ip=0.0.0.0&ipbits=0&expire=19000000000&sparams=ip,ipbits,expire,id,itag,source&signature=46A04ED550CA83B79B60060BA80C79FDA5853D26.49582D382B4A9AFAA163DED38D2AE531D85603C0&key=ik0&user=android-device-test</value>
</entry>
- <entry key="StreamingMediaPlayerTest-testHTTP_H264Base_AAC_Video1">
- <value>http://redirector.gvt1.com/videoplayback?id=271de9756065677e&itag=18&source=youtube&ip=0.0.0.0&ipbits=0&expire=19000000000&sparams=ip,ipbits,expire,id,itag,source&signature=667AEEF54639926662CE62361400B8F8C1753B3F.15F46C382C68A9F121BA17BF1F56BEDEB4B06091&key=ik0&user=android-device-test</value>
+ <entry key="decoder_test_video_url">
+ <value>http://redirector.gvt1.com/videoplayback?id=c80658495af60617&itag=18&source=youtube&ip=0.0.0.0&ipbits=0&expire=19000000000&sparams=ip,ipbits,expire,id,itag,source&signature=46A04ED550CA83B79B60060BA80C79FDA5853D26.49582D382B4A9AFAA163DED38D2AE531D85603C0&key=ik0&user=android-device-test</value>
</entry>
- <entry key="StreamingMediaPlayerTest-testHTTP_H264Base_AAC_Video2">
- <value>http://www.youtube.com/api/manifest/hls_variant/id/0168724d02bd9945/itag/5/source/youtube/playlist_type/DVR/ip/0.0.0.0/ipbits/0/expire/19000000000/sparams/ip,ipbits,expire,id,itag,source,playlist_type/signature/773AB8ACC68A96E5AA481996AD6A1BBCB70DCB87.95733B544ACC5F01A1223A837D2CF04DF85A3360/key/ik0/file/m3u8</value>
- </entry>
- <entry key="MediaCodecCapabilitiesTest-testAvcHigh31">
- <value>http://redirector.gvt1.com/videoplayback?id=271de9756065677e&itag=22&source=youtube&user=android-device-test&sparams=ip,ipbits,expire,id,itag,source,user&ip=0.0.0.0&ipbits=0&expire=19000000000&signature=179525311196616BD8E1381759B0E5F81A9E91B5.C4A50E44059FEBCC6BBC78E3B3A4E0E0065777&key=ik0</value>
- </entry>
- <entry key="StreamingMediaPlayerTest-testHTTP_MPEG4SP_AAC_Video2">
- <value>http://redirector.gvt1.com/videoplayback?id=c80658495af60617&itag=17&source=youtube&ip=0.0.0.0&ipbits=0&expire=19000000000&sparams=ip,ipbits,expire,id,itag,source&signature=70E979A621001201BC18622BDBF914FA870BDA40.6E78890B80F4A33A18835F775B1FF64F0A4D0003&key=ik0&user=android-device-test</value>
- </entry>
- <entry key="StreamingMediaPlayerTest-testHTTP_MPEG4SP_AAC_Video1">
- <value>http://redirector.gvt1.com/videoplayback?id=271de9756065677e&itag=17&source=youtube&ip=0.0.0.0&ipbits=0&expire=19000000000&sparams=ip,ipbits,expire,id,itag,source&signature=837198AAADF6F36BA6B2D324F690A7C5B7AFE3FF.7138CE5E36D718220726C1FC305497FF2D082249&key=ik0&user=android-device-test</value>
- </entry>
- <entry key="MediaCodecCapabilitiesTest-testAvcBaseline12">
+ <entry key="media_codec_capabilities_test_avc_baseline12">
<value>http://redirector.gvt1.com/videoplayback?id=271de9756065677e&itag=160&source=youtube&user=android-device-test&sparams=ip,ipbits,expire,id,itag,source,user&ip=0.0.0.0&ipbits=0&expire=19000000000&signature=9EDCA0B395B8A949C511FD5E59B9F805CFF797FD.702DE9BA7AF96785FD6930AD2DD693A0486C880E&key=ik0</value>
</entry>
- <entry key="DecoderTest-AUDIO_URL">
- <value>http://redirector.gvt1.com/videoplayback?id=c80658495af60617&itag=18&source=youtube&ip=0.0.0.0&ipbits=0&expire=19000000000&sparams=ip,ipbits,expire,id,itag,source&signature=46A04ED550CA83B79B60060BA80C79FDA5853D26.49582D382B4A9AFAA163DED38D2AE531D85603C0&key=ik0&user=android-device-test</value>
- </entry>
- <entry key="MediaCodecCapabilitiesTest-testAvcBaseline30">
+ <entry key="media_codec_capabilities_test_avc_baseline30">
<value>http://redirector.gvt1.com/videoplayback?id=271de9756065677e&itag=18&source=youtube&user=android-device-test&sparams=ip,ipbits,expire,id,itag,source,user&ip=0.0.0.0&ipbits=0&expire=19000000000&signature=7DCDE3A6594D0B91A27676A3CDC3A87B149F82EA.7A83031734CB1EDCE06766B6228842F954927960&key=ik0</value>
</entry>
- <entry key="MediaCodecCapabilitiesTest-testAvcHigh40">
+ <entry key="media_codec_capabilities_test_avc_high31">
+ <value>http://redirector.gvt1.com/videoplayback?id=271de9756065677e&itag=22&source=youtube&user=android-device-test&sparams=ip,ipbits,expire,id,itag,source,user&ip=0.0.0.0&ipbits=0&expire=19000000000&signature=179525311196616BD8E1381759B0E5F81A9E91B5.C4A50E44059FEBCC6BBC78E3B3A4E0E0065777&key=ik0</value>
+ </entry>
+ <entry key="media_codec_capabilities_test_avc_high40">
<value>http://redirector.gvt1.com/videoplayback?id=271de9756065677e&itag=137&source=youtube&user=android-device-test&sparams=ip,ipbits,expire,id,itag,source,user&ip=0.0.0.0&ipbits=0&expire=19000000000&signature=B0976085596DD42DEA3F08307F76587241CB132B.043B719C039E8B92F45391ADC0BE3665E2332930&key=ik0</value>
</entry>
- <entry key="StreamingMediaPlayerTest-testHTTP_H263_AMR_Video2">
+ <entry key="streaming_media_player_test_http_h263_amr_video1">
+ <value>http://redirector.gvt1.com/videoplayback?id=271de9756065677e&itag=13&source=youtube&ip=0.0.0.0&ipbits=0&expire=19000000000&sparams=ip,ipbits,expire,id,itag,source&signature=5729247E22691EBB3E804DDD523EC42DC17DD8CE.443B81C1E8E6D64E4E1555F568BA46C206507D78&key=ik0&user=android-device-test</value>
+ </entry>
+ <entry key="streaming_media_player_test_http_h263_amr_video2">
<value>http://redirector.gvt1.com/videoplayback?id=c80658495af60617&itag=13&source=youtube&ip=0.0.0.0&ipbits=0&expire=19000000000&sparams=ip,ipbits,expire,id,itag,source&signature=508D82AB36939345BF6B8D0623CB6CABDD9C64C3.9B3336A96846DF38E5343C46AA57F6CF2956E427&key=ik0&user=android-device-test</value>
</entry>
- <entry key="StreamingMediaPlayerTest-testHTTP_H263_AMR_Video1">
- <value>http://redirector.gvt1.com/videoplayback?id=271de9756065677e&itag=13&source=youtube&ip=0.0.0.0&ipbits=0&expire=19000000000&sparams=ip,ipbits,expire,id,itag,source&signature=5729247E22691EBB3E804DDD523EC42DC17DD8CE.443B81C1E8E6D64E4E1555F568BA46C206507D78&key=ik0&user=android-device-test</value>
+ <entry key="streaming_media_player_test_http_h264_base_aac_video1">
+ <value>http://redirector.gvt1.com/videoplayback?id=271de9756065677e&itag=18&source=youtube&ip=0.0.0.0&ipbits=0&expire=19000000000&sparams=ip,ipbits,expire,id,itag,source&signature=667AEEF54639926662CE62361400B8F8C1753B3F.15F46C382C68A9F121BA17BF1F56BEDEB4B06091&key=ik0&user=android-device-test</value>
+ </entry>
+ <entry key="streaming_media_player_test_http_h264_base_aac_video2">
+ <value>http://www.youtube.com/api/manifest/hls_variant/id/0168724d02bd9945/itag/5/source/youtube/playlist_type/DVR/ip/0.0.0.0/ipbits/0/expire/19000000000/sparams/ip,ipbits,expire,id,itag,source,playlist_type/signature/773AB8ACC68A96E5AA481996AD6A1BBCB70DCB87.95733B544ACC5F01A1223A837D2CF04DF85A3360/key/ik0/file/m3u8</value>
+ </entry>
+ <entry key="streaming_media_player_test_http_mpeg4_sp_aac_video1">
+ <value>http://redirector.gvt1.com/videoplayback?id=271de9756065677e&itag=17&source=youtube&ip=0.0.0.0&ipbits=0&expire=19000000000&sparams=ip,ipbits,expire,id,itag,source&signature=837198AAADF6F36BA6B2D324F690A7C5B7AFE3FF.7138CE5E36D718220726C1FC305497FF2D082249&key=ik0&user=android-device-test</value>
+ </entry>
+ <entry key="streaming_media_player_test_http_mpeg4_sp_aac_video2">
+ <value>http://redirector.gvt1.com/videoplayback?id=c80658495af60617&itag=17&source=youtube&ip=0.0.0.0&ipbits=0&expire=19000000000&sparams=ip,ipbits,expire,id,itag,source&signature=70E979A621001201BC18622BDBF914FA870BDA40.6E78890B80F4A33A18835F775B1FF64F0A4D0003&key=ik0&user=android-device-test</value>
</entry>
</dynamicConfig>
diff --git a/tests/tests/media/src/android/media/cts/DecoderTest.java b/tests/tests/media/src/android/media/cts/DecoderTest.java
index 7fcbdd1..b93fad5 100755
--- a/tests/tests/media/src/android/media/cts/DecoderTest.java
+++ b/tests/tests/media/src/android/media/cts/DecoderTest.java
@@ -38,6 +38,7 @@
import android.net.Uri;
import com.android.compatibility.common.util.DeviceReportLog;
+import com.android.compatibility.common.util.DynamicConfigDeviceSide;
import com.android.compatibility.common.util.ResultType;
import com.android.compatibility.common.util.ResultUnit;
@@ -72,20 +73,11 @@
private MediaCodecTunneledPlayer mMediaCodecPlayer;
private static final int SLEEP_TIME_MS = 1000;
private static final long PLAY_TIME_MS = TimeUnit.MILLISECONDS.convert(1, TimeUnit.MINUTES);
- private static final Uri AUDIO_URL = Uri.parse(
- "http://redirector.c.youtube.com/videoplayback?id=c80658495af60617"
- + "&itag=18&source=youtube&ip=0.0.0.0&ipbits=0&expire=19000000000"
- + "&sparams=ip,ipbits,expire,id,itag,source"
- + "&signature=46A04ED550CA83B79B60060BA80C79FDA5853D26."
- + "49582D382B4A9AFAA163DED38D2AE531D85603C0"
- + "&key=ik0&user=android-device-test"); // H.264 Base + AAC
- private static final Uri VIDEO_URL = Uri.parse(
- "http://redirector.c.youtube.com/videoplayback?id=c80658495af60617"
- + "&itag=18&source=youtube&ip=0.0.0.0&ipbits=0&expire=19000000000"
- + "&sparams=ip,ipbits,expire,id,itag,source"
- + "&signature=46A04ED550CA83B79B60060BA80C79FDA5853D26."
- + "49582D382B4A9AFAA163DED38D2AE531D85603C0"
- + "&key=ik0&user=android-device-test"); // H.264 Base + AAC
+
+ private static final String AUDIO_URL_KEY = "decoder_test_audio_url";
+ private static final String VIDEO_URL_KEY = "decoder_test_video_url";
+ private static final String MODULE_NAME = "CtsMediaTestCases";
+ private DynamicConfigDeviceSide dynamicConfig;
@Override
protected void setUp() throws Exception {
@@ -109,6 +101,8 @@
}
bis.close();
masterFd.close();
+
+ dynamicConfig = new DynamicConfigDeviceSide(MODULE_NAME);
}
@Override
@@ -2662,8 +2656,10 @@
mMediaCodecPlayer = new MediaCodecTunneledPlayer(
getActivity().getSurfaceHolder(), true, am.generateAudioSessionId());
- mMediaCodecPlayer.setAudioDataSource(AUDIO_URL, null);
- mMediaCodecPlayer.setVideoDataSource(VIDEO_URL, null);
+ Uri audioUri = Uri.parse(dynamicConfig.getValue(AUDIO_URL_KEY));
+ Uri videoUri = Uri.parse(dynamicConfig.getValue(VIDEO_URL_KEY));
+ mMediaCodecPlayer.setAudioDataSource(audioUri, null);
+ mMediaCodecPlayer.setVideoDataSource(videoUri, null);
assertTrue("MediaCodecPlayer.start() failed!", mMediaCodecPlayer.start());
assertTrue("MediaCodecPlayer.prepare() failed!", mMediaCodecPlayer.prepare());
@@ -2702,8 +2698,10 @@
mMediaCodecPlayer = new MediaCodecTunneledPlayer(
getActivity().getSurfaceHolder(), true, am.generateAudioSessionId());
- mMediaCodecPlayer.setAudioDataSource(AUDIO_URL, null);
- mMediaCodecPlayer.setVideoDataSource(VIDEO_URL, null);
+ Uri audioUri = Uri.parse(dynamicConfig.getValue(AUDIO_URL_KEY));
+ Uri videoUri = Uri.parse(dynamicConfig.getValue(VIDEO_URL_KEY));
+ mMediaCodecPlayer.setAudioDataSource(audioUri, null);
+ mMediaCodecPlayer.setVideoDataSource(videoUri, null);
assertTrue("MediaCodecPlayer.start() failed!", mMediaCodecPlayer.start());
assertTrue("MediaCodecPlayer.prepare() failed!", mMediaCodecPlayer.prepare());
diff --git a/tests/tests/media/src/android/media/cts/MediaCodecCapabilitiesTest.java b/tests/tests/media/src/android/media/cts/MediaCodecCapabilitiesTest.java
index 5b2936b..446cd3c 100644
--- a/tests/tests/media/src/android/media/cts/MediaCodecCapabilitiesTest.java
+++ b/tests/tests/media/src/android/media/cts/MediaCodecCapabilitiesTest.java
@@ -36,6 +36,8 @@
import android.os.Build;
import android.util.Log;
+import com.android.compatibility.common.util.DynamicConfigDeviceSide;
+
import java.io.IOException;
import java.util.HashSet;
import java.util.Set;
@@ -61,6 +63,21 @@
private final MediaCodecInfo[] mAllInfos =
mAllCodecs.getCodecInfos();
+ private static final String AVC_BASELINE_12_KEY =
+ "media_codec_capabilities_test_avc_baseline12";
+ private static final String AVC_BASELINE_30_KEY =
+ "media_codec_capabilities_test_avc_baseline30";
+ private static final String AVC_HIGH_31_KEY = "media_codec_capabilities_test_avc_high31";
+ private static final String AVC_HIGH_40_KEY = "media_codec_capabilities_test_avc_high40";
+ private static final String MODULE_NAME = "CtsMediaTestCases";
+ private DynamicConfigDeviceSide dynamicConfig;
+
+ @Override
+ protected void setUp() throws Exception {
+ super.setUp();
+ dynamicConfig = new DynamicConfigDeviceSide(MODULE_NAME);
+ }
+
// Android device implementations with H.264 encoders, MUST support Baseline Profile Level 3.
// SHOULD support Main Profile/ Level 4, if supported the device must also support Main
// Profile/Level 4 decoding.
@@ -172,13 +189,8 @@
return; // skip
}
- playVideoWithRetries("http://redirector.c.youtube.com/videoplayback?id=271de9756065677e"
- + "&itag=160&source=youtube&user=android-device-test"
- + "&sparams=ip,ipbits,expire,id,itag,source,user"
- + "&ip=0.0.0.0&ipbits=0&expire=19000000000"
- + "&signature=9EDCA0B395B8A949C511FD5E59B9F805CFF797FD."
- + "702DE9BA7AF96785FD6930AD2DD693A0486C880E"
- + "&key=ik0", 256, 144, PLAY_TIME_MS);
+ String urlString = dynamicConfig.getValue(AVC_BASELINE_12_KEY);
+ playVideoWithRetries(urlString, 256, 144, PLAY_TIME_MS);
}
public void testAvcBaseline30() throws Exception {
@@ -186,13 +198,8 @@
return; // skip
}
- playVideoWithRetries("http://redirector.c.youtube.com/videoplayback?id=271de9756065677e"
- + "&itag=18&source=youtube&user=android-device-test"
- + "&sparams=ip,ipbits,expire,id,itag,source,user"
- + "&ip=0.0.0.0&ipbits=0&expire=19000000000"
- + "&signature=7DCDE3A6594D0B91A27676A3CDC3A87B149F82EA."
- + "7A83031734CB1EDCE06766B6228842F954927960"
- + "&key=ik0", 640, 360, PLAY_TIME_MS);
+ String urlString = dynamicConfig.getValue(AVC_BASELINE_30_KEY);
+ playVideoWithRetries(urlString, 640, 360, PLAY_TIME_MS);
}
public void testAvcHigh31() throws Exception {
@@ -200,13 +207,8 @@
return; // skip
}
- playVideoWithRetries("http://redirector.c.youtube.com/videoplayback?id=271de9756065677e"
- + "&itag=22&source=youtube&user=android-device-test"
- + "&sparams=ip,ipbits,expire,id,itag,source,user"
- + "&ip=0.0.0.0&ipbits=0&expire=19000000000"
- + "&signature=179525311196616BD8E1381759B0E5F81A9E91B5."
- + "C4A50E44059FEBCC6BBC78E3B3A4E0E0065777"
- + "&key=ik0", 1280, 720, PLAY_TIME_MS);
+ String urlString = dynamicConfig.getValue(AVC_HIGH_31_KEY);
+ playVideoWithRetries(urlString, 1280, 720, PLAY_TIME_MS);
}
public void testAvcHigh40() throws Exception {
@@ -218,13 +220,8 @@
return;
}
- playVideoWithRetries("http://redirector.c.youtube.com/videoplayback?id=271de9756065677e"
- + "&itag=137&source=youtube&user=android-device-test"
- + "&sparams=ip,ipbits,expire,id,itag,source,user"
- + "&ip=0.0.0.0&ipbits=0&expire=19000000000"
- + "&signature=B0976085596DD42DEA3F08307F76587241CB132B."
- + "043B719C039E8B92F45391ADC0BE3665E2332930"
- + "&key=ik0", 1920, 1080, PLAY_TIME_MS);
+ String urlString = dynamicConfig.getValue(AVC_HIGH_40_KEY);
+ playVideoWithRetries(urlString, 1920, 1080, PLAY_TIME_MS);
}
public void testHevcMain1() throws Exception {
diff --git a/tests/tests/media/src/android/media/cts/StreamingMediaPlayerTest.java b/tests/tests/media/src/android/media/cts/StreamingMediaPlayerTest.java
index 0464cb6..0db2e05 100644
--- a/tests/tests/media/src/android/media/cts/StreamingMediaPlayerTest.java
+++ b/tests/tests/media/src/android/media/cts/StreamingMediaPlayerTest.java
@@ -26,6 +26,8 @@
import android.util.Log;
import android.webkit.cts.CtsTestServer;
+import com.android.compatibility.common.util.DynamicConfigDeviceSide;
+
import java.io.IOException;
import java.util.concurrent.atomic.AtomicInteger;
@@ -35,8 +37,29 @@
public class StreamingMediaPlayerTest extends MediaPlayerTestBase {
private static final String TAG = "StreamingMediaPlayerTest";
+ private static final String HTTP_H263_AMR_VIDEO_1_KEY =
+ "streaming_media_player_test_http_h263_amr_video1";
+ private static final String HTTP_H263_AMR_VIDEO_2_KEY =
+ "streaming_media_player_test_http_h263_amr_video2";
+ private static final String HTTP_H264_BASE_AAC_VIDEO_1_KEY =
+ "streaming_media_player_test_http_h264_base_aac_video1";
+ private static final String HTTP_H264_BASE_AAC_VIDEO_2_KEY =
+ "streaming_media_player_test_http_h264_base_aac_video2";
+ private static final String HTTP_MPEG4_SP_AAC_VIDEO_1_KEY =
+ "streaming_media_player_test_http_mpeg4_sp_aac_video1";
+ private static final String HTTP_MPEG4_SP_AAC_VIDEO_2_KEY =
+ "streaming_media_player_test_http_mpeg4_sp_aac_video2";
+ private static final String MODULE_NAME = "CtsMediaTestCases";
+ private DynamicConfigDeviceSide dynamicConfig;
+
private CtsTestServer mServer;
+ @Override
+ protected void setUp() throws Exception {
+ super.setUp();
+ dynamicConfig = new DynamicConfigDeviceSide(MODULE_NAME);
+ }
+
/* RTSP tests are more flaky and vulnerable to network condition.
Disable until better solution is available
// Streaming RTSP video from YouTube
@@ -73,12 +96,8 @@
return; // skip
}
- playVideoTest("http://redirector.c.youtube.com/videoplayback?id=271de9756065677e"
- + "&itag=13&source=youtube&ip=0.0.0.0&ipbits=0&expire=19000000000"
- + "&sparams=ip,ipbits,expire,id,itag,source"
- + "&signature=5729247E22691EBB3E804DDD523EC42DC17DD8CE"
- + ".443B81C1E8E6D64E4E1555F568BA46C206507D78"
- + "&key=ik0&user=android-device-test", 176, 144);
+ String urlString = dynamicConfig.getValue(HTTP_H263_AMR_VIDEO_1_KEY);
+ playVideoTest(urlString, 176, 144);
}
public void testHTTP_H263_AMR_Video2() throws Exception {
@@ -86,12 +105,8 @@
return; // skip
}
- playVideoTest("http://redirector.c.youtube.com/videoplayback?id=c80658495af60617"
- + "&itag=13&source=youtube&ip=0.0.0.0&ipbits=0&expire=19000000000"
- + "&sparams=ip,ipbits,expire,id,itag,source"
- + "&signature=508D82AB36939345BF6B8D0623CB6CABDD9C64C3"
- + ".9B3336A96846DF38E5343C46AA57F6CF2956E427"
- + "&key=ik0&user=android-device-test", 176, 144);
+ String urlString = dynamicConfig.getValue(HTTP_H263_AMR_VIDEO_2_KEY);
+ playVideoTest(urlString, 176, 144);
}
public void testHTTP_MPEG4SP_AAC_Video1() throws Exception {
@@ -99,12 +114,8 @@
return; // skip
}
- playVideoTest("http://redirector.c.youtube.com/videoplayback?id=271de9756065677e"
- + "&itag=17&source=youtube&ip=0.0.0.0&ipbits=0&expire=19000000000"
- + "&sparams=ip,ipbits,expire,id,itag,source"
- + "&signature=837198AAADF6F36BA6B2D324F690A7C5B7AFE3FF"
- + ".7138CE5E36D718220726C1FC305497FF2D082249"
- + "&key=ik0&user=android-device-test", 176, 144);
+ String urlString = dynamicConfig.getValue(HTTP_MPEG4_SP_AAC_VIDEO_1_KEY);
+ playVideoTest(urlString, 176, 144);
}
public void testHTTP_MPEG4SP_AAC_Video2() throws Exception {
@@ -112,12 +123,8 @@
return; // skip
}
- playVideoTest("http://redirector.c.youtube.com/videoplayback?id=c80658495af60617"
- + "&itag=17&source=youtube&ip=0.0.0.0&ipbits=0&expire=19000000000"
- + "&sparams=ip,ipbits,expire,id,itag,source"
- + "&signature=70E979A621001201BC18622BDBF914FA870BDA40"
- + ".6E78890B80F4A33A18835F775B1FF64F0A4D0003"
- + "&key=ik0&user=android-device-test", 176, 144);
+ String urlString = dynamicConfig.getValue(HTTP_MPEG4_SP_AAC_VIDEO_2_KEY);
+ playVideoTest(urlString, 176, 144);
}
public void testHTTP_H264Base_AAC_Video1() throws Exception {
@@ -125,12 +132,8 @@
return; // skip
}
- playVideoTest("http://redirector.c.youtube.com/videoplayback?id=271de9756065677e"
- + "&itag=18&source=youtube&ip=0.0.0.0&ipbits=0&expire=19000000000"
- + "&sparams=ip,ipbits,expire,id,itag,source"
- + "&signature=667AEEF54639926662CE62361400B8F8C1753B3F"
- + ".15F46C382C68A9F121BA17BF1F56BEDEB4B06091"
- + "&key=ik0&user=android-device-test", 640, 360);
+ String urlString = dynamicConfig.getValue(HTTP_H264_BASE_AAC_VIDEO_1_KEY);
+ playVideoTest(urlString, 640, 360);
}
public void testHTTP_H264Base_AAC_Video2() throws Exception {
@@ -138,12 +141,8 @@
return; // skip
}
- playVideoTest("http://redirector.c.youtube.com/videoplayback?id=c80658495af60617"
- + "&itag=18&source=youtube&ip=0.0.0.0&ipbits=0&expire=19000000000"
- + "&sparams=ip,ipbits,expire,id,itag,source"
- + "&signature=46A04ED550CA83B79B60060BA80C79FDA5853D26"
- + ".49582D382B4A9AFAA163DED38D2AE531D85603C0"
- + "&key=ik0&user=android-device-test", 640, 360);
+ String urlString = dynamicConfig.getValue(HTTP_H264_BASE_AAC_VIDEO_2_KEY);
+ playVideoTest(urlString, 640, 360);
}
// Streaming HLS video from YouTube
