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 /media/libmedia | |
| 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 'media/libmedia')
| -rw-r--r-- | media/libmedia/AudioParameter.cpp | 3 | ||||
| -rw-r--r-- | media/libmedia/AudioTrack.cpp | 6 |
2 files changed, 7 insertions, 2 deletions
diff --git a/media/libmedia/AudioParameter.cpp b/media/libmedia/AudioParameter.cpp index fbb34f4..367d9f6 100644 --- a/media/libmedia/AudioParameter.cpp +++ b/media/libmedia/AudioParameter.cpp @@ -1,6 +1,6 @@ /* * Copyright (C) 2006-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. @@ -39,6 +39,7 @@ const char * const AudioParameter::keyVoipCheck = AUDIO_PARAMETER_KEY_VOIP_CHECK const char * const AudioParameter::keyFluenceType = AUDIO_PARAMETER_KEY_FLUENCE_TYPE; const char * const AudioParameter::keySSR = AUDIO_PARAMETER_KEY_SSR; const char * const AudioParameter::keyHandleA2dpDevice = AUDIO_PARAMETER_KEY_HANDLE_A2DP_DEVICE; +const char * const AudioParameter::keyADSPStatus = AUDIO_PARAMETER_KEY_ADSP_STATUS; #endif AudioParameter::AudioParameter(const String8& keyValuePairs) diff --git a/media/libmedia/AudioTrack.cpp b/media/libmedia/AudioTrack.cpp index 36b1469..0d7d733 100644 --- a/media/libmedia/AudioTrack.cpp +++ b/media/libmedia/AudioTrack.cpp @@ -2,7 +2,7 @@ ** ** Copyright 2007, The Android Open Source Project ** -** Copyright (c) 2012, The Linux Foundation. All rights reserved. +** Copyright (c) 2012-2013, The Linux Foundation. All rights reserved. ** Not a Contribution, Apache license notifications and license are retained ** for attribution purposes only. @@ -1620,6 +1620,10 @@ void AudioTrack::notify(int msg) { ALOGV("Posting event underrun to Audio Sink."); mCbf(EVENT_UNDERRUN, mUserData, 0); } + if (msg == EVENT_HW_FAIL) { + ALOGV("Posting event HW fail to Audio Sink."); + mCbf(EVENT_HW_FAIL, mUserData, 0); + } } status_t AudioTrack::getTimeStamp(uint64_t *tstamp) { |