92fa17660f
The desktop_capture code logs failed HRESULTs in several places,
the problem is that it tries to use a wchar* (when a char*
is required) for the error message and doesn't display the HRESULT
in hex. This makes the error logging less useful than it could be.
Example failure: error 08406B28, with code -2005270488
In this CL, I add a simple utility function to convert a _com_error
object to a std::string whic can be logged. With this change the
output looks like this (linebreak added for CL description):
Failed to capture frame: HRESULT: 0x887A0026,
Message: 'The keyed mutex was abandoned.'
I also adjusted the formatting of a few logging statements to be
more consistent (adding '<<' operators mostly).
Bug: webrtc:12051
Change-Id: I3e88ff6f2ff079fbe210626e1e89b2b053a742a9
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/188522
Reviewed-by: Jamie Walch <jamiewalch@chromium.org>
Commit-Queue: Joe Downing <joedow@google.com>
Cr-Commit-Position: refs/heads/master@{#32417}
82 lines
2.2 KiB
C++
82 lines
2.2 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.
|
|
*/
|
|
|
|
#include "modules/desktop_capture/win/dxgi_texture.h"
|
|
|
|
#include <comdef.h>
|
|
#include <d3d11.h>
|
|
#include <wrl/client.h>
|
|
|
|
#include "modules/desktop_capture/desktop_region.h"
|
|
#include "modules/desktop_capture/win/desktop_capture_utils.h"
|
|
#include "rtc_base/checks.h"
|
|
#include "rtc_base/logging.h"
|
|
|
|
using Microsoft::WRL::ComPtr;
|
|
|
|
namespace webrtc {
|
|
|
|
namespace {
|
|
|
|
class DxgiDesktopFrame : public DesktopFrame {
|
|
public:
|
|
explicit DxgiDesktopFrame(const DxgiTexture& texture)
|
|
: DesktopFrame(texture.desktop_size(),
|
|
texture.pitch(),
|
|
texture.bits(),
|
|
nullptr) {}
|
|
|
|
~DxgiDesktopFrame() override = default;
|
|
};
|
|
|
|
} // namespace
|
|
|
|
DxgiTexture::DxgiTexture() = default;
|
|
DxgiTexture::~DxgiTexture() = default;
|
|
|
|
bool DxgiTexture::CopyFrom(const DXGI_OUTDUPL_FRAME_INFO& frame_info,
|
|
IDXGIResource* resource) {
|
|
RTC_DCHECK_GT(frame_info.AccumulatedFrames, 0);
|
|
RTC_DCHECK(resource);
|
|
ComPtr<ID3D11Texture2D> texture;
|
|
_com_error error = resource->QueryInterface(
|
|
__uuidof(ID3D11Texture2D),
|
|
reinterpret_cast<void**>(texture.GetAddressOf()));
|
|
if (error.Error() != S_OK || !texture) {
|
|
RTC_LOG(LS_ERROR) << "Failed to convert IDXGIResource to ID3D11Texture2D: "
|
|
<< desktop_capture::utils::ComErrorToString(error);
|
|
return false;
|
|
}
|
|
|
|
D3D11_TEXTURE2D_DESC desc = {0};
|
|
texture->GetDesc(&desc);
|
|
desktop_size_.set(desc.Width, desc.Height);
|
|
|
|
return CopyFromTexture(frame_info, texture.Get());
|
|
}
|
|
|
|
const DesktopFrame& DxgiTexture::AsDesktopFrame() {
|
|
if (!frame_) {
|
|
frame_.reset(new DxgiDesktopFrame(*this));
|
|
}
|
|
return *frame_;
|
|
}
|
|
|
|
bool DxgiTexture::Release() {
|
|
frame_.reset();
|
|
return DoRelease();
|
|
}
|
|
|
|
DXGI_MAPPED_RECT* DxgiTexture::rect() {
|
|
return &rect_;
|
|
}
|
|
|
|
} // namespace webrtc
|