9a407346fd
This reverts commit e20fbb00d0e0219b710da24664e81a10b12c703a. Reason for revert: Breaks WebRTC roll to Chromium, see: https://chromium-review.googlesource.com/c/chromium/src/+/6218060 Example of error: https://ci.chromium.org/ui/p/chrome/builders/ci/win-arm64-rel-ready/51821/test-results?sortby=&groupby= Original change's description: > Get DeviceScaleFactor for the captured monitor/screen > > Accesses DeviceScaleFactor using the windows API > GetScaleFactorForMonitor and adds it to the DesktopFrame. In a follow-up > CL, this value is propagated to > DesktopCaptureDevice::Core::OnCaptureResult where it is added to the > frame metadata. > > In a follow-up CL, add RegisterScaleChangeEvent to get notified whenever > the device scale factor changes. > > Design doc: go/expose-captured-surface-resolution > > Bug: chromium:383946052 > Change-Id: I363af33c569419d95ddf31a0cc2f9cecf6fb0c7b > Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/374344 > Reviewed-by: Henrik Andreassson <henrika@webrtc.org> > Reviewed-by: Mark Foltz <mfoltz@chromium.org> > Commit-Queue: Palak Agarwal <agpalak@google.com> > Reviewed-by: Ilya Nikolaevskiy <ilnik@webrtc.org> > Cr-Commit-Position: refs/heads/main@{#43827} Bug: chromium:383946052 Change-Id: I3065b278939ca0e686ee6da0f0721082bc0c99e8 No-Presubmit: true No-Tree-Checks: true No-Try: true Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/375902 Owners-Override: Mirko Bonadei <mbonadei@webrtc.org> Bot-Commit: rubber-stamper@appspot.gserviceaccount.com <rubber-stamper@appspot.gserviceaccount.com> Commit-Queue: Mirko Bonadei <mbonadei@webrtc.org> Cr-Commit-Position: refs/heads/main@{#43829}
64 lines
2.1 KiB
C++
64 lines
2.1 KiB
C++
/*
|
|
* 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_WIN_DXGI_FRAME_H_
|
|
#define MODULES_DESKTOP_CAPTURE_WIN_DXGI_FRAME_H_
|
|
|
|
#include <memory>
|
|
#include <vector>
|
|
|
|
#include "modules/desktop_capture/desktop_capture_types.h"
|
|
#include "modules/desktop_capture/desktop_capturer.h"
|
|
#include "modules/desktop_capture/desktop_geometry.h"
|
|
#include "modules/desktop_capture/resolution_tracker.h"
|
|
#include "modules/desktop_capture/shared_desktop_frame.h"
|
|
#include "modules/desktop_capture/shared_memory.h"
|
|
#include "modules/desktop_capture/win/dxgi_context.h"
|
|
|
|
namespace webrtc {
|
|
|
|
class DxgiDuplicatorController;
|
|
|
|
// A pair of a SharedDesktopFrame and a DxgiDuplicatorController::Context for
|
|
// the client of DxgiDuplicatorController.
|
|
class DxgiFrame final {
|
|
public:
|
|
using Context = DxgiFrameContext;
|
|
|
|
// DxgiFrame does not take ownership of `factory`, consumers should ensure it
|
|
// outlives this instance. nullptr is acceptable.
|
|
explicit DxgiFrame(SharedMemoryFactory* factory);
|
|
~DxgiFrame();
|
|
|
|
// Should not be called if Prepare() is not executed or returns false.
|
|
SharedDesktopFrame* frame() const;
|
|
|
|
private:
|
|
// Allows DxgiDuplicatorController to access Prepare() and context() function
|
|
// as well as Context class.
|
|
friend class DxgiDuplicatorController;
|
|
|
|
// Prepares current instance with desktop size and source id.
|
|
bool Prepare(DesktopSize size, DesktopCapturer::SourceId source_id);
|
|
|
|
// Should not be called if Prepare() is not executed or returns false.
|
|
Context* context();
|
|
|
|
SharedMemoryFactory* const factory_;
|
|
ResolutionTracker resolution_tracker_;
|
|
DesktopCapturer::SourceId source_id_ = kFullDesktopScreenId;
|
|
std::unique_ptr<SharedDesktopFrame> frame_;
|
|
Context context_;
|
|
};
|
|
|
|
} // namespace webrtc
|
|
|
|
#endif // MODULES_DESKTOP_CAPTURE_WIN_DXGI_FRAME_H_
|