diff options
| author | Andy Hung <hunga@google.com> | 2019-03-12 19:39:03 -0700 |
|---|---|---|
| committer | Andy Hung <hunga@google.com> | 2019-03-13 21:33:51 +0000 |
| commit | f963b2bfdaf406b42d371322402172b4380bbba5 (patch) | |
| tree | dee19fcce132fa8e36d3c64d2edd2397bb34fbc2 /services | |
| parent | c025be8ce5f1b34bdf293ac367685c969bd430ba (diff) | |
| download | frameworks_av-f963b2bfdaf406b42d371322402172b4380bbba5.tar.gz frameworks_av-f963b2bfdaf406b42d371322402172b4380bbba5.tar.bz2 frameworks_av-f963b2bfdaf406b42d371322402172b4380bbba5.zip | |
AudioFlinger: Prevent multiple effect chains with same sessionId
Allow at most one effect chain with same sessionId on mPlaybackThreads.
Test: poc, CTS effect tests
Bug: 123237974
Merged-In: Ide46cd23b0a9f4295f0dca2fea23379a76b836ee
Change-Id: Ide46cd23b0a9f4295f0dca2fea23379a76b836ee
(cherry picked from commit 1631f06feb36df5406ad00e850dcca9394f67772)
Diffstat (limited to 'services')
| -rw-r--r-- | services/audioflinger/AudioFlinger.cpp | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/services/audioflinger/AudioFlinger.cpp b/services/audioflinger/AudioFlinger.cpp index 153023e52f..f5c136052d 100644 --- a/services/audioflinger/AudioFlinger.cpp +++ b/services/audioflinger/AudioFlinger.cpp @@ -2751,6 +2751,21 @@ sp<IEffect> AudioFlinger::createEffect( io = mPlaybackThreads.keyAt(0); } ALOGV("createEffect() got io %d for effect %s", io, desc.name); + } else if (checkPlaybackThread_l(io) != nullptr) { + // allow only one effect chain per sessionId on mPlaybackThreads. + for (size_t i = 0; i < mPlaybackThreads.size(); i++) { + const audio_io_handle_t checkIo = mPlaybackThreads.keyAt(i); + if (io == checkIo) continue; + const uint32_t sessionType = + mPlaybackThreads.valueAt(i)->hasAudioSession(sessionId); + if ((sessionType & ThreadBase::EFFECT_SESSION) != 0) { + ALOGE("%s: effect %s io %d denied because session %d effect exists on io %d", + __func__, desc.name, (int)io, (int)sessionId, (int)checkIo); + android_errorWriteLog(0x534e4554, "123237974"); + lStatus = BAD_VALUE; + goto Exit; + } + } } ThreadBase *thread = checkRecordThread_l(io); if (thread == NULL) { |