gugelfrei
/
android_frameworks_av
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge "Split nblog off from nbaio"

Browse Source
gugelfrei
Glenn Kasten 7 years ago committed by Android (Google) Code Review
parent 3463e1de5b 8589ce7045
commit 158482dcc8
24 changed files with 55 additions and 26 deletions
Show Stats Download Patch File Download Diff File

1
include/media/nbaio/NBLog.h
Unescape View File

@ -1 +0,0 @@
../../../media/libnbaio/include/media/nbaio/NBLog.h

1
include/media/nbaio/PerformanceAnalysis.h
Unescape View File

@ -1 +0,0 @@
../../../media/libnbaio/include/media/nbaio/PerformanceAnalysis.h

1
include/media/nbaio/ReportPerformance.h
Unescape View File

@ -1 +0,0 @@
../../../media/libnbaio/include/media/nbaio/ReportPerformance.h

1
include/media/nblog/NBLog.h
Unescape View File

@ -0,0 +1 @@
../../../media/libnblog/include/media/nblog/NBLog.h

1
include/media/nblog/PerformanceAnalysis.h
Unescape View File

@ -0,0 +1 @@
../../../media/libnblog/include/media/nblog/PerformanceAnalysis.h

1
include/media/nblog/ReportPerformance.h
Unescape View File

@ -0,0 +1 @@
../../../media/libnblog/include/media/nblog/ReportPerformance.h

2
media/libaudioclient/include/media/AudioMixer.h
Unescape View File

@ -25,7 +25,7 @@
#include <media/AudioResampler.h> #include <media/AudioResampler.h>
#include <media/AudioResamplerPublic.h> #include <media/AudioResamplerPublic.h>
#include <media/BufferProviders.h> #include <media/BufferProviders.h>
#include <media/nbaio/NBLog.h> #include <media/nblog/NBLog.h>
#include <system/audio.h> #include <system/audio.h>
#include <utils/Compat.h> #include <utils/Compat.h>
#include <utils/threads.h> #include <utils/threads.h>

1
media/libaudioprocessing/Android.mk
Unescape View File

@ -24,6 +24,7 @@ LOCAL_SHARED_LIBRARIES := \
libcutils \ libcutils \
liblog \ liblog \
libnbaio \ libnbaio \
libnblog \
libsonic \ libsonic \
libutils \ libutils \

3
media/libnbaio/Android.bp
Unescape View File

@ -41,11 +41,8 @@ cc_library_shared {
"AudioBufferProviderSource.cpp", "AudioBufferProviderSource.cpp",
"AudioStreamInSource.cpp", "AudioStreamInSource.cpp",
"AudioStreamOutSink.cpp", "AudioStreamOutSink.cpp",
"NBLog.cpp",
"PerformanceAnalysis.cpp",
"Pipe.cpp", "Pipe.cpp",
"PipeReader.cpp", "PipeReader.cpp",
"ReportPerformance.cpp",
"SourceAudioBufferProvider.cpp", "SourceAudioBufferProvider.cpp",
], ],

28
media/libnblog/Android.bp
Unescape View File

@ -0,0 +1,28 @@
cc_library_shared {
name: "libnblog",
srcs: [
"NBLog.cpp",
"PerformanceAnalysis.cpp",
"ReportPerformance.cpp",
],
shared_libs: [
"libaudioutils",
"libbinder",
"libcutils",
"liblog",
"libutils",
],
cflags: [
"-Werror",
"-Wall",
],
include_dirs: ["system/media/audio_utils/include"],
export_include_dirs: ["include"],
}

6
media/libnbaio/NBLog.cpp → media/libnblog/NBLog.cpp
Unescape View File

@ -34,9 +34,9 @@
#include <time.h> #include <time.h>
#include <new> #include <new>
#include <audio_utils/roundup.h> #include <audio_utils/roundup.h>
#include <media/nbaio/NBLog.h> #include <media/nblog/NBLog.h>
#include <media/nbaio/PerformanceAnalysis.h> #include <media/nblog/PerformanceAnalysis.h>
#include <media/nbaio/ReportPerformance.h> #include <media/nblog/ReportPerformance.h>
#include <utils/CallStack.h> #include <utils/CallStack.h>
#include <utils/Log.h> #include <utils/Log.h>
#include <utils/String8.h> #include <utils/String8.h>

6
media/libnbaio/PerformanceAnalysis.cpp → media/libnblog/PerformanceAnalysis.cpp
Unescape View File

@ -33,9 +33,9 @@
#include <time.h> #include <time.h>
#include <new> #include <new>
#include <audio_utils/roundup.h> #include <audio_utils/roundup.h>
#include <media/nbaio/NBLog.h> #include <media/nblog/NBLog.h>
#include <media/nbaio/PerformanceAnalysis.h> #include <media/nblog/PerformanceAnalysis.h>
#include <media/nbaio/ReportPerformance.h> #include <media/nblog/ReportPerformance.h>
#include <utils/Log.h> #include <utils/Log.h>
#include <utils/String8.h> #include <utils/String8.h>

6
media/libnbaio/ReportPerformance.cpp → media/libnblog/ReportPerformance.cpp
Unescape View File

