diff options
| author | Daniel Xie <dxie@google.com> | 2016-03-01 21:15:15 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2016-03-01 21:15:15 +0000 |
| commit | e6ca6365a299b23bdfc2fa817072f58dbf3e257d (patch) | |
| tree | 485131134fd76367ea3b0dc908609afc19026894 | |
| parent | acf3a5a6a3a2f7ecdbc08c9c9177a493dcc639fe (diff) | |
| parent | 7953a0a3e3a5602281f920c4855af248142b4f72 (diff) | |
| download | cts-marshmallow-dev.tar.gz | |
Merge "Add timeout for performance tests." into marshmallow-devmarshmallow-dev
| -rw-r--r-- | tests/tests/media/src/android/media/cts/VideoDecoderPerfTest.java | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/tests/tests/media/src/android/media/cts/VideoDecoderPerfTest.java b/tests/tests/media/src/android/media/cts/VideoDecoderPerfTest.java index f5680f6e912..4fb1e77a24e 100644 --- a/tests/tests/media/src/android/media/cts/VideoDecoderPerfTest.java +++ b/tests/tests/media/src/android/media/cts/VideoDecoderPerfTest.java @@ -325,6 +325,7 @@ public class VideoDecoderPerfTest extends MediaPlayerTestBase { 720, 480, true /* isGoog */); } + @TimeoutReq(minutes = 20) public void testH2641280x0720Other() throws Exception { decode(VIDEO_AVC, R.raw.video_1280x720_mp4_h264_8192kbps_30fps_aac_stereo_128kbps_44100hz, @@ -337,6 +338,7 @@ public class VideoDecoderPerfTest extends MediaPlayerTestBase { 1280, 720, true /* isGoog */); } + @TimeoutReq(minutes = 20) public void testH2641920x1080Other() throws Exception { decode(VIDEO_AVC, R.raw.video_1920x1080_mp4_h264_20480kbps_30fps_aac_stereo_128kbps_44100hz, @@ -385,6 +387,7 @@ public class VideoDecoderPerfTest extends MediaPlayerTestBase { 1280, 720, true /* isGoog */); } + @TimeoutReq(minutes = 20) public void testVP81920x1080Other() throws Exception { decode(VIDEO_VP8, R.raw.video_1920x1080_webm_vp8_20480kbps_30fps_vorbis_stereo_128kbps_48000hz, @@ -493,6 +496,7 @@ public class VideoDecoderPerfTest extends MediaPlayerTestBase { 1280, 720, true /* isGoog */); } + @TimeoutReq(minutes = 20) public void testHEVC1920x1080Other() throws Exception { decode(VIDEO_HEVC, R.raw.video_1920x1080_mp4_hevc_10240kbps_30fps_aac_stereo_128kbps_44100hz, |