commit 5feb2a956f51b5126479a1664ebeec28cb611644
author android-build-team Robot <android-build-team-robot@google.com> Wed Mar 13 18:05:54 2019 +0000
committer android-build-team Robot <android-build-team-robot@google.com> Wed Mar 13 18:05:54 2019 +0000
tree 821e06e18c18ee7813367ac759fa5fc273bf7a4e
parent db51d7062676b70fe40148ef54ba5ff104859435
parent cb01b68fa7ead9eff6dd5d9e46a11b1405ff9040

Merge cherrypicks of [6716922, 6716923, 6716413, 6717023, 6717024, 6716716, 6715859, 6717160, 6717161, 6717162, 6717163, 6716295, 6717141, 6717181, 6717183, 6717184, 6717185, 6714937, 6717028, 6716717, 6716927, 6717200, 6717029, 6717030, 6717031, 6717032, 6717033, 6716928, 6717034, 6717035, 6716929, 6717201, 6716930, 6712377, 6712378, 6716643, 6717164, 6712379] into pi-qpr3-release

Change-Id: I3956956a86006931fce06e80250171141a99648e

media/sfplugin/CCodec.cpp

diff --git a/media/sfplugin/CCodec.cpp b/media/sfplugin/CCodec.cpp
index 0a58dd4..1e74658 100644
--- a/media/sfplugin/CCodec.cpp
+++ b/media/sfplugin/CCodec.cpp
@@ -1509,7 +1509,8 @@
         }
         case kWhatStart: {
             // C2Component::start() should return within 500ms.
-            setDeadline(now, 550ms, "start");
+            // WORKAROUND: start sometimes takes longer than expected.
+            setDeadline(now, 2500ms, "start");
             mQueuedWorkCount = 0;
             start();
             break;