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

Side by Side Diff: webrtc/modules/rtp_rtcp/include/flexfec_receiver.h

Issue 2553863003: Parse FlexFEC RTP headers in Call and add integration with BWE. (Closed)
Patch Set: Add basic CongestionController unit test, based on nisse's suggestion. 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 #ifndef WEBRTC_MODULES_RTP_RTCP_INCLUDE_FLEXFEC_RECEIVER_H_ 11 #ifndef WEBRTC_MODULES_RTP_RTCP_INCLUDE_FLEXFEC_RECEIVER_H_
12 #define WEBRTC_MODULES_RTP_RTCP_INCLUDE_FLEXFEC_RECEIVER_H_ 12 #define WEBRTC_MODULES_RTP_RTCP_INCLUDE_FLEXFEC_RECEIVER_H_
13 13
14 #include <memory> 14 #include <memory>
15 15
16 #include "webrtc/base/basictypes.h" 16 #include "webrtc/base/basictypes.h"
17 #include "webrtc/base/sequenced_task_checker.h" 17 #include "webrtc/base/sequenced_task_checker.h"
18 #include "webrtc/call/call.h" 18 #include "webrtc/call/call.h"
19 #include "webrtc/modules/rtp_rtcp/include/flexfec_receiver.h"
20 #include "webrtc/modules/rtp_rtcp/include/ulpfec_receiver.h" 19 #include "webrtc/modules/rtp_rtcp/include/ulpfec_receiver.h"
21 #include "webrtc/modules/rtp_rtcp/source/forward_error_correction.h" 20 #include "webrtc/modules/rtp_rtcp/source/forward_error_correction.h"
21 #include "webrtc/modules/rtp_rtcp/source/rtp_packet_received.h"
22 #include "webrtc/system_wrappers/include/clock.h" 22 #include "webrtc/system_wrappers/include/clock.h"
23 23
24 namespace webrtc { 24 namespace webrtc {
25 25
26 // Callback interface for packets recovered by FlexFEC. The implementation 26 // Callback interface for packets recovered by FlexFEC. The implementation
27 // should be able to demultiplex the recovered RTP packets based on SSRC. 27 // should be able to demultiplex the recovered RTP packets based on SSRC.
28 class RecoveredPacketReceiver { 28 class RecoveredPacketReceiver {
29 public: 29 public:
30 virtual bool OnRecoveredPacket(const uint8_t* packet, size_t length) = 0; 30 virtual bool OnRecoveredPacket(const uint8_t* packet, size_t length) = 0;
31 31
32 protected: 32 protected:
33 virtual ~RecoveredPacketReceiver() = default; 33 virtual ~RecoveredPacketReceiver() = default;
34 }; 34 };
35 35
36 class FlexfecReceiver { 36 class FlexfecReceiver {
37 public: 37 public:
38 FlexfecReceiver(uint32_t ssrc, 38 FlexfecReceiver(uint32_t ssrc,
39 uint32_t protected_media_ssrc, 39 uint32_t protected_media_ssrc,
40 RecoveredPacketReceiver* callback); 40 RecoveredPacketReceiver* recovered_packet_receiver);
41 ~FlexfecReceiver(); 41 ~FlexfecReceiver();
42 42
43 // Inserts a received packet (can be either media or FlexFEC) into the 43 // Inserts a received packet (can be either media or FlexFEC) into the
44 // internal buffer, and sends the received packets to the erasure code. 44 // internal buffer, and sends the received packets to the erasure code.
45 // All newly recovered packets are sent back through the callback. 45 // All newly recovered packets are sent back through the callback.
46 bool AddAndProcessReceivedPacket(const uint8_t* packet, size_t packet_length); 46 bool AddAndProcessReceivedPacket(RtpPacketReceived packet);
47 47
48 // Returns a counter describing the added and recovered packets. 48 // Returns a counter describing the added and recovered packets.
49 FecPacketCounter GetPacketCounter() const; 49 FecPacketCounter GetPacketCounter() const;
50 50
51 private: 51 private:
52 bool AddReceivedPacket(const uint8_t* packet, size_t packet_length); 52 bool AddReceivedPacket(RtpPacketReceived packet);
53 bool ProcessReceivedPackets(); 53 bool ProcessReceivedPackets();
54 54
55 // Config. 55 // Config.
56 const uint32_t ssrc_; 56 const uint32_t ssrc_;
57 const uint32_t protected_media_ssrc_; 57 const uint32_t protected_media_ssrc_;
58 58
59 // Erasure code interfacing and callback. 59 // Erasure code interfacing and callback.
60 std::unique_ptr<ForwardErrorCorrection> erasure_code_ 60 std::unique_ptr<ForwardErrorCorrection> erasure_code_
61 GUARDED_BY(sequence_checker_); 61 GUARDED_BY(sequence_checker_);
62 ForwardErrorCorrection::ReceivedPacketList received_packets_ 62 ForwardErrorCorrection::ReceivedPacketList received_packets_
63 GUARDED_BY(sequence_checker_); 63 GUARDED_BY(sequence_checker_);
64 ForwardErrorCorrection::RecoveredPacketList recovered_packets_ 64 ForwardErrorCorrection::RecoveredPacketList recovered_packets_
65 GUARDED_BY(sequence_checker_); 65 GUARDED_BY(sequence_checker_);
66 RecoveredPacketReceiver* const callback_ GUARDED_BY(sequence_checker_); 66 RecoveredPacketReceiver* const recovered_packet_receiver_;
67 67
68 // Logging and stats. 68 // Logging and stats.
69 Clock* const clock_; 69 Clock* const clock_;
70 int64_t last_recovered_packet_ms_ GUARDED_BY(sequence_checker_); 70 int64_t last_recovered_packet_ms_ GUARDED_BY(sequence_checker_);
71 FecPacketCounter packet_counter_ GUARDED_BY(sequence_checker_); 71 FecPacketCounter packet_counter_ GUARDED_BY(sequence_checker_);
72 72
73 rtc::SequencedTaskChecker sequence_checker_; 73 rtc::SequencedTaskChecker sequence_checker_;
74 }; 74 };
75 75
76 } // namespace webrtc 76 } // namespace webrtc
77 77
78 #endif // WEBRTC_MODULES_RTP_RTCP_INCLUDE_FLEXFEC_RECEIVER_H_ 78 #endif // WEBRTC_MODULES_RTP_RTCP_INCLUDE_FLEXFEC_RECEIVER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698