mirror of
https://github.com/mollyim/webrtc.git
synced 2025-05-17 23:57:59 +01:00
d19d0cf8ee
Relanding this after a build break in a downstream consumer caused a revert. I've removed the include of the windows.graphics.capture.interop header and instead replaced it with an include of windows.graphics.directx.direct3d11.h which is where the IDirect3DDevice data type that we need is declared. Before this was being included transitively through the WGC header, which was a mistake. Original change's description: Add ability to load CreateDirect3DDeviceFromDXGIDevice from d3d11.dll Creating a Direct3D11Device from a DXGIDevice is necessary for the new WGC based window capturer. However, the CreateDirect3DDeviceFromDXGIDevice API is not available on all versions of Windows, which means we have to load this function from d3d11.dll at runtime. You can see how this function will be used in this CL: 196624: Finish implementing WGC Window Capturer and add unit tests. | https://webrtc-review.googlesource.com/c/src/+/196624 I also ensure we don't leak HSTRINGs in GetActivationFactory and fix up some includes in ScopedComInitializer. Bug: webrtc:9273 Change-Id: I56a5eef29815a09297bd2cdad4c5e4265dd7e27e Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/203200 Commit-Queue: Austin Orion <auorion@microsoft.com> Reviewed-by: Mirko Bonadei <mbonadei@webrtc.org> Cr-Commit-Position: refs/heads/master@{#33081}
57 lines
2.1 KiB
C++
57 lines
2.1 KiB
C++
/*
|
|
* Copyright (c) 2020 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 "rtc_base/win/scoped_com_initializer.h"
|
|
|
|
#include "rtc_base/checks.h"
|
|
#include "rtc_base/logging.h"
|
|
|
|
namespace webrtc {
|
|
|
|
ScopedCOMInitializer::ScopedCOMInitializer() {
|
|
RTC_DLOG(INFO) << "Single-Threaded Apartment (STA) COM thread";
|
|
Initialize(COINIT_APARTMENTTHREADED);
|
|
}
|
|
|
|
// Constructor for MTA initialization.
|
|
ScopedCOMInitializer::ScopedCOMInitializer(SelectMTA mta) {
|
|
RTC_DLOG(INFO) << "Multi-Threaded Apartment (MTA) COM thread";
|
|
Initialize(COINIT_MULTITHREADED);
|
|
}
|
|
|
|
ScopedCOMInitializer::~ScopedCOMInitializer() {
|
|
if (Succeeded()) {
|
|
CoUninitialize();
|
|
}
|
|
}
|
|
|
|
void ScopedCOMInitializer::Initialize(COINIT init) {
|
|
// Initializes the COM library for use by the calling thread, sets the
|
|
// thread's concurrency model, and creates a new apartment for the thread
|
|
// if one is required. CoInitializeEx must be called at least once, and is
|
|
// usually called only once, for each thread that uses the COM library.
|
|
hr_ = CoInitializeEx(NULL, init);
|
|
RTC_CHECK_NE(RPC_E_CHANGED_MODE, hr_)
|
|
<< "Invalid COM thread model change (MTA->STA)";
|
|
// Multiple calls to CoInitializeEx by the same thread are allowed as long
|
|
// as they pass the same concurrency flag, but subsequent valid calls
|
|
// return S_FALSE. To close the COM library gracefully on a thread, each
|
|
// successful call to CoInitializeEx, including any call that returns
|
|
// S_FALSE, must be balanced by a corresponding call to CoUninitialize.
|
|
if (hr_ == S_OK) {
|
|
RTC_DLOG(INFO)
|
|
<< "The COM library was initialized successfully on this thread";
|
|
} else if (hr_ == S_FALSE) {
|
|
RTC_DLOG(WARNING)
|
|
<< "The COM library is already initialized on this thread";
|
|
}
|
|
}
|
|
|
|
} // namespace webrtc
|