diff options
author | Glenn Kasten <gkasten@google.com> | 2015-01-06 10:46:38 -0800 |
---|---|---|
committer | Glenn Kasten <gkasten@google.com> | 2015-01-07 09:12:17 -0800 |
commit | 53dbe77b9f50cdd0de88b9d25dd643e90c8ba68b (patch) | |
tree | c69d11cf3119aaa816cea8a59cc0b63f52a53e69 /media/libnbaio | |
parent | 81879df8dc51df4d8a3880349e9e1e6b5e3cebfb (diff) | |
download | frameworks_av-53dbe77b9f50cdd0de88b9d25dd643e90c8ba68b.zip frameworks_av-53dbe77b9f50cdd0de88b9d25dd643e90c8ba68b.tar.gz frameworks_av-53dbe77b9f50cdd0de88b9d25dd643e90c8ba68b.tar.bz2 |
Move roundup from frameworks/av to system/media
Change-Id: I1083ab739e445e5bd3e3082fc1d3a20cc19601d5
Diffstat (limited to 'media/libnbaio')
-rw-r--r-- | media/libnbaio/Android.mk | 4 | ||||
-rw-r--r-- | media/libnbaio/MonoPipe.cpp | 2 | ||||
-rw-r--r-- | media/libnbaio/Pipe.cpp | 2 | ||||
-rw-r--r-- | media/libnbaio/roundup.c | 32 |
4 files changed, 5 insertions, 35 deletions
diff --git a/media/libnbaio/Android.mk b/media/libnbaio/Android.mk index 5d00d15..1353f28 100644 --- a/media/libnbaio/Android.mk +++ b/media/libnbaio/Android.mk @@ -11,7 +11,6 @@ LOCAL_SRC_FILES := \ MonoPipeReader.cpp \ Pipe.cpp \ PipeReader.cpp \ - roundup.c \ SourceAudioBufferProvider.cpp LOCAL_SRC_FILES += NBLog.cpp @@ -27,10 +26,13 @@ LOCAL_SRC_FILES += NBLog.cpp LOCAL_MODULE := libnbaio LOCAL_SHARED_LIBRARIES := \ + libaudioutils \ libbinder \ libcommon_time_client \ libcutils \ libutils \ liblog +LOCAL_C_INCLUDES := $(call include-path-for, audio-utils) + include $(BUILD_SHARED_LIBRARY) diff --git a/media/libnbaio/MonoPipe.cpp b/media/libnbaio/MonoPipe.cpp index 0b65861..129e9ef 100644 --- a/media/libnbaio/MonoPipe.cpp +++ b/media/libnbaio/MonoPipe.cpp @@ -27,7 +27,7 @@ #include <utils/Trace.h> #include <media/AudioBufferProvider.h> #include <media/nbaio/MonoPipe.h> -#include <media/nbaio/roundup.h> +#include <audio_utils/roundup.h> namespace android { diff --git a/media/libnbaio/Pipe.cpp b/media/libnbaio/Pipe.cpp index 6e0ec8c..13f211d 100644 --- a/media/libnbaio/Pipe.cpp +++ b/media/libnbaio/Pipe.cpp @@ -21,7 +21,7 @@ #include <cutils/compiler.h> #include <utils/Log.h> #include <media/nbaio/Pipe.h> -#include <media/nbaio/roundup.h> +#include <audio_utils/roundup.h> namespace android { diff --git a/media/libnbaio/roundup.c b/media/libnbaio/roundup.c deleted file mode 100644 index 1d552d1..0000000 --- a/media/libnbaio/roundup.c +++ /dev/null @@ -1,32 +0,0 @@ -/* - * Copyright (C) 2012 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#include <media/nbaio/roundup.h> - -unsigned roundup(unsigned v) -{ - // __builtin_clz is undefined for zero input - if (v == 0) { - v = 1; - } - int lz = __builtin_clz((int) v); - unsigned rounded = ((unsigned) 0x80000000) >> lz; - // 0x800000001 and higher are actually rounded _down_ to prevent overflow - if (v > rounded && lz > 0) { - rounded <<= 1; - } - return rounded; -} |