diff options
| author | Mikhail Naganov <mnaganov@google.com> | 2016-10-14 15:32:25 -0700 |
|---|---|---|
| committer | Mikhail Naganov <mnaganov@google.com> | 2016-10-14 15:32:25 -0700 |
| commit | 2ad970981d31000e468f835de8286fa46f07c5e1 (patch) | |
| tree | eb400239d0308201205669f5b777e34e7c9957e9 | |
| parent | 37eb4483527e0d386910b76389003ca14a68942c (diff) | |
| download | voip-2ad970981d31000e468f835de8286fa46f07c5e1.tar.gz | |
Split audio effects headers
There can be different use cases with the code that imports
headers from audio_effects (each subsequent case is a more
specialized version of the previous one):
1. The code only needs access to general structures
like effect_descriptor_t:
==> include system/audio_effect.h
Example: AudioSystem in libmedia
2. The code that needs access to effect UUID and parameter
enums:
==> include system/audio_effects/effect_foo.h
Examples: media framework effects interfaces, libwilhelm
3. The code that needs to call into HAL:
==> include hardware/audio_effect.h
Examples: libaudiohal (implementation part) and libeffects
4. The code that implements a particular effect:
==> include audio_effects/effect_foo.h
Examples: cts/.../CTSTestEffect.cpp
stuff in hardware/, vendor/
Change-Id: Icad01477bdaeab2c32e89b52e332cb909de37909
Test: make
| -rw-r--r-- | src/jni/rtp/Android.mk | 3 | ||||
| -rw-r--r-- | src/jni/rtp/AudioGroup.cpp | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/src/jni/rtp/Android.mk b/src/jni/rtp/Android.mk index 3401d9e..0a3cdb4 100644 --- a/src/jni/rtp/Android.mk +++ b/src/jni/rtp/Android.mk @@ -50,8 +50,7 @@ LOCAL_C_INCLUDES += \ frameworks/av/media/libstagefright/codecs/amrnb/enc/include \ frameworks/av/media/libstagefright/codecs/amrnb/enc/src \ frameworks/av/media/libstagefright/codecs/amrnb/dec/include \ - frameworks/av/media/libstagefright/codecs/amrnb/dec/src \ - $(call include-path-for, audio-effects) + frameworks/av/media/libstagefright/codecs/amrnb/dec/src # getInput() is deprecated but we want to continue to track the usage of it elsewhere LOCAL_CFLAGS += -fvisibility=hidden -Wall -Wextra -Wno-deprecated-declarations -Werror diff --git a/src/jni/rtp/AudioGroup.cpp b/src/jni/rtp/AudioGroup.cpp index da02861..bad584b 100644 --- a/src/jni/rtp/AudioGroup.cpp +++ b/src/jni/rtp/AudioGroup.cpp @@ -42,7 +42,7 @@ #include <media/AudioTrack.h> #include <media/mediarecorder.h> #include <media/AudioEffect.h> -#include <audio_effects/effect_aec.h> +#include <system/audio_effects/effect_aec.h> #include <system/audio.h> #include <ScopedUtfChars.h> |