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

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

Issue 2922723002: Revert of Protect new header extension by field trial experiment to allow hardcoding it in SDP (Closed)
Patch Set: Created 3 years, 6 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
« no previous file with comments | « webrtc/video/end_to_end_tests.cc ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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> // max 10 #include <algorithm> // max
(...skipping 314 matching lines...) Expand 10 before | Expand all | Expand 10 after
325 RtpExtension(RtpExtension::kVideoContentTypeUri, 325 RtpExtension(RtpExtension::kVideoContentTypeUri,
326 test::kVideoContentTypeExtensionId)); 326 test::kVideoContentTypeExtensionId));
327 encoder_config->content_type = VideoEncoderConfig::ContentType::kScreen; 327 encoder_config->content_type = VideoEncoderConfig::ContentType::kScreen;
328 } 328 }
329 329
330 void PerformTest() override { 330 void PerformTest() override {
331 EXPECT_TRUE(Wait()) << "Timed out while waiting for single RTP packet."; 331 EXPECT_TRUE(Wait()) << "Timed out while waiting for single RTP packet.";
332 } 332 }
333 } test; 333 } test;
334 334
335 test::ScopedFieldTrials override_field_trials(
336 "WebRTC-VideoContentTypeExtension/Enabled/");
337 RunBaseTest(&test); 335 RunBaseTest(&test);
338 } 336 }
339 337
340 class FakeReceiveStatistics : public NullReceiveStatistics { 338 class FakeReceiveStatistics : public NullReceiveStatistics {
341 public: 339 public:
342 FakeReceiveStatistics(uint32_t send_ssrc, 340 FakeReceiveStatistics(uint32_t send_ssrc,
343 uint32_t last_sequence_number, 341 uint32_t last_sequence_number,
344 uint32_t cumulative_lost, 342 uint32_t cumulative_lost,
345 uint8_t fraction_lost) 343 uint8_t fraction_lost)
346 : lossy_stats_(new LossyStatistician(last_sequence_number, 344 : lossy_stats_(new LossyStatistician(last_sequence_number,
(...skipping 2992 matching lines...) Expand 10 before | Expand all | Expand 10 after
3339 rtc::CriticalSection crit_; 3337 rtc::CriticalSection crit_;
3340 uint32_t max_bitrate_bps_ GUARDED_BY(&crit_); 3338 uint32_t max_bitrate_bps_ GUARDED_BY(&crit_);
3341 bool first_packet_sent_ GUARDED_BY(&crit_); 3339 bool first_packet_sent_ GUARDED_BY(&crit_);
3342 rtc::Event bitrate_changed_event_; 3340 rtc::Event bitrate_changed_event_;
3343 } test; 3341 } test;
3344 3342
3345 RunBaseTest(&test); 3343 RunBaseTest(&test);
3346 } 3344 }
3347 3345
3348 } // namespace webrtc 3346 } // namespace webrtc
OLDNEW
« no previous file with comments | « webrtc/video/end_to_end_tests.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698