diff options
Diffstat (limited to 'www/chromium/files/patch-content__renderer__media__webrtc_audio_capturer.cc')
| -rw-r--r-- | www/chromium/files/patch-content__renderer__media__webrtc_audio_capturer.cc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/www/chromium/files/patch-content__renderer__media__webrtc_audio_capturer.cc b/www/chromium/files/patch-content__renderer__media__webrtc_audio_capturer.cc index 896a67619025..3dc38f8e8291 100644 --- a/www/chromium/files/patch-content__renderer__media__webrtc_audio_capturer.cc +++ b/www/chromium/files/patch-content__renderer__media__webrtc_audio_capturer.cc @@ -1,5 +1,5 @@ ---- ./content/renderer/media/webrtc_audio_capturer.cc.orig 2014-08-12 21:01:18.000000000 +0200 -+++ ./content/renderer/media/webrtc_audio_capturer.cc 2014-08-13 09:56:57.000000000 +0200 +--- ./content/renderer/media/webrtc_audio_capturer.cc.orig 2014-08-20 21:02:43.000000000 +0200 ++++ ./content/renderer/media/webrtc_audio_capturer.cc 2014-08-22 15:06:26.000000000 +0200 @@ -31,9 +31,7 @@ // will fail if the user selects any rate outside these ranges. const int kValidInputRates[] = @@ -11,13 +11,13 @@ const int kValidInputRates[] = {48000, 44100}; #else const int kValidInputRates[] = {44100}; -@@ -452,8 +450,8 @@ +@@ -457,8 +455,8 @@ // CaptureCallback. #if defined(OS_WIN) || defined(OS_MACOSX) DCHECK_LE(volume, 1.0); --#elif defined(OS_LINUX) || defined(OS_OPENBSD) +-#elif (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_OPENBSD) - // We have a special situation on Linux where the microphone volume can be -+#elif defined(OS_POSIX) && !defined(OS_ANDROID) ++#elif defined(OS_POSIX) && !defined(OS_CHROMEOS) && !defined(OS_ANDROID) + // We have a special situation on POSIX where the microphone volume can be // "higher than maximum". The input volume slider in the sound preference // allows the user to set a scaling that is higher than 100%. It means that |