mirror of
https://github.com/mollyim/webrtc.git
synced 2025-05-13 05:40:42 +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}
56 lines
1.9 KiB
C++
56 lines
1.9 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.
|
||
*/
|
||
|
||
#ifndef RTC_BASE_WIN_SCOPED_COM_INITIALIZER_H_
|
||
#define RTC_BASE_WIN_SCOPED_COM_INITIALIZER_H_
|
||
|
||
#include <comdef.h>
|
||
|
||
namespace webrtc {
|
||
|
||
// Initializes COM in the constructor (STA or MTA), and uninitializes COM in the
|
||
// destructor. Taken from base::win::ScopedCOMInitializer.
|
||
//
|
||
// WARNING: This should only be used once per thread, ideally scoped to a
|
||
// similar lifetime as the thread itself. You should not be using this in
|
||
// random utility functions that make COM calls; instead ensure that these
|
||
// functions are running on a COM-supporting thread!
|
||
// See https://msdn.microsoft.com/en-us/library/ms809971.aspx for details.
|
||
class ScopedCOMInitializer {
|
||
public:
|
||
// Enum value provided to initialize the thread as an MTA instead of STA.
|
||
// There are two types of apartments, Single Threaded Apartments (STAs)
|
||
// and Multi Threaded Apartments (MTAs). Within a given process there can
|
||
// be multiple STA’s but there is only one MTA. STA is typically used by
|
||
// "GUI applications" and MTA by "worker threads" with no UI message loop.
|
||
enum SelectMTA { kMTA };
|
||
|
||
// Constructor for STA initialization.
|
||
ScopedCOMInitializer();
|
||
|
||
// Constructor for MTA initialization.
|
||
explicit ScopedCOMInitializer(SelectMTA mta);
|
||
|
||
~ScopedCOMInitializer();
|
||
|
||
ScopedCOMInitializer(const ScopedCOMInitializer&) = delete;
|
||
ScopedCOMInitializer& operator=(const ScopedCOMInitializer&) = delete;
|
||
|
||
bool Succeeded() { return SUCCEEDED(hr_); }
|
||
|
||
private:
|
||
void Initialize(COINIT init);
|
||
|
||
HRESULT hr_;
|
||
};
|
||
|
||
} // namespace webrtc
|
||
|
||
#endif // RTC_BASE_WIN_SCOPED_COM_INITIALIZER_H_
|