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

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

Issue 1226143013: Merge methods for configuring NACK/FEC/hybrid. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: rebase Created 5 years, 5 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 245 matching lines...) Expand 10 before | Expand all | Expand 10 after
256 // Get payload type for Redundant Audio Data RFC 2198. 256 // Get payload type for Redundant Audio Data RFC 2198.
257 int32_t RED(int8_t *payload_type) const; 257 int32_t RED(int8_t *payload_type) const;
258 258
259 RtpVideoCodecTypes VideoCodecType() const; 259 RtpVideoCodecTypes VideoCodecType() const;
260 260
261 uint32_t MaxConfiguredBitrateVideo() const; 261 uint32_t MaxConfiguredBitrateVideo() const;
262 262
263 int32_t SendRTPIntraRequest(); 263 int32_t SendRTPIntraRequest();
264 264
265 // FEC. 265 // FEC.
266 int32_t SetGenericFECStatus(bool enable, 266 void SetGenericFECStatus(bool enable,
267 uint8_t payload_type_red, 267 uint8_t payload_type_red,
268 uint8_t payload_type_fec); 268 uint8_t payload_type_fec);
269 269
270 int32_t GenericFECStatus(bool *enable, uint8_t *payload_type_red, 270 void GenericFECStatus(bool* enable,
271 uint8_t *payload_type_fec) const; 271 uint8_t* payload_type_red,
272 uint8_t* payload_type_fec) const;
272 273
273 int32_t SetFecParameters(const FecProtectionParams *delta_params, 274 int32_t SetFecParameters(const FecProtectionParams *delta_params,
274 const FecProtectionParams *key_params); 275 const FecProtectionParams *key_params);
275 276
276 size_t SendPadData(uint32_t timestamp, 277 size_t SendPadData(uint32_t timestamp,
277 int64_t capture_time_ms, 278 int64_t capture_time_ms,
278 size_t bytes); 279 size_t bytes);
279 280
280 // Called on update of RTP statistics. 281 // Called on update of RTP statistics.
281 void RegisterRtpStatisticsCallback(StreamDataCountersCallback* callback); 282 void RegisterRtpStatisticsCallback(StreamDataCountersCallback* callback);
(...skipping 147 matching lines...) Expand 10 before | Expand all | Expand 10 after
429 // SetTargetBitrateKbps or GetTargetBitrateKbps. Also remember 430 // SetTargetBitrateKbps or GetTargetBitrateKbps. Also remember
430 // that by the time the function returns there is no guarantee 431 // that by the time the function returns there is no guarantee
431 // that the target bitrate is still valid. 432 // that the target bitrate is still valid.
432 rtc::scoped_ptr<CriticalSectionWrapper> target_bitrate_critsect_; 433 rtc::scoped_ptr<CriticalSectionWrapper> target_bitrate_critsect_;
433 uint32_t target_bitrate_ GUARDED_BY(target_bitrate_critsect_); 434 uint32_t target_bitrate_ GUARDED_BY(target_bitrate_critsect_);
434 }; 435 };
435 436
436 } // namespace webrtc 437 } // namespace webrtc
437 438
438 #endif // WEBRTC_MODULES_RTP_RTCP_SOURCE_RTP_SENDER_H_ 439 #endif // WEBRTC_MODULES_RTP_RTCP_SOURCE_RTP_SENDER_H_
OLDNEW
« no previous file with comments | « webrtc/modules/rtp_rtcp/source/rtp_rtcp_impl.cc ('k') | webrtc/modules/rtp_rtcp/source/rtp_sender.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698