admin/webrtc_m130
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ScreenCapturerWinDirectx should have two DxgiDuplicatorController::Context instances, each for one DesktopFrame. So both DesktopFrame instances can be correctly updated.

Browse Source 
I have verified this change on my laptop, which cannot reproduce the issue anymore.

BUG=704205

Review-Url: https://codereview.webrtc.org/2781253002
Cr-Commit-Position: refs/heads/master@{#17494}
This commit is contained in:
zijiehe 2017-03-31 14:13:40 -07:00 committed by Commit bot
parent 5f93709e7c
commit 8a8b238556
2 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
webrtc/modules/desktop_capture/win/screen_capturer_win_directx.cc
View File

@ -15,6 +15,7 @@
#include "webrtc/base/checks.h"
#include "webrtc/base/logging.h"
#include "webrtc/base/ptr_util.h"
#include "webrtc/base/timeutils.h"
#include "webrtc/modules/desktop_capture/desktop_frame.h"
#include "webrtc/modules/desktop_capture/win/screen_capture_utils.h"
@ -106,10 +107,15 @@ void ScreenCapturerWinDirectx::CaptureFrame() {
}
frames_.ReplaceCurrentFrame(SharedDesktopFrame::Wrap(std::move(new_frame)));
}
contexts_.MoveToNextFrame();
if (!contexts_.current_frame()) {
contexts_.ReplaceCurrentFrame(
rtc::MakeUnique<DxgiDuplicatorController::Context>());
}
if (current_screen_id_ == kFullDesktopScreenId) {
if (!DxgiDuplicatorController::Instance()->Duplicate(
&context_, frames_.current_frame())) {
contexts_.current_frame(), frames_.current_frame())) {
// Screen size may be changed, so we need to reset the frames.
frames_.Reset();
resolution_change_detector_.Reset();
@ -118,7 +124,8 @@ void ScreenCapturerWinDirectx::CaptureFrame() {
}
} else {
if (!DxgiDuplicatorController::Instance()->DuplicateMonitor(
&context_, current_screen_id_, frames_.current_frame())) {
contexts_.current_frame(), current_screen_id_,
frames_.current_frame())) {
// Screen size may be changed, so we need to reset the frames.
frames_.Reset();
resolution_change_detector_.Reset();
@ -158,14 +165,14 @@ bool ScreenCapturerWinDirectx::SelectSource(SourceId id) {
// frames only when a Duplicate() function call returns false.
if (id == kFullDesktopScreenId) {
current_screen_id_ = id;
context_.Reset();
contexts_.Reset();
return true;
}
int screen_count = DxgiDuplicatorController::Instance()->ScreenCount();
if (id >= 0 && id < screen_count) {
current_screen_id_ = id;
context_.Reset();
contexts_.Reset();
return true;
}
return false;

3
webrtc/modules/desktop_capture/win/screen_capturer_win_directx.h
View File

@ -59,10 +59,11 @@ class ScreenCapturerWinDirectx : public DesktopCapturer {
// Returns desktop size of selected screen.
DesktopSize SelectedDesktopSize() const;
// TODO(zijiehe): Merge |frames_| and |contexts_| into a single object.
ScreenCaptureFrameQueue<SharedDesktopFrame> frames_;
ScreenCaptureFrameQueue<DxgiDuplicatorController::Context> contexts_;
std::unique_ptr<SharedMemoryFactory> shared_memory_factory_;
Callback* callback_ = nullptr;
DxgiDuplicatorController::Context context_;
SourceId current_screen_id_ = kFullDesktopScreenId;
ResolutionChangeDetector resolution_change_detector_;