| Index: webrtc/voice_engine/channel.h
|
| diff --git a/webrtc/voice_engine/channel.h b/webrtc/voice_engine/channel.h
|
| index 68211a605aafea0e5831a8982dc169077922ee3f..9b6a2a136f0eae00c74cb1d4d2c0f3afd43b6bc2 100644
|
| --- a/webrtc/voice_engine/channel.h
|
| +++ b/webrtc/voice_engine/channel.h
|
| @@ -66,7 +66,6 @@
|
| namespace voe {
|
|
|
| class OutputMixer;
|
| -class RtcEventLogProxy;
|
| class RtpPacketSenderProxy;
|
| class Statistics;
|
| class StatisticsProxy;
|
| @@ -174,15 +173,18 @@
|
| static int32_t CreateChannel(Channel*& channel,
|
| int32_t channelId,
|
| uint32_t instanceId,
|
| + RtcEventLog* const event_log,
|
| const Config& config);
|
| static int32_t CreateChannel(
|
| Channel*& channel,
|
| int32_t channelId,
|
| uint32_t instanceId,
|
| + RtcEventLog* const event_log,
|
| const Config& config,
|
| const rtc::scoped_refptr<AudioDecoderFactory>& decoder_factory);
|
| Channel(int32_t channelId,
|
| uint32_t instanceId,
|
| + RtcEventLog* const event_log,
|
| const Config& config,
|
| const rtc::scoped_refptr<AudioDecoderFactory>& decoder_factory);
|
| int32_t Init();
|
| @@ -449,9 +451,6 @@
|
| // Disassociate a send channel if it was associated.
|
| void DisassociateSendChannel(int channel_id);
|
|
|
| - // Set a RtcEventLog logging object.
|
| - void SetRtcEventLog(RtcEventLog* event_log);
|
| -
|
| protected:
|
| void OnIncomingFractionLoss(int fraction_lost);
|
|
|
| @@ -487,7 +486,7 @@
|
|
|
| ChannelState channel_state_;
|
|
|
| - std::unique_ptr<voe::RtcEventLogProxy> event_log_proxy_;
|
| + RtcEventLog* const event_log_;
|
|
|
| std::unique_ptr<RtpHeaderParser> rtp_header_parser_;
|
| std::unique_ptr<RTPPayloadRegistry> rtp_payload_registry_;
|
|
|