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

Commit 42448b13 authored by Andy Hung's avatar Andy Hung Committed by Automerger Merge Worker
Browse files

Merge "AudioFlinger: move fast path components to library" am: 2caed6d5 

Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/2607725



Change-Id: I04c90a7fa8be8000c03bbca39789c932157d3596
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents d6f07e76 2caed6d5

media/libaudioprocessing/Android.bp

+4 −0
Original line number Diff line number Diff line
@@ -72,6 +72,10 @@ cc_library_shared { 
    ],



    whole_static_libs: ["libaudioprocessing_base"],



    export_shared_lib_headers: [

        "libvibrator",

    ],

}



cc_library_static {

services/audioflinger/Android.bp

+1 −11
Original line number Diff line number Diff line
@@ -148,19 +148,9 @@ cc_library_shared { 
        "AudioStreamOut.cpp",

        "DeviceEffectManager.cpp",

        "Effects.cpp",

        "FastCapture.cpp",

        "FastCaptureDumpState.cpp",

        "FastCaptureState.cpp",

        "FastMixer.cpp",

        "FastMixerDumpState.cpp",

        "FastMixerState.cpp",

        "FastThread.cpp",

        "FastThreadDumpState.cpp",

        "FastThreadState.cpp",

        "PatchPanel.cpp",

        "PropertyUtils.cpp",

        "SpdifStreamOut.cpp",

        "StateQueue.cpp",

        "Threads.cpp",

        "Tracks.cpp",

    ],
@@ -176,6 +166,7 @@ cc_library_shared { 
        "av-types-aidl-cpp",

        "effect-aidl-cpp",

        "libaudioclient_aidl_conversion",

        "libaudioflinger_fastpath",

        "libaudioflinger_timing",

        "libaudioflinger_utils",

        "libaudiofoundation",
@@ -220,7 +211,6 @@ cc_library_shared { 
    ],



    cflags: [

        "-DSTATE_QUEUE_INSTANTIATIONS=\"StateQueueInstantiations.cpp\"",

        "-fvisibility=hidden",

        "-Werror",

        "-Wall",

services/audioflinger/AudioFlinger.h

+2 −2
Original line number Diff line number Diff line
@@ -91,8 +91,8 @@ 
#include <timing/SyncEvent.h>

#include <timing/SynchronizedRecordState.h>



#include "FastCapture.h"

#include "FastMixer.h"

#include <fastpath/FastCapture.h>

#include <fastpath/FastMixer.h>

#include <media/nbaio/NBAIO.h>

#include "AudioStreamOut.h"

#include "SpdifStreamOut.h"

services/audioflinger/Threads.cpp

+1 −3
Original line number Diff line number Diff line
@@ -74,8 +74,6 @@ 
#include <media/audiohal/StreamHalInterface.h>



#include "AudioFlinger.h"

#include "FastMixer.h"

#include "FastCapture.h"

#include <mediautils/SchedulingPolicyService.h>

#include <mediautils/ServiceUtilities.h>
@@ -89,7 +87,7 @@ 
#include <cpustats/ThreadCpuUsage.h>

#endif



#include "AutoPark.h"

#include <fastpath/AutoPark.h>



#include <pthread.h>

#include <afutils/TypedLogger.h>

services/audioflinger/fastpath/Android.bp

0 → 100644
+164 −0
Original line number Diff line number Diff line 


fastpath_tidy_errors = [

    // https://clang.llvm.org/extra/clang-tidy/checks/list.html

    // For many categories, the checks are too many to specify individually.

    // Feel free to disable as needed - as warnings are generally ignored,

    // we treat warnings as errors.

    "android-*",

    "bugprone-*",

    "cert-*",

    "clang-analyzer-security*",

    "google-*",

    "misc-*",

    //"modernize-*",  // explicitly list the modernize as they can be subjective.

    "modernize-avoid-bind",

    //"modernize-avoid-c-arrays", // std::array<> can be verbose

    "modernize-concat-nested-namespaces",

    //"modernize-deprecated-headers", // C headers still ok even if there is C++ equivalent.

    "modernize-deprecated-ios-base-aliases",

    "modernize-loop-convert",

    "modernize-make-shared",

    "modernize-make-unique",

    // "modernize-pass-by-value",

    "modernize-raw-string-literal",

    "modernize-redundant-void-arg",

    "modernize-replace-auto-ptr",

    "modernize-replace-random-shuffle",

    "modernize-return-braced-init-list",

    "modernize-shrink-to-fit",

    "modernize-unary-static-assert",

    // "modernize-use-auto",  // found in MediaMetricsService.h, debatable - auto can obscure type

    "modernize-use-bool-literals",

    "modernize-use-default-member-init",

    "modernize-use-emplace",

    "modernize-use-equals-default",

    "modernize-use-equals-delete",

    // "modernize-use-nodiscard",

    "modernize-use-noexcept",

    "modernize-use-nullptr",

    "modernize-use-override",

    //"modernize-use-trailing-return-type", // not necessarily more readable

    "modernize-use-transparent-functors",

    "modernize-use-uncaught-exceptions",

    "modernize-use-using",

    "performance-*",



    // Remove some pedantic stylistic requirements.

    "-google-readability-casting", // C++ casts not always necessary and may be verbose

    "-google-readability-todo",    // do not require TODO(info)



    "-bugprone-unhandled-self-assignment",

    "-bugprone-suspicious-string-compare",

    "-cert-oop54-cpp", // found in TransactionLog.h

    "-bugprone-narrowing-conversions", // b/182410845



    // TODO(b/275642749) Reenable these warnings

    "-bugprone-assignment-in-if-condition",

    "-bugprone-forward-declaration-namespace",

    "-bugprone-parent-virtual-call",

    "-cert-dcl59-cpp",

    "-cert-err34-c",

    "-google-build-namespaces",

    "-google-build-using-namespace",

    "-google-default-arguments",

    "-google-runtime-int",

    "-misc-const-correctness",

    "-misc-non-private-member-variables-in-classes",

    "-modernize-concat-nested-namespaces",

    "-modernize-loop-convert",

    "-modernize-use-default-member-init",

    "-modernize-use-equals-default",

    "-modernize-use-nullptr",

    "-modernize-use-override",

    "-modernize-use-using",

    "-performance-no-int-to-ptr",

]



// Eventually use common tidy defaults

cc_defaults {

    name: "fastpath_flags_defaults",

    // https://clang.llvm.org/docs/UsersManual.html#command-line-options

    // https://clang.llvm.org/docs/DiagnosticsReference.html

    cflags: [

        "-Wall",

        "-Wdeprecated",

        "-Werror",

        "-Werror=implicit-fallthrough",

        "-Werror=sometimes-uninitialized",

        "-Werror=conditional-uninitialized",

        "-Wextra",



        // suppress some warning chatter.

        "-Wno-deprecated-copy-with-dtor",

        "-Wno-deprecated-copy-with-user-provided-dtor",



        "-Wredundant-decls",

        "-Wshadow",

        "-Wstrict-aliasing",

        "-fstrict-aliasing",

        "-Wthread-safety",

        //"-Wthread-safety-negative", // experimental - looks broken in R.

        "-Wunreachable-code",

        "-Wunreachable-code-break",

        "-Wunreachable-code-return",

        "-Wunused",

        "-Wused-but-marked-unused",

        "-D_LIBCPP_ENABLE_THREAD_SAFETY_ANNOTATIONS",

    ],

    // https://clang.llvm.org/extra/clang-tidy/

    tidy: true,

    tidy_checks: fastpath_tidy_errors,

    tidy_checks_as_errors: fastpath_tidy_errors,

    tidy_flags: [

      "-format-style=file",

    ],

}



cc_library_shared {

    name: "libaudioflinger_fastpath",



    defaults: [

        "fastpath_flags_defaults",

    ],



    srcs: [

        "FastCapture.cpp",

        "FastCaptureDumpState.cpp",

        "FastCaptureState.cpp",

        "FastMixer.cpp",

        "FastMixerDumpState.cpp",

        "FastMixerState.cpp",

        "FastThread.cpp",

        "FastThreadDumpState.cpp",

        "FastThreadState.cpp",

        "StateQueue.cpp",

    ],



    include_dirs: [

        "frameworks/av/services/audioflinger", // for Configuration

    ],



    shared_libs: [

        "libaudioflinger_utils", // NBAIO_Tee

        "libaudioprocessing",

        "libaudioutils",

        "libcutils",

        "liblog",

        "libnbaio",

        "libnblog", // legacy NBLog that can be removed.

        "libutils",

    ],



    header_libs: [

        "libaudiohal_headers",

        "libmedia_headers",

    ],



    cflags: [

        "-DSTATE_QUEUE_INSTANTIATIONS=\"StateQueueInstantiations.cpp\"",

    ],

    sanitize: {

        integer_overflow: true,

    },



}