Chromium Code Reviews| Index: webrtc/modules/rtp_rtcp/source/forward_error_correction.h |
| diff --git a/webrtc/modules/rtp_rtcp/source/forward_error_correction.h b/webrtc/modules/rtp_rtcp/source/forward_error_correction.h |
| index 673d15bfbce8ff7bf52aea94dd9988b7477ff10c..8c1124f3b7246c59037c021aa05c6d4911eafc41 100644 |
| --- a/webrtc/modules/rtp_rtcp/source/forward_error_correction.h |
| +++ b/webrtc/modules/rtp_rtcp/source/forward_error_correction.h |
| @@ -75,9 +75,11 @@ class ForwardErrorCorrection { |
| uint16_t seq_num; |
| }; |
| - // The received list parameter of DecodeFec() references structs of this type. |
| + // Used for the input to DecodeFec(). |
| // |
| // TODO(holmer): Refactor into a proper class. |
| + // TODO(nisse): Or delete, instead passing |is_fec| and |pkt| as |
| + // separate arguments. |
|
brandtr
2017/09/14 11:49:45
+1 for this.
nisse-webrtc
2017/09/14 12:55:51
For a followup, then, it's not quite trivial. Migh
brandtr
2017/09/14 13:14:15
Yep, no need to do now.
|
| class ReceivedPacket : public SortablePacket { |
| public: |
| ReceivedPacket(); |
| @@ -141,7 +143,6 @@ class ForwardErrorCorrection { |
| }; |
| using PacketList = std::list<std::unique_ptr<Packet>>; |
| - using ReceivedPacketList = std::list<std::unique_ptr<ReceivedPacket>>; |
| using RecoveredPacketList = std::list<std::unique_ptr<RecoveredPacket>>; |
| using ReceivedFecPacketList = std::list<std::unique_ptr<ReceivedFecPacket>>; |
| @@ -218,10 +219,8 @@ class ForwardErrorCorrection { |
| // list will be valid until the next call to |
| // DecodeFec(). |
| // |
| - // Returns 0 on success, -1 on failure. |
| - // |
| - int DecodeFec(ReceivedPacketList* received_packets, |
| - RecoveredPacketList* recovered_packets); |
| + void DecodeFec(const ReceivedPacket& received_packet, |
| + RecoveredPacketList* recovered_packets); |
| // Get the number of generated FEC packets, given the number of media packets |
| // and the protection factor. |
| @@ -266,14 +265,14 @@ class ForwardErrorCorrection { |
| uint32_t media_ssrc, |
| uint16_t seq_num_base); |
| - // Inserts the |received_packets| into the internal received FEC packet list |
| + // Inserts the |received_packet| into the internal received FEC packet list |
| // or into |recovered_packets|. |
| - void InsertPackets(ReceivedPacketList* received_packets, |
| - RecoveredPacketList* recovered_packets); |
| + void InsertPacket(const ReceivedPacket& received_packet, |
| + RecoveredPacketList* recovered_packets); |
| // Inserts the |received_packet| into |recovered_packets|. Deletes duplicates. |
| void InsertMediaPacket(RecoveredPacketList* recovered_packets, |
| - ReceivedPacket* received_packet); |
| + const ReceivedPacket& received_packet); |
| // Assigns pointers to the recovered packet from all FEC packets which cover |
| // it. |
| @@ -284,7 +283,7 @@ class ForwardErrorCorrection { |
| // Insert |received_packet| into internal FEC list. Deletes duplicates. |
| void InsertFecPacket(const RecoveredPacketList& recovered_packets, |
| - ReceivedPacket* received_packet); |
| + const ReceivedPacket& received_packet); |
| // Assigns pointers to already recovered packets covered by |fec_packet|. |
| static void AssignRecoveredPackets( |