OLD | NEW |
1 /* | 1 /* |
2 * libjingle | 2 * libjingle |
3 * Copyright 2004 Google Inc. | 3 * Copyright 2004 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 846 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
857 } | 857 } |
858 | 858 |
859 TEST_F(WebRtcVideoChannel2BaseTest, TwoStreamsSendAndReceive) { | 859 TEST_F(WebRtcVideoChannel2BaseTest, TwoStreamsSendAndReceive) { |
860 Base::TwoStreamsSendAndReceive(kVp8Codec); | 860 Base::TwoStreamsSendAndReceive(kVp8Codec); |
861 } | 861 } |
862 | 862 |
863 TEST_F(WebRtcVideoChannel2BaseTest, TwoStreamsReUseFirstStream) { | 863 TEST_F(WebRtcVideoChannel2BaseTest, TwoStreamsReUseFirstStream) { |
864 Base::TwoStreamsReUseFirstStream(kVp8Codec); | 864 Base::TwoStreamsReUseFirstStream(kVp8Codec); |
865 } | 865 } |
866 | 866 |
867 //Disabled for TSan: https://bugs.chromium.org/p/webrtc/issues/detail?id=4963 | |
868 #if !defined(THREAD_SANITIZER) | |
869 WEBRTC_BASE_TEST(SendManyResizeOnce); | |
870 #endif // THREAD_SANITIZER | |
871 | |
872 // TODO(pbos): Enable and figure out why this fails (or should work). | 867 // TODO(pbos): Enable and figure out why this fails (or should work). |
873 TEST_F(WebRtcVideoChannel2BaseTest, DISABLED_SendVp8HdAndReceiveAdaptedVp8Vga) { | 868 TEST_F(WebRtcVideoChannel2BaseTest, DISABLED_SendVp8HdAndReceiveAdaptedVp8Vga) { |
874 EXPECT_TRUE(channel_->SetCapturer(kSsrc, NULL)); | 869 EXPECT_TRUE(channel_->SetCapturer(kSsrc, NULL)); |
875 EXPECT_TRUE(channel_->SetRenderer(kDefaultReceiveSsrc, &renderer_)); | 870 EXPECT_TRUE(channel_->SetRenderer(kDefaultReceiveSsrc, &renderer_)); |
876 channel_->UpdateAspectRatio(1280, 720); | 871 channel_->UpdateAspectRatio(1280, 720); |
877 video_capturer_.reset(new cricket::FakeVideoCapturer); | 872 video_capturer_.reset(new cricket::FakeVideoCapturer); |
878 const std::vector<cricket::VideoFormat>* formats = | 873 const std::vector<cricket::VideoFormat>* formats = |
879 video_capturer_->GetSupportedFormats(); | 874 video_capturer_->GetSupportedFormats(); |
880 cricket::VideoFormat capture_format_hd = (*formats)[0]; | 875 cricket::VideoFormat capture_format_hd = (*formats)[0]; |
881 EXPECT_EQ(cricket::CS_RUNNING, video_capturer_->Start(capture_format_hd)); | 876 EXPECT_EQ(cricket::CS_RUNNING, video_capturer_->Start(capture_format_hd)); |
(...skipping 2523 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
3405 // Ensures that the correct settings are applied to the codec when two temporal | 3400 // Ensures that the correct settings are applied to the codec when two temporal |
3406 // layer screencasting is enabled, and that the correct simulcast settings are | 3401 // layer screencasting is enabled, and that the correct simulcast settings are |
3407 // reapplied when disabling screencasting. | 3402 // reapplied when disabling screencasting. |
3408 TEST_F(WebRtcVideoChannel2SimulcastTest, | 3403 TEST_F(WebRtcVideoChannel2SimulcastTest, |
3409 DISABLED_TwoTemporalLayerScreencastSettings) { | 3404 DISABLED_TwoTemporalLayerScreencastSettings) { |
3410 // TODO(pbos): Implement. | 3405 // TODO(pbos): Implement. |
3411 FAIL() << "Not implemented."; | 3406 FAIL() << "Not implemented."; |
3412 } | 3407 } |
3413 | 3408 |
3414 } // namespace cricket | 3409 } // namespace cricket |
OLD | NEW |