Move IncomingVideoStream closer to its only user.

Bug: webrtc:14507
Change-Id: Id0eb1eb76dba85dfc8831f7b021e19b6a7c9a885
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/277442
Commit-Queue: Rasmus Brandt <brandtr@webrtc.org>
Reviewed-by: Erik Språng <sprang@webrtc.org>
Cr-Commit-Position: refs/heads/main@{#38256}

common_video/BUILD.gn

@@ -28,17 +28,13 @@ rtc_library("common_video") {
     "h264/sps_vui_rewriter.cc",
     "h264/sps_vui_rewriter.h",
     "include/bitrate_adjuster.h",
-    "include/incoming_video_stream.h",
     "include/quality_limitation_reason.h",
     "include/video_frame_buffer.h",
     "include/video_frame_buffer_pool.h",
-    "incoming_video_stream.cc",
     "libyuv/include/webrtc_libyuv.h",
     "libyuv/webrtc_libyuv.cc",
     "video_frame_buffer.cc",
     "video_frame_buffer_pool.cc",
-    "video_render_frames.cc",
-    "video_render_frames.h",
   ]
 
   deps = [

video/BUILD.gn

@@ -162,6 +162,7 @@ rtc_library("video") {
     "../system_wrappers:metrics",
     "../video/config:encoder_config",
     "adaptation:video_adaptation",
+    "render:incoming_video_stream",
   ]
   absl_deps = [
     "//third_party/abseil-cpp/absl/algorithm:container",

video/render/BUILD.gn

@@ -0,0 +1,51 @@
+# Copyright (c) 2022 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")
+
+rtc_library("incoming_video_stream") {
+  visibility = [ "*" ]
+
+  sources = [
+    "incoming_video_stream.cc",
+    "incoming_video_stream.h",
+  ]
+
+  deps = [
+    ":video_render_frames",
+    "../../api:sequence_checker",
+    "../../api/task_queue:task_queue",
+    "../../api/units:time_delta",
+    "../../api/video:video_frame",
+    "../../rtc_base:checks",
+    "../../rtc_base:event_tracer",
+    "../../rtc_base:macromagic",
+    "../../rtc_base:race_checker",
+    "../../rtc_base:rtc_task_queue",
+  ]
+
+  absl_deps = [ "//third_party/abseil-cpp/absl/types:optional" ]
+}
+
+rtc_library("video_render_frames") {
+  visibility = [ ":*" ]  # Private.
+
+  sources = [
+    "video_render_frames.cc",
+    "video_render_frames.h",
+  ]
+
+  deps = [
+    "../../api/video:video_frame",
+    "../../rtc_base:checks",
+    "../../rtc_base:logging",
+    "../../rtc_base:timeutils",
+    "../../system_wrappers:metrics",
+  ]
+  absl_deps = [ "//third_party/abseil-cpp/absl/types:optional" ]
+}

video/render/incoming_video_stream.cc

@@ -8,16 +8,16 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "common_video/include/incoming_video_stream.h"
+#include "video/render/incoming_video_stream.h"
 
 #include <memory>
 #include <utility>
 
 #include "absl/types/optional.h"
 #include "api/units/time_delta.h"
-#include "common_video/video_render_frames.h"
 #include "rtc_base/checks.h"
 #include "rtc_base/trace_event.h"
+#include "video/render/video_render_frames.h"
 
 namespace webrtc {
 

video/render/incoming_video_stream.h

@@ -8,8 +8,8 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef COMMON_VIDEO_INCLUDE_INCOMING_VIDEO_STREAM_H_
-#define COMMON_VIDEO_INCLUDE_INCOMING_VIDEO_STREAM_H_
+#ifndef VIDEO_RENDER_INCOMING_VIDEO_STREAM_H_
+#define VIDEO_RENDER_INCOMING_VIDEO_STREAM_H_
 
 #include <stdint.h>
 
@@ -17,10 +17,10 @@
 #include "api/task_queue/task_queue_factory.h"
 #include "api/video/video_frame.h"
 #include "api/video/video_sink_interface.h"
-#include "common_video/video_render_frames.h"
 #include "rtc_base/race_checker.h"
 #include "rtc_base/task_queue.h"
 #include "rtc_base/thread_annotations.h"
+#include "video/render/video_render_frames.h"
 
 namespace webrtc {
 
@@ -45,4 +45,4 @@ class IncomingVideoStream : public rtc::VideoSinkInterface<VideoFrame> {
 
 }  // namespace webrtc
 
-#endif  // COMMON_VIDEO_INCLUDE_INCOMING_VIDEO_STREAM_H_
+#endif  // VIDEO_RENDER_INCOMING_VIDEO_STREAM_H_

video/render/video_render_frames.cc

@@ -8,7 +8,7 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "common_video/video_render_frames.h"
+#include "video/render/video_render_frames.h"
 
 #include <type_traits>
 #include <utility>

video/render/video_render_frames.h

@@ -8,8 +8,8 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef COMMON_VIDEO_VIDEO_RENDER_FRAMES_H_
-#define COMMON_VIDEO_VIDEO_RENDER_FRAMES_H_
+#ifndef VIDEO_RENDER_VIDEO_RENDER_FRAMES_H_
+#define VIDEO_RENDER_VIDEO_RENDER_FRAMES_H_
 
 #include <stddef.h>
 #include <stdint.h>
@@ -52,4 +52,4 @@ class VideoRenderFrames {
 
 }  // namespace webrtc
 
-#endif  // COMMON_VIDEO_VIDEO_RENDER_FRAMES_H_
+#endif  // VIDEO_RENDER_VIDEO_RENDER_FRAMES_H_

video/video_receive_stream2.cc

@@ -36,7 +36,6 @@
 #include "api/video_codecs/video_decoder_factory.h"
 #include "call/rtp_stream_receiver_controller_interface.h"
 #include "call/rtx_receive_stream.h"
-#include "common_video/include/incoming_video_stream.h"
 #include "modules/video_coding/include/video_codec_interface.h"
 #include "modules/video_coding/include/video_coding_defines.h"
 #include "modules/video_coding/include/video_error_codes.h"
@@ -54,6 +53,7 @@
 #include "video/call_stats2.h"
 #include "video/frame_dumping_decoder.h"
 #include "video/receive_statistics_proxy2.h"
+#include "video/render/incoming_video_stream.h"
 #include "video/task_queue_frame_decode_scheduler.h"
 
 namespace webrtc {