From fc7992bd8220824f1404c0c54ac516d9e28b58c2 Mon Sep 17 00:00:00 2001 From: Glenn Kasten Date: Wed, 29 Aug 2012 11:10:32 -0700 Subject: [PATCH] Move libnbaio out of AudioFlinger libnbaio is now a separate shared library from AudioFlinger, rather than a static library used only by AudioFlinger. AudioBufferProvider interface is now also independent of AudioFlinger, moved to include/media/ Change-Id: I9bb62ffbc38d42a38b0af76e66da5e9ab1e0e21b --- .../media}/AudioBufferProvider.h | 0 .../media}/ExtendedAudioBufferProvider.h | 2 +- .../media/nbaio}/AudioBufferProviderSource.h | 2 +- .../media/nbaio}/AudioStreamInSource.h | 0 .../media/nbaio}/AudioStreamOutSink.h | 0 .../media/nbaio}/LibsndfileSink.h | 0 .../media/nbaio}/LibsndfileSource.h | 0 .../media/nbaio}/MonoPipe.h | 0 .../media/nbaio}/MonoPipeReader.h | 0 .../audioflinger => include/media/nbaio}/NBAIO.h | 0 .../audioflinger => include/media/nbaio}/Pipe.h | 0 .../media/nbaio}/PipeReader.h | 0 .../media/nbaio}/SourceAudioBufferProvider.h | 2 +- .../audioflinger => include/media/nbaio}/roundup.h | 0 libvideoeditor/lvpp/VideoEditorSRC.h | 2 +- media/libnbaio/Android.mk | 32 ++++++++++++++++++++++ .../libnbaio}/AudioBufferProviderSource.cpp | 2 +- .../libnbaio}/AudioStreamInSource.cpp | 2 +- .../libnbaio}/AudioStreamOutSink.cpp | 2 +- .../libnbaio}/LibsndfileSink.cpp | 2 +- .../libnbaio}/LibsndfileSource.cpp | 2 +- .../audioflinger => media/libnbaio}/MonoPipe.cpp | 6 ++-- .../libnbaio}/MonoPipeReader.cpp | 2 +- .../audioflinger => media/libnbaio}/NBAIO.cpp | 2 +- {services/audioflinger => media/libnbaio}/Pipe.cpp | 4 +-- .../audioflinger => media/libnbaio}/PipeReader.cpp | 2 +- .../libnbaio}/SourceAudioBufferProvider.cpp | 2 +- .../audioflinger => media/libnbaio}/roundup.c | 2 +- services/audioflinger/Android.mk | 28 +------------------ services/audioflinger/AudioFlinger.cpp | 12 ++++---- services/audioflinger/AudioFlinger.h | 6 ++-- services/audioflinger/AudioMixer.h | 2 +- services/audioflinger/AudioResampler.h | 2 +- services/audioflinger/FastMixerState.h | 4 +-- 34 files changed, 65 insertions(+), 59 deletions(-) rename {services/audioflinger => include/media}/AudioBufferProvider.h (100%) rename {services/audioflinger => include/media}/ExtendedAudioBufferProvider.h (96%) rename {services/audioflinger => include/media/nbaio}/AudioBufferProviderSource.h (98%) rename {services/audioflinger => include/media/nbaio}/AudioStreamInSource.h (100%) rename {services/audioflinger => include/media/nbaio}/AudioStreamOutSink.h (100%) rename {services/audioflinger => include/media/nbaio}/LibsndfileSink.h (100%) rename {services/audioflinger => include/media/nbaio}/LibsndfileSource.h (100%) rename {services/audioflinger => include/media/nbaio}/MonoPipe.h (100%) rename {services/audioflinger => include/media/nbaio}/MonoPipeReader.h (100%) rename {services/audioflinger => include/media/nbaio}/NBAIO.h (100%) rename {services/audioflinger => include/media/nbaio}/Pipe.h (100%) rename {services/audioflinger => include/media/nbaio}/PipeReader.h (100%) rename {services/audioflinger => include/media/nbaio}/SourceAudioBufferProvider.h (97%) rename {services/audioflinger => include/media/nbaio}/roundup.h (100%) create mode 100644 media/libnbaio/Android.mk rename {services/audioflinger => media/libnbaio}/AudioBufferProviderSource.cpp (99%) rename {services/audioflinger => media/libnbaio}/AudioStreamInSource.cpp (98%) rename {services/audioflinger => media/libnbaio}/AudioStreamOutSink.cpp (98%) rename {services/audioflinger => media/libnbaio}/LibsndfileSink.cpp (97%) rename {services/audioflinger => media/libnbaio}/LibsndfileSource.cpp (98%) rename {services/audioflinger => media/libnbaio}/MonoPipe.cpp (99%) rename {services/audioflinger => media/libnbaio}/MonoPipeReader.cpp (98%) rename {services/audioflinger => media/libnbaio}/NBAIO.cpp (99%) rename {services/audioflinger => media/libnbaio}/Pipe.cpp (97%) rename {services/audioflinger => media/libnbaio}/PipeReader.cpp (98%) rename {services/audioflinger => media/libnbaio}/SourceAudioBufferProvider.cpp (98%) rename {services/audioflinger => media/libnbaio}/roundup.c (96%) diff --git a/services/audioflinger/AudioBufferProvider.h b/include/media/AudioBufferProvider.h similarity index 100% rename from services/audioflinger/AudioBufferProvider.h rename to include/media/AudioBufferProvider.h diff --git a/services/audioflinger/ExtendedAudioBufferProvider.h b/include/media/ExtendedAudioBufferProvider.h similarity index 96% rename from services/audioflinger/ExtendedAudioBufferProvider.h rename to include/media/ExtendedAudioBufferProvider.h index 88279b483f..00c4444f1b 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 namespace android { diff --git a/services/audioflinger/AudioBufferProviderSource.h b/include/media/nbaio/AudioBufferProviderSource.h similarity index 98% rename from services/audioflinger/AudioBufferProviderSource.h rename to include/media/nbaio/AudioBufferProviderSource.h index 1435a84e11..2c4aaffbfe 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 namespace android { diff --git a/services/audioflinger/AudioStreamInSource.h b/include/media/nbaio/AudioStreamInSource.h similarity index 100% rename from services/audioflinger/AudioStreamInSource.h rename to include/media/nbaio/AudioStreamInSource.h diff --git a/services/audioflinger/AudioStreamOutSink.h b/include/media/nbaio/AudioStreamOutSink.h similarity index 100% rename from services/audioflinger/AudioStreamOutSink.h rename to include/media/nbaio/AudioStreamOutSink.h diff --git a/services/audioflinger/LibsndfileSink.h b/include/media/nbaio/LibsndfileSink.h similarity index 100% rename from services/audioflinger/LibsndfileSink.h rename to include/media/nbaio/LibsndfileSink.h diff --git a/services/audioflinger/LibsndfileSource.h b/include/media/nbaio/LibsndfileSource.h similarity index 100% rename from services/audioflinger/LibsndfileSource.h rename to include/media/nbaio/LibsndfileSource.h diff --git a/services/audioflinger/MonoPipe.h b/include/media/nbaio/MonoPipe.h similarity index 100% rename from services/audioflinger/MonoPipe.h rename to include/media/nbaio/MonoPipe.h diff --git a/services/audioflinger/MonoPipeReader.h b/include/media/nbaio/MonoPipeReader.h similarity index 100% rename from services/audioflinger/MonoPipeReader.h rename to include/media/nbaio/MonoPipeReader.h diff --git a/services/audioflinger/NBAIO.h b/include/media/nbaio/NBAIO.h similarity index 100% rename from services/audioflinger/NBAIO.h rename to include/media/nbaio/NBAIO.h diff --git a/services/audioflinger/Pipe.h b/include/media/nbaio/Pipe.h similarity index 100% rename from services/audioflinger/Pipe.h rename to include/media/nbaio/Pipe.h diff --git a/services/audioflinger/PipeReader.h b/include/media/nbaio/PipeReader.h similarity index 100% rename from services/audioflinger/PipeReader.h rename to include/media/nbaio/PipeReader.h diff --git a/services/audioflinger/SourceAudioBufferProvider.h b/include/media/nbaio/SourceAudioBufferProvider.h similarity index 97% rename from services/audioflinger/SourceAudioBufferProvider.h rename to include/media/nbaio/SourceAudioBufferProvider.h index 85ccbb2e05..c08331bfc7 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 namespace android { diff --git a/services/audioflinger/roundup.h b/include/media/nbaio/roundup.h similarity index 100% rename from services/audioflinger/roundup.h rename to include/media/nbaio/roundup.h diff --git a/libvideoeditor/lvpp/VideoEditorSRC.h b/libvideoeditor/lvpp/VideoEditorSRC.h index 2b7e9b6cfe..1707d4d418 100755 --- a/libvideoeditor/lvpp/VideoEditorSRC.h +++ b/libvideoeditor/lvpp/VideoEditorSRC.h @@ -17,7 +17,7 @@ #include #include -#include "AudioBufferProvider.h" +#include #include "AudioResampler.h" namespace android { diff --git a/media/libnbaio/Android.mk b/media/libnbaio/Android.mk new file mode 100644 index 0000000000..757272fafa --- /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 similarity index 99% rename from services/audioflinger/AudioBufferProviderSource.cpp rename to media/libnbaio/AudioBufferProviderSource.cpp index 613e924235..74a6fdb552 100644 --- a/services/audioflinger/AudioBufferProviderSource.cpp +++ b/media/libnbaio/AudioBufferProviderSource.cpp @@ -19,7 +19,7 @@ #include #include -#include "AudioBufferProviderSource.h" +#include namespace android { diff --git a/services/audioflinger/AudioStreamInSource.cpp b/media/libnbaio/AudioStreamInSource.cpp similarity index 98% rename from services/audioflinger/AudioStreamInSource.cpp rename to media/libnbaio/AudioStreamInSource.cpp index 8b4bebf056..05273f6963 100644 --- a/services/audioflinger/AudioStreamInSource.cpp +++ b/media/libnbaio/AudioStreamInSource.cpp @@ -19,7 +19,7 @@ #include #include -#include "AudioStreamInSource.h" +#include namespace android { diff --git a/services/audioflinger/AudioStreamOutSink.cpp b/media/libnbaio/AudioStreamOutSink.cpp similarity index 98% rename from services/audioflinger/AudioStreamOutSink.cpp rename to media/libnbaio/AudioStreamOutSink.cpp index bc2d15b833..6f525e5ded 100644 --- a/services/audioflinger/AudioStreamOutSink.cpp +++ b/media/libnbaio/AudioStreamOutSink.cpp @@ -18,7 +18,7 @@ //#define LOG_NDEBUG 0 #include -#include "AudioStreamOutSink.h" +#include namespace android { diff --git a/services/audioflinger/LibsndfileSink.cpp b/media/libnbaio/LibsndfileSink.cpp similarity index 97% rename from services/audioflinger/LibsndfileSink.cpp rename to media/libnbaio/LibsndfileSink.cpp index efc1c8f790..77debc047b 100644 --- a/services/audioflinger/LibsndfileSink.cpp +++ b/media/libnbaio/LibsndfileSink.cpp @@ -19,7 +19,7 @@ #include #include -#include "LibsndfileSink.h" +#include namespace android { diff --git a/services/audioflinger/LibsndfileSource.cpp b/media/libnbaio/LibsndfileSource.cpp similarity index 98% rename from services/audioflinger/LibsndfileSource.cpp rename to media/libnbaio/LibsndfileSource.cpp index 28317d65db..98610e02b5 100644 --- a/services/audioflinger/LibsndfileSource.cpp +++ b/media/libnbaio/LibsndfileSource.cpp @@ -19,7 +19,7 @@ #include #include -#include "LibsndfileSource.h" +#include namespace android { diff --git a/services/audioflinger/MonoPipe.cpp b/media/libnbaio/MonoPipe.cpp similarity index 99% rename from services/audioflinger/MonoPipe.cpp rename to media/libnbaio/MonoPipe.cpp index bd876b449f..c426efb958 100644 --- a/services/audioflinger/MonoPipe.cpp +++ b/media/libnbaio/MonoPipe.cpp @@ -23,9 +23,9 @@ #include #include #include -#include "AudioBufferProvider.h" -#include "MonoPipe.h" -#include "roundup.h" +#include +#include +#include namespace android { diff --git a/services/audioflinger/MonoPipeReader.cpp b/media/libnbaio/MonoPipeReader.cpp similarity index 98% rename from services/audioflinger/MonoPipeReader.cpp rename to media/libnbaio/MonoPipeReader.cpp index 39a07de56b..394f6acd95 100644 --- a/services/audioflinger/MonoPipeReader.cpp +++ b/media/libnbaio/MonoPipeReader.cpp @@ -19,7 +19,7 @@ #include #include -#include "MonoPipeReader.h" +#include namespace android { diff --git a/services/audioflinger/NBAIO.cpp b/media/libnbaio/NBAIO.cpp similarity index 99% rename from services/audioflinger/NBAIO.cpp rename to media/libnbaio/NBAIO.cpp index 2c07ebf9c1..00d2017628 100644 --- a/services/audioflinger/NBAIO.cpp +++ b/media/libnbaio/NBAIO.cpp @@ -18,7 +18,7 @@ //#define LOG_NDEBUG 0 #include -#include "NBAIO.h" +#include namespace android { diff --git a/services/audioflinger/Pipe.cpp b/media/libnbaio/Pipe.cpp similarity index 97% rename from services/audioflinger/Pipe.cpp rename to media/libnbaio/Pipe.cpp index e5b35610fe..1c21f9c3db 100644 --- a/services/audioflinger/Pipe.cpp +++ b/media/libnbaio/Pipe.cpp @@ -20,8 +20,8 @@ #include #include #include -#include "Pipe.h" -#include "roundup.h" +#include +#include namespace android { diff --git a/services/audioflinger/PipeReader.cpp b/media/libnbaio/PipeReader.cpp similarity index 98% rename from services/audioflinger/PipeReader.cpp rename to media/libnbaio/PipeReader.cpp index 529d478909..d786b8436d 100644 --- a/services/audioflinger/PipeReader.cpp +++ b/media/libnbaio/PipeReader.cpp @@ -19,7 +19,7 @@ #include #include -#include "PipeReader.h" +#include namespace android { diff --git a/services/audioflinger/SourceAudioBufferProvider.cpp b/media/libnbaio/SourceAudioBufferProvider.cpp similarity index 98% rename from services/audioflinger/SourceAudioBufferProvider.cpp rename to media/libnbaio/SourceAudioBufferProvider.cpp index 3343b539c6..d11a86c5b0 100644 --- a/services/audioflinger/SourceAudioBufferProvider.cpp +++ b/media/libnbaio/SourceAudioBufferProvider.cpp @@ -18,7 +18,7 @@ //#define LOG_NDEBUG 0 #include -#include "SourceAudioBufferProvider.h" +#include namespace android { diff --git a/services/audioflinger/roundup.c b/media/libnbaio/roundup.c similarity index 96% rename from services/audioflinger/roundup.c rename to media/libnbaio/roundup.c index 4f9af6aa49..1d552d1ace 100644 --- a/services/audioflinger/roundup.c +++ b/media/libnbaio/roundup.c @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "roundup.h" +#include unsigned roundup(unsigned v) { diff --git a/services/audioflinger/Android.mk b/services/audioflinger/Android.mk index c2d2790308..66759d14a8 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 7126006b7b..8acd244534 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 +#include +#include +#include +#include +#include #include "SchedulingPolicyService.h" diff --git a/services/audioflinger/AudioFlinger.h b/services/audioflinger/AudioFlinger.h index 682d61d8dc..b4aefc1611 100644 --- a/services/audioflinger/AudioFlinger.h +++ b/services/audioflinger/AudioFlinger.h @@ -45,10 +45,10 @@ #include #include -#include "AudioBufferProvider.h" -#include "ExtendedAudioBufferProvider.h" +#include +#include #include "FastMixer.h" -#include "NBAIO.h" +#include #include "AudioWatchdog.h" #include diff --git a/services/audioflinger/AudioMixer.h b/services/audioflinger/AudioMixer.h index 46deae7543..6e34cd1664 100644 --- a/services/audioflinger/AudioMixer.h +++ b/services/audioflinger/AudioMixer.h @@ -23,7 +23,7 @@ #include -#include "AudioBufferProvider.h" +#include #include "AudioResampler.h" #include diff --git a/services/audioflinger/AudioResampler.h b/services/audioflinger/AudioResampler.h index 1610e00325..dc696d864f 100644 --- a/services/audioflinger/AudioResampler.h +++ b/services/audioflinger/AudioResampler.h @@ -20,7 +20,7 @@ #include #include -#include "AudioBufferProvider.h" +#include namespace android { // ---------------------------------------------------------------------------- diff --git a/services/audioflinger/FastMixerState.h b/services/audioflinger/FastMixerState.h index bc69c9c4b4..6e53f217fc 100644 --- a/services/audioflinger/FastMixerState.h +++ b/services/audioflinger/FastMixerState.h @@ -18,8 +18,8 @@ #define ANDROID_AUDIO_FAST_MIXER_STATE_H #include -#include "ExtendedAudioBufferProvider.h" -#include "NBAIO.h" +#include +#include namespace android { -- 2.11.0