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

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

Issue 2553863003: Parse FlexFEC RTP headers in Call and add integration with BWE. (Closed)
Patch Set: Work in progress. Created 4 years 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/basictypes.h" 11 #include "webrtc/base/basictypes.h"
12 #include "webrtc/call/flexfec_receive_stream.h" 12 #include "webrtc/call/flexfec_receive_stream.h"
13 #include "webrtc/modules/remote_bitrate_estimator/include/mock/mock_remote_bitra te_estimator.h"
13 #include "webrtc/modules/rtp_rtcp/include/flexfec_receiver.h" 14 #include "webrtc/modules/rtp_rtcp/include/flexfec_receiver.h"
14 #include "webrtc/modules/rtp_rtcp/source/byte_io.h" 15 #include "webrtc/modules/rtp_rtcp/source/byte_io.h"
16 #include "webrtc/modules/rtp_rtcp/source/rtp_packet_received.h"
15 #include "webrtc/modules/rtp_rtcp/mocks/mock_recovered_packet_receiver.h" 17 #include "webrtc/modules/rtp_rtcp/mocks/mock_recovered_packet_receiver.h"
16 #include "webrtc/test/gmock.h" 18 #include "webrtc/test/gmock.h"
17 #include "webrtc/test/gtest.h" 19 #include "webrtc/test/gtest.h"
18 20
19 namespace webrtc { 21 namespace webrtc {
20 22
23 namespace {
24
25 RtpPacketReceived ParsePacket(const uint8_t* data, size_t length) {
26 RtpPacketReceived packet(nullptr);
27 packet.Parse(data, length);
28 return packet;
29 }
30
31 } // namespace
32
21 TEST(FlexfecReceiveStreamTest, ConstructDestruct) { 33 TEST(FlexfecReceiveStreamTest, ConstructDestruct) {
22 FlexfecReceiveStream::Config config; 34 FlexfecReceiveStream::Config config;
23 config.payload_type = 118; 35 config.payload_type = 118;
24 config.remote_ssrc = 424223; 36 config.remote_ssrc = 424223;
25 config.protected_media_ssrcs = {912512}; 37 config.protected_media_ssrcs = {912512};
26 MockRecoveredPacketReceiver callback; 38 MockRecoveredPacketReceiver callback;
39 MockRemoteBitrateEstimator bwe;
27 40
28 internal::FlexfecReceiveStream receive_stream(config, &callback); 41 internal::FlexfecReceiveStream receive_stream(config, &callback, &bwe);
29 } 42 }
30 43
31 TEST(FlexfecReceiveStreamTest, StartStop) { 44 TEST(FlexfecReceiveStreamTest, StartStop) {
32 FlexfecReceiveStream::Config config; 45 FlexfecReceiveStream::Config config;
33 config.payload_type = 118; 46 config.payload_type = 118;
34 config.remote_ssrc = 1652392; 47 config.remote_ssrc = 1652392;
35 config.protected_media_ssrcs = {23300443}; 48 config.protected_media_ssrcs = {23300443};
36 MockRecoveredPacketReceiver callback; 49 MockRecoveredPacketReceiver callback;
37 internal::FlexfecReceiveStream receive_stream(config, &callback); 50 MockRemoteBitrateEstimator bwe;
51 internal::FlexfecReceiveStream receive_stream(config, &callback, &bwe);
38 52
39 receive_stream.Start(); 53 receive_stream.Start();
40 receive_stream.Stop(); 54 receive_stream.Stop();
41 } 55 }
42 56
43 TEST(FlexfecReceiveStreamTest, DoesNotProcessPacketWhenNoMediaSsrcGiven) { 57 TEST(FlexfecReceiveStreamTest, DoesNotProcessPacketWhenNoMediaSsrcGiven) {
44 FlexfecReceiveStream::Config config; 58 FlexfecReceiveStream::Config config;
45 config.payload_type = 118; 59 config.payload_type = 118;
46 config.remote_ssrc = 424223; 60 config.remote_ssrc = 424223;
47 config.protected_media_ssrcs = {}; 61 config.protected_media_ssrcs = {};
48 MockRecoveredPacketReceiver callback; 62 MockRecoveredPacketReceiver callback;
49 internal::FlexfecReceiveStream receive_stream(config, &callback); 63 MockRemoteBitrateEstimator bwe;
64 internal::FlexfecReceiveStream receive_stream(config, &callback, &bwe);
50 const uint8_t packet[] = {0x00, 0x11, 0x22, 0x33}; 65 const uint8_t packet[] = {0x00, 0x11, 0x22, 0x33};
51 const size_t packet_length = sizeof(packet); 66 const size_t packet_length = sizeof(packet);
52 67
53 EXPECT_FALSE( 68 EXPECT_FALSE(receive_stream.AddAndProcessReceivedPacket(
54 receive_stream.AddAndProcessReceivedPacket(packet, packet_length)); 69 ParsePacket(packet, packet_length)));
55 } 70 }
56 71
57 // Create a FlexFEC packet that protects a single media packet and ensure 72 // Create a FlexFEC packet that protects a single media packet and ensure
58 // that the callback is called. Correctness of recovery is checked in the 73 // that the callback is called. Correctness of recovery is checked in the
59 // FlexfecReceiver unit tests. 74 // FlexfecReceiver unit tests.
60 TEST(FlexfecReceiveStreamTest, RecoversPacketWhenStarted) { 75 TEST(FlexfecReceiveStreamTest, RecoversPacketWhenStarted) {
61 constexpr uint8_t kFlexfecPlType = 118; 76 constexpr uint8_t kFlexfecPlType = 118;
62 constexpr uint8_t kFlexfecSeqNum[] = {0x00, 0x01}; 77 constexpr uint8_t kFlexfecSeqNum[] = {0x00, 0x01};
63 constexpr uint8_t kFlexfecTs[] = {0x00, 0x11, 0x22, 0x33}; 78 constexpr uint8_t kFlexfecTs[] = {0x00, 0x11, 0x22, 0x33};
64 constexpr uint8_t kFlexfecSsrc[] = {0x00, 0x00, 0x00, 0x01}; 79 constexpr uint8_t kFlexfecSsrc[] = {0x00, 0x00, 0x00, 0x01};
(...skipping 26 matching lines...) Expand all
91 // FEC payload. 106 // FEC payload.
92 kPayloadBits, kPayloadBits, kPayloadBits, kPayloadBits}; 107 kPayloadBits, kPayloadBits, kPayloadBits, kPayloadBits};
93 // clang-format on 108 // clang-format on
94 constexpr size_t kFlexfecPacketLength = sizeof(kFlexfecPacket); 109 constexpr size_t kFlexfecPacketLength = sizeof(kFlexfecPacket);
95 110
96 FlexfecReceiveStream::Config config; 111 FlexfecReceiveStream::Config config;
97 config.payload_type = kFlexfecPlType; 112 config.payload_type = kFlexfecPlType;
98 config.remote_ssrc = ByteReader<uint32_t>::ReadBigEndian(kFlexfecSsrc); 113 config.remote_ssrc = ByteReader<uint32_t>::ReadBigEndian(kFlexfecSsrc);
99 config.protected_media_ssrcs = { 114 config.protected_media_ssrcs = {
100 ByteReader<uint32_t>::ReadBigEndian(kMediaSsrc)}; 115 ByteReader<uint32_t>::ReadBigEndian(kMediaSsrc)};
101 testing::StrictMock<MockRecoveredPacketReceiver> recovered_packet_receiver; 116 testing::StrictMock<MockRecoveredPacketReceiver> callback;
102 internal::FlexfecReceiveStream receive_stream(config, 117 MockRemoteBitrateEstimator bwe;
103 &recovered_packet_receiver); 118 internal::FlexfecReceiveStream receive_stream(config, &callback, &bwe);
104 119
105 // Do not call back before being started. 120 // Do not call back before being started.
106 receive_stream.AddAndProcessReceivedPacket(kFlexfecPacket, 121 receive_stream.AddAndProcessReceivedPacket(
107 kFlexfecPacketLength); 122 ParsePacket(kFlexfecPacket, kFlexfecPacketLength));
108 123
109 // Call back after being started. 124 // Call back after being started.
110 receive_stream.Start(); 125 receive_stream.Start();
111 EXPECT_CALL( 126 EXPECT_CALL(callback, OnRecoveredPacket(::testing::_,
112 recovered_packet_receiver, 127 kRtpHeaderSize + kPayloadLength[1]));
113 OnRecoveredPacket(::testing::_, kRtpHeaderSize + kPayloadLength[1])); 128 receive_stream.AddAndProcessReceivedPacket(
114 receive_stream.AddAndProcessReceivedPacket(kFlexfecPacket, 129 ParsePacket(kFlexfecPacket, kFlexfecPacketLength));
115 kFlexfecPacketLength);
116 } 130 }
117 131
118 } // namespace webrtc 132 } // namespace webrtc
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698