summaryrefslogtreecommitdiffstats
path: root/services/audiopolicy
diff options
context:
space:
mode:
authorKarthik Reddy Katta <a_katta@codeaurora.org>2015-11-12 12:16:02 +0530
committerSteve Kondik <steve@cyngn.com>2015-12-07 22:21:17 -0800
commitc97328535b36bb30a6242f26e161722c1bbbc3d3 (patch)
tree0f1591e64012c3a024cb0dd6b8d1ddf2a97024af /services/audiopolicy
parent02d88d66c02982deec3aedee78c1f64352c539bc (diff)
downloadframeworks_av-c97328535b36bb30a6242f26e161722c1bbbc3d3.zip
frameworks_av-c97328535b36bb30a6242f26e161722c1bbbc3d3.tar.gz
frameworks_av-c97328535b36bb30a6242f26e161722c1bbbc3d3.tar.bz2
audiopolicy: Add voip flag to output flag list
Direct output is not selected for voip usecases as AUDIO_OUTPUT_FLAG_VOIP_RX is not added to sOutputFlagNameToEnumTable. Add this flag to output flags list. Change-Id: Ifccb78a7b8579da0a65eb3ea7347756c664246a8
Diffstat (limited to 'services/audiopolicy')
-rw-r--r--services/audiopolicy/common/managerdefinitions/include/ConfigParsingUtils.h1
-rw-r--r--services/audiopolicy/managerdefault/AudioPolicyManager.cpp3
2 files changed, 3 insertions, 1 deletions
diff --git a/services/audiopolicy/common/managerdefinitions/include/ConfigParsingUtils.h b/services/audiopolicy/common/managerdefinitions/include/ConfigParsingUtils.h
index 03b45c2..6f80435 100644
--- a/services/audiopolicy/common/managerdefinitions/include/ConfigParsingUtils.h
+++ b/services/audiopolicy/common/managerdefinitions/include/ConfigParsingUtils.h
@@ -169,6 +169,7 @@ const StringToEnum sOutputFlagNameToEnumTable[] = {
STRING_TO_ENUM(AUDIO_OUTPUT_FLAG_TTS),
STRING_TO_ENUM(AUDIO_OUTPUT_FLAG_RAW),
STRING_TO_ENUM(AUDIO_OUTPUT_FLAG_SYNC),
+ STRING_TO_ENUM(AUDIO_OUTPUT_FLAG_VOIP_RX),
};
const StringToEnum sInputFlagNameToEnumTable[] = {
diff --git a/services/audiopolicy/managerdefault/AudioPolicyManager.cpp b/services/audiopolicy/managerdefault/AudioPolicyManager.cpp
index 598edfc..50b5087 100644
--- a/services/audiopolicy/managerdefault/AudioPolicyManager.cpp
+++ b/services/audiopolicy/managerdefault/AudioPolicyManager.cpp
@@ -648,7 +648,8 @@ sp<IOProfile> AudioPolicyManager::getProfileForDirectOutput(
// only retain flags that will drive the direct output profile selection
// if explicitly requested
static const uint32_t kRelevantFlags =
- (AUDIO_OUTPUT_FLAG_HW_AV_SYNC | AUDIO_OUTPUT_FLAG_COMPRESS_OFFLOAD);
+ (AUDIO_OUTPUT_FLAG_HW_AV_SYNC | AUDIO_OUTPUT_FLAG_COMPRESS_OFFLOAD |
+ AUDIO_OUTPUT_FLAG_VOIP_RX);
flags =
(audio_output_flags_t)((flags & kRelevantFlags) | AUDIO_OUTPUT_FLAG_DIRECT);