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

Side by Side Diff: content/renderer/media/media_stream_audio_processor_options.h

Issue 1615433002: Roll WebRTC 11523:11548, Libjingle 11522:11545 (Closed) Base URL: http://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rolling to webrtc@11548 instead to pull in a fix Created 4 years, 10 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
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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 #ifndef CONTENT_RENDERER_MEDIA_MEDIA_STREAM_AUDIO_PROCESSOR_OPTIONS_H_ 5 #ifndef CONTENT_RENDERER_MEDIA_MEDIA_STREAM_AUDIO_PROCESSOR_OPTIONS_H_
6 #define CONTENT_RENDERER_MEDIA_MEDIA_STREAM_AUDIO_PROCESSOR_OPTIONS_H_ 6 #define CONTENT_RENDERER_MEDIA_MEDIA_STREAM_AUDIO_PROCESSOR_OPTIONS_H_
7 7
8 #include <string> 8 #include <string>
9 9
10 #include "base/files/file.h" 10 #include "base/files/file.h"
11 #include "base/macros.h" 11 #include "base/macros.h"
12 #include "content/common/content_export.h" 12 #include "content/common/content_export.h"
13 #include "content/public/common/media_stream_request.h" 13 #include "content/public/common/media_stream_request.h"
14 #include "third_party/WebKit/public/platform/WebMediaConstraints.h" 14 #include "third_party/WebKit/public/platform/WebMediaConstraints.h"
15 #include "third_party/libjingle/source/talk/app/webrtc/mediastreaminterface.h" 15 #include "third_party/webrtc/api/mediastreaminterface.h"
16 #include "third_party/webrtc/modules/audio_processing/include/audio_processing.h " 16 #include "third_party/webrtc/modules/audio_processing/include/audio_processing.h "
17 17
18 namespace webrtc { 18 namespace webrtc {
19 19
20 class EchoCancellation; 20 class EchoCancellation;
21 class MediaConstraintsInterface; 21 class MediaConstraintsInterface;
22 class TypingDetection; 22 class TypingDetection;
23 23
24 } 24 }
25 25
(...skipping 116 matching lines...) Expand 10 before | Expand all | Expand 10 after
142 142
143 // Returns the array geometry from the media constraints if existing and 143 // Returns the array geometry from the media constraints if existing and
144 // otherwise that provided by the input device. 144 // otherwise that provided by the input device.
145 CONTENT_EXPORT std::vector<webrtc::Point> GetArrayGeometryPreferringConstraints( 145 CONTENT_EXPORT std::vector<webrtc::Point> GetArrayGeometryPreferringConstraints(
146 const MediaAudioConstraints& audio_constraints, 146 const MediaAudioConstraints& audio_constraints,
147 const MediaStreamDevice::AudioDeviceParameters& input_params); 147 const MediaStreamDevice::AudioDeviceParameters& input_params);
148 148
149 } // namespace content 149 } // namespace content
150 150
151 #endif // CONTENT_RENDERER_MEDIA_MEDIA_STREAM_AUDIO_PROCESSOR_OPTIONS_H_ 151 #endif // CONTENT_RENDERER_MEDIA_MEDIA_STREAM_AUDIO_PROCESSOR_OPTIONS_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698