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 /include | |
| 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 'include')
| -rw-r--r-- | include/media/nbaio/NBLog.h | 2 | ||||
| -rw-r--r-- | include/media/nbaio/roundup.h | 31 | ||||
| -rw-r--r-- | include/private/media/AudioTrackShared.h | 2 |
3 files changed, 2 insertions, 33 deletions
diff --git a/include/media/nbaio/NBLog.h b/include/media/nbaio/NBLog.h index bcbbc04..1297b51 100644 --- a/include/media/nbaio/NBLog.h +++ b/include/media/nbaio/NBLog.h @@ -21,7 +21,7 @@ #include <binder/IMemory.h> #include <utils/Mutex.h> -#include <media/nbaio/roundup.h> +#include <audio_utils/roundup.h> namespace android { diff --git a/include/media/nbaio/roundup.h b/include/media/nbaio/roundup.h deleted file mode 100644 index 4c3cc25..0000000 --- a/include/media/nbaio/roundup.h +++ /dev/null @@ -1,31 +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. - */ - -#ifndef ROUNDUP_H -#define ROUNDUP_H - -#ifdef __cplusplus -extern "C" { -#endif - -// Round up to the next highest power of 2 -unsigned roundup(unsigned v); - -#ifdef __cplusplus -} -#endif - -#endif // ROUNDUP_H diff --git a/include/private/media/AudioTrackShared.h b/include/private/media/AudioTrackShared.h index 97448c1..0af82b5 100644 --- a/include/private/media/AudioTrackShared.h +++ b/include/private/media/AudioTrackShared.h @@ -24,7 +24,7 @@ #include <utils/threads.h> #include <utils/Log.h> #include <utils/RefBase.h> -#include <media/nbaio/roundup.h> +#include <audio_utils/roundup.h> #include <media/SingleStateQueue.h> #include <private/media/StaticAudioTrackState.h> |