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

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

Merge "stagefright: add nonblocking read option to MediaBuffer" into lmp-dev

parents 09b9a3b0 8eebda04

include/media/stagefright/MediaSource.h

+5 −0
Original line number Diff line number Diff line
@@ -82,6 +82,10 @@ struct MediaSource : public virtual RefBase { 
        void setLateBy(int64_t lateness_us);

        int64_t getLateBy() const;



        void setNonBlocking();

        void clearNonBlocking();

        bool getNonBlocking() const;



    private:

        enum Options {

            kSeekTo_Option      = 1,
@@ -91,6 +95,7 @@ struct MediaSource : public virtual RefBase { 
        int64_t mSeekTimeUs;

        SeekMode mSeekMode;

        int64_t mLatenessUs;

        bool mNonBlocking;

    };



    // Causes this source to suspend pulling data from its upstream source

media/libstagefright/MediaSource.cpp

+13 −0
Original line number Diff line number Diff line
@@ -32,6 +32,19 @@ void MediaSource::ReadOptions::reset() { 
    mOptions = 0;

    mSeekTimeUs = 0;

    mLatenessUs = 0;

    mNonBlocking = false;

}



void MediaSource::ReadOptions::setNonBlocking() {

    mNonBlocking = true;

}



void MediaSource::ReadOptions::clearNonBlocking() {

    mNonBlocking = false;

}



bool MediaSource::ReadOptions::getNonBlocking() const {

    return mNonBlocking;

}



void MediaSource::ReadOptions::setSeekTo(int64_t time_us, SeekMode mode) {