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

Commit 691d801f authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "MediaCodec: report message from CodecErrorLog" into udc-dev am: 45a444bc 

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



Change-Id: Ia37686ed1ab12cef39945b302a33b5479319f806
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 29628b2e 45a444bc

media/jni/android_media_MediaCodec.cpp

+173 −90

File changed.

Preview size limit exceeded, changes collapsed.

media/jni/android_media_MediaCodec.h

+2 −0
Original line number Original line Diff line number Diff line
@@ -176,6 +176,8 @@ struct JMediaCodec : public AHandler { 




    const sp<ICrypto> &getCrypto() { return mCrypto; }

    const sp<ICrypto> &getCrypto() { return mCrypto; }





    std::string getExceptionMessage(const char *msg) const;



protected:

protected:

    virtual ~JMediaCodec();

    virtual ~JMediaCodec();