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

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

Issue 3003673002: Remove WebRTC-videocontenttypeextension field trial completely (Closed)
Patch Set: Created 3 years, 4 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/video_send_stream.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 322 matching lines...) Expand 10 before | Expand all | Expand 10 after
333 RtpExtension(RtpExtension::kVideoContentTypeUri, 333 RtpExtension(RtpExtension::kVideoContentTypeUri,
334 test::kVideoContentTypeExtensionId)); 334 test::kVideoContentTypeExtensionId));
335 encoder_config->content_type = VideoEncoderConfig::ContentType::kScreen; 335 encoder_config->content_type = VideoEncoderConfig::ContentType::kScreen;
336 } 336 }
337 337
338 void PerformTest() override { 338 void PerformTest() override {
339 EXPECT_TRUE(Wait()) << "Timed out while waiting for single RTP packet."; 339 EXPECT_TRUE(Wait()) << "Timed out while waiting for single RTP packet.";
340 } 340 }
341 } test; 341 } test;
342 342
343 test::ScopedFieldTrials override_field_trials(
344 "WebRTC-VideoContentTypeExtension/Enabled/");
345 RunBaseTest(&test); 343 RunBaseTest(&test);
346 } 344 }
347 345
348 TEST_F(VideoSendStreamTest, SupportsVideoTimingFrames) { 346 TEST_F(VideoSendStreamTest, SupportsVideoTimingFrames) {
349 class VideoTimingObserver : public test::SendTest { 347 class VideoTimingObserver : public test::SendTest {
350 public: 348 public:
351 VideoTimingObserver() : SendTest(kDefaultTimeoutMs) { 349 VideoTimingObserver() : SendTest(kDefaultTimeoutMs) {
352 EXPECT_TRUE(parser_->RegisterRtpHeaderExtension( 350 EXPECT_TRUE(parser_->RegisterRtpHeaderExtension(
353 kRtpExtensionVideoTiming, test::kVideoTimingExtensionId)); 351 kRtpExtensionVideoTiming, test::kVideoTimingExtensionId));
354 } 352 }
(...skipping 3137 matching lines...) Expand 10 before | Expand all | Expand 10 after
3492 capturer_ = frame_generator_capturer; 3490 capturer_ = frame_generator_capturer;
3493 } 3491 }
3494 3492
3495 test::FrameGeneratorCapturer* capturer_ = nullptr; 3493 test::FrameGeneratorCapturer* capturer_ = nullptr;
3496 } test; 3494 } test;
3497 3495
3498 RunBaseTest(&test); 3496 RunBaseTest(&test);
3499 } 3497 }
3500 3498
3501 } // namespace webrtc 3499 } // namespace webrtc
OLDNEW
« no previous file with comments | « webrtc/video/video_send_stream.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698