Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

audiopolicy: get rid of hardcoded attributes <--> stream types

Browse Source 
Linked to CL in frameworks/av:
"audio policy service: Add introspection API to retrieve AudioProductStrategies"

Test: CTS: AudioTrackTest AudioRecordTest
Test: audio smoke test on sailfish, walleye blueline

Change-Id: I14515704bf8de76815f0d9ad7ed4b46f42a441b0
Signed-off-by: François Gaffie <francois.gaffie@renault.com>
This commit is contained in:
François Gaffie
2018-07-30 09:33:05 +02:00
committed by Eric Laurent
parent c511faec51
commit 713f0e4a63
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
core/jni/Android.bp
View File

@@ -276,6 +276,7 @@ cc_library_shared {
"libmediametrics",
"libmeminfo",
"libaudioclient",
"libaudiopolicy",
"libjpeg",
"libusbhost",
"libharfbuzz_ng",

4
media/jni/soundpool/SoundPool.cpp
View File

@@ -26,7 +26,6 @@
#include <media/AudioTrack.h>
#include "SoundPool.h"
#include "SoundPoolThread.h"
#include <media/AudioPolicyHelper.h>
#include <media/NdkMediaCodec.h>
#include <media/NdkMediaExtractor.h>
#include <media/NdkMediaFormat.h>
@@ -746,7 +745,8 @@ void SoundChannel::play(const sp<Sample>& sample, int nextChannelID, float leftV
// initialize track
size_t afFrameCount;
uint32_t afSampleRate;
audio_stream_type_t streamType = audio_attributes_to_stream_type(mSoundPool->attributes());
audio_stream_type_t streamType =
AudioSystem::attributesToStreamType(*mSoundPool->attributes());
if (AudioSystem::getOutputFrameCount(&afFrameCount, streamType) != NO_ERROR) {
afFrameCount = kDefaultFrameCount;
}