zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add hacky way to send TransportFeedback in RtcpTransceiver

Browse Source 
With an extra interface it will allow to add both RtpRtcp module
and RtcpTransceiver as feedback sender to PacketRouter

Though hacky, this is very similar to currently used implementation
in the RTCPSender::SendFeedbackPacket

Bug: webrtc:8239
Change-Id: I237b422ae1594dede78cb63daa4aa42b6774d6fe
Reviewed-on: https://webrtc-review.googlesource.com/32680
Commit-Queue: Danil Chapovalov <danilchap@webrtc.org>
Reviewed-by: Niels Moller <nisse@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#21274}
This commit is contained in:
Danil Chapovalov
2017-12-14 11:14:35 +01:00
committed by Commit Bot
parent 408ee5f2c9
commit d5cae4d59c
5 changed files with 73 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
modules/rtp_rtcp/source/rtcp_transceiver_unittest.cc
View File

@ -10,6 +10,7 @@
#include "modules/rtp_rtcp/source/rtcp_transceiver.h"
#include "modules/rtp_rtcp/source/rtcp_packet/transport_feedback.h"
#include "rtc_base/event.h"
#include "rtc_base/ptr_util.h"
#include "test/gmock.h"
@ -19,12 +20,14 @@
namespace {
using ::testing::AtLeast;
using ::testing::Invoke;
using ::testing::InvokeWithoutArgs;
using ::testing::NiceMock;
using ::testing::_;
using ::webrtc::MockTransport;
using ::webrtc::RtcpTransceiver;
using ::webrtc::RtcpTransceiverConfig;
using ::webrtc::rtcp::TransportFeedback;
void WaitPostedTasks(rtc::TaskQueue* queue) {
rtc::Event done(false, false);
@ -132,4 +135,36 @@ TEST(RtcpTransceiverTest, DoesntSendPacketsAfterDestruction) {
EXPECT_FALSE(rtcp_transceiver);
}
TEST(RtcpTransceiverTest, SendsTransportFeedbackOnTaskQueue) {
static constexpr uint32_t kSenderSsrc = 12345;
MockTransport outgoing_transport;
rtc::TaskQueue queue("rtcp");
RtcpTransceiverConfig config;
config.feedback_ssrc = kSenderSsrc;
config.outgoing_transport = &outgoing_transport;
config.task_queue = &queue;
config.schedule_periodic_compound_packets = false;
RtcpTransceiver rtcp_transceiver(config);
EXPECT_CALL(outgoing_transport, SendRtcp(_, _))
.WillOnce(Invoke([&](const uint8_t* buffer, size_t size) {
EXPECT_TRUE(queue.IsCurrent());
std::unique_ptr<TransportFeedback> transport_feedback =
TransportFeedback::ParseFrom(buffer, size);
EXPECT_TRUE(transport_feedback);
EXPECT_EQ(transport_feedback->sender_ssrc(), kSenderSsrc);
return true;
}));
// Create minimalistic transport feedback packet.
TransportFeedback transport_feedback;
transport_feedback.SetSenderSsrc(rtcp_transceiver.SSRC());
transport_feedback.AddReceivedPacket(321, 10000);
EXPECT_TRUE(rtcp_transceiver.SendFeedbackPacket(transport_feedback));
WaitPostedTasks(&queue);
}
} // namespace