| commit | f5c6fcdb4befc1aa816119a66e4aaf63b52abba5 | [log] [tgz] |
|---|---|---|
| author | TreeHugger Robot <treehugger-gerrit@google.com> | Wed Jul 01 18:41:30 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Jul 01 18:41:30 2020 +0000 |
| tree | db691e8fdac3449db43482af358a4490d1fb1086 | |
| parent | 2f13acc6b50114aa585d64e8bf9873813640cd7c [diff] | |
| parent | 5291b3926c306d7f46564ee86f62f3c28740dab7 [diff] |
Merge "CCodec: Duplicate format given to CCodecBufferChannel" into rvc-dev am: e241b78536 am: 5291b3926c Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/av/+/12014034 Change-Id: I0344fc4d0b4ea081bc665c0196ae3793a06982b1
diff --git a/media/codec2/sfplugin/CCodec.cpp b/media/codec2/sfplugin/CCodec.cpp index 70171fd..73b3857 100644 --- a/media/codec2/sfplugin/CCodec.cpp +++ b/media/codec2/sfplugin/CCodec.cpp
@@ -1868,7 +1868,7 @@ config->mInputSurface->onInputBufferDone(work->input.ordinal.frameIndex); } mChannel->onWorkDone( - std::move(work), changed ? config->mOutputFormat : nullptr, + std::move(work), changed ? config->mOutputFormat->dup() : nullptr, initData.hasChanged() ? initData.update().get() : nullptr); break; }