Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0b2b1a7f authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "CCodec: Push blank buffer at the end of protected content" into... 

Merge "CCodec: Push blank buffer at the end of protected content" into tm-qpr-dev am: bb1760af am: 00b4040a am: 4c1eaec6

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/av/+/21801541



Change-Id: I475312e2e0eef6cd373b4e24e0eedbc367a542c8
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 7a9226ed 4c1eaec6

media/codec2/sfplugin/CCodec.cpp

+10 −0
Original line number Diff line number Diff line
@@ -884,6 +884,16 @@ void CCodec::configure(const sp<AMessage> &msg) { 
                    if (msg->findInt32(KEY_PUSH_BLANK_BUFFERS_ON_STOP, &pushBlankBuffersOnStop)) {

                        config->mPushBlankBuffersOnStop = pushBlankBuffersOnStop == 1;

                    }

                    // secure compoment or protected content default with

                    // "push-blank-buffers-on-shutdown" flag

                    if (!config->mPushBlankBuffersOnStop) {

                        int32_t usageProtected;

                        if (comp->getName().find(".secure") != std::string::npos) {

                            config->mPushBlankBuffersOnStop = true;

                        } else if (msg->findInt32("protected", &usageProtected) && usageProtected) {

                            config->mPushBlankBuffersOnStop = true;

                        }

                    }

                }

            }

            setSurface(surface);