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

Unified Diff: talk/media/base/videocapturer_unittest.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.cc ('k') | talk/media/base/videoframe.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: talk/media/base/videocapturer_unittest.cc
diff --git a/talk/media/base/videocapturer_unittest.cc b/talk/media/base/videocapturer_unittest.cc
index dbef1b9ede8879ff0dcc05a6b51d70ed0f5ec4af..8f529d238d8383b4974ef64ce28823dbf4aa8840 100644
--- a/talk/media/base/videocapturer_unittest.cc
+++ b/talk/media/base/videocapturer_unittest.cc
@@ -55,7 +55,6 @@ class VideoCapturerTest
: capture_state_(cricket::CS_STOPPED),
num_state_changes_(0),
video_frames_received_(0),
- last_frame_elapsed_time_(0),
expects_rotation_applied_(true) {
capturer_.SignalVideoFrame.connect(this, &VideoCapturerTest::OnVideoFrame);
capturer_.SignalStateChange.connect(this,
@@ -69,7 +68,6 @@ class VideoCapturerTest
protected:
void OnVideoFrame(cricket::VideoCapturer*, const cricket::VideoFrame* frame) {
++video_frames_received_;
- last_frame_elapsed_time_ = frame->GetElapsedTime();
if (expects_rotation_applied_) {
EXPECT_EQ(webrtc::kVideoRotation_0, frame->GetRotation());
} else {
@@ -87,13 +85,11 @@ class VideoCapturerTest
int video_frames_received() const {
return video_frames_received_;
}
- int64 last_frame_elapsed_time() const { return last_frame_elapsed_time_; }
cricket::FakeVideoCapturer capturer_;
cricket::CaptureState capture_state_;
int num_state_changes_;
int video_frames_received_;
- int64 last_frame_elapsed_time_;
cricket::FakeVideoRenderer renderer_;
bool expects_rotation_applied_;
};
« no previous file with comments | « talk/media/base/videocapturer.cc ('k') | talk/media/base/videoframe.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698