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

Side by Side Diff: call/bitrate_estimator_tests.cc

Issue 2826263004: Move responsibility for RTP header extensions on video receive. (Closed)
Patch Set: Crude rebase. Created 3 years, 2 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 | « no previous file | call/call.h » ('j') | 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 <functional> 10 #include <functional>
(...skipping 110 matching lines...) Expand 10 before | Expand all | Expand 10 after
121 video_send_config_.encoder_settings.payload_name = "FAKE"; 121 video_send_config_.encoder_settings.payload_name = "FAKE";
122 video_send_config_.encoder_settings.payload_type = 122 video_send_config_.encoder_settings.payload_type =
123 kFakeVideoSendPayloadType; 123 kFakeVideoSendPayloadType;
124 test::FillEncoderConfiguration(1, &video_encoder_config_); 124 test::FillEncoderConfiguration(1, &video_encoder_config_);
125 125
126 receive_config_ = VideoReceiveStream::Config(receive_transport_.get()); 126 receive_config_ = VideoReceiveStream::Config(receive_transport_.get());
127 // receive_config_.decoders will be set by every stream separately. 127 // receive_config_.decoders will be set by every stream separately.
128 receive_config_.rtp.remote_ssrc = video_send_config_.rtp.ssrcs[0]; 128 receive_config_.rtp.remote_ssrc = video_send_config_.rtp.ssrcs[0];
129 receive_config_.rtp.local_ssrc = kReceiverLocalVideoSsrc; 129 receive_config_.rtp.local_ssrc = kReceiverLocalVideoSsrc;
130 receive_config_.rtp.remb = true; 130 receive_config_.rtp.remb = true;
131 #if 0
131 receive_config_.rtp.extensions.push_back( 132 receive_config_.rtp.extensions.push_back(
132 RtpExtension(RtpExtension::kTimestampOffsetUri, kTOFExtensionId)); 133 RtpExtension(RtpExtension::kTimestampOffsetUri, kTOFExtensionId));
133 receive_config_.rtp.extensions.push_back( 134 receive_config_.rtp.extensions.push_back(
134 RtpExtension(RtpExtension::kAbsSendTimeUri, kASTExtensionId)); 135 RtpExtension(RtpExtension::kAbsSendTimeUri, kASTExtensionId));
136 #endif
135 }); 137 });
136 } 138 }
137 139
138 virtual void TearDown() { 140 virtual void TearDown() {
139 task_queue_.SendTask([this]() { 141 task_queue_.SendTask([this]() {
140 std::for_each(streams_.begin(), streams_.end(), 142 std::for_each(streams_.begin(), streams_.end(),
141 std::mem_fun(&Stream::StopSending)); 143 std::mem_fun(&Stream::StopSending));
142 144
143 while (!streams_.empty()) { 145 while (!streams_.empty()) {
144 delete streams_.back(); 146 delete streams_.back();
(...skipping 170 matching lines...) Expand 10 before | Expand all | Expand 10 after
315 receiver_log_.PushExpectedLogLine(kAbsSendTimeLog); 317 receiver_log_.PushExpectedLogLine(kAbsSendTimeLog);
316 receiver_log_.PushExpectedLogLine( 318 receiver_log_.PushExpectedLogLine(
317 "WrappingBitrateEstimator: Switching to transmission time offset RBE."); 319 "WrappingBitrateEstimator: Switching to transmission time offset RBE.");
318 streams_.push_back(new Stream(this)); 320 streams_.push_back(new Stream(this));
319 streams_[0]->StopSending(); 321 streams_[0]->StopSending();
320 streams_[1]->StopSending(); 322 streams_[1]->StopSending();
321 }); 323 });
322 EXPECT_TRUE(receiver_log_.Wait()); 324 EXPECT_TRUE(receiver_log_.Wait());
323 } 325 }
324 } // namespace webrtc 326 } // namespace webrtc
OLDNEW
« no previous file with comments | « no previous file | call/call.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698