commit f23fc99610f53bb27c8c1f3646f0d71fd5afa392
author Ronghua Wu <ronghuawu@google.com> Wed Jul 15 09:43:20 2015 -0700
committer Ronghua Wu <ronghuawu@google.com> Wed Jul 15 09:43:20 2015 -0700
tree 19349765e4b99d9d9fdc65a86d67ec52121d9182
parent 390ec0508374b56de3660dc165851e66e880d12e

videoperf: specify timeout for VideoEncoderDecoderTest

Bug: 22504214
Change-Id: I20700fd8953bbddc0a27d283f70956b15366337d

suite/cts/deviceTests/videoperf/src/com/android/cts/videoperf/VideoEncoderDecoderTest.java

diff --git a/suite/cts/deviceTests/videoperf/src/com/android/cts/videoperf/VideoEncoderDecoderTest.java b/suite/cts/deviceTests/videoperf/src/com/android/cts/videoperf/VideoEncoderDecoderTest.java
index eb0e784..a2fd20d9 100644
--- a/suite/cts/deviceTests/videoperf/src/com/android/cts/videoperf/VideoEncoderDecoderTest.java
+++ b/suite/cts/deviceTests/videoperf/src/com/android/cts/videoperf/VideoEncoderDecoderTest.java
@@ -37,6 +37,7 @@
 import com.android.cts.util.ResultType;
 import com.android.cts.util.ResultUnit;
 import com.android.cts.util.Stat;
+import com.android.cts.util.TimeoutReq;
 
 import java.io.IOException;
 import java.nio.ByteBuffer;
@@ -223,18 +224,22 @@
         doTestGoog(VIDEO_AVC, 720, 480);
     }
 
+    @TimeoutReq(minutes = 10)
     public void testAvc1280x0720Other() throws Exception {
         doTestOther(VIDEO_AVC, 1280, 720);
     }
 
+    @TimeoutReq(minutes = 10)
     public void testAvc1280x0720Goog() throws Exception {
         doTestGoog(VIDEO_AVC, 1280, 720);
     }
 
+    @TimeoutReq(minutes = 10)
     public void testAvc1920x1080Other() throws Exception {
         doTestOther(VIDEO_AVC, 1920, 1080);
     }
 
+    @TimeoutReq(minutes = 10)
     public void testAvc1920x1080Goog() throws Exception {
         doTestGoog(VIDEO_AVC, 1920, 1080);
     }
@@ -256,18 +261,22 @@
         doTestGoog(VIDEO_VP8, 640, 360);
     }
 
+    @TimeoutReq(minutes = 10)
     public void testVp81280x0720Other() throws Exception {
         doTestOther(VIDEO_VP8, 1280, 720);
     }
 
+    @TimeoutReq(minutes = 10)
     public void testVp81280x0720Goog() throws Exception {
         doTestGoog(VIDEO_VP8, 1280, 720);
     }
 
+    @TimeoutReq(minutes = 10)
     public void testVp81920x1080Other() throws Exception {
         doTestOther(VIDEO_VP8, 1920, 1080);
     }
 
+    @TimeoutReq(minutes = 10)
     public void testVp81920x1080Goog() throws Exception {
         doTestGoog(VIDEO_VP8, 1920, 1080);
     }
@@ -314,10 +323,12 @@
         doTestGoog(VIDEO_MPEG4, 640, 480);
     }
 
+    @TimeoutReq(minutes = 10)
     public void testMpeg41280x0720Other() throws Exception {
         doTestOther(VIDEO_MPEG4, 1280, 720);
     }
 
+    @TimeoutReq(minutes = 10)
     public void testMpeg41280x0720Goog() throws Exception {
         doTestGoog(VIDEO_MPEG4, 1280, 720);
     }