Chromium Code Reviews

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

Issue 3013033002: Remove VoEFile (Closed)
Patch Set: rebase Created 3 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
View unified diff |
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 611 matching lines...)
622 if (!shared_->audio_device()->Recording()) { 622 if (!shared_->audio_device()->Recording()) {
623 if (shared_->audio_device()->StartRecording() != 0) { 623 if (shared_->audio_device()->StartRecording() != 0) {
624 LOG_F(LS_ERROR) << "Failed to start recording"; 624 LOG_F(LS_ERROR) << "Failed to start recording";
625 return -1; 625 return -1;
626 } 626 }
627 } 627 }
628 return 0; 628 return 0;
629 } 629 }
630 630
631 int32_t VoEBaseImpl::StopSend() { 631 int32_t VoEBaseImpl::StopSend() {
632 if (shared_->NumOfSendingChannels() == 0 && 632 if (shared_->NumOfSendingChannels() == 0) {
633 !shared_->transmit_mixer()->IsRecordingMic()) {
634 // Stop audio-device recording if no channel is recording 633 // Stop audio-device recording if no channel is recording
635 if (shared_->audio_device()->StopRecording() != 0) { 634 if (shared_->audio_device()->StopRecording() != 0) {
636 shared_->SetLastError(VE_CANNOT_STOP_RECORDING, kTraceError, 635 shared_->SetLastError(VE_CANNOT_STOP_RECORDING, kTraceError,
637 "StopSend() failed to stop recording"); 636 "StopSend() failed to stop recording");
638 return -1; 637 return -1;
639 } 638 }
640 shared_->transmit_mixer()->StopSend(); 639 shared_->transmit_mixer()->StopSend();
641 } 640 }
642 641
643 return 0; 642 return 0;
(...skipping 95 matching lines...)
739 shared_->SetLastError(VE_CHANNEL_NOT_VALID, kTraceError, 738 shared_->SetLastError(VE_CHANNEL_NOT_VALID, kTraceError,
740 "AssociateSendChannel() failed to locate accociate_send_channel"); 739 "AssociateSendChannel() failed to locate accociate_send_channel");
741 return -1; 740 return -1;
742 } 741 }
743 742
744 channel_ptr->set_associate_send_channel(ch); 743 channel_ptr->set_associate_send_channel(ch);
745 return 0; 744 return 0;
746 } 745 }
747 746
748 } // namespace webrtc 747 } // namespace webrtc
OLDNEW

Powered by Google App Engine