Delete unused class CaptureResultDesktopCapturerWrapper
Class was introduced in 2017, see https://webrtc-review.googlesource.com/1420, but never taken into use. Bug: chromium:764258 Change-Id: I5f15f25a3c1a992f8c725b78891956e7275b0e4d Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/194320 Reviewed-by: Jamie Walch <jamiewalch@chromium.org> Commit-Queue: Niels Moller <nisse@webrtc.org> Cr-Commit-Position: refs/heads/master@{#32665}
This commit is contained in:
@ -284,8 +284,6 @@ rtc_library("desktop_capture_generic") {
|
||||
sources = [
|
||||
"blank_detector_desktop_capturer_wrapper.cc",
|
||||
"blank_detector_desktop_capturer_wrapper.h",
|
||||
"capture_result_desktop_capturer_wrapper.cc",
|
||||
"capture_result_desktop_capturer_wrapper.h",
|
||||
"cropped_desktop_frame.cc",
|
||||
"cropped_desktop_frame.h",
|
||||
"cropping_window_capturer.cc",
|
||||
|
@ -1,49 +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 "modules/desktop_capture/capture_result_desktop_capturer_wrapper.h"
|
||||
|
||||
#include <memory>
|
||||
#include <utility>
|
||||
|
||||
#include "rtc_base/checks.h"
|
||||
|
||||
namespace webrtc {
|
||||
|
||||
CaptureResultDesktopCapturerWrapper::CaptureResultDesktopCapturerWrapper(
|
||||
std::unique_ptr<DesktopCapturer> base_capturer,
|
||||
ResultObserver* observer)
|
||||
: DesktopCapturerWrapper(std::move(base_capturer)), observer_(observer) {
|
||||
RTC_DCHECK(observer_);
|
||||
}
|
||||
|
||||
CaptureResultDesktopCapturerWrapper::~CaptureResultDesktopCapturerWrapper() =
|
||||
default;
|
||||
|
||||
void CaptureResultDesktopCapturerWrapper::Start(Callback* callback) {
|
||||
if ((callback_ == nullptr) != (callback == nullptr)) {
|
||||
if (callback) {
|
||||
callback_ = callback;
|
||||
base_capturer_->Start(this);
|
||||
} else {
|
||||
base_capturer_->Start(nullptr);
|
||||
}
|
||||
}
|
||||
callback_ = callback;
|
||||
}
|
||||
|
||||
void CaptureResultDesktopCapturerWrapper::OnCaptureResult(
|
||||
Result result,
|
||||
std::unique_ptr<DesktopFrame> frame) {
|
||||
observer_->Observe(&result, &frame);
|
||||
callback_->OnCaptureResult(result, std::move(frame));
|
||||
}
|
||||
|
||||
} // namespace webrtc
|
@ -1,64 +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.
|
||||
*/
|
||||
|
||||
#ifndef MODULES_DESKTOP_CAPTURE_CAPTURE_RESULT_DESKTOP_CAPTURER_WRAPPER_H_
|
||||
#define MODULES_DESKTOP_CAPTURE_CAPTURE_RESULT_DESKTOP_CAPTURER_WRAPPER_H_
|
||||
|
||||
#include <memory>
|
||||
|
||||
#include "modules/desktop_capture/desktop_capturer.h"
|
||||
#include "modules/desktop_capture/desktop_capturer_wrapper.h"
|
||||
#include "modules/desktop_capture/desktop_frame.h"
|
||||
|
||||
namespace webrtc {
|
||||
|
||||
// A DesktopCapturerWrapper implementation to capture the result of
|
||||
// |base_capturer|. Derived classes are expected to provide a ResultObserver
|
||||
// implementation to observe the DesktopFrame returned by |base_capturer_|.
|
||||
class CaptureResultDesktopCapturerWrapper : public DesktopCapturerWrapper,
|
||||
public DesktopCapturer::Callback {
|
||||
public:
|
||||
using Callback = DesktopCapturer::Callback;
|
||||
|
||||
// Provides a way to let derived classes or clients to modify the result
|
||||
// returned by |base_capturer_|.
|
||||
class ResultObserver {
|
||||
public:
|
||||
ResultObserver();
|
||||
virtual ~ResultObserver();
|
||||
|
||||
virtual void Observe(Result* result,
|
||||
std::unique_ptr<DesktopFrame>* frame) = 0;
|
||||
};
|
||||
|
||||
// |observer| must outlive this instance and can be |this|. |observer| is
|
||||
// guaranteed to be executed only after the constructor and before the
|
||||
// destructor.
|
||||
CaptureResultDesktopCapturerWrapper(
|
||||
std::unique_ptr<DesktopCapturer> base_capturer,
|
||||
ResultObserver* observer);
|
||||
|
||||
~CaptureResultDesktopCapturerWrapper() override;
|
||||
|
||||
// DesktopCapturer implementations.
|
||||
void Start(Callback* callback) final;
|
||||
|
||||
private:
|
||||
// DesktopCapturer::Callback implementation.
|
||||
void OnCaptureResult(Result result,
|
||||
std::unique_ptr<DesktopFrame> frame) final;
|
||||
|
||||
ResultObserver* const observer_;
|
||||
Callback* callback_ = nullptr;
|
||||
};
|
||||
|
||||
} // namespace webrtc
|
||||
|
||||
#endif // MODULES_DESKTOP_CAPTURE_CAPTURE_RESULT_DESKTOP_CAPTURER_WRAPPER_H_
|
Reference in New Issue
Block a user