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

Commit 9e0308c0 authored by Andy Hung's avatar Andy Hung
Browse files

Enable new dynamic audio resampler as default 



The default may still be overridden by af.resampler.quality
in the local or build properties file.  For the build properties
check the relevant device.mk files.

In the absence of being overridden, the 44.1 to 48kHz and
48 to 44.1kHz conversion will use the DYN_MED_QUALITY resamplers
and other conversion will use the DYN_LOW_QUALITY resamplers.

Change-Id: Icf9a4af5422cddc445e1904eef93984b0abe6a44
Signed-off-by: default avatarAndy Hung <hunga@google.com>
parent e983e0a0

services/audioflinger/AudioMixer.cpp

+1 −1
Original line number Diff line number Diff line
@@ -536,7 +536,7 @@ bool AudioMixer::track_t::setResampler(uint32_t value, uint32_t devSampleRate) 
                // Should have a way to distinguish tracks with static ratios vs. dynamic ratios.

                if (!((value == 44100 && devSampleRate == 48000) ||

                      (value == 48000 && devSampleRate == 44100))) {

                    quality = AudioResampler::LOW_QUALITY;

                    quality = AudioResampler::DYN_LOW_QUALITY;

                } else {

                    quality = AudioResampler::DEFAULT_QUALITY;

                }

services/audioflinger/AudioResampler.cpp

+10 −2
Original line number Diff line number Diff line
@@ -158,6 +158,16 @@ AudioResampler* AudioResampler::create(int bitDepth, int inChannelCount, 
        atFinalQuality = true;

    }



    /* if the caller requests DEFAULT_QUALITY and af.resampler.property

     * has not been set, the target resampler quality is set to DYN_MED_QUALITY,

     * and allowed to "throttle" down to DYN_LOW_QUALITY if necessary

     * due to estimated CPU load of having too many active resamplers

     * (the code below the if).

     */

    if (quality == DEFAULT_QUALITY) {

        quality = DYN_MED_QUALITY;

    }



    // naive implementation of CPU load throttling doesn't account for whether resampler is active

    pthread_mutex_lock(&mutex);

    for (;;) {
@@ -172,7 +182,6 @@ AudioResampler* AudioResampler::create(int bitDepth, int inChannelCount, 
        // not enough CPU available for proposed quality level, so try next lowest level

        switch (quality) {

        default:

        case DEFAULT_QUALITY:

        case LOW_QUALITY:

            atFinalQuality = true;

            break;
@@ -202,7 +211,6 @@ AudioResampler* AudioResampler::create(int bitDepth, int inChannelCount, 


    switch (quality) {

    default:

    case DEFAULT_QUALITY:

    case LOW_QUALITY:

        ALOGV("Create linear Resampler");

        resampler = new AudioResamplerOrder1(bitDepth, inChannelCount, sampleRate);