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

Unified Diff: Source/platform/audio/chromium/AudioBusChromium.cpp

Issue 100993004: Move chrome specific code from platform/audio/chromium to platform/audio (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: fixed atreat review commets Created 7 years 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 side-by-side diff with in-line comments
Download patch
Index: Source/platform/audio/chromium/AudioBusChromium.cpp
diff --git a/Source/platform/audio/chromium/AudioBusChromium.cpp b/Source/platform/audio/chromium/AudioBusChromium.cpp
deleted file mode 100644
index 8c458d2b2d1c7e23090920ff6364273f2e07959c..0000000000000000000000000000000000000000
--- a/Source/platform/audio/chromium/AudioBusChromium.cpp
+++ /dev/null
@@ -1,80 +0,0 @@
-/*
- * Copyright (C) 2010, Google Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "config.h"
-
-#if ENABLE(WEB_AUDIO)
-
-#include "platform/audio/AudioFileReader.h"
-
-#include "platform/audio/AudioBus.h"
-#include "public/platform/Platform.h"
-#include "public/platform/WebAudioBus.h"
-
-namespace WebCore {
-
-PassRefPtr<AudioBus> decodeAudioFileData(const char* data, size_t size, double sampleRate)
-{
- blink::WebAudioBus webAudioBus;
- if (blink::Platform::current()->loadAudioResource(&webAudioBus, data, size, sampleRate))
- return webAudioBus.release();
- return 0;
-}
-
-PassRefPtr<AudioBus> AudioBus::loadPlatformResource(const char* name, float sampleRate)
-{
- const blink::WebData& resource = blink::Platform::current()->loadResource(name);
- if (resource.isEmpty())
- return 0;
-
- // FIXME: the sampleRate parameter is ignored. It should be removed from the API.
- RefPtr<AudioBus> audioBus = decodeAudioFileData(resource.data(), resource.size(), sampleRate);
-
- if (!audioBus.get())
- return 0;
-
- // If the bus is already at the requested sample-rate then return as is.
- if (audioBus->sampleRate() == sampleRate)
- return audioBus;
-
- return AudioBus::createBySampleRateConverting(audioBus.get(), false, sampleRate);
-}
-
-PassRefPtr<AudioBus> createBusFromInMemoryAudioFile(const void* data, size_t dataSize, bool mixToMono, float sampleRate)
-{
- // FIXME: the sampleRate parameter is ignored. It should be removed from the API.
- RefPtr<AudioBus> audioBus = decodeAudioFileData(static_cast<const char*>(data), dataSize, sampleRate);
- if (!audioBus.get())
- return 0;
-
- // If the bus needs no conversion then return as is.
- if ((!mixToMono || audioBus->numberOfChannels() == 1) && audioBus->sampleRate() == sampleRate)
- return audioBus;
-
- return AudioBus::createBySampleRateConverting(audioBus.get(), mixToMono, sampleRate);
-}
-
-} // namespace WebCore
-
-#endif // ENABLE(WEB_AUDIO)
« no previous file with comments | « Source/platform/audio/android/FFTFrameOpenMAXDLAndroid.cpp ('k') | Source/platform/audio/chromium/AudioDestinationChromium.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698