Merge "audio policy: fix HW A/V sync rerouting" into nyc-dev
am: a8d309d
* commit 'a8d309df2f603767c0f0ad9248aef47a5b6ed5b8':
audio policy: fix HW A/V sync rerouting
diff --git a/services/audiopolicy/managerdefault/AudioPolicyManager.cpp b/services/audiopolicy/managerdefault/AudioPolicyManager.cpp
index 1d7849c..b2b014a 100644
--- a/services/audiopolicy/managerdefault/AudioPolicyManager.cpp
+++ b/services/audiopolicy/managerdefault/AudioPolicyManager.cpp
@@ -954,6 +954,13 @@
}
non_direct_output:
+
+ // A request for HW A/V sync cannot fallback to a mixed output because time
+ // stamps are embedded in audio data
+ if ((flags & AUDIO_OUTPUT_FLAG_HW_AV_SYNC) != 0) {
+ return AUDIO_IO_HANDLE_NONE;
+ }
+
// ignoring channel mask due to downmix capability in mixer
// open a non direct output