Upstream version 10.39.225.0

[platform/framework/web/crosswalk.git] / src / content / renderer / media / audio_message_filter.cc

diff --git a/src/content/renderer/media/audio_message_filter.cc b/src/content/renderer/media/audio_message_filter.cc
index fde42fb..09f3689 100644 (file)
--- a/src/content/renderer/media/audio_message_filter.cc
+++ b/src/content/renderer/media/audio_message_filter.cc
@@ -168,11 +168,7 @@ void AudioMessageFilter::OnChannelClosing() {
 void AudioMessageFilter::OnStreamCreated(
     int stream_id,
     base::SharedMemoryHandle handle,
-#if defined(OS_WIN)
-    base::SyncSocket::Handle socket_handle,
-#else
-    base::FileDescriptor socket_descriptor,
-#endif
+    base::SyncSocket::TransitDescriptor socket_descriptor,
     uint32 length) {
   DCHECK(io_message_loop_->BelongsToCurrentThread());
 
@@ -180,9 +176,8 @@ void AudioMessageFilter::OnStreamCreated(
       "AMF::OnStreamCreated. stream_id=%d",
       stream_id));
 
-#if !defined(OS_WIN)
-  base::SyncSocket::Handle socket_handle = socket_descriptor.fd;
-#endif
+  base::SyncSocket::Handle socket_handle =
+      base::SyncSocket::UnwrapHandle(socket_descriptor);
 
   media::AudioOutputIPCDelegate* delegate = delegates_.Lookup(stream_id);
   if (!delegate) {
@@ -234,7 +229,6 @@ void AudioMessageFilter::OnOutputDeviceChanged(int stream_id,
       media::AudioParameters::AUDIO_PCM_LOW_LATENCY,
       channel_layout,
       channels,
-      0,
       new_sample_rate,
       16,
       new_buffer_size);