Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 53dbe77b authored by Glenn Kasten's avatar Glenn Kasten
Browse files

Move roundup from frameworks/av to system/media 

Change-Id: I1083ab739e445e5bd3e3082fc1d3a20cc19601d5
parent 81879df8

include/media/nbaio/NBLog.h

+1 −1
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ 


#include <binder/IMemory.h>

#include <utils/Mutex.h>

#include <media/nbaio/roundup.h>

#include <audio_utils/roundup.h>



namespace android {

include/media/nbaio/roundup.h

deleted100644 → 0
+0 −31
Original line number Diff line number Diff line 
/*

 * 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

include/private/media/AudioTrackShared.h

+1 −1
Original line number Diff line number Diff line
@@ -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>

media/libmedia/Android.mk

+0 −2
Original line number Diff line number Diff line
@@ -63,8 +63,6 @@ LOCAL_SRC_FILES:= \ 
    StringArray.cpp \

    AudioPolicy.cpp



LOCAL_SRC_FILES += ../libnbaio/roundup.c



LOCAL_SHARED_LIBRARIES := \

	libui liblog libcutils libutils libbinder libsonivox libicuuc libicui18n libexpat \

        libcamera_client libstagefright_foundation \

media/libnbaio/Android.mk

+3 −1
Original line number Diff line number Diff line
@@ -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)