2018-06-08 16:10:03 +02:00
|
|
|
/*
|
|
|
|
|
* Copyright (c) 2018 The WebRTC project authors. All Rights Reserved.
|
|
|
|
|
*
|
|
|
|
|
* Use of this source code is governed by a BSD-style license
|
|
|
|
|
* that can be found in the LICENSE file in the root of the source
|
|
|
|
|
* tree. An additional intellectual property rights grant can be found
|
|
|
|
|
* in the file PATENTS. All contributing project authors may
|
|
|
|
|
* be found in the AUTHORS file in the root of the source tree.
|
|
|
|
|
*/
|
|
|
|
|
|
|
|
|
|
#include "modules/audio_device/include/audio_device_factory.h"
|
|
|
|
|
|
|
|
|
|
#if defined(WEBRTC_WIN)
|
|
|
|
|
#include "modules/audio_device/win/audio_device_module_win.h"
|
|
|
|
|
#include "modules/audio_device/win/core_audio_input_win.h"
|
|
|
|
|
#include "modules/audio_device/win/core_audio_output_win.h"
|
|
|
|
|
#include "modules/audio_device/win/core_audio_utility_win.h"
|
|
|
|
|
#endif
|
|
|
|
|
|
Use absl::make_unique and absl::WrapUnique directly
Instead of going through our wrappers in ptr_util.h.
This CL was generated by the following script:
git grep -l ptr_util | xargs perl -pi -e 's,#include "rtc_base/ptr_util.h",#include "absl/memory/memory.h",'
git grep -l MakeUnique | xargs perl -pi -e 's,\b(rtc::)?MakeUnique\b,absl::make_unique,g'
git grep -l WrapUnique | xargs perl -pi -e 's,\b(rtc::)?WrapUnique\b,absl::WrapUnique,g'
git checkout -- rtc_base/ptr_util{.h,_unittest.cc}
git cl format
Followed by manually adding dependencies on
//third_party/abseil-cpp/absl/memory until `gn check` stopped
complaining.
Bug: webrtc:9473
Change-Id: I89ccd363f070479b8c431eb2c3d404a46eaacc1c
Reviewed-on: https://webrtc-review.googlesource.com/86600
Commit-Queue: Karl Wiberg <kwiberg@webrtc.org>
Reviewed-by: Danil Chapovalov <danilchap@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#23850}
2018-07-05 11:40:33 +02:00
|
|
|
#include "absl/memory/memory.h"
|
2018-06-08 16:10:03 +02:00
|
|
|
#include "rtc_base/logging.h"
|
|
|
|
|
|
|
|
|
|
namespace webrtc {
|
|
|
|
|
|
|
|
|
|
rtc::scoped_refptr<AudioDeviceModule>
|
|
|
|
|
CreateWindowsCoreAudioAudioDeviceModule() {
|
2018-09-05 14:34:40 +02:00
|
|
|
RTC_DLOG(INFO) << __FUNCTION__;
|
|
|
|
|
return CreateWindowsCoreAudioAudioDeviceModuleForTest();
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
rtc::scoped_refptr<AudioDeviceModuleForTest>
|
|
|
|
|
CreateWindowsCoreAudioAudioDeviceModuleForTest() {
|
2018-06-08 16:10:03 +02:00
|
|
|
RTC_DLOG(INFO) << __FUNCTION__;
|
|
|
|
|
// Returns NULL if Core Audio is not supported or if COM has not been
|
|
|
|
|
// initialized correctly using webrtc_win::ScopedCOMInitializer.
|
|
|
|
|
if (!webrtc_win::core_audio_utility::IsSupported()) {
|
|
|
|
|
RTC_LOG(LS_ERROR)
|
|
|
|
|
<< "Unable to create ADM since Core Audio is not supported";
|
|
|
|
|
return nullptr;
|
|
|
|
|
}
|
|
|
|
|
return CreateWindowsCoreAudioAudioDeviceModuleFromInputAndOutput(
|
Use absl::make_unique and absl::WrapUnique directly
Instead of going through our wrappers in ptr_util.h.
This CL was generated by the following script:
git grep -l ptr_util | xargs perl -pi -e 's,#include "rtc_base/ptr_util.h",#include "absl/memory/memory.h",'
git grep -l MakeUnique | xargs perl -pi -e 's,\b(rtc::)?MakeUnique\b,absl::make_unique,g'
git grep -l WrapUnique | xargs perl -pi -e 's,\b(rtc::)?WrapUnique\b,absl::WrapUnique,g'
git checkout -- rtc_base/ptr_util{.h,_unittest.cc}
git cl format
Followed by manually adding dependencies on
//third_party/abseil-cpp/absl/memory until `gn check` stopped
complaining.
Bug: webrtc:9473
Change-Id: I89ccd363f070479b8c431eb2c3d404a46eaacc1c
Reviewed-on: https://webrtc-review.googlesource.com/86600
Commit-Queue: Karl Wiberg <kwiberg@webrtc.org>
Reviewed-by: Danil Chapovalov <danilchap@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#23850}
2018-07-05 11:40:33 +02:00
|
|
|
absl::make_unique<webrtc_win::CoreAudioInput>(),
|
|
|
|
|
absl::make_unique<webrtc_win::CoreAudioOutput>());
|
2018-06-08 16:10:03 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
} // namespace webrtc
|
