| commit | 7eb31a2523ec872575e91723d0d2da0f70c31e57 | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <treehugger-gerrit@google.com> | Mon Oct 11 13:43:09 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Oct 11 13:43:09 2021 +0000 |
| tree | 62a60c0e2260c1413773b1fe9c8d9dc86db556a6 | |
| parent | e3dd2447f996a32c345397203c423f34302914ab [diff] | |
| parent | cd6efb004b05dd10455dea57aa62e8d93538f763 [diff] |
Merge "CCodec: Fix null check" am: 77a7eeff17 am: def290614b am: 1cefed77ab am: b77b357586 am: cd6efb004b Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/1850314 Change-Id: I37b8484f89012d84137e2ec2e165aada7f299e5e
diff --git a/media/codec2/sfplugin/CCodecBuffers.cpp b/media/codec2/sfplugin/CCodecBuffers.cpp index 90f9c1b..20f2ecf 100644 --- a/media/codec2/sfplugin/CCodecBuffers.cpp +++ b/media/codec2/sfplugin/CCodecBuffers.cpp
@@ -240,7 +240,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.