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

Unified Diff: content/renderer/renderer_webkitplatformsupport_impl.cc

Issue 17502007: Move webkit/renderer/media/android/ to content/renderer/media/android/. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 6 months 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: content/renderer/renderer_webkitplatformsupport_impl.cc
diff --git a/content/renderer/renderer_webkitplatformsupport_impl.cc b/content/renderer/renderer_webkitplatformsupport_impl.cc
index 3565af5d230f0d866833d90e24917a505c8074be..32470bafbe67799dd7ce1ea5aa82dec2c132a3a6 100644
--- a/content/renderer/renderer_webkitplatformsupport_impl.cc
+++ b/content/renderer/renderer_webkitplatformsupport_impl.cc
@@ -29,6 +29,7 @@
#include "content/renderer/dom_storage/webstoragenamespace_impl.h"
#include "content/renderer/gamepad_shared_memory_reader.h"
#include "content/renderer/hyphenator/hyphenator.h"
+#include "content/renderer/media/audio_decoder.h"
#include "content/renderer/media/media_stream_dependency_factory.h"
#include "content/renderer/media/renderer_webaudiodevice_impl.h"
#include "content/renderer/media/webcontentdecryptionmodule_impl.h"
@@ -743,12 +744,11 @@ static void RunWebAudioMediaCodec(base::SharedMemoryHandle encoded_data_handle,
bool RendererWebKitPlatformSupportImpl::loadAudioResource(
WebKit::WebAudioBus* destination_bus, const char* audio_file_data,
size_t data_size, double sample_rate) {
- return webkit_media::DecodeAudioFileData(
- destination_bus,
- audio_file_data,
- data_size,
- sample_rate,
- base::Bind(&RunWebAudioMediaCodec));
+ return DecodeAudioFileData(destination_bus,
+ audio_file_data,
+ data_size,
+ sample_rate,
+ base::Bind(&RunWebAudioMediaCodec));
}
#else
bool RendererWebKitPlatformSupportImpl::loadAudioResource(

Powered by Google App Engine
This is Rietveld 408576698