Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "content/renderer/pepper/pepper_platform_audio_output.h" | 5 #include "content/renderer/pepper/pepper_platform_audio_output.h" |
| 6 | 6 |
| 7 #include "base/bind.h" | 7 #include "base/bind.h" |
| 8 #include "base/location.h" | 8 #include "base/location.h" |
| 9 #include "base/logging.h" | 9 #include "base/logging.h" |
| 10 #include "base/single_thread_task_runner.h" | 10 #include "base/single_thread_task_runner.h" |
| (...skipping 56 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 67 io_task_runner_->PostTask( | 67 io_task_runner_->PostTask( |
| 68 FROM_HERE, | 68 FROM_HERE, |
| 69 base::Bind(&PepperPlatformAudioOutput::ShutDownOnIOThread, this)); | 69 base::Bind(&PepperPlatformAudioOutput::ShutDownOnIOThread, this)); |
| 70 } | 70 } |
| 71 | 71 |
| 72 void PepperPlatformAudioOutput::OnStateChanged( | 72 void PepperPlatformAudioOutput::OnStateChanged( |
| 73 media::AudioOutputIPCDelegateState state) {} | 73 media::AudioOutputIPCDelegateState state) {} |
| 74 | 74 |
| 75 void PepperPlatformAudioOutput::OnDeviceAuthorized( | 75 void PepperPlatformAudioOutput::OnDeviceAuthorized( |
| 76 media::OutputDeviceStatus device_status, | 76 media::OutputDeviceStatus device_status, |
| 77 const media::AudioParameters& output_params) { | 77 const media::AudioParameters& output_params, |
| 78 const std::string& matched_deviec_id) { | |
|
o1ka
2016/03/07 15:25:49
nit: matched_device_id
o1ka
2016/04/05 15:13:38
Done.
| |
| 78 NOTREACHED(); | 79 NOTREACHED(); |
| 79 } | 80 } |
| 80 | 81 |
| 81 void PepperPlatformAudioOutput::OnStreamCreated( | 82 void PepperPlatformAudioOutput::OnStreamCreated( |
| 82 base::SharedMemoryHandle handle, | 83 base::SharedMemoryHandle handle, |
| 83 base::SyncSocket::Handle socket_handle, | 84 base::SyncSocket::Handle socket_handle, |
| 84 int length) { | 85 int length) { |
| 85 #if defined(OS_WIN) | 86 #if defined(OS_WIN) |
| 86 DCHECK(handle.IsValid()); | 87 DCHECK(handle.IsValid()); |
| 87 DCHECK(socket_handle); | 88 DCHECK(socket_handle); |
| (...skipping 81 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 169 return; | 170 return; |
| 170 | 171 |
| 171 ipc_->CloseStream(); | 172 ipc_->CloseStream(); |
| 172 ipc_.reset(); | 173 ipc_.reset(); |
| 173 | 174 |
| 174 Release(); // Release for the delegate, balances out the reference taken in | 175 Release(); // Release for the delegate, balances out the reference taken in |
| 175 // PepperPlatformAudioOutput::Create. | 176 // PepperPlatformAudioOutput::Create. |
| 176 } | 177 } |
| 177 | 178 |
| 178 } // namespace content | 179 } // namespace content |
| OLD | NEW |