summaryrefslogtreecommitdiffstats
path: root/include/media/mediaplayer.h
diff options
context:
space:
mode:
authorGloria Wang <gwang@google.com>2011-04-11 17:23:27 -0700
committerGloria Wang <gwang@google.com>2011-04-13 11:11:34 -0700
commitb483c4724846c0b8d4e82afcbb7c17f671bae81c (patch)
tree3323eb5f46357ffff206c880b36fcf30dd984e02 /include/media/mediaplayer.h
parentfa4e195a735ab99e02388ac5c5611e73a76c7c72 (diff)
downloadframeworks_av-b483c4724846c0b8d4e82afcbb7c17f671bae81c.zip
frameworks_av-b483c4724846c0b8d4e82afcbb7c17f671bae81c.tar.gz
frameworks_av-b483c4724846c0b8d4e82afcbb7c17f671bae81c.tar.bz2
- Add another parameter in notify() to be able to send timed text sample
through listener during video playback. - Add OnTimedTextListener in the MediaPlayer For feature request 800939. Change-Id: I65072c27acb4c0037109a72be38c73e9f667420f
Diffstat (limited to 'include/media/mediaplayer.h')
-rw-r--r--include/media/mediaplayer.h5
1 files changed, 3 insertions, 2 deletions
diff --git a/include/media/mediaplayer.h b/include/media/mediaplayer.h
index 528eeb9..748e489 100644
--- a/include/media/mediaplayer.h
+++ b/include/media/mediaplayer.h
@@ -37,6 +37,7 @@ enum media_event_type {
MEDIA_BUFFERING_UPDATE = 3,
MEDIA_SEEK_COMPLETE = 4,
MEDIA_SET_VIDEO_SIZE = 5,
+ MEDIA_TIMED_TEXT = 99,
MEDIA_ERROR = 100,
MEDIA_INFO = 200,
};
@@ -129,7 +130,7 @@ enum media_player_states {
class MediaPlayerListener: virtual public RefBase
{
public:
- virtual void notify(int msg, int ext1, int ext2) = 0;
+ virtual void notify(int msg, int ext1, int ext2, const Parcel *obj) = 0;
};
class MediaPlayer : public BnMediaPlayerClient,
@@ -166,7 +167,7 @@ public:
status_t setLooping(int loop);
bool isLooping();
status_t setVolume(float leftVolume, float rightVolume);
- void notify(int msg, int ext1, int ext2);
+ void notify(int msg, int ext1, int ext2, const Parcel *obj = NULL);
static sp<IMemory> decode(const char* url, uint32_t *pSampleRate, int* pNumChannels, int* pFormat);
static sp<IMemory> decode(int fd, int64_t offset, int64_t length, uint32_t *pSampleRate, int* pNumChannels, int* pFormat);
status_t invoke(const Parcel& request, Parcel *reply);