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

Commit 3a0fb34e authored by Jesse Hall's avatar Jesse Hall Committed by Android (Google) Code Review
Browse files

Merge "Add empty onSidebandChanged callbacks to BufferQueue::ConsumerListeners"

parents 4e053b1a 8dcc81a2

include/media/stagefright/SurfaceMediaSource.h

+4 −0
Original line number Diff line number Diff line
@@ -139,6 +139,10 @@ protected: 
    // frames is separate than the one calling stop.

    virtual void onBuffersReleased();



    // SurfaceMediaSource can't handle sideband streams, so this is not expected

    // to ever be called. Does nothing.

    virtual void onSidebandStreamChanged();



    static bool isExternalFormat(uint32_t format);



private:

media/libstagefright/SurfaceMediaSource.cpp

+4 −0
Original line number Diff line number Diff line
@@ -477,4 +477,8 @@ void SurfaceMediaSource::onBuffersReleased() { 
    }

}



void SurfaceMediaSource::onSidebandStreamChanged() {

    ALOG_ASSERT(false, "SurfaceMediaSource can't consume sideband streams");

}



} // end of namespace android

media/libstagefright/omx/GraphicBufferSource.cpp

+5 −0
Original line number Diff line number Diff line
@@ -777,6 +777,11 @@ void GraphicBufferSource::onBuffersReleased() { 
    }

}



// BufferQueue::ConsumerListener callback

void GraphicBufferSource::onSidebandStreamChanged() {

    ALOG_ASSERT(false, "GraphicBufferSource can't consume sideband streams");

}



status_t GraphicBufferSource::setRepeatPreviousFrameDelayUs(

        int64_t repeatAfterUs) {

    Mutex::Autolock autoLock(mMutex);

media/libstagefright/omx/GraphicBufferSource.h

+5 −0
Original line number Diff line number Diff line
@@ -143,6 +143,11 @@ protected: 
    // set of mBufferSlot entries.

    virtual void onBuffersReleased();



    // BufferQueue::ConsumerListener interface, called when the client has

    // changed the sideband stream. GraphicBufferSource doesn't handle sideband

    // streams so this is a no-op (and should never be called).

    virtual void onSidebandStreamChanged();



private:

    // Keep track of codec input buffers.  They may either be available

    // (mGraphicBuffer == NULL) or in use by the codec.