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

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

Issue 1985743002: Propagate muted parameter to VoE::Channel (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Created 4 years, 7 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) 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 813 matching lines...) Expand 10 before | Expand all | Expand 10 after
824 // GetAudio always returns 10 ms, at the requested sample rate. 824 // GetAudio always returns 10 ms, at the requested sample rate.
825 if (receiver_.GetAudio(desired_freq_hz, audio_frame, muted) != 0) { 825 if (receiver_.GetAudio(desired_freq_hz, audio_frame, muted) != 0) {
826 WEBRTC_TRACE(webrtc::kTraceError, webrtc::kTraceAudioCoding, id_, 826 WEBRTC_TRACE(webrtc::kTraceError, webrtc::kTraceAudioCoding, id_,
827 "PlayoutData failed, RecOut Failed"); 827 "PlayoutData failed, RecOut Failed");
828 return -1; 828 return -1;
829 } 829 }
830 audio_frame->id_ = id_; 830 audio_frame->id_ = id_;
831 return 0; 831 return 0;
832 } 832 }
833 833
834 int AudioCodingModuleImpl::PlayoutData10Ms(int desired_freq_hz,
835 AudioFrame* audio_frame) {
836 bool muted;
837 int ret = PlayoutData10Ms(desired_freq_hz, audio_frame, &muted);
838 RTC_DCHECK(!muted);
839 return ret;
840 }
841
842 ///////////////////////////////////////// 834 /////////////////////////////////////////
843 // Statistics 835 // Statistics
844 // 836 //
845 837
846 // TODO(turajs) change the return value to void. Also change the corresponding 838 // TODO(turajs) change the return value to void. Also change the corresponding
847 // NetEq function. 839 // NetEq function.
848 int AudioCodingModuleImpl::GetNetworkStatistics(NetworkStatistics* statistics) { 840 int AudioCodingModuleImpl::GetNetworkStatistics(NetworkStatistics* statistics) {
849 receiver_.GetNetworkStatistics(statistics); 841 receiver_.GetNetworkStatistics(statistics);
850 return 0; 842 return 0;
851 } 843 }
(...skipping 123 matching lines...) Expand 10 before | Expand all | Expand 10 after
975 return receiver_.LeastRequiredDelayMs(); 967 return receiver_.LeastRequiredDelayMs();
976 } 968 }
977 969
978 void AudioCodingModuleImpl::GetDecodingCallStatistics( 970 void AudioCodingModuleImpl::GetDecodingCallStatistics(
979 AudioDecodingCallStats* call_stats) const { 971 AudioDecodingCallStats* call_stats) const {
980 receiver_.GetDecodingCallStatistics(call_stats); 972 receiver_.GetDecodingCallStatistics(call_stats);
981 } 973 }
982 974
983 } // namespace acm2 975 } // namespace acm2
984 } // namespace webrtc 976 } // namespace webrtc
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698