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

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

Snap for 12609205 from c193a690 to 25Q1-release

Change-Id: I3b87db345b89dddd82643aa37f64b42f9af38ff9
parents 7a961cd9 c193a690
Loading
Loading
Loading
Loading
+7 −0
Original line number Diff line number Diff line
@@ -34,6 +34,13 @@ flag {
    bug: "338089555"
}

flag {
    name: "audio_eraser_effect"
    namespace: "media_audio"
    description: "Enable audio eraser effect"
    bug: "367667349"
}

flag {
    name: "bluetooth_mac_address_anonymization"
    namespace: "media_audio"
+17 −0
Original line number Diff line number Diff line
@@ -2352,6 +2352,15 @@ aidl2legacy_AudioPortDeviceExt_audio_port_config_device_ext(const AudioPortDevic
    audio_port_config_device_ext legacy{};
    RETURN_IF_ERROR(aidl2legacy_AudioDevice_audio_device(
                    aidl.device, &legacy.type, legacy.address));
    const bool isInput = false;  // speaker_layout_channel_mask only represents output.
    if (aidl.speakerLayout.has_value()) {
        legacy.speaker_layout_channel_mask =
                VALUE_OR_RETURN(aidl2legacy_AudioChannelLayout_audio_channel_mask_t(
                        aidl.speakerLayout.value(), isInput));
    } else {
        // Default to none when the field is null in the AIDL.
        legacy.speaker_layout_channel_mask = AUDIO_CHANNEL_NONE;
    }
    return legacy;
}

@@ -2360,6 +2369,14 @@ ConversionResult<AudioPortDeviceExt> legacy2aidl_audio_port_config_device_ext_Au
    AudioPortDeviceExt aidl;
    aidl.device = VALUE_OR_RETURN(
            legacy2aidl_audio_device_AudioDevice(legacy.type, legacy.address));
    const bool isInput = false;  // speaker_layout_channel_mask only represents output.
    // The AIDL speakerLayout is nullable and if set, can only be a layoutMask.
    if (audio_channel_mask_is_valid(legacy.speaker_layout_channel_mask) &&
        audio_channel_mask_get_representation(legacy.speaker_layout_channel_mask) ==
                AUDIO_CHANNEL_REPRESENTATION_POSITION) {
        aidl.speakerLayout = VALUE_OR_RETURN(legacy2aidl_audio_channel_mask_t_AudioChannelLayout(
                legacy.speaker_layout_channel_mask, isInput));
    }
    return aidl;
}

+19 −0
Original line number Diff line number Diff line
@@ -689,6 +689,25 @@ INSTANTIATE_TEST_SUITE_P(AudioEncapsulationMetadataType,
                                         AudioEncapsulationMetadataType::FRAMEWORK_TUNER,
                                         AudioEncapsulationMetadataType::DVB_AD_DESCRIPTOR));

TEST(AudioPortDeviceExt_speakerLayoutRoundTripTest, Aidl2Legacy2Aidl_layoutMask) {
    AudioPortDeviceExt initial{};
    initial.speakerLayout = make_ACL_Stereo();
    auto conv = aidl2legacy_AudioPortDeviceExt_audio_port_config_device_ext(initial);
    ASSERT_TRUE(conv.ok());
    auto convBack = legacy2aidl_audio_port_config_device_ext_AudioPortDeviceExt(conv.value());
    ASSERT_TRUE(convBack.ok());
    EXPECT_EQ(initial, convBack.value());
}

TEST(AudioPortDeviceExt_speakerLayoutRoundTripTest, Aidl2Legacy2Aidl_null) {
    const AudioPortDeviceExt initial{};  // speakerLayout is null
    auto conv = aidl2legacy_AudioPortDeviceExt_audio_port_config_device_ext(initial);
    ASSERT_TRUE(conv.ok());
    auto convBack = legacy2aidl_audio_port_config_device_ext_AudioPortDeviceExt(conv.value());
    ASSERT_TRUE(convBack.ok());
    EXPECT_EQ(initial, convBack.value());
}

class AudioGainModeRoundTripTest : public testing::TestWithParam<AudioGainMode> {};
TEST_P(AudioGainModeRoundTripTest, Aidl2Legacy2Aidl) {
    const auto initial = GetParam();
+1 −1
Original line number Diff line number Diff line
@@ -132,7 +132,7 @@ std::string dumpMixerBehaviors(const MixerBehaviorSet& mixerBehaviors) {

std::string toString(const DeviceIdSet& deviceIds) {
    if (deviceIds.empty()) {
        return "Empty device ids";
        return "AUDIO_PORT_HANDLE_NONE";
    }
    std::stringstream ss;
    for (auto it = deviceIds.begin(); it != deviceIds.end(); ++it) {
+3 −2
Original line number Diff line number Diff line
@@ -55,8 +55,8 @@ cc_library {
    defaults: ["libaudiopreprocessing-defaults"],
    relative_install_path: "soundfx",
    srcs: ["PreProcessing.cpp"],
    header_libs: [
        "libwebrtc_absl_headers",
    static_libs: [
        "libabsl",
    ],
}

@@ -77,6 +77,7 @@ cc_library_shared {
        "libutils",
    ],
    static_libs: [
        "libabsl",
        "webrtc_audio_processing",
    ],
    header_libs: [
Loading