OLD | NEW |
1 /* | 1 /* |
2 * Copyright (C) 2011, Google Inc. All rights reserved. | 2 * Copyright (C) 2011, Google Inc. All rights reserved. |
3 * | 3 * |
4 * Redistribution and use in source and binary forms, with or without | 4 * Redistribution and use in source and binary forms, with or without |
5 * modification, are permitted provided that the following conditions | 5 * modification, are permitted provided that the following conditions |
6 * are met: | 6 * are met: |
7 * 1. Redistributions of source code must retain the above copyright | 7 * 1. Redistributions of source code must retain the above copyright |
8 * notice, this list of conditions and the following disclaimer. | 8 * notice, this list of conditions and the following disclaimer. |
9 * 2. Redistributions in binary form must reproduce the above copyright | 9 * 2. Redistributions in binary form must reproduce the above copyright |
10 * notice, this list of conditions and the following disclaimer in the | 10 * notice, this list of conditions and the following disclaimer in the |
11 * documentation and/or other materials provided with the distribution. | 11 * documentation and/or other materials provided with the distribution. |
12 * | 12 * |
13 * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS'' AND AN
Y | 13 * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS'' AND AN
Y |
14 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED | 14 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED |
15 * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE | 15 * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE |
16 * DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS BE LIABLE FOR AN
Y | 16 * DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS BE LIABLE FOR AN
Y |
17 * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES | 17 * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES |
18 * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; | 18 * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; |
19 * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND O
N | 19 * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND O
N |
20 * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | 20 * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT |
21 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS | 21 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS |
22 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 22 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
23 */ | 23 */ |
24 | 24 |
25 #include "core/dom/DOMArrayBuffer.h" | 25 #include "core/dom/DOMArrayBuffer.h" |
26 #include "modules/webaudio/AbstractAudioContext.h" | 26 #include "modules/webaudio/AbstractAudioContext.h" |
27 #include "modules/webaudio/AsyncAudioDecoder.h" | 27 #include "modules/webaudio/AsyncAudioDecoder.h" |
28 #include "modules/webaudio/AudioBuffer.h" | 28 #include "modules/webaudio/AudioBuffer.h" |
29 #include "modules/webaudio/AudioBufferCallback.h" | 29 #include "modules/webaudio/AudioBufferCallback.h" |
30 #include "platform/CrossThreadFunctional.h" | |
31 #include "platform/audio/AudioBus.h" | 30 #include "platform/audio/AudioBus.h" |
32 #include "platform/audio/AudioFileReader.h" | 31 #include "platform/audio/AudioFileReader.h" |
33 #include "public/platform/Platform.h" | 32 #include "public/platform/Platform.h" |
34 #include "public/platform/WebTraceLocation.h" | 33 #include "public/platform/WebTraceLocation.h" |
| 34 #include "wtf/Functional.h" |
35 #include "wtf/PtrUtil.h" | 35 #include "wtf/PtrUtil.h" |
36 | 36 |
37 namespace blink { | 37 namespace blink { |
38 | 38 |
39 AsyncAudioDecoder::AsyncAudioDecoder() | 39 AsyncAudioDecoder::AsyncAudioDecoder() |
40 : m_thread(wrapUnique(Platform::current()->createThread("Audio Decoder"))) | 40 : m_thread(wrapUnique(Platform::current()->createThread("Audio Decoder"))) |
41 { | 41 { |
42 } | 42 } |
43 | 43 |
44 AsyncAudioDecoder::~AsyncAudioDecoder() | 44 AsyncAudioDecoder::~AsyncAudioDecoder() |
(...skipping 23 matching lines...) Expand all Loading... |
68 { | 68 { |
69 ASSERT(isMainThread()); | 69 ASSERT(isMainThread()); |
70 | 70 |
71 AudioBuffer* audioBuffer = AudioBuffer::createFromAudioBus(audioBus); | 71 AudioBuffer* audioBuffer = AudioBuffer::createFromAudioBus(audioBus); |
72 | 72 |
73 // Let the context finish the notification. | 73 // Let the context finish the notification. |
74 context->handleDecodeAudioData(audioBuffer, resolver, successCallback, error
Callback); | 74 context->handleDecodeAudioData(audioBuffer, resolver, successCallback, error
Callback); |
75 } | 75 } |
76 | 76 |
77 } // namespace blink | 77 } // namespace blink |
OLD | NEW |