Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(302)

Side by Side Diff: content/renderer/media/webrtc_audio_device_impl.cc

Issue 9965076: Revert 130180 - Move media/audio files into media namespace (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "content/renderer/media/webrtc_audio_device_impl.h" 5 #include "content/renderer/media/webrtc_audio_device_impl.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/string_util.h" 8 #include "base/string_util.h"
9 #include "base/win/windows_version.h" 9 #include "base/win/windows_version.h"
10 #include "content/renderer/media/audio_hardware.h" 10 #include "content/renderer/media/audio_hardware.h"
11 #include "content/renderer/render_thread_impl.h" 11 #include "content/renderer/render_thread_impl.h"
12 #include "media/audio/audio_util.h" 12 #include "media/audio/audio_util.h"
13 13
14 using media::AudioParameters;
15
16 static const int64 kMillisecondsBetweenProcessCalls = 5000; 14 static const int64 kMillisecondsBetweenProcessCalls = 5000;
17 static const double kMaxVolumeLevel = 255.0; 15 static const double kMaxVolumeLevel = 255.0;
18 16
19 // Supported hardware sample rates for input and output sides. 17 // Supported hardware sample rates for input and output sides.
20 #if defined(OS_WIN) || defined(OS_MACOSX) 18 #if defined(OS_WIN) || defined(OS_MACOSX)
21 // media::GetAudioInput[Output]HardwareSampleRate() asks the audio layer 19 // media::GetAudioInput[Output]HardwareSampleRate() asks the audio layer
22 // for its current sample rate (set by the user) on Windows and Mac OS X. 20 // for its current sample rate (set by the user) on Windows and Mac OS X.
23 // The listed rates below adds restrictions and WebRtcAudioDeviceImpl::Init() 21 // The listed rates below adds restrictions and WebRtcAudioDeviceImpl::Init()
24 // will fail if the user selects any rate outside these ranges. 22 // will fail if the user selects any rate outside these ranges.
25 static int kValidInputRates[] = {96000, 48000, 44100, 32000, 16000}; 23 static int kValidInputRates[] = {96000, 48000, 44100, 32000, 16000};
(...skipping 1011 matching lines...) Expand 10 before | Expand all | Expand 10 after
1037 } 1035 }
1038 1036
1039 int32_t WebRtcAudioDeviceImpl::GetLoudspeakerStatus(bool* enabled) const { 1037 int32_t WebRtcAudioDeviceImpl::GetLoudspeakerStatus(bool* enabled) const {
1040 NOTIMPLEMENTED(); 1038 NOTIMPLEMENTED();
1041 return -1; 1039 return -1;
1042 } 1040 }
1043 1041
1044 void WebRtcAudioDeviceImpl::SetSessionId(int session_id) { 1042 void WebRtcAudioDeviceImpl::SetSessionId(int session_id) {
1045 session_id_ = session_id; 1043 session_id_ = session_id;
1046 } 1044 }
OLDNEW
« no previous file with comments | « content/renderer/media/webrtc_audio_device_impl.h ('k') | content/renderer/pepper/pepper_platform_audio_input_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698