OLD | NEW |
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 2936 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2947 { | 2947 { |
2948 rtc::CritScope lock(&crit_); | 2948 rtc::CritScope lock(&crit_); |
2949 num_frames_received_ = 0; | 2949 num_frames_received_ = 0; |
2950 } | 2950 } |
2951 } | 2951 } |
2952 | 2952 |
2953 rtc::CriticalSection crit_; | 2953 rtc::CriticalSection crit_; |
2954 int num_frames_received_ GUARDED_BY(&crit_); | 2954 int num_frames_received_ GUARDED_BY(&crit_); |
2955 } test; | 2955 } test; |
2956 | 2956 |
2957 test::ScopedFieldTrials override_field_trials( | |
2958 "WebRTC-VideoContentTypeExtension/Enabled/"); | |
2959 metrics::Reset(); | 2957 metrics::Reset(); |
2960 | 2958 |
2961 Call::Config send_config(test.GetSenderCallConfig()); | 2959 Call::Config send_config(test.GetSenderCallConfig()); |
2962 Call::Config recv_config(test.GetReceiverCallConfig()); | 2960 Call::Config recv_config(test.GetReceiverCallConfig()); |
2963 VideoEncoderConfig encoder_config_with_screenshare; | 2961 VideoEncoderConfig encoder_config_with_screenshare; |
2964 | 2962 |
2965 task_queue_.SendTask([this, &test, &override_field_trials, &send_config, | 2963 task_queue_.SendTask([this, &test, &send_config, |
2966 &recv_config, &encoder_config_with_screenshare]() { | 2964 &recv_config, &encoder_config_with_screenshare]() { |
2967 CreateSenderCall(send_config); | 2965 CreateSenderCall(send_config); |
2968 CreateReceiverCall(recv_config); | 2966 CreateReceiverCall(recv_config); |
2969 | 2967 |
2970 receive_transport_.reset(test.CreateReceiveTransport(&task_queue_)); | 2968 receive_transport_.reset(test.CreateReceiveTransport(&task_queue_)); |
2971 send_transport_.reset( | 2969 send_transport_.reset( |
2972 test.CreateSendTransport(&task_queue_, sender_call_.get())); | 2970 test.CreateSendTransport(&task_queue_, sender_call_.get())); |
2973 send_transport_->SetReceiver(receiver_call_->Receiver()); | 2971 send_transport_->SetReceiver(receiver_call_->Receiver()); |
2974 receive_transport_->SetReceiver(sender_call_->Receiver()); | 2972 receive_transport_->SetReceiver(sender_call_->Receiver()); |
2975 | 2973 |
(...skipping 73 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
3049 const bool kEnabledRtx = false; | 3047 const bool kEnabledRtx = false; |
3050 const bool kEnabledRed = true; | 3048 const bool kEnabledRed = true; |
3051 const bool kScreenshare = false; | 3049 const bool kScreenshare = false; |
3052 VerifyHistogramStats(kEnabledRtx, kEnabledRed, kScreenshare); | 3050 VerifyHistogramStats(kEnabledRtx, kEnabledRed, kScreenshare); |
3053 } | 3051 } |
3054 | 3052 |
3055 TEST_F(EndToEndTest, VerifyHistogramStatsWithScreenshare) { | 3053 TEST_F(EndToEndTest, VerifyHistogramStatsWithScreenshare) { |
3056 const bool kEnabledRtx = false; | 3054 const bool kEnabledRtx = false; |
3057 const bool kEnabledRed = false; | 3055 const bool kEnabledRed = false; |
3058 const bool kScreenshare = true; | 3056 const bool kScreenshare = true; |
3059 test::ScopedFieldTrials override_field_trials( | |
3060 "WebRTC-VideoContentTypeExtension/Enabled/"); | |
3061 VerifyHistogramStats(kEnabledRtx, kEnabledRed, kScreenshare); | 3057 VerifyHistogramStats(kEnabledRtx, kEnabledRed, kScreenshare); |
3062 } | 3058 } |
3063 | 3059 |
3064 void EndToEndTest::TestSendsSetSsrcs(size_t num_ssrcs, | 3060 void EndToEndTest::TestSendsSetSsrcs(size_t num_ssrcs, |
3065 bool send_single_ssrc_first) { | 3061 bool send_single_ssrc_first) { |
3066 class SendsSetSsrcs : public test::EndToEndTest { | 3062 class SendsSetSsrcs : public test::EndToEndTest { |
3067 public: | 3063 public: |
3068 SendsSetSsrcs(const uint32_t* ssrcs, | 3064 SendsSetSsrcs(const uint32_t* ssrcs, |
3069 size_t num_ssrcs, | 3065 size_t num_ssrcs, |
3070 bool send_single_ssrc_first) | 3066 bool send_single_ssrc_first) |
(...skipping 1932 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
5003 std::unique_ptr<VideoEncoder> encoder_; | 4999 std::unique_ptr<VideoEncoder> encoder_; |
5004 std::unique_ptr<VideoDecoder> decoder_; | 5000 std::unique_ptr<VideoDecoder> decoder_; |
5005 rtc::CriticalSection crit_; | 5001 rtc::CriticalSection crit_; |
5006 int recorded_frames_ GUARDED_BY(crit_); | 5002 int recorded_frames_ GUARDED_BY(crit_); |
5007 } test(this); | 5003 } test(this); |
5008 | 5004 |
5009 RunBaseTest(&test); | 5005 RunBaseTest(&test); |
5010 } | 5006 } |
5011 | 5007 |
5012 } // namespace webrtc | 5008 } // namespace webrtc |
OLD | NEW |