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

Unified Diff: webrtc/voice_engine/voe_base_impl.cc

Issue 1304933008: Remove unnecessary fields from VoE SharedData. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: rebase Created 5 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « webrtc/voice_engine/shared_data.cc ('k') | webrtc/voice_engine/voe_file_impl.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webrtc/voice_engine/voe_base_impl.cc
diff --git a/webrtc/voice_engine/voe_base_impl.cc b/webrtc/voice_engine/voe_base_impl.cc
index 1dc89e7ee119422fd14c9eb56e36de31b914a51f..94cd98f797feea696a2cd005654c259c970ad654 100644
--- a/webrtc/voice_engine/voe_base_impl.cc
+++ b/webrtc/voice_engine/voe_base_impl.cc
@@ -642,10 +642,7 @@ int32_t VoEBaseImpl::AddExternalTransportBuild(char* str) const {
int VoEBaseImpl::LastError() { return (shared_->statistics().LastError()); }
int32_t VoEBaseImpl::StartPlayout() {
- if (shared_->audio_device()->Playing()) {
- return 0;
- }
- if (!shared_->ext_playout()) {
+ if (!shared_->audio_device()->Playing()) {
if (shared_->audio_device()->InitPlayout() != 0) {
LOG_F(LS_ERROR) << "Failed to initialize playout";
return -1;
@@ -671,10 +668,7 @@ int32_t VoEBaseImpl::StopPlayout() {
}
int32_t VoEBaseImpl::StartSend() {
- if (shared_->audio_device()->Recording()) {
- return 0;
- }
- if (!shared_->ext_recording()) {
+ if (!shared_->audio_device()->Recording()) {
if (shared_->audio_device()->InitRecording() != 0) {
LOG_F(LS_ERROR) << "Failed to initialize recording";
return -1;
@@ -684,7 +678,6 @@ int32_t VoEBaseImpl::StartSend() {
return -1;
}
}
-
return 0;
}
« no previous file with comments | « webrtc/voice_engine/shared_data.cc ('k') | webrtc/voice_engine/voe_file_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698