| 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" | |
| 28 #include "modules/webaudio/AudioBuffer.h" | 27 #include "modules/webaudio/AudioBuffer.h" |
| 29 #include "modules/webaudio/AudioBufferCallback.h" | 28 #include "modules/webaudio/AudioBufferCallback.h" |
| 29 #include "modules/webaudio/BaseAudioContext.h" |
| 30 #include "platform/ThreadSafeFunctional.h" | 30 #include "platform/ThreadSafeFunctional.h" |
| 31 #include "platform/audio/AudioBus.h" | 31 #include "platform/audio/AudioBus.h" |
| 32 #include "platform/audio/AudioFileReader.h" | 32 #include "platform/audio/AudioFileReader.h" |
| 33 #include "public/platform/Platform.h" | 33 #include "public/platform/Platform.h" |
| 34 #include "public/platform/WebTraceLocation.h" | 34 #include "public/platform/WebTraceLocation.h" |
| 35 #include "wtf/PassOwnPtr.h" | 35 #include "wtf/PassOwnPtr.h" |
| 36 | 36 |
| 37 namespace blink { | 37 namespace blink { |
| 38 | 38 |
| 39 AsyncAudioDecoder::AsyncAudioDecoder() | 39 AsyncAudioDecoder::AsyncAudioDecoder() |
| 40 : m_thread(adoptPtr(Platform::current()->createThread("Audio Decoder"))) | 40 : m_thread(adoptPtr(Platform::current()->createThread("Audio Decoder"))) |
| 41 { | 41 { |
| 42 } | 42 } |
| 43 | 43 |
| 44 AsyncAudioDecoder::~AsyncAudioDecoder() | 44 AsyncAudioDecoder::~AsyncAudioDecoder() |
| 45 { | 45 { |
| 46 } | 46 } |
| 47 | 47 |
| 48 void AsyncAudioDecoder::decodeAsync(DOMArrayBuffer* audioData, float sampleRate,
AudioBufferCallback* successCallback, AudioBufferCallback* errorCallback, Scrip
tPromiseResolver* resolver, AbstractAudioContext* context) | 48 void AsyncAudioDecoder::decodeAsync(DOMArrayBuffer* audioData, float sampleRate,
AudioBufferCallback* successCallback, AudioBufferCallback* errorCallback, Scrip
tPromiseResolver* resolver, BaseAudioContext* context) |
| 49 { | 49 { |
| 50 ASSERT(isMainThread()); | 50 ASSERT(isMainThread()); |
| 51 ASSERT(audioData); | 51 ASSERT(audioData); |
| 52 if (!audioData) | 52 if (!audioData) |
| 53 return; | 53 return; |
| 54 | 54 |
| 55 // Add a ref to keep audioData alive until completion of decoding. | 55 // Add a ref to keep audioData alive until completion of decoding. |
| 56 RefPtr<DOMArrayBuffer> audioDataRef(audioData); | 56 RefPtr<DOMArrayBuffer> audioDataRef(audioData); |
| 57 | 57 |
| 58 // The leak references to successCallback and errorCallback are picked up on
notifyComplete. | 58 // The leak references to successCallback and errorCallback are picked up on
notifyComplete. |
| 59 m_thread->getWebTaskRunner()->postTask(BLINK_FROM_HERE, threadSafeBind(&Asyn
cAudioDecoder::decode, AllowCrossThreadAccess(audioDataRef.release().leakRef()),
sampleRate, successCallback, errorCallback, resolver, context)); | 59 m_thread->getWebTaskRunner()->postTask(BLINK_FROM_HERE, threadSafeBind(&Asyn
cAudioDecoder::decode, AllowCrossThreadAccess(audioDataRef.release().leakRef()),
sampleRate, successCallback, errorCallback, resolver, context)); |
| 60 } | 60 } |
| 61 | 61 |
| 62 void AsyncAudioDecoder::decode(DOMArrayBuffer* audioData, float sampleRate, Audi
oBufferCallback* successCallback, AudioBufferCallback* errorCallback, ScriptProm
iseResolver* resolver, AbstractAudioContext* context) | 62 void AsyncAudioDecoder::decode(DOMArrayBuffer* audioData, float sampleRate, Audi
oBufferCallback* successCallback, AudioBufferCallback* errorCallback, ScriptProm
iseResolver* resolver, BaseAudioContext* context) |
| 63 { | 63 { |
| 64 RefPtr<AudioBus> bus = createBusFromInMemoryAudioFile(audioData->data(), aud
ioData->byteLength(), false, sampleRate); | 64 RefPtr<AudioBus> bus = createBusFromInMemoryAudioFile(audioData->data(), aud
ioData->byteLength(), false, sampleRate); |
| 65 | 65 |
| 66 // Decoding is finished, but we need to do the callbacks on the main thread. | 66 // Decoding is finished, but we need to do the callbacks on the main thread. |
| 67 // The leaked reference to audioBuffer is picked up in notifyComplete. | 67 // The leaked reference to audioBuffer is picked up in notifyComplete. |
| 68 Platform::current()->mainThread()->getWebTaskRunner()->postTask(BLINK_FROM_H
ERE, threadSafeBind(&AsyncAudioDecoder::notifyComplete, AllowCrossThreadAccess(a
udioData), successCallback, errorCallback, bus.release().leakRef(), resolver, co
ntext)); | 68 Platform::current()->mainThread()->getWebTaskRunner()->postTask(BLINK_FROM_H
ERE, threadSafeBind(&AsyncAudioDecoder::notifyComplete, AllowCrossThreadAccess(a
udioData), successCallback, errorCallback, bus.release().leakRef(), resolver, co
ntext)); |
| 69 } | 69 } |
| 70 | 70 |
| 71 void AsyncAudioDecoder::notifyComplete(DOMArrayBuffer* audioData, AudioBufferCal
lback* successCallback, AudioBufferCallback* errorCallback, AudioBus* audioBus,
ScriptPromiseResolver* resolver, AbstractAudioContext* context) | 71 void AsyncAudioDecoder::notifyComplete(DOMArrayBuffer* audioData, AudioBufferCal
lback* successCallback, AudioBufferCallback* errorCallback, AudioBus* audioBus,
ScriptPromiseResolver* resolver, BaseAudioContext* context) |
| 72 { | 72 { |
| 73 ASSERT(isMainThread()); | 73 ASSERT(isMainThread()); |
| 74 | 74 |
| 75 // Adopt references, so everything gets correctly dereffed. | 75 // Adopt references, so everything gets correctly dereffed. |
| 76 RefPtr<DOMArrayBuffer> audioDataRef = adoptRef(audioData); | 76 RefPtr<DOMArrayBuffer> audioDataRef = adoptRef(audioData); |
| 77 RefPtr<AudioBus> audioBusRef = adoptRef(audioBus); | 77 RefPtr<AudioBus> audioBusRef = adoptRef(audioBus); |
| 78 | 78 |
| 79 AudioBuffer* audioBuffer = AudioBuffer::createFromAudioBus(audioBus); | 79 AudioBuffer* audioBuffer = AudioBuffer::createFromAudioBus(audioBus); |
| 80 | 80 |
| 81 // Let the context finish the notification. | 81 // Let the context finish the notification. |
| 82 context->handleDecodeAudioData(audioBuffer, resolver, successCallback, error
Callback); | 82 context->handleDecodeAudioData(audioBuffer, resolver, successCallback, error
Callback); |
| 83 } | 83 } |
| 84 | 84 |
| 85 } // namespace blink | 85 } // namespace blink |
| OLD | NEW |