diff options
-rw-r--r-- | include/media/EffectBassBoostApi.h | 43 | ||||
-rw-r--r-- | include/media/EffectEnvironmentalReverbApi.h | 69 | ||||
-rw-r--r-- | include/media/EffectEqualizerApi.h | 58 | ||||
-rw-r--r-- | include/media/EffectPresetReverbApi.h | 55 | ||||
-rw-r--r-- | include/media/EffectVirtualizerApi.h | 43 | ||||
-rw-r--r-- | include/media/EffectVisualizerApi.h | 56 | ||||
-rw-r--r-- | include/media/Visualizer.h | 2 | ||||
-rw-r--r-- | media/jni/audioeffect/Android.mk | 3 | ||||
-rw-r--r-- | media/libeffects/lvm/wrapper/Android.mk | 5 | ||||
-rw-r--r-- | media/libeffects/lvm/wrapper/Bundle/EffectBundle.h | 6 | ||||
-rw-r--r-- | media/libeffects/lvm/wrapper/Reverb/EffectReverb.h | 4 | ||||
-rw-r--r-- | media/libeffects/testlibs/Android.mk_ | 4 | ||||
-rw-r--r-- | media/libeffects/testlibs/EffectEqualizer.cpp | 3 | ||||
-rw-r--r-- | media/libeffects/testlibs/EffectReverb.h | 4 | ||||
-rw-r--r-- | media/libeffects/visualizer/Android.mk | 4 | ||||
-rw-r--r-- | media/libeffects/visualizer/EffectVisualizer.cpp | 10 | ||||
-rw-r--r-- | media/libmedia/Android.mk | 3 | ||||
-rw-r--r-- | media/libmedia/Visualizer.cpp | 6 | ||||
-rw-r--r-- | services/audioflinger/Android.mk | 3 | ||||
-rw-r--r-- | services/audioflinger/AudioFlinger.cpp | 2 |
20 files changed, 35 insertions, 348 deletions
diff --git a/include/media/EffectBassBoostApi.h b/include/media/EffectBassBoostApi.h deleted file mode 100644 index 56119eb..0000000 --- a/include/media/EffectBassBoostApi.h +++ /dev/null @@ -1,43 +0,0 @@ -/* - * Copyright (C) 2010 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#ifndef ANDROID_EFFECTBASSBOOSTAPI_H_ -#define ANDROID_EFFECTBASSBOOSTAPI_H_ - -#include <hardware/audio_effect.h> - -#if __cplusplus -extern "C" { -#endif - -#ifndef OPENSL_ES_H_ -static const effect_uuid_t SL_IID_BASSBOOST_ = { 0x0634f220, 0xddd4, 0x11db, 0xa0fc, { 0x00, 0x02, 0xa5, 0xd5, 0xc5, 0x1b } }; -const effect_uuid_t * const SL_IID_BASSBOOST = &SL_IID_BASSBOOST_; -#endif //OPENSL_ES_H_ - -/* enumerated parameter settings for BassBoost effect */ -typedef enum -{ - BASSBOOST_PARAM_STRENGTH_SUPPORTED, - BASSBOOST_PARAM_STRENGTH -} t_bassboost_params; - -#if __cplusplus -} // extern "C" -#endif - - -#endif /*ANDROID_EFFECTBASSBOOSTAPI_H_*/ diff --git a/include/media/EffectEnvironmentalReverbApi.h b/include/media/EffectEnvironmentalReverbApi.h deleted file mode 100644 index f11c5ec..0000000 --- a/include/media/EffectEnvironmentalReverbApi.h +++ /dev/null @@ -1,69 +0,0 @@ -/* - * Copyright (C) 2010 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#ifndef ANDROID_EFFECTENVIRONMENTALREVERBAPI_H_ -#define ANDROID_EFFECTENVIRONMENTALREVERBAPI_H_ - -#include <hardware/audio_effect.h> - -#if __cplusplus -extern "C" { -#endif - -#ifndef OPENSL_ES_H_ -static const effect_uuid_t SL_IID_ENVIRONMENTALREVERB_ = { 0xc2e5d5f0, 0x94bd, 0x4763, 0x9cac, { 0x4e, 0x23, 0x4d, 0x6, 0x83, 0x9e } }; -const effect_uuid_t * const SL_IID_ENVIRONMENTALREVERB = &SL_IID_ENVIRONMENTALREVERB_; -#endif //OPENSL_ES_H_ - -/* enumerated parameter settings for environmental reverb effect */ -typedef enum -{ - // Parameters below are as defined in OpenSL ES specification for environmental reverb interface - REVERB_PARAM_ROOM_LEVEL, // in millibels, range -6000 to 0 - REVERB_PARAM_ROOM_HF_LEVEL, // in millibels, range -4000 to 0 - REVERB_PARAM_DECAY_TIME, // in milliseconds, range 100 to 20000 - REVERB_PARAM_DECAY_HF_RATIO, // in permilles, range 100 to 1000 - REVERB_PARAM_REFLECTIONS_LEVEL, // in millibels, range -6000 to 0 - REVERB_PARAM_REFLECTIONS_DELAY, // in milliseconds, range 0 to 65 - REVERB_PARAM_REVERB_LEVEL, // in millibels, range -6000 to 0 - REVERB_PARAM_REVERB_DELAY, // in milliseconds, range 0 to 65 - REVERB_PARAM_DIFFUSION, // in permilles, range 0 to 1000 - REVERB_PARAM_DENSITY, // in permilles, range 0 to 1000 - REVERB_PARAM_PROPERTIES, - REVERB_PARAM_BYPASS -} t_env_reverb_params; - -//t_reverb_settings is equal to SLEnvironmentalReverbSettings defined in OpenSL ES specification. -typedef struct s_reverb_settings { - int16_t roomLevel; - int16_t roomHFLevel; - uint32_t decayTime; - int16_t decayHFRatio; - int16_t reflectionsLevel; - uint32_t reflectionsDelay; - int16_t reverbLevel; - uint32_t reverbDelay; - int16_t diffusion; - int16_t density; -} __attribute__((packed)) t_reverb_settings; - - -#if __cplusplus -} // extern "C" -#endif - - -#endif /*ANDROID_EFFECTENVIRONMENTALREVERBAPI_H_*/ diff --git a/include/media/EffectEqualizerApi.h b/include/media/EffectEqualizerApi.h deleted file mode 100644 index 950d138..0000000 --- a/include/media/EffectEqualizerApi.h +++ /dev/null @@ -1,58 +0,0 @@ -/* - * Copyright (C) 2010 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#ifndef ANDROID_EFFECTEQUALIZERAPI_H_ -#define ANDROID_EFFECTEQUALIZERAPI_H_ - -#include <hardware/audio_effect.h> - -#ifndef OPENSL_ES_H_ -static const effect_uuid_t SL_IID_EQUALIZER_ = { 0x0bed4300, 0xddd6, 0x11db, 0x8f34, { 0x00, 0x02, 0xa5, 0xd5, 0xc5, 0x1b } }; -const effect_uuid_t * const SL_IID_EQUALIZER = &SL_IID_EQUALIZER_; -#endif //OPENSL_ES_H_ - -#if __cplusplus -extern "C" { -#endif - -/* enumerated parameters for Equalizer effect */ -typedef enum -{ - EQ_PARAM_NUM_BANDS, // Gets the number of frequency bands that the equalizer supports. - EQ_PARAM_LEVEL_RANGE, // Returns the minimum and maximum band levels supported. - EQ_PARAM_BAND_LEVEL, // Gets/Sets the gain set for the given equalizer band. - EQ_PARAM_CENTER_FREQ, // Gets the center frequency of the given band. - EQ_PARAM_BAND_FREQ_RANGE, // Gets the frequency range of the given frequency band. - EQ_PARAM_GET_BAND, // Gets the band that has the most effect on the given frequency. - EQ_PARAM_CUR_PRESET, // Gets/Sets the current preset. - EQ_PARAM_GET_NUM_OF_PRESETS, // Gets the total number of presets the equalizer supports. - EQ_PARAM_GET_PRESET_NAME, // Gets the preset name based on the index. - EQ_PARAM_PROPERTIES // Gets/Sets all parameters at a time. -} t_equalizer_params; - -//t_equalizer_settings groups all current equalizer setting for backup and restore. -typedef struct s_equalizer_settings { - uint16_t curPreset; - uint16_t numBands; - uint16_t bandLevels[]; -} t_equalizer_settings; - -#if __cplusplus -} // extern "C" -#endif - - -#endif /*ANDROID_EFFECTEQUALIZERAPI_H_*/ diff --git a/include/media/EffectPresetReverbApi.h b/include/media/EffectPresetReverbApi.h deleted file mode 100644 index e5b168a..0000000 --- a/include/media/EffectPresetReverbApi.h +++ /dev/null @@ -1,55 +0,0 @@ -/* - * Copyright (C) 2010 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#ifndef ANDROID_EFFECTPRESETREVERBAPI_H_ -#define ANDROID_EFFECTPRESETREVERBAPI_H_ - -#include <hardware/audio_effect.h> - -#if __cplusplus -extern "C" { -#endif - -#ifndef OPENSL_ES_H_ -static const effect_uuid_t SL_IID_PRESETREVERB_ = { 0x47382d60, 0xddd8, 0x11db, 0xbf3a, { 0x00, 0x02, 0xa5, 0xd5, 0xc5, 0x1b } }; -const effect_uuid_t * const SL_IID_PRESETREVERB = &SL_IID_PRESETREVERB_; -#endif //OPENSL_ES_H_ - -/* enumerated parameter settings for preset reverb effect */ -typedef enum -{ - REVERB_PARAM_PRESET -} t_preset_reverb_params; - - -typedef enum -{ - REVERB_PRESET_NONE, - REVERB_PRESET_SMALLROOM, - REVERB_PRESET_MEDIUMROOM, - REVERB_PRESET_LARGEROOM, - REVERB_PRESET_MEDIUMHALL, - REVERB_PRESET_LARGEHALL, - REVERB_PRESET_PLATE, - REVERB_PRESET_LAST = REVERB_PRESET_PLATE -} t_reverb_presets; - -#if __cplusplus -} // extern "C" -#endif - - -#endif /*ANDROID_EFFECTPRESETREVERBAPI_H_*/ diff --git a/include/media/EffectVirtualizerApi.h b/include/media/EffectVirtualizerApi.h deleted file mode 100644 index 2e216e2..0000000 --- a/include/media/EffectVirtualizerApi.h +++ /dev/null @@ -1,43 +0,0 @@ -/* - * Copyright (C) 2010 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#ifndef ANDROID_EFFECTVIRTUALIZERAPI_H_ -#define ANDROID_EFFECTVIRTUALIZERAPI_H_ - -#include <hardware/audio_effect.h> - -#if __cplusplus -extern "C" { -#endif - -#ifndef OPENSL_ES_H_ -static const effect_uuid_t SL_IID_VIRTUALIZER_ = { 0x37cc2c00, 0xdddd, 0x11db, 0x8577, { 0x00, 0x02, 0xa5, 0xd5, 0xc5, 0x1b } }; -const effect_uuid_t * const SL_IID_VIRTUALIZER = &SL_IID_VIRTUALIZER_; -#endif //OPENSL_ES_H_ - -/* enumerated parameter settings for virtualizer effect */ -typedef enum -{ - VIRTUALIZER_PARAM_STRENGTH_SUPPORTED, - VIRTUALIZER_PARAM_STRENGTH -} t_virtualizer_params; - -#if __cplusplus -} // extern "C" -#endif - - -#endif /*ANDROID_EFFECTVIRTUALIZERAPI_H_*/ diff --git a/include/media/EffectVisualizerApi.h b/include/media/EffectVisualizerApi.h deleted file mode 100644 index e0fa328..0000000 --- a/include/media/EffectVisualizerApi.h +++ /dev/null @@ -1,56 +0,0 @@ -/* - * Copyright (C) 2010 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#ifndef ANDROID_EFFECTVISUALIZERAPI_H_ -#define ANDROID_EFFECTVISUALIZERAPI_H_ - -#include <hardware/audio_effect.h> - -#if __cplusplus -extern "C" { -#endif - -#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 - -/* enumerated parameters for Visualizer effect */ -typedef enum -{ - VISU_PARAM_CAPTURE_SIZE, // Sets the number PCM samples in the capture. -} t_visualizer_params; - -/* commands */ -typedef enum -{ - VISU_CMD_CAPTURE = EFFECT_CMD_FIRST_PROPRIETARY, // Gets the latest PCM capture. -}t_visualizer_cmds; - -// VISU_CMD_CAPTURE retrieves the latest PCM snapshot captured by the visualizer engine. -// It returns the number of samples specified by VISU_PARAM_CAPTURE_SIZE -// in 8 bit unsigned format (0 = 0x80) - -#if __cplusplus -} // extern "C" -#endif - - -#endif /*ANDROID_EFFECTVISUALIZERAPI_H_*/ diff --git a/include/media/Visualizer.h b/include/media/Visualizer.h index b8746c2..5d2c874 100644 --- a/include/media/Visualizer.h +++ b/include/media/Visualizer.h @@ -18,7 +18,7 @@ #define ANDROID_MEDIA_VISUALIZER_H #include <media/AudioEffect.h> -#include <media/EffectVisualizerApi.h> +#include <audio_effects/effect_visualizer.h> #include <string.h> /** diff --git a/media/jni/audioeffect/Android.mk b/media/jni/audioeffect/Android.mk index 4c5cf71..3e493b1 100644 --- a/media/jni/audioeffect/Android.mk +++ b/media/jni/audioeffect/Android.mk @@ -12,6 +12,9 @@ LOCAL_SHARED_LIBRARIES := \ libnativehelper \ libmedia +LOCAL_C_INCLUDES := \ + system/media/audio_effects/include + LOCAL_MODULE:= libaudioeffect_jni include $(BUILD_SHARED_LIBRARY) diff --git a/media/libeffects/lvm/wrapper/Android.mk b/media/libeffects/lvm/wrapper/Android.mk index 99cfdfa..ab13605 100644 --- a/media/libeffects/lvm/wrapper/Android.mk +++ b/media/libeffects/lvm/wrapper/Android.mk @@ -30,7 +30,8 @@ endif LOCAL_C_INCLUDES += \ $(LOCAL_PATH)/Bundle \ $(LOCAL_PATH)/../lib/Common/lib/ \ - $(LOCAL_PATH)/../lib/Bundle/lib/ + $(LOCAL_PATH)/../lib/Bundle/lib/ \ + system/media/audio_effects/include include $(BUILD_SHARED_LIBRARY) @@ -64,6 +65,6 @@ LOCAL_C_INCLUDES += \ $(LOCAL_PATH)/Reverb \ $(LOCAL_PATH)/../lib/Common/lib/ \ $(LOCAL_PATH)/../lib/Reverb/lib/ \ - + system/media/audio_effects/include include $(BUILD_SHARED_LIBRARY)
\ No newline at end of file diff --git a/media/libeffects/lvm/wrapper/Bundle/EffectBundle.h b/media/libeffects/lvm/wrapper/Bundle/EffectBundle.h index 2b51029..5634ca1 100644 --- a/media/libeffects/lvm/wrapper/Bundle/EffectBundle.h +++ b/media/libeffects/lvm/wrapper/Bundle/EffectBundle.h @@ -17,9 +17,9 @@ #ifndef ANDROID_EFFECTBUNDLE_H_ #define ANDROID_EFFECTBUNDLE_H_ -#include <media/EffectEqualizerApi.h> -#include <media/EffectBassBoostApi.h> -#include <media/EffectVirtualizerApi.h> +#include <audio_effects/effect_bassboost.h> +#include <audio_effects/effect_equalizer.h> +#include <audio_effects/effect_virtualizer.h> #include <LVM.h> #include <limits.h> diff --git a/media/libeffects/lvm/wrapper/Reverb/EffectReverb.h b/media/libeffects/lvm/wrapper/Reverb/EffectReverb.h index 093992b..7c15b18 100644 --- a/media/libeffects/lvm/wrapper/Reverb/EffectReverb.h +++ b/media/libeffects/lvm/wrapper/Reverb/EffectReverb.h @@ -17,8 +17,8 @@ #ifndef ANDROID_EFFECTREVERB_H_ #define ANDROID_EFFECTREVERB_H_ -#include <media/EffectEnvironmentalReverbApi.h> -#include <media/EffectPresetReverbApi.h> +#include <audio_effects/effect_environmentalreverb.h> +#include <audio_effects/effect_presetreverb.h> #if __cplusplus extern "C" { diff --git a/media/libeffects/testlibs/Android.mk_ b/media/libeffects/testlibs/Android.mk_ index 98d477b..249ebf4 100644 --- a/media/libeffects/testlibs/Android.mk_ +++ b/media/libeffects/testlibs/Android.mk_ @@ -23,6 +23,7 @@ LOCAL_SHARED_LIBRARIES += libdl endif LOCAL_C_INCLUDES := \ + system/media/audio_effects/include \ $(call include-path-for, graphics corecg) LOCAL_MODULE_TAGS := optional @@ -58,7 +59,8 @@ LOCAL_SHARED_LIBRARIES += libdl endif LOCAL_C_INCLUDES := \ - $(call include-path-for, graphics corecg) + $(call include-path-for, graphics corecg) \ + system/media/audio_effects/include LOCAL_MODULE_TAGS := optional diff --git a/media/libeffects/testlibs/EffectEqualizer.cpp b/media/libeffects/testlibs/EffectEqualizer.cpp index 43dfa82..c2ffce5 100644 --- a/media/libeffects/testlibs/EffectEqualizer.cpp +++ b/media/libeffects/testlibs/EffectEqualizer.cpp @@ -26,7 +26,8 @@ #include "AudioEqualizer.h" #include "AudioBiquadFilter.h" #include "AudioFormatAdapter.h" -#include <media/EffectEqualizerApi.h> +#include <audio_effects/effect_equalizer.h> + // effect_handle_t interface implementation for equalizer effect extern "C" const struct effect_interface_s gEqualizerInterface; diff --git a/media/libeffects/testlibs/EffectReverb.h b/media/libeffects/testlibs/EffectReverb.h index a239814..8e2cc31 100644 --- a/media/libeffects/testlibs/EffectReverb.h +++ b/media/libeffects/testlibs/EffectReverb.h @@ -17,8 +17,8 @@ #ifndef ANDROID_EFFECTREVERB_H_ #define ANDROID_EFFECTREVERB_H_ -#include <media/EffectEnvironmentalReverbApi.h> -#include <media/EffectPresetReverbApi.h> +#include <audio_effects/effect_environmentalreverb.h> +#include <audio_effects/effect_presetreverb.h> /*------------------------------------ diff --git a/media/libeffects/visualizer/Android.mk b/media/libeffects/visualizer/Android.mk index 3a0f438..dff585f 100644 --- a/media/libeffects/visualizer/Android.mk +++ b/media/libeffects/visualizer/Android.mk @@ -23,8 +23,8 @@ LOCAL_SHARED_LIBRARIES += libdl endif LOCAL_C_INCLUDES := \ - $(call include-path-for, graphics corecg) - + $(call include-path-for, graphics corecg) \ + system/media/audio_effects/include include $(BUILD_SHARED_LIBRARY) diff --git a/media/libeffects/visualizer/EffectVisualizer.cpp b/media/libeffects/visualizer/EffectVisualizer.cpp index 80d1f69..aeebd4d 100644 --- a/media/libeffects/visualizer/EffectVisualizer.cpp +++ b/media/libeffects/visualizer/EffectVisualizer.cpp @@ -21,7 +21,7 @@ #include <stdlib.h> #include <string.h> #include <new> -#include <media/EffectVisualizerApi.h> +#include <audio_effects/effect_visualizer.h> extern "C" { @@ -375,7 +375,7 @@ int Visualizer_command(effect_handle_t self, uint32_t cmdCode, uint32_t cmdSize, p->status = 0; *replySize = sizeof(effect_param_t) + sizeof(uint32_t); if (p->psize != sizeof(uint32_t) || - *(uint32_t *)p->data != VISU_PARAM_CAPTURE_SIZE) { + *(uint32_t *)p->data != VISUALIZER_PARAM_CAPTURE_SIZE) { p->status = -EINVAL; break; } @@ -394,7 +394,7 @@ int Visualizer_command(effect_handle_t self, uint32_t cmdCode, uint32_t cmdSize, effect_param_t *p = (effect_param_t *)pCmdData; if (p->psize != sizeof(uint32_t) || p->vsize != sizeof(uint32_t) || - *(uint32_t *)p->data != VISU_PARAM_CAPTURE_SIZE) { + *(uint32_t *)p->data != VISUALIZER_PARAM_CAPTURE_SIZE) { *(int32_t *)pReplyData = -EINVAL; break;; } @@ -407,9 +407,9 @@ int Visualizer_command(effect_handle_t self, uint32_t cmdCode, uint32_t cmdSize, break; - case VISU_CMD_CAPTURE: + case VISUALIZER_CMD_CAPTURE: if (pReplyData == NULL || *replySize != pContext->mCaptureSize) { - LOGV("VISU_CMD_CAPTURE() error *replySize %d pContext->mCaptureSize %d", + LOGV("VISUALIZER_CMD_CAPTURE() error *replySize %d pContext->mCaptureSize %d", *replySize, pContext->mCaptureSize); return -EINVAL; } diff --git a/media/libmedia/Android.mk b/media/libmedia/Android.mk index 121e38a4..f7c54fa 100644 --- a/media/libmedia/Android.mk +++ b/media/libmedia/Android.mk @@ -68,6 +68,7 @@ LOCAL_C_INCLUDES := \ $(call include-path-for, graphics corecg) \ $(TOP)/frameworks/base/include/media/stagefright/openmax \ external/icu4c/common \ - external/expat/lib + external/expat/lib \ + system/media/audio_effects/include include $(BUILD_SHARED_LIBRARY) diff --git a/media/libmedia/Visualizer.cpp b/media/libmedia/Visualizer.cpp index 366707c..bf40481 100644 --- a/media/libmedia/Visualizer.cpp +++ b/media/libmedia/Visualizer.cpp @@ -143,7 +143,7 @@ status_t Visualizer::setCaptureSize(uint32_t size) p->psize = sizeof(uint32_t); p->vsize = sizeof(uint32_t); - *(int32_t *)p->data = VISU_PARAM_CAPTURE_SIZE; + *(int32_t *)p->data = VISUALIZER_PARAM_CAPTURE_SIZE; *((int32_t *)p->data + 1)= size; status_t status = setParameter(p); @@ -171,7 +171,7 @@ status_t Visualizer::getWaveForm(uint8_t *waveform) status_t status = NO_ERROR; if (mEnabled) { uint32_t replySize = mCaptureSize; - status = command(VISU_CMD_CAPTURE, 0, NULL, &replySize, waveform); + status = command(VISUALIZER_CMD_CAPTURE, 0, NULL, &replySize, waveform); LOGV("getWaveForm() command returned %d", status); if (replySize == 0) { status = NOT_ENOUGH_DATA; @@ -276,7 +276,7 @@ uint32_t Visualizer::initCaptureSize() p->psize = sizeof(uint32_t); p->vsize = sizeof(uint32_t); - *(int32_t *)p->data = VISU_PARAM_CAPTURE_SIZE; + *(int32_t *)p->data = VISUALIZER_PARAM_CAPTURE_SIZE; status_t status = getParameter(p); if (status == NO_ERROR) { diff --git a/services/audioflinger/Android.mk b/services/audioflinger/Android.mk index 2222e8b..75d24a1 100644 --- a/services/audioflinger/Android.mk +++ b/services/audioflinger/Android.mk @@ -10,6 +10,9 @@ LOCAL_SRC_FILES:= \ AudioResamplerCubic.cpp.arm \ AudioPolicyService.cpp +LOCAL_C_INCLUDES := \ + system/media/audio_effects/include + LOCAL_SHARED_LIBRARIES := \ libcutils \ libutils \ diff --git a/services/audioflinger/AudioFlinger.cpp b/services/audioflinger/AudioFlinger.cpp index f716e63..daf94f2 100644 --- a/services/audioflinger/AudioFlinger.cpp +++ b/services/audioflinger/AudioFlinger.cpp @@ -50,7 +50,7 @@ #include "AudioFlinger.h" #include <media/EffectsFactoryApi.h> -#include <media/EffectVisualizerApi.h> +#include <audio_effects/effect_visualizer.h> // ---------------------------------------------------------------------------- |