diff options
| author | Chris Watkins <watk@google.com> | 2015-04-16 17:06:37 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-04-16 17:06:42 +0000 |
| commit | c224ec53a17994fa97ab2f29304647c9f195c51c (patch) | |
| tree | 6086a1cf5720b82e7dc25b7ecd60af39d66c738d /include/media/mediaplayer.h | |
| parent | f2326ac96366ec4d05f470cc4a0b407e7805bab7 (diff) | |
| parent | 99f31604136d66ae10e20669fb6b5716f342bde0 (diff) | |
| download | frameworks_av-c224ec53a17994fa97ab2f29304647c9f195c51c.zip frameworks_av-c224ec53a17994fa97ab2f29304647c9f195c51c.tar.gz frameworks_av-c224ec53a17994fa97ab2f29304647c9f195c51c.tar.bz2 | |
Merge "Unhide the android.media.[Media]DataSource interface."
Diffstat (limited to 'include/media/mediaplayer.h')
| -rw-r--r-- | include/media/mediaplayer.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/media/mediaplayer.h b/include/media/mediaplayer.h index 808e893..269a2d7 100644 --- a/include/media/mediaplayer.h +++ b/include/media/mediaplayer.h @@ -211,6 +211,7 @@ public: status_t setDataSource(int fd, int64_t offset, int64_t length); status_t setDataSource(const sp<IStreamSource> &source); + status_t setDataSource(const sp<IDataSource> &source); status_t setVideoSurfaceTexture( const sp<IGraphicBufferProducer>& bufferProducer); status_t setListener(const sp<MediaPlayerListener>& listener); |