diff options
author | Gloria Wang <gwang@google.com> | 2011-05-03 15:59:03 -0700 |
---|---|---|
committer | Gloria Wang <gwang@google.com> | 2011-05-03 16:41:17 -0700 |
commit | c6091ddd3a22da98b5e83d4b5d864939b451b752 (patch) | |
tree | 1971f9f15b8ea6ac1a46be791a6d3973729e4395 /include/media/stagefright | |
parent | 9d216f7b0ef66e4d2e32f86cd7e31608fcce49b6 (diff) | |
download | frameworks_base-c6091ddd3a22da98b5e83d4b5d864939b451b752.zip frameworks_base-c6091ddd3a22da98b5e83d4b5d864939b451b752.tar.gz frameworks_base-c6091ddd3a22da98b5e83d4b5d864939b451b752.tar.bz2 |
Initial CL for the timed text support:
- Add support for MP4 timed text
- Add API for app to turn on/off a text track
- Add timed text metadata(language) in the MediaMetadataRetriever
Change-Id: I0055beba38ac761627dbcc6d581ae9582d68bb94
Diffstat (limited to 'include/media/stagefright')
-rw-r--r-- | include/media/stagefright/MediaDefs.h | 2 | ||||
-rw-r--r-- | include/media/stagefright/MetaData.h | 3 |
2 files changed, 5 insertions, 0 deletions
diff --git a/include/media/stagefright/MediaDefs.h b/include/media/stagefright/MediaDefs.h index 6a21627..5e471c1 100644 --- a/include/media/stagefright/MediaDefs.h +++ b/include/media/stagefright/MediaDefs.h @@ -49,6 +49,8 @@ extern const char *MEDIA_MIMETYPE_CONTAINER_AVI; extern const char *MEDIA_MIMETYPE_CONTAINER_WVM; +extern const char *MEDIA_MIMETYPE_TEXT_3GPP; + } // namespace android #endif // MEDIA_DEFS_H_ diff --git a/include/media/stagefright/MetaData.h b/include/media/stagefright/MetaData.h index f7f2235..4044c5d 100644 --- a/include/media/stagefright/MetaData.h +++ b/include/media/stagefright/MetaData.h @@ -114,6 +114,9 @@ enum { // An indication that a video buffer has been rendered. kKeyRendered = 'rend', // bool (int32_t) + + // The language code for this media + kKeyMediaLanguage = 'lang', // cstring }; enum { |