diff options
-rw-r--r-- | include/media/AudioBufferProvider.h (renamed from services/audioflinger/AudioBufferProvider.h) | 0 | ||||
-rw-r--r-- | include/media/ExtendedAudioBufferProvider.h (renamed from services/audioflinger/ExtendedAudioBufferProvider.h) | 2 | ||||
-rw-r--r-- | include/media/nbaio/AudioBufferProviderSource.h (renamed from services/audioflinger/AudioBufferProviderSource.h) | 2 | ||||
-rw-r--r-- | include/media/nbaio/AudioStreamInSource.h (renamed from services/audioflinger/AudioStreamInSource.h) | 0 | ||||
-rw-r--r-- | include/media/nbaio/AudioStreamOutSink.h (renamed from services/audioflinger/AudioStreamOutSink.h) | 0 | ||||
-rw-r--r-- | include/media/nbaio/LibsndfileSink.h (renamed from services/audioflinger/LibsndfileSink.h) | 0 | ||||
-rw-r--r-- | include/media/nbaio/LibsndfileSource.h (renamed from services/audioflinger/LibsndfileSource.h) | 0 | ||||
-rw-r--r-- | include/media/nbaio/MonoPipe.h (renamed from services/audioflinger/MonoPipe.h) | 0 | ||||
-rw-r--r-- | include/media/nbaio/MonoPipeReader.h (renamed from services/audioflinger/MonoPipeReader.h) | 0 | ||||
-rw-r--r-- | include/media/nbaio/NBAIO.h (renamed from services/audioflinger/NBAIO.h) | 0 | ||||
-rw-r--r-- | include/media/nbaio/Pipe.h (renamed from services/audioflinger/Pipe.h) | 0 | ||||
-rw-r--r-- | include/media/nbaio/PipeReader.h (renamed from services/audioflinger/PipeReader.h) | 0 | ||||
-rw-r--r-- | include/media/nbaio/SourceAudioBufferProvider.h (renamed from services/audioflinger/SourceAudioBufferProvider.h) | 2 | ||||
-rw-r--r-- | include/media/nbaio/roundup.h (renamed from services/audioflinger/roundup.h) | 0 | ||||
-rwxr-xr-x | libvideoeditor/lvpp/VideoEditorSRC.h | 2 | ||||
-rw-r--r-- | media/libnbaio/Android.mk | 32 | ||||
-rw-r--r-- | media/libnbaio/AudioBufferProviderSource.cpp (renamed from services/audioflinger/AudioBufferProviderSource.cpp) | 2 | ||||
-rw-r--r-- | media/libnbaio/AudioStreamInSource.cpp (renamed from services/audioflinger/AudioStreamInSource.cpp) | 2 | ||||
-rw-r--r-- | media/libnbaio/AudioStreamOutSink.cpp (renamed from services/audioflinger/AudioStreamOutSink.cpp) | 2 | ||||
-rw-r--r-- | media/libnbaio/LibsndfileSink.cpp (renamed from services/audioflinger/LibsndfileSink.cpp) | 2 | ||||
-rw-r--r-- | media/libnbaio/LibsndfileSource.cpp (renamed from services/audioflinger/LibsndfileSource.cpp) | 2 | ||||
-rw-r--r-- | media/libnbaio/MonoPipe.cpp (renamed from services/audioflinger/MonoPipe.cpp) | 6 | ||||
-rw-r--r-- | media/libnbaio/MonoPipeReader.cpp (renamed from services/audioflinger/MonoPipeReader.cpp) | 2 | ||||
-rw-r--r-- | media/libnbaio/NBAIO.cpp (renamed from services/audioflinger/NBAIO.cpp) | 2 | ||||
-rw-r--r-- | media/libnbaio/Pipe.cpp (renamed from services/audioflinger/Pipe.cpp) | 4 | ||||
-rw-r--r-- | media/libnbaio/PipeReader.cpp (renamed from services/audioflinger/PipeReader.cpp) | 2 | ||||
-rw-r--r-- | media/libnbaio/SourceAudioBufferProvider.cpp (renamed from services/audioflinger/SourceAudioBufferProvider.cpp) | 2 | ||||
-rw-r--r-- | media/libnbaio/roundup.c (renamed from services/audioflinger/roundup.c) | 2 | ||||
-rw-r--r-- | services/audioflinger/Android.mk | 28 | ||||
-rw-r--r-- | services/audioflinger/AudioFlinger.cpp | 12 | ||||
-rw-r--r-- | services/audioflinger/AudioFlinger.h | 6 | ||||
-rw-r--r-- | services/audioflinger/AudioMixer.h | 2 | ||||
-rw-r--r-- | services/audioflinger/AudioResampler.h | 2 | ||||
-rw-r--r-- | services/audioflinger/FastMixerState.h | 4 |
34 files changed, 65 insertions, 59 deletions
diff --git a/services/audioflinger/AudioBufferProvider.h b/include/media/AudioBufferProvider.h index 43e4de7..43e4de7 100644 --- a/services/audioflinger/AudioBufferProvider.h +++ b/include/media/AudioBufferProvider.h diff --git a/services/audioflinger/ExtendedAudioBufferProvider.h b/include/media/ExtendedAudioBufferProvider.h index 88279b4..00c4444 100644 --- a/services/audioflinger/ExtendedAudioBufferProvider.h +++ b/include/media/ExtendedAudioBufferProvider.h @@ -17,7 +17,7 @@ #ifndef ANDROID_EXTENDED_AUDIO_BUFFER_PROVIDER_H #define ANDROID_EXTENDED_AUDIO_BUFFER_PROVIDER_H -#include "AudioBufferProvider.h" +#include <media/AudioBufferProvider.h> namespace android { diff --git a/services/audioflinger/AudioBufferProviderSource.h b/include/media/nbaio/AudioBufferProviderSource.h index 1435a84..2c4aaff 100644 --- a/services/audioflinger/AudioBufferProviderSource.h +++ b/include/media/nbaio/AudioBufferProviderSource.h @@ -20,7 +20,7 @@ #define ANDROID_AUDIO_BUFFER_PROVIDER_SOURCE_H #include "NBAIO.h" -#include "AudioBufferProvider.h" +#include <media/AudioBufferProvider.h> namespace android { diff --git a/services/audioflinger/AudioStreamInSource.h b/include/media/nbaio/AudioStreamInSource.h index 07d8c89..07d8c89 100644 --- a/services/audioflinger/AudioStreamInSource.h +++ b/include/media/nbaio/AudioStreamInSource.h diff --git a/services/audioflinger/AudioStreamOutSink.h b/include/media/nbaio/AudioStreamOutSink.h index 5976b18..5976b18 100644 --- a/services/audioflinger/AudioStreamOutSink.h +++ b/include/media/nbaio/AudioStreamOutSink.h diff --git a/services/audioflinger/LibsndfileSink.h b/include/media/nbaio/LibsndfileSink.h index f5d53d5..f5d53d5 100644 --- a/services/audioflinger/LibsndfileSink.h +++ b/include/media/nbaio/LibsndfileSink.h diff --git a/services/audioflinger/LibsndfileSource.h b/include/media/nbaio/LibsndfileSource.h index 4fbdb4b..4fbdb4b 100644 --- a/services/audioflinger/LibsndfileSource.h +++ b/include/media/nbaio/LibsndfileSource.h diff --git a/services/audioflinger/MonoPipe.h b/include/media/nbaio/MonoPipe.h index c47bf6c..c47bf6c 100644 --- a/services/audioflinger/MonoPipe.h +++ b/include/media/nbaio/MonoPipe.h diff --git a/services/audioflinger/MonoPipeReader.h b/include/media/nbaio/MonoPipeReader.h index 0e1c992..0e1c992 100644 --- a/services/audioflinger/MonoPipeReader.h +++ b/include/media/nbaio/MonoPipeReader.h diff --git a/services/audioflinger/NBAIO.h b/include/media/nbaio/NBAIO.h index 81f42ed..81f42ed 100644 --- a/services/audioflinger/NBAIO.h +++ b/include/media/nbaio/NBAIO.h diff --git a/services/audioflinger/Pipe.h b/include/media/nbaio/Pipe.h index 79a4eee..79a4eee 100644 --- a/services/audioflinger/Pipe.h +++ b/include/media/nbaio/Pipe.h diff --git a/services/audioflinger/PipeReader.h b/include/media/nbaio/PipeReader.h index 350e6ab..350e6ab 100644 --- a/services/audioflinger/PipeReader.h +++ b/include/media/nbaio/PipeReader.h diff --git a/services/audioflinger/SourceAudioBufferProvider.h b/include/media/nbaio/SourceAudioBufferProvider.h index 85ccbb2..c08331b 100644 --- a/services/audioflinger/SourceAudioBufferProvider.h +++ b/include/media/nbaio/SourceAudioBufferProvider.h @@ -20,7 +20,7 @@ #define ANDROID_SOURCE_AUDIO_BUFFER_PROVIDER_H #include "NBAIO.h" -#include "ExtendedAudioBufferProvider.h" +#include <media/ExtendedAudioBufferProvider.h> namespace android { diff --git a/services/audioflinger/roundup.h b/include/media/nbaio/roundup.h index 4c3cc25..4c3cc25 100644 --- a/services/audioflinger/roundup.h +++ b/include/media/nbaio/roundup.h diff --git a/libvideoeditor/lvpp/VideoEditorSRC.h b/libvideoeditor/lvpp/VideoEditorSRC.h index 2b7e9b6..1707d4d 100755 --- a/libvideoeditor/lvpp/VideoEditorSRC.h +++ b/libvideoeditor/lvpp/VideoEditorSRC.h @@ -17,7 +17,7 @@ #include <stdint.h> #include <media/stagefright/MediaSource.h> -#include "AudioBufferProvider.h" +#include <media/AudioBufferProvider.h> #include "AudioResampler.h" namespace android { diff --git a/media/libnbaio/Android.mk b/media/libnbaio/Android.mk new file mode 100644 index 0000000..757272f --- /dev/null +++ b/media/libnbaio/Android.mk @@ -0,0 +1,32 @@ +LOCAL_PATH := $(call my-dir) + +include $(CLEAR_VARS) + +LOCAL_SRC_FILES := \ + AudioBufferProviderSource.cpp \ + AudioStreamOutSink.cpp \ + AudioStreamInSource.cpp \ + NBAIO.cpp \ + MonoPipe.cpp \ + MonoPipeReader.cpp \ + Pipe.cpp \ + PipeReader.cpp \ + roundup.c \ + SourceAudioBufferProvider.cpp + +# libsndfile license is incompatible; uncomment to use for local debug only +#LOCAL_SRC_FILES += LibsndfileSink.cpp LibsndfileSource.cpp +#LOCAL_C_INCLUDES += path/to/libsndfile/src +#LOCAL_STATIC_LIBRARIES += libsndfile + +# uncomment for systrace +# LOCAL_CFLAGS += -DATRACE_TAG=ATRACE_TAG_AUDIO + +LOCAL_MODULE := libnbaio + +LOCAL_SHARED_LIBRARIES := \ + libcommon_time_client \ + libcutils \ + libutils + +include $(BUILD_SHARED_LIBRARY) diff --git a/services/audioflinger/AudioBufferProviderSource.cpp b/media/libnbaio/AudioBufferProviderSource.cpp index 613e924..74a6fdb 100644 --- a/services/audioflinger/AudioBufferProviderSource.cpp +++ b/media/libnbaio/AudioBufferProviderSource.cpp @@ -19,7 +19,7 @@ #include <cutils/compiler.h> #include <utils/Log.h> -#include "AudioBufferProviderSource.h" +#include <media/nbaio/AudioBufferProviderSource.h> namespace android { diff --git a/services/audioflinger/AudioStreamInSource.cpp b/media/libnbaio/AudioStreamInSource.cpp index 8b4bebf..05273f6 100644 --- a/services/audioflinger/AudioStreamInSource.cpp +++ b/media/libnbaio/AudioStreamInSource.cpp @@ -19,7 +19,7 @@ #include <cutils/compiler.h> #include <utils/Log.h> -#include "AudioStreamInSource.h" +#include <media/nbaio/AudioStreamInSource.h> namespace android { diff --git a/services/audioflinger/AudioStreamOutSink.cpp b/media/libnbaio/AudioStreamOutSink.cpp index bc2d15b..6f525e5 100644 --- a/services/audioflinger/AudioStreamOutSink.cpp +++ b/media/libnbaio/AudioStreamOutSink.cpp @@ -18,7 +18,7 @@ //#define LOG_NDEBUG 0 #include <utils/Log.h> -#include "AudioStreamOutSink.h" +#include <media/nbaio/AudioStreamOutSink.h> namespace android { diff --git a/services/audioflinger/LibsndfileSink.cpp b/media/libnbaio/LibsndfileSink.cpp index efc1c8f..77debc0 100644 --- a/services/audioflinger/LibsndfileSink.cpp +++ b/media/libnbaio/LibsndfileSink.cpp @@ -19,7 +19,7 @@ #include <utils/Errors.h> #include <utils/Log.h> -#include "LibsndfileSink.h" +#include <media/nbaio/LibsndfileSink.h> namespace android { diff --git a/services/audioflinger/LibsndfileSource.cpp b/media/libnbaio/LibsndfileSource.cpp index 28317d6..98610e0 100644 --- a/services/audioflinger/LibsndfileSource.cpp +++ b/media/libnbaio/LibsndfileSource.cpp @@ -19,7 +19,7 @@ #include <utils/Errors.h> #include <utils/Log.h> -#include "LibsndfileSource.h" +#include <media/nbaio/LibsndfileSource.h> namespace android { diff --git a/services/audioflinger/MonoPipe.cpp b/media/libnbaio/MonoPipe.cpp index bd876b4..c426efb 100644 --- a/services/audioflinger/MonoPipe.cpp +++ b/media/libnbaio/MonoPipe.cpp @@ -23,9 +23,9 @@ #include <utils/LinearTransform.h> #include <utils/Log.h> #include <utils/Trace.h> -#include "AudioBufferProvider.h" -#include "MonoPipe.h" -#include "roundup.h" +#include <media/AudioBufferProvider.h> +#include <media/nbaio/MonoPipe.h> +#include <media/nbaio/roundup.h> namespace android { diff --git a/services/audioflinger/MonoPipeReader.cpp b/media/libnbaio/MonoPipeReader.cpp index 39a07de..394f6ac 100644 --- a/services/audioflinger/MonoPipeReader.cpp +++ b/media/libnbaio/MonoPipeReader.cpp @@ -19,7 +19,7 @@ #include <cutils/compiler.h> #include <utils/Log.h> -#include "MonoPipeReader.h" +#include <media/nbaio/MonoPipeReader.h> namespace android { diff --git a/services/audioflinger/NBAIO.cpp b/media/libnbaio/NBAIO.cpp index 2c07ebf..00d2017 100644 --- a/services/audioflinger/NBAIO.cpp +++ b/media/libnbaio/NBAIO.cpp @@ -18,7 +18,7 @@ //#define LOG_NDEBUG 0 #include <utils/Log.h> -#include "NBAIO.h" +#include <media/nbaio/NBAIO.h> namespace android { diff --git a/services/audioflinger/Pipe.cpp b/media/libnbaio/Pipe.cpp index e5b3561..1c21f9c 100644 --- a/services/audioflinger/Pipe.cpp +++ b/media/libnbaio/Pipe.cpp @@ -20,8 +20,8 @@ #include <cutils/atomic.h> #include <cutils/compiler.h> #include <utils/Log.h> -#include "Pipe.h" -#include "roundup.h" +#include <media/nbaio/Pipe.h> +#include <media/nbaio/roundup.h> namespace android { diff --git a/services/audioflinger/PipeReader.cpp b/media/libnbaio/PipeReader.cpp index 529d478..d786b84 100644 --- a/services/audioflinger/PipeReader.cpp +++ b/media/libnbaio/PipeReader.cpp @@ -19,7 +19,7 @@ #include <cutils/compiler.h> #include <utils/Log.h> -#include "PipeReader.h" +#include <media/nbaio/PipeReader.h> namespace android { diff --git a/services/audioflinger/SourceAudioBufferProvider.cpp b/media/libnbaio/SourceAudioBufferProvider.cpp index 3343b53..d11a86c 100644 --- a/services/audioflinger/SourceAudioBufferProvider.cpp +++ b/media/libnbaio/SourceAudioBufferProvider.cpp @@ -18,7 +18,7 @@ //#define LOG_NDEBUG 0 #include <utils/Log.h> -#include "SourceAudioBufferProvider.h" +#include <media/nbaio/SourceAudioBufferProvider.h> namespace android { diff --git a/services/audioflinger/roundup.c b/media/libnbaio/roundup.c index 4f9af6a..1d552d1 100644 --- a/services/audioflinger/roundup.c +++ b/media/libnbaio/roundup.c @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "roundup.h" +#include <media/nbaio/roundup.h> unsigned roundup(unsigned v) { diff --git a/services/audioflinger/Android.mk b/services/audioflinger/Android.mk index c2d2790..66759d1 100644 --- a/services/audioflinger/Android.mk +++ b/services/audioflinger/Android.mk @@ -13,32 +13,6 @@ include $(BUILD_STATIC_LIBRARY) include $(CLEAR_VARS) -LOCAL_SRC_FILES := \ - AudioBufferProviderSource.cpp \ - AudioStreamOutSink.cpp \ - AudioStreamInSource.cpp \ - NBAIO.cpp \ - MonoPipe.cpp \ - MonoPipeReader.cpp \ - Pipe.cpp \ - PipeReader.cpp \ - roundup.c \ - SourceAudioBufferProvider.cpp - -# libsndfile license is incompatible; uncomment to use for local debug only -#LOCAL_SRC_FILES += LibsndfileSink.cpp LibsndfileSource.cpp -#LOCAL_C_INCLUDES += path/to/libsndfile/src -#LOCAL_STATIC_LIBRARIES += libsndfile - -# uncomment for systrace -# LOCAL_CFLAGS += -DATRACE_TAG=ATRACE_TAG_AUDIO - -LOCAL_MODULE := libnbaio - -include $(BUILD_STATIC_LIBRARY) - -include $(CLEAR_VARS) - LOCAL_SRC_FILES:= \ AudioFlinger.cpp \ AudioMixer.cpp.arm \ @@ -66,6 +40,7 @@ LOCAL_SHARED_LIBRARIES := \ libbinder \ libmedia \ libmedia_native \ + libnbaio \ libhardware \ libhardware_legacy \ libeffects \ @@ -74,7 +49,6 @@ LOCAL_SHARED_LIBRARIES := \ LOCAL_STATIC_LIBRARIES := \ libscheduling_policy \ - libnbaio \ libcpustats \ libmedia_helper diff --git a/services/audioflinger/AudioFlinger.cpp b/services/audioflinger/AudioFlinger.cpp index 7126006..8acd244 100644 --- a/services/audioflinger/AudioFlinger.cpp +++ b/services/audioflinger/AudioFlinger.cpp @@ -76,12 +76,12 @@ #include "FastMixer.h" // NBAIO implementations -#include "AudioStreamOutSink.h" -#include "MonoPipe.h" -#include "MonoPipeReader.h" -#include "Pipe.h" -#include "PipeReader.h" -#include "SourceAudioBufferProvider.h" +#include <media/nbaio/AudioStreamOutSink.h> +#include <media/nbaio/MonoPipe.h> +#include <media/nbaio/MonoPipeReader.h> +#include <media/nbaio/Pipe.h> +#include <media/nbaio/PipeReader.h> +#include <media/nbaio/SourceAudioBufferProvider.h> #include "SchedulingPolicyService.h" diff --git a/services/audioflinger/AudioFlinger.h b/services/audioflinger/AudioFlinger.h index 682d61d..b4aefc1 100644 --- a/services/audioflinger/AudioFlinger.h +++ b/services/audioflinger/AudioFlinger.h @@ -45,10 +45,10 @@ #include <hardware/audio.h> #include <hardware/audio_policy.h> -#include "AudioBufferProvider.h" -#include "ExtendedAudioBufferProvider.h" +#include <media/AudioBufferProvider.h> +#include <media/ExtendedAudioBufferProvider.h> #include "FastMixer.h" -#include "NBAIO.h" +#include <media/nbaio/NBAIO.h> #include "AudioWatchdog.h" #include <powermanager/IPowerManager.h> diff --git a/services/audioflinger/AudioMixer.h b/services/audioflinger/AudioMixer.h index 66abb4f..6c80253 100644 --- a/services/audioflinger/AudioMixer.h +++ b/services/audioflinger/AudioMixer.h @@ -23,7 +23,7 @@ #include <utils/threads.h> -#include "AudioBufferProvider.h" +#include <media/AudioBufferProvider.h> #include "AudioResampler.h" #include <audio_effects/effect_downmix.h> diff --git a/services/audioflinger/AudioResampler.h b/services/audioflinger/AudioResampler.h index 1610e00..dc696d8 100644 --- a/services/audioflinger/AudioResampler.h +++ b/services/audioflinger/AudioResampler.h @@ -20,7 +20,7 @@ #include <stdint.h> #include <sys/types.h> -#include "AudioBufferProvider.h" +#include <media/AudioBufferProvider.h> namespace android { // ---------------------------------------------------------------------------- diff --git a/services/audioflinger/FastMixerState.h b/services/audioflinger/FastMixerState.h index bc69c9c..6e53f21 100644 --- a/services/audioflinger/FastMixerState.h +++ b/services/audioflinger/FastMixerState.h @@ -18,8 +18,8 @@ #define ANDROID_AUDIO_FAST_MIXER_STATE_H #include <system/audio.h> -#include "ExtendedAudioBufferProvider.h" -#include "NBAIO.h" +#include <media/ExtendedAudioBufferProvider.h> +#include <media/nbaio/NBAIO.h> namespace android { |