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

Side by Side Diff: webrtc/modules/rtp_rtcp/source/ulpfec_receiver_impl.h

Issue 2918333002: Reland of Only compare sequence numbers from the same SSRC in ForwardErrorCorrection. (Closed)
Patch Set: Let ForwardErrorCorrection be aware of its SSRCs. Created 3 years, 6 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) 2012 The WebRTC project authors. All Rights Reserved. 2 * Copyright (c) 2012 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_SOURCE_ULPFEC_RECEIVER_IMPL_H_ 11 #ifndef WEBRTC_MODULES_RTP_RTCP_SOURCE_ULPFEC_RECEIVER_IMPL_H_
12 #define WEBRTC_MODULES_RTP_RTCP_SOURCE_ULPFEC_RECEIVER_IMPL_H_ 12 #define WEBRTC_MODULES_RTP_RTCP_SOURCE_ULPFEC_RECEIVER_IMPL_H_
13 13
14 #include <memory> 14 #include <memory>
15 15
16 #include "webrtc/base/criticalsection.h" 16 #include "webrtc/base/criticalsection.h"
17 #include "webrtc/modules/rtp_rtcp/include/rtp_rtcp_defines.h" 17 #include "webrtc/modules/rtp_rtcp/include/rtp_rtcp_defines.h"
18 #include "webrtc/modules/rtp_rtcp/include/ulpfec_receiver.h" 18 #include "webrtc/modules/rtp_rtcp/include/ulpfec_receiver.h"
19 #include "webrtc/modules/rtp_rtcp/source/forward_error_correction.h" 19 #include "webrtc/modules/rtp_rtcp/source/forward_error_correction.h"
20 #include "webrtc/typedefs.h" 20 #include "webrtc/typedefs.h"
21 21
22 namespace webrtc { 22 namespace webrtc {
23 23
24 class UlpfecReceiverImpl : public UlpfecReceiver { 24 class UlpfecReceiverImpl : public UlpfecReceiver {
25 public: 25 public:
26 explicit UlpfecReceiverImpl(RecoveredPacketReceiver* callback); 26 explicit UlpfecReceiverImpl(uint32_t ssrc, RecoveredPacketReceiver* callback);
27 virtual ~UlpfecReceiverImpl(); 27 virtual ~UlpfecReceiverImpl();
28 28
29 int32_t AddReceivedRedPacket(const RTPHeader& rtp_header, 29 int32_t AddReceivedRedPacket(const RTPHeader& rtp_header,
30 const uint8_t* incoming_rtp_packet, 30 const uint8_t* incoming_rtp_packet,
31 size_t packet_length, 31 size_t packet_length,
32 uint8_t ulpfec_payload_type) override; 32 uint8_t ulpfec_payload_type) override;
33 33
34 int32_t ProcessReceivedFec() override; 34 int32_t ProcessReceivedFec() override;
35 35
36 FecPacketCounter GetPacketCounter() const override; 36 FecPacketCounter GetPacketCounter() const override;
37 37
38 private: 38 private:
39 const uint32_t ssrc_;
40
39 rtc::CriticalSection crit_sect_; 41 rtc::CriticalSection crit_sect_;
40 RecoveredPacketReceiver* recovered_packet_callback_; 42 RecoveredPacketReceiver* recovered_packet_callback_;
41 std::unique_ptr<ForwardErrorCorrection> fec_; 43 std::unique_ptr<ForwardErrorCorrection> fec_;
42 // TODO(holmer): In the current version |received_packets_| is never more 44 // TODO(holmer): In the current version |received_packets_| is never more
43 // than one packet, since we process FEC every time a new packet 45 // than one packet, since we process FEC every time a new packet
44 // arrives. We should remove the list. 46 // arrives. We should remove the list.
45 ForwardErrorCorrection::ReceivedPacketList received_packets_; 47 ForwardErrorCorrection::ReceivedPacketList received_packets_;
46 ForwardErrorCorrection::RecoveredPacketList recovered_packets_; 48 ForwardErrorCorrection::RecoveredPacketList recovered_packets_;
47 FecPacketCounter packet_counter_; 49 FecPacketCounter packet_counter_;
48 }; 50 };
49 51
50 } // namespace webrtc 52 } // namespace webrtc
51 53
52 #endif // WEBRTC_MODULES_RTP_RTCP_SOURCE_ULPFEC_RECEIVER_IMPL_H_ 54 #endif // WEBRTC_MODULES_RTP_RTCP_SOURCE_ULPFEC_RECEIVER_IMPL_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698