| commit | 1a6a808fb5c44b061183bdb39d8dfd4b5abc34f1 | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> | Mon May 22 07:28:31 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon May 22 07:28:31 2023 +0000 |
| tree | f0913c3a54bffea0e162bb19c5bdfcbd46aefcc8 | |
| parent | 19a4703e47262d34b06dbc128c05fcff6a3feadf [diff] | |
| parent | 03e54442b3493d844b7576659332eb37cffc6289 [diff] |
Merge "update inputdelay if changed" am: 4a3734db34 am: bfd43a0edf am: d297b5e672 am: 5828ec4d7a am: 9a49149282 am: 03e54442b3 Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/2529659 Change-Id: I764b625b84d564249b9c0d9e1097f0ba160adfd3 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;