summaryrefslogtreecommitdiffstats
path: root/include/media/IMediaPlayer.h
diff options
context:
space:
mode:
authorAndreas Huber <andih@google.com>2010-08-16 08:49:37 -0700
committerAndreas Huber <andih@google.com>2010-08-23 12:30:24 -0700
commite3c01832fc741e9908f047d86cd40db1ea5d78c8 (patch)
tree6765bad7dbcf95dc5ca28ba5b2de5f7a70047712 /include/media/IMediaPlayer.h
parented23e3b87906d367304dbf5bd49ed17448d5d684 (diff)
downloadframeworks_base-e3c01832fc741e9908f047d86cd40db1ea5d78c8.zip
frameworks_base-e3c01832fc741e9908f047d86cd40db1ea5d78c8.tar.gz
frameworks_base-e3c01832fc741e9908f047d86cd40db1ea5d78c8.tar.bz2
Squashed commit of the following:
commit 35cc68814a9537c31fde146e171e7b0bbdfe211e Author: Andreas Huber <andih@google.com> Date: Mon Aug 16 08:48:42 2010 -0700 Only enable support for yuv to yuv conversion on passion, where it's available, use the slower yuv->rgb565 path everywhere else. commit d8ac5a8814103e60d11d2acf61997fc31a1dc58d Author: Andreas Huber <andih@google.com> Date: Fri Aug 13 13:56:44 2010 -0700 The software renderer takes over all rendering, converting from yuv to yuv if possible and rgb565 otherwise. commit 684972074b74318bdcb826ed9b5b0864d2d2e273 Author: Andreas Huber <andih@google.com> Date: Fri Aug 13 09:34:35 2010 -0700 A first shot at supporting the new rendering APIs. Change-Id: Iea9b32856da46950501f1a700f616b5feac710fd
Diffstat (limited to 'include/media/IMediaPlayer.h')
-rw-r--r--include/media/IMediaPlayer.h4
1 files changed, 3 insertions, 1 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;