| commit | def290614b98df9f0e1523ea434ad2ce30f71bb3 | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <treehugger-gerrit@google.com> | Mon Oct 11 12:48:15 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Oct 11 12:48:15 2021 +0000 |
| tree | 2398284f433f6087a921c2baea351b7bf6caa3de | |
| parent | 0db0cf02bfc4e66e26f5ea7faae9670ce9954c79 [diff] | |
| parent | 77a7eeff17d152f5041d4da1ce5933da70165439 [diff] |
Merge "CCodec: Fix null check" am: 77a7eeff17 Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/1850314 Change-Id: Iaa1990e9de45421d8eeadd0923398ef17b2cc0f2
diff --git a/media/codec2/sfplugin/CCodecBuffers.cpp b/media/codec2/sfplugin/CCodecBuffers.cpp index e12b209..d57eb0c 100644 --- a/media/codec2/sfplugin/CCodecBuffers.cpp +++ b/media/codec2/sfplugin/CCodecBuffers.cpp
@@ -233,7 +233,7 @@ if (!srcBuffer) { return false; } - if (!dst) { + if (!*dst) { *dst = new Codec2Buffer( mFormat, new ABuffer(mDataConverter->targetSize(srcBuffer->size())));
diff --git a/media/codec2/sfplugin/CCodecBuffers.h b/media/codec2/sfplugin/CCodecBuffers.h index 7f3a655..c8e9930 100644 --- a/media/codec2/sfplugin/CCodecBuffers.h +++ b/media/codec2/sfplugin/CCodecBuffers.h
@@ -385,7 +385,7 @@ void submit(const sp<MediaCodecBuffer> &buffer); /** - * Apply DataConverter from |src| to |*dst| if needed. If |dst| is nullptr, + * Apply DataConverter from |src| to |*dst| if needed. If |*dst| is nullptr, * a new buffer is allocated. * * Returns true if conversion was needed and executed; false otherwise.