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

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

Issue 2474993002: Pass selected cricket::VideoCodec down to internal H264 encoder (Closed)
Patch Set: Fix includes. Created 4 years 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 356 matching lines...) Expand 10 before | Expand all | Expand 10 after
367 367
368 TEST_F(EndToEndTest, SendsAndReceivesVP9VideoRotation90) { 368 TEST_F(EndToEndTest, SendsAndReceivesVP9VideoRotation90) {
369 CodecObserver test(5, kVideoRotation_90, "VP9", VP9Encoder::Create(), 369 CodecObserver test(5, kVideoRotation_90, "VP9", VP9Encoder::Create(),
370 VP9Decoder::Create()); 370 VP9Decoder::Create());
371 RunBaseTest(&test); 371 RunBaseTest(&test);
372 } 372 }
373 #endif // !defined(RTC_DISABLE_VP9) 373 #endif // !defined(RTC_DISABLE_VP9)
374 374
375 #if defined(WEBRTC_USE_H264) 375 #if defined(WEBRTC_USE_H264)
376 TEST_F(EndToEndTest, SendsAndReceivesH264) { 376 TEST_F(EndToEndTest, SendsAndReceivesH264) {
377 CodecObserver test(500, kVideoRotation_0, "H264", H264Encoder::Create(), 377 CodecObserver test(500, kVideoRotation_0, "H264",
378 H264Encoder::Create(cricket::VideoCodec("H264")),
378 H264Decoder::Create()); 379 H264Decoder::Create());
379 RunBaseTest(&test); 380 RunBaseTest(&test);
380 } 381 }
381 382
382 TEST_F(EndToEndTest, SendsAndReceivesH264VideoRotation90) { 383 TEST_F(EndToEndTest, SendsAndReceivesH264VideoRotation90) {
383 CodecObserver test(5, kVideoRotation_90, "H264", H264Encoder::Create(), 384 CodecObserver test(5, kVideoRotation_90, "H264",
385 H264Encoder::Create(cricket::VideoCodec("H264")),
384 H264Decoder::Create()); 386 H264Decoder::Create());
385 RunBaseTest(&test); 387 RunBaseTest(&test);
386 } 388 }
387 #endif // defined(WEBRTC_USE_H264) 389 #endif // defined(WEBRTC_USE_H264)
388 390
389 TEST_F(EndToEndTest, ReceiverUsesLocalSsrc) { 391 TEST_F(EndToEndTest, ReceiverUsesLocalSsrc) {
390 class SyncRtcpObserver : public test::EndToEndTest { 392 class SyncRtcpObserver : public test::EndToEndTest {
391 public: 393 public:
392 SyncRtcpObserver() : EndToEndTest(kDefaultTimeoutMs) {} 394 SyncRtcpObserver() : EndToEndTest(kDefaultTimeoutMs) {}
393 395
(...skipping 3609 matching lines...) Expand 10 before | Expand all | Expand 10 after
4003 std::unique_ptr<VideoEncoder> encoder_; 4005 std::unique_ptr<VideoEncoder> encoder_;
4004 std::unique_ptr<VideoDecoder> decoder_; 4006 std::unique_ptr<VideoDecoder> decoder_;
4005 rtc::CriticalSection crit_; 4007 rtc::CriticalSection crit_;
4006 int recorded_frames_ GUARDED_BY(crit_); 4008 int recorded_frames_ GUARDED_BY(crit_);
4007 } test(this); 4009 } test(this);
4008 4010
4009 RunBaseTest(&test); 4011 RunBaseTest(&test);
4010 } 4012 }
4011 4013
4012 } // namespace webrtc 4014 } // namespace webrtc
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698