Remove unused headers ScreenCaptureFrameQueue

I've added the proper headers to the only file in Chromium which includes screen_capture_frame_queue.h (see https://chromium-review.googlesource.com/c/chromium/src/+/3836317).

I've also built the remoting host and Chrome on Windows and Linux with this change and did not see any build errors.

The only build error I encountered was in shared_screencast_stream when building webrtc so I added the required header there.

Bug: webrtc:14378
Change-Id: Ie88e606dfa52f18514a87b87e5904424543d7df3
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/271922
Commit-Queue: Joe Downing <joedow@google.com>
Reviewed-by: Alexander Cooper <alcooper@chromium.org>
Cr-Commit-Position: refs/heads/main@{#37811}
This commit is contained in:
Joe Downing 2022-08-16 21:24:09 -07:00 committed by WebRTC LUCI CQ
parent 6df49b9d01
commit 88fa60357d
2 changed files with 3 additions and 7 deletions

View file

@ -22,6 +22,7 @@
#include "modules/desktop_capture/linux/wayland/egl_dmabuf.h"
#include "modules/desktop_capture/linux/wayland/screencast_stream_utils.h"
#include "modules/desktop_capture/screen_capture_frame_queue.h"
#include "modules/desktop_capture/shared_desktop_frame.h"
#include "rtc_base/checks.h"
#include "rtc_base/logging.h"
#include "rtc_base/sanitizer.h"

View file

@ -13,11 +13,6 @@
#include <memory>
// TODO(zijiehe): These headers are not used in this file, but to avoid build
// break in remoting/host. We should add headers in each individual files.
#include "modules/desktop_capture/desktop_frame.h" // Remove
#include "modules/desktop_capture/shared_desktop_frame.h" // Remove
namespace webrtc {
// Represents a queue of reusable video frames. Provides access to the 'current'
@ -36,7 +31,7 @@ namespace webrtc {
template <typename FrameType>
class ScreenCaptureFrameQueue {
public:
ScreenCaptureFrameQueue() : current_(0) {}
ScreenCaptureFrameQueue() = default;
~ScreenCaptureFrameQueue() = default;
ScreenCaptureFrameQueue(const ScreenCaptureFrameQueue&) = delete;
@ -69,7 +64,7 @@ class ScreenCaptureFrameQueue {
private:
// Index of the current frame.
int current_;
int current_ = 0;
static const int kQueueLength = 2;
std::unique_ptr<FrameType> frames_[kQueueLength];