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

Commit 94494601 authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Snap for 11464157 from a8b7ec8e to 24Q2-release

Change-Id: I6cb7049b5e7cb40b5648dd9dab2f6751bbe6c224
parents c1539dbc a8b7ec8e
Loading
Loading
Loading
Loading
+31 −3
Original line number Diff line number Diff line
@@ -29,20 +29,48 @@ flag {
flag {
  name: "in_process_sw_audio_codec"
  namespace: "codec_fwk"
  description: "Feature flag for in-process software audio codec support"
  description: "Feature flag for in-process software audio codec API"
  bug: "297922713"
}

flag {
  name: "in_process_sw_audio_codec_support"
  namespace: "codec_fwk"
  description: "Feature flag for in-process software audio codec support"
  bug: "325520135"
}

flag {
  name: "large_audio_frame_finish"
  namespace: "codec_fwk"
  description: "Implementation flag for large audio frame finishing tasks"
  bug: "325512893"
}

flag {
  name: "null_output_surface"
  namespace: "codec_fwk"
  description: "Feature flag for null output Surface support"
  description: "Feature flag for null output Surface API"
  bug: "297920102"
}

flag {
  name: "null_output_surface_support"
  namespace: "codec_fwk"
  description: "Feature flag for null output Surface support"
  bug: "325550522"
}

flag {
  name: "region_of_interest"
  namespace: "codec_fwk"
  description: "Feature flag for region of interest support"
  description: "Feature flag for region of interest API"
  bug: "299191092"
}

flag {
  name: "region_of_interest_support"
  namespace: "codec_fwk"
  description: "Feature flag for region of interest support"
  bug: "325549730"
}
+5 −5
Original line number Diff line number Diff line
@@ -134,11 +134,11 @@ cc_aconfig_library {
    defaults: ["audio-aconfig-cc-defaults"],
}

filegroup {
aconfig_declarations_group {
    name: "audio-framework-aconfig",
    srcs: [
        ":android.media.audio-aconfig-java{.generated_srcjars}",
        ":android.media.audiopolicy-aconfig-java{.generated_srcjars}",
        ":android.media.midi-aconfig-java{.generated_srcjars}",
    java_aconfig_libraries: [
        "android.media.audio-aconfig-java",
        "android.media.audiopolicy-aconfig-java",
        "android.media.midi-aconfig-java",
    ],
}
+7 −8
Original line number Diff line number Diff line
@@ -134,6 +134,10 @@ cc_defaults {
        "libaudiopolicy",
    ],
    data: ["bbb*.raw"],
    srcs: [
        "audio_test_utils.cpp",
        "test_execution_tracer.cpp",
    ],
    test_config_template: "audio_test_template.xml",
}

@@ -142,7 +146,6 @@ cc_test {
    defaults: ["libaudioclient_gtests_defaults"],
    srcs: [
        "audiorecord_tests.cpp",
        "audio_test_utils.cpp",
    ],
}

@@ -151,7 +154,6 @@ cc_test {
    defaults: ["libaudioclient_gtests_defaults"],
    srcs: [
        "audiotrack_tests.cpp",
        "audio_test_utils.cpp",
    ],
}

@@ -160,7 +162,6 @@ cc_test {
    defaults: ["libaudioclient_gtests_defaults"],
    srcs: [
        "audioeffect_tests.cpp",
        "audio_test_utils.cpp",
    ],
}

@@ -173,7 +174,6 @@ cc_test {
    ],
    srcs: [
        "audioeffect_analyser.cpp",
        "audio_test_utils.cpp",
    ],
    static_libs: [
        "libpffft",
@@ -185,7 +185,6 @@ cc_test {
    defaults: ["libaudioclient_gtests_defaults"],
    srcs: [
        "audiorouting_tests.cpp",
        "audio_test_utils.cpp",
    ],
}

@@ -194,14 +193,15 @@ cc_test {
    defaults: ["libaudioclient_gtests_defaults"],
    srcs: [
        "audioclient_serialization_tests.cpp",
        "audio_test_utils.cpp",
    ],
}

cc_test {
    name: "trackplayerbase_tests",
    defaults: ["libaudioclient_gtests_defaults"],
    srcs: ["trackplayerbase_tests.cpp"],
    srcs: [
        "trackplayerbase_tests.cpp",
    ],
}

cc_test {
@@ -209,6 +209,5 @@ cc_test {
    defaults: ["libaudioclient_gtests_defaults"],
    srcs: [
        "audiosystem_tests.cpp",
        "audio_test_utils.cpp",
    ],
}
+15 −4
Original line number Diff line number Diff line
@@ -15,18 +15,23 @@
 */

//#define LOG_NDEBUG 0
#define LOG_TAG "AudioClientSerializationUnitTests"
#define LOG_TAG "AudioClientSerializationTests"

#include <cstdint>
#include <cstdlib>
#include <ctime>

#include <gtest/gtest.h>
#include <vector>

#include <android_audio_policy_configuration_V7_0-enums.h>
#include <gtest/gtest.h>
#include <media/AudioPolicy.h>
#include <media/AudioProductStrategy.h>
#include <media/AudioVolumeGroup.h>
#include <media/VolumeGroupAttributes.h>
#include <system/audio.h>
#include <xsdc/XsdcSupport.h>

#include "audio_test_utils.h"
#include "test_execution_tracer.h"

using namespace android;
namespace xsd {
@@ -310,3 +315,9 @@ TEST_P(AudioAttributesParameterizedTest, AudioAttributesBinderization) {
// audioStream
INSTANTIATE_TEST_SUITE_P(SerializationParameterizedTests, AudioAttributesParameterizedTest,
                         ::testing::Combine(testing::ValuesIn(kStreamtypes)));

int main(int argc, char** argv) {
    ::testing::InitGoogleTest(&argc, argv);
    ::testing::UnitTest::GetInstance()->listeners().Append(new TestExecutionTracer());
    return RUN_ALL_TESTS();
}
+15 −5
Original line number Diff line number Diff line
@@ -14,23 +14,26 @@
 * limitations under the License.
 */

#include <fstream>
#include <iostream>
#include <string>
#include <tuple>
#include <vector>

// #define LOG_NDEBUG 0
#define LOG_TAG "AudioEffectAnalyser"

#include <android-base/file.h>
#include <android-base/stringprintf.h>
#include <binder/ProcessState.h>
#include <gtest/gtest.h>
#include <media/AudioEffect.h>
#include <system/audio_effects/effect_bassboost.h>
#include <system/audio_effects/effect_equalizer.h>
#include <fstream>
#include <iostream>
#include <string>
#include <tuple>
#include <vector>

#include "audio_test_utils.h"
#include "pffft.hpp"
#include "test_execution_tracer.h"

#define CHECK_OK(expr, msg) \
    mStatus = (expr);       \
@@ -417,3 +420,10 @@ TEST(AudioEffectTest, CheckBassBoostEffect) {
        prevGain = diffB;
    }
}

int main(int argc, char** argv) {
    android::ProcessState::self()->startThreadPool();
    ::testing::InitGoogleTest(&argc, argv);
    ::testing::UnitTest::GetInstance()->listeners().Append(new TestExecutionTracer());
    return RUN_ALL_TESTS();
}
Loading