From e71b55fb276a95589e1729930a45c3bf869871ae Mon Sep 17 00:00:00 2001 From: Philipp Hancke Date: Sat, 6 Feb 2021 11:33:28 +0100 Subject: [PATCH] build: merge media_constants and engine_constants no functional changes BUG=None Change-Id: I994cf7de6fdbf5505ed3359e08700cac5ea9fe3f Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/202022 Commit-Queue: Niels Moller Reviewed-by: Mirko Bonadei Reviewed-by: Niels Moller Cr-Commit-Position: refs/heads/master@{#33246} --- media/BUILD.gn | 13 ------------ media/base/media_constants.cc | 4 ++++ media/base/media_constants.h | 4 ++++ media/engine/constants.cc | 19 ----------------- media/engine/constants.h | 22 -------------------- media/engine/simulcast_unittest.cc | 1 - media/engine/webrtc_video_engine.h | 1 - media/engine/webrtc_video_engine_unittest.cc | 1 - 8 files changed, 8 insertions(+), 57 deletions(-) delete mode 100644 media/engine/constants.cc delete mode 100644 media/engine/constants.h diff --git a/media/BUILD.gn b/media/BUILD.gn index 8ac9f26f74..0ae8a6125a 100644 --- a/media/BUILD.gn +++ b/media/BUILD.gn @@ -161,16 +161,6 @@ rtc_library("rtc_media_base") { ] } -rtc_library("rtc_constants") { - defines = [] - libs = [] - deps = [] - sources = [ - "engine/constants.cc", - "engine/constants.h", - ] -} - rtc_library("rtc_simulcast_encoder_adapter") { visibility = [ "*" ] defines = [] @@ -232,7 +222,6 @@ rtc_library("rtc_internal_video_codecs") { defines = [] libs = [] deps = [ - ":rtc_constants", ":rtc_encoder_simulcast_proxy", ":rtc_h264_profile_id", ":rtc_media_base", @@ -281,7 +270,6 @@ rtc_library("rtc_audio_video") { defines = [] libs = [] deps = [ - ":rtc_constants", ":rtc_media_base", "../api:call_api", "../api:libjingle_peerconnection_api", @@ -548,7 +536,6 @@ if (rtc_include_tests) { defines = [] deps = [ ":rtc_audio_video", - ":rtc_constants", ":rtc_data", ":rtc_encoder_simulcast_proxy", ":rtc_internal_video_codecs", diff --git a/media/base/media_constants.cc b/media/base/media_constants.cc index fb34ea8851..d16196a11c 100644 --- a/media/base/media_constants.cc +++ b/media/base/media_constants.cc @@ -16,6 +16,10 @@ const int kVideoCodecClockrate = 90000; const int kDataCodecClockrate = 90000; const int kRtpDataMaxBandwidth = 30720; // bps +const int kVideoMtu = 1200; +const int kVideoRtpSendBufferSize = 65536; +const int kVideoRtpRecvBufferSize = 262144; + const float kHighSystemCpuThreshold = 0.85f; const float kLowSystemCpuThreshold = 0.65f; const float kProcessCpuThreshold = 0.10f; diff --git a/media/base/media_constants.h b/media/base/media_constants.h index 6907172df2..90fb424d10 100644 --- a/media/base/media_constants.h +++ b/media/base/media_constants.h @@ -23,6 +23,10 @@ extern const int kVideoCodecClockrate; extern const int kDataCodecClockrate; extern const int kRtpDataMaxBandwidth; // bps +extern const int kVideoMtu; +extern const int kVideoRtpSendBufferSize; +extern const int kVideoRtpRecvBufferSize; + // Default CPU thresholds. extern const float kHighSystemCpuThreshold; extern const float kLowSystemCpuThreshold; diff --git a/media/engine/constants.cc b/media/engine/constants.cc deleted file mode 100644 index 12d6ddde5a..0000000000 --- a/media/engine/constants.cc +++ /dev/null @@ -1,19 +0,0 @@ -/* - * 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. - */ - -#include "media/engine/constants.h" - -namespace cricket { - -const int kVideoMtu = 1200; -const int kVideoRtpSendBufferSize = 65536; -const int kVideoRtpRecvBufferSize = 262144; - -} // namespace cricket diff --git a/media/engine/constants.h b/media/engine/constants.h deleted file mode 100644 index 9a421d9875..0000000000 --- a/media/engine/constants.h +++ /dev/null @@ -1,22 +0,0 @@ -/* - * Copyright (c) 2014 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. - */ - -#ifndef MEDIA_ENGINE_CONSTANTS_H_ -#define MEDIA_ENGINE_CONSTANTS_H_ - -namespace cricket { - -extern const int kVideoMtu; -extern const int kVideoRtpSendBufferSize; -extern const int kVideoRtpRecvBufferSize; - -} // namespace cricket - -#endif // MEDIA_ENGINE_CONSTANTS_H_ diff --git a/media/engine/simulcast_unittest.cc b/media/engine/simulcast_unittest.cc index 1635055286..98ee109d1a 100644 --- a/media/engine/simulcast_unittest.cc +++ b/media/engine/simulcast_unittest.cc @@ -12,7 +12,6 @@ #include "api/transport/field_trial_based_config.h" #include "media/base/media_constants.h" -#include "media/engine/constants.h" #include "test/field_trial.h" #include "test/gtest.h" diff --git a/media/engine/webrtc_video_engine.h b/media/engine/webrtc_video_engine.h index c4b5921ad7..5a3cd81c17 100644 --- a/media/engine/webrtc_video_engine.h +++ b/media/engine/webrtc_video_engine.h @@ -31,7 +31,6 @@ #include "call/video_receive_stream.h" #include "call/video_send_stream.h" #include "media/base/media_engine.h" -#include "media/engine/constants.h" #include "media/engine/unhandled_packets_buffer.h" #include "rtc_base/network_route.h" #include "rtc_base/synchronization/mutex.h" diff --git a/media/engine/webrtc_video_engine_unittest.cc b/media/engine/webrtc_video_engine_unittest.cc index 21d1160070..7a8c1de7f3 100644 --- a/media/engine/webrtc_video_engine_unittest.cc +++ b/media/engine/webrtc_video_engine_unittest.cc @@ -47,7 +47,6 @@ #include "media/base/media_constants.h" #include "media/base/rtp_utils.h" #include "media/base/test_utils.h" -#include "media/engine/constants.h" #include "media/engine/fake_webrtc_call.h" #include "media/engine/fake_webrtc_video_engine.h" #include "media/engine/simulcast.h"