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

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

Issue 2772033002: Add content type information to encoded images and corresponding rtp extension header (Closed)
Patch Set: Set EncodedImage content_type from vie_encoder Created 3 years, 8 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
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> 10 #include <algorithm>
(...skipping 2389 matching lines...) Expand 10 before | Expand all | Expand 10 after
2400 (*receive_configs)[0].rtp.rtx_payload_types[kFakeVideoSendPayloadType] = 2400 (*receive_configs)[0].rtp.rtx_payload_types[kFakeVideoSendPayloadType] =
2401 kSendRtxPayloadType; 2401 kSendRtxPayloadType;
2402 } 2402 }
2403 // RTT needed for RemoteNtpTimeEstimator for the receive stream. 2403 // RTT needed for RemoteNtpTimeEstimator for the receive stream.
2404 (*receive_configs)[0].rtp.rtcp_xr.receiver_reference_time_report = true; 2404 (*receive_configs)[0].rtp.rtcp_xr.receiver_reference_time_report = true;
2405 encoder_config->content_type = 2405 encoder_config->content_type =
2406 screenshare_ ? VideoEncoderConfig::ContentType::kScreen 2406 screenshare_ ? VideoEncoderConfig::ContentType::kScreen
2407 : VideoEncoderConfig::ContentType::kRealtimeVideo; 2407 : VideoEncoderConfig::ContentType::kRealtimeVideo;
2408 } 2408 }
2409 2409
2410 void OnFrameGeneratorCapturerCreated(
2411 test::FrameGeneratorCapturer* frame_generator_capturer) override {
2412 frame_generator_capturer->SetFakeContentType(
2413 screenshare_ ? kVideoContent_Screenshare
2414 : kVideoContent_Default);
2415 }
2416
2410 void OnCallsCreated(Call* sender_call, Call* receiver_call) override { 2417 void OnCallsCreated(Call* sender_call, Call* receiver_call) override {
2411 sender_call_ = sender_call; 2418 sender_call_ = sender_call;
2412 receiver_call_ = receiver_call; 2419 receiver_call_ = receiver_call;
2413 } 2420 }
2414 2421
2415 void PerformTest() override { 2422 void PerformTest() override {
2416 EXPECT_TRUE(Wait()) << "Timed out waiting for packet to be NACKed."; 2423 EXPECT_TRUE(Wait()) << "Timed out waiting for packet to be NACKed.";
2417 } 2424 }
2418 2425
2419 rtc::CriticalSection crit_; 2426 rtc::CriticalSection crit_;
(...skipping 69 matching lines...) Expand 10 before | Expand all | Expand 10 after
2489 EXPECT_EQ(1, metrics::NumSamples(video_prefix + "InputFramesPerSecond")); 2496 EXPECT_EQ(1, metrics::NumSamples(video_prefix + "InputFramesPerSecond"));
2490 EXPECT_EQ(1, metrics::NumSamples(video_prefix + "SentFramesPerSecond")); 2497 EXPECT_EQ(1, metrics::NumSamples(video_prefix + "SentFramesPerSecond"));
2491 EXPECT_EQ(1, metrics::NumSamples("WebRTC.Video.DecodedFramesPerSecond")); 2498 EXPECT_EQ(1, metrics::NumSamples("WebRTC.Video.DecodedFramesPerSecond"));
2492 EXPECT_EQ(1, metrics::NumSamples("WebRTC.Video.RenderFramesPerSecond")); 2499 EXPECT_EQ(1, metrics::NumSamples("WebRTC.Video.RenderFramesPerSecond"));
2493 2500
2494 EXPECT_EQ(1, metrics::NumSamples("WebRTC.Video.JitterBufferDelayInMs")); 2501 EXPECT_EQ(1, metrics::NumSamples("WebRTC.Video.JitterBufferDelayInMs"));
2495 EXPECT_EQ(1, metrics::NumSamples("WebRTC.Video.TargetDelayInMs")); 2502 EXPECT_EQ(1, metrics::NumSamples("WebRTC.Video.TargetDelayInMs"));
2496 EXPECT_EQ(1, metrics::NumSamples("WebRTC.Video.CurrentDelayInMs")); 2503 EXPECT_EQ(1, metrics::NumSamples("WebRTC.Video.CurrentDelayInMs"));
2497 EXPECT_EQ(1, metrics::NumSamples("WebRTC.Video.OnewayDelayInMs")); 2504 EXPECT_EQ(1, metrics::NumSamples("WebRTC.Video.OnewayDelayInMs"));
2498 2505
2499 EXPECT_EQ(1, metrics::NumSamples("WebRTC.Video.EndToEndDelayInMs")); 2506 EXPECT_EQ(1, metrics::NumSamples(video_prefix + "EndToEndDelayInMs"));
2507 EXPECT_EQ(1, metrics::NumSamples(video_prefix + "EndToEndDelayMaxInMs"));
2500 EXPECT_EQ(1, metrics::NumSamples("WebRTC.Video.RenderSqrtPixelsPerSecond")); 2508 EXPECT_EQ(1, metrics::NumSamples("WebRTC.Video.RenderSqrtPixelsPerSecond"));
2501 2509
2502 EXPECT_EQ(1, metrics::NumSamples(video_prefix + "EncodeTimeInMs")); 2510 EXPECT_EQ(1, metrics::NumSamples(video_prefix + "EncodeTimeInMs"));
2503 EXPECT_EQ(1, metrics::NumSamples("WebRTC.Video.DecodeTimeInMs")); 2511 EXPECT_EQ(1, metrics::NumSamples("WebRTC.Video.DecodeTimeInMs"));
2504 2512
2505 EXPECT_EQ(1, metrics::NumSamples(video_prefix + "NumberOfPauseEvents")); 2513 EXPECT_EQ(1, metrics::NumSamples(video_prefix + "NumberOfPauseEvents"));
2506 EXPECT_EQ(1, metrics::NumSamples(video_prefix + "PausedTimeInPercent")); 2514 EXPECT_EQ(1, metrics::NumSamples(video_prefix + "PausedTimeInPercent"));
2507 2515
2508 EXPECT_EQ(1, metrics::NumSamples(video_prefix + "BitrateSentInKbps")); 2516 EXPECT_EQ(1, metrics::NumSamples(video_prefix + "BitrateSentInKbps"));
2509 EXPECT_EQ(1, metrics::NumSamples("WebRTC.Video.BitrateReceivedInKbps")); 2517 EXPECT_EQ(1, metrics::NumSamples("WebRTC.Video.BitrateReceivedInKbps"));
(...skipping 1681 matching lines...) Expand 10 before | Expand all | Expand 10 after
4191 std::unique_ptr<VideoEncoder> encoder_; 4199 std::unique_ptr<VideoEncoder> encoder_;
4192 std::unique_ptr<VideoDecoder> decoder_; 4200 std::unique_ptr<VideoDecoder> decoder_;
4193 rtc::CriticalSection crit_; 4201 rtc::CriticalSection crit_;
4194 int recorded_frames_ GUARDED_BY(crit_); 4202 int recorded_frames_ GUARDED_BY(crit_);
4195 } test(this); 4203 } test(this);
4196 4204
4197 RunBaseTest(&test); 4205 RunBaseTest(&test);
4198 } 4206 }
4199 4207
4200 } // namespace webrtc 4208 } // namespace webrtc
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698