diff options
| author | Ravishankar Sarawadi <crsaraw@codeaurora.org> | 2013-02-27 18:47:54 +0100 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@cyanogenmod.org> | 2013-03-04 23:35:32 -0800 |
| commit | 720055270a0412311d39ca77ff1c0e6d744d6b5e (patch) | |
| tree | b28146c1cb226734c35e14ce3c1225c486ee159c /include | |
| parent | ab5138fa0d9bf3c149e3b586d7640f0d2fb90685 (diff) | |
| download | frameworks_av-720055270a0412311d39ca77ff1c0e6d744d6b5e.zip frameworks_av-720055270a0412311d39ca77ff1c0e6d744d6b5e.tar.gz frameworks_av-720055270a0412311d39ca77ff1c0e6d744d6b5e.tar.bz2 | |
audio: Subsystem Restart changes
- Handle new ADSP status parameter
- media/libmedia: Add new ADSP status audio parameter
- framework/av: Add handling of new key-pair value in
Audio Flinger
- Handle Tunnel mode SubSys Restart
- framework/av: Post SSR event to Audio Flinger
- media/libmedia: Post SSR event to AudioTrack
- media/libmediaplayerservice: Post SSR event to
MediaPlayerService
- media/libstagefright: Post SSR event to TunnelPlayer
Change-Id: I8c8385af45be91caf7d7160ab2e0236d6591b159
Diffstat (limited to 'include')
| -rw-r--r-- | include/media/AudioParameter.h | 3 | ||||
| -rw-r--r-- | include/media/AudioTrack.h | 4 |
2 files changed, 5 insertions, 2 deletions
diff --git a/include/media/AudioParameter.h b/include/media/AudioParameter.h index d29c699..2476e66 100644 --- a/include/media/AudioParameter.h +++ b/include/media/AudioParameter.h @@ -1,6 +1,6 @@ /* * Copyright (C) 2008-2011 The Android Open Source Project - * Copyright (c) 2012, The Linux Foundation. All rights reserved. + * Copyright (c) 2012-2013, The Linux Foundation. All rights reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -55,6 +55,7 @@ public: static const char * const keyFluenceType; static const char * const keySSR; static const char * const keyHandleA2dpDevice; + static const char * const keyADSPStatus; #endif String8 toString(); diff --git a/include/media/AudioTrack.h b/include/media/AudioTrack.h index 77a0b26..108f1a7 100644 --- a/include/media/AudioTrack.h +++ b/include/media/AudioTrack.h @@ -1,5 +1,6 @@ /* * Copyright (C) 2007 The Android Open Source Project + * Copyright (c) 2013, The Linux Foundation. All rights reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -64,7 +65,8 @@ public: EVENT_LOOP_END = 2, // Sample loop end was reached; playback restarted from loop start if loop count was not 0. EVENT_MARKER = 3, // Playback head is at the specified marker position (See setMarkerPosition()). EVENT_NEW_POS = 4, // Playback head is at a new position (See setPositionUpdatePeriod()). - EVENT_BUFFER_END = 5 // Playback head is at the end of the buffer. + EVENT_BUFFER_END = 5, // Playback head is at the end of the buffer. + EVENT_HW_FAIL = 6, // ADSP failure. }; /* Client should declare Buffer on the stack and pass address to obtainBuffer() |