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

Unified Diff: talk/media/base/fakevideorenderer.h

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/fakevideocapturer.h ('k') | talk/media/base/videocapturer.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: talk/media/base/fakevideorenderer.h
diff --git a/talk/media/base/fakevideorenderer.h b/talk/media/base/fakevideorenderer.h
index 23ae06d5334b31a4bd0a4f3a5a294f11e552d2d8..9ceaac8b1f03d1680fde4b813c2cb16a7d87738d 100644
--- a/talk/media/base/fakevideorenderer.h
+++ b/talk/media/base/fakevideorenderer.h
@@ -44,8 +44,7 @@ class FakeVideoRenderer : public VideoRenderer {
height_(0),
num_set_sizes_(0),
num_rendered_frames_(0),
- black_frame_(false),
- last_frame_elapsed_time_ns_(-1) {
+ black_frame_(false) {
}
virtual bool SetSize(int width, int height, int reserved) {
@@ -76,7 +75,6 @@ class FakeVideoRenderer : public VideoRenderer {
++errors_;
return false;
}
- last_frame_elapsed_time_ns_ = frame->GetElapsedTime();
++num_rendered_frames_;
SignalRenderFrame(frame);
return true;
@@ -104,11 +102,6 @@ class FakeVideoRenderer : public VideoRenderer {
return black_frame_;
}
- int64_t last_frame_elapsed_time_ns() const {
- rtc::CritScope cs(&crit_);
- return last_frame_elapsed_time_ns_;
- }
-
sigslot::signal3<int, int, int> SignalSetSize;
sigslot::signal1<const VideoFrame*> SignalRenderFrame;
@@ -167,7 +160,6 @@ class FakeVideoRenderer : public VideoRenderer {
int num_set_sizes_;
int num_rendered_frames_;
bool black_frame_;
- int64_t last_frame_elapsed_time_ns_;
mutable rtc::CriticalSection crit_;
};
« no previous file with comments | « talk/media/base/fakevideocapturer.h ('k') | talk/media/base/videocapturer.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698