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

Unified Diff: webrtc/voice_engine/channel.h

Issue 1748403002: Move RtcEventLog object from inside VoiceEngine to Call. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Undid unneccessary changes to rtp_rtcp module. Created 4 years, 9 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/voice_engine/channel.h
diff --git a/webrtc/voice_engine/channel.h b/webrtc/voice_engine/channel.h
index 0e87252877c407e9b9f6ec84e019a9712f3206f6..b69a8a840c25bda8c7f86fb8b9de42f11c9e2cda 100644
--- a/webrtc/voice_engine/channel.h
+++ b/webrtc/voice_engine/channel.h
@@ -70,6 +70,7 @@ struct SenderInfo;
namespace voe {
class OutputMixer;
+class RtcEventLogProxy;
class RtpPacketSenderProxy;
class Statistics;
class StatisticsProxy;
@@ -178,11 +179,9 @@ class Channel
static int32_t CreateChannel(Channel*& channel,
int32_t channelId,
uint32_t instanceId,
- RtcEventLog* const event_log,
const Config& config);
Channel(int32_t channelId,
uint32_t instanceId,
- RtcEventLog* const event_log,
const Config& config);
int32_t Init();
int32_t SetEngineInformation(Statistics& engineStatistics,
@@ -455,6 +454,9 @@ class Channel
// 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);
@@ -492,7 +494,7 @@ class Channel
ChannelState channel_state_;
- RtcEventLog* const event_log_;
+ std::unique_ptr<voe::RtcEventLogProxy> event_log_;
stefan-webrtc 2016/03/21 13:25:48 event_log_proxy_
ivoc 2016/03/22 13:44:55 Done.
std::unique_ptr<RtpHeaderParser> rtp_header_parser_;
std::unique_ptr<RTPPayloadRegistry> rtp_payload_registry_;

Powered by Google App Engine
This is Rietveld 408576698