From 5daeb129a2c2ba3d14ccd94af283b5f561c783ea Mon Sep 17 00:00:00 2001 From: Andreas Huber Date: Mon, 16 Aug 2010 08:49:37 -0700 Subject: Squashed commit of the following: commit 35cc68814a9537c31fde146e171e7b0bbdfe211e Author: Andreas Huber 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 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 Date: Fri Aug 13 09:34:35 2010 -0700 A first shot at supporting the new rendering APIs. Change-Id: Iea9b32856da46950501f1a700f616b5feac710fd --- media/libmediaplayerservice/MidiFile.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'media/libmediaplayerservice/MidiFile.h') diff --git a/media/libmediaplayerservice/MidiFile.h b/media/libmediaplayerservice/MidiFile.h index 4a60ece..06e4b70 100644 --- a/media/libmediaplayerservice/MidiFile.h +++ b/media/libmediaplayerservice/MidiFile.h @@ -35,7 +35,8 @@ public: const char* path, const KeyedVector *headers); virtual status_t setDataSource(int fd, int64_t offset, int64_t length); - virtual status_t setVideoSurface(const sp& surface) { return UNKNOWN_ERROR; } + virtual status_t setVideoISurface(const sp& surface) { return UNKNOWN_ERROR; } + virtual status_t setVideoSurface(const sp& surface) { return UNKNOWN_ERROR; } virtual status_t prepare(); virtual status_t prepareAsync(); virtual status_t start(); -- cgit v1.1