hal: policy: fallback to deep buffer if stream is music
- in case of direct PCM, Direct flag is added explicitly which
is causing deep buffer flag not to be added for Music case.
- absence of deep buffer flag is causing low latency path to be
selected by default if direct pcm fails. Fastmixer path has
higher power footprint.
- to avoid low latency and allow stream music to use deep buffer path
check if direct flag is added explicitly, if so allow adding
deep buffer flag. This will allow selecting deep buffer output.
Change-Id: Icc1de9f4ac3ff7981d2325fbda4891d9b8476df7
diff --git a/policy_hal/AudioPolicyManager.cpp b/policy_hal/AudioPolicyManager.cpp
index 346a4a6..a030c83 100755
--- a/policy_hal/AudioPolicyManager.cpp
+++ b/policy_hal/AudioPolicyManager.cpp
@@ -1178,30 +1178,29 @@
flags = (audio_output_flags_t)(flags | AUDIO_OUTPUT_FLAG_DIRECT);
}
- // Do offload magic here
- if ((flags == AUDIO_OUTPUT_FLAG_NONE) && (stream == AUDIO_STREAM_MUSIC) &&
- (offloadInfo != NULL) &&
- ((offloadInfo->usage == AUDIO_USAGE_MEDIA ||
- (offloadInfo->usage == AUDIO_USAGE_GAME)))) {
- if ((flags & AUDIO_OUTPUT_FLAG_DIRECT) == 0) {
- ALOGD("AudioCustomHAL --> Force Direct Flag ..");
- flags = (audio_output_flags_t)(flags | AUDIO_OUTPUT_FLAG_DIRECT);
- }
- }
-
+ bool forced_deep = false;
// only allow deep buffering for music stream type
if (stream != AUDIO_STREAM_MUSIC) {
flags = (audio_output_flags_t)(flags &~AUDIO_OUTPUT_FLAG_DEEP_BUFFER);
} else if (/* stream == AUDIO_STREAM_MUSIC && */
flags == AUDIO_OUTPUT_FLAG_NONE &&
property_get_bool("audio.deep_buffer.media", false /* default_value */)) {
- flags = (audio_output_flags_t)AUDIO_OUTPUT_FLAG_DEEP_BUFFER;
+ flags = (audio_output_flags_t)(AUDIO_OUTPUT_FLAG_DEEP_BUFFER);
+ forced_deep = true;
}
if (stream == AUDIO_STREAM_TTS) {
flags = AUDIO_OUTPUT_FLAG_TTS;
}
+ // Do offload magic here
+ if (((flags == AUDIO_OUTPUT_FLAG_NONE) || forced_deep) &&
+ (stream == AUDIO_STREAM_MUSIC) && (offloadInfo != NULL) &&
+ ((offloadInfo->usage == AUDIO_USAGE_MEDIA) || (offloadInfo->usage == AUDIO_USAGE_GAME))) {
+ flags = (audio_output_flags_t)(flags | AUDIO_OUTPUT_FLAG_DIRECT);
+ ALOGD("AudioCustomHAL --> Force Direct Flag .. flag (0x%x)", flags);
+ }
+
sp<IOProfile> profile;
// skip direct output selection if the request can obviously be attached to a mixed output