zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Resolve cyclic dependency between audio network adaptor and event log api

Browse Source 
BUG=webrtc:7257

Review-Url: https://codereview.webrtc.org/2745473003
Cr-Commit-Position: refs/heads/master@{#17565}
This commit is contained in:
michaelt
2017-04-06 05:59:10 -07:00
committed by Commit bot
parent 28dc285f22
commit cde46b7278
46 changed files with 101 additions and 108 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
webrtc/logging/rtc_event_log/rtc_event_log.h
View File

@ -17,7 +17,6 @@
#include "webrtc/base/platform_file.h"
#include "webrtc/call/audio_receive_stream.h"
#include "webrtc/call/audio_send_stream.h"
#include "webrtc/modules/audio_coding/audio_network_adaptor/include/audio_network_adaptor.h"
#include "webrtc/modules/remote_bitrate_estimator/include/bwe_defines.h"
#include "webrtc/video_receive_stream.h"
#include "webrtc/video_send_stream.h"
@ -32,6 +31,7 @@ class EventStream;
class Clock;
class RtcEventLogImpl;
struct AudioEncoderRuntimeConfig;
enum class MediaType;
@ -135,7 +135,7 @@ class RtcEventLog {
// Logs audio encoder re-configuration driven by audio network adaptor.
virtual void LogAudioNetworkAdaptation(
const AudioNetworkAdaptor::EncoderRuntimeConfig& config) = 0;
const AudioEncoderRuntimeConfig& config) = 0;
// Logs when a probe cluster is created.
virtual void LogProbeClusterCreated(int id,
@ -199,7 +199,7 @@ class RtcEventLogNullImpl final : public RtcEventLog {
void LogDelayBasedBweUpdate(int32_t bitrate_bps,
BandwidthUsage detector_state) override {}
void LogAudioNetworkAdaptation(
const AudioNetworkAdaptor::EncoderRuntimeConfig& config) override {}
const AudioEncoderRuntimeConfig& config) override {}
void LogProbeClusterCreated(int id,
int bitrate_bps,
int min_probes,