diff options
Diffstat (limited to 'media')
-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 |
11 files changed, 30 insertions, 22 deletions
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) { |