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

Side by Side Diff: webrtc/video/end_to_end_tests.cc

Issue 2781433002: Reland of Add framerate to VideoSinkWants and ability to signal on overuse (Closed)
Patch Set: Time limit Created 3 years, 8 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
OLDNEW
1 /* 1 /*
2 * Copyright (c) 2013 The WebRTC project authors. All Rights Reserved. 2 * Copyright (c) 2013 The WebRTC project authors. All Rights Reserved.
3 * 3 *
4 * Use of this source code is governed by a BSD-style license 4 * Use of this source code is governed by a BSD-style license
5 * that can be found in the LICENSE file in the root of the source 5 * that can be found in the LICENSE file in the root of the source
6 * tree. An additional intellectual property rights grant can be found 6 * tree. An additional intellectual property rights grant can be found
7 * in the file PATENTS. All contributing project authors may 7 * in the file PATENTS. All contributing project authors may
8 * be found in the AUTHORS file in the root of the source tree. 8 * be found in the AUTHORS file in the root of the source tree.
9 */ 9 */
10 #include <algorithm> 10 #include <algorithm>
(...skipping 203 matching lines...) Expand 10 before | Expand all | Expand 10 after
214 214
215 CreateVideoStreams(); 215 CreateVideoStreams();
216 Start(); 216 Start();
217 217
218 // Create frames that are smaller than the send width/height, this is done to 218 // Create frames that are smaller than the send width/height, this is done to
219 // check that the callbacks are done after processing video. 219 // check that the callbacks are done after processing video.
220 std::unique_ptr<test::FrameGenerator> frame_generator( 220 std::unique_ptr<test::FrameGenerator> frame_generator(
221 test::FrameGenerator::CreateSquareGenerator(kWidth, kHeight)); 221 test::FrameGenerator::CreateSquareGenerator(kWidth, kHeight));
222 test::FrameForwarder frame_forwarder; 222 test::FrameForwarder frame_forwarder;
223 video_send_stream_->SetSource( 223 video_send_stream_->SetSource(
224 &frame_forwarder, VideoSendStream::DegradationPreference::kBalanced); 224 &frame_forwarder,
225 VideoSendStream::DegradationPreference::kMaintainFramerate);
225 226
226 frame_forwarder.IncomingCapturedFrame(*frame_generator->NextFrame()); 227 frame_forwarder.IncomingCapturedFrame(*frame_generator->NextFrame());
227 EXPECT_TRUE(renderer.Wait()) 228 EXPECT_TRUE(renderer.Wait())
228 << "Timed out while waiting for the frame to render."; 229 << "Timed out while waiting for the frame to render.";
229 230
230 Stop(); 231 Stop();
231 232
232 sender_transport.StopSending(); 233 sender_transport.StopSending();
233 receiver_transport.StopSending(); 234 receiver_transport.StopSending();
234 235
(...skipping 24 matching lines...) Expand all
259 video_receive_configs_[0].renderer = &renderer; 260 video_receive_configs_[0].renderer = &renderer;
260 261
261 CreateVideoStreams(); 262 CreateVideoStreams();
262 Start(); 263 Start();
263 264
264 std::unique_ptr<test::FrameGenerator> frame_generator( 265 std::unique_ptr<test::FrameGenerator> frame_generator(
265 test::FrameGenerator::CreateSquareGenerator(kDefaultWidth, 266 test::FrameGenerator::CreateSquareGenerator(kDefaultWidth,
266 kDefaultHeight)); 267 kDefaultHeight));
267 test::FrameForwarder frame_forwarder; 268 test::FrameForwarder frame_forwarder;
268 video_send_stream_->SetSource( 269 video_send_stream_->SetSource(
269 &frame_forwarder, VideoSendStream::DegradationPreference::kBalanced); 270 &frame_forwarder,
271 VideoSendStream::DegradationPreference::kMaintainFramerate);
270 frame_forwarder.IncomingCapturedFrame(*frame_generator->NextFrame()); 272 frame_forwarder.IncomingCapturedFrame(*frame_generator->NextFrame());
271 273
272 EXPECT_TRUE(renderer.Wait()) 274 EXPECT_TRUE(renderer.Wait())
273 << "Timed out while waiting for the frame to render."; 275 << "Timed out while waiting for the frame to render.";
274 276
275 Stop(); 277 Stop();
276 278
277 sender_transport.StopSending(); 279 sender_transport.StopSending();
278 receiver_transport.StopSending(); 280 receiver_transport.StopSending();
279 281
(...skipping 1213 matching lines...) Expand 10 before | Expand all | Expand 10 after
1493 UpdateReceiveConfig(i, &receive_config); 1495 UpdateReceiveConfig(i, &receive_config);
1494 1496
1495 receive_streams[i] = 1497 receive_streams[i] =
1496 receiver_call->CreateVideoReceiveStream(std::move(receive_config)); 1498 receiver_call->CreateVideoReceiveStream(std::move(receive_config));
1497 receive_streams[i]->Start(); 1499 receive_streams[i]->Start();
1498 1500
1499 frame_generators[i] = test::FrameGeneratorCapturer::Create( 1501 frame_generators[i] = test::FrameGeneratorCapturer::Create(
1500 width, height, 30, Clock::GetRealTimeClock()); 1502 width, height, 30, Clock::GetRealTimeClock());
1501 send_streams[i]->SetSource( 1503 send_streams[i]->SetSource(
1502 frame_generators[i], 1504 frame_generators[i],
1503 VideoSendStream::DegradationPreference::kBalanced); 1505 VideoSendStream::DegradationPreference::kMaintainFramerate);
1504 frame_generators[i]->Start(); 1506 frame_generators[i]->Start();
1505 } 1507 }
1506 1508
1507 Wait(); 1509 Wait();
1508 1510
1509 for (size_t i = 0; i < kNumStreams; ++i) { 1511 for (size_t i = 0; i < kNumStreams; ++i) {
1510 frame_generators[i]->Stop(); 1512 frame_generators[i]->Stop();
1511 sender_call->DestroyVideoSendStream(send_streams[i]); 1513 sender_call->DestroyVideoSendStream(send_streams[i]);
1512 receiver_call->DestroyVideoReceiveStream(receive_streams[i]); 1514 receiver_call->DestroyVideoReceiveStream(receive_streams[i]);
1513 delete frame_generators[i]; 1515 delete frame_generators[i];
(...skipping 426 matching lines...) Expand 10 before | Expand all | Expand 10 after
1940 video_receive_configs_[0].pre_decode_callback = &pre_decode_observer; 1942 video_receive_configs_[0].pre_decode_callback = &pre_decode_observer;
1941 1943
1942 CreateVideoStreams(); 1944 CreateVideoStreams();
1943 Start(); 1945 Start();
1944 1946
1945 std::unique_ptr<test::FrameGenerator> frame_generator( 1947 std::unique_ptr<test::FrameGenerator> frame_generator(
1946 test::FrameGenerator::CreateSquareGenerator(kDefaultWidth, 1948 test::FrameGenerator::CreateSquareGenerator(kDefaultWidth,
1947 kDefaultHeight)); 1949 kDefaultHeight));
1948 test::FrameForwarder forwarder; 1950 test::FrameForwarder forwarder;
1949 video_send_stream_->SetSource( 1951 video_send_stream_->SetSource(
1950 &forwarder, VideoSendStream::DegradationPreference::kBalanced); 1952 &forwarder, VideoSendStream::DegradationPreference::kMaintainFramerate);
1951 forwarder.IncomingCapturedFrame(*frame_generator->NextFrame()); 1953 forwarder.IncomingCapturedFrame(*frame_generator->NextFrame());
1952 1954
1953 EXPECT_TRUE(post_encode_observer.Wait()) 1955 EXPECT_TRUE(post_encode_observer.Wait())
1954 << "Timed out while waiting for send-side encoded-frame callback."; 1956 << "Timed out while waiting for send-side encoded-frame callback.";
1955 1957
1956 EXPECT_TRUE(pre_decode_observer.Wait()) 1958 EXPECT_TRUE(pre_decode_observer.Wait())
1957 << "Timed out while waiting for pre-decode encoded-frame callback."; 1959 << "Timed out while waiting for pre-decode encoded-frame callback.";
1958 1960
1959 post_encode_observer.ExpectEqualFrames(pre_decode_observer); 1961 post_encode_observer.ExpectEqualFrames(pre_decode_observer);
1960 1962
(...skipping 2326 matching lines...) Expand 10 before | Expand all | Expand 10 after
4287 std::unique_ptr<VideoEncoder> encoder_; 4289 std::unique_ptr<VideoEncoder> encoder_;
4288 std::unique_ptr<VideoDecoder> decoder_; 4290 std::unique_ptr<VideoDecoder> decoder_;
4289 rtc::CriticalSection crit_; 4291 rtc::CriticalSection crit_;
4290 int recorded_frames_ GUARDED_BY(crit_); 4292 int recorded_frames_ GUARDED_BY(crit_);
4291 } test(this); 4293 } test(this);
4292 4294
4293 RunBaseTest(&test); 4295 RunBaseTest(&test);
4294 } 4296 }
4295 4297
4296 } // namespace webrtc 4298 } // namespace webrtc
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698