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

Commit e6858d59 authored by Lajos Molnar's avatar Lajos Molnar Committed by Android (Google) Code Review
Browse files

Merge "stagefright: prevent more crashes in ACodec" into mnc-dev

parents 467b6e15 08063406

include/media/stagefright/ACodec.h

+8 −0
Original line number Diff line number Diff line
@@ -146,8 +146,13 @@ private: 
            OWNED_BY_UPSTREAM,

            OWNED_BY_DOWNSTREAM,

            OWNED_BY_NATIVE_WINDOW,

            UNRECOGNIZED,            // not a tracked buffer

        };



        static inline Status getSafeStatus(BufferInfo *info) {

            return info == NULL ? UNRECOGNIZED : info->mStatus;

        }



        IOMX::buffer_id mBufferID;

        Status mStatus;

        unsigned mDequeuedAt;
@@ -156,6 +161,9 @@ private: 
        sp<GraphicBuffer> mGraphicBuffer;

    };



    static const char *_asString(BufferInfo::Status s);

    void dumpBuffers(OMX_U32 portIndex);



#if TRACK_BUFFER_TIMING

    struct BufferStats {

        int64_t mEmptyBufferTimeUs;

media/libstagefright/ACodec.cpp

+299 −164

File changed.

Preview size limit exceeded, changes collapsed.