From b11fb25c1230b2ef1085b9c0aa0642d6494afa88 Mon Sep 17 00:00:00 2001 From: agouaillard Date: Fri, 3 Feb 2017 06:37:05 -0800 Subject: [PATCH] Protect APM in webkit builds. Update libwertc AudioRtpSender::SetAudioSend with WEBRTC_WEBKIT_BUILD This only introduces the WEBRTC_WEBKIT BUILD, inspired by WEBRTC_CHROMIUM_BUILD macro. It is only defined by Webkit libwebrtc build system. https://trac.webkit.org/changeset/210977 BUG=webrtc:7039 Review-Url: https://codereview.webrtc.org/2651273003 Cr-Commit-Position: refs/heads/master@{#16432} --- AUTHORS | 1 + webrtc/pc/rtpsender.cc | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/AUTHORS b/AUTHORS index e9437d07c1..1c23c3e5da 100644 --- a/AUTHORS +++ b/AUTHORS @@ -3,6 +3,7 @@ Adam Fedor Alexander Brauckmann +Alexandre Gouaillard Andrew MacDonald Anil Kumar Ben Strong diff --git a/webrtc/pc/rtpsender.cc b/webrtc/pc/rtpsender.cc index c8ac830bf3..5cf13d060d 100644 --- a/webrtc/pc/rtpsender.cc +++ b/webrtc/pc/rtpsender.cc @@ -249,7 +249,7 @@ void AudioRtpSender::SetAudioSend() { return; } cricket::AudioOptions options; -#if !defined(WEBRTC_CHROMIUM_BUILD) +#if !defined(WEBRTC_CHROMIUM_BUILD) && !defined(WEBRTC_WEBKIT_BUILD) // TODO(tommi): Remove this hack when we move CreateAudioSource out of // PeerConnection. This is a bit of a strange way to apply local audio // options since it is also applied to all streams/channels, local or remote.