webkit/glue/webkitplatformsupport_impl.cc - Issue 12457043: Android implementation of WebAudio audio file decoder

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: webkit/glue/webkitplatformsupport_impl.cc

Issue 12457043: Android implementation of WebAudio audio file decoder (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 7 years, 9 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

« media/base/android/webaudio_media_codec_bridge.cc ('K') | « webkit/glue/webkitplatformsupport_impl.h ('k') | webkit/media/android/audio_decoder_android.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: webkit/glue/webkitplatformsupport_impl.cc

diff --git a/webkit/glue/webkitplatformsupport_impl.cc b/webkit/glue/webkitplatformsupport_impl.cc

index bb06120ab85ae73ee87eb9b9da2c00472f9afc54..f5027b78f0b913e1a0df7e84c32dcb092c33a73c 100644

--- a/webkit/glue/webkitplatformsupport_impl.cc

+++ b/webkit/glue/webkitplatformsupport_impl.cc

@@ -675,10 +675,20 @@ WebData WebKitPlatformSupportImpl::loadResource(const char* name) {

bool WebKitPlatformSupportImpl::loadAudioResource(

WebKit::WebAudioBus* destination_bus, const char* audio_file_data,

size_t data_size, double sample_rate) {

+#if !defined(OS_ANDROID)

return webkit_media::DecodeAudioFileData(destination_bus,

audio_file_data,

data_size,

sample_rate);

+#else

+ webkit_media::WebAudioMediaCodecRunner runner = GetWebAudioMediaCodecRunner();

+ return webkit_media::DecodeAudioFileData(

+ destination_bus,

+ audio_file_data,

+ data_size,

+ sample_rate,

+ runner);

+#endif

}

WebString WebKitPlatformSupportImpl::queryLocalizedString(

« media/base/android/webaudio_media_codec_bridge.cc ('K') | « webkit/glue/webkitplatformsupport_impl.h ('k') | webkit/media/android/audio_decoder_android.cc » ('j') | no next file with comments »