mirror of
https://github.com/mollyim/webrtc.git
synced 2025-05-13 05:40:42 +01:00
317a1f09ed
WebRTC is now using C++14 so there is no need to use the Abseil version of std::make_unique. This CL has been created with the following steps: git grep -l absl::make_unique | sort | uniq > /tmp/make_unique.txt git grep -l absl::WrapUnique | sort | uniq > /tmp/wrap_unique.txt git grep -l "#include <memory>" | sort | uniq > /tmp/memory.txt diff --new-line-format="" --unchanged-line-format="" \ /tmp/make_unique.txt /tmp/wrap_unique.txt | sort | \ uniq > /tmp/only_make_unique.txt diff --new-line-format="" --unchanged-line-format="" \ /tmp/only_make_unique.txt /tmp/memory.txt | \ xargs grep -l "absl/memory" > /tmp/add-memory.txt git grep -l "\babsl::make_unique\b" | \ xargs sed -i "s/\babsl::make_unique\b/std::make_unique/g" git checkout PRESUBMIT.py abseil-in-webrtc.md cat /tmp/add-memory.txt | \ xargs sed -i \ 's/#include "absl\/memory\/memory.h"/#include <memory>/g' git cl format # Manual fix order of the new inserted #include <memory> cat /tmp/only_make_unique | xargs grep -l "#include <memory>" | \ xargs sed -i '/#include "absl\/memory\/memory.h"/d' git ls-files | grep BUILD.gn | \ xargs sed -i '/\/\/third_party\/abseil-cpp\/absl\/memory/d' python tools_webrtc/gn_check_autofix.py \ -m tryserver.webrtc -b linux_rel # Repead the gn_check_autofix step for other platforms git ls-files | grep BUILD.gn | \ xargs sed -i 's/absl\/memory:memory/absl\/memory/g' git cl format Bug: webrtc:10945 Change-Id: I3fe28ea80f4dd3ba3cf28effd151d5e1f19aff89 Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/153221 Commit-Queue: Mirko Bonadei <mbonadei@webrtc.org> Reviewed-by: Alessio Bazzica <alessiob@webrtc.org> Reviewed-by: Karl Wiberg <kwiberg@webrtc.org> Cr-Commit-Position: refs/heads/master@{#29209}
116 lines
3.2 KiB
Text
116 lines
3.2 KiB
Text
# Copyright (c) 2017 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.
|
|
|
|
import("../../../webrtc.gni")
|
|
if (is_android) {
|
|
import("//build/config/android/config.gni")
|
|
import("//build/config/android/rules.gni")
|
|
}
|
|
|
|
rtc_static_library("audio_encoder_opus_config") {
|
|
visibility = [ "*" ]
|
|
sources = [
|
|
"audio_encoder_multi_channel_opus_config.cc",
|
|
"audio_encoder_multi_channel_opus_config.h",
|
|
"audio_encoder_opus_config.cc",
|
|
"audio_encoder_opus_config.h",
|
|
]
|
|
deps = [
|
|
"../../../rtc_base:rtc_base_approved",
|
|
"../../../rtc_base/system:rtc_export",
|
|
"//third_party/abseil-cpp/absl/types:optional",
|
|
]
|
|
defines = []
|
|
if (rtc_opus_variable_complexity) {
|
|
defines += [ "WEBRTC_OPUS_VARIABLE_COMPLEXITY=1" ]
|
|
} else {
|
|
defines += [ "WEBRTC_OPUS_VARIABLE_COMPLEXITY=0" ]
|
|
}
|
|
}
|
|
|
|
rtc_source_set("audio_decoder_opus_config") {
|
|
visibility = [ "*" ]
|
|
sources = [
|
|
"audio_decoder_multi_channel_opus_config.h",
|
|
]
|
|
}
|
|
|
|
rtc_source_set("audio_encoder_opus") {
|
|
visibility = [ "*" ]
|
|
poisonous = [ "audio_codecs" ]
|
|
public = [
|
|
"audio_encoder_opus.h",
|
|
]
|
|
sources = [
|
|
"audio_encoder_opus.cc",
|
|
]
|
|
deps = [
|
|
":audio_encoder_opus_config",
|
|
"..:audio_codecs_api",
|
|
"../../../modules/audio_coding:webrtc_opus",
|
|
"../../../rtc_base:rtc_base_approved",
|
|
"../../../rtc_base/system:rtc_export",
|
|
"//third_party/abseil-cpp/absl/strings",
|
|
"//third_party/abseil-cpp/absl/types:optional",
|
|
]
|
|
}
|
|
|
|
rtc_static_library("audio_decoder_opus") {
|
|
visibility = [ "*" ]
|
|
poisonous = [ "audio_codecs" ]
|
|
sources = [
|
|
"audio_decoder_opus.cc",
|
|
"audio_decoder_opus.h",
|
|
]
|
|
deps = [
|
|
"..:audio_codecs_api",
|
|
"../../../modules/audio_coding:webrtc_opus",
|
|
"../../../rtc_base:rtc_base_approved",
|
|
"../../../rtc_base/system:rtc_export",
|
|
"//third_party/abseil-cpp/absl/strings",
|
|
"//third_party/abseil-cpp/absl/types:optional",
|
|
]
|
|
}
|
|
|
|
rtc_source_set("audio_encoder_multiopus") {
|
|
visibility = [ "*" ]
|
|
poisonous = [ "audio_codecs" ]
|
|
public = [
|
|
"audio_encoder_multi_channel_opus.h",
|
|
]
|
|
sources = [
|
|
"audio_encoder_multi_channel_opus.cc",
|
|
]
|
|
deps = [
|
|
"..:audio_codecs_api",
|
|
"../../../modules/audio_coding:webrtc_multiopus",
|
|
"../../../rtc_base:rtc_base_approved",
|
|
"../../../rtc_base/system:rtc_export",
|
|
"../opus:audio_encoder_opus_config",
|
|
"//third_party/abseil-cpp/absl/types:optional",
|
|
]
|
|
}
|
|
|
|
rtc_static_library("audio_decoder_multiopus") {
|
|
visibility = [ "*" ]
|
|
poisonous = [ "audio_codecs" ]
|
|
sources = [
|
|
"audio_decoder_multi_channel_opus.cc",
|
|
"audio_decoder_multi_channel_opus.h",
|
|
]
|
|
deps = [
|
|
":audio_decoder_opus_config",
|
|
"..:audio_codecs_api",
|
|
"../../../modules/audio_coding:webrtc_multiopus",
|
|
"../../../rtc_base:rtc_base_approved",
|
|
"../../../rtc_base/system:rtc_export",
|
|
"//third_party/abseil-cpp/absl/memory",
|
|
"//third_party/abseil-cpp/absl/strings",
|
|
"//third_party/abseil-cpp/absl/types:optional",
|
|
]
|
|
}
|