diff options
author | Glenn Kasten <gkasten@google.com> | 2011-07-27 14:45:28 -0700 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-07-27 14:45:28 -0700 |
commit | 43a5d6e541fef5983e967d9b67792c0a088418ea (patch) | |
tree | aa14971b2431d0c07b150825e22c4f9e471cdf40 /include | |
parent | f92fbc5daf6a4446054205ee2d829ea157afa2b7 (diff) | |
parent | 6ff9b812abe388478bbaba118a580c3f4a30c863 (diff) | |
download | frameworks_base-43a5d6e541fef5983e967d9b67792c0a088418ea.zip frameworks_base-43a5d6e541fef5983e967d9b67792c0a088418ea.tar.gz frameworks_base-43a5d6e541fef5983e967d9b67792c0a088418ea.tar.bz2 |
Merge "Bug 4599730 Get audio channel count on MediaPlayer"
Diffstat (limited to 'include')
-rw-r--r-- | include/media/mediaplayer.h | 17 |
1 files changed, 13 insertions, 4 deletions
diff --git a/include/media/mediaplayer.h b/include/media/mediaplayer.h index 1136f6c..1a67671 100644 --- a/include/media/mediaplayer.h +++ b/include/media/mediaplayer.h @@ -130,13 +130,22 @@ enum media_player_states { MEDIA_PLAYER_PLAYBACK_COMPLETE = 1 << 7 }; -enum media_set_parameter_keys { - KEY_PARAMETER_TIMED_TEXT_TRACK_INDEX = 1000, - KEY_PARAMETER_TIMED_TEXT_ADD_OUT_OF_BAND_SOURCE = 1001, +// Keep KEY_PARAMETER_* in sync with MediaPlayer.java. +// The same enum space is used for both set and get, in case there are future keys that +// can be both set and get. But as of now, all parameters are either set only or get only. +enum media_parameter_keys { + KEY_PARAMETER_TIMED_TEXT_TRACK_INDEX = 1000, // set only + KEY_PARAMETER_TIMED_TEXT_ADD_OUT_OF_BAND_SOURCE = 1001, // set only // Streaming/buffering parameters - KEY_PARAMETER_CACHE_STAT_COLLECT_FREQ_MS = 1100, + KEY_PARAMETER_CACHE_STAT_COLLECT_FREQ_MS = 1100, // set only + + // Return a Parcel containing a single int, which is the channel count of the + // audio track, or zero for error (e.g. no audio track) or unknown. + KEY_PARAMETER_AUDIO_CHANNEL_COUNT = 1200, // get only + }; + // ---------------------------------------------------------------------------- // ref-counted object for callbacks class MediaPlayerListener: virtual public RefBase |