| commit | a6a7fb3e618098be9f046eef05bfb651ad011188 | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> | Tue Jun 27 19:54:46 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Jun 27 19:54:46 2023 +0000 |
| tree | 80254d3d4dd54eacf051c095471f8f382ef6d7bc | |
| parent | ec94e9d80ba02a66b89e5d0e3a725ed26d2ae769 [diff] | |
| parent | 415fa2dbc82262e3d48452cdf975f40fa9dc5410 [diff] |
Merge "CCodec: clear deadline after component start returns" am: 2a14692178 am: 415fa2dbc8 Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/2635504 Change-Id: Ia5ff827107d7f11c86d7bddc27312a59528a3df7 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/media/codec2/sfplugin/CCodec.cpp b/media/codec2/sfplugin/CCodec.cpp index fe58711..6295b06 100644 --- a/media/codec2/sfplugin/CCodec.cpp +++ b/media/codec2/sfplugin/CCodec.cpp
@@ -1801,6 +1801,10 @@ ACTION_CODE_FATAL); return; } + + // clear the deadline after the component starts + setDeadline(TimePoint::max(), 0ms, "none"); + sp<AMessage> inputFormat; sp<AMessage> outputFormat; status_t err2 = OK;