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 42 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
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<DOMArrayBuffer> 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(FROM_HERE, new Task(threadSafeBind(&AsyncAudioDecoder::de
code, AllowCrossThreadAccess(audioDataRef.release().leakRef()), sampleRate, succ
essCallback, errorCallback))); | 63 m_thread->taskRunner()->postTask(FROM_HERE, new Task(threadSafeBind(&AsyncAu
dioDecoder::decode, AllowCrossThreadAccess(audioDataRef.release().leakRef()), sa
mpleRate, successCallback, errorCallback))); |
64 } | 64 } |
65 | 65 |
66 void AsyncAudioDecoder::decode(DOMArrayBuffer* audioData, float sampleRate, Audi
oBufferCallback* 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 Platform::current()->mainThread()->postTask(FROM_HERE, threadSafeBind(&Async
AudioDecoder::notifyComplete, AllowCrossThreadAccess(audioData), successCallback
, errorCallback, bus.release().leakRef())); | 72 Platform::current()->mainThread()->taskRunner()->postTask(FROM_HERE, threadS
afeBind(&AsyncAudioDecoder::notifyComplete, AllowCrossThreadAccess(audioData), s
uccessCallback, errorCallback, bus.release().leakRef())); |
73 } | 73 } |
74 | 74 |
75 void AsyncAudioDecoder::notifyComplete(DOMArrayBuffer* audioData, AudioBufferCal
lback* 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<DOMArrayBuffer> 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) |
OLD | NEW |