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

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

Merge "Rename SurfaceMediaSource::dump to dumpState" into oc-dev-plus-aosp

parents 62adc938 4fa8643d

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