Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(146)

Unified Diff: webrtc/logging/rtc_event_log/rtc_event_log.h

Issue 2997973002: Split LogRtpHeader and LogRtcpPacket into separate versions for incoming and outgoing packets.
Patch Set: Rebase Created 3 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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 d26dccbea96b2058521f31dd083753171639e861..c5f92b60a3ec70f537e6a80ac764acf8e0ac3162 100644
--- a/webrtc/logging/rtc_event_log/rtc_event_log.h
+++ b/webrtc/logging/rtc_event_log/rtc_event_log.h
@@ -17,6 +17,7 @@
#include "webrtc/api/rtpparameters.h"
#include "webrtc/common_types.h"
+#include "webrtc/rtc_base/array_view.h"
danilchap 2017/09/05 08:47:16 just moved to webrtc/api/
terelius 2017/09/07 12:53:55 Done.
#include "webrtc/rtc_base/platform_file.h"
namespace webrtc {
@@ -57,6 +58,8 @@ struct StreamConfig {
class Clock;
class RtcEventLogImpl;
struct AudioEncoderRuntimeConfig;
+class RtpPacketReceived;
+class RtpPacketToSend;
enum class MediaType;
enum class BandwidthUsage;
@@ -124,23 +127,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;
@@ -200,16 +213,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,

Powered by Google App Engine
This is Rietveld 408576698