From 239db68b17aff0280ac6c15720e5fb96de03bdfb Mon Sep 17 00:00:00 2001
From: Artem Titov <titovartem@webrtc.org>
Date: Thu, 13 Apr 2023 17:22:18 +0200
Subject: [PATCH] Fix frame_generator_capturer dependencies

Bug: b/272350185
Change-Id: If1e9c60f407b1c9ceb5ccf426653419dbbf96851
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/301261
Auto-Submit: Artem Titov <titovartem@webrtc.org>
Commit-Queue: Mirko Bonadei <mbonadei@webrtc.org>
Reviewed-by: Mirko Bonadei <mbonadei@webrtc.org>
Cr-Commit-Position: refs/heads/main@{#39855}
---
 test/BUILD.gn                    | 10 +++++++---
 test/frame_generator_capturer.cc | 18 ++++++++++++++----
 test/frame_generator_capturer.h  |  9 ++++++++-
 3 files changed, 29 insertions(+), 8 deletions(-)

diff --git a/test/BUILD.gn b/test/BUILD.gn
index 2ef7d6ac79..29c52afd70 100644
--- a/test/BUILD.gn
+++ b/test/BUILD.gn
@@ -158,19 +158,23 @@ rtc_library("frame_generator_capturer") {
   ]
   deps = [
     ":test_video_capturer",
-    "../api:create_frame_generator",
     "../api:frame_generator_api",
     "../api/task_queue",
+    "../api/units:time_delta",
     "../api/video:video_frame",
+    "../api/video:video_rtp_headers",
     "../rtc_base:checks",
     "../rtc_base:logging",
+    "../rtc_base:macromagic",
     "../rtc_base:rtc_task_queue",
-    "../rtc_base:timeutils",
     "../rtc_base/synchronization:mutex",
     "../rtc_base/task_utils:repeating_task",
     "../system_wrappers",
   ]
-  absl_deps = [ "//third_party/abseil-cpp/absl/strings" ]
+  absl_deps = [
+    "//third_party/abseil-cpp/absl/strings",
+    "//third_party/abseil-cpp/absl/types:optional",
+  ]
 }
 
 rtc_library("video_test_common") {
diff --git a/test/frame_generator_capturer.cc b/test/frame_generator_capturer.cc
index c47f88e21a..6ba0807a74 100644
--- a/test/frame_generator_capturer.cc
+++ b/test/frame_generator_capturer.cc
@@ -12,17 +12,27 @@
 
 #include <algorithm>
 #include <cmath>
-#include <limits>
+#include <cstddef>
 #include <memory>
 #include <utility>
-#include <vector>
 
-#include "api/test/create_frame_generator.h"
+#include "absl/types/optional.h"
+#include "api/task_queue/task_queue_base.h"
+#include "api/task_queue/task_queue_factory.h"
+#include "api/test/frame_generator_interface.h"
+#include "api/units/time_delta.h"
+#include "api/video/color_space.h"
+#include "api/video/video_frame.h"
+#include "api/video/video_rotation.h"
+#include "api/video/video_sink_interface.h"
+#include "api/video/video_source_interface.h"
 #include "rtc_base/checks.h"
 #include "rtc_base/logging.h"
+#include "rtc_base/synchronization/mutex.h"
 #include "rtc_base/task_queue.h"
-#include "rtc_base/time_utils.h"
+#include "rtc_base/task_utils/repeating_task.h"
 #include "system_wrappers/include/clock.h"
+#include "test/test_video_capturer.h"
 
 namespace webrtc {
 namespace test {
diff --git a/test/frame_generator_capturer.h b/test/frame_generator_capturer.h
index ff240cc0c5..b1fd7ebfc7 100644
--- a/test/frame_generator_capturer.h
+++ b/test/frame_generator_capturer.h
@@ -10,15 +10,22 @@
 #ifndef TEST_FRAME_GENERATOR_CAPTURER_H_
 #define TEST_FRAME_GENERATOR_CAPTURER_H_
 
+#include <cstddef>
+#include <cstdint>
 #include <memory>
-#include <string>
 
+#include "absl/types/optional.h"
 #include "api/task_queue/task_queue_factory.h"
 #include "api/test/frame_generator_interface.h"
+#include "api/video/color_space.h"
 #include "api/video/video_frame.h"
+#include "api/video/video_rotation.h"
+#include "api/video/video_sink_interface.h"
+#include "api/video/video_source_interface.h"
 #include "rtc_base/synchronization/mutex.h"
 #include "rtc_base/task_queue.h"
 #include "rtc_base/task_utils/repeating_task.h"
+#include "rtc_base/thread_annotations.h"
 #include "system_wrappers/include/clock.h"
 #include "test/test_video_capturer.h"