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

Commit 36c68885 authored by Colin Cross's avatar Colin Cross Committed by android-build-merger
Browse files

Merge changes I155f9f77,Ibb1aa07a,If460a6ef,Ifabff1c2 am: 87f08974 

am: f8e4180a

Change-Id: I6bcdd3d7034bc5acb49300026ce7abdc74c4e3c0
parents 91f88b64 f8e4180a

cmds/stagefright/stagefright.cpp

+1 −1
Original line number Diff line number Diff line
@@ -159,7 +159,7 @@ static void dumpSource(const sp<IMediaSource> &source, const String8 &filename) 
                       1,

                       mbuf->range_length(),

                       out),

                (ssize_t)mbuf->range_length());

                mbuf->range_length());



        mbuf->release();

        mbuf = NULL;

include/media/stagefright/DataSource.h

+1 −1
Original line number Diff line number Diff line
@@ -165,7 +165,7 @@ bool DataSource::getVector(off64_t offset, Vector<T>* x, size_t count, 
        if (numBytesRead == -1) { // If readAt() returns -1, there is an error.

            return false;

        }

        if (numBytesRead < numBytesPerChunk) {

        if (static_cast<size_t>(numBytesRead) < numBytesPerChunk) {

            // This case is triggered when the stream ends before the whole

            // chunk is read.

            x->appendArray(tmp, (size_t)numBytesRead / sizeof(T));

include/media/stagefright/MediaBuffer.h

+1 −1
Original line number Diff line number Diff line
@@ -223,7 +223,7 @@ private: 
        // Caution: atomic_int_fast32_t is 64 bits on LP64.

        std::atomic_int_least32_t mFlags;

        std::atomic_int_least32_t mRemoteRefcount;

        int32_t unused[6]; // additional buffer space

        int32_t unused[6] __attribute__((__unused__)); // additional buffer space

    };



    inline SharedControl *getSharedControl() const {

include/media/stagefright/SurfaceMediaSource.h

+2 −2
Original line number Diff line number Diff line
@@ -107,8 +107,8 @@ public: 
    void setFrameAvailableListener(const sp<FrameAvailableListener>& listener);



    // dump our state in a String

    void dump(String8& result) const;

    void dump(String8& result, const char* prefix, char* buffer,

    void dumpState(String8& result) const;

    void dumpState(String8& result, const char* prefix, char* buffer,

                                                    size_t SIZE) const;



    // metaDataStoredInVideoBuffers tells the encoder what kind of metadata

include/media/stagefright/foundation/ADebug.h

+12 −0
Original line number Diff line number Diff line
@@ -53,6 +53,9 @@ inline static const char *asString(status_t i, const char *def = "??") { 
#define LITERAL_TO_STRING_INTERNAL(x)    #x

#define LITERAL_TO_STRING(x) LITERAL_TO_STRING_INTERNAL(x)



#ifdef CHECK

#undef CHECK

#endif

#define CHECK(condition)                                \

    LOG_ALWAYS_FATAL_IF(                                \

            !(condition),                               \
@@ -92,6 +95,15 @@ MAKE_COMPARATOR(GT,>) 
        }                                                               \

    } while (false)



#ifdef CHECK_EQ

#undef CHECK_EQ

#undef CHECK_NE

#undef CHECK_LE

#undef CHECK_LT

#undef CHECK_GE

#undef CHECK_GT

#endif



#define CHECK_EQ(x,y)   CHECK_OP(x,y,EQ,==)

#define CHECK_NE(x,y)   CHECK_OP(x,y,NE,!=)

#define CHECK_LE(x,y)   CHECK_OP(x,y,LE,<=)