diff options
| author | peter@chromium.org <peter@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-12-09 17:29:32 +0000 |
|---|---|---|
| committer | peter@chromium.org <peter@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-12-09 17:29:32 +0000 |
| commit | 1965af4f256738e0364a10500f5e8c6fa0dbda4f (patch) | |
| tree | ef3fa20431536f52e943265ff8951366818454be /webkit/media | |
| parent | 4a8521f52f4b2bd1c99a48b2ff885025691a9eda (diff) | |
| download | chromium_src-1965af4f256738e0364a10500f5e8c6fa0dbda4f.zip chromium_src-1965af4f256738e0364a10500f5e8c6fa0dbda4f.tar.gz chromium_src-1965af4f256738e0364a10500f5e8c6fa0dbda4f.tar.bz2 | |
Don't attempt to decode audio data for Android
As the Web Audio API won't be enabled, make sure that Android uses
an empty implementation of the DecodeAudioFileData.
BUG=
TEST=
Review URL: http://codereview.chromium.org/8844005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@113814 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/media')
| -rw-r--r-- | webkit/media/audio_decoder_android.cc | 17 | ||||
| -rw-r--r-- | webkit/media/webkit_media.gypi | 6 |
2 files changed, 23 insertions, 0 deletions
diff --git a/webkit/media/audio_decoder_android.cc b/webkit/media/audio_decoder_android.cc new file mode 100644 index 0000000..474e083 --- /dev/null +++ b/webkit/media/audio_decoder_android.cc @@ -0,0 +1,17 @@ +// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +#include "webkit/media/audio_decoder.h" + +#include "base/logging.h" + +namespace webkit_media { + +bool DecodeAudioFileData(WebKit::WebAudioBus* destination_bus, const char* data, + size_t data_size, double sample_rate) { + NOTIMPLEMENTED(); + return false; +} + +} // namespace webkit_glue diff --git a/webkit/media/webkit_media.gypi b/webkit/media/webkit_media.gypi index 2763b47..1fc0753 100644 --- a/webkit/media/webkit_media.gypi +++ b/webkit/media/webkit_media.gypi @@ -18,6 +18,7 @@ 'active_loader.h', 'audio_decoder.cc', 'audio_decoder.h', + 'audio_decoder_android.cc', 'buffered_data_source.cc', 'buffered_data_source.h', 'buffered_resource_loader.cc', @@ -45,6 +46,11 @@ '<(DEPTH)/webkit/support/setup_third_party.gyp:third_party_headers', ], }], + ['OS=="android"', { + 'sources!': [ + 'audio_decoder.cc', + ], + }], ], }, ], |