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

Unified Diff: webkit/renderer/media/audio_decoder.h

Issue 17502007: Move webkit/renderer/media/android/ to content/renderer/media/android/. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix shared lib 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: webkit/renderer/media/audio_decoder.h
diff --git a/webkit/renderer/media/audio_decoder.h b/webkit/renderer/media/audio_decoder.h
index 2f9561ab649de640b465ef89235b05432d81c7ec..ed843279222f46369c34f061c934d33bacce388d 100644
--- a/webkit/renderer/media/audio_decoder.h
+++ b/webkit/renderer/media/audio_decoder.h
@@ -7,32 +7,13 @@
#include "base/basictypes.h"
-#if defined(OS_ANDROID)
-#include "base/callback_forward.h"
-#include "base/file_descriptor_posix.h"
-#include "base/shared_memory.h"
-#endif
-
namespace WebKit { class WebAudioBus; }
namespace webkit_media {
-#if !defined(OS_ANDROID)
-
// Decode in-memory audio file data.
bool DecodeAudioFileData(WebKit::WebAudioBus* destination_bus, const char* data,
size_t data_size, double sample_rate);
-#else
-
-typedef base::Callback<void (base::SharedMemoryHandle,
- base::FileDescriptor,
- size_t)>
- WebAudioMediaCodecRunner;
-
-bool DecodeAudioFileData(WebKit::WebAudioBus* destination_bus, const char* data,
- size_t data_size, double sample_rate,
- const WebAudioMediaCodecRunner& runner);
-#endif
} // namespace webkit_media
« no previous file with comments | « webkit/renderer/media/android/webmediaplayer_proxy_android.cc ('k') | webkit/renderer/media/crypto/proxy_decryptor.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698