summaryrefslogtreecommitdiffstats
path: root/include/media
diff options
context:
space:
mode:
authorGloria Wang <gwang@google.com>2011-03-02 19:51:04 -0800
committerAndroid (Google) Code Review <android-gerrit@google.com>2011-03-02 19:51:04 -0800
commit396f6de6606e44bcbef9548d369e31945dfa46b1 (patch)
treea445656771a0679ed71938ff3bb9ffaad5475a61 /include/media
parent6c1bebe33e42e584951314116b7b370ebc32aa64 (diff)
parent9b3f1521b521fd7248632fed71a81423e479a523 (diff)
downloadframeworks_base-396f6de6606e44bcbef9548d369e31945dfa46b1.zip
frameworks_base-396f6de6606e44bcbef9548d369e31945dfa46b1.tar.gz
frameworks_base-396f6de6606e44bcbef9548d369e31945dfa46b1.tar.bz2
Merge "- To track the usage of all audio output devices - To track the currently used audio device - The devices are separated as speaker and other audio devices - Provide the collected data to battery application through pullBatteryData()"
Diffstat (limited to 'include/media')
-rw-r--r--include/media/IMediaPlayerService.h18
1 files changed, 13 insertions, 5 deletions
diff --git a/include/media/IMediaPlayerService.h b/include/media/IMediaPlayerService.h
index cce9129..7956788 100644
--- a/include/media/IMediaPlayerService.h
+++ b/include/media/IMediaPlayerService.h
@@ -55,17 +55,25 @@ public:
virtual sp<IMemory> decode(int fd, int64_t offset, int64_t length, uint32_t *pSampleRate, int* pNumChannels, int* pFormat) = 0;
virtual sp<IOMX> getOMX() = 0;
- // codecs usage tracking for the battery app
+ // codecs and audio devices usage tracking for the battery app
enum BatteryDataBits {
// tracking audio codec
- kBatteryDataTrackAudio = 1,
+ kBatteryDataTrackAudio = 0x1,
// tracking video codec
- kBatteryDataTrackVideo = 2,
+ kBatteryDataTrackVideo = 0x2,
// codec is started, otherwise codec is paused
- kBatteryDataCodecStarted = 4,
+ kBatteryDataCodecStarted = 0x4,
// tracking decoder (for media player),
// otherwise tracking encoder (for media recorder)
- kBatteryDataTrackDecoder = 8,
+ kBatteryDataTrackDecoder = 0x8,
+ // start to play an audio on an audio device
+ kBatteryDataAudioFlingerStart = 0x10,
+ // stop/pause the audio playback
+ kBatteryDataAudioFlingerStop = 0x20,
+ // audio is rounted to speaker
+ kBatteryDataSpeakerOn = 0x40,
+ // audio is rounted to devices other than speaker
+ kBatteryDataOtherAudioDeviceOn = 0x80,
};
virtual void addBatteryData(uint32_t params) = 0;