diff options
| author | Andreas Huber <andih@google.com> | 2010-08-23 12:31:59 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-08-23 12:31:59 -0700 |
| commit | d5350764c9cbb27b91ca0503d6e318dffabe969f (patch) | |
| tree | bb237345667138cf8776bed5a0a0d663bfa1a1da /include | |
| parent | 27113f86461fb19005900b8d6cebf264ecf77409 (diff) | |
| parent | e3c01832fc741e9908f047d86cd40db1ea5d78c8 (diff) | |
| download | frameworks_base-d5350764c9cbb27b91ca0503d6e318dffabe969f.zip frameworks_base-d5350764c9cbb27b91ca0503d6e318dffabe969f.tar.gz frameworks_base-d5350764c9cbb27b91ca0503d6e318dffabe969f.tar.bz2 | |
Merge "Squashed commit of the following:"
Diffstat (limited to 'include')
| -rw-r--r-- | include/media/IMediaPlayer.h | 4 | ||||
| -rw-r--r-- | include/media/MediaPlayerInterface.h | 4 | ||||
| -rw-r--r-- | include/media/PVPlayer.h | 3 | ||||
| -rw-r--r-- | include/surfaceflinger/Surface.h | 1 |
4 files changed, 9 insertions, 3 deletions
diff --git a/include/media/IMediaPlayer.h b/include/media/IMediaPlayer.h index af9a7ed..a1ce113 100644 --- a/include/media/IMediaPlayer.h +++ b/include/media/IMediaPlayer.h @@ -25,6 +25,7 @@ namespace android { class Parcel; class ISurface; +class Surface; class IMediaPlayer: public IInterface { @@ -33,7 +34,8 @@ public: virtual void disconnect() = 0; - virtual status_t setVideoSurface(const sp<ISurface>& surface) = 0; + virtual status_t setVideoISurface(const sp<ISurface>& surface) = 0; + virtual status_t setVideoSurface(const sp<Surface>& surface) = 0; virtual status_t prepareAsync() = 0; virtual status_t start() = 0; virtual status_t stop() = 0; diff --git a/include/media/MediaPlayerInterface.h b/include/media/MediaPlayerInterface.h index 3662983..13c73ac 100644 --- a/include/media/MediaPlayerInterface.h +++ b/include/media/MediaPlayerInterface.h @@ -33,6 +33,7 @@ namespace android { class Parcel; class ISurface; +class Surface; template<typename T> class SortedVector; @@ -104,7 +105,8 @@ public: const KeyedVector<String8, String8> *headers = NULL) = 0; virtual status_t setDataSource(int fd, int64_t offset, int64_t length) = 0; - virtual status_t setVideoSurface(const sp<ISurface>& surface) = 0; + virtual status_t setVideoISurface(const sp<ISurface>& surface) = 0; + virtual status_t setVideoSurface(const sp<Surface>& surface) = 0; virtual status_t prepare() = 0; virtual status_t prepareAsync() = 0; virtual status_t start() = 0; diff --git a/include/media/PVPlayer.h b/include/media/PVPlayer.h index df50981..657e7a6 100644 --- a/include/media/PVPlayer.h +++ b/include/media/PVPlayer.h @@ -43,7 +43,8 @@ public: const char *url, const KeyedVector<String8, String8> *headers); virtual status_t setDataSource(int fd, int64_t offset, int64_t length); - virtual status_t setVideoSurface(const sp<ISurface>& surface); + virtual status_t setVideoISurface(const sp<ISurface>& surface); + virtual status_t setVideoSurface(const sp<Surface>& surface); virtual status_t prepare(); virtual status_t prepareAsync(); virtual status_t start(); diff --git a/include/surfaceflinger/Surface.h b/include/surfaceflinger/Surface.h index 294c867..28ab0fd 100644 --- a/include/surfaceflinger/Surface.h +++ b/include/surfaceflinger/Surface.h @@ -178,6 +178,7 @@ private: // MediaPlayer needs access to ISurface for display friend class MediaPlayer; friend class IOMX; + friend class SoftwareRenderer; // this is just to be able to write some unit tests friend class Test; |