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

Commit 2d2f17cc authored by dimitry's avatar dimitry
Browse files

Split libaaudio.so to internal and NDK part 

This change moves almost everything from libaadio.so to
separate libaaudio_internal.so library. This is done to
avoid exporting symbols which apps are not allowed to use
but have them available for platform libraries by exporting
them from libaaudio_internal.so

Bug: http://b/69603741
Test: make
Change-Id: If93118ed2c266faf2964abf21e17b0b13df493d2
parent ed84e713

media/libaaudio/src/Android.bp

+57 −21
Original line number Diff line number Diff line
@@ -10,14 +10,70 @@ cc_library { 
        "legacy",

        "utility",

    ],

    header_libs: ["libaaudio_headers"],

    export_header_lib_headers: ["libaaudio_headers"],



    srcs: [

        "core/AAudioAudio.cpp",

    ],



    cflags: [

        "-Wno-unused-parameter",

        "-Wall",

        "-Werror",



        // By default, all symbols are hidden.

        // "-fvisibility=hidden",

        // AAUDIO_API is used to explicitly export a function or a variable as a visible symbol.

        "-DAAUDIO_API=__attribute__((visibility(\"default\")))",

    ],



    shared_libs: [

        "libaaudio_internal",

        "libaudioclient",

        "libaudioutils",

        "liblog",

        "libcutils",

        "libutils",

        "libbinder",

    ],

}



cc_library {

    name: "libaaudio_internal",



    local_include_dirs: [

        "binding",

        "client",

        "core",

        "fifo",

        "legacy",

        "utility",

    ],



    export_include_dirs: ["."],

    header_libs: ["libaaudio_headers"],

    export_header_lib_headers: ["libaaudio_headers"],



    shared_libs: [

        "libaudioclient",

        "libaudioutils",

        "liblog",

        "libcutils",

        "libutils",

        "libbinder",

    ],



    cflags: [

        "-Wno-unused-parameter",

        "-Wall",

        "-Werror",

    ],



    srcs: [

        "core/AudioGlobal.cpp",

        "core/AudioStream.cpp",

        "core/AudioStreamBuilder.cpp",

        "core/AAudioAudio.cpp",

        "core/AAudioStreamParameters.cpp",

        "legacy/AudioStreamLegacy.cpp",

        "legacy/AudioStreamRecord.cpp",
@@ -54,24 +110,4 @@ cc_library { 
        "flowgraph/SourceI16.cpp",

        "flowgraph/SourceI24.cpp",

    ],



    cflags: [

        "-Wno-unused-parameter",

        "-Wall",

        "-Werror",



        // By default, all symbols are hidden.

        // "-fvisibility=hidden",

        // AAUDIO_API is used to explicitly export a function or a variable as a visible symbol.

        "-DAAUDIO_API=__attribute__((visibility(\"default\")))",

    ],



    shared_libs: [

        "libaudioclient",

        "libaudioutils",

        "liblog",

        "libcutils",

        "libutils",

        "libbinder",

    ],

}

media/libaaudio/src/core/AAudioAudio.cpp

+5 −65
Original line number Diff line number Diff line
@@ -27,6 +27,7 @@ 
#include <aaudio/AAudioTesting.h>



#include "AudioClock.h"

#include "AudioGlobal.h"

#include "AudioStreamBuilder.h"

#include "AudioStream.h"

#include "binding/AAudioCommon.h"
@@ -45,62 +46,13 @@ using namespace aaudio; 
        return AAUDIO_ERROR_NULL; \

    }



#define AAUDIO_CASE_ENUM(name) case name: return #name



