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

Commit e0cd633e authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "MediaCodec: report message from CodecErrorLog" am: c33f81ff am: 7778c72b 

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



Change-Id: I4ccadee321416335ba69af7f53df3502bb7b7754
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 730bedc7 7778c72b

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 Diff line number Diff line
@@ -176,6 +176,8 @@ struct JMediaCodec : public AHandler { 


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



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



protected:

    virtual ~JMediaCodec();