webrtc/modules/audio_coding/main/acm2/rent_a_codec.cc - Issue 1430433004: Replace rtc::cricket::Settable with rtc::Maybe

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/main/acm2/rent_a_codec.cc

Issue 1430433004: Replace rtc::cricket::Settable with rtc::Maybe (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master

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

Index: webrtc/modules/audio_coding/main/acm2/rent_a_codec.cc

diff --git a/webrtc/modules/audio_coding/main/acm2/rent_a_codec.cc b/webrtc/modules/audio_coding/main/acm2/rent_a_codec.cc

index 42f0a4c7db0b61dadcc2c61ee28d6b1a7d36b6e1..bee0275efe53ac0461b0d2775007c4a568b16ddf 100644

--- a/webrtc/modules/audio_coding/main/acm2/rent_a_codec.cc

+++ b/webrtc/modules/audio_coding/main/acm2/rent_a_codec.cc

@@ -61,9 +61,10 @@ rtc::Maybe<NetEqDecoder> RentACodec::NetEqDecoderFromCodecId(CodecId codec_id,

if (!i)

return rtc::Maybe<NetEqDecoder>();

const NetEqDecoder ned = ACMCodecDB::neteq_decoders_[*i];

- return (ned == NetEqDecoder::kDecoderOpus && num_channels == 2)

- ? NetEqDecoder::kDecoderOpus_2ch

- : ned;

+ return rtc::Maybe<NetEqDecoder>(

+ (ned == NetEqDecoder::kDecoderOpus && num_channels == 2)

+ ? NetEqDecoder::kDecoderOpus_2ch

+ : ned);

}

} // namespace acm2