talk/media/webrtc/webrtcvideocapturer.cc - Issue 1324263004: Remove cricket::VideoFrame::Set/GetElapsedTime()

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: talk/media/webrtc/webrtcvideocapturer.cc

Issue 1324263004: Remove cricket::VideoFrame::Set/GetElapsedTime() (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master

Patch Set: Rebased. Re-added CapturedFrame.elapsed_time. Remove once Chromium is updated. Created 5 years, 3 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 side-by-side diff with in-line comments

Download patch

Index: talk/media/webrtc/webrtcvideocapturer.cc

diff --git a/talk/media/webrtc/webrtcvideocapturer.cc b/talk/media/webrtc/webrtcvideocapturer.cc

index 60b84220c49e650fa54f3ab44ea30eb3e6bfe679..f64786f098da512be049a310cef81986d8555ca2 100644

--- a/talk/media/webrtc/webrtcvideocapturer.cc

+++ b/talk/media/webrtc/webrtcvideocapturer.cc

@@ -434,8 +434,7 @@ WebRtcCapturedFrame::WebRtcCapturedFrame(const webrtc::VideoFrame& sample,

pixel_width = 1;

pixel_height = 1;

// Convert units from VideoFrame RenderTimeMs to CapturedFrame (nanoseconds).

- elapsed_time = sample.render_time_ms() * rtc::kNumNanosecsPerMillisec;

- time_stamp = elapsed_time;

+ time_stamp = sample.render_time_ms() * rtc::kNumNanosecsPerMillisec;

data_size = rtc::checked_cast<uint32>(length);

data = buffer;

rotation = sample.rotation();

« no previous file with comments | « talk/media/devices/filevideocapturer.cc ('k') | talk/media/webrtc/webrtcvideoengine2.cc » ('j') | no next file with comments »