| 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 "modules/webaudio/AsyncAudioDecoder.h" | 25 #include "modules/webaudio/AsyncAudioDecoder.h" |
| 26 #include "core/dom/DOMArrayBuffer.h" | 26 #include "core/dom/DOMArrayBuffer.h" |
| 27 #include "modules/webaudio/AbstractAudioContext.h" | 27 #include "modules/webaudio/AbstractAudioContext.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/Task.h" | |
| 31 #include "platform/ThreadSafeFunctional.h" | 30 #include "platform/ThreadSafeFunctional.h" |
| 32 #include "platform/audio/AudioBus.h" | 31 #include "platform/audio/AudioBus.h" |
| 33 #include "platform/audio/AudioFileReader.h" | 32 #include "platform/audio/AudioFileReader.h" |
| 34 #include "public/platform/Platform.h" | 33 #include "public/platform/Platform.h" |
| 35 #include "public/platform/WebTraceLocation.h" | 34 #include "public/platform/WebTraceLocation.h" |
| 36 #include "wtf/MainThread.h" | 35 #include "wtf/MainThread.h" |
| 37 #include "wtf/PassOwnPtr.h" | 36 #include "wtf/PassOwnPtr.h" |
| 38 | 37 |
| 39 namespace blink { | 38 namespace blink { |
| 40 | 39 |
| (...skipping 10 matching lines...) Expand all Loading... |
| 51 { | 50 { |
| 52 ASSERT(isMainThread()); | 51 ASSERT(isMainThread()); |
| 53 ASSERT(audioData); | 52 ASSERT(audioData); |
| 54 if (!audioData) | 53 if (!audioData) |
| 55 return; | 54 return; |
| 56 | 55 |
| 57 // Add a ref to keep audioData alive until completion of decoding. | 56 // Add a ref to keep audioData alive until completion of decoding. |
| 58 RefPtr<DOMArrayBuffer> audioDataRef(audioData); | 57 RefPtr<DOMArrayBuffer> audioDataRef(audioData); |
| 59 | 58 |
| 60 // The leak references to successCallback and errorCallback are picked up on
notifyComplete. | 59 // The leak references to successCallback and errorCallback are picked up on
notifyComplete. |
| 61 m_thread->taskRunner()->postTask(BLINK_FROM_HERE, new Task(threadSafeBind(&A
syncAudioDecoder::decode, AllowCrossThreadAccess(audioDataRef.release().leakRef(
)), sampleRate, successCallback, errorCallback, resolver, context))); | 60 m_thread->taskRunner()->postTask(BLINK_FROM_HERE, threadSafeBind(&AsyncAudio
Decoder::decode, AllowCrossThreadAccess(audioDataRef.release().leakRef()), sampl
eRate, successCallback, errorCallback, resolver, context)); |
| 62 } | 61 } |
| 63 | 62 |
| 64 void AsyncAudioDecoder::decode(DOMArrayBuffer* audioData, float sampleRate, Audi
oBufferCallback* successCallback, AudioBufferCallback* errorCallback, ScriptProm
iseResolver* resolver, AbstractAudioContext* context) | 63 void AsyncAudioDecoder::decode(DOMArrayBuffer* audioData, float sampleRate, Audi
oBufferCallback* successCallback, AudioBufferCallback* errorCallback, ScriptProm
iseResolver* resolver, AbstractAudioContext* context) |
| 65 { | 64 { |
| 66 RefPtr<AudioBus> bus = createBusFromInMemoryAudioFile(audioData->data(), aud
ioData->byteLength(), false, sampleRate); | 65 RefPtr<AudioBus> bus = createBusFromInMemoryAudioFile(audioData->data(), aud
ioData->byteLength(), false, sampleRate); |
| 67 | 66 |
| 68 // Decoding is finished, but we need to do the callbacks on the main thread. | 67 // Decoding is finished, but we need to do the callbacks on the main thread. |
| 69 // The leaked reference to audioBuffer is picked up in notifyComplete. | 68 // The leaked reference to audioBuffer is picked up in notifyComplete. |
| 70 Platform::current()->mainThread()->taskRunner()->postTask(BLINK_FROM_HERE, t
hreadSafeBind(&AsyncAudioDecoder::notifyComplete, AllowCrossThreadAccess(audioDa
ta), successCallback, errorCallback, bus.release().leakRef(), resolver, context)
); | 69 Platform::current()->mainThread()->taskRunner()->postTask(BLINK_FROM_HERE, t
hreadSafeBind(&AsyncAudioDecoder::notifyComplete, AllowCrossThreadAccess(audioDa
ta), successCallback, errorCallback, bus.release().leakRef(), resolver, context)
); |
| 71 } | 70 } |
| 72 | 71 |
| 73 void AsyncAudioDecoder::notifyComplete(DOMArrayBuffer* audioData, AudioBufferCal
lback* successCallback, AudioBufferCallback* errorCallback, AudioBus* audioBus,
ScriptPromiseResolver* resolver, AbstractAudioContext* context) | 72 void AsyncAudioDecoder::notifyComplete(DOMArrayBuffer* audioData, AudioBufferCal
lback* successCallback, AudioBufferCallback* errorCallback, AudioBus* audioBus,
ScriptPromiseResolver* resolver, AbstractAudioContext* context) |
| 74 { | 73 { |
| 75 ASSERT(isMainThread()); | 74 ASSERT(isMainThread()); |
| 76 | 75 |
| 77 // Adopt references, so everything gets correctly dereffed. | 76 // Adopt references, so everything gets correctly dereffed. |
| 78 RefPtr<DOMArrayBuffer> audioDataRef = adoptRef(audioData); | 77 RefPtr<DOMArrayBuffer> audioDataRef = adoptRef(audioData); |
| 79 RefPtr<AudioBus> audioBusRef = adoptRef(audioBus); | 78 RefPtr<AudioBus> audioBusRef = adoptRef(audioBus); |
| 80 | 79 |
| 81 AudioBuffer* audioBuffer = AudioBuffer::createFromAudioBus(audioBus); | 80 AudioBuffer* audioBuffer = AudioBuffer::createFromAudioBus(audioBus); |
| 82 | 81 |
| 83 // Let the context finish the notification. | 82 // Let the context finish the notification. |
| 84 context->handleDecodeAudioData(audioBuffer, resolver, successCallback, error
Callback); | 83 context->handleDecodeAudioData(audioBuffer, resolver, successCallback, error
Callback); |
| 85 } | 84 } |
| 86 | 85 |
| 87 } // namespace blink | 86 } // namespace blink |
| 88 | |
| OLD | NEW |