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

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: Introduce proxy object for RtcEventLog and handle other comments. 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..8f03fcb7e33b34143e85c56bad6b712723a636c5 100644
--- a/webrtc/voice_engine/channel.h
+++ b/webrtc/voice_engine/channel.h
@@ -15,6 +15,7 @@
#include "webrtc/audio/audio_sink.h"
#include "webrtc/base/criticalsection.h"
+#include "webrtc/call/rtc_event_log_proxy.h"
#include "webrtc/common_audio/resampler/include/push_resampler.h"
#include "webrtc/common_types.h"
#include "webrtc/modules/audio_coding/include/audio_coding_module.h"
@@ -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,11 @@ 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) {
+ event_log_.SetEventLog(event_log);
+ }
+
protected:
void OnIncomingFractionLoss(int fraction_lost);
@@ -492,7 +496,7 @@ class Channel
ChannelState channel_state_;
- RtcEventLog* const event_log_;
+ RtcEventLogProxy event_log_;
std::unique_ptr<RtpHeaderParser> rtp_header_parser_;
std::unique_ptr<RTPPayloadRegistry> rtp_payload_registry_;

Powered by Google App Engine
This is Rietveld 408576698