@ -27,9 +27,9 @@
#include <sys/prctl.h> #include <sys/prctl.h>
#include <sys/time.h> #include <sys/time.h>
#include <utility> #include <utility>
#include <media/nbaio/NBLog.h> #include <media/nblog/NBLog.h>
#include <media/nbaio/PerformanceAnalysis.h> #include <media/nblog/PerformanceAnalysis.h>
#include <media/nbaio/ReportPerformance.h> #include <media/nblog/ReportPerformance.h>
#include <utils/Log.h> #include <utils/Log.h>
#include <utils/String8.h> #include <utils/String8.h>

4
media/libnbaio/include/media/nbaio/NBLog.h → media/libnblog/include/media/nblog/NBLog.h
Unescape View File

@ -26,8 +26,8 @@
#include <audio_utils/fifo.h> #include <audio_utils/fifo.h>
#include <binder/IMemory.h> #include <binder/IMemory.h>
#include <media/nbaio/PerformanceAnalysis.h> #include <media/nblog/PerformanceAnalysis.h>
#include <media/nbaio/ReportPerformance.h> #include <media/nblog/ReportPerformance.h>
#include <utils/Mutex.h> #include <utils/Mutex.h>
#include <utils/threads.h> #include <utils/threads.h>

2
media/libnbaio/include/media/nbaio/PerformanceAnalysis.h → media/libnblog/include/media/nblog/PerformanceAnalysis.h
Unescape View File

@ -21,7 +21,7 @@
#include <map> #include <map>
#include <vector> #include <vector>
#include <media/nbaio/ReportPerformance.h> #include <media/nblog/ReportPerformance.h>
namespace android { namespace android {

0
media/libnbaio/include/media/nbaio/ReportPerformance.h → media/libnblog/include/media/nblog/ReportPerformance.h
Unescape View File

1
services/audioflinger/Android.mk
Unescape View File

@ -51,6 +51,7 @@ LOCAL_SHARED_LIBRARIES := \
libmedialogservice \ libmedialogservice \
libmediautils \ libmediautils \
libnbaio \ libnbaio \
libnblog \
libpowermanager \ libpowermanager \
libserviceutility \ libserviceutility \
libmediautils \ libmediautils \

2
services/audioflinger/AudioFlinger.h
Unescape View File

@ -71,7 +71,7 @@
#include <powermanager/IPowerManager.h> #include <powermanager/IPowerManager.h>
#include <media/nbaio/NBLog.h> #include <media/nblog/NBLog.h>
#include <private/media/AudioEffectShared.h> #include <private/media/AudioEffectShared.h>
#include <private/media/AudioTrackShared.h> #include <private/media/AudioTrackShared.h>

2
services/audioflinger/FastMixerState.h
Unescape View File

@ -21,7 +21,7 @@
#include <system/audio.h> #include <system/audio.h>
#include <media/ExtendedAudioBufferProvider.h> #include <media/ExtendedAudioBufferProvider.h>
#include <media/nbaio/NBAIO.h> #include <media/nbaio/NBAIO.h>
#include <media/nbaio/NBLog.h> #include <media/nblog/NBLog.h>
#include "FastThreadState.h" #include "FastThreadState.h"
namespace android { namespace android {

2
services/audioflinger/FastThreadState.h
Unescape View File

@ -19,7 +19,7 @@
#include "Configuration.h" #include "Configuration.h"
#include <stdint.h> #include <stdint.h>
#include <media/nbaio/NBLog.h> #include <media/nblog/NBLog.h>
namespace android { namespace android {

4
services/audioflinger/TypedLogger.h
Unescape View File

@ -18,7 +18,9 @@
#ifndef ANDROID_TYPED_LOGGER_H #ifndef ANDROID_TYPED_LOGGER_H
#define ANDROID_TYPED_LOGGER_H #define ANDROID_TYPED_LOGGER_H
#include <media/nbaio/NBLog.h> // This is the client API for the typed logger.
#include <media/nblog/NBLog.h>
#include <algorithm> #include <algorithm>
/* /*

2
services/medialog/Android.mk
Unescape View File

@ -4,7 +4,7 @@ include $(CLEAR_VARS)
LOCAL_SRC_FILES := MediaLogService.cpp IMediaLogService.cpp LOCAL_SRC_FILES := MediaLogService.cpp IMediaLogService.cpp
LOCAL_SHARED_LIBRARIES := libbinder libutils liblog libnbaio libaudioutils LOCAL_SHARED_LIBRARIES := libbinder libutils liblog libnbaio libnblog libaudioutils
LOCAL_MULTILIB := $(AUDIOSERVER_MULTILIB) LOCAL_MULTILIB := $(AUDIOSERVER_MULTILIB)

2
services/medialog/MediaLogService.cpp
Unescape View File

@ -20,7 +20,7 @@
#include <sys/mman.h> #include <sys/mman.h>
#include <utils/Log.h> #include <utils/Log.h>
#include <binder/PermissionCache.h> #include <binder/PermissionCache.h>
#include <media/nbaio/NBLog.h> #include <media/nblog/NBLog.h>
#include <private/android_filesystem_config.h> #include <private/android_filesystem_config.h>
#include "MediaLogService.h" #include "MediaLogService.h"

2
services/medialog/MediaLogService.h
Unescape View File

@ -19,7 +19,7 @@
#include <binder/BinderService.h> #include <binder/BinderService.h>
#include <media/IMediaLogService.h> #include <media/IMediaLogService.h>
#include <media/nbaio/NBLog.h> #include <media/nblog/NBLog.h>
namespace android { namespace android {

Write Preview
Loading…
Cancel
Save