webrtc/modules/audio_coding/audio_network_adaptor/controller_manager.cc - Issue 2669733002: Add 120ms frame ability to ANA

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/controller_manager.cc

Issue 2669733002: Add 120ms frame ability to ANA (Closed)

Patch Set: Rebased Created 3 years, 11 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/config.proto ('k') | webrtc/modules/audio_coding/audio_network_adaptor/frame_length_controller.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

index 31eff216890882ecc0b2496914d45b312a5cd831..09177514b22f3f6946f279813a2439f5ece6a9f7 100644

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

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

@@ -80,13 +80,17 @@ std::unique_ptr<FrameLengthController> CreateFrameLengthController(

RTC_CHECK(config.has_fl_decreasing_packet_loss_fraction());

RTC_CHECK(config.has_fl_20ms_to_60ms_bandwidth_bps());

RTC_CHECK(config.has_fl_60ms_to_20ms_bandwidth_bps());

+ RTC_CHECK(config.has_fl_60ms_to_120ms_bandwidth_bps());

minyue-webrtc 2017/02/02 08:31:10 this must be carefully treated for backward-compat

michaelt 2017/02/02 10:29:57 Impl. as discussed offline.

+ RTC_CHECK(config.has_fl_120ms_to_60ms_bandwidth_bps());

FrameLengthController::Config ctor_config(

std::vector<int>(), initial_frame_length_ms,

config.fl_increasing_packet_loss_fraction(),

config.fl_decreasing_packet_loss_fraction(),

config.fl_20ms_to_60ms_bandwidth_bps(),

- config.fl_60ms_to_20ms_bandwidth_bps());

+ config.fl_60ms_to_20ms_bandwidth_bps(),

+ config.fl_60ms_to_120ms_bandwidth_bps(),

+ config.fl_120ms_to_60ms_bandwidth_bps());

for (auto frame_length : encoder_frame_lengths_ms)

ctor_config.encoder_frame_lengths_ms.push_back(frame_length);