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

Commit 96eea114 authored by android-build-team Robot's avatar android-build-team Robot
Browse files

Snap for 7142207 from 3fbf0f29 to sc-release 

Change-Id: I3abc3ef7e00d27c68669d81da004e752cae5d6e5
parents d0e31a47 3fbf0f29

media/libaudioclient/fuzzer/Android.bp

+9 −9
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ cc_fuzz { 
    ],

    static_libs: [

        "android.hardware.audio.common@7.0-enums",

        "effect-aidl-unstable-cpp",

        "effect-aidl-cpp",

        "libaudioclient",

        "libbase",

        "libcgrouprc",
@@ -33,16 +33,16 @@ cc_fuzz { 
        "libmediametricsservice",

        "libmedia_helper",

        "libprocessgroup",

        "shared-file-region-aidl-unstable-cpp",

        "shared-file-region-aidl-cpp",

    ],

    shared_libs: [

        "android.hardware.audio.common-util",

        "audioclient-types-aidl-unstable-cpp",

        "audioflinger-aidl-unstable-cpp",

        "audiopolicy-aidl-unstable-cpp",

        "audiopolicy-types-aidl-unstable-cpp",

        "av-types-aidl-unstable-cpp",

        "capture_state_listener-aidl-unstable-cpp",

        "audioclient-types-aidl-cpp",

        "audioflinger-aidl-cpp",

        "audiopolicy-aidl-cpp",

        "audiopolicy-types-aidl-cpp",

        "av-types-aidl-cpp",

        "capture_state_listener-aidl-cpp",

        "libaudioclient_aidl_conversion",

        "libaudioflinger",

        "libaudiofoundation",
@@ -55,7 +55,7 @@ cc_fuzz { 
        "libnblog",

        "libutils",

        "libxml2",

        "mediametricsservice-aidl-unstable-cpp",

        "mediametricsservice-aidl-cpp",

    ],

    header_libs: [

        "libaudiofoundation_headers",

media/libeffects/preprocessing/tests/correlation.cpp

+10 −3
Original line number Diff line number Diff line
@@ -107,12 +107,19 @@ int main(int argc, const char* argv[]) { 
        return EXIT_FAILURE;

    }



    int numFrames = fileSize1 / sizeof(int16_t);

    size_t numFrames = fileSize1 / sizeof(int16_t);

    std::unique_ptr<int16_t[]> inBuffer1(new int16_t[numFrames]());

    std::unique_ptr<int16_t[]> inBuffer2(new int16_t[numFrames]());



    fread(inBuffer1.get(), sizeof(int16_t), numFrames, fInput1.get());

    fread(inBuffer2.get(), sizeof(int16_t), numFrames, fInput2.get());

    if (numFrames != fread(inBuffer1.get(), sizeof(int16_t), numFrames, fInput1.get())) {

        printf("\nError: Unable to read %zu samples from file %s\n", numFrames, argv[1]);

        return EXIT_FAILURE;

    }



    if (numFrames != fread(inBuffer2.get(), sizeof(int16_t), numFrames, fInput2.get())) {

        printf("\nError: Unable to read %zu samples from file %s\n", numFrames, argv[2]);

        return EXIT_FAILURE;

    }



    auto pairAutoCorr1 = correlation(inBuffer1.get(), inBuffer1.get(), numFrames, enableCrossCorr);

    auto pairAutoCorr2 = correlation(inBuffer2.get(), inBuffer2.get(), numFrames, enableCrossCorr);

media/libmediametrics/Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ cc_library { 
        "libcutils",

        "liblog",

        "libutils",

        "mediametricsservice-aidl-unstable-cpp",

        "mediametricsservice-aidl-cpp",

    ],



    export_include_dirs: ["include"],

services/mediametrics/Android.bp

+2 −2
Original line number Diff line number Diff line
@@ -100,7 +100,7 @@ cc_binary { 
        "libmediametricsservice",

        "libmediautils",

        "libutils",

        "mediametricsservice-aidl-unstable-cpp",

        "mediametricsservice-aidl-cpp",

    ],

    header_libs: [

        "libaudioutils_headers",
@@ -143,7 +143,7 @@ cc_library { 
    },



    shared_libs: [

        "mediametricsservice-aidl-unstable-cpp",

        "mediametricsservice-aidl-cpp",

        "libbase", // android logging

        "libbinder",

        "libcutils",

services/mediametrics/fuzzer/Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -43,7 +43,7 @@ cc_fuzz { 
        "libstagefright",

        "libstatslog",

        "libutils",

        "mediametricsservice-aidl-unstable-cpp",

        "mediametricsservice-aidl-cpp",

    ],



    include_dirs: [