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

Side by Side Diff: webrtc/modules/rtp_rtcp/source/rtcp_packet/transport_feedback.h

Issue 2579613003: Add TransportFeedbackPacketLossTracker. (Closed)
Patch Set: rebase Created 3 years, 11 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
« no previous file with comments | « webrtc/modules/rtp_rtcp/mocks/mock_transport_feedback.h ('k') | webrtc/test/fuzzers/BUILD.gn » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (c) 2015 The WebRTC project authors. All Rights Reserved. 2 * Copyright (c) 2015 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_RTCP_PACKET_TRANSPORT_FEEDBACK_H_ 11 #ifndef WEBRTC_MODULES_RTP_RTCP_SOURCE_RTCP_PACKET_TRANSPORT_FEEDBACK_H_
12 #define WEBRTC_MODULES_RTP_RTCP_SOURCE_RTCP_PACKET_TRANSPORT_FEEDBACK_H_ 12 #define WEBRTC_MODULES_RTP_RTCP_SOURCE_RTCP_PACKET_TRANSPORT_FEEDBACK_H_
13 13
14 #include <memory> 14 #include <memory>
15 #include <vector> 15 #include <vector>
16 16
17 #include "webrtc/base/constructormagic.h" 17 #include "webrtc/base/constructormagic.h"
18 #include "webrtc/modules/rtp_rtcp/source/rtcp_packet/rtpfb.h" 18 #include "webrtc/modules/rtp_rtcp/source/rtcp_packet/rtpfb.h"
19 19
20 namespace webrtc { 20 namespace webrtc {
21 namespace rtcp { 21 namespace rtcp {
22
23 class TransportFeedbackInterface {
minyue-webrtc 2017/01/19 11:11:45 Hi Erik, I would like you take a look at my way o
24 public:
25 virtual ~TransportFeedbackInterface() = default;
26 enum class StatusSymbol {
27 kNotReceived,
28 kReceivedSmallDelta,
29 kReceivedLargeDelta,
30 };
31 virtual void SetBase(uint16_t base_sequence, int64_t ref_timestamp_us) = 0;
32 virtual void SetFeedbackSequenceNumber(uint8_t feedback_sequence) = 0;
33 virtual bool AddReceivedPacket(uint16_t sequence_number,
34 int64_t timestamp_us) = 0;
35 virtual uint16_t GetBaseSequence() const = 0;
36 virtual std::vector<StatusSymbol> GetStatusVector() const = 0;
37 virtual std::vector<int16_t> GetReceiveDeltas() const = 0;
38 virtual int64_t GetBaseTimeUs() const = 0;
39 virtual std::vector<int64_t> GetReceiveDeltasUs() const = 0;
40 };
41
22 class CommonHeader; 42 class CommonHeader;
23 43
24 class TransportFeedback : public Rtpfb { 44 // TODO(minyue): Update PacketCounter so that TransportFeedback can become a
45 // final class.
46 class TransportFeedback : public Rtpfb, public TransportFeedbackInterface {
25 public: 47 public:
26 class ReceivedPacket { 48 class ReceivedPacket {
27 public: 49 public:
28 ReceivedPacket(uint16_t sequence_number, int16_t delta_ticks) 50 ReceivedPacket(uint16_t sequence_number, int16_t delta_ticks)
29 : sequence_number_(sequence_number), delta_ticks_(delta_ticks) {} 51 : sequence_number_(sequence_number), delta_ticks_(delta_ticks) {}
30 ReceivedPacket(const ReceivedPacket&) = default; 52 ReceivedPacket(const ReceivedPacket&) = default;
31 ReceivedPacket& operator=(const ReceivedPacket&) = default; 53 ReceivedPacket& operator=(const ReceivedPacket&) = default;
32 54
33 uint16_t sequence_number() const { return sequence_number_; } 55 uint16_t sequence_number() const { return sequence_number_; }
34 int16_t delta_ticks() const { return delta_ticks_; } 56 int16_t delta_ticks() const { return delta_ticks_; }
35 int32_t delta_us() const { return delta_ticks_ * kDeltaScaleFactor; } 57 int32_t delta_us() const { return delta_ticks_ * kDeltaScaleFactor; }
36 58
37 private: 59 private:
38 uint16_t sequence_number_; 60 uint16_t sequence_number_;
39 int16_t delta_ticks_; 61 int16_t delta_ticks_;
40 }; 62 };
41 // TODO(sprang): IANA reg? 63 // TODO(sprang): IANA reg?
42 static constexpr uint8_t kFeedbackMessageType = 15; 64 static constexpr uint8_t kFeedbackMessageType = 15;
43 // Convert to multiples of 0.25ms. 65 // Convert to multiples of 0.25ms.
44 static constexpr int kDeltaScaleFactor = 250; 66 static constexpr int kDeltaScaleFactor = 250;
45 // Maximum number of packets (including missing) TransportFeedback can report. 67 // Maximum number of packets (including missing) TransportFeedback can report.
46 static constexpr size_t kMaxReportedPackets = 0xffff; 68 static constexpr size_t kMaxReportedPackets = 0xffff;
47 69
48 TransportFeedback(); 70 TransportFeedback();
49 ~TransportFeedback() override; 71 ~TransportFeedback() override;
50 72
51 void SetBase(uint16_t base_sequence, // Seq# of first packet in this msg. 73 void SetBase(uint16_t base_sequence, // Seq# of first packet in this msg.
52 int64_t ref_timestamp_us); // Reference timestamp for this msg. 74 int64_t ref_timestamp_us) // Reference timestamp for this msg.
53 void SetFeedbackSequenceNumber(uint8_t feedback_sequence); 75 override;
76 void SetFeedbackSequenceNumber(uint8_t feedback_sequence) override;
54 // NOTE: This method requires increasing sequence numbers (excepting wraps). 77 // NOTE: This method requires increasing sequence numbers (excepting wraps).
55 bool AddReceivedPacket(uint16_t sequence_number, int64_t timestamp_us); 78 bool AddReceivedPacket(uint16_t sequence_number,
56 const std::vector<ReceivedPacket>& GetReceivedPackets() const; 79 int64_t timestamp_us) override;
57 80
58 enum class StatusSymbol { 81 uint16_t GetBaseSequence() const override;
59 kNotReceived, 82 std::vector<StatusSymbol> GetStatusVector() const override;
60 kReceivedSmallDelta, 83 std::vector<int16_t> GetReceiveDeltas() const override;
61 kReceivedLargeDelta,
62 };
63
64 uint16_t GetBaseSequence() const;
65 std::vector<TransportFeedback::StatusSymbol> GetStatusVector() const;
66 std::vector<int16_t> GetReceiveDeltas() const;
67 84
68 // Get the reference time in microseconds, including any precision loss. 85 // Get the reference time in microseconds, including any precision loss.
69 int64_t GetBaseTimeUs() const; 86 int64_t GetBaseTimeUs() const override;
70 // Convenience method for getting all deltas as microseconds. The first delta 87 // Convenience method for getting all deltas as microseconds. The first delta
71 // is relative the base time. 88 // is relative the base time.
72 std::vector<int64_t> GetReceiveDeltasUs() const; 89 std::vector<int64_t> GetReceiveDeltasUs() const override;
73 90
74 bool Parse(const CommonHeader& packet); 91 bool Parse(const CommonHeader& packet);
75 static std::unique_ptr<TransportFeedback> ParseFrom(const uint8_t* buffer, 92 static std::unique_ptr<TransportFeedback> ParseFrom(const uint8_t* buffer,
76 size_t length); 93 size_t length);
77 // Pre and postcondition for all public methods. Should always return true. 94 // Pre and postcondition for all public methods. Should always return true.
78 // This function is for tests. 95 // This function is for tests.
79 bool IsConsistent() const; 96 bool IsConsistent() const;
97 const std::vector<ReceivedPacket>& GetReceivedPackets() const;
80 98
81 protected: 99 protected:
82 bool Create(uint8_t* packet, 100 bool Create(uint8_t* packet,
83 size_t* position, 101 size_t* position,
84 size_t max_length, 102 size_t max_length,
85 PacketReadyCallback* callback) const override; 103 PacketReadyCallback* callback) const override;
86 104
87 size_t BlockLength() const override; 105 size_t BlockLength() const override;
88 106
89 private: 107 private:
(...skipping 19 matching lines...) Expand all
109 std::vector<uint16_t> encoded_chunks_; 127 std::vector<uint16_t> encoded_chunks_;
110 const std::unique_ptr<LastChunk> last_chunk_; 128 const std::unique_ptr<LastChunk> last_chunk_;
111 size_t size_bytes_; 129 size_t size_bytes_;
112 130
113 RTC_DISALLOW_COPY_AND_ASSIGN(TransportFeedback); 131 RTC_DISALLOW_COPY_AND_ASSIGN(TransportFeedback);
114 }; 132 };
115 133
116 } // namespace rtcp 134 } // namespace rtcp
117 } // namespace webrtc 135 } // namespace webrtc
118 #endif // WEBRTC_MODULES_RTP_RTCP_SOURCE_RTCP_PACKET_TRANSPORT_FEEDBACK_H_ 136 #endif // WEBRTC_MODULES_RTP_RTCP_SOURCE_RTCP_PACKET_TRANSPORT_FEEDBACK_H_
OLDNEW
« no previous file with comments | « webrtc/modules/rtp_rtcp/mocks/mock_transport_feedback.h ('k') | webrtc/test/fuzzers/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698