Index: webrtc/modules/rtp_rtcp/include/rtp_rtcp_defines.h |
diff --git a/webrtc/modules/rtp_rtcp/include/rtp_rtcp_defines.h b/webrtc/modules/rtp_rtcp/include/rtp_rtcp_defines.h |
index 81b46f8abf9e2edf6ffca3c54ffd986e1ab8f072..e8f010c8acedcfb5934e7bece9defa402e331e8b 100644 |
--- a/webrtc/modules/rtp_rtcp/include/rtp_rtcp_defines.h |
+++ b/webrtc/modules/rtp_rtcp/include/rtp_rtcp_defines.h |
@@ -384,32 +384,44 @@ class RtcpRttStats { |
// Null object version of RtpFeedback. |
class NullRtpFeedback : public RtpFeedback { |
public: |
- virtual ~NullRtpFeedback() {} |
+ ~NullRtpFeedback() override {} |
int32_t OnInitializeDecoder(int8_t payload_type, |
const char payloadName[RTP_PAYLOAD_NAME_SIZE], |
int frequency, |
size_t channels, |
- uint32_t rate) override { |
- return 0; |
- } |
+ uint32_t rate) override; |
void OnIncomingSSRCChanged(uint32_t ssrc) override {} |
void OnIncomingCSRCChanged(uint32_t csrc, bool added) override {} |
}; |
+inline int32_t NullRtpFeedback::OnInitializeDecoder( |
kwiberg-webrtc
2017/05/31 08:22:28
I'm not sure I like the use of "inline" here---you
nisse-webrtc
2017/05/31 08:44:54
I'm not sure what's the background for the warning
kwiberg-webrtc
2017/05/31 08:49:48
Binary size. It warns about inlined constructors,
|
+ int8_t payload_type, |
+ const char payloadName[RTP_PAYLOAD_NAME_SIZE], |
+ int frequency, |
+ size_t channels, |
+ uint32_t rate) { |
+ return 0; |
+} |
+ |
// Null object version of RtpData. |
class NullRtpData : public RtpData { |
public: |
- virtual ~NullRtpData() {} |
+ ~NullRtpData() override {} |
int32_t OnReceivedPayloadData(const uint8_t* payload_data, |
size_t payload_size, |
- const WebRtcRTPHeader* rtp_header) override { |
- return 0; |
- } |
+ const WebRtcRTPHeader* rtp_header) override; |
}; |
+inline int32_t NullRtpData::OnReceivedPayloadData( |
+ const uint8_t* payload_data, |
+ size_t payload_size, |
+ const WebRtcRTPHeader* rtp_header) { |
+ return 0; |
+} |
+ |
// Statistics about packet loss for a single directional connection. All values |
// are totals since the connection initiated. |
struct RtpPacketLossStats { |