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

Side by Side Diff: webrtc/call/bitrate_estimator_tests.cc

Issue 2826263004: Move responsibility for RTP header extensions on video receive. (Closed)
Patch Set: 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
« no previous file with comments | « no previous file | webrtc/call/call.h » ('j') | webrtc/call/call.h » ('J')
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 109 matching lines...) Expand 10 before | Expand all | Expand 10 after
120 video_send_config_.encoder_settings.payload_name = "FAKE"; 120 video_send_config_.encoder_settings.payload_name = "FAKE";
121 video_send_config_.encoder_settings.payload_type = 121 video_send_config_.encoder_settings.payload_type =
122 kFakeVideoSendPayloadType; 122 kFakeVideoSendPayloadType;
123 test::FillEncoderConfiguration(1, &video_encoder_config_); 123 test::FillEncoderConfiguration(1, &video_encoder_config_);
124 124
125 receive_config_ = VideoReceiveStream::Config(receive_transport_.get()); 125 receive_config_ = VideoReceiveStream::Config(receive_transport_.get());
126 // receive_config_.decoders will be set by every stream separately. 126 // receive_config_.decoders will be set by every stream separately.
127 receive_config_.rtp.remote_ssrc = video_send_config_.rtp.ssrcs[0]; 127 receive_config_.rtp.remote_ssrc = video_send_config_.rtp.ssrcs[0];
128 receive_config_.rtp.local_ssrc = kReceiverLocalVideoSsrc; 128 receive_config_.rtp.local_ssrc = kReceiverLocalVideoSsrc;
129 receive_config_.rtp.remb = true; 129 receive_config_.rtp.remb = true;
130 #if 0
131 // TODO(nisse): Configure receiver_call_ instead.
130 receive_config_.rtp.extensions.push_back( 132 receive_config_.rtp.extensions.push_back(
131 RtpExtension(RtpExtension::kTimestampOffsetUri, kTOFExtensionId)); 133 RtpExtension(RtpExtension::kTimestampOffsetUri, kTOFExtensionId));
132 receive_config_.rtp.extensions.push_back( 134 receive_config_.rtp.extensions.push_back(
133 RtpExtension(RtpExtension::kAbsSendTimeUri, kASTExtensionId)); 135 RtpExtension(RtpExtension::kAbsSendTimeUri, kASTExtensionId));
136 #endif
134 } 137 }
135 138
136 virtual void TearDown() { 139 virtual void TearDown() {
137 std::for_each(streams_.begin(), streams_.end(), 140 std::for_each(streams_.begin(), streams_.end(),
138 std::mem_fun(&Stream::StopSending)); 141 std::mem_fun(&Stream::StopSending));
139 142
140 send_transport_->StopSending(); 143 send_transport_->StopSending();
141 receive_transport_->StopSending(); 144 receive_transport_->StopSending();
142 145
143 while (!streams_.empty()) { 146 while (!streams_.empty()) {
(...skipping 153 matching lines...) Expand 10 before | Expand all | Expand 10 after
297 RtpExtension(RtpExtension::kTimestampOffsetUri, kTOFExtensionId); 300 RtpExtension(RtpExtension::kTimestampOffsetUri, kTOFExtensionId);
298 receiver_log_.PushExpectedLogLine(kAbsSendTimeLog); 301 receiver_log_.PushExpectedLogLine(kAbsSendTimeLog);
299 receiver_log_.PushExpectedLogLine( 302 receiver_log_.PushExpectedLogLine(
300 "WrappingBitrateEstimator: Switching to transmission time offset RBE."); 303 "WrappingBitrateEstimator: Switching to transmission time offset RBE.");
301 streams_.push_back(new Stream(this)); 304 streams_.push_back(new Stream(this));
302 streams_[0]->StopSending(); 305 streams_[0]->StopSending();
303 streams_[1]->StopSending(); 306 streams_[1]->StopSending();
304 EXPECT_TRUE(receiver_log_.Wait()); 307 EXPECT_TRUE(receiver_log_.Wait());
305 } 308 }
306 } // namespace webrtc 309 } // namespace webrtc
OLDNEW
« no previous file with comments | « no previous file | webrtc/call/call.h » ('j') | webrtc/call/call.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698