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

Side by Side Diff: webrtc/modules/rtp_rtcp/source/rtcp_format_remb_unittest.cc

Issue 1571283002: Fixes a bug which incorrectly logs incoming RTCP as outgoing. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Rebase Created 4 years, 11 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) 2012 The WebRTC project authors. All Rights Reserved. 2 * Copyright (c) 2012 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 10
(...skipping 76 matching lines...) Expand 10 before | Expand all | Expand 10 after
87 RtpRtcp::Configuration configuration; 87 RtpRtcp::Configuration configuration;
88 configuration.audio = false; 88 configuration.audio = false;
89 configuration.clock = system_clock_; 89 configuration.clock = system_clock_;
90 configuration.remote_bitrate_estimator = remote_bitrate_estimator_.get(); 90 configuration.remote_bitrate_estimator = remote_bitrate_estimator_.get();
91 configuration.outgoing_transport = &null_transport_; 91 configuration.outgoing_transport = &null_transport_;
92 dummy_rtp_rtcp_impl_ = new ModuleRtpRtcpImpl(configuration); 92 dummy_rtp_rtcp_impl_ = new ModuleRtpRtcpImpl(configuration);
93 rtcp_receiver_ = new RTCPReceiver(system_clock_, false, nullptr, nullptr, 93 rtcp_receiver_ = new RTCPReceiver(system_clock_, false, nullptr, nullptr,
94 nullptr, nullptr, dummy_rtp_rtcp_impl_); 94 nullptr, nullptr, dummy_rtp_rtcp_impl_);
95 test_transport_ = new TestTransport(rtcp_receiver_); 95 test_transport_ = new TestTransport(rtcp_receiver_);
96 rtcp_sender_ = new RTCPSender(false, system_clock_, receive_statistics_.get(), 96 rtcp_sender_ = new RTCPSender(false, system_clock_, receive_statistics_.get(),
97 nullptr, test_transport_); 97 nullptr, nullptr, test_transport_);
98 } 98 }
99 99
100 void RtcpFormatRembTest::TearDown() { 100 void RtcpFormatRembTest::TearDown() {
101 delete rtcp_sender_; 101 delete rtcp_sender_;
102 delete rtcp_receiver_; 102 delete rtcp_receiver_;
103 delete dummy_rtp_rtcp_impl_; 103 delete dummy_rtp_rtcp_impl_;
104 delete test_transport_; 104 delete test_transport_;
105 } 105 }
106 106
107 TEST_F(RtcpFormatRembTest, TestRembStatus) { 107 TEST_F(RtcpFormatRembTest, TestRembStatus) {
(...skipping 16 matching lines...) Expand all
124 TEST_F(RtcpFormatRembTest, TestCompund) { 124 TEST_F(RtcpFormatRembTest, TestCompund) {
125 uint32_t SSRCs[2] = {456789, 98765}; 125 uint32_t SSRCs[2] = {456789, 98765};
126 rtcp_sender_->SetRTCPStatus(RtcpMode::kCompound); 126 rtcp_sender_->SetRTCPStatus(RtcpMode::kCompound);
127 rtcp_sender_->SetREMBData(1234, std::vector<uint32_t>(SSRCs, SSRCs + 2)); 127 rtcp_sender_->SetREMBData(1234, std::vector<uint32_t>(SSRCs, SSRCs + 2));
128 RTCPSender::FeedbackState feedback_state = 128 RTCPSender::FeedbackState feedback_state =
129 dummy_rtp_rtcp_impl_->GetFeedbackState(); 129 dummy_rtp_rtcp_impl_->GetFeedbackState();
130 EXPECT_EQ(0, rtcp_sender_->SendRTCP(feedback_state, kRtcpRemb)); 130 EXPECT_EQ(0, rtcp_sender_->SendRTCP(feedback_state, kRtcpRemb));
131 } 131 }
132 } // namespace 132 } // namespace
133 } // namespace webrtc 133 } // namespace webrtc
OLDNEW
« no previous file with comments | « webrtc/modules/rtp_rtcp/include/rtp_rtcp.h ('k') | webrtc/modules/rtp_rtcp/source/rtcp_sender.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698