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 | 7a1e3e81264189e23a1db2b174e1b5a5d4c7d1c3 (patch) | |
| tree | d75e0a639df8f389786d9bdf6c6de1f22729b135 /include | |
| parent | 10d227074b5a67a2e738d72888ece4dd24537c66 (diff) | |
| download | frameworks_av-7a1e3e81264189e23a1db2b174e1b5a5d4c7d1c3.zip frameworks_av-7a1e3e81264189e23a1db2b174e1b5a5d4c7d1c3.tar.gz frameworks_av-7a1e3e81264189e23a1db2b174e1b5a5d4c7d1c3.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')
| -rw-r--r-- | include/media/mediametadataretriever.h | 1 | ||||
| -rw-r--r-- | include/media/mediaplayer.h | 3 | ||||
| -rw-r--r-- | include/media/stagefright/MediaDefs.h | 2 | ||||
| -rw-r--r-- | include/media/stagefright/MetaData.h | 3 |
4 files changed, 9 insertions, 0 deletions
diff --git a/include/media/mediametadataretriever.h b/include/media/mediametadataretriever.h index 3e343e0..28f305d 100644 --- a/include/media/mediametadataretriever.h +++ b/include/media/mediametadataretriever.h @@ -52,6 +52,7 @@ enum { METADATA_KEY_VIDEO_WIDTH = 18, METADATA_KEY_VIDEO_HEIGHT = 19, METADATA_KEY_BITRATE = 20, + METADATA_KEY_TIMED_TEXT_LANGUAGES = 21, // Add more here... }; diff --git a/include/media/mediaplayer.h b/include/media/mediaplayer.h index 241626c..cfa4cfd 100644 --- a/include/media/mediaplayer.h +++ b/include/media/mediaplayer.h @@ -125,6 +125,9 @@ enum media_player_states { MEDIA_PLAYER_PLAYBACK_COMPLETE = 1 << 7 }; +enum media_set_parameter_keys { + KEY_PARAMETER_TIMED_TEXT_TRACK_INDEX = 1000, +}; // ---------------------------------------------------------------------------- // ref-counted object for callbacks class MediaPlayerListener: virtual public RefBase 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 { |