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) |
867 WEBRTC_BASE_TEST(SendManyResizeOnce); | 869 WEBRTC_BASE_TEST(SendManyResizeOnce); |
| 870 #endif // THREAD_SANITIZER |
868 | 871 |
869 // TODO(pbos): Enable and figure out why this fails (or should work). | 872 // TODO(pbos): Enable and figure out why this fails (or should work). |
870 TEST_F(WebRtcVideoChannel2BaseTest, DISABLED_SendVp8HdAndReceiveAdaptedVp8Vga) { | 873 TEST_F(WebRtcVideoChannel2BaseTest, DISABLED_SendVp8HdAndReceiveAdaptedVp8Vga) { |
871 EXPECT_TRUE(channel_->SetCapturer(kSsrc, NULL)); | 874 EXPECT_TRUE(channel_->SetCapturer(kSsrc, NULL)); |
872 EXPECT_TRUE(channel_->SetRenderer(kDefaultReceiveSsrc, &renderer_)); | 875 EXPECT_TRUE(channel_->SetRenderer(kDefaultReceiveSsrc, &renderer_)); |
873 channel_->UpdateAspectRatio(1280, 720); | 876 channel_->UpdateAspectRatio(1280, 720); |
874 video_capturer_.reset(new cricket::FakeVideoCapturer); | 877 video_capturer_.reset(new cricket::FakeVideoCapturer); |
875 const std::vector<cricket::VideoFormat>* formats = | 878 const std::vector<cricket::VideoFormat>* formats = |
876 video_capturer_->GetSupportedFormats(); | 879 video_capturer_->GetSupportedFormats(); |
877 cricket::VideoFormat capture_format_hd = (*formats)[0]; | 880 cricket::VideoFormat capture_format_hd = (*formats)[0]; |
(...skipping 2524 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
3402 // Ensures that the correct settings are applied to the codec when two temporal | 3405 // Ensures that the correct settings are applied to the codec when two temporal |
3403 // layer screencasting is enabled, and that the correct simulcast settings are | 3406 // layer screencasting is enabled, and that the correct simulcast settings are |
3404 // reapplied when disabling screencasting. | 3407 // reapplied when disabling screencasting. |
3405 TEST_F(WebRtcVideoChannel2SimulcastTest, | 3408 TEST_F(WebRtcVideoChannel2SimulcastTest, |
3406 DISABLED_TwoTemporalLayerScreencastSettings) { | 3409 DISABLED_TwoTemporalLayerScreencastSettings) { |
3407 // TODO(pbos): Implement. | 3410 // TODO(pbos): Implement. |
3408 FAIL() << "Not implemented."; | 3411 FAIL() << "Not implemented."; |
3409 } | 3412 } |
3410 | 3413 |
3411 } // namespace cricket | 3414 } // namespace cricket |
OLD | NEW |