| Index: webrtc/modules/rtp_rtcp/include/rtp_rtcp.h
|
| diff --git a/webrtc/modules/rtp_rtcp/include/rtp_rtcp.h b/webrtc/modules/rtp_rtcp/include/rtp_rtcp.h
|
| index 39aeba2f47ebae3e1659ad4d85cc5801e0347c3b..6a7022a94cc66bda08f0749b1c1761b0d7da1b08 100644
|
| --- a/webrtc/modules/rtp_rtcp/include/rtp_rtcp.h
|
| +++ b/webrtc/modules/rtp_rtcp/include/rtp_rtcp.h
|
| @@ -12,6 +12,7 @@
|
| #define WEBRTC_MODULES_RTP_RTCP_INCLUDE_RTP_RTCP_H_
|
|
|
| #include <set>
|
| +#include <utility>
|
| #include <vector>
|
|
|
| #include "webrtc/modules/include/module.h"
|
| @@ -580,9 +581,13 @@ class RtpRtcp : public Module {
|
| *
|
| * return -1 on failure else 0
|
| */
|
| - virtual int32_t SendREDPayloadType(
|
| - int8_t& payloadType) const = 0;
|
| -
|
| + // DEPRECATED. Use SendREDPayloadType below that takes output parameter
|
| + // by pointer instead of by reference.
|
| + // TODO(danilchap): Remove this when all callers have been updated.
|
| + int32_t SendREDPayloadType(int8_t& payloadType) const { // NOLINT
|
| + return SendREDPayloadType(&payloadType);
|
| + }
|
| + virtual int32_t SendREDPayloadType(int8_t* payload_type) const = 0;
|
| /*
|
| * Store the audio level in dBov for header-extension-for-audio-level-
|
| * indication.
|
| @@ -614,10 +619,17 @@ class RtpRtcp : public Module {
|
| /*
|
| * Get generic FEC setting
|
| */
|
| - virtual void GenericFECStatus(bool& enable,
|
| - uint8_t& payloadTypeRED,
|
| - uint8_t& payloadTypeFEC) = 0;
|
| -
|
| + // DEPRECATED. Use GenericFECStatus below that takes output parameters
|
| + // by pointers instead of by references.
|
| + // TODO(danilchap): Remove this when all callers have been updated.
|
| + void GenericFECStatus(bool& enable, // NOLINT
|
| + uint8_t& payloadTypeRED, // NOLINT
|
| + uint8_t& payloadTypeFEC) { // NOLINT
|
| + GenericFECStatus(&enable, &payloadTypeRED, &payloadTypeFEC);
|
| + }
|
| + virtual void GenericFECStatus(bool* enable,
|
| + uint8_t* payload_type_red,
|
| + uint8_t* payload_type_fec) = 0;
|
|
|
| virtual int32_t SetFecParameters(
|
| const FecProtectionParams* delta_params,
|
| @@ -638,4 +650,4 @@ class RtpRtcp : public Module {
|
| virtual int32_t RequestKeyFrame() = 0;
|
| };
|
| } // namespace webrtc
|
| -#endif // WEBRTC_MODULES_RTP_RTCP_INCLUDE_RTP_RTCP_H_
|
| +#endif // WEBRTC_MODULES_RTP_RTCP_INCLUDE_RTP_RTCP_H_
|
|
|