Loading services/audioflinger/AudioMixer.h→include/media/AudioMixer.h +2 −3 Original line number Diff line number Diff line Loading @@ -22,15 +22,14 @@ #include <sys/types.h> #include <media/AudioBufferProvider.h> #include <media/AudioResampler.h> #include <media/AudioResamplerPublic.h> #include <media/BufferProviders.h> #include <media/nbaio/NBLog.h> #include <system/audio.h> #include <utils/Compat.h> #include <utils/threads.h> #include "AudioResampler.h" #include "BufferProviders.h" // FIXME This is actually unity gain, which might not be max in future, expressed in U.12 #define MAX_GAIN_INT AudioMixer::UNITY_GAIN_INT Loading services/audioflinger/AudioResampler.h→include/media/AudioResampler.h +0 −0 File moved. View file services/audioflinger/BufferProviders.h→include/media/BufferProviders.h +4 −1 Original line number Diff line number Diff line Loading @@ -23,9 +23,12 @@ #include <media/AudioBufferProvider.h> #include <system/audio.h> #include <system/audio_effect.h> #include <sonic.h> #include <utils/StrongPointer.h> // external forward declaration from external/sonic/sonic.h struct sonicStreamStruct; typedef struct sonicStreamStruct *sonicStream; namespace android { class EffectBufferHalInterface; Loading services/audioflinger/LinearMap.h→include/media/LinearMap.h +0 −0 File moved. View file media/libaudioprocessing/Android.mk 0 → 100644 +35 −0 Original line number Diff line number Diff line LOCAL_PATH := $(call my-dir) include $(CLEAR_VARS) LOCAL_SRC_FILES := \ AudioMixer.cpp.arm \ AudioResampler.cpp.arm \ AudioResamplerCubic.cpp.arm \ AudioResamplerSinc.cpp.arm \ AudioResamplerDyn.cpp.arm \ BufferProviders.cpp \ LOCAL_C_INCLUDES := \ $(TOP) \ $(call include-path-for, audio-utils) \ LOCAL_SHARED_LIBRARIES := \ libaudiohal \ libaudioutils \ libcutils \ liblog \ libnbaio \ libsonic \ libutils \ LOCAL_MODULE := libaudioprocessing LOCAL_CFLAGS := -Werror -Wall # uncomment to disable NEON on architectures that actually do support NEON, for benchmarking #LOCAL_CFLAGS += -DUSE_NEON=false include $(BUILD_SHARED_LIBRARY) include $(call all-makefiles-under,$(LOCAL_PATH)) Loading
services/audioflinger/AudioMixer.h→include/media/AudioMixer.h +2 −3 Original line number Diff line number Diff line Loading @@ -22,15 +22,14 @@ #include <sys/types.h> #include <media/AudioBufferProvider.h> #include <media/AudioResampler.h> #include <media/AudioResamplerPublic.h> #include <media/BufferProviders.h> #include <media/nbaio/NBLog.h> #include <system/audio.h> #include <utils/Compat.h> #include <utils/threads.h> #include "AudioResampler.h" #include "BufferProviders.h" // FIXME This is actually unity gain, which might not be max in future, expressed in U.12 #define MAX_GAIN_INT AudioMixer::UNITY_GAIN_INT Loading
services/audioflinger/BufferProviders.h→include/media/BufferProviders.h +4 −1 Original line number Diff line number Diff line Loading @@ -23,9 +23,12 @@ #include <media/AudioBufferProvider.h> #include <system/audio.h> #include <system/audio_effect.h> #include <sonic.h> #include <utils/StrongPointer.h> // external forward declaration from external/sonic/sonic.h struct sonicStreamStruct; typedef struct sonicStreamStruct *sonicStream; namespace android { class EffectBufferHalInterface; Loading
media/libaudioprocessing/Android.mk 0 → 100644 +35 −0 Original line number Diff line number Diff line LOCAL_PATH := $(call my-dir) include $(CLEAR_VARS) LOCAL_SRC_FILES := \ AudioMixer.cpp.arm \ AudioResampler.cpp.arm \ AudioResamplerCubic.cpp.arm \ AudioResamplerSinc.cpp.arm \ AudioResamplerDyn.cpp.arm \ BufferProviders.cpp \ LOCAL_C_INCLUDES := \ $(TOP) \ $(call include-path-for, audio-utils) \ LOCAL_SHARED_LIBRARIES := \ libaudiohal \ libaudioutils \ libcutils \ liblog \ libnbaio \ libsonic \ libutils \ LOCAL_MODULE := libaudioprocessing LOCAL_CFLAGS := -Werror -Wall # uncomment to disable NEON on architectures that actually do support NEON, for benchmarking #LOCAL_CFLAGS += -DUSE_NEON=false include $(BUILD_SHARED_LIBRARY) include $(call all-makefiles-under,$(LOCAL_PATH))