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

Forward capturer_id between DesktopFrame and its implementations

Browse Source 
This is a trivial change to forward capturer id from various DesktopFrame
related implementations.

BUG=chromium:679523, chromium:650926

Review-Url: https://codereview.webrtc.org/2851513003
Cr-Commit-Position: refs/heads/master@{#17918}
This commit is contained in:
zijiehe 2017-04-27 18:39:01 -07:00 committed by Commit bot
parent 911c5904d1
commit 4032674349
3 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
webrtc/modules/desktop_capture/desktop_and_cursor_composer.cc
View File

@ -81,6 +81,7 @@ DesktopFrameWithCursor::DesktopFrameWithCursor(
frame->shared_memory()) {
set_dpi(frame->dpi());
set_capture_time_ms(frame->capture_time_ms());
set_capturer_id(frame->capturer_id());
mutable_updated_region()->Swap(frame->mutable_updated_region());
original_frame_ = std::move(frame);

1
webrtc/modules/desktop_capture/desktop_capturer_differ_wrapper.cc
View File

@ -214,6 +214,7 @@ void DesktopCapturerDifferWrapper::OnCaptureResult(
frame->set_capture_time_ms(frame->GetUnderlyingFrame()->capture_time_ms() +
(rtc::TimeNanos() - start_time_nanos) /
rtc::kNumNanosecsPerMillisec);
frame->set_capturer_id(frame->GetUnderlyingFrame()->capturer_id());
callback_->OnCaptureResult(result, std::move(frame));
}

1
webrtc/modules/desktop_capture/desktop_frame.cc
View File

@ -76,6 +76,7 @@ DesktopFrame* BasicDesktopFrame::CopyOf(const DesktopFrame& frame) {
}
result->set_dpi(frame.dpi());
result->set_capture_time_ms(frame.capture_time_ms());
result->set_capturer_id(frame.capturer_id());
*result->mutable_updated_region() = frame.updated_region();
return result;
}