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

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

Issue 1907973003: media: Move audio_parameters and audio_point to media/base/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 4 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
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 #include "content/renderer/media/media_stream_audio_processor_options.h" 5 #include "content/renderer/media/media_stream_audio_processor_options.h"
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8 #include <utility> 8 #include <utility>
9 9
10 #include "base/files/file_path.h" 10 #include "base/files/file_path.h"
11 #include "base/files/file_util.h" 11 #include "base/files/file_util.h"
12 #include "base/logging.h" 12 #include "base/logging.h"
13 #include "base/macros.h" 13 #include "base/macros.h"
14 #include "base/metrics/histogram.h" 14 #include "base/metrics/histogram.h"
15 #include "base/strings/string_number_conversions.h" 15 #include "base/strings/string_number_conversions.h"
16 #include "base/strings/string_split.h" 16 #include "base/strings/string_split.h"
17 #include "base/strings/string_util.h" 17 #include "base/strings/string_util.h"
18 #include "base/strings/utf_string_conversions.h" 18 #include "base/strings/utf_string_conversions.h"
19 #include "build/build_config.h" 19 #include "build/build_config.h"
20 #include "content/common/media/media_stream_options.h" 20 #include "content/common/media/media_stream_options.h"
21 #include "content/renderer/media/media_stream_constraints_util.h" 21 #include "content/renderer/media/media_stream_constraints_util.h"
22 #include "content/renderer/media/media_stream_source.h" 22 #include "content/renderer/media/media_stream_source.h"
23 #include "media/audio/audio_parameters.h" 23 #include "media/base/audio_parameters.h"
24 #include "third_party/webrtc/modules/audio_processing/include/audio_processing.h " 24 #include "third_party/webrtc/modules/audio_processing/include/audio_processing.h "
25 #include "third_party/webrtc/modules/audio_processing/typing_detection.h" 25 #include "third_party/webrtc/modules/audio_processing/typing_detection.h"
26 26
27 namespace content { 27 namespace content {
28 28
29 const char MediaAudioConstraints::kEchoCancellation[] = "echoCancellation"; 29 const char MediaAudioConstraints::kEchoCancellation[] = "echoCancellation";
30 const char MediaAudioConstraints::kGoogEchoCancellation[] = 30 const char MediaAudioConstraints::kGoogEchoCancellation[] =
31 "googEchoCancellation"; 31 "googEchoCancellation";
32 const char MediaAudioConstraints::kGoogExperimentalEchoCancellation[] = 32 const char MediaAudioConstraints::kGoogExperimentalEchoCancellation[] =
33 "googEchoCancellation2"; 33 "googEchoCancellation2";
(...skipping 439 matching lines...) Expand 10 before | Expand all | Expand 10 after
473 473
474 // Give preference to the audio constraint over the device-supplied mic 474 // Give preference to the audio constraint over the device-supplied mic
475 // positions. This is mainly for testing purposes. 475 // positions. This is mainly for testing purposes.
476 return WebrtcPointsFromMediaPoints( 476 return WebrtcPointsFromMediaPoints(
477 constraints_geometry.empty() 477 constraints_geometry.empty()
478 ? input_params.mic_positions 478 ? input_params.mic_positions
479 : media::ParsePointsFromString(constraints_geometry)); 479 : media::ParsePointsFromString(constraints_geometry));
480 } 480 }
481 481
482 } // namespace content 482 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698