cf5753df77
The key change of this CL is to merge ScreenCapturerWinDirectx::frames_ and contexts_ into a new DxgiFrame class. So consumers of DxgiDuplicateController does not need to maintain two objects. DxgiDuplicateController::Duplicate*() functions are also updated to accept DxgiFrame parameter instead of SharedDesktopFrame + Context. The advantages of this change are, 1. Once the screen resolution changes or an existing monitor has been removed, DxgiFrame can automatically reset the frame without needing to return a capture failure. 2. Remove public APIs of DxgiDuplicatorController. Some public APIs are not needed anymore, i.e. consumers of DxgiDuplicatorController do not need to take care about these internal states anymore. It also helps to remove several lock acquiements. 3. Reduce the complexity of ScreenCapturerWinDirectx. But the disadvantage is, instead of a boolean value, DxgiDuplicateController::Duplicate*() now return an enumeration. Clients need to use the enumeration to decide whether the error can be recovered or not. This change also removes a duplicating logic in ScreenCapturerWinDirectx. i.e. ResolutionChangeDetector, DxgiDuplicateController now takes care of the screen resolution changes. I have verified the scenarios with and without SharedMemoryFactory, also the Desktop capture API example. So far no regression is detected. BUG=704205 Review-Url: https://codereview.webrtc.org/2788863006 Cr-Commit-Position: refs/heads/master@{#17795}
62 lines
2.0 KiB
C++
62 lines
2.0 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.
|
|
*/
|
|
|
|
#ifndef WEBRTC_MODULES_DESKTOP_CAPTURE_WIN_DXGI_CONTEXT_H_
|
|
#define WEBRTC_MODULES_DESKTOP_CAPTURE_WIN_DXGI_CONTEXT_H_
|
|
|
|
#include <vector>
|
|
#include "webrtc/modules/desktop_capture/desktop_region.h"
|
|
|
|
namespace webrtc {
|
|
|
|
// A DxgiOutputContext stores the status of a single DxgiFrame of
|
|
// DxgiOutputDuplicator.
|
|
struct DxgiOutputContext final {
|
|
// The updated region DxgiOutputDuplicator::DetectUpdatedRegion() output
|
|
// during last Duplicate() function call. It's always relative to the (0, 0).
|
|
DesktopRegion updated_region;
|
|
};
|
|
|
|
// A DxgiAdapterContext stores the status of a single DxgiFrame of
|
|
// DxgiAdapterDuplicator.
|
|
struct DxgiAdapterContext final {
|
|
DxgiAdapterContext();
|
|
DxgiAdapterContext(const DxgiAdapterContext& other);
|
|
~DxgiAdapterContext();
|
|
|
|
// Child DxgiOutputContext belongs to this AdapterContext.
|
|
std::vector<DxgiOutputContext> contexts;
|
|
};
|
|
|
|
// A DxgiFrameContext stores the status of a single DxgiFrame of
|
|
// DxgiDuplicatorController.
|
|
struct DxgiFrameContext final {
|
|
public:
|
|
DxgiFrameContext();
|
|
// Unregister this Context instance from DxgiDuplicatorController during
|
|
// destructing.
|
|
~DxgiFrameContext();
|
|
|
|
// Reset current Context, so it will be reinitialized next time.
|
|
void Reset();
|
|
|
|
// A Context will have an exactly same |controller_id| as
|
|
// DxgiDuplicatorController, to ensure it has been correctly setted up after
|
|
// each DxgiDuplicatorController::Initialize().
|
|
int controller_id = 0;
|
|
|
|
// Child DxgiAdapterContext belongs to this DxgiFrameContext.
|
|
std::vector<DxgiAdapterContext> contexts;
|
|
};
|
|
|
|
} // namespace webrtc
|
|
|
|
#endif // WEBRTC_MODULES_DESKTOP_CAPTURE_WIN_DXGI_CONTEXT_H_
|