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

Commit df72e61b authored by Wonsik Kim's avatar Wonsik Kim
Browse files

Revert "Fix supportsNonblockingRead" 

This reverts commit fc69b8e5.

Reason for revert: android.media.cts.MediaCodecTest fails

Change-Id: If20c8f95f19fc0c670e1c05820adf3e021c9cc56
parent fc69b8e5

media/libmediaextractor/include/media/MediaTrack.h

+0 −6
Original line number Diff line number Diff line
@@ -113,12 +113,6 @@ struct MediaTrack 
    virtual status_t read(

            MediaBufferBase **buffer, const ReadOptions *options = NULL) = 0;



    // Returns true if |read| supports nonblocking option, otherwise false.

    // |readMultiple| if supported, always allows the nonblocking option.

    virtual bool supportNonblockingRead() {

        return false;

    }



    virtual ~MediaTrack();



private:

media/libstagefright/RemoteMediaSource.cpp

+0 −4
Original line number Diff line number Diff line
@@ -54,10 +54,6 @@ status_t RemoteMediaSource::read( 
    return mSource->read(buffer, reinterpret_cast<const MediaSource::ReadOptions*>(options));

}



bool RemoteMediaSource::supportNonblockingRead() {

    return mSource->supportNonblockingRead();

}



status_t RemoteMediaSource::pause() {

    return ERROR_UNSUPPORTED;

}

media/libstagefright/include/media/stagefright/RemoteMediaSource.h

+0 −1
Original line number Diff line number Diff line
@@ -37,7 +37,6 @@ public: 
    virtual status_t read(

            MediaBufferBase **buffer,

            const MediaSource::ReadOptions *options = NULL);

    virtual bool supportNonblockingRead();

    virtual status_t pause();

    virtual status_t setStopTimeUs(int64_t stopTimeUs);