Piping for audio decoding.

remoting/client/chromoting_client.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/client/chromoting_client.h"
 
 #include "base/bind.h"
 #include "remoting/client/audio_player.h"
 #include "remoting/client/client_context.h"
 #include "remoting/client/client_user_interface.h"
 #include "remoting/client/rectangle_update_decoder.h"
+#include "remoting/codec/audio_decoder.h"
 #include "remoting/proto/audio.pb.h"
 #include "remoting/proto/video.pb.h"
 #include "remoting/protocol/authentication_method.h"
 #include "remoting/protocol/connection_to_host.h"
 #include "remoting/protocol/negotiating_authenticator.h"
 #include "remoting/protocol/session_config.h"
 #include "remoting/protocol/transport.h"
 
 namespace remoting {
 
@@ skipping 114 matching lines @@
     DispatchPacket();
 }
 
 int ChromotingClient::GetPendingVideoPackets() {
   DCHECK(task_runner_->BelongsToCurrentThread());
   return received_packets_.size();
 }
 
 void ChromotingClient::ProcessAudioPacket(scoped_ptr<AudioPacket> packet,
                                           const base::Closure& done) {
-  audio_player_->ProcessAudioPacket(packet.Pass());
+  scoped_ptr<AudioPacket> decoded_packet =

[Sergey Ulanov, 2012/08/01 17:43:54]

Add DCHECK to verify that this method is called on |task_runner_|

[kxing, 2012/08/01 22:15:38]

Done.

+      audio_decoder_->Decode(packet.Pass());

[Sergey Ulanov, 2012/08/01 17:43:54]

We shouldn't be decoding audio on the main plugin thread. Please add another
thread in ClientContext and use it to decode audio. It's best to move all
thread-switching logic to a new class similar to RectangleUpdateDecoder (e.g.
AudioDecodeScheduler).

[kxing, 2012/08/01 22:15:38]

Done.

+  audio_player_->ProcessAudioPacket(decoded_packet.Pass());
   done.Run();
 }
 
 void ChromotingClient::DispatchPacket() {
   DCHECK(task_runner_->BelongsToCurrentThread());
   CHECK(!packet_being_processed_);
 
   if (received_packets_.empty()) {
     // Nothing to do!
     return;
@@ skipping 53 matching lines @@
 
   // Process the next video packet.
   DispatchPacket();
 }
 
 void ChromotingClient::Initialize() {
   DCHECK(task_runner_->BelongsToCurrentThread());
 
   // Initialize the decoder.
   rectangle_decoder_->Initialize(connection_->config());
+  if (connection_->config().is_audio_enabled()) {
+    audio_decoder_.reset(
+        AudioDecoder::CreateAudioDecoder(connection_->config()).release());
+  }
 }
 
 }  // namespace remoting