| commit | b77b357586a0f376718afdbc6eb9d8bc4451a39b | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <treehugger-gerrit@google.com> | Mon Oct 11 13:17:53 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Oct 11 13:17:53 2021 +0000 |
| tree | df85f1614879aa41a8a398e39fe1b350346b73f6 | |
| parent | 384cb18cb2533ef524202b2505887a6a1384ef62 [diff] | |
| parent | 1cefed77ab08c330ef66e4fe3954baa9f4769593 [diff] |
Merge "CCodec: Fix null check" am: 77a7eeff17 am: def290614b am: 1cefed77ab Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/1850314 Change-Id: Ic7e4c3d70625680bbcae42b0da8e785d2605e6b0
diff --git a/media/codec2/sfplugin/CCodecBuffers.cpp b/media/codec2/sfplugin/CCodecBuffers.cpp index 0b4a19a..97e1a01 100644 --- a/media/codec2/sfplugin/CCodecBuffers.cpp +++ b/media/codec2/sfplugin/CCodecBuffers.cpp
@@ -236,7 +236,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.