diff --git a/common_types.h b/common_types.h index 2eb2564951..58c0a93d88 100644 --- a/common_types.h +++ b/common_types.h @@ -16,16 +16,6 @@ namespace webrtc { -// Callback, used to notify an observer whenever new rates have been estimated. -class BitrateStatisticsObserver { - public: - virtual ~BitrateStatisticsObserver() {} - - virtual void Notify(uint32_t total_bitrate_bps, - uint32_t retransmit_bitrate_bps, - uint32_t ssrc) = 0; -}; - struct FrameCounts { FrameCounts() : key_frames(0), delta_frames(0) {} int key_frames; @@ -40,27 +30,6 @@ class FrameCountObserver { uint32_t ssrc) = 0; }; -// Callback, used to notify an observer whenever the send-side delay is updated. -class SendSideDelayObserver { - public: - virtual ~SendSideDelayObserver() {} - virtual void SendSideDelayUpdated(int avg_delay_ms, - int max_delay_ms, - uint32_t ssrc) = 0; -}; - -// Callback, used to notify an observer whenever a packet is sent to the -// transport. -// TODO(asapersson): This class will remove the need for SendSideDelayObserver. -// Remove SendSideDelayObserver once possible. -class SendPacketObserver { - public: - virtual ~SendPacketObserver() {} - virtual void OnSendPacket(uint16_t packet_id, - int64_t capture_time_ms, - uint32_t ssrc) = 0; -}; - // Callback, used to notify an observer when the overhead per packet // has changed. class OverheadObserver { diff --git a/modules/rtp_rtcp/include/rtp_rtcp_defines.h b/modules/rtp_rtcp/include/rtp_rtcp_defines.h index 2828575d01..d984575109 100644 --- a/modules/rtp_rtcp/include/rtp_rtcp_defines.h +++ b/modules/rtp_rtcp/include/rtp_rtcp_defines.h @@ -516,5 +516,36 @@ class RtcpAckObserver { virtual ~RtcpAckObserver() = default; }; +// Callback, used to notify an observer whenever new rates have been estimated. +class BitrateStatisticsObserver { + public: + virtual ~BitrateStatisticsObserver() {} + + virtual void Notify(uint32_t total_bitrate_bps, + uint32_t retransmit_bitrate_bps, + uint32_t ssrc) = 0; +}; + +// Callback, used to notify an observer whenever the send-side delay is updated. +class SendSideDelayObserver { + public: + virtual ~SendSideDelayObserver() {} + virtual void SendSideDelayUpdated(int avg_delay_ms, + int max_delay_ms, + uint32_t ssrc) = 0; +}; + +// Callback, used to notify an observer whenever a packet is sent to the +// transport. +// TODO(asapersson): This class will remove the need for SendSideDelayObserver. +// Remove SendSideDelayObserver once possible. +class SendPacketObserver { + public: + virtual ~SendPacketObserver() {} + virtual void OnSendPacket(uint16_t packet_id, + int64_t capture_time_ms, + uint32_t ssrc) = 0; +}; + } // namespace webrtc #endif // MODULES_RTP_RTCP_INCLUDE_RTP_RTCP_DEFINES_H_