| commit | 5efafeaadd05cbca9aed4efbf51f9bdac074304f | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <treehugger-gerrit@google.com> | Tue Aug 02 19:50:05 2022 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Aug 02 19:50:05 2022 +0000 |
| tree | fa3437243be46b919a3e5c41ef6793315b5cd955 | |
| parent | 6053f70a22a96eea242e2157d21c385bb8f7548f [diff] | |
| parent | 0bea00ea9272b9c830574d060eff07aa69af26bb [diff] |
Merge "codec2: fix issue in allocating too many 8k buffers" am: e7b08e2b88 am: 0bea00ea92 Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/1906682 Change-Id: Ibd3bc9c57811c8f1335ad31c988c2ad049007a71 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/media/codec2/sfplugin/Codec2Buffer.cpp b/media/codec2/sfplugin/Codec2Buffer.cpp index 55e0c45..876c96d 100644 --- a/media/codec2/sfplugin/Codec2Buffer.cpp +++ b/media/codec2/sfplugin/Codec2Buffer.cpp
@@ -843,6 +843,10 @@ } } sp<ABuffer> aBuffer(alloc(align(width, 16) * align(height, 16) * bpp / 8)); + if (aBuffer == nullptr) { + ALOGD("%s: failed to allocate buffer", __func__); + return nullptr; + } return new ConstGraphicBlockBuffer( format, aBuffer,