commit 922bb104df7f0467c1f6200d1d2c4f935b13b45f
author Wonsik Kim <wonsik@google.com> Wed Jan 29 10:50:41 2020 -0800
committer Wonsik Kim <wonsik@google.com> Wed Jan 29 10:50:41 2020 -0800
tree 09f974f65d11c29ac522fb2c6dbd6f91a357c592
parent 86d5a2a36b918c4f5cc33be1b139ec9a53f5da03

stagefright: do not attempt to read from secure output buffer

Bug: 143193031
Test: atest CtsMediaTestCases -- --module-arg CtsMediaTestCases:size:small
Change-Id: Ie5eca8fc954e1b8527b70c04bfc326089720e022

media/libstagefright/MediaCodec.cpp

diff --git a/media/libstagefright/MediaCodec.cpp b/media/libstagefright/MediaCodec.cpp
index 6757474..8b673d6 100644
--- a/media/libstagefright/MediaCodec.cpp
+++ b/media/libstagefright/MediaCodec.cpp
@@ -2518,7 +2518,7 @@
                             // format as necessary.
                             int32_t flags = 0;
                             (void) buffer->meta()->findInt32("flags", &flags);
-                            if (flags & BUFFER_FLAG_CODECCONFIG) {
+                            if ((flags & BUFFER_FLAG_CODECCONFIG) && !(mFlags & kFlagIsSecure)) {
                                 status_t err =
                                     amendOutputFormatWithCodecSpecificData(buffer);