Index: webrtc/modules/audio_coding/main/acm2/codec_manager.cc |
diff --git a/webrtc/modules/audio_coding/main/acm2/codec_manager.cc b/webrtc/modules/audio_coding/main/acm2/codec_manager.cc |
index f9b77e898511ff2dd4d682ff085ba30c3d3e9d3b..ca2afbae8ee8745f0b3e88369426213f715bb8ad 100644 |
--- a/webrtc/modules/audio_coding/main/acm2/codec_manager.cc |
+++ b/webrtc/modules/audio_coding/main/acm2/codec_manager.cc |
@@ -337,7 +337,7 @@ void CodecManager::RegisterEncoder(AudioEncoder* external_speech_encoder) { |
codec_owner_.SetEncoders(external_speech_encoder, cng_pt, vad_mode_, red_pt); |
} |
-int CodecManager::GetCodecInst(CodecInst* current_codec) const { |
+rtc::Maybe<CodecInst> CodecManager::GetCodecInst() const { |
int dummy_id = 0; |
WEBRTC_TRACE(webrtc::kTraceStream, webrtc::kTraceAudioCoding, dummy_id, |
"SendCodec()"); |
@@ -345,10 +345,9 @@ int CodecManager::GetCodecInst(CodecInst* current_codec) const { |
if (!codec_owner_.Encoder()) { |
WEBRTC_TRACE(webrtc::kTraceStream, webrtc::kTraceAudioCoding, dummy_id, |
"SendCodec Failed, no codec is registered"); |
- return -1; |
+ return rtc::Maybe<CodecInst>(); |
} |
- *current_codec = send_codec_inst_; |
- return 0; |
+ return rtc::Maybe<CodecInst>(send_codec_inst_); |
} |
bool CodecManager::SetCopyRed(bool enable) { |