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

Commit 3a144d08 authored by Glenn Kasten's avatar Glenn Kasten Committed by Android (Google) Code Review
Browse files

Merge "Disable HQ resamplers for now until qualified"

parents 0d9302d7 cdf2158f

services/audioflinger/Android.mk

+2 −2
Original line number Diff line number Diff line
@@ -6,9 +6,9 @@ LOCAL_SRC_FILES:= \ 
    AudioFlinger.cpp            \

    AudioMixer.cpp.arm          \

    AudioResampler.cpp.arm      \

    AudioResamplerSinc.cpp.arm  \

    AudioResamplerCubic.cpp.arm \

    AudioPolicyService.cpp

#   AudioResamplerSinc.cpp.arm

#   AudioResamplerCubic.cpp.arm



LOCAL_C_INCLUDES := \

    system/media/audio_effects/include \

services/audioflinger/AudioResampler.cpp

+4 −0
Original line number Diff line number Diff line
@@ -23,8 +23,10 @@ 
#include <cutils/log.h>

#include <cutils/properties.h>

#include "AudioResampler.h"

#if 0

#include "AudioResamplerSinc.h"

#include "AudioResamplerCubic.h"

#endif



#ifdef __arm__

#include <machine/cpu-features.h>
@@ -99,6 +101,7 @@ AudioResampler* AudioResampler::create(int bitDepth, int inChannelCount, 
        ALOGV("Create linear Resampler");

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

        break;

#if 0

    case MED_QUALITY:

        ALOGV("Create cubic Resampler");

        resampler = new AudioResamplerCubic(bitDepth, inChannelCount, sampleRate);
@@ -107,6 +110,7 @@ AudioResampler* AudioResampler::create(int bitDepth, int inChannelCount, 
        ALOGV("Create sinc Resampler");

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

        break;

#endif

    }



    // initialize resampler