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

Implement recieving NACK in RtcpTranceiver

Browse Source 
Bug: webrtc:8239
Change-Id: I41d6c3252bbffeab66ded7ed294f82134351541a
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/254800
Reviewed-by: Emil Lundmark <lndmrk@webrtc.org>
Commit-Queue: Danil Chapovalov <danilchap@webrtc.org>
Cr-Commit-Position: refs/heads/main@{#36254}
This commit is contained in:
Danil Chapovalov
2022-03-18 14:49:12 +01:00
committed by WebRTC LUCI CQ
parent 16af378884
commit ef6b028c92
4 changed files with 63 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
modules/rtp_rtcp/source/rtcp_transceiver_impl_unittest.cc
View File

@ -40,6 +40,7 @@ namespace {
using ::testing::_;
using ::testing::ElementsAre;
using ::testing::ElementsAreArray;
using ::testing::Ge;
using ::testing::NiceMock;
using ::testing::Return;
@ -82,6 +83,10 @@ class MockRtpStreamRtcpHandler : public RtpStreamRtcpHandler {
}
MOCK_METHOD(RtpStats, SentStats, (), (override));
MOCK_METHOD(void,
OnNack,
(uint32_t, rtc::ArrayView<const uint16_t>),
(override));
private:
int num_calls_ = 0;
@ -1044,6 +1049,30 @@ TEST(RtcpTransceiverImplTest, SendsNack) {
EXPECT_EQ(rtcp_parser.nack()->packet_ids(), kMissingSequenceNumbers);
}
TEST(RtcpTransceiverImplTest, ReceivesNack) {
static constexpr uint32_t kRemoteSsrc = 4321;
static constexpr uint32_t kMediaSsrc1 = 1234;
static constexpr uint32_t kMediaSsrc2 = 1235;
std::vector<uint16_t> kMissingSequenceNumbers = {34, 37, 38};
RtcpTransceiverConfig config = DefaultTestConfig();
RtcpTransceiverImpl rtcp_transceiver(config);
MockRtpStreamRtcpHandler local_stream1;
MockRtpStreamRtcpHandler local_stream2;
EXPECT_CALL(local_stream1,
OnNack(kRemoteSsrc, ElementsAreArray(kMissingSequenceNumbers)));
EXPECT_CALL(local_stream2, OnNack).Times(0);
EXPECT_TRUE(rtcp_transceiver.AddMediaSender(kMediaSsrc1, &local_stream1));
EXPECT_TRUE(rtcp_transceiver.AddMediaSender(kMediaSsrc2, &local_stream2));
rtcp::Nack nack;
nack.SetSenderSsrc(kRemoteSsrc);
nack.SetMediaSsrc(kMediaSsrc1);
nack.SetPacketIds(kMissingSequenceNumbers);
rtcp_transceiver.ReceivePacket(nack.Build(), config.clock->CurrentTime());
}
TEST(RtcpTransceiverImplTest, RequestKeyFrameWithPictureLossIndication) {
const uint32_t kSenderSsrc = 1234;
const uint32_t kRemoteSsrc = 4321;