Use correct thread for audio capturing and encoding.

remoting/host/audio_scheduler.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "remoting/host/audio_scheduler.h"
 
 #include "base/bind.h"
 #include "base/callback.h"
 #include "base/location.h"
 #include "base/logging.h"
 #include "base/single_thread_task_runner.h"
 #include "remoting/codec/audio_encoder.h"
 #include "remoting/host/audio_capturer.h"
+#include "remoting/host/desktop_environment.h"
 #include "remoting/proto/audio.pb.h"
 #include "remoting/protocol/audio_stub.h"
 
 namespace remoting {
 
 AudioScheduler::AudioScheduler(
     scoped_refptr<base::SingleThreadTaskRunner> audio_task_runner,
     scoped_refptr<base::SingleThreadTaskRunner> network_task_runner,
-    AudioCapturer* audio_capturer,
+    DesktopEnvironment* desktop_environment,
     scoped_ptr<AudioEncoder> audio_encoder,
     protocol::AudioStub* audio_stub)
     : audio_task_runner_(audio_task_runner),
       network_task_runner_(network_task_runner),
-      audio_capturer_(audio_capturer),
       audio_encoder_(audio_encoder.Pass()),
       audio_stub_(audio_stub),
       network_stopped_(false),
       enabled_(true) {
   DCHECK(network_task_runner_->BelongsToCurrentThread());
-  DCHECK(audio_capturer_);
   DCHECK(audio_stub_);
 
   audio_task_runner_->PostTask(
-      FROM_HERE, base::Bind(&AudioScheduler::StartOnAudioThread, this));
+      FROM_HERE, base::Bind(&AudioScheduler::StartOnAudioThread, this,
+                            desktop_environment));

[Wez, 2012/10/27 03:43:15]

base::Unretained()?

[Wez, 2012/10/27 03:43:15]

Add a comment reminding that |desktop_environment| is required to remain valid
until Stop() has completed.

[Sergey Ulanov, 2012/10/29 23:43:04]

AudioScheduler is ref-counted

[Sergey Ulanov, 2012/10/29 23:43:04]

Done.

 }
 
 void AudioScheduler::Stop(const base::Closure& done_task) {
   DCHECK(network_task_runner_->BelongsToCurrentThread());
   DCHECK(!done_task.is_null());
   DCHECK(audio_stub_);
 
   // Clear |audio_stub_| to prevent audio packets being delivered to the client.
   audio_stub_ = NULL;
 
   audio_task_runner_->PostTask(
       FROM_HERE,
       base::Bind(&AudioScheduler::StopOnAudioThread, this, done_task));
 }
 
 AudioScheduler::~AudioScheduler() {
 }
 
-void AudioScheduler::StartOnAudioThread() {
+void AudioScheduler::StartOnAudioThread(
+    DesktopEnvironment* desktop_environment) {
   DCHECK(audio_task_runner_->BelongsToCurrentThread());
 
-  // TODO(kxing): Do something with the return value.
-  audio_capturer_->Start(
-      base::Bind(&AudioScheduler::EncodeAudioPacket, this));
+  audio_capturer_ = desktop_environment->CreateAudioCapturer();
+  if (!audio_capturer_->Start(
+          base::Bind(&AudioScheduler::EncodeAudioPacket, this))) {

[Wez, 2012/10/27 03:43:15]

nit: Indentation.

[Sergey Ulanov, 2012/10/29 23:43:04]

It is indented correctly - 4 spaces relative to start of the expression.

+    LOG(ERROR) << "Failed to create audio capturer";

[Wez, 2012/10/27 03:43:15]

nit: Failed to start audio capturer?

[Sergey Ulanov, 2012/10/29 23:43:04]

Done.

+    audio_capturer_.reset();
+  }
 }
 
 void AudioScheduler::StopOnAudioThread(const base::Closure& done_task) {
   DCHECK(audio_task_runner_->BelongsToCurrentThread());
-  audio_capturer_->Stop();
+  if (audio_capturer_)
+    audio_capturer_->Stop();

[Wez, 2012/10/27 03:43:15]

Not for this CL, but I wonder if we even need AudioCapturer::Stop() to be
separate from deleting it any more?

[Sergey Ulanov, 2012/10/29 23:43:04]

No. I'll remove it in a separate CL.

 
   network_task_runner_->PostTask(FROM_HERE, done_task);
 }
 
 void AudioScheduler::SetEnabled(bool enabled) {
   if (!audio_task_runner_->BelongsToCurrentThread()) {
     audio_task_runner_->PostTask(
         FROM_HERE, base::Bind(&AudioScheduler::SetEnabled, this, enabled));
     return;
   }
@@ skipping 23 matching lines @@
   DCHECK(network_task_runner_->BelongsToCurrentThread());
   DCHECK(packet.get());
 
   if (!audio_stub_)
     return;
 
   audio_stub_->ProcessAudioPacket(packet.Pass(), base::Closure());
 }
 
 }  // namespace remoting