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}
78 lines
2.2 KiB
C++
78 lines
2.2 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.
|
|
*/
|
|
|
|
#include "modules/desktop_capture/win/dxgi_frame.h"
|
|
|
|
#include <string.h>
|
|
|
|
#include <utility>
|
|
|
|
#include "modules/desktop_capture/desktop_frame.h"
|
|
#include "modules/desktop_capture/win/dxgi_duplicator_controller.h"
|
|
#include "rtc_base/checks.h"
|
|
#include "rtc_base/logging.h"
|
|
|
|
namespace webrtc {
|
|
|
|
DxgiFrame::DxgiFrame(SharedMemoryFactory* factory) : factory_(factory) {}
|
|
|
|
DxgiFrame::~DxgiFrame() = default;
|
|
|
|
bool DxgiFrame::Prepare(DesktopSize size, DesktopCapturer::SourceId source_id) {
|
|
if (source_id != source_id_) {
|
|
// Once the source has been changed, the entire source should be copied.
|
|
source_id_ = source_id;
|
|
context_.Reset();
|
|
}
|
|
|
|
if (resolution_tracker_.SetResolution(size)) {
|
|
// Once the output size changed, recreate the SharedDesktopFrame.
|
|
frame_.reset();
|
|
}
|
|
|
|
if (!frame_) {
|
|
std::unique_ptr<DesktopFrame> frame;
|
|
if (factory_) {
|
|
frame = SharedMemoryDesktopFrame::Create(size, factory_);
|
|
|
|
if (!frame) {
|
|
RTC_LOG(LS_WARNING) << "DxgiFrame cannot create a new DesktopFrame.";
|
|
return false;
|
|
}
|
|
|
|
// DirectX capturer won't paint each pixel in the frame due to its one
|
|
// capturer per monitor design. So once the new frame is created, we
|
|
// should clear it to avoid the legacy image to be remained on it. See
|
|
// http://crbug.com/708766.
|
|
RTC_DCHECK_EQ(frame->stride(),
|
|
frame->size().width() * DesktopFrame::kBytesPerPixel);
|
|
memset(frame->data(), 0, frame->stride() * frame->size().height());
|
|
} else {
|
|
frame.reset(new BasicDesktopFrame(size));
|
|
}
|
|
|
|
frame_ = SharedDesktopFrame::Wrap(std::move(frame));
|
|
}
|
|
|
|
return !!frame_;
|
|
}
|
|
|
|
SharedDesktopFrame* DxgiFrame::frame() const {
|
|
RTC_DCHECK(frame_);
|
|
return frame_.get();
|
|
}
|
|
|
|
DxgiFrame::Context* DxgiFrame::context() {
|
|
RTC_DCHECK(frame_);
|
|
return &context_;
|
|
}
|
|
|
|
} // namespace webrtc
|