commit | 9da2cbf1f9f46f9688513a6671be42ce5dea16d0 | [log] [tgz] |
---|---|---|
author | TreeHugger Robot <treehugger-gerrit@google.com> | Thu Jun 11 19:19:05 2020 +0000 |
committer | Android (Google) Code Review <android-gerrit@google.com> | Thu Jun 11 19:19:05 2020 +0000 |
tree | 0b5f86362246551c637f2faf7dc75cfd34fc325f | |
parent | 7ccd54fe966147ce1507aea58bd7d6e0924f10ac [diff] | |
parent | dd7aeb4863e9cd124329edf60cdb14dc1e52bb61 [diff] |
Merge "transcoding: fix timeout value"
diff --git a/services/mediatranscoding/tests/mediatranscodingservice_tests.cpp b/services/mediatranscoding/tests/mediatranscodingservice_tests.cpp index 47625cf..dfe105d 100644 --- a/services/mediatranscoding/tests/mediatranscodingservice_tests.cpp +++ b/services/mediatranscoding/tests/mediatranscodingservice_tests.cpp
@@ -67,7 +67,7 @@ constexpr int32_t kClientId = 0; #define CLIENT(n) (kClientId + (n)) -constexpr int64_t kPaddingUs = 10000000; +constexpr int64_t kPaddingUs = 1000000; constexpr int64_t kJobWithPaddingUs = SimulatedTranscoder::kJobDurationUs + kPaddingUs; constexpr const char* kClientName = "TestClient";