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 |
(...skipping 13 matching lines...) Expand all Loading... |
24 | 24 |
25 #include "config.h" | 25 #include "config.h" |
26 | 26 |
27 #if ENABLE(WEB_AUDIO) | 27 #if ENABLE(WEB_AUDIO) |
28 | 28 |
29 #include "modules/webaudio/AsyncAudioDecoder.h" | 29 #include "modules/webaudio/AsyncAudioDecoder.h" |
30 | 30 |
31 #include "modules/webaudio/AudioBuffer.h" | 31 #include "modules/webaudio/AudioBuffer.h" |
32 #include "modules/webaudio/AudioBufferCallback.h" | 32 #include "modules/webaudio/AudioBufferCallback.h" |
33 #include "platform/Task.h" | 33 #include "platform/Task.h" |
| 34 #include "platform/audio/AudioBus.h" |
| 35 #include "platform/audio/AudioFileReader.h" |
34 #include "public/platform/Platform.h" | 36 #include "public/platform/Platform.h" |
35 #include "wtf/ArrayBuffer.h" | 37 #include "wtf/ArrayBuffer.h" |
36 #include "wtf/MainThread.h" | 38 #include "wtf/MainThread.h" |
37 #include "wtf/PassOwnPtr.h" | 39 #include "wtf/PassOwnPtr.h" |
38 | 40 |
39 namespace WebCore { | 41 namespace WebCore { |
40 | 42 |
41 AsyncAudioDecoder::AsyncAudioDecoder() | 43 AsyncAudioDecoder::AsyncAudioDecoder() |
42 : m_thread(adoptPtr(blink::Platform::current()->createThread("Audio Decoder"
))) | 44 : m_thread(adoptPtr(blink::Platform::current()->createThread("Audio Decoder"
))) |
43 { | 45 { |
(...skipping 12 matching lines...) Expand all Loading... |
56 | 58 |
57 // Add a ref to keep audioData alive until completion of decoding. | 59 // Add a ref to keep audioData alive until completion of decoding. |
58 RefPtr<ArrayBuffer> audioDataRef(audioData); | 60 RefPtr<ArrayBuffer> audioDataRef(audioData); |
59 | 61 |
60 // The leak references to successCallback and errorCallback are picked up on
notifyComplete. | 62 // The leak references to successCallback and errorCallback are picked up on
notifyComplete. |
61 m_thread->postTask(new Task(WTF::bind(&AsyncAudioDecoder::decode, audioDataR
ef.release().leakRef(), sampleRate, successCallback.leakPtr(), errorCallback.lea
kPtr()))); | 63 m_thread->postTask(new Task(WTF::bind(&AsyncAudioDecoder::decode, audioDataR
ef.release().leakRef(), sampleRate, successCallback.leakPtr(), errorCallback.lea
kPtr()))); |
62 } | 64 } |
63 | 65 |
64 void AsyncAudioDecoder::decode(ArrayBuffer* audioData, float sampleRate, AudioBu
fferCallback* successCallback, AudioBufferCallback* errorCallback) | 66 void AsyncAudioDecoder::decode(ArrayBuffer* audioData, float sampleRate, AudioBu
fferCallback* successCallback, AudioBufferCallback* errorCallback) |
65 { | 67 { |
66 // Do the actual decoding and invoke the callback. | 68 RefPtr<AudioBus> bus = createBusFromInMemoryAudioFile(audioData->data(), aud
ioData->byteLength(), false, sampleRate); |
67 RefPtr<AudioBuffer> audioBuffer = AudioBuffer::createFromAudioFileData(audio
Data->data(), audioData->byteLength(), false, sampleRate); | |
68 | 69 |
69 // Decoding is finished, but we need to do the callbacks on the main thread. | 70 // Decoding is finished, but we need to do the callbacks on the main thread. |
70 // The leaked reference to audioBuffer is picked up in notifyComplete. | 71 // The leaked reference to audioBuffer is picked up in notifyComplete. |
71 callOnMainThread(WTF::bind(&AsyncAudioDecoder::notifyComplete, audioData, su
ccessCallback, errorCallback, audioBuffer.release().leakRef())); | 72 callOnMainThread(WTF::bind(&AsyncAudioDecoder::notifyComplete, audioData, su
ccessCallback, errorCallback, bus.release().leakRef())); |
72 } | 73 } |
73 | 74 |
74 void AsyncAudioDecoder::notifyComplete(ArrayBuffer* audioData, AudioBufferCallba
ck* successCallback, AudioBufferCallback* errorCallback, AudioBuffer* audioBuffe
r) | 75 void AsyncAudioDecoder::notifyComplete(ArrayBuffer* audioData, AudioBufferCallba
ck* successCallback, AudioBufferCallback* errorCallback, AudioBus* audioBus) |
75 { | 76 { |
76 // Adopt references, so everything gets correctly dereffed. | 77 // Adopt references, so everything gets correctly dereffed. |
77 RefPtr<ArrayBuffer> audioDataRef = adoptRef(audioData); | 78 RefPtr<ArrayBuffer> audioDataRef = adoptRef(audioData); |
78 OwnPtr<AudioBufferCallback> successCallbackPtr = adoptPtr(successCallback); | 79 OwnPtr<AudioBufferCallback> successCallbackPtr = adoptPtr(successCallback); |
79 OwnPtr<AudioBufferCallback> errorCallbackPtr = adoptPtr(errorCallback); | 80 OwnPtr<AudioBufferCallback> errorCallbackPtr = adoptPtr(errorCallback); |
80 RefPtr<AudioBuffer> audioBufferRef = adoptRef(audioBuffer); | 81 RefPtr<AudioBus> audioBusRef = adoptRef(audioBus); |
81 | 82 |
82 if (audioBuffer && successCallback) | 83 RefPtrWillBeRawPtr<AudioBuffer> audioBuffer = AudioBuffer::createFromAudioBu
s(audioBus); |
83 successCallback->handleEvent(audioBuffer); | 84 if (audioBuffer.get() && successCallback) |
| 85 successCallback->handleEvent(audioBuffer.get()); |
84 else if (errorCallback) | 86 else if (errorCallback) |
85 errorCallback->handleEvent(audioBuffer); | 87 errorCallback->handleEvent(audioBuffer.get()); |
86 } | 88 } |
87 | 89 |
88 } // namespace WebCore | 90 } // namespace WebCore |
89 | 91 |
90 #endif // ENABLE(WEB_AUDIO) | 92 #endif // ENABLE(WEB_AUDIO) |
OLD | NEW |