AAUDIO_API const char * AAudio_convertResultToText(aaudio_result_t returnCode) {

    switch (returnCode) {

        AAUDIO_CASE_ENUM(AAUDIO_OK);

        AAUDIO_CASE_ENUM(AAUDIO_ERROR_DISCONNECTED);

        AAUDIO_CASE_ENUM(AAUDIO_ERROR_ILLEGAL_ARGUMENT);

        // reserved

        AAUDIO_CASE_ENUM(AAUDIO_ERROR_INTERNAL);

        AAUDIO_CASE_ENUM(AAUDIO_ERROR_INVALID_STATE);

        // reserved

        // reserved

        AAUDIO_CASE_ENUM(AAUDIO_ERROR_INVALID_HANDLE);

         // reserved

        AAUDIO_CASE_ENUM(AAUDIO_ERROR_UNIMPLEMENTED);

        AAUDIO_CASE_ENUM(AAUDIO_ERROR_UNAVAILABLE);

        AAUDIO_CASE_ENUM(AAUDIO_ERROR_NO_FREE_HANDLES);

        AAUDIO_CASE_ENUM(AAUDIO_ERROR_NO_MEMORY);

        AAUDIO_CASE_ENUM(AAUDIO_ERROR_NULL);

        AAUDIO_CASE_ENUM(AAUDIO_ERROR_TIMEOUT);

        AAUDIO_CASE_ENUM(AAUDIO_ERROR_WOULD_BLOCK);

        AAUDIO_CASE_ENUM(AAUDIO_ERROR_INVALID_FORMAT);

        AAUDIO_CASE_ENUM(AAUDIO_ERROR_OUT_OF_RANGE);

        AAUDIO_CASE_ENUM(AAUDIO_ERROR_NO_SERVICE);

        AAUDIO_CASE_ENUM(AAUDIO_ERROR_INVALID_RATE);

    }

    return "Unrecognized AAudio error.";

    return AudioGlobal_convertResultToText(returnCode);

}



AAUDIO_API const char * AAudio_convertStreamStateToText(aaudio_stream_state_t state) {

    switch (state) {

        AAUDIO_CASE_ENUM(AAUDIO_STREAM_STATE_UNINITIALIZED);

        AAUDIO_CASE_ENUM(AAUDIO_STREAM_STATE_UNKNOWN);

        AAUDIO_CASE_ENUM(AAUDIO_STREAM_STATE_OPEN);

        AAUDIO_CASE_ENUM(AAUDIO_STREAM_STATE_STARTING);

        AAUDIO_CASE_ENUM(AAUDIO_STREAM_STATE_STARTED);

        AAUDIO_CASE_ENUM(AAUDIO_STREAM_STATE_PAUSING);

        AAUDIO_CASE_ENUM(AAUDIO_STREAM_STATE_PAUSED);

        AAUDIO_CASE_ENUM(AAUDIO_STREAM_STATE_FLUSHING);

        AAUDIO_CASE_ENUM(AAUDIO_STREAM_STATE_FLUSHED);

        AAUDIO_CASE_ENUM(AAUDIO_STREAM_STATE_STOPPING);

        AAUDIO_CASE_ENUM(AAUDIO_STREAM_STATE_STOPPED);

        AAUDIO_CASE_ENUM(AAUDIO_STREAM_STATE_DISCONNECTED);

        AAUDIO_CASE_ENUM(AAUDIO_STREAM_STATE_CLOSING);

        AAUDIO_CASE_ENUM(AAUDIO_STREAM_STATE_CLOSED);

    }

    return "Unrecognized AAudio state.";

}



#undef AAUDIO_CASE_ENUM





/******************************************

 * Static globals.

 */

static aaudio_policy_t s_MMapPolicy = AAUDIO_UNSPECIFIED;

    return AudioGlobal_convertStreamStateToText(state);

}



static AudioStream *convertAAudioStreamToAudioStream(AAudioStream* stream)

