| commit | 12f62861754dbca6125a16080ada13a7125e1ba8 | [log] [tgz] |
|---|---|---|
| author | TreeHugger Robot <treehugger-gerrit@google.com> | Sat Jul 24 02:38:54 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Sat Jul 24 02:38:54 2021 +0000 |
| tree | f2e9d5791a9f4765cb3cc9f3b049b651a71586fc | |
| parent | 8da13864591493de7fa8a2ed2a360e399be78c5e [diff] | |
| parent | 43d2e5f4a34ef4086a5eb1989ee5b1b91ff19460 [diff] |
Merge "CCodec: wrap graphic buffer only if Y plane has the smallest address" into sc-dev am: 6ac4ef512e am: 43d2e5f4a3 Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/av/+/15367054 Change-Id: I29586dedd7df991bdfdb90b3e4dd4ebed2776902
diff --git a/media/codec2/sfplugin/Codec2Buffer.cpp b/media/codec2/sfplugin/Codec2Buffer.cpp index 691bab1..4070478 100644 --- a/media/codec2/sfplugin/Codec2Buffer.cpp +++ b/media/codec2/sfplugin/Codec2Buffer.cpp
@@ -491,7 +491,7 @@ * align(mHeight, 64) / plane.rowSampling; } - if ((maxPtr - minPtr + 1) <= planeSize) { + if (minPtr == mView.data()[0] && (maxPtr - minPtr + 1) <= planeSize) { // FIXME: this is risky as reading/writing data out of bound results // in an undefined behavior, but gralloc does assume a // contiguous mapping