2018-09-21 00:30:26 +00:00
|
|
|
From 2a1f4c039a4522620daea2898870c220318d539a Mon Sep 17 00:00:00 2001
|
|
|
|
From: Jeremy Apthorp <nornagon@nornagon.net>
|
|
|
|
Date: Thu, 20 Sep 2018 17:49:31 -0700
|
|
|
|
Subject: mas-audiodeviceduck.patch
|
|
|
|
|
|
|
|
Removes usage of the AudioDeviceDuck private API.
|
|
|
|
|
2018-09-14 05:02:16 +00:00
|
|
|
diff --git a/media/audio/mac/audio_low_latency_input_mac.cc b/media/audio/mac/audio_low_latency_input_mac.cc
|
2018-09-14 18:03:43 +00:00
|
|
|
index 53586b888d82..c1d750dbf32d 100644
|
2018-09-14 05:02:16 +00:00
|
|
|
--- a/media/audio/mac/audio_low_latency_input_mac.cc
|
|
|
|
+++ b/media/audio/mac/audio_low_latency_input_mac.cc
|
2018-09-14 18:03:43 +00:00
|
|
|
@@ -31,19 +31,23 @@
|
2018-09-14 05:02:16 +00:00
|
|
|
|
|
|
|
namespace {
|
|
|
|
extern "C" {
|
|
|
|
+#ifndef MAS_BUILD
|
|
|
|
// See:
|
|
|
|
// https://trac.webkit.org/browser/webkit/trunk/Source/WebCore/PAL/pal/spi/cf/CoreAudioSPI.h?rev=228264
|
|
|
|
OSStatus AudioDeviceDuck(AudioDeviceID inDevice,
|
|
|
|
Float32 inDuckedLevel,
|
|
|
|
const AudioTimeStamp* __nullable inStartTime,
|
|
|
|
Float32 inRampDuration) __attribute__((weak_import));
|
|
|
|
+#endif
|
|
|
|
}
|
|
|
|
|
2018-09-14 18:03:43 +00:00
|
|
|
void UndoDucking(AudioDeviceID output_device_id) {
|
2018-09-14 05:02:16 +00:00
|
|
|
+#ifndef MAS_BUILD
|
|
|
|
if (AudioDeviceDuck != nullptr) {
|
2018-09-14 18:03:43 +00:00
|
|
|
// Ramp the volume back up over half a second.
|
|
|
|
AudioDeviceDuck(output_device_id, 1.0, nullptr, 0.5);
|
2018-09-14 05:02:16 +00:00
|
|
|
}
|
|
|
|
+#endif
|
|
|
|
}
|
2018-09-14 18:03:43 +00:00
|
|
|
|
|
|
|
} // namespace
|
2018-09-14 05:02:16 +00:00
|
|
|
--
|
|
|
|
2.17.0
|
|
|
|
|