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

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

Issue 2190913002: Fix bug where transport sequence numbers are allocated for packets without the header extension reg… (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Comments addressed. Created 4 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/modules/rtp_rtcp/source/rtp_sender_unittest.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> 10 #include <algorithm>
(...skipping 2050 matching lines...) Expand 10 before | Expand all | Expand 10 after
2061 return false; 2061 return false;
2062 } 2062 }
2063 int64_t elapsed_sec = (now - start_runtime_ms_) / 1000; 2063 int64_t elapsed_sec = (now - start_runtime_ms_) / 1000;
2064 return elapsed_sec > metrics::kMinRunTimeInSeconds * 2; 2064 return elapsed_sec > metrics::kMinRunTimeInSeconds * 2;
2065 } 2065 }
2066 2066
2067 void ModifyVideoConfigs( 2067 void ModifyVideoConfigs(
2068 VideoSendStream::Config* send_config, 2068 VideoSendStream::Config* send_config,
2069 std::vector<VideoReceiveStream::Config>* receive_configs, 2069 std::vector<VideoReceiveStream::Config>* receive_configs,
2070 VideoEncoderConfig* encoder_config) override { 2070 VideoEncoderConfig* encoder_config) override {
2071 static const int kExtensionId = 8;
2072 send_config->rtp.extensions.push_back(RtpExtension(
2073 RtpExtension::kTransportSequenceNumberUri, kExtensionId));
2074 (*receive_configs)[0].rtp.extensions.push_back(RtpExtension(
2075 RtpExtension::kTransportSequenceNumberUri, kExtensionId));
2071 // NACK 2076 // NACK
2072 send_config->rtp.nack.rtp_history_ms = kNackRtpHistoryMs; 2077 send_config->rtp.nack.rtp_history_ms = kNackRtpHistoryMs;
2073 (*receive_configs)[0].rtp.nack.rtp_history_ms = kNackRtpHistoryMs; 2078 (*receive_configs)[0].rtp.nack.rtp_history_ms = kNackRtpHistoryMs;
2074 (*receive_configs)[0].renderer = this; 2079 (*receive_configs)[0].renderer = this;
2075 // FEC 2080 // FEC
2076 if (use_red_) { 2081 if (use_red_) {
2077 send_config->rtp.fec.ulpfec_payload_type = kUlpfecPayloadType; 2082 send_config->rtp.fec.ulpfec_payload_type = kUlpfecPayloadType;
2078 send_config->rtp.fec.red_payload_type = kRedPayloadType; 2083 send_config->rtp.fec.red_payload_type = kRedPayloadType;
2079 send_config->encoder_settings.encoder = vp8_encoder_.get(); 2084 send_config->encoder_settings.encoder = vp8_encoder_.get();
2080 send_config->encoder_settings.payload_name = "VP8"; 2085 send_config->encoder_settings.payload_name = "VP8";
(...skipping 1555 matching lines...) Expand 10 before | Expand all | Expand 10 after
3636 private: 3641 private:
3637 bool video_observed_; 3642 bool video_observed_;
3638 bool audio_observed_; 3643 bool audio_observed_;
3639 SequenceNumberUnwrapper unwrapper_; 3644 SequenceNumberUnwrapper unwrapper_;
3640 std::set<int64_t> received_packet_ids_; 3645 std::set<int64_t> received_packet_ids_;
3641 } test; 3646 } test;
3642 3647
3643 RunBaseTest(&test); 3648 RunBaseTest(&test);
3644 } 3649 }
3645 } // namespace webrtc 3650 } // namespace webrtc
OLDNEW
« no previous file with comments | « webrtc/modules/rtp_rtcp/source/rtp_sender_unittest.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698