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

A variable in ScreenCapturerWinDirectx has a bad name

Browse Source 
BUG=https://bugs.chromium.org/p/chromium/issues/detail?id=314516

Review-Url: https://codereview.webrtc.org/2440613002
Cr-Commit-Position: refs/heads/master@{#14686}
This commit is contained in:
zijiehe 2016-10-19 23:40:36 -07:00 committed by Commit bot
parent f04f14e772
commit 79f0bf3ab5
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -46,11 +46,11 @@ void ScreenCapturerWinDirectx::SetSharedMemoryFactory(
}
DesktopSize ScreenCapturerWinDirectx::SelectedDesktopSize() const {
if (current_screen_id == kFullDesktopScreenId) {
if (current_screen_id_ == kFullDesktopScreenId) {
return DxgiDuplicatorController::Instance()->desktop_size();
}
return DxgiDuplicatorController::Instance()
->ScreenRect(current_screen_id)
->ScreenRect(current_screen_id_)
.size();
}
@ -78,7 +78,7 @@ void ScreenCapturerWinDirectx::CaptureFrame() {
frames_.ReplaceCurrentFrame(SharedDesktopFrame::Wrap(std::move(new_frame)));
}
if (current_screen_id == kFullDesktopScreenId) {
if (current_screen_id_ == kFullDesktopScreenId) {
if (!DxgiDuplicatorController::Instance()->Duplicate(
&context_, frames_.current_frame())) {
// Screen size may be changed, so we need to reset the frames.
@ -88,10 +88,10 @@ void ScreenCapturerWinDirectx::CaptureFrame() {
}
} else {
if (!DxgiDuplicatorController::Instance()->DuplicateMonitor(
&context_, current_screen_id, frames_.current_frame())) {
&context_, current_screen_id_, frames_.current_frame())) {
// Screen size may be changed, so we need to reset the frames.
frames_.Reset();
if (current_screen_id >=
if (current_screen_id_ >=
DxgiDuplicatorController::Instance()->ScreenCount()) {
// Current monitor has been removed from the system.
callback_->OnCaptureResult(Result::ERROR_PERMANENT, nullptr);
@ -118,20 +118,20 @@ bool ScreenCapturerWinDirectx::GetScreenList(ScreenList* screens) {
}
bool ScreenCapturerWinDirectx::SelectScreen(ScreenId id) {
if (id == current_screen_id) {
if (id == current_screen_id_) {
return true;
}
// Changing target screen may or may not impact frame size. So resetting
// frames only when a Duplicate() function call returns false.
if (id == kFullDesktopScreenId) {
current_screen_id = id;
current_screen_id_ = id;
return true;
}
int screen_count = DxgiDuplicatorController::Instance()->ScreenCount();
if (id >= 0 && id < screen_count) {
current_screen_id = id;
current_screen_id_ = id;
return true;
}
return false;

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

@ -52,7 +52,7 @@ class ScreenCapturerWinDirectx : public ScreenCapturer {
DxgiDuplicatorController::Context context_;
ScreenId current_screen_id = kFullDesktopScreenId;
ScreenId current_screen_id_ = kFullDesktopScreenId;
RTC_DISALLOW_COPY_AND_ASSIGN(ScreenCapturerWinDirectx);
};