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..d6d41b040422bc8e64e6a465be334b9e41191d63 100644 |
--- a/webrtc/modules/rtp_rtcp/include/rtp_rtcp.h |
+++ b/webrtc/modules/rtp_rtcp/include/rtp_rtcp.h |
@@ -13,6 +13,7 @@ |
#include <set> |
#include <vector> |
+#include <utility> |
mflodman
2015/12/09 09:19:13
Alphabetic order.
danilchap
2015/12/09 11:23:36
Done.
|
#include "webrtc/modules/include/module.h" |
#include "webrtc/modules/rtp_rtcp/include/rtp_rtcp_defines.h" |
@@ -580,9 +581,11 @@ class RtpRtcp : public Module { |
* |
* return -1 on failure else 0 |
*/ |
- virtual int32_t SendREDPayloadType( |
- int8_t& payloadType) const = 0; |
- |
+ // NOLINTNEXTLINE |
+ int32_t SendREDPayloadType(int8_t& payloadType) const { // Depricated. |
+ 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 +617,15 @@ class RtpRtcp : public Module { |
/* |
* Get generic FEC setting |
*/ |
- virtual void GenericFECStatus(bool& enable, |
- uint8_t& payloadTypeRED, |
- uint8_t& payloadTypeFEC) = 0; |
- |
+ // Depricated. |
+ 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 +646,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_ |