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 <nisse@webrtc.org>
Reviewed-by: Mirko Bonadei <mbonadei@webrtc.org>
Reviewed-by: Niels Moller <nisse@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#33246}

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",

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;

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;

media/engine/constants.cc

@@ -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

media/engine/constants.h

@@ -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_

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"
 

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"

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"