diff options
| author | James Dong <jdong@google.com> | 2012-03-14 17:45:18 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-03-14 17:45:18 -0700 |
| commit | cbcd6e869dd41158076e742a31c1ee410fc0c713 (patch) | |
| tree | ca11dbcb2453661a440691a1e0e67e3cd1ddb92a /media/libstagefright/include | |
| parent | 213744c53992ba183809b30980f57d25dc8bd967 (diff) | |
| parent | f9d660a5e0196240add5daf0199f128d471e592c (diff) | |
| download | frameworks_av-cbcd6e869dd41158076e742a31c1ee410fc0c713.zip frameworks_av-cbcd6e869dd41158076e742a31c1ee410fc0c713.tar.gz frameworks_av-cbcd6e869dd41158076e742a31c1ee410fc0c713.tar.bz2 | |
Merge "Defines MediaPlayer APIs to support multiple audio/video/timedtext tracks."
Diffstat (limited to 'media/libstagefright/include')
| -rw-r--r-- | media/libstagefright/include/AwesomePlayer.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/media/libstagefright/include/AwesomePlayer.h b/media/libstagefright/include/AwesomePlayer.h index 4c7bfa6..06e9468 100644 --- a/media/libstagefright/include/AwesomePlayer.h +++ b/media/libstagefright/include/AwesomePlayer.h @@ -90,6 +90,7 @@ struct AwesomePlayer { status_t setParameter(int key, const Parcel &request); status_t getParameter(int key, Parcel *reply); + status_t invoke(const Parcel &request, Parcel *reply); status_t setCacheStatCollectFreq(const Parcel &request); status_t seekTo(int64_t timeUs); @@ -100,8 +101,6 @@ struct AwesomePlayer { void postAudioEOS(int64_t delayUs = 0ll); void postAudioSeekComplete(); - status_t setTimedTextTrackIndex(int32_t index); - status_t dump(int fd, const Vector<String16> &args) const; private: @@ -136,7 +135,7 @@ private: INCOGNITO = 0x8000, TEXT_RUNNING = 0x10000, - TEXTPLAYER_STARTED = 0x20000, + TEXTPLAYER_INITIALIZED = 0x20000, SLOW_DECODER_HACK = 0x40000, }; |