ef77ef3573
This reverts commit d1208c26b1cdb536fdec942207033711101d5d26. Reason for revert: This cl causes the crashing issue as in chromium:916961 at starting desktop capture on Windows. Original change's description: > Desktop capturer: Add OnDisplayChanged callback > > This adds support for a new DesktopCapturer::Callback method > OnDisplayChanged that is sent at the start of a desktop capture > session and whenever the display geometry changes. > > This cl adds the basic structure to call this api at the start > of the capture session. Currently Windows only. > > A follow-up cl will add support to call this whenever the display > geometry changes. > > Bug: webrtc:10122, chromium:915411 > Change-Id: Ie7283be5992454180daab1a60f58a3b2efdfed56 > Reviewed-on: https://webrtc-review.googlesource.com/c/114020 > Commit-Queue: Gary Kacmarcik <garykac@chromium.org> > Reviewed-by: Brave Yao <braveyao@webrtc.org> > Cr-Commit-Position: refs/heads/master@{#26053} TBR=jamiewalch@chromium.org,braveyao@webrtc.org,braveyao@chromium.org,garykac@chromium.org # Not skipping CQ checks because original CL landed > 1 day ago. Bug: webrtc:10122, chromium:915411, chromium:916961 Change-Id: Id0471e01bb90bb5accdf58262ae2b130cf343ecd Reviewed-on: https://webrtc-review.googlesource.com/c/115433 Commit-Queue: Brave Yao <braveyao@webrtc.org> Reviewed-by: Brave Yao <braveyao@webrtc.org> Cr-Commit-Position: refs/heads/master@{#26095}
67 lines
2.6 KiB
C++
67 lines
2.6 KiB
C++
/*
|
|
* Copyright (c) 2016 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_DESKTOP_CAPTURER_DIFFER_WRAPPER_H_
|
|
#define MODULES_DESKTOP_CAPTURE_DESKTOP_CAPTURER_DIFFER_WRAPPER_H_
|
|
|
|
#include <memory>
|
|
|
|
#include "modules/desktop_capture/desktop_capture_types.h"
|
|
#include "modules/desktop_capture/desktop_capturer.h"
|
|
#include "modules/desktop_capture/desktop_frame.h"
|
|
#include "modules/desktop_capture/desktop_geometry.h"
|
|
#include "modules/desktop_capture/shared_desktop_frame.h"
|
|
#include "modules/desktop_capture/shared_memory.h"
|
|
|
|
namespace webrtc {
|
|
|
|
// DesktopCapturer wrapper that calculates updated_region() by comparing frames
|
|
// content. This class always expects the underlying DesktopCapturer
|
|
// implementation returns a superset of updated regions in DestkopFrame. If a
|
|
// DesktopCapturer implementation does not know the updated region, it should
|
|
// set updated_region() to full frame.
|
|
//
|
|
// This class marks entire frame as updated if the frame size or frame stride
|
|
// has been changed.
|
|
class DesktopCapturerDifferWrapper : public DesktopCapturer,
|
|
public DesktopCapturer::Callback {
|
|
public:
|
|
// Creates a DesktopCapturerDifferWrapper with a DesktopCapturer
|
|
// implementation, and takes its ownership.
|
|
explicit DesktopCapturerDifferWrapper(
|
|
std::unique_ptr<DesktopCapturer> base_capturer);
|
|
|
|
~DesktopCapturerDifferWrapper() override;
|
|
|
|
// DesktopCapturer interface.
|
|
void Start(DesktopCapturer::Callback* callback) override;
|
|
void SetSharedMemoryFactory(
|
|
std::unique_ptr<SharedMemoryFactory> shared_memory_factory) override;
|
|
void CaptureFrame() override;
|
|
void SetExcludedWindow(WindowId window) override;
|
|
bool GetSourceList(SourceList* screens) override;
|
|
bool SelectSource(SourceId id) override;
|
|
bool FocusOnSelectedSource() override;
|
|
bool IsOccluded(const DesktopVector& pos) override;
|
|
|
|
private:
|
|
// DesktopCapturer::Callback interface.
|
|
void OnCaptureResult(Result result,
|
|
std::unique_ptr<DesktopFrame> frame) override;
|
|
|
|
const std::unique_ptr<DesktopCapturer> base_capturer_;
|
|
DesktopCapturer::Callback* callback_;
|
|
std::unique_ptr<SharedDesktopFrame> last_frame_;
|
|
};
|
|
|
|
} // namespace webrtc
|
|
|
|
#endif // MODULES_DESKTOP_CAPTURE_DESKTOP_CAPTURER_DIFFER_WRAPPER_H_
|