diff options
| author | Robert Shih <robertshih@google.com> | 2015-04-08 09:06:54 -0700 |
|---|---|---|
| committer | Robert Shih <robertshih@google.com> | 2015-04-16 19:01:15 -0700 |
| commit | 0852843d304006e3ab333081fddda13b07193de8 (patch) | |
| tree | f60be26aad988e89bc135a86f6e4ae8853c69a49 /include | |
| parent | 3d66eb4128aebef31bb0fa44c4d53d6122294a26 (diff) | |
| download | frameworks_av-0852843d304006e3ab333081fddda13b07193de8.zip frameworks_av-0852843d304006e3ab333081fddda13b07193de8.tar.gz frameworks_av-0852843d304006e3ab333081fddda13b07193de8.tar.bz2 | |
stagefright: initial timed id3 support in hls
Change-Id: I00a8a786b3f4b74742c34770edd94e937abe20a8
Diffstat (limited to 'include')
| -rw-r--r-- | include/media/mediaplayer.h | 2 | ||||
| -rw-r--r-- | include/media/stagefright/MediaDefs.h | 1 |
2 files changed, 3 insertions, 0 deletions
diff --git a/include/media/mediaplayer.h b/include/media/mediaplayer.h index 269a2d7..256fa9a 100644 --- a/include/media/mediaplayer.h +++ b/include/media/mediaplayer.h @@ -50,6 +50,7 @@ enum media_event_type { MEDIA_ERROR = 100, MEDIA_INFO = 200, MEDIA_SUBTITLE_DATA = 201, + MEDIA_META_DATA = 202, }; // Generic error codes for the media player framework. Errors are fatal, the @@ -183,6 +184,7 @@ enum media_track_type { MEDIA_TRACK_TYPE_AUDIO = 2, MEDIA_TRACK_TYPE_TIMEDTEXT = 3, MEDIA_TRACK_TYPE_SUBTITLE = 4, + MEDIA_TRACK_TYPE_METADATA = 5, }; // ---------------------------------------------------------------------------- diff --git a/include/media/stagefright/MediaDefs.h b/include/media/stagefright/MediaDefs.h index a0036e0..3b58122 100644 --- a/include/media/stagefright/MediaDefs.h +++ b/include/media/stagefright/MediaDefs.h @@ -64,6 +64,7 @@ extern const char *MEDIA_MIMETYPE_TEXT_3GPP; extern const char *MEDIA_MIMETYPE_TEXT_SUBRIP; extern const char *MEDIA_MIMETYPE_TEXT_VTT; extern const char *MEDIA_MIMETYPE_TEXT_CEA_608; +extern const char *MEDIA_MIMETYPE_DATA_METADATA; } // namespace android |