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

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

Issue 2746413003: Delete support for sending RTCP RPSI and SLI messages. (Closed)
Patch Set: Created 3 years, 9 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
(...skipping 95 matching lines...) Expand 10 before | Expand all | Expand 10 after
106 int32_t AddMixedCNAME(uint32_t SSRC, const char* c_name); 106 int32_t AddMixedCNAME(uint32_t SSRC, const char* c_name);
107 107
108 int32_t RemoveMixedCNAME(uint32_t SSRC); 108 int32_t RemoveMixedCNAME(uint32_t SSRC);
109 109
110 bool TimeToSendRTCPReport(bool sendKeyframeBeforeRTP = false) const; 110 bool TimeToSendRTCPReport(bool sendKeyframeBeforeRTP = false) const;
111 111
112 int32_t SendRTCP(const FeedbackState& feedback_state, 112 int32_t SendRTCP(const FeedbackState& feedback_state,
113 RTCPPacketType packetType, 113 RTCPPacketType packetType,
114 int32_t nackSize = 0, 114 int32_t nackSize = 0,
115 const uint16_t* nackList = 0, 115 const uint16_t* nackList = 0,
116 uint64_t pictureID = 0); 116 uint64_t pictureID = 0);
danilchap 2017/03/14 13:31:47 may be remove this parameter too
nisse-webrtc 2017/03/14 13:41:09 Done.
117 117
118 int32_t SendCompoundRTCP(const FeedbackState& feedback_state, 118 int32_t SendCompoundRTCP(const FeedbackState& feedback_state,
119 const std::set<RTCPPacketType>& packetTypes, 119 const std::set<RTCPPacketType>& packetTypes,
120 int32_t nackSize = 0, 120 int32_t nackSize = 0,
121 const uint16_t* nackList = 0, 121 const uint16_t* nackList = 0,
122 uint64_t pictureID = 0); 122 uint64_t pictureID = 0);
danilchap 2017/03/14 13:31:46 may be remove this parameter too
nisse-webrtc 2017/03/14 13:41:09 Done.
123 123
124 bool REMB() const; 124 bool REMB() const;
125 125
126 void SetREMBStatus(bool enable); 126 void SetREMBStatus(bool enable);
127 127
128 void SetREMBData(uint32_t bitrate, const std::vector<uint32_t>& ssrcs); 128 void SetREMBData(uint32_t bitrate, const std::vector<uint32_t>& ssrcs);
129 129
130 bool TMMBR() const; 130 bool TMMBR() const;
131 131
132 void SetTMMBRStatus(bool enable); 132 void SetTMMBRStatus(bool enable);
(...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after
179 EXCLUSIVE_LOCKS_REQUIRED(critical_section_rtcp_sender_); 179 EXCLUSIVE_LOCKS_REQUIRED(critical_section_rtcp_sender_);
180 std::unique_ptr<rtcp::RtcpPacket> BuildAPP(const RtcpContext& context) 180 std::unique_ptr<rtcp::RtcpPacket> BuildAPP(const RtcpContext& context)
181 EXCLUSIVE_LOCKS_REQUIRED(critical_section_rtcp_sender_); 181 EXCLUSIVE_LOCKS_REQUIRED(critical_section_rtcp_sender_);
182 std::unique_ptr<rtcp::RtcpPacket> BuildExtendedReports( 182 std::unique_ptr<rtcp::RtcpPacket> BuildExtendedReports(
183 const RtcpContext& context) 183 const RtcpContext& context)
184 EXCLUSIVE_LOCKS_REQUIRED(critical_section_rtcp_sender_); 184 EXCLUSIVE_LOCKS_REQUIRED(critical_section_rtcp_sender_);
185 std::unique_ptr<rtcp::RtcpPacket> BuildBYE(const RtcpContext& context) 185 std::unique_ptr<rtcp::RtcpPacket> BuildBYE(const RtcpContext& context)
186 EXCLUSIVE_LOCKS_REQUIRED(critical_section_rtcp_sender_); 186 EXCLUSIVE_LOCKS_REQUIRED(critical_section_rtcp_sender_);
187 std::unique_ptr<rtcp::RtcpPacket> BuildFIR(const RtcpContext& context) 187 std::unique_ptr<rtcp::RtcpPacket> BuildFIR(const RtcpContext& context)
188 EXCLUSIVE_LOCKS_REQUIRED(critical_section_rtcp_sender_); 188 EXCLUSIVE_LOCKS_REQUIRED(critical_section_rtcp_sender_);
189 std::unique_ptr<rtcp::RtcpPacket> BuildSLI(const RtcpContext& context)
190 EXCLUSIVE_LOCKS_REQUIRED(critical_section_rtcp_sender_);
191 std::unique_ptr<rtcp::RtcpPacket> BuildRPSI(const RtcpContext& context)
192 EXCLUSIVE_LOCKS_REQUIRED(critical_section_rtcp_sender_);
193 std::unique_ptr<rtcp::RtcpPacket> BuildNACK(const RtcpContext& context) 189 std::unique_ptr<rtcp::RtcpPacket> BuildNACK(const RtcpContext& context)
194 EXCLUSIVE_LOCKS_REQUIRED(critical_section_rtcp_sender_); 190 EXCLUSIVE_LOCKS_REQUIRED(critical_section_rtcp_sender_);
195 191
196 private: 192 private:
197 const bool audio_; 193 const bool audio_;
198 Clock* const clock_; 194 Clock* const clock_;
199 Random random_ GUARDED_BY(critical_section_rtcp_sender_); 195 Random random_ GUARDED_BY(critical_section_rtcp_sender_);
200 RtcpMode method_ GUARDED_BY(critical_section_rtcp_sender_); 196 RtcpMode method_ GUARDED_BY(critical_section_rtcp_sender_);
201 197
202 RtcEventLog* const event_log_; 198 RtcEventLog* const event_log_;
(...skipping 85 matching lines...) Expand 10 before | Expand all | Expand 10 after
288 typedef std::unique_ptr<rtcp::RtcpPacket> (RTCPSender::*BuilderFunc)( 284 typedef std::unique_ptr<rtcp::RtcpPacket> (RTCPSender::*BuilderFunc)(
289 const RtcpContext&); 285 const RtcpContext&);
290 // Map from RTCPPacketType to builder. 286 // Map from RTCPPacketType to builder.
291 std::map<uint32_t, BuilderFunc> builders_; 287 std::map<uint32_t, BuilderFunc> builders_;
292 288
293 RTC_DISALLOW_IMPLICIT_CONSTRUCTORS(RTCPSender); 289 RTC_DISALLOW_IMPLICIT_CONSTRUCTORS(RTCPSender);
294 }; 290 };
295 } // namespace webrtc 291 } // namespace webrtc
296 292
297 #endif // WEBRTC_MODULES_RTP_RTCP_SOURCE_RTCP_SENDER_H_ 293 #endif // WEBRTC_MODULES_RTP_RTCP_SOURCE_RTCP_SENDER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698