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

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

Snap for 12609205 from dd4cdfdc to 25Q1-release

Change-Id: Ic7d751b744bdec5a1f9476b89f80f3184c860e01
parents 4f23eabc dd4cdfdc
Loading
Loading
Loading
Loading
+1 −0
Original line number Diff line number Diff line
@@ -84,6 +84,7 @@ static inline std::string getPrefix(Descriptor& descriptor) {
}

static constexpr float kMaxAudioSampleValue = 1;
static constexpr int kSamplingFrequency = 44100;

class EffectHelper {
  public:
+11 −1
Original line number Diff line number Diff line
@@ -80,6 +80,7 @@ using aidl::android::hardware::audio::core::StreamDescriptor;
using aidl::android::hardware::audio::core::VendorParameter;
using aidl::android::hardware::audio::core::sounddose::ISoundDose;
using aidl::android::hardware::common::fmq::SynchronizedReadWrite;
using aidl::android::media::audio::common::AudioChannelLayout;
using aidl::android::media::audio::common::AudioContentType;
using aidl::android::media::audio::common::AudioDevice;
using aidl::android::media::audio::common::AudioDeviceAddress;
@@ -1514,7 +1515,7 @@ TEST_P(AudioCoreModule, CheckDevicePorts) {
    const int defaultDeviceFlag = 1 << AudioPortDeviceExt::FLAG_INDEX_DEFAULT_DEVICE;
    for (const auto& port : ports) {
        if (port.ext.getTag() != AudioPortExt::Tag::device) continue;
        const auto& devicePort = port.ext.get<AudioPortExt::Tag::device>();
        const AudioPortDeviceExt& devicePort = port.ext.get<AudioPortExt::Tag::device>();
        EXPECT_NE(AudioDeviceType::NONE, devicePort.device.type.type);
        EXPECT_NE(AudioDeviceType::IN_DEFAULT, devicePort.device.type.type);
        EXPECT_NE(AudioDeviceType::OUT_DEFAULT, devicePort.device.type.type);
@@ -1549,6 +1550,15 @@ TEST_P(AudioCoreModule, CheckDevicePorts) {
                FAIL() << "Invalid AudioIoFlags Tag: " << toString(port.flags.getTag());
            }
        }
        // Speaker layout can be null or layoutMask variant.
        if (devicePort.speakerLayout.has_value()) {
            // Should only be set for output ports.
            EXPECT_EQ(AudioIoFlags::Tag::output, port.flags.getTag());
            const auto speakerLayoutTag = devicePort.speakerLayout.value().getTag();
            EXPECT_EQ(AudioChannelLayout::Tag::layoutMask, speakerLayoutTag)
                    << "If set, speaker layout must be layoutMask.  Received: "
                    << toString(speakerLayoutTag);
        }
    }
}

+0 −1
Original line number Diff line number Diff line
@@ -113,7 +113,6 @@ class BassBoostEffectHelper : public EffectHelper {
        }
    }

    static constexpr int kSamplingFrequency = 44100;
    static constexpr int kDurationMilliSec = 720;
    static constexpr int kInputSize = kSamplingFrequency * kDurationMilliSec / 1000;
    long mInputFrameCount, mOutputFrameCount;
+0 −2
Original line number Diff line number Diff line
@@ -226,7 +226,6 @@ class EnvironmentalReverbHelper : public EffectHelper {

    void generateSineWaveInput(std::vector<float>& input) {
        int frequency = 1000;
        size_t kSamplingFrequency = 44100;
        for (size_t i = 0; i < input.size(); i++) {
            input[i] = sin(2 * M_PI * frequency * i / kSamplingFrequency);
        }
@@ -286,7 +285,6 @@ class EnvironmentalReverbHelper : public EffectHelper {
        }
    }

    static constexpr int kSamplingFrequency = 44100;
    static constexpr int kDurationMilliSec = 500;
    static constexpr int kBufferSize = kSamplingFrequency * kDurationMilliSec / 1000;

+0 −1
Original line number Diff line number Diff line
@@ -81,7 +81,6 @@ class PresetReverbHelper : public EffectHelper {
                                           << "\ngetParam:" << getParam.toString();
    }

    static constexpr int kSamplingFrequency = 44100;
    static constexpr int kDurationMilliSec = 500;
    static constexpr int kBufferSize = kSamplingFrequency * kDurationMilliSec / 1000;
    int mStereoChannelCount =
Loading