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

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

Issue 2551143004: Remove deprecated RTPSender::SendPadData (Closed)
Patch Set: Created 4 years 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 | « no previous file | webrtc/modules/rtp_rtcp/source/rtp_sender.cc » ('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) 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 179 matching lines...) Expand 10 before | Expand all | Expand 10 after
190 RtpVideoCodecTypes VideoCodecType() const; 190 RtpVideoCodecTypes VideoCodecType() const;
191 191
192 uint32_t MaxConfiguredBitrateVideo() const; 192 uint32_t MaxConfiguredBitrateVideo() const;
193 193
194 // ULPFEC. 194 // ULPFEC.
195 void SetUlpfecConfig(int red_payload_type, int ulpfec_payload_type); 195 void SetUlpfecConfig(int red_payload_type, int ulpfec_payload_type);
196 196
197 bool SetFecParameters(const FecProtectionParams& delta_params, 197 bool SetFecParameters(const FecProtectionParams& delta_params,
198 const FecProtectionParams& key_params); 198 const FecProtectionParams& key_params);
199 199
200 RTC_DEPRECATED
201 size_t SendPadData(size_t bytes,
202 bool timestamp_provided,
203 uint32_t timestamp,
204 int64_t capture_time_ms);
205
206 // Called on update of RTP statistics. 200 // Called on update of RTP statistics.
207 void RegisterRtpStatisticsCallback(StreamDataCountersCallback* callback); 201 void RegisterRtpStatisticsCallback(StreamDataCountersCallback* callback);
208 StreamDataCountersCallback* GetRtpStatisticsCallback() const; 202 StreamDataCountersCallback* GetRtpStatisticsCallback() const;
209 203
210 uint32_t BitrateSent() const; 204 uint32_t BitrateSent() const;
211 205
212 void SetRtpState(const RtpState& rtp_state); 206 void SetRtpState(const RtpState& rtp_state);
213 RtpState GetRtpState() const; 207 RtpState GetRtpState() const;
214 void SetRtxRtpState(const RtpState& rtp_state); 208 void SetRtxRtpState(const RtpState& rtp_state);
215 RtpState GetRtxRtpState() const; 209 RtpState GetRtxRtpState() const;
216 210
217 void SetTransportOverhead(int transport_overhead); 211 void SetTransportOverhead(int transport_overhead);
218 212
219 protected: 213 protected:
220 int32_t CheckPayloadType(int8_t payload_type, RtpVideoCodecTypes* video_type); 214 int32_t CheckPayloadType(int8_t payload_type, RtpVideoCodecTypes* video_type);
221 215
222 private: 216 private:
223 // Maps capture time in milliseconds to send-side delay in milliseconds. 217 // Maps capture time in milliseconds to send-side delay in milliseconds.
224 // Send-side delay is the difference between transmission time and capture 218 // Send-side delay is the difference between transmission time and capture
225 // time. 219 // time.
226 typedef std::map<int64_t, int> SendDelayMap; 220 typedef std::map<int64_t, int> SendDelayMap;
227 221
228 size_t SendPadData(size_t bytes, int probe_cluster_id); 222 size_t SendPadData(size_t bytes, int probe_cluster_id);
229 223
230 size_t DeprecatedSendPadData(size_t bytes,
231 bool timestamp_provided,
232 uint32_t timestamp,
233 int64_t capture_time_ms,
234 int probe_cluster_id);
235
236 bool PrepareAndSendPacket(std::unique_ptr<RtpPacketToSend> packet, 224 bool PrepareAndSendPacket(std::unique_ptr<RtpPacketToSend> packet,
237 bool send_over_rtx, 225 bool send_over_rtx,
238 bool is_retransmit, 226 bool is_retransmit,
239 int probe_cluster_id); 227 int probe_cluster_id);
240 228
241 // Return the number of bytes sent. Note that both of these functions may 229 // Return the number of bytes sent. Note that both of these functions may
242 // return a larger value that their argument. 230 // return a larger value that their argument.
243 size_t TrySendRedundantPayloads(size_t bytes, int probe_cluster_id); 231 size_t TrySendRedundantPayloads(size_t bytes, int probe_cluster_id);
244 232
245 std::unique_ptr<RtpPacketToSend> BuildRtxPacket( 233 std::unique_ptr<RtpPacketToSend> BuildRtxPacket(
(...skipping 94 matching lines...) Expand 10 before | Expand all | Expand 10 after
340 328
341 RateLimiter* const retransmission_rate_limiter_; 329 RateLimiter* const retransmission_rate_limiter_;
342 OverheadObserver* overhead_observer_; 330 OverheadObserver* overhead_observer_;
343 331
344 RTC_DISALLOW_IMPLICIT_CONSTRUCTORS(RTPSender); 332 RTC_DISALLOW_IMPLICIT_CONSTRUCTORS(RTPSender);
345 }; 333 };
346 334
347 } // namespace webrtc 335 } // namespace webrtc
348 336
349 #endif // WEBRTC_MODULES_RTP_RTCP_SOURCE_RTP_SENDER_H_ 337 #endif // WEBRTC_MODULES_RTP_RTCP_SOURCE_RTP_SENDER_H_
OLDNEW
« no previous file with comments | « no previous file | webrtc/modules/rtp_rtcp/source/rtp_sender.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698