Switch AudioDevice classes from SyncSocket to CancelableSyncSocket.

content/renderer/media/audio_device.cc

Index: content/renderer/media/audio_device.cc
diff --git a/content/renderer/media/audio_device.cc b/content/renderer/media/audio_device.cc
index 99b01f22c9c85ff8188af2410902e92a044046db..96ac905cbbc8d1afaf775aa86fac86f5da41b92f 100644
--- a/content/renderer/media/audio_device.cc
+++ b/content/renderer/media/audio_device.cc
@@ -7,6 +7,7 @@
 #include "base/bind.h"
 #include "base/debug/trace_event.h"
 #include "base/message_loop.h"
+#include "base/threading/thread_restrictions.h"
 #include "base/time.h"
 #include "content/common/child_process.h"
 #include "content/common/media/audio_messages.h"
@@ -243,7 +244,7 @@ void AudioDevice::OnLowLatencyCreated(
 
   shared_memory_handle_ = handle;
   memory_length_ = length;
-  audio_socket_ = new AudioSocket(socket_handle);
+  audio_socket_.reset(new base::CancelableSyncSocket(socket_handle));
 
   audio_thread_.reset(
       new base::DelegateSimpleThread(this, "renderer_audio_thread"));
@@ -270,20 +271,25 @@ void AudioDevice::Run() {
 
   base::SharedMemory shared_memory(shared_memory_handle_, false);
   shared_memory.Map(media::TotalSharedMemorySizeInBytes(memory_length_));
-  scoped_refptr<AudioSocket> audio_socket(audio_socket_);
+  base::CancelableSyncSocket* audio_socket = audio_socket_.get();

[scherkus (not reviewing), 2012/01/30 19:10:57]

nit: do we need this anymore?

[tommi (sloooow) - chröme, 2012/01/30 21:53:14]

yes, this is different than what we had before (scoped_refptr vs
CancelableSyncSocket*)

 
-  int pending_data;
   const int samples_per_ms = static_cast<int>(sample_rate_) / 1000;
   const int bytes_per_ms = channels_ * (bits_per_sample_ / 8) * samples_per_ms;
 
-  while (sizeof(pending_data) ==
-      audio_socket->socket()->Receive(&pending_data, sizeof(pending_data))) {
-    if (pending_data == media::AudioOutputController::kPauseMark) {
+  while (true) {
+    uint32 pending_data = 0;
+    size_t bytes_read = audio_socket->Receive(&pending_data,
+                                              sizeof(pending_data));
+    if (bytes_read != sizeof(pending_data)) {
+      DCHECK_EQ(bytes_read, 0U);
+      break;
+    }
+
+    if (pending_data ==
+        static_cast<uint32>(media::AudioOutputController::kPauseMark)) {
       memset(shared_memory.memory(), 0, memory_length_);
       media::SetActualDataSizeInBytes(&shared_memory, memory_length_, 0);
       continue;
-    } else if (pending_data < 0) {
-      break;
     }
 
     // Convert the number of pending bytes in the render buffer
@@ -297,7 +303,6 @@ void AudioDevice::Run() {
                                     memory_length_,
                                     num_frames * channels_ * sizeof(int16));
   }
-  audio_socket->Close();
 }
 
 size_t AudioDevice::FireRenderCallback(int16* data) {
@@ -327,9 +332,11 @@ void AudioDevice::ShutDownAudioThread() {
   if (audio_thread_.get()) {
     // Close the socket to terminate the main thread function in the
     // audio thread.
-    audio_socket_->Close();
-    audio_socket_ = NULL;
+    audio_socket_->Shutdown();  // Stops blocking Receive calls.
+    // TODO(tommi): We must not do this from the IO thread.  Fix.

[scherkus (not reviewing), 2012/01/30 19:10:57]

is this coming in a follow up CL or should we file a bug for M19?

[tommi (sloooow) - chröme, 2012/01/30 21:53:14]

Yes, I'll start working on it tomorrow.  I'll file a bug.

+    base::ThreadRestrictions::ScopedAllowIO allow_wait;
     audio_thread_->Join();
     audio_thread_.reset(NULL);
+    audio_socket_.reset();
   }
 }