diff options
| author | Eric Laurent <elaurent@google.com> | 2010-07-27 02:41:41 -0700 |
|---|---|---|
| committer | Eric Laurent <elaurent@google.com> | 2010-07-27 02:41:41 -0700 |
| commit | b008e9b1281da871e970e5b4817f78afb4f12d4a (patch) | |
| tree | d1d6f8338d470406fcfb868303aafe85dad64971 /include/media/EffectVisualizerApi.h | |
| parent | 84aa5066855daaa944d8e0f5846bbff05ed1c748 (diff) | |
| parent | d306cc8192bf569b2e6e7d58b4d73f6607e9d509 (diff) | |
| download | frameworks_base-b008e9b1281da871e970e5b4817f78afb4f12d4a.zip frameworks_base-b008e9b1281da871e970e5b4817f78afb4f12d4a.tar.gz frameworks_base-b008e9b1281da871e970e5b4817f78afb4f12d4a.tar.bz2 | |
resolved conflicts for merge of d306cc81 to master
Change-Id: Ib593b7719a837de12605e8c75904634843298ba1
Diffstat (limited to 'include/media/EffectVisualizerApi.h')
| -rw-r--r-- | include/media/EffectVisualizerApi.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/media/EffectVisualizerApi.h b/include/media/EffectVisualizerApi.h index 1155db8..bef1a4f 100644 --- a/include/media/EffectVisualizerApi.h +++ b/include/media/EffectVisualizerApi.h @@ -23,10 +23,11 @@ extern "C" { #endif -//TODO replace by openSL ES include when available +#ifndef OPENSL_ES_H_ static const effect_uuid_t SL_IID_VISUALIZATION_ = { 0xe46b26a0, 0xdddd, 0x11db, 0x8afd, { 0x00, 0x02, 0xa5, 0xd5, 0xc5, 0x1b } }; const effect_uuid_t * const SL_IID_VISUALIZATION = &SL_IID_VISUALIZATION_; +#endif //OPENSL_ES_H_ #define VISUALIZER_CAPTURE_SIZE_MAX 1024 // maximum capture size in samples #define VISUALIZER_CAPTURE_SIZE_MIN 128 // minimum capture size in samples |