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

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

Issue 2750783004: Add mute state field to AudioFrame. (Closed)
Patch Set: Update new usages of AudioFrame::data_ Created 3 years, 6 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
« no previous file with comments | « webrtc/voice_engine/utility_unittest.cc ('k') | no next file » | 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 698 matching lines...) Expand 10 before | Expand all | Expand 10 after
709 shared_->output_mixer()->DoOperationsOnCombinedSignal(feed_data_to_apm); 709 shared_->output_mixer()->DoOperationsOnCombinedSignal(feed_data_to_apm);
710 710
711 // Retrieve the final output mix (resampled to match the ADM) 711 // Retrieve the final output mix (resampled to match the ADM)
712 shared_->output_mixer()->GetMixedAudio(sample_rate, number_of_channels, 712 shared_->output_mixer()->GetMixedAudio(sample_rate, number_of_channels,
713 &audioFrame_); 713 &audioFrame_);
714 714
715 assert(number_of_frames == audioFrame_.samples_per_channel_); 715 assert(number_of_frames == audioFrame_.samples_per_channel_);
716 assert(sample_rate == audioFrame_.sample_rate_hz_); 716 assert(sample_rate == audioFrame_.sample_rate_hz_);
717 717
718 // Deliver audio (PCM) samples to the ADM 718 // Deliver audio (PCM) samples to the ADM
719 memcpy(audio_data, audioFrame_.data_, 719 memcpy(audio_data, audioFrame_.data(),
720 sizeof(int16_t) * number_of_frames * number_of_channels); 720 sizeof(int16_t) * number_of_frames * number_of_channels);
721 721
722 *elapsed_time_ms = audioFrame_.elapsed_time_ms_; 722 *elapsed_time_ms = audioFrame_.elapsed_time_ms_;
723 *ntp_time_ms = audioFrame_.ntp_time_ms_; 723 *ntp_time_ms = audioFrame_.ntp_time_ms_;
724 } 724 }
725 725
726 int VoEBaseImpl::AssociateSendChannel(int channel, 726 int VoEBaseImpl::AssociateSendChannel(int channel,
727 int accociate_send_channel) { 727 int accociate_send_channel) {
728 rtc::CritScope cs(shared_->crit_sec()); 728 rtc::CritScope cs(shared_->crit_sec());
729 729
(...skipping 16 matching lines...) Expand all
746 shared_->SetLastError(VE_CHANNEL_NOT_VALID, kTraceError, 746 shared_->SetLastError(VE_CHANNEL_NOT_VALID, kTraceError,
747 "AssociateSendChannel() failed to locate accociate_send_channel"); 747 "AssociateSendChannel() failed to locate accociate_send_channel");
748 return -1; 748 return -1;
749 } 749 }
750 750
751 channel_ptr->set_associate_send_channel(ch); 751 channel_ptr->set_associate_send_channel(ch);
752 return 0; 752 return 0;
753 } 753 }
754 754
755 } // namespace webrtc 755 } // namespace webrtc
OLDNEW
« no previous file with comments | « webrtc/voice_engine/utility_unittest.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698