| Index: webrtc/voice_engine/channel.cc
|
| diff --git a/webrtc/voice_engine/channel.cc b/webrtc/voice_engine/channel.cc
|
| index 746db8114c600ab0d7afa7c0e2b4007d78b4b8da..95f1e6d09882c32c81356254dc63c874fc091929 100644
|
| --- a/webrtc/voice_engine/channel.cc
|
| +++ b/webrtc/voice_engine/channel.cc
|
| @@ -11,7 +11,10 @@
|
| #include "webrtc/voice_engine/channel.h"
|
|
|
| #include <algorithm>
|
| +#include <map>
|
| +#include <string>
|
| #include <utility>
|
| +#include <vector>
|
|
|
| #include "webrtc/api/array_view.h"
|
| #include "webrtc/audio/utility/audio_frame_operations.h"
|
| @@ -100,29 +103,32 @@ class RtcEventLogProxy final : public webrtc::RtcEventLog {
|
| }
|
| }
|
|
|
| - void LogRtpHeader(webrtc::PacketDirection direction,
|
| - const uint8_t* header,
|
| - size_t packet_length) override {
|
| - LogRtpHeader(direction, header, packet_length, PacedPacketInfo::kNotAProbe);
|
| + void LogIncomingRtpHeader(const RtpPacketReceived& packet) override {
|
| + rtc::CritScope lock(&crit_);
|
| + if (event_log_) {
|
| + event_log_->LogIncomingRtpHeader(packet);
|
| + }
|
| + }
|
| +
|
| + void LogOutgoingRtpHeader(const RtpPacketToSend& packet,
|
| + int probe_cluster_id) override {
|
| + rtc::CritScope lock(&crit_);
|
| + if (event_log_) {
|
| + event_log_->LogOutgoingRtpHeader(packet, probe_cluster_id);
|
| + }
|
| }
|
|
|
| - void LogRtpHeader(webrtc::PacketDirection direction,
|
| - const uint8_t* header,
|
| - size_t packet_length,
|
| - int probe_cluster_id) override {
|
| + void LogIncomingRtcpPacket(rtc::ArrayView<const uint8_t> packet) override {
|
| rtc::CritScope lock(&crit_);
|
| if (event_log_) {
|
| - event_log_->LogRtpHeader(direction, header, packet_length,
|
| - probe_cluster_id);
|
| + event_log_->LogIncomingRtcpPacket(packet);
|
| }
|
| }
|
|
|
| - void LogRtcpPacket(webrtc::PacketDirection direction,
|
| - const uint8_t* packet,
|
| - size_t length) override {
|
| + void LogOutgoingRtcpPacket(rtc::ArrayView<const uint8_t> packet) override {
|
| rtc::CritScope lock(&crit_);
|
| if (event_log_) {
|
| - event_log_->LogRtcpPacket(direction, packet, length);
|
| + event_log_->LogOutgoingRtcpPacket(packet);
|
| }
|
| }
|
|
|
|
|