Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(83)

Side by Side Diff: webrtc/modules/desktop_capture/desktop_capturer_differ_wrapper.cc

Issue 2851513003: Forward capturer_id between DesktopFrame and its implementations (Closed)
Patch Set: Created 3 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 /* 1 /*
2 * Copyright (c) 2016 The WebRTC project authors. All Rights Reserved. 2 * Copyright (c) 2016 The WebRTC project authors. All Rights Reserved.
3 * 3 *
4 * Use of this source code is governed by a BSD-style license 4 * Use of this source code is governed by a BSD-style license
5 * that can be found in the LICENSE file in the root of the source 5 * that can be found in the LICENSE file in the root of the source
6 * tree. An additional intellectual property rights grant can be found 6 * tree. An additional intellectual property rights grant can be found
7 * in the file PATENTS. All contributing project authors may 7 * in the file PATENTS. All contributing project authors may
8 * be found in the AUTHORS file in the root of the source tree. 8 * be found in the AUTHORS file in the root of the source tree.
9 */ 9 */
10 10
(...skipping 196 matching lines...) Expand 10 before | Expand all | Expand 10 after
207 } 207 }
208 } else { 208 } else {
209 frame->mutable_updated_region()->SetRect( 209 frame->mutable_updated_region()->SetRect(
210 DesktopRect::MakeSize(frame->size())); 210 DesktopRect::MakeSize(frame->size()));
211 } 211 }
212 last_frame_ = frame->Share(); 212 last_frame_ = frame->Share();
213 213
214 frame->set_capture_time_ms(frame->GetUnderlyingFrame()->capture_time_ms() + 214 frame->set_capture_time_ms(frame->GetUnderlyingFrame()->capture_time_ms() +
215 (rtc::TimeNanos() - start_time_nanos) / 215 (rtc::TimeNanos() - start_time_nanos) /
216 rtc::kNumNanosecsPerMillisec); 216 rtc::kNumNanosecsPerMillisec);
217 frame->set_capturer_id(frame->GetUnderlyingFrame()->capturer_id());
217 callback_->OnCaptureResult(result, std::move(frame)); 218 callback_->OnCaptureResult(result, std::move(frame));
218 } 219 }
219 220
220 } // namespace webrtc 221 } // namespace webrtc
OLDNEW
« no previous file with comments | « webrtc/modules/desktop_capture/desktop_and_cursor_composer.cc ('k') | webrtc/modules/desktop_capture/desktop_frame.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698