| commit | 9a49149282d1dff1b9eacdbdd3fbf4bce7b2e4fd | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> | Mon May 22 06:33:42 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon May 22 06:33:42 2023 +0000 |
| tree | 85f1656ffd7e783729c6b37736e8e385030a91ab | |
| parent | 53633dd68f342797ddd256f2083ac5819e75bc9c [diff] | |
| parent | 5828ec4d7a7d9ac260ca65e3eeedc4b418e09d94 [diff] |
Merge "update inputdelay if changed" am: 4a3734db34 am: bfd43a0edf am: d297b5e672 am: 5828ec4d7a Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/2529659 Change-Id: I8a5fb3312a53b6d69b4a9c694358b50ae587d366 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/media/codec2/sfplugin/CCodecBufferChannel.cpp b/media/codec2/sfplugin/CCodecBufferChannel.cpp index 967d586..28661b8 100644 --- a/media/codec2/sfplugin/CCodecBufferChannel.cpp +++ b/media/codec2/sfplugin/CCodecBufferChannel.cpp
@@ -2000,6 +2000,7 @@ newInputDelay.value_or(input->inputDelay) + newPipelineDelay.value_or(input->pipelineDelay) + kSmoothnessFactor; + input->inputDelay = newInputDelay.value_or(input->inputDelay); if (input->buffers->isArrayMode()) { if (input->numSlots >= newNumSlots) { input->numExtraSlots = 0;