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}
64 lines
2.2 KiB
C++
64 lines
2.2 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_FRAME_H_
|
|
#define WEBRTC_MODULES_DESKTOP_CAPTURE_WIN_DXGI_FRAME_H_
|
|
|
|
#include <memory>
|
|
#include <vector>
|
|
|
|
#include "webrtc/modules/desktop_capture/desktop_capturer.h"
|
|
#include "webrtc/modules/desktop_capture/desktop_capture_types.h"
|
|
#include "webrtc/modules/desktop_capture/desktop_geometry.h"
|
|
#include "webrtc/modules/desktop_capture/resolution_change_detector.h"
|
|
#include "webrtc/modules/desktop_capture/shared_desktop_frame.h"
|
|
#include "webrtc/modules/desktop_capture/shared_memory.h"
|
|
#include "webrtc/modules/desktop_capture/win/dxgi_context.h"
|
|
|
|
namespace webrtc {
|
|
|
|
class DxgiDuplicatorController;
|
|
|
|
// A pair of a SharedDesktopFrame and a DxgiDuplicatorController::Context for
|
|
// the client of DxgiDuplicatorController.
|
|
class DxgiFrame final {
|
|
public:
|
|
using Context = DxgiFrameContext;
|
|
|
|
// DxgiFrame does not take ownership of |factory|, consumers should ensure it
|
|
// outlives this instance. nullptr is acceptable.
|
|
explicit DxgiFrame(SharedMemoryFactory* factory);
|
|
~DxgiFrame();
|
|
|
|
// Should not be called if Prepare() is not executed or returns false.
|
|
SharedDesktopFrame* frame() const;
|
|
|
|
private:
|
|
// Allows DxgiDuplicatorController to access Prepare() and context() function
|
|
// as well as Context class.
|
|
friend class DxgiDuplicatorController;
|
|
|
|
// Prepares current instance with desktop size and source id.
|
|
bool Prepare(DesktopSize size, DesktopCapturer::SourceId source_id);
|
|
|
|
// Should not be called if Prepare() is not executed or returns false.
|
|
Context* context();
|
|
|
|
SharedMemoryFactory* const factory_;
|
|
ResolutionChangeDetector resolution_change_detector_;
|
|
DesktopCapturer::SourceId source_id_ = kFullDesktopScreenId;
|
|
std::unique_ptr<SharedDesktopFrame> frame_;
|
|
Context context_;
|
|
};
|
|
|
|
} // namespace webrtc
|
|
|
|
#endif // WEBRTC_MODULES_DESKTOP_CAPTURE_WIN_DXGI_FRAME_H_
|