{
@@ -543,23 +495,11 @@ AAUDIO_API aaudio_result_t AAudioStream_getTimestamp(AAudioStream* stream, 
}



AAUDIO_API aaudio_policy_t AAudio_getMMapPolicy() {

    return s_MMapPolicy;

    return AudioGlobal_getMMapPolicy();

}



AAUDIO_API aaudio_result_t AAudio_setMMapPolicy(aaudio_policy_t policy) {

    aaudio_result_t result = AAUDIO_OK;

    switch(policy) {

        case AAUDIO_UNSPECIFIED:

        case AAUDIO_POLICY_NEVER:

        case AAUDIO_POLICY_AUTO:

        case AAUDIO_POLICY_ALWAYS:

            s_MMapPolicy = policy;

            break;

        default:

            result = AAUDIO_ERROR_ILLEGAL_ARGUMENT;

            break;

    }

    return result;

    return AudioGlobal_setMMapPolicy(policy);

}



AAUDIO_API bool AAudioStream_isMMapUsed(AAudioStream* stream)

media/libaaudio/src/core/AudioGlobal.cpp

0 → 100644
+99 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2019 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 <aaudio/AAudio.h>

#include <aaudio/AAudioTesting.h>



#include "AudioGlobal.h"



/******************************************

 * Static globals.

 */

namespace aaudio {



static aaudio_policy_t g_MMapPolicy = AAUDIO_UNSPECIFIED;



aaudio_policy_t AudioGlobal_getMMapPolicy() {

  return g_MMapPolicy;

}



aaudio_result_t AudioGlobal_setMMapPolicy(aaudio_policy_t policy) {

    aaudio_result_t result = AAUDIO_OK;

    switch(policy) {

        case AAUDIO_UNSPECIFIED:

        case AAUDIO_POLICY_NEVER:

        case AAUDIO_POLICY_AUTO:

        case AAUDIO_POLICY_ALWAYS:

            g_MMapPolicy = policy;

            break;

        default:

            result = AAUDIO_ERROR_ILLEGAL_ARGUMENT;

            break;

    }

    return result;

}



#define AAUDIO_CASE_ENUM(name) case name: return #name



const char* AudioGlobal_convertResultToText(aaudio_result_t returnCode) {

    switch (returnCode) {

        AAUDIO_CASE_ENUM(AAUDIO_OK);

        AAUDIO_CASE_ENUM(AAUDIO_ERROR_DISCONNECTED);

        AAUDIO_CASE_ENUM(AAUDIO_ERROR_ILLEGAL_ARGUMENT);

        // reserved

        AAUDIO_CASE_ENUM(AAUDIO_ERROR_INTERNAL);

        AAUDIO_CASE_ENUM(AAUDIO_ERROR_INVALID_STATE);

        // reserved

        // reserved

        AAUDIO_CASE_ENUM(AAUDIO_ERROR_INVALID_HANDLE);

         // reserved

        AAUDIO_CASE_ENUM(AAUDIO_ERROR_UNIMPLEMENTED);

        AAUDIO_CASE_ENUM(AAUDIO_ERROR_UNAVAILABLE);

        AAUDIO_CASE_ENUM(AAUDIO_ERROR_NO_FREE_HANDLES);

        AAUDIO_CASE_ENUM(AAUDIO_ERROR_NO_MEMORY);

        AAUDIO_CASE_ENUM(AAUDIO_ERROR_NULL);

        AAUDIO_CASE_ENUM(AAUDIO_ERROR_TIMEOUT);

        AAUDIO_CASE_ENUM(AAUDIO_ERROR_WOULD_BLOCK);

        AAUDIO_CASE_ENUM(AAUDIO_ERROR_INVALID_FORMAT);

        AAUDIO_CASE_ENUM(AAUDIO_ERROR_OUT_OF_RANGE);

        AAUDIO_CASE_ENUM(AAUDIO_ERROR_NO_SERVICE);

        AAUDIO_CASE_ENUM(AAUDIO_ERROR_INVALID_RATE);

    }

    return "Unrecognized AAudio error.";

}



const char* AudioGlobal_convertStreamStateToText(aaudio_stream_state_t state) {

      switch (state) {

        AAUDIO_CASE_ENUM(AAUDIO_STREAM_STATE_UNINITIALIZED);

        AAUDIO_CASE_ENUM(AAUDIO_STREAM_STATE_UNKNOWN);

        AAUDIO_CASE_ENUM(AAUDIO_STREAM_STATE_OPEN);

        AAUDIO_CASE_ENUM(AAUDIO_STREAM_STATE_STARTING);

        AAUDIO_CASE_ENUM(AAUDIO_STREAM_STATE_STARTED);

        AAUDIO_CASE_ENUM(AAUDIO_STREAM_STATE_PAUSING);

        AAUDIO_CASE_ENUM(AAUDIO_STREAM_STATE_PAUSED);

        AAUDIO_CASE_ENUM(AAUDIO_STREAM_STATE_FLUSHING);

        AAUDIO_CASE_ENUM(AAUDIO_STREAM_STATE_FLUSHED);

        AAUDIO_CASE_ENUM(AAUDIO_STREAM_STATE_STOPPING);

        AAUDIO_CASE_ENUM(AAUDIO_STREAM_STATE_STOPPED);

        AAUDIO_CASE_ENUM(AAUDIO_STREAM_STATE_DISCONNECTED);

        AAUDIO_CASE_ENUM(AAUDIO_STREAM_STATE_CLOSING);

        AAUDIO_CASE_ENUM(AAUDIO_STREAM_STATE_CLOSED);

    }

    return "Unrecognized AAudio state.";

}



#undef AAUDIO_CASE_ENUM



}  // namespace aaudio

media/libaaudio/src/core/AudioGlobal.h

0 → 100644
+34 −0
Original line number Diff line number Diff line 
/*

 * Copyright 2019 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 AAUDIO_AUDIOGLOBAL_H

#define AAUDIO_AUDIOGLOBAL_H



#include <aaudio/AAudio.h>

#include <aaudio/AAudioTesting.h>





namespace aaudio {



aaudio_policy_t AudioGlobal_getMMapPolicy();

aaudio_result_t AudioGlobal_setMMapPolicy(aaudio_policy_t policy);



const char* AudioGlobal_convertResultToText(aaudio_result_t returnCode);

const char* AudioGlobal_convertStreamStateToText(aaudio_stream_state_t state);



}



#endif  // AAUDIO_AUDIOGLOBAL_H

media/libaaudio/src/core/AudioStream.cpp

+7 −4
Original line number Diff line number Diff line
@@ -25,8 +25,9 @@ 
#include "AudioStreamBuilder.h"

#include "AudioStream.h"

#include "AudioClock.h"

#include "AudioGlobal.h"



using namespace aaudio;

namespace aaudio {





// Sequential number assigned to streams solely for debugging purposes.
@@ -51,7 +52,7 @@ AudioStream::~AudioStream() { 
                          || getState() == AAUDIO_STREAM_STATE_UNINITIALIZED

                          || getState() == AAUDIO_STREAM_STATE_DISCONNECTED),

                        "~AudioStream() - still in use, state = %s",

                        AAudio_convertStreamStateToText(getState()));

                        AudioGlobal_convertStreamStateToText(getState()));



    mPlayerBase->clearParentReference(); // remove reference to this AudioStream

}
@@ -155,7 +156,7 @@ aaudio_result_t AudioStream::systemPause() { 
        case AAUDIO_STREAM_STATE_CLOSED:

        default:

            ALOGW("safePause() stream not running, state = %s",

                  AAudio_convertStreamStateToText(getState()));

                  AudioGlobal_convertStreamStateToText(getState()));

            return AAUDIO_ERROR_INVALID_STATE;

    }
@@ -240,7 +241,7 @@ aaudio_result_t AudioStream::safeStop() { 
        case AAUDIO_STREAM_STATE_CLOSED:

        default:

            ALOGW("%s() stream not running, state = %s", __func__,

                  AAudio_convertStreamStateToText(getState()));

                  AudioGlobal_convertStreamStateToText(getState()));

            return AAUDIO_ERROR_INVALID_STATE;

    }
@@ -488,3 +489,5 @@ void AudioStream::MyPlayerBase::unregisterWithAudioManager() { 
void AudioStream::MyPlayerBase::destroy() {

    unregisterWithAudioManager();

}



}  // namespace aaudio