Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(29)

Side by Side Diff: Source/modules/webaudio/AsyncAudioDecoder.cpp

Issue 723143002: bindings: Transition from ArrayBuffer to DOMArrayBuffer, part 3. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 6 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « Source/modules/webaudio/AsyncAudioDecoder.h ('k') | Source/modules/webaudio/AudioContext.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 10 matching lines...) Expand all
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 "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 "core/dom/DOMArrayBuffer.h"
31 #include "modules/webaudio/AudioBuffer.h" 32 #include "modules/webaudio/AudioBuffer.h"
32 #include "modules/webaudio/AudioBufferCallback.h" 33 #include "modules/webaudio/AudioBufferCallback.h"
33 #include "platform/Task.h" 34 #include "platform/Task.h"
34 #include "platform/audio/AudioBus.h" 35 #include "platform/audio/AudioBus.h"
35 #include "platform/audio/AudioFileReader.h" 36 #include "platform/audio/AudioFileReader.h"
36 #include "public/platform/Platform.h" 37 #include "public/platform/Platform.h"
37 #include "wtf/ArrayBuffer.h"
38 #include "wtf/MainThread.h" 38 #include "wtf/MainThread.h"
39 #include "wtf/PassOwnPtr.h" 39 #include "wtf/PassOwnPtr.h"
40 40
41 namespace blink { 41 namespace blink {
42 42
43 AsyncAudioDecoder::AsyncAudioDecoder() 43 AsyncAudioDecoder::AsyncAudioDecoder()
44 : m_thread(adoptPtr(Platform::current()->createThread("Audio Decoder"))) 44 : m_thread(adoptPtr(Platform::current()->createThread("Audio Decoder")))
45 { 45 {
46 } 46 }
47 47
48 AsyncAudioDecoder::~AsyncAudioDecoder() 48 AsyncAudioDecoder::~AsyncAudioDecoder()
49 { 49 {
50 } 50 }
51 51
52 void AsyncAudioDecoder::decodeAsync(ArrayBuffer* audioData, float sampleRate, Au dioBufferCallback* successCallback, AudioBufferCallback* errorCallback) 52 void AsyncAudioDecoder::decodeAsync(DOMArrayBuffer* audioData, float sampleRate, AudioBufferCallback* successCallback, AudioBufferCallback* errorCallback)
53 { 53 {
54 ASSERT(isMainThread()); 54 ASSERT(isMainThread());
55 ASSERT(audioData); 55 ASSERT(audioData);
56 if (!audioData) 56 if (!audioData)
57 return; 57 return;
58 58
59 // Add a ref to keep audioData alive until completion of decoding. 59 // Add a ref to keep audioData alive until completion of decoding.
60 RefPtr<ArrayBuffer> audioDataRef(audioData); 60 RefPtr<DOMArrayBuffer> audioDataRef(audioData);
61 61
62 // 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.
63 m_thread->postTask(new Task(WTF::bind(&AsyncAudioDecoder::decode, audioDataR ef.release().leakRef(), sampleRate, successCallback, errorCallback))); 63 m_thread->postTask(new Task(WTF::bind(&AsyncAudioDecoder::decode, audioDataR ef.release().leakRef(), sampleRate, successCallback, errorCallback)));
64 } 64 }
65 65
66 void AsyncAudioDecoder::decode(ArrayBuffer* audioData, float sampleRate, AudioBu fferCallback* successCallback, AudioBufferCallback* errorCallback) 66 void AsyncAudioDecoder::decode(DOMArrayBuffer* audioData, float sampleRate, Audi oBufferCallback* successCallback, AudioBufferCallback* errorCallback)
67 { 67 {
68 RefPtr<AudioBus> bus = createBusFromInMemoryAudioFile(audioData->data(), aud ioData->byteLength(), false, sampleRate); 68 RefPtr<AudioBus> bus = createBusFromInMemoryAudioFile(audioData->data(), aud ioData->byteLength(), false, sampleRate);
69 69
70 // 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.
71 // The leaked reference to audioBuffer is picked up in notifyComplete. 71 // The leaked reference to audioBuffer is picked up in notifyComplete.
72 callOnMainThread(WTF::bind(&AsyncAudioDecoder::notifyComplete, audioData, su ccessCallback, errorCallback, bus.release().leakRef())); 72 callOnMainThread(WTF::bind(&AsyncAudioDecoder::notifyComplete, audioData, su ccessCallback, errorCallback, bus.release().leakRef()));
73 } 73 }
74 74
75 void AsyncAudioDecoder::notifyComplete(ArrayBuffer* audioData, AudioBufferCallba ck* successCallback, AudioBufferCallback* errorCallback, AudioBus* audioBus) 75 void AsyncAudioDecoder::notifyComplete(DOMArrayBuffer* audioData, AudioBufferCal lback* successCallback, AudioBufferCallback* errorCallback, AudioBus* audioBus)
76 { 76 {
77 // Adopt references, so everything gets correctly dereffed. 77 // Adopt references, so everything gets correctly dereffed.
78 RefPtr<ArrayBuffer> audioDataRef = adoptRef(audioData); 78 RefPtr<DOMArrayBuffer> audioDataRef = adoptRef(audioData);
79 RefPtr<AudioBus> audioBusRef = adoptRef(audioBus); 79 RefPtr<AudioBus> audioBusRef = adoptRef(audioBus);
80 80
81 AudioBuffer* audioBuffer = AudioBuffer::createFromAudioBus(audioBus); 81 AudioBuffer* audioBuffer = AudioBuffer::createFromAudioBus(audioBus);
82 if (audioBuffer && successCallback) 82 if (audioBuffer && successCallback)
83 successCallback->handleEvent(audioBuffer); 83 successCallback->handleEvent(audioBuffer);
84 else if (errorCallback) 84 else if (errorCallback)
85 errorCallback->handleEvent(audioBuffer); 85 errorCallback->handleEvent(audioBuffer);
86 } 86 }
87 87
88 } // namespace blink 88 } // namespace blink
89 89
90 #endif // ENABLE(WEB_AUDIO) 90 #endif // ENABLE(WEB_AUDIO)
OLDNEW
« no previous file with comments | « Source/modules/webaudio/AsyncAudioDecoder.h ('k') | Source/modules/webaudio/AudioContext.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698