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

Side by Side Diff: webrtc/modules/rtp_rtcp/source/rtp_rtcp_impl.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 262 matching lines...) Expand 10 before | Expand all | Expand 10 after
273 int32_t SendRTCPSliceLossIndication(uint8_t picture_id) override; 273 int32_t SendRTCPSliceLossIndication(uint8_t picture_id) override;
274 274
275 // Set method for requesting a new key frame. 275 // Set method for requesting a new key frame.
276 int32_t SetKeyFrameRequestMethod(KeyFrameRequestMethod method) override; 276 int32_t SetKeyFrameRequestMethod(KeyFrameRequestMethod method) override;
277 277
278 // Send a request for a keyframe. 278 // Send a request for a keyframe.
279 int32_t RequestKeyFrame() override; 279 int32_t RequestKeyFrame() override;
280 280
281 void SetTargetSendBitrate(uint32_t bitrate_bps) override; 281 void SetTargetSendBitrate(uint32_t bitrate_bps) override;
282 282
283 int32_t SetGenericFECStatus(bool enable, 283 void SetGenericFECStatus(bool enable,
284 uint8_t payload_type_red, 284 uint8_t payload_type_red,
285 uint8_t payload_type_fec) override; 285 uint8_t payload_type_fec) override;
286 286
287 int32_t GenericFECStatus(bool& enable, 287 void GenericFECStatus(bool& enable,
288 uint8_t& payload_type_red, 288 uint8_t& payload_type_red,
289 uint8_t& payload_type_fec) override; 289 uint8_t& payload_type_fec) override;
290 290
291 int32_t SetFecParameters(const FecProtectionParams* delta_params, 291 int32_t SetFecParameters(const FecProtectionParams* delta_params,
292 const FecProtectionParams* key_params) override; 292 const FecProtectionParams* key_params) override;
293 293
294 bool LastReceivedNTP(uint32_t* NTPsecs, 294 bool LastReceivedNTP(uint32_t* NTPsecs,
295 uint32_t* NTPfrac, 295 uint32_t* NTPfrac,
296 uint32_t* remote_sr) const; 296 uint32_t* remote_sr) const;
297 297
298 bool LastReceivedXrReferenceTimeInfo(RtcpReceiveTimeInfo* info) const; 298 bool LastReceivedXrReferenceTimeInfo(RtcpReceiveTimeInfo* info) const;
299 299
(...skipping 84 matching lines...) Expand 10 before | Expand all | Expand 10 after
384 PacketLossStats receive_loss_stats_; 384 PacketLossStats receive_loss_stats_;
385 385
386 // The processed RTT from RtcpRttStats. 386 // The processed RTT from RtcpRttStats.
387 rtc::scoped_ptr<CriticalSectionWrapper> critical_section_rtt_; 387 rtc::scoped_ptr<CriticalSectionWrapper> critical_section_rtt_;
388 int64_t rtt_ms_; 388 int64_t rtt_ms_;
389 }; 389 };
390 390
391 } // namespace webrtc 391 } // namespace webrtc
392 392
393 #endif // WEBRTC_MODULES_RTP_RTCP_SOURCE_RTP_RTCP_IMPL_H_ 393 #endif // WEBRTC_MODULES_RTP_RTCP_SOURCE_RTP_RTCP_IMPL_H_
OLDNEW
« no previous file with comments | « webrtc/modules/rtp_rtcp/mocks/mock_rtp_rtcp.h ('k') | webrtc/modules/rtp_rtcp/source/rtp_rtcp_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698