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

Commit da8a81dc authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge changes If460a6ef,Ifabff1c2 

* changes:
  Rename SurfaceMediaSource::dump to dumpState
  HACK: work around both android-base/logging.h and ADebug.h defining CHECK
parents 8025cd5d f461f38e

media/libstagefright/SurfaceMediaSource.cpp

+3 −3
Original line number Diff line number Diff line
@@ -96,13 +96,13 @@ void SurfaceMediaSource::setFrameAvailableListener( 
    mFrameAvailableListener = listener;

}



void SurfaceMediaSource::dump(String8& result) const

void SurfaceMediaSource::dumpState(String8& result) const

{

    char buffer[1024];

    dump(result, "", buffer, 1024);

    dumpState(result, "", buffer, 1024);

}



void SurfaceMediaSource::dump(

void SurfaceMediaSource::dumpState(

        String8& result,

        const char* /* prefix */,

        char* buffer,

media/libstagefright/include/SurfaceMediaSource.h

+2 −2
Original line number Diff line number Diff line
@@ -106,8 +106,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

media/libstagefright/include/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,<=)