diff options
author | Gloria Wang <gwang@google.com> | 2011-05-04 09:00:15 -0700 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-05-04 09:00:15 -0700 |
commit | 89dc0dffdcbf0999a854a9b1bbea8f56395cc209 (patch) | |
tree | 2c5fd3e04f8a4dc89a57967e0379e017cc45b81a /include | |
parent | 8ce2364512f7c32c824f5ec5719688830ba72427 (diff) | |
parent | 7a1e3e81264189e23a1db2b174e1b5a5d4c7d1c3 (diff) | |
download | frameworks_av-89dc0dffdcbf0999a854a9b1bbea8f56395cc209.zip frameworks_av-89dc0dffdcbf0999a854a9b1bbea8f56395cc209.tar.gz frameworks_av-89dc0dffdcbf0999a854a9b1bbea8f56395cc209.tar.bz2 |
Merge "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"
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 { |