Chromium Code Reviews| 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 #ifndef AsyncAudioDecoder_h | 25 #ifndef AsyncAudioDecoder_h |
| 26 #define AsyncAudioDecoder_h | 26 #define AsyncAudioDecoder_h |
| 27 | 27 |
| 28 #include "heap/Handle.h" | |
| 28 #include "public/platform/WebThread.h" | 29 #include "public/platform/WebThread.h" |
| 29 #include "wtf/Forward.h" | 30 #include "wtf/Forward.h" |
| 30 #include "wtf/OwnPtr.h" | 31 #include "wtf/OwnPtr.h" |
| 31 | 32 |
| 32 namespace WebCore { | 33 namespace WebCore { |
| 33 | 34 |
| 34 class AudioBuffer; | 35 class AudioBuffer; |
| 35 class AudioBufferCallback; | 36 class AudioBufferCallback; |
| 37 class AudioBus; | |
| 36 | 38 |
| 37 // AsyncAudioDecoder asynchronously decodes audio file data from an ArrayBuffer in a worker thread. | 39 // AsyncAudioDecoder asynchronously decodes audio file data from an ArrayBuffer in a worker thread. |
| 38 // Upon successful decoding, a completion callback will be invoked with the deco ded PCM data in an AudioBuffer. | 40 // Upon successful decoding, a completion callback will be invoked with the deco ded PCM data in an AudioBuffer. |
| 39 | 41 |
| 40 class AsyncAudioDecoder { | 42 class AsyncAudioDecoder { |
| 41 WTF_MAKE_NONCOPYABLE(AsyncAudioDecoder); | 43 WTF_MAKE_NONCOPYABLE(AsyncAudioDecoder); |
| 42 public: | 44 public: |
| 43 AsyncAudioDecoder(); | 45 AsyncAudioDecoder(); |
| 44 ~AsyncAudioDecoder(); | 46 ~AsyncAudioDecoder(); |
| 45 | 47 |
| 46 // Must be called on the main thread. | 48 // Must be called on the main thread. |
| 47 void decodeAsync(ArrayBuffer* audioData, float sampleRate, PassOwnPtr<AudioB ufferCallback> successCallback, PassOwnPtr<AudioBufferCallback> errorCallback); | 49 void decodeAsync(ArrayBuffer* audioData, float sampleRate, PassOwnPtr<AudioB ufferCallback> successCallback, PassOwnPtr<AudioBufferCallback> errorCallback); |
| 48 | 50 |
| 49 private: | 51 private: |
| 52 PassRefPtrWillBeRawPtr<AudioBuffer> createAudioBufferFromAudioBus(AudioBus*) ; | |
|
Mads Ager (chromium)
2014/03/20 08:30:00
This change seems independent of Oilpan? Can you e
| |
| 50 static void decode(ArrayBuffer* audioData, float sampleRate, AudioBufferCall back* successCallback, AudioBufferCallback* errorCallback); | 53 static void decode(ArrayBuffer* audioData, float sampleRate, AudioBufferCall back* successCallback, AudioBufferCallback* errorCallback); |
| 51 static void notifyComplete(ArrayBuffer* audioData, AudioBufferCallback* succ essCallback, AudioBufferCallback* errorCallback, AudioBuffer*); | 54 static void notifyComplete(ArrayBuffer* audioData, AudioBufferCallback* succ essCallback, AudioBufferCallback* errorCallback, AudioBus*); |
| 52 | 55 |
| 53 OwnPtr<blink::WebThread> m_thread; | 56 OwnPtr<blink::WebThread> m_thread; |
| 54 }; | 57 }; |
| 55 | 58 |
| 56 } // namespace WebCore | 59 } // namespace WebCore |
| 57 | 60 |
| 58 #endif // AsyncAudioDecoder_h | 61 #endif // AsyncAudioDecoder_h |
| OLD | NEW |