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 31 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
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, Pa
ssOwnPtrWillBeRawPtr<AudioBufferCallback> successCallback, PassOwnPtrWillBeRawPt
r<AudioBufferCallback> errorCallback) | 52 void AsyncAudioDecoder::decodeAsync(ArrayBuffer* audioData, float sampleRate, Au
dioBufferCallback* 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<ArrayBuffer> 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.leakPtr(), errorCallback.lea
kPtr()))); | 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(ArrayBuffer* audioData, float sampleRate, AudioBu
fferCallback* 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(ArrayBuffer* audioData, AudioBufferCallba
ck* 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<ArrayBuffer> audioDataRef = adoptRef(audioData); |
79 #if !ENABLE(OILPAN) | |
80 OwnPtr<AudioBufferCallback> successCallbackPtr = adoptPtr(successCallback); | |
81 OwnPtr<AudioBufferCallback> errorCallbackPtr = adoptPtr(errorCallback); | |
82 #endif | |
83 RefPtr<AudioBus> audioBusRef = adoptRef(audioBus); | 79 RefPtr<AudioBus> audioBusRef = adoptRef(audioBus); |
84 | 80 |
85 AudioBuffer* audioBuffer = AudioBuffer::createFromAudioBus(audioBus); | 81 AudioBuffer* audioBuffer = AudioBuffer::createFromAudioBus(audioBus); |
86 if (audioBuffer && successCallback) | 82 if (audioBuffer && successCallback) |
87 successCallback->handleEvent(audioBuffer); | 83 successCallback->handleEvent(audioBuffer); |
88 else if (errorCallback) | 84 else if (errorCallback) |
89 errorCallback->handleEvent(audioBuffer); | 85 errorCallback->handleEvent(audioBuffer); |
90 } | 86 } |
91 | 87 |
92 } // namespace blink | 88 } // namespace blink |
93 | 89 |
94 #endif // ENABLE(WEB_AUDIO) | 90 #endif // ENABLE(WEB_AUDIO) |
OLD | NEW |