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

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

Issue 2589713003: Make |rtcp_send_transport| mandatory in FlexfecReceiveStream::Config. (Closed)
Patch Set: Clarify config setup in VideoQualityTest a bit. Created 3 years, 12 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) 2016 The WebRTC project authors. All Rights Reserved. 2 * Copyright (c) 2016 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
11 #include "webrtc/base/array_view.h" 11 #include "webrtc/base/array_view.h"
12 #include "webrtc/base/basictypes.h" 12 #include "webrtc/base/basictypes.h"
13 #include "webrtc/call/flexfec_receive_stream_impl.h" 13 #include "webrtc/call/flexfec_receive_stream_impl.h"
14 #include "webrtc/modules/rtp_rtcp/include/flexfec_receiver.h" 14 #include "webrtc/modules/rtp_rtcp/include/flexfec_receiver.h"
15 #include "webrtc/modules/rtp_rtcp/mocks/mock_recovered_packet_receiver.h"
15 #include "webrtc/modules/rtp_rtcp/source/byte_io.h" 16 #include "webrtc/modules/rtp_rtcp/source/byte_io.h"
16 #include "webrtc/modules/rtp_rtcp/source/rtp_packet_received.h" 17 #include "webrtc/modules/rtp_rtcp/source/rtp_header_extensions.h"
17 #include "webrtc/modules/rtp_rtcp/mocks/mock_recovered_packet_receiver.h"
18 #include "webrtc/test/gmock.h" 18 #include "webrtc/test/gmock.h"
19 #include "webrtc/test/gtest.h" 19 #include "webrtc/test/gtest.h"
20 #include "webrtc/test/mock_transport.h"
20 21
21 namespace webrtc { 22 namespace webrtc {
22 23
23 namespace { 24 namespace {
24 25
26 constexpr uint8_t kFlexfecPlType = 118;
27 constexpr uint8_t kFlexfecSsrc[] = {0x00, 0x00, 0x00, 0x01};
28 constexpr uint8_t kMediaSsrc[] = {0x00, 0x00, 0x00, 0x02};
29
30 FlexfecReceiveStream::Config CreateDefaultConfig(
31 Transport* rtcp_send_transport) {
32 FlexfecReceiveStream::Config config(rtcp_send_transport);
33 config.payload_type = kFlexfecPlType;
34 config.remote_ssrc = ByteReader<uint32_t>::ReadBigEndian(kFlexfecSsrc);
35 config.protected_media_ssrcs = {
36 ByteReader<uint32_t>::ReadBigEndian(kMediaSsrc)};
37 EXPECT_TRUE(config.IsCompleteAndEnabled());
38 return config;
39 }
40
25 RtpPacketReceived ParsePacket(rtc::ArrayView<const uint8_t> packet) { 41 RtpPacketReceived ParsePacket(rtc::ArrayView<const uint8_t> packet) {
26 RtpPacketReceived parsed_packet(nullptr); 42 RtpPacketReceived parsed_packet(nullptr);
27 EXPECT_TRUE(parsed_packet.Parse(packet)); 43 EXPECT_TRUE(parsed_packet.Parse(packet));
28 return parsed_packet; 44 return parsed_packet;
29 } 45 }
30 46
31 } // namespace 47 } // namespace
32 48
33 TEST(FlexfecReceiveStreamTest, ConstructDestruct) { 49 TEST(FlexfecReceiveStreamConfigTest, IsCompleteAndEnabled) {
34 FlexfecReceiveStream::Config config; 50 MockTransport rtcp_send_transport;
35 config.payload_type = 118; 51 FlexfecReceiveStream::Config config(&rtcp_send_transport);
36 config.remote_ssrc = 424223;
37 config.protected_media_ssrcs = {912512};
38 MockRecoveredPacketReceiver recovered_packet_receiver;
39 52
40 FlexfecReceiveStreamImpl receive_stream(config, &recovered_packet_receiver); 53 config.local_ssrc = 18374743;
54 config.rtcp_mode = RtcpMode::kCompound;
55 config.transport_cc = true;
56 config.rtp_header_extensions.emplace_back(TransportSequenceNumber::kUri, 7);
57 EXPECT_FALSE(config.IsCompleteAndEnabled());
58
59 config.payload_type = 123;
60 EXPECT_FALSE(config.IsCompleteAndEnabled());
61
62 config.remote_ssrc = 238423838;
63 EXPECT_FALSE(config.IsCompleteAndEnabled());
64
65 config.protected_media_ssrcs.push_back(138989393);
66 EXPECT_TRUE(config.IsCompleteAndEnabled());
67
68 config.protected_media_ssrcs.push_back(33423423);
69 EXPECT_FALSE(config.IsCompleteAndEnabled());
41 } 70 }
42 71
43 TEST(FlexfecReceiveStreamTest, StartStop) { 72 class FlexfecReceiveStreamTest : public ::testing::Test {
44 FlexfecReceiveStream::Config config; 73 protected:
45 config.payload_type = 118; 74 FlexfecReceiveStreamTest()
46 config.remote_ssrc = 1652392; 75 : config_(CreateDefaultConfig(&rtcp_send_transport_)),
47 config.protected_media_ssrcs = {23300443}; 76 receive_stream_(config_, &recovered_packet_receiver_) {}
48 MockRecoveredPacketReceiver recovered_packet_receiver;
49 FlexfecReceiveStreamImpl receive_stream(config, &recovered_packet_receiver);
50 77
51 receive_stream.Start(); 78 FlexfecReceiveStream::Config config_;
52 receive_stream.Stop(); 79 MockRecoveredPacketReceiver recovered_packet_receiver_;
80 MockTransport rtcp_send_transport_;
81
82 FlexfecReceiveStreamImpl receive_stream_;
83 };
84
85 TEST_F(FlexfecReceiveStreamTest, ConstructDestruct) {}
86
87 TEST_F(FlexfecReceiveStreamTest, StartStop) {
88 receive_stream_.Start();
89 receive_stream_.Stop();
53 } 90 }
54 91
55 // Create a FlexFEC packet that protects a single media packet and ensure 92 // Create a FlexFEC packet that protects a single media packet and ensure
56 // that the callback is called. Correctness of recovery is checked in the 93 // that the callback is called. Correctness of recovery is checked in the
57 // FlexfecReceiver unit tests. 94 // FlexfecReceiver unit tests.
58 TEST(FlexfecReceiveStreamTest, RecoversPacketWhenStarted) { 95 TEST_F(FlexfecReceiveStreamTest, RecoversPacketWhenStarted) {
59 constexpr uint8_t kFlexfecPlType = 118;
60 constexpr uint8_t kFlexfecSeqNum[] = {0x00, 0x01}; 96 constexpr uint8_t kFlexfecSeqNum[] = {0x00, 0x01};
61 constexpr uint8_t kFlexfecTs[] = {0x00, 0x11, 0x22, 0x33}; 97 constexpr uint8_t kFlexfecTs[] = {0x00, 0x11, 0x22, 0x33};
62 constexpr uint8_t kFlexfecSsrc[] = {0x00, 0x00, 0x00, 0x01};
63 constexpr uint8_t kMediaPlType = 107; 98 constexpr uint8_t kMediaPlType = 107;
64 constexpr uint8_t kMediaSeqNum[] = {0x00, 0x02}; 99 constexpr uint8_t kMediaSeqNum[] = {0x00, 0x02};
65 constexpr uint8_t kMediaTs[] = {0xaa, 0xbb, 0xcc, 0xdd}; 100 constexpr uint8_t kMediaTs[] = {0xaa, 0xbb, 0xcc, 0xdd};
66 constexpr uint8_t kMediaSsrc[] = {0x00, 0x00, 0x00, 0x02};
67 101
68 // This packet mask protects a single media packet, i.e., the FlexFEC payload 102 // This packet mask protects a single media packet, i.e., the FlexFEC payload
69 // is a copy of that media packet. When inserted in the FlexFEC pipeline, 103 // is a copy of that media packet. When inserted in the FlexFEC pipeline,
70 // it will thus trivially recover the lost media packet. 104 // it will thus trivially recover the lost media packet.
71 constexpr uint8_t kKBit0 = 1 << 7; 105 constexpr uint8_t kKBit0 = 1 << 7;
72 constexpr uint8_t kFlexfecPktMask[] = {kKBit0 | 0x00, 0x01}; 106 constexpr uint8_t kFlexfecPktMask[] = {kKBit0 | 0x00, 0x01};
73 constexpr uint8_t kPayloadLength[] = {0x00, 0x04}; 107 constexpr uint8_t kPayloadLength[] = {0x00, 0x04};
74 constexpr uint8_t kSsrcCount = 1; 108 constexpr uint8_t kSsrcCount = 1;
75 constexpr uint8_t kReservedBits = 0x00; 109 constexpr uint8_t kReservedBits = 0x00;
76 constexpr uint8_t kPayloadBits = 0x00; 110 constexpr uint8_t kPayloadBits = 0x00;
77 // clang-format off 111 // clang-format off
78 constexpr uint8_t kFlexfecPacket[] = { 112 constexpr uint8_t kFlexfecPacket[] = {
79 // RTP header. 113 // RTP header.
80 0x80, kFlexfecPlType, kFlexfecSeqNum[0], kFlexfecSeqNum[1], 114 0x80, kFlexfecPlType, kFlexfecSeqNum[0], kFlexfecSeqNum[1],
81 kFlexfecTs[0], kFlexfecTs[1], kFlexfecTs[2], kFlexfecTs[3], 115 kFlexfecTs[0], kFlexfecTs[1], kFlexfecTs[2], kFlexfecTs[3],
82 kFlexfecSsrc[0], kFlexfecSsrc[1], kFlexfecSsrc[2], kFlexfecSsrc[3], 116 kFlexfecSsrc[0], kFlexfecSsrc[1], kFlexfecSsrc[2], kFlexfecSsrc[3],
83 // FlexFEC header. 117 // FlexFEC header.
84 0x00, kMediaPlType, kPayloadLength[0], kPayloadLength[1], 118 0x00, kMediaPlType, kPayloadLength[0], kPayloadLength[1],
85 kMediaTs[0], kMediaTs[1], kMediaTs[2], kMediaTs[3], 119 kMediaTs[0], kMediaTs[1], kMediaTs[2], kMediaTs[3],
86 kSsrcCount, kReservedBits, kReservedBits, kReservedBits, 120 kSsrcCount, kReservedBits, kReservedBits, kReservedBits,
87 kMediaSsrc[0], kMediaSsrc[1], kMediaSsrc[2], kMediaSsrc[3], 121 kMediaSsrc[0], kMediaSsrc[1], kMediaSsrc[2], kMediaSsrc[3],
88 kMediaSeqNum[0], kMediaSeqNum[1], kFlexfecPktMask[0], kFlexfecPktMask[1], 122 kMediaSeqNum[0], kMediaSeqNum[1], kFlexfecPktMask[0], kFlexfecPktMask[1],
89 // FEC payload. 123 // FEC payload.
90 kPayloadBits, kPayloadBits, kPayloadBits, kPayloadBits}; 124 kPayloadBits, kPayloadBits, kPayloadBits, kPayloadBits};
91 // clang-format on 125 // clang-format on
92 126
93 FlexfecReceiveStream::Config config;
94 config.payload_type = kFlexfecPlType;
95 config.remote_ssrc = ByteReader<uint32_t>::ReadBigEndian(kFlexfecSsrc);
96 config.protected_media_ssrcs = {
97 ByteReader<uint32_t>::ReadBigEndian(kMediaSsrc)};
98 testing::StrictMock<MockRecoveredPacketReceiver> recovered_packet_receiver; 127 testing::StrictMock<MockRecoveredPacketReceiver> recovered_packet_receiver;
99 FlexfecReceiveStreamImpl receive_stream(config, &recovered_packet_receiver); 128 FlexfecReceiveStreamImpl receive_stream(config_, &recovered_packet_receiver);
100 129
101 // Do not call back before being started. 130 // Do not call back before being started.
102 receive_stream.AddAndProcessReceivedPacket(ParsePacket(kFlexfecPacket)); 131 receive_stream.AddAndProcessReceivedPacket(ParsePacket(kFlexfecPacket));
103 132
104 // Call back after being started. 133 // Call back after being started.
105 receive_stream.Start(); 134 receive_stream.Start();
106 EXPECT_CALL( 135 EXPECT_CALL(
107 recovered_packet_receiver, 136 recovered_packet_receiver,
108 OnRecoveredPacket(::testing::_, kRtpHeaderSize + kPayloadLength[1])); 137 OnRecoveredPacket(::testing::_, kRtpHeaderSize + kPayloadLength[1]));
109 receive_stream.AddAndProcessReceivedPacket(ParsePacket(kFlexfecPacket)); 138 receive_stream.AddAndProcessReceivedPacket(ParsePacket(kFlexfecPacket));
110 } 139 }
111 140
112 } // namespace webrtc 141 } // namespace webrtc
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698