am 0465d4fb: am 455358bb: Merge "Enable RTSP tests." into gingerbread
* commit '0465d4fbd20a8d216cc903ea997b04e69e3bb3e3':
Enable RTSP tests.
diff --git a/apps/CtsVerifier/src/com/android/cts/verifier/streamquality/StreamingVideoActivity.java b/apps/CtsVerifier/src/com/android/cts/verifier/streamquality/StreamingVideoActivity.java
index 6335648..9dd7d8b 100644
--- a/apps/CtsVerifier/src/com/android/cts/verifier/streamquality/StreamingVideoActivity.java
+++ b/apps/CtsVerifier/src/com/android/cts/verifier/streamquality/StreamingVideoActivity.java
@@ -136,13 +136,10 @@
private TestListAdapter getStreamAdapter() {
ArrayTestListAdapter adapter = new ArrayTestListAdapter(this);
- // TODO: Enable RTSP streams
- /*
adapter.add(TestListItem.newCategory("RTSP"));
for (Stream stream : RTSP_STREAMS) {
addStreamToTests(streams, stream);
}
- */
adapter.add(TestListItem.newCategory("HTTP Progressive"));
for (Stream stream : HTTP_STREAMS) {
diff --git a/tests/tests/media/src/android/media/cts/MediaPlayerStreamingTest.java b/tests/tests/media/src/android/media/cts/MediaPlayerStreamingTest.java
index 3388b9d..64e8820 100644
--- a/tests/tests/media/src/android/media/cts/MediaPlayerStreamingTest.java
+++ b/tests/tests/media/src/android/media/cts/MediaPlayerStreamingTest.java
@@ -26,8 +26,6 @@
private CtsTestServer mServer;
// Streaming RTSP video from YouTube
- // TODO: Enable RTSP tests once network issues are sorted out.
- /*
public void testRTSP_H263_AMR_Video1() throws Exception {
playVideoTest("rtsp://v2.cache7.c.youtube.com/video.3gp?cid=0x271de9756065677e"
+ "&fmt=13&user=android-device-test", 176, 144);
@@ -54,7 +52,6 @@
playVideoTest("rtsp://v2.cache7.c.youtube.com/video.3gp?cid=0xc80658495af60617"
+ "&fmt=18&user=android-device-test", 176, 144);
}
- */
// Streaming HTTP video from YouTube
public void testHTTP_H263_AMR_Video1() throws Exception {