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

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

Issue 1946183002: Removing some old code which looked like it had to do with NACK handling but in reality did nothing. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: rebase Created 4 years, 7 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) 2013 The WebRTC project authors. All Rights Reserved. 2 * Copyright (c) 2013 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
(...skipping 30 matching lines...) Expand all
41 const uint32_t rate) override; 41 const uint32_t rate) override;
42 42
43 int32_t DeRegisterReceivePayload(const int8_t payload_type) override; 43 int32_t DeRegisterReceivePayload(const int8_t payload_type) override;
44 44
45 bool IncomingRtpPacket(const RTPHeader& rtp_header, 45 bool IncomingRtpPacket(const RTPHeader& rtp_header,
46 const uint8_t* payload, 46 const uint8_t* payload,
47 size_t payload_length, 47 size_t payload_length,
48 PayloadUnion payload_specific, 48 PayloadUnion payload_specific,
49 bool in_order) override; 49 bool in_order) override;
50 50
51 NACKMethod NACK() const override;
52
53 // Turn negative acknowledgement requests on/off.
54 void SetNACKStatus(const NACKMethod method) override;
55
56 // Returns the last received timestamp. 51 // Returns the last received timestamp.
57 bool Timestamp(uint32_t* timestamp) const override; 52 bool Timestamp(uint32_t* timestamp) const override;
58 bool LastReceivedTimeMs(int64_t* receive_time_ms) const override; 53 bool LastReceivedTimeMs(int64_t* receive_time_ms) const override;
59 54
60 uint32_t SSRC() const override; 55 uint32_t SSRC() const override;
61 56
62 int32_t CSRCs(uint32_t array_of_csrc[kRtpCsrcSize]) const override; 57 int32_t CSRCs(uint32_t array_of_csrc[kRtpCsrcSize]) const override;
63 58
64 int32_t Energy(uint8_t array_of_energy[kRtpCsrcSize]) const override; 59 int32_t Energy(uint8_t array_of_energy[kRtpCsrcSize]) const override;
65 60
(...skipping 20 matching lines...) Expand all
86 size_t last_received_payload_length_; 81 size_t last_received_payload_length_;
87 82
88 // SSRCs. 83 // SSRCs.
89 uint32_t ssrc_; 84 uint32_t ssrc_;
90 uint8_t num_csrcs_; 85 uint8_t num_csrcs_;
91 uint32_t current_remote_csrc_[kRtpCsrcSize]; 86 uint32_t current_remote_csrc_[kRtpCsrcSize];
92 87
93 uint32_t last_received_timestamp_; 88 uint32_t last_received_timestamp_;
94 int64_t last_received_frame_time_ms_; 89 int64_t last_received_frame_time_ms_;
95 uint16_t last_received_sequence_number_; 90 uint16_t last_received_sequence_number_;
96
97 NACKMethod nack_method_;
98 }; 91 };
99 } // namespace webrtc 92 } // namespace webrtc
100 #endif // WEBRTC_MODULES_RTP_RTCP_SOURCE_RTP_RECEIVER_IMPL_H_ 93 #endif // WEBRTC_MODULES_RTP_RTCP_SOURCE_RTP_RECEIVER_IMPL_H_
OLDNEW
« no previous file with comments | « webrtc/modules/rtp_rtcp/source/nack_rtx_unittest.cc ('k') | webrtc/modules/rtp_rtcp/source/rtp_receiver_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698