Chromium Code Reviews| OLD | NEW |
|---|---|
| 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 class CommonHeader; | 22 class CommonHeader; |
| 23 | 23 |
| 24 class TransportFeedback : public Rtpfb { | 24 class TransportFeedback : public Rtpfb { |
| 25 public: | 25 public: |
| 26 class ReceivedPacket { | |
| 27 public: | |
| 28 ReceivedPacket(uint16_t sequence_number, int16_t delta_ticks) | |
| 29 : sequence_number_(sequence_number), delta_ticks_(delta_ticks) {} | |
| 30 uint16_t sequence_number() const { return sequence_number_; } | |
| 31 int16_t delta_ticks() const { return delta_ticks_; } | |
| 32 int32_t delta_us() const { return delta_ticks_ * kDeltaScaleFactor; } | |
| 33 | |
| 34 private: | |
| 35 uint16_t sequence_number_; | |
| 36 int16_t delta_ticks_; | |
|
sprang_webrtc
2017/01/17 09:22:02
Looks like these can be const as well?
danilchap
2017/01/17 09:36:30
Let me try... no, they can't:
ReceivedPacket is in
sprang_webrtc
2017/01/17 09:56:21
I see. Don't remember what the style guide says, m
danilchap
2017/01/17 10:11:27
You right, explicit it better, even if copy is tri
| |
| 37 }; | |
| 26 // TODO(sprang): IANA reg? | 38 // TODO(sprang): IANA reg? |
| 27 static constexpr uint8_t kFeedbackMessageType = 15; | 39 static constexpr uint8_t kFeedbackMessageType = 15; |
| 28 // Convert to multiples of 0.25ms. | 40 // Convert to multiples of 0.25ms. |
| 29 static constexpr int kDeltaScaleFactor = 250; | 41 static constexpr int kDeltaScaleFactor = 250; |
| 30 // Maximum number of packets (including missing) TransportFeedback can report. | 42 // Maximum number of packets (including missing) TransportFeedback can report. |
| 31 static constexpr size_t kMaxReportedPackets = 0xffff; | 43 static constexpr size_t kMaxReportedPackets = 0xffff; |
| 32 | 44 |
| 33 TransportFeedback(); | 45 TransportFeedback(); |
| 34 ~TransportFeedback() override; | 46 ~TransportFeedback() override; |
| 35 | 47 |
| 36 void SetBase(uint16_t base_sequence, // Seq# of first packet in this msg. | 48 void SetBase(uint16_t base_sequence, // Seq# of first packet in this msg. |
| 37 int64_t ref_timestamp_us); // Reference timestamp for this msg. | 49 int64_t ref_timestamp_us); // Reference timestamp for this msg. |
| 38 void SetFeedbackSequenceNumber(uint8_t feedback_sequence); | 50 void SetFeedbackSequenceNumber(uint8_t feedback_sequence); |
| 39 // NOTE: This method requires increasing sequence numbers (excepting wraps). | 51 // NOTE: This method requires increasing sequence numbers (excepting wraps). |
| 40 bool AddReceivedPacket(uint16_t sequence_number, int64_t timestamp_us); | 52 bool AddReceivedPacket(uint16_t sequence_number, int64_t timestamp_us); |
| 53 const std::vector<ReceivedPacket>& GetReceivedPackets() const; | |
| 41 | 54 |
| 42 enum class StatusSymbol { | 55 enum class StatusSymbol { |
| 43 kNotReceived, | 56 kNotReceived, |
| 44 kReceivedSmallDelta, | 57 kReceivedSmallDelta, |
| 45 kReceivedLargeDelta, | 58 kReceivedLargeDelta, |
| 46 }; | 59 }; |
| 47 | 60 |
| 48 uint16_t GetBaseSequence() const; | 61 uint16_t GetBaseSequence() const; |
| 49 std::vector<TransportFeedback::StatusSymbol> GetStatusVector() const; | 62 std::vector<TransportFeedback::StatusSymbol> GetStatusVector() const; |
| 50 std::vector<int16_t> GetReceiveDeltas() const; | 63 std::vector<int16_t> GetReceiveDeltas() const; |
| (...skipping 18 matching lines...) Expand all Loading... | |
| 69 PacketReadyCallback* callback) const override; | 82 PacketReadyCallback* callback) const override; |
| 70 | 83 |
| 71 size_t BlockLength() const override; | 84 size_t BlockLength() const override; |
| 72 | 85 |
| 73 private: | 86 private: |
| 74 // Size in bytes of a delta time in rtcp packet. | 87 // Size in bytes of a delta time in rtcp packet. |
| 75 // Valid values are 0 (packet wasn't received), 1 or 2. | 88 // Valid values are 0 (packet wasn't received), 1 or 2. |
| 76 using DeltaSize = uint8_t; | 89 using DeltaSize = uint8_t; |
| 77 // Keeps DeltaSizes that can be encoded into single chunk if it is last chunk. | 90 // Keeps DeltaSizes that can be encoded into single chunk if it is last chunk. |
| 78 class LastChunk; | 91 class LastChunk; |
| 79 struct ReceivedPacket { | |
| 80 ReceivedPacket(uint16_t sequence_number, int16_t delta_ticks) | |
| 81 : sequence_number(sequence_number), delta_ticks(delta_ticks) {} | |
| 82 uint16_t sequence_number; | |
| 83 int16_t delta_ticks; | |
| 84 }; | |
| 85 | 92 |
| 86 // Reset packet to consistent empty state. | 93 // Reset packet to consistent empty state. |
| 87 void Clear(); | 94 void Clear(); |
| 88 | 95 |
| 89 bool AddDeltaSize(DeltaSize delta_size); | 96 bool AddDeltaSize(DeltaSize delta_size); |
| 90 | 97 |
| 91 uint16_t base_seq_no_; | 98 uint16_t base_seq_no_; |
| 92 uint16_t num_seq_no_; | 99 uint16_t num_seq_no_; |
| 93 int32_t base_time_ticks_; | 100 int32_t base_time_ticks_; |
| 94 uint8_t feedback_seq_; | 101 uint8_t feedback_seq_; |
| 95 | 102 |
| 96 int64_t last_timestamp_us_; | 103 int64_t last_timestamp_us_; |
| 97 std::vector<ReceivedPacket> packets_; | 104 std::vector<ReceivedPacket> packets_; |
| 98 // All but last encoded packet chunks. | 105 // All but last encoded packet chunks. |
| 99 std::vector<uint16_t> encoded_chunks_; | 106 std::vector<uint16_t> encoded_chunks_; |
| 100 const std::unique_ptr<LastChunk> last_chunk_; | 107 const std::unique_ptr<LastChunk> last_chunk_; |
| 101 size_t size_bytes_; | 108 size_t size_bytes_; |
| 102 | 109 |
| 103 RTC_DISALLOW_COPY_AND_ASSIGN(TransportFeedback); | 110 RTC_DISALLOW_COPY_AND_ASSIGN(TransportFeedback); |
| 104 }; | 111 }; |
| 105 | 112 |
| 106 } // namespace rtcp | 113 } // namespace rtcp |
| 107 } // namespace webrtc | 114 } // namespace webrtc |
| 108 #endif // WEBRTC_MODULES_RTP_RTCP_SOURCE_RTCP_PACKET_TRANSPORT_FEEDBACK_H_ | 115 #endif // WEBRTC_MODULES_RTP_RTCP_SOURCE_RTCP_PACKET_TRANSPORT_FEEDBACK_H_ |
| OLD | NEW |