diff options
author | Glenn Kasten <gkasten@google.com> | 2011-07-25 09:26:22 -0700 |
---|---|---|
committer | Glenn Kasten <gkasten@google.com> | 2011-07-27 10:21:09 -0700 |
commit | cd25fed09742235fac10953b9d4b77268c695063 (patch) | |
tree | 4495bebf5ca8342877e52b5b7db78a24e47db78e /include/media | |
parent | 7fc25dd82dec8474139315b8e905f103c13406f5 (diff) | |
download | frameworks_av-cd25fed09742235fac10953b9d4b77268c695063.zip frameworks_av-cd25fed09742235fac10953b9d4b77268c695063.tar.gz frameworks_av-cd25fed09742235fac10953b9d4b77268c695063.tar.bz2 |
Bug 4599730 Get audio channel count on MediaPlayer
Related changes:
- Fix bug in get/setParameter* to recycle Parcels when done with them.
Change-Id: Iaff05e91bbd99a14fccb79d816dd873359b6ae65
Diffstat (limited to 'include/media')
-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 |