Index: webrtc/logging/rtc_event_log/rtc_event_log.h |
diff --git a/webrtc/logging/rtc_event_log/rtc_event_log.h b/webrtc/logging/rtc_event_log/rtc_event_log.h |
index ec90ab9a855fe0ae1540d601456339b717df2249..5657e97596a8005179e80a65c4a848611d100c0d 100644 |
--- a/webrtc/logging/rtc_event_log/rtc_event_log.h |
+++ b/webrtc/logging/rtc_event_log/rtc_event_log.h |
@@ -15,6 +15,7 @@ |
#include <string> |
#include <vector> |
+#include "webrtc/api/array_view.h" |
// TODO(eladalon): Get rid of this later in the CL-stack. |
#include "webrtc/api/rtpparameters.h" |
#include "webrtc/common_types.h" |
@@ -30,6 +31,8 @@ struct StreamConfig; |
class Clock; |
struct AudioEncoderRuntimeConfig; |
+class RtpPacketReceived; |
+class RtpPacketToSend; |
enum class MediaType; |
enum class BandwidthUsage; |
@@ -98,23 +101,33 @@ class RtcEventLog { |
// Logs configuration information for an audio send stream. |
virtual void LogAudioSendStreamConfig(const rtclog::StreamConfig& config) = 0; |
- // Logs the header of an incoming or outgoing RTP packet. packet_length |
+ RTC_DEPRECATED virtual void LogRtpHeader(PacketDirection direction, |
+ const uint8_t* header, |
+ size_t packet_length) {} |
+ |
+ RTC_DEPRECATED virtual void LogRtpHeader(PacketDirection direction, |
+ const uint8_t* header, |
+ size_t packet_length, |
+ int probe_cluster_id) {} |
+ |
+ // Logs the header of an incoming RTP packet. |packet_length| |
+ // is the total length of the packet, including both header and payload. |
+ virtual void LogIncomingRtpHeader(const RtpPacketReceived& packet) = 0; |
+ |
+ // Logs the header of an incoming RTP packet. |packet_length| |
// is the total length of the packet, including both header and payload. |
- virtual void LogRtpHeader(PacketDirection direction, |
- const uint8_t* header, |
- size_t packet_length) = 0; |
- |
- // Same as above but used on the sender side to log packets that are part of |
- // a probe cluster. |
- virtual void LogRtpHeader(PacketDirection direction, |
- const uint8_t* header, |
- size_t packet_length, |
- int probe_cluster_id) = 0; |
- |
- // Logs an incoming or outgoing RTCP packet. |
- virtual void LogRtcpPacket(PacketDirection direction, |
- const uint8_t* packet, |
- size_t length) = 0; |
+ virtual void LogOutgoingRtpHeader(const RtpPacketToSend& packet, |
+ int probe_cluster_id) = 0; |
+ |
+ RTC_DEPRECATED virtual void LogRtcpPacket(PacketDirection direction, |
+ const uint8_t* header, |
+ size_t packet_length) {} |
+ |
+ // Logs an incoming RTCP packet. |
+ virtual void LogIncomingRtcpPacket(rtc::ArrayView<const uint8_t> packet) = 0; |
+ |
+ // Logs an outgoing RTCP packet. |
+ virtual void LogOutgoingRtcpPacket(rtc::ArrayView<const uint8_t> packet) = 0; |
// Logs an audio playout event. |
virtual void LogAudioPlayout(uint32_t ssrc) = 0; |
@@ -164,16 +177,11 @@ class RtcEventLogNullImpl : public RtcEventLog { |
void LogAudioReceiveStreamConfig( |
const rtclog::StreamConfig& config) override {} |
void LogAudioSendStreamConfig(const rtclog::StreamConfig& config) override {} |
- void LogRtpHeader(PacketDirection direction, |
- const uint8_t* header, |
- size_t packet_length) override {} |
- void LogRtpHeader(PacketDirection direction, |
- const uint8_t* header, |
- size_t packet_length, |
- int probe_cluster_id) override {} |
- void LogRtcpPacket(PacketDirection direction, |
- const uint8_t* packet, |
- size_t length) override {} |
+ void LogIncomingRtpHeader(const RtpPacketReceived& packet) override {} |
+ void LogOutgoingRtpHeader(const RtpPacketToSend& packet, |
+ int probe_cluster_id) override {} |
+ void LogIncomingRtcpPacket(rtc::ArrayView<const uint8_t> packet) override {} |
+ void LogOutgoingRtcpPacket(rtc::ArrayView<const uint8_t> packet) override {} |
void LogAudioPlayout(uint32_t ssrc) override {} |
void LogLossBasedBweUpdate(int32_t bitrate_bps, |
uint8_t fraction_loss, |