e61fbfffda
To support rotation in DirectX capturer, several other changes are also required. 1. Removing AddRect in RotateDesktopFrame, this is a performance improvement. DxgiOutputDuplicator creates a rotated DesktopRegion, which can be directly add to updated_region. 2. DxgiOutputDuplicator::SourceRect() is not accurate, the rectangle in source is controlled by |offset| or |rotation_| + |offset|, instead of desktop_rect(). 3. The |region| in DxgiTexture::CopyFrom() is not accurate. It needs an unrotated DesktopRegion which offsets by |offset| instead of desktop_rect(). To avoid generating both rotated and unrotated updated_region, this parameter has been removed. This impacts DxgiTextureStagning performance a little bit (1.5ms). Refer to bug for details. BUG=webrtc:6646 Review-Url: https://codereview.webrtc.org/2530303002 Cr-Commit-Position: refs/heads/master@{#15308}
57 lines
1.8 KiB
C++
57 lines
1.8 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 "webrtc/modules/desktop_capture/win/dxgi_texture_mapping.h"
|
|
|
|
#include <comdef.h>
|
|
#include <DXGI.h>
|
|
#include <DXGI1_2.h>
|
|
|
|
#include "webrtc/base/checks.h"
|
|
#include "webrtc/system_wrappers/include/logging.h"
|
|
|
|
namespace webrtc {
|
|
|
|
DxgiTextureMapping::DxgiTextureMapping(const DesktopSize& desktop_size,
|
|
IDXGIOutputDuplication* duplication)
|
|
: DxgiTexture(desktop_size), duplication_(duplication) {
|
|
RTC_DCHECK(duplication_);
|
|
}
|
|
|
|
DxgiTextureMapping::~DxgiTextureMapping() = default;
|
|
|
|
bool DxgiTextureMapping::CopyFrom(const DXGI_OUTDUPL_FRAME_INFO& frame_info,
|
|
IDXGIResource* resource) {
|
|
RTC_DCHECK(resource && frame_info.AccumulatedFrames > 0);
|
|
rect_ = {0};
|
|
_com_error error = duplication_->MapDesktopSurface(&rect_);
|
|
if (error.Error() != S_OK) {
|
|
rect_ = {0};
|
|
LOG(LS_ERROR) << "Failed to map the IDXGIOutputDuplication to a bitmap, "
|
|
"error "
|
|
<< error.ErrorMessage() << ", code " << error.Error();
|
|
return false;
|
|
}
|
|
|
|
return true;
|
|
}
|
|
|
|
bool DxgiTextureMapping::DoRelease() {
|
|
_com_error error = duplication_->UnMapDesktopSurface();
|
|
if (error.Error() != S_OK) {
|
|
LOG(LS_ERROR) << "Failed to unmap the IDXGIOutputDuplication, error "
|
|
<< error.ErrorMessage() << ", code " << error.Error();
|
|
return false;
|
|
}
|
|
return true;
|
|
}
|
|
|
|
} // namespace webrtc
|