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

Side by Side Diff: webrtc/voice_engine/channel.cc

Issue 1421013006: Delete a chain of methods in ViE, VoE and ACM (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Created 5 years, 1 month 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
« no previous file with comments | « webrtc/voice_engine/channel.h ('k') | webrtc/voice_engine/include/voe_video_sync.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (c) 2012 The WebRTC project authors. All Rights Reserved. 2 * Copyright (c) 2012 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 3396 matching lines...) Expand 10 before | Expand all | Expand 10 after
3407 *jitter_buffer_delay_ms = (_average_jitter_buffer_delay_us + 500) / 1000 + 3407 *jitter_buffer_delay_ms = (_average_jitter_buffer_delay_us + 500) / 1000 +
3408 _recPacketDelayMs; 3408 _recPacketDelayMs;
3409 *playout_buffer_delay_ms = playout_delay_ms_; 3409 *playout_buffer_delay_ms = playout_delay_ms_;
3410 return true; 3410 return true;
3411 } 3411 }
3412 3412
3413 int Channel::LeastRequiredDelayMs() const { 3413 int Channel::LeastRequiredDelayMs() const {
3414 return audio_coding_->LeastRequiredDelayMs(); 3414 return audio_coding_->LeastRequiredDelayMs();
3415 } 3415 }
3416 3416
3417 int Channel::SetInitialPlayoutDelay(int delay_ms)
3418 {
3419 WEBRTC_TRACE(kTraceInfo, kTraceVoice, VoEId(_instanceId,_channelId),
3420 "Channel::SetInitialPlayoutDelay()");
3421 if ((delay_ms < kVoiceEngineMinMinPlayoutDelayMs) ||
3422 (delay_ms > kVoiceEngineMaxMinPlayoutDelayMs))
3423 {
3424 _engineStatisticsPtr->SetLastError(
3425 VE_INVALID_ARGUMENT, kTraceError,
3426 "SetInitialPlayoutDelay() invalid min delay");
3427 return -1;
3428 }
3429 if (audio_coding_->SetInitialPlayoutDelay(delay_ms) != 0)
3430 {
3431 _engineStatisticsPtr->SetLastError(
3432 VE_AUDIO_CODING_MODULE_ERROR, kTraceError,
3433 "SetInitialPlayoutDelay() failed to set min playout delay");
3434 return -1;
3435 }
3436 return 0;
3437 }
3438
3439
3440 int 3417 int
3441 Channel::SetMinimumPlayoutDelay(int delayMs) 3418 Channel::SetMinimumPlayoutDelay(int delayMs)
3442 { 3419 {
3443 WEBRTC_TRACE(kTraceInfo, kTraceVoice, VoEId(_instanceId,_channelId), 3420 WEBRTC_TRACE(kTraceInfo, kTraceVoice, VoEId(_instanceId,_channelId),
3444 "Channel::SetMinimumPlayoutDelay()"); 3421 "Channel::SetMinimumPlayoutDelay()");
3445 if ((delayMs < kVoiceEngineMinMinPlayoutDelayMs) || 3422 if ((delayMs < kVoiceEngineMinMinPlayoutDelayMs) ||
3446 (delayMs > kVoiceEngineMaxMinPlayoutDelayMs)) 3423 (delayMs > kVoiceEngineMaxMinPlayoutDelayMs))
3447 { 3424 {
3448 _engineStatisticsPtr->SetLastError( 3425 _engineStatisticsPtr->SetLastError(
3449 VE_INVALID_ARGUMENT, kTraceError, 3426 VE_INVALID_ARGUMENT, kTraceError,
(...skipping 503 matching lines...) Expand 10 before | Expand all | Expand 10 after
3953 int64_t min_rtt = 0; 3930 int64_t min_rtt = 0;
3954 if (_rtpRtcpModule->RTT(remoteSSRC, &rtt, &avg_rtt, &min_rtt, &max_rtt) 3931 if (_rtpRtcpModule->RTT(remoteSSRC, &rtt, &avg_rtt, &min_rtt, &max_rtt)
3955 != 0) { 3932 != 0) {
3956 return 0; 3933 return 0;
3957 } 3934 }
3958 return rtt; 3935 return rtt;
3959 } 3936 }
3960 3937
3961 } // namespace voe 3938 } // namespace voe
3962 } // namespace webrtc 3939 } // namespace webrtc
OLDNEW
« no previous file with comments | « webrtc/voice_engine/channel.h ('k') | webrtc/voice_engine/include/voe_video_sync.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698