| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2010, Google Inc. All rights reserved. | 2 * Copyright (C) 2010, 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 Loading... |
| 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 "core/platform/audio/AudioBus.h" | 29 #include "core/platform/audio/AudioBus.h" |
| 30 | 30 |
| 31 #include "core/platform/audio/AudioFileReader.h" | |
| 32 #include <public/Platform.h> | 31 #include <public/Platform.h> |
| 33 #include <public/WebAudioBus.h> | 32 #include <public/WebAudioBus.h> |
| 34 | 33 |
| 35 namespace WebCore { | 34 namespace WebCore { |
| 36 | 35 |
| 37 PassRefPtr<AudioBus> decodeAudioFileData(const char* data, size_t size, double s
ampleRate) | 36 PassRefPtr<AudioBus> decodeAudioFileData(const char* data, size_t size, double s
ampleRate) |
| 38 { | 37 { |
| 39 WebKit::WebAudioBus webAudioBus; | 38 WebKit::WebAudioBus webAudioBus; |
| 40 if (WebKit::Platform::current()->loadAudioResource(&webAudioBus, data, size,
sampleRate)) | 39 if (WebKit::Platform::current()->loadAudioResource(&webAudioBus, data, size,
sampleRate)) |
| 41 return webAudioBus.release(); | 40 return webAudioBus.release(); |
| (...skipping 29 matching lines...) Expand all Loading... |
| 71 // If the bus needs no conversion then return as is. | 70 // If the bus needs no conversion then return as is. |
| 72 if ((!mixToMono || audioBus->numberOfChannels() == 1) && audioBus->sampleRat
e() == sampleRate) | 71 if ((!mixToMono || audioBus->numberOfChannels() == 1) && audioBus->sampleRat
e() == sampleRate) |
| 73 return audioBus; | 72 return audioBus; |
| 74 | 73 |
| 75 return AudioBus::createBySampleRateConverting(audioBus.get(), mixToMono, sam
pleRate); | 74 return AudioBus::createBySampleRateConverting(audioBus.get(), mixToMono, sam
pleRate); |
| 76 } | 75 } |
| 77 | 76 |
| 78 } // namespace WebCore | 77 } // namespace WebCore |
| 79 | 78 |
| 80 #endif // ENABLE(WEB_AUDIO) | 79 #endif // ENABLE(WEB_AUDIO) |
| OLD | NEW |