diff options
| author | Chong Zhang <chz@google.com> | 2013-08-23 19:13:28 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-08-23 19:13:28 +0000 |
| commit | 2484040e0f413989e4edbe26ba3bf71122382af6 (patch) | |
| tree | 0a17a226282f38322b9761650a9536088096c657 /include | |
| parent | 62c1a46eec047eb5fbc4b90432ec1ce65b76fb75 (diff) | |
| parent | dcb89b3b505522efde173c105a851c412f947178 (diff) | |
| download | frameworks_av-2484040e0f413989e4edbe26ba3bf71122382af6.zip frameworks_av-2484040e0f413989e4edbe26ba3bf71122382af6.tar.gz frameworks_av-2484040e0f413989e4edbe26ba3bf71122382af6.tar.bz2 | |
Merge "MediaPlayer: add listener for raw track data" into klp-dev
Diffstat (limited to 'include')
| -rw-r--r-- | include/media/mediaplayer.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/media/mediaplayer.h b/include/media/mediaplayer.h index 1afd7f7..923c8b2 100644 --- a/include/media/mediaplayer.h +++ b/include/media/mediaplayer.h @@ -48,6 +48,7 @@ enum media_event_type { MEDIA_TIMED_TEXT = 99, MEDIA_ERROR = 100, MEDIA_INFO = 200, + MEDIA_SUBTITLE_DATA = 201, }; // Generic error codes for the media player framework. Errors are fatal, the @@ -176,6 +177,7 @@ enum media_track_type { MEDIA_TRACK_TYPE_VIDEO = 1, MEDIA_TRACK_TYPE_AUDIO = 2, MEDIA_TRACK_TYPE_TIMEDTEXT = 3, + MEDIA_TRACK_TYPE_SUBTITLE = 4, }; // ---------------------------------------------------------------------------- |