Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(184)

Side by Side Diff: webrtc/modules/audio_coding/acm2/acm_receiver.cc

Issue 2262203002: Add NetEq::FilteredCurrentDelayMs() and use it in VoiceEngine (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Created 4 years, 3 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 unified diff | Download patch
OLDNEW
1 /* 1 /*
2 * Copyright (c) 2013 The WebRTC project authors. All Rights Reserved. 2 * Copyright (c) 2013 The WebRTC project authors. All Rights Reserved.
3 * 3 *
4 * Use of this source code is governed by a BSD-style license 4 * Use of this source code is governed by a BSD-style license
5 * that can be found in the LICENSE file in the root of the source 5 * that can be found in the LICENSE file in the root of the source
6 * tree. An additional intellectual property rights grant can be found 6 * tree. An additional intellectual property rights grant can be found
7 * in the file PATENTS. All contributing project authors may 7 * in the file PATENTS. All contributing project authors may
8 * be found in the AUTHORS file in the root of the source tree. 8 * be found in the AUTHORS file in the root of the source tree.
9 */ 9 */
10 10
(...skipping 291 matching lines...) Expand 10 before | Expand all | Expand 10 after
302 last_packet_sample_rate_hz_ = rtc::Optional<int>(); 302 last_packet_sample_rate_hz_ = rtc::Optional<int>();
303 } 303 }
304 decoders_.erase(it); 304 decoders_.erase(it);
305 return 0; 305 return 0;
306 } 306 }
307 307
308 rtc::Optional<uint32_t> AcmReceiver::GetPlayoutTimestamp() { 308 rtc::Optional<uint32_t> AcmReceiver::GetPlayoutTimestamp() {
309 return neteq_->GetPlayoutTimestamp(); 309 return neteq_->GetPlayoutTimestamp();
310 } 310 }
311 311
312 int AcmReceiver::FilteredCurrentDelayMs() const {
313 return neteq_->FilteredCurrentDelayMs();
314 }
315
312 int AcmReceiver::LastAudioCodec(CodecInst* codec) const { 316 int AcmReceiver::LastAudioCodec(CodecInst* codec) const {
313 rtc::CritScope lock(&crit_sect_); 317 rtc::CritScope lock(&crit_sect_);
314 if (!last_audio_decoder_) { 318 if (!last_audio_decoder_) {
315 return -1; 319 return -1;
316 } 320 }
317 *codec = *RentACodec::CodecInstById( 321 *codec = *RentACodec::CodecInstById(
318 *RentACodec::CodecIdFromIndex(last_audio_decoder_->acm_codec_id)); 322 *RentACodec::CodecIdFromIndex(last_audio_decoder_->acm_codec_id));
319 codec->pltype = last_audio_decoder_->payload_type; 323 codec->pltype = last_audio_decoder_->payload_type;
320 codec->channels = last_audio_decoder_->channels; 324 codec->channels = last_audio_decoder_->channels;
321 codec->plfreq = last_audio_decoder_->sample_rate_hz; 325 codec->plfreq = last_audio_decoder_->sample_rate_hz;
(...skipping 89 matching lines...) Expand 10 before | Expand all | Expand 10 after
411 415
412 void AcmReceiver::GetDecodingCallStatistics( 416 void AcmReceiver::GetDecodingCallStatistics(
413 AudioDecodingCallStats* stats) const { 417 AudioDecodingCallStats* stats) const {
414 rtc::CritScope lock(&crit_sect_); 418 rtc::CritScope lock(&crit_sect_);
415 *stats = call_stats_.GetDecodingStatistics(); 419 *stats = call_stats_.GetDecodingStatistics();
416 } 420 }
417 421
418 } // namespace acm2 422 } // namespace acm2
419 423
420 } // namespace webrtc 424 } // namespace webrtc
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698