From 2eecfc1f9a19819182c868f77b9479516661ac2d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niels=20M=C3=B6ller?= <nisse@webrtc.org>
Date: Tue, 10 Sep 2019 15:28:17 +0200
Subject: [PATCH] Trim dependencies in modules/video_coding/

And move jitter_buffer_common.h to the legacy build target.

Bug: None
Change-Id: I986649f2f0773cadfa7dd9c8b533af7ecf01f3a3
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/152382
Reviewed-by: Philip Eliasson <philipel@webrtc.org>
Commit-Queue: Niels Moller <nisse@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#29150}
---
 modules/video_coding/BUILD.gn               | 9 +--------
 modules/video_coding/frame_buffer.cc        | 1 -
 modules/video_coding/include/video_coding.h | 2 --
 modules/video_coding/jitter_buffer.cc       | 2 --
 modules/video_coding/session_info.cc        | 1 -
 5 files changed, 1 insertion(+), 14 deletions(-)

diff --git a/modules/video_coding/BUILD.gn b/modules/video_coding/BUILD.gn
index f525827cb1..f3d9c48fe9 100644
--- a/modules/video_coding/BUILD.gn
+++ b/modules/video_coding/BUILD.gn
@@ -108,7 +108,6 @@ rtc_static_library("video_coding") {
     "inter_frame_delay.cc",
     "inter_frame_delay.h",
     "internal_defines.h",
-    "jitter_buffer_common.h",
     "jitter_estimator.cc",
     "jitter_estimator.h",
     "loss_notification_controller.cc",
@@ -152,7 +151,6 @@ rtc_static_library("video_coding") {
     "../../common_video",
     "../../rtc_base",
     "../../rtc_base:checks",
-    "../../rtc_base:deprecation",
     "../../rtc_base:rtc_base_approved",
     "../../rtc_base:rtc_numerics",
     "../../rtc_base:rtc_task_queue",
@@ -166,7 +164,6 @@ rtc_static_library("video_coding") {
     "../../rtc_base/time:timestamp_extrapolator",
     "../../system_wrappers",
     "../rtp_rtcp:rtp_rtcp_format",
-    "../utility",
     "//third_party/abseil-cpp/absl/container:inlined_vector",
     "//third_party/abseil-cpp/absl/types:optional",
     "//third_party/abseil-cpp/absl/types:variant",
@@ -204,6 +201,7 @@ rtc_source_set("video_coding_legacy") {
     "include/video_coding.h",
     "jitter_buffer.cc",
     "jitter_buffer.h",
+    "jitter_buffer_common.h",
     "receiver.cc",
     "receiver.h",
     "session_info.cc",
@@ -220,7 +218,6 @@ rtc_source_set("video_coding_legacy") {
     ":video_coding",
     "..:module_api",
     "..:module_api_public",
-    "../../api:fec_controller_api",
     "../../api:rtp_headers",
     "../../api/video:encoded_image",
     "../../api/video:video_frame",
@@ -228,15 +225,11 @@ rtc_source_set("video_coding_legacy") {
     "../../api/video_codecs:video_codecs_api",
     "../../common_video",
     "../../rtc_base:checks",
-    "../../rtc_base:deprecation",
     "../../rtc_base:logging",
     "../../rtc_base:rtc_base_approved",
     "../../rtc_base/synchronization:sequence_checker",
-    "../../rtc_base/system:fallthrough",
     "../../system_wrappers",
     "../../system_wrappers:event_wrapper",
-    "../rtp_rtcp:rtp_rtcp_format",
-    "../rtp_rtcp:rtp_video_header",
     "../utility",
     "//third_party/abseil-cpp/absl/memory",
     "//third_party/abseil-cpp/absl/types:optional",
diff --git a/modules/video_coding/frame_buffer.cc b/modules/video_coding/frame_buffer.cc
index f5c5d3e634..937c9bedbe 100644
--- a/modules/video_coding/frame_buffer.cc
+++ b/modules/video_coding/frame_buffer.cc
@@ -15,7 +15,6 @@
 
 #include "api/video/encoded_image.h"
 #include "api/video/video_timing.h"
-#include "modules/rtp_rtcp/source/rtp_video_header.h"
 #include "modules/video_coding/include/video_codec_interface.h"
 #include "modules/video_coding/packet.h"
 #include "rtc_base/checks.h"
diff --git a/modules/video_coding/include/video_coding.h b/modules/video_coding/include/video_coding.h
index 38208aaa87..549f303181 100644
--- a/modules/video_coding/include/video_coding.h
+++ b/modules/video_coding/include/video_coding.h
@@ -11,13 +11,11 @@
 #ifndef MODULES_VIDEO_CODING_INCLUDE_VIDEO_CODING_H_
 #define MODULES_VIDEO_CODING_INCLUDE_VIDEO_CODING_H_
 
-#include "api/fec_controller.h"
 #include "api/video/video_frame.h"
 #include "api/video_codecs/video_codec.h"
 #include "modules/include/module.h"
 #include "modules/include/module_common_types.h"
 #include "modules/video_coding/include/video_coding_defines.h"
-#include "rtc_base/deprecation.h"
 
 namespace webrtc {
 
diff --git a/modules/video_coding/jitter_buffer.cc b/modules/video_coding/jitter_buffer.cc
index a63254d650..0873285f39 100644
--- a/modules/video_coding/jitter_buffer.cc
+++ b/modules/video_coding/jitter_buffer.cc
@@ -15,7 +15,6 @@
 #include <limits>
 #include <utility>
 
-#include "modules/rtp_rtcp/include/rtp_rtcp_defines.h"
 #include "modules/video_coding/frame_buffer.h"
 #include "modules/video_coding/include/video_coding.h"
 #include "modules/video_coding/inter_frame_delay.h"
@@ -25,7 +24,6 @@
 #include "modules/video_coding/packet.h"
 #include "rtc_base/checks.h"
 #include "rtc_base/logging.h"
-#include "rtc_base/system/fallthrough.h"
 #include "system_wrappers/include/clock.h"
 
 namespace webrtc {
diff --git a/modules/video_coding/session_info.cc b/modules/video_coding/session_info.cc
index 9cc1d4a835..e51d293607 100644
--- a/modules/video_coding/session_info.cc
+++ b/modules/video_coding/session_info.cc
@@ -18,7 +18,6 @@
 #include "absl/types/variant.h"
 #include "modules/include/module_common_types.h"
 #include "modules/include/module_common_types_public.h"
-#include "modules/rtp_rtcp/source/rtp_video_header.h"
 #include "modules/video_coding/codecs/interface/common_constants.h"
 #include "modules/video_coding/codecs/vp8/include/vp8_globals.h"
 #include "modules/video_coding/jitter_buffer_common.h"