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

Unified Diff: talk/media/base/videocapturer.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
« no previous file with comments | « talk/media/base/videocapturer.h ('k') | talk/media/base/videocapturer_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: talk/media/base/videocapturer.cc
diff --git a/talk/media/base/videocapturer.cc b/talk/media/base/videocapturer.cc
index c8fa26a5f6a2aff84e87c9dca0e11a3d38b90125..33cab7189398f71c9b3361c82fbe883d9606bf1a 100644
--- a/talk/media/base/videocapturer.cc
+++ b/talk/media/base/videocapturer.cc
@@ -80,7 +80,6 @@ CapturedFrame::CapturedFrame()
fourcc(0),
pixel_width(0),
pixel_height(0),
- elapsed_time(0),
time_stamp(0),
data_size(0),
rotation(0),
@@ -323,8 +322,7 @@ std::string VideoCapturer::ToString(const CapturedFrame* captured_frame) const {
}
std::ostringstream ss;
- ss << fourcc_name << captured_frame->width << "x" << captured_frame->height
- << "x" << VideoFormat::IntervalToFpsFloat(captured_frame->elapsed_time);
+ ss << fourcc_name << captured_frame->width << "x" << captured_frame->height;
return ss.str();
}
« no previous file with comments | « talk/media/base/videocapturer.h ('k') | talk/media/base/videocapturer_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698