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

Side by Side Diff: talk/app/webrtc/videotrack_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, 2 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
« no previous file with comments | « talk/app/webrtc/objc/avfoundationvideocapturer.mm ('k') | talk/media/base/fakevideocapturer.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * libjingle 2 * libjingle
3 * Copyright 2012 Google Inc. 3 * Copyright 2012 Google Inc.
4 * 4 *
5 * Redistribution and use in source and binary forms, with or without 5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions are met: 6 * modification, are permitted provided that the following conditions are met:
7 * 7 *
8 * 1. Redistributions of source code must retain the above copyright notice, 8 * 1. Redistributions of source code must retain the above copyright notice,
9 * this list of conditions and the following disclaimer. 9 * this list of conditions and the following disclaimer.
10 * 2. Redistributions in binary form must reproduce the above copyright notice, 10 * 2. Redistributions in binary form must reproduce the above copyright notice,
(...skipping 64 matching lines...) Expand 10 before | Expand all | Expand 10 after
75 TEST_F(VideoTrackTest, RenderVideo) { 75 TEST_F(VideoTrackTest, RenderVideo) {
76 // FakeVideoTrackRenderer register itself to |video_track_| 76 // FakeVideoTrackRenderer register itself to |video_track_|
77 rtc::scoped_ptr<FakeVideoTrackRenderer> renderer_1( 77 rtc::scoped_ptr<FakeVideoTrackRenderer> renderer_1(
78 new FakeVideoTrackRenderer(video_track_.get())); 78 new FakeVideoTrackRenderer(video_track_.get()));
79 79
80 cricket::VideoRenderer* renderer_input = 80 cricket::VideoRenderer* renderer_input =
81 video_track_->GetSource()->FrameInput(); 81 video_track_->GetSource()->FrameInput();
82 ASSERT_FALSE(renderer_input == NULL); 82 ASSERT_FALSE(renderer_input == NULL);
83 83
84 cricket::WebRtcVideoFrame frame; 84 cricket::WebRtcVideoFrame frame;
85 frame.InitToBlack(123, 123, 1, 1, 0, 0); 85 frame.InitToBlack(123, 123, 1, 1, 0);
86 renderer_input->RenderFrame(&frame); 86 renderer_input->RenderFrame(&frame);
87 EXPECT_EQ(1, renderer_1->num_rendered_frames()); 87 EXPECT_EQ(1, renderer_1->num_rendered_frames());
88 88
89 EXPECT_EQ(123, renderer_1->width()); 89 EXPECT_EQ(123, renderer_1->width());
90 EXPECT_EQ(123, renderer_1->height()); 90 EXPECT_EQ(123, renderer_1->height());
91 91
92 // FakeVideoTrackRenderer register itself to |video_track_| 92 // FakeVideoTrackRenderer register itself to |video_track_|
93 rtc::scoped_ptr<FakeVideoTrackRenderer> renderer_2( 93 rtc::scoped_ptr<FakeVideoTrackRenderer> renderer_2(
94 new FakeVideoTrackRenderer(video_track_.get())); 94 new FakeVideoTrackRenderer(video_track_.get()));
95 95
96 renderer_input->RenderFrame(&frame); 96 renderer_input->RenderFrame(&frame);
97 97
98 EXPECT_EQ(123, renderer_1->width()); 98 EXPECT_EQ(123, renderer_1->width());
99 EXPECT_EQ(123, renderer_1->height()); 99 EXPECT_EQ(123, renderer_1->height());
100 EXPECT_EQ(123, renderer_2->width()); 100 EXPECT_EQ(123, renderer_2->width());
101 EXPECT_EQ(123, renderer_2->height()); 101 EXPECT_EQ(123, renderer_2->height());
102 102
103 EXPECT_EQ(2, renderer_1->num_rendered_frames()); 103 EXPECT_EQ(2, renderer_1->num_rendered_frames());
104 EXPECT_EQ(1, renderer_2->num_rendered_frames()); 104 EXPECT_EQ(1, renderer_2->num_rendered_frames());
105 105
106 video_track_->RemoveRenderer(renderer_1.get()); 106 video_track_->RemoveRenderer(renderer_1.get());
107 renderer_input->RenderFrame(&frame); 107 renderer_input->RenderFrame(&frame);
108 108
109 EXPECT_EQ(2, renderer_1->num_rendered_frames()); 109 EXPECT_EQ(2, renderer_1->num_rendered_frames());
110 EXPECT_EQ(2, renderer_2->num_rendered_frames()); 110 EXPECT_EQ(2, renderer_2->num_rendered_frames());
111 } 111 }
OLDNEW
« no previous file with comments | « talk/app/webrtc/objc/avfoundationvideocapturer.mm ('k') | talk/media/base/fakevideocapturer.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698