Revert "Fix supportsNonblockingRead"
This reverts commit fc69b8e517b853e62b13a0b38eb1af33573c9a02.
Reason for revert: android.media.cts.MediaCodecTest fails
Change-Id: If20c8f95f19fc0c670e1c05820adf3e021c9cc56
diff --git a/media/libmediaextractor/include/media/MediaTrack.h b/media/libmediaextractor/include/media/MediaTrack.h
index 94510a2..adea61a 100644
--- a/media/libmediaextractor/include/media/MediaTrack.h
+++ b/media/libmediaextractor/include/media/MediaTrack.h
@@ -113,12 +113,6 @@
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:
diff --git a/media/libstagefright/RemoteMediaSource.cpp b/media/libstagefright/RemoteMediaSource.cpp
index e549fcf..d07afec 100644
--- a/media/libstagefright/RemoteMediaSource.cpp
+++ b/media/libstagefright/RemoteMediaSource.cpp
@@ -54,10 +54,6 @@
return mSource->read(buffer, reinterpret_cast<const MediaSource::ReadOptions*>(options));
}
-bool RemoteMediaSource::supportNonblockingRead() {
- return mSource->supportNonblockingRead();
-}
-
status_t RemoteMediaSource::pause() {
return ERROR_UNSUPPORTED;
}
diff --git a/media/libstagefright/include/media/stagefright/RemoteMediaSource.h b/media/libstagefright/include/media/stagefright/RemoteMediaSource.h
index d1ec1ed..1d720af 100644
--- a/media/libstagefright/include/media/stagefright/RemoteMediaSource.h
+++ b/media/libstagefright/include/media/stagefright/RemoteMediaSource.h
@@ -37,7 +37,6 @@
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);