Support bit-perfect PCM playback.
This is part of USB audio improvement. Bit-perfect PCM playback
indicates that the PCM data will be sent as is down to the audio HAL.
When the track is bit-perfect, there will not be volume control
applied in the audio mixer. Only effects without processing or hw
accelerated effects will be allowed to attach to bit-perfect tracks.
Bug: 239435816
Test: manually
Test: atest audiopolicy_tests
Change-Id: I0bad4d7d78d4eaf741754d01bc5422ba15374782
diff --git a/media/libaudioclient/AudioSystem.cpp b/media/libaudioclient/AudioSystem.cpp
index 7309cad..9cc0ce0 100644
--- a/media/libaudioclient/AudioSystem.cpp
+++ b/media/libaudioclient/AudioSystem.cpp
@@ -1021,7 +1021,8 @@
audio_port_handle_t* selectedDeviceId,
audio_port_handle_t* portId,
std::vector<audio_io_handle_t>* secondaryOutputs,
- bool *isSpatialized) {
+ bool *isSpatialized,
+ bool *isBitPerfect) {
if (attr == nullptr) {
ALOGE("%s NULL audio attributes", __func__);
return BAD_VALUE;
@@ -1084,6 +1085,7 @@
*secondaryOutputs = VALUE_OR_RETURN_STATUS(convertContainer<std::vector<audio_io_handle_t>>(
responseAidl.secondaryOutputs, aidl2legacy_int32_t_audio_io_handle_t));
*isSpatialized = responseAidl.isSpatialized;
+ *isBitPerfect = responseAidl.isBitPerfect;
return OK;
}
diff --git a/media/libaudioclient/PolicyAidlConversion.cpp b/media/libaudioclient/PolicyAidlConversion.cpp
index 3790000..60b08fa 100644
--- a/media/libaudioclient/PolicyAidlConversion.cpp
+++ b/media/libaudioclient/PolicyAidlConversion.cpp
@@ -477,6 +477,8 @@
switch (aidl) {
case media::AudioMixerBehavior::DEFAULT:
return AUDIO_MIXER_BEHAVIOR_DEFAULT;
+ case media::AudioMixerBehavior::BIT_PERFECT:
+ return AUDIO_MIXER_BEHAVIOR_BIT_PERFECT;
case media::AudioMixerBehavior::INVALID:
return AUDIO_MIXER_BEHAVIOR_INVALID;
}
@@ -487,6 +489,8 @@
switch (legacy) {
case AUDIO_MIXER_BEHAVIOR_DEFAULT:
return media::AudioMixerBehavior::DEFAULT;
+ case AUDIO_MIXER_BEHAVIOR_BIT_PERFECT:
+ return media::AudioMixerBehavior::BIT_PERFECT;
case AUDIO_MIXER_BEHAVIOR_INVALID:
return media::AudioMixerBehavior::INVALID;
}
diff --git a/media/libaudioclient/aidl/android/media/AudioMixerBehavior.aidl b/media/libaudioclient/aidl/android/media/AudioMixerBehavior.aidl
index 0c0c070..38f50d6 100644
--- a/media/libaudioclient/aidl/android/media/AudioMixerBehavior.aidl
+++ b/media/libaudioclient/aidl/android/media/AudioMixerBehavior.aidl
@@ -30,4 +30,8 @@
* different sources.
*/
DEFAULT = 0,
+ /**
+ * The audio data in the mixer will be bit-perfect as long as possible.
+ */
+ BIT_PERFECT = 1,
}
diff --git a/media/libaudioclient/aidl/android/media/GetOutputForAttrResponse.aidl b/media/libaudioclient/aidl/android/media/GetOutputForAttrResponse.aidl
index 5b25d79..385f787 100644
--- a/media/libaudioclient/aidl/android/media/GetOutputForAttrResponse.aidl
+++ b/media/libaudioclient/aidl/android/media/GetOutputForAttrResponse.aidl
@@ -36,4 +36,5 @@
boolean isSpatialized;
/** The suggested audio config if fails to get an output. **/
AudioConfigBase configBase;
+ boolean isBitPerfect;
}
diff --git a/media/libaudioclient/include/media/AudioSystem.h b/media/libaudioclient/include/media/AudioSystem.h
index 507802d..163adcb 100644
--- a/media/libaudioclient/include/media/AudioSystem.h
+++ b/media/libaudioclient/include/media/AudioSystem.h
@@ -300,6 +300,7 @@
* @param[out] portId the generated port id to identify the client
* @param[out] secondaryOutputs collection of io handle for secondary outputs
* @param[out] isSpatialized true if the playback will be spatialized
+ * @param[out] isBitPerfect true if the playback will be bit-perfect
* @return if the call is successful or not
*/
static status_t getOutputForAttr(audio_attributes_t *attr,
@@ -312,7 +313,8 @@
audio_port_handle_t *selectedDeviceId,
audio_port_handle_t *portId,
std::vector<audio_io_handle_t> *secondaryOutputs,
- bool *isSpatialized);
+ bool *isSpatialized,
+ bool *isBitPerfect);
static status_t startOutput(audio_port_handle_t portId);
static status_t stopOutput(audio_port_handle_t portId);
static void releaseOutput(audio_port_handle_t portId);