webrtc/modules/audio_coding/codecs/ilbc/audio_encoder_ilbc.cc - Issue 1172163004: Reformat existing code. There should be no functional effects.

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/codecs/ilbc/audio_encoder_ilbc.cc

Issue 1172163004: Reformat existing code. There should be no functional effects. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc@master

Patch Set: Created 5 years, 6 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

« webrtc/modules/audio_coding/codecs/g722/test/testG722.cc ('K') | « webrtc/modules/audio_coding/codecs/ilbc/abs_quant_loop.c ('k') | webrtc/modules/audio_coding/codecs/ilbc/cb_mem_energy.c » ('j') | webrtc/modules/audio_coding/codecs/ilbc/cb_mem_energy_calc.c » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: webrtc/modules/audio_coding/codecs/ilbc/audio_encoder_ilbc.cc

diff --git a/webrtc/modules/audio_coding/codecs/ilbc/audio_encoder_ilbc.cc b/webrtc/modules/audio_coding/codecs/ilbc/audio_encoder_ilbc.cc

index 4fea44babdded8cb51b3aac1f736d51441d34365..66d24650a659d9b505dca51cdff39b0527bac6e2 100644

--- a/webrtc/modules/audio_coding/codecs/ilbc/audio_encoder_ilbc.cc

+++ b/webrtc/modules/audio_coding/codecs/ilbc/audio_encoder_ilbc.cc

@@ -25,12 +25,9 @@ const int kSampleRateHz = 8000;

} // namespace

bool AudioEncoderIlbc::Config::IsOk() const {

- if (!(frame_size_ms == 20 || frame_size_ms == 30 || frame_size_ms == 40 ||

- frame_size_ms == 60))

- return false;

- if (kSampleRateHz / 100 * (frame_size_ms / 10) > kMaxSamplesPerPacket)

- return false;

- return true;

+ return (frame_size_ms == 20 || frame_size_ms == 30 || frame_size_ms == 40 ||

+ frame_size_ms == 60) &&

+ (kSampleRateHz / 100 * (frame_size_ms / 10)) <= kMaxSamplesPerPacket;

kwiberg-webrtc 2015/06/10 11:58:32 I preferred the old way---it's easier to parse pie

}

AudioEncoderIlbc::AudioEncoderIlbc(const Config& config)