webrtc/modules/audio_coding/audio_network_adaptor/channel_controller.cc - Issue 2745473003: Resolve cyclic dependency between audio network adaptor and event log api

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: webrtc/modules/audio_coding/audio_network_adaptor/channel_controller.cc

Issue 2745473003: Resolve cyclic dependency between audio network adaptor and event log api (Closed)

Patch Set: Revert "Activated checks for rtc_event_log_api" Created 3 years, 8 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

« no previous file with comments | « webrtc/modules/audio_coding/audio_network_adaptor/channel_controller.h ('k') | webrtc/modules/audio_coding/audio_network_adaptor/channel_controller_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: webrtc/modules/audio_coding/audio_network_adaptor/channel_controller.cc

diff --git a/webrtc/modules/audio_coding/audio_network_adaptor/channel_controller.cc b/webrtc/modules/audio_coding/audio_network_adaptor/channel_controller.cc

index 77217a381c4274b289b7015ef5bce7eabb307311..90c1e564177cd1eab09ea726aa74bf82752eeca1 100644

--- a/webrtc/modules/audio_coding/audio_network_adaptor/channel_controller.cc

+++ b/webrtc/modules/audio_coding/audio_network_adaptor/channel_controller.cc

@@ -41,8 +41,7 @@ void ChannelController::UpdateNetworkMetrics(

uplink_bandwidth_bps_ = network_metrics.uplink_bandwidth_bps;

}

-void ChannelController::MakeDecision(

- AudioNetworkAdaptor::EncoderRuntimeConfig* config) {

+void ChannelController::MakeDecision(AudioEncoderRuntimeConfig* config) {

// Decision on |num_channels| should not have been made.

RTC_DCHECK(!config->num_channels);