diff options
| author | Nicholas Sauer <nicksauer@google.com> | 2015-02-10 21:11:38 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2015-02-10 21:11:39 +0000 |
| commit | ac08bc8a4827f300f6c9937ca4ec7497867b7895 (patch) | |
| tree | 09d60d1dc1df0ca690fb5861baaf91b326d8c5cc | |
| parent | 6558d48b0ee4ee86aa978d896115f6389263ae99 (diff) | |
| parent | 41ece30c02da2d7a03a79eda31240a57d9522af2 (diff) | |
| download | cts-ac08bc8a4827f300f6c9937ca4ec7497867b7895.tar.gz | |
Merge "Update Android CTS bandaid urls that use test_key1 to a new key" into jb-dev
| -rw-r--r-- | apps/CtsVerifier/src/com/android/cts/verifier/streamquality/StreamingVideoActivity.java | 30 | ||||
| -rw-r--r-- | tests/tests/media/src/android/media/cts/StreamingMediaPlayerTest.java | 36 |
2 files changed, 33 insertions, 33 deletions
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 6d1274747be..a265b2695c8 100644 --- a/apps/CtsVerifier/src/com/android/cts/verifier/streamquality/StreamingVideoActivity.java +++ b/apps/CtsVerifier/src/com/android/cts/verifier/streamquality/StreamingVideoActivity.java @@ -119,30 +119,30 @@ public class StreamingVideoActivity extends PassFailButtons.TestListActivity { new Stream("H263 Video, AMR Audio", "http_h263_amr", "http://redirector.c.play.google.com/" + "videoplayback?id=271de9756065677e" - + "&itag=13&ip=0.0.0.0&ipbits=0&expire=999999999999999999" - + "&sparams=ip,ipbits,expire,ip,ipbits,expire,id,itag" - + "&signature=372FA4C532AA49D14EAF049BCDA66460EEE161E9" - + ".6D8BF096B73B7A68A7032CA8685053CFB498D30A" + + "&itag=13&ip=0.0.0.0&ipbits=0&expire=19000000000" + + "&sparams=ip,ipbits,expire,id,itag" + + "&signature=073A731E2BDF1E05206AC7B9B895C922ABCBA01D" + + ".1DDA3F999541D2136E6755F16FC44CA972767169" + "&source=youtube" - + "&key=test_key1&user=android-device-test"), + + "&key=ik0&user=android-device-test"), new Stream("MPEG4 SP Video, AAC Audio", "http_mpeg4_aac", "http://redirector.c.play.google.com/" + "videoplayback?id=271de9756065677e" - + "&itag=17&ip=0.0.0.0&ipbits=0&expire=999999999999999999" - + "&sparams=ip,ipbits,expire,ip,ipbits,expire,id,itag" - + "&signature=3DCD3F79E045F95B6AF661765F046FB0440FF016" - + ".06A42661B3AF6BAF046F012549CC9BA34EBC80A9" + + "&itag=17&ip=0.0.0.0&ipbits=0&expire=19000000000" + + "&sparams=ip,ipbits,expire,id,itag" + + "&signature=6B0F8B8A6A7FD9E4CDF123349C2E061ED2020D74" + + ".3460FC81D6C8894BA2D241597D2E1D059845F5F0" + "&source=youtube" - + "&key=test_key1&user=android-device-test"), + + "&key=ik0&user=android-device-test"), new Stream("H264 Base Video, AAC Audio", "http_h264_aac", "http://redirector.c.play.google.com/" + "videoplayback?id=271de9756065677e" - + "&itag=18&ip=0.0.0.0&ipbits=0&expire=999999999999999999" - + "&sparams=ip,ipbits,expire,ip,ipbits,expire,id,itag" - + "&signature=1219C2B07AF0638C27916307A6093C0E43CB894E" - + ".126B6B916BD57157782738AA7C03E59F21DBC168" + + "&itag=18&ip=0.0.0.0&ipbits=0&expire=19000000000" + + "&sparams=ip,ipbits,expire,ip,id,itag" + + "&signature=75627CD4CEA73D7868CBDE3CE5C4011955164107" + + ".1DCFB0EF1372B48DDCFBE69645FE137AC02AF561" + "&source=youtube" - + "&key=test_key1&user=android-device-test"), + + "&key=ik0&user=android-device-test"), }; @Override diff --git a/tests/tests/media/src/android/media/cts/StreamingMediaPlayerTest.java b/tests/tests/media/src/android/media/cts/StreamingMediaPlayerTest.java index ee63bb3890e..a783c972d5a 100644 --- a/tests/tests/media/src/android/media/cts/StreamingMediaPlayerTest.java +++ b/tests/tests/media/src/android/media/cts/StreamingMediaPlayerTest.java @@ -59,51 +59,51 @@ public class StreamingMediaPlayerTest extends MediaPlayerTestBase { 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=6F5AEC448AAF88466D7A10EBB76020745405D33F." - + "5050D35AE997E1535FE828B0DE99EF31A699D9D0" - + "&key=test_key1&user=android-device-test", 176, 144); + + "&signature=5729247E22691EBB3E804DDD523EC42DC17DD8CE" + + ".443B81C1E8E6D64E4E1555F568BA46C206507D78" + + "&key=ik0&user=android-device-test", 176, 144); } public void testHTTP_H263_AMR_Video2() throws Exception { 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=71749754E28115FD1C233E3BE96CDDC3F430CB74." - + "49D1506DE694CC8FCEE63CB4F3AD41EB76C198CE" - + "&key=test_key1&user=android-device-test", 176, 144); + + "&signature=508D82AB36939345BF6B8D0623CB6CABDD9C64C3" + + ".9B3336A96846DF38E5343C46AA57F6CF2956E427" + + "&key=ik0&user=android-device-test", 176, 144); } public void testHTTP_MPEG4SP_AAC_Video1() throws Exception { 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=197A9742C1EFCA95725F2F26DFFD512FC48C149F." - + "A59B42FD490F6B591B292F3B2659A9723B980351" - + "&key=test_key1&user=android-device-test", 176, 144); + + "&signature=837198AAADF6F36BA6B2D324F690A7C5B7AFE3FF" + + ".7138CE5E36D718220726C1FC305497FF2D082249" + + "&key=ik0&user=android-device-test", 176, 144); } public void testHTTP_MPEG4SP_AAC_Video2() throws Exception { 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=0F84740A7E06F884127E78A6D7DE6DEA8F4B8BFD." - + "248DF1E90B8137C30769C79BF23147F6BB3DFCDF" - + "&key=test_key1&user=android-device-test", 176, 144); + + "&signature=70E979A621001201BC18622BDBF914FA870BDA40" + + ".6E78890B80F4A33A18835F775B1FF64F0A4D0003" + + "&key=ik0&user=android-device-test", 176, 144); } public void testHTTP_H264Base_AAC_Video1() throws Exception { 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=3CFCAFB87EB9FC943FACDC54FEC8C725A801642C." - + "7D77ACBC4CAF40349BF093E302B635757E45F345" - + "&key=test_key1&user=android-device-test", 640, 360); + + "&signature=667AEEF54639926662CE62361400B8F8C1753B3F" + + ".15F46C382C68A9F121BA17BF1F56BEDEB4B06091" + + "&key=ik0&user=android-device-test", 640, 360); } public void testHTTP_H264Base_AAC_Video2() throws Exception { 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=A11D8BA0AA67A27F1409BE0C0B96B756625DB88B." - + "9BF4C93A130583ADBDF2B953AD5A8A58F518B012" - + "&key=test_key1&user=android-device-test", 640, 360); + + "&signature=46A04ED550CA83B79B60060BA80C79FDA5853D26" + + ".49582D382B4A9AFAA163DED38D2AE531D85603C0" + + "&key=ik0&user=android-device-test", 640, 360); } // Streaming HLS video from YouTube |