| commit | c9877821e89c3ab797332ae17b7d1b29f7dd0dbb | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <treehugger-gerrit@google.com> | Fri Apr 30 01:40:39 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Apr 30 01:40:39 2021 +0000 |
| tree | 0d2c7bb8b8a731e62a0a3db6ffb2c8b6e7680825 | |
| parent | 10705ba205abfc8a4d0e9e39a600d321b36dd0cf [diff] | |
| parent | 4d31beaed85d5ad209a51a870c90b8f152680b94 [diff] |
Merge "CCodecBufferChannel: add null checks" am: 324ee07643 am: fece72c946 am: 4d31beaed8 Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/1688971 Change-Id: I969f0a4046c82d9692596e9b2e587b66e1d373fc
diff --git a/media/codec2/sfplugin/CCodecBufferChannel.cpp b/media/codec2/sfplugin/CCodecBufferChannel.cpp index e33a5ba..c6ff825 100644 --- a/media/codec2/sfplugin/CCodecBufferChannel.cpp +++ b/media/codec2/sfplugin/CCodecBufferChannel.cpp
@@ -1780,7 +1780,7 @@ { Mutexed<Output>::Locked output(mOutput); numOutputSlots = output->numSlots; - reorderDepth = output->buffers->getReorderDepth(); + reorderDepth = output->buffers ? output->buffers->getReorderDepth() : 0; } { Mutexed<OutputSurface>::Locked output(mOutputSurface);