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

Commit 5dd0a57f authored by Glenn Kasten's avatar Glenn Kasten
Browse files

resolved conflicts for merge of 41829f30 to jb-mr1-dev-plus-aosp 

Change-Id: I952d333c2e88b6b28663793046a136822d1b6838
parents edac4511 5ad21fb5

services/audioflinger/Android.mk

+24 −3
Original line number Diff line number Diff line
@@ -19,11 +19,9 @@ LOCAL_SRC_FILES:= \ 
    AudioResampler.cpp.arm      \

    AudioPolicyService.cpp      \

    ServiceUtilities.cpp        \

	AudioResamplerCubic.cpp.arm \

    AudioResamplerSinc.cpp.arm



# uncomment to enable AudioResampler::MED_QUALITY

# LOCAL_SRC_FILES += AudioResamplerCubic.cpp.arm



LOCAL_SRC_FILES += StateQueue.cpp



# uncomment for debugging timing problems related to StateQueue::push()
@@ -80,4 +78,27 @@ LOCAL_CFLAGS += -UFAST_TRACKS_AT_NON_NATIVE_SAMPLE_RATE 


include $(BUILD_SHARED_LIBRARY)



#

# build audio resampler test tool

#

include $(CLEAR_VARS)



LOCAL_SRC_FILES:=               \

	test-resample.cpp 			\

    AudioResampler.cpp.arm      \

	AudioResamplerCubic.cpp.arm \

    AudioResamplerSinc.cpp.arm



LOCAL_SHARED_LIBRARIES := \

	libdl \

    libcutils \

    libutils



LOCAL_MODULE:= test-resample



LOCAL_MODULE_TAGS := optional



include $(BUILD_EXECUTABLE)





include $(call all-makefiles-under,$(LOCAL_PATH))

services/audioflinger/AudioResampler.cpp

+0 −4
Original line number Diff line number Diff line
@@ -82,10 +82,8 @@ bool AudioResampler::qualityIsSupported(src_quality quality) 
    switch (quality) {

    case DEFAULT_QUALITY:

    case LOW_QUALITY:

#if 0   // these have not been qualified recently so are not supported unless explicitly requested

    case MED_QUALITY:

    case HIGH_QUALITY:

#endif

    case VERY_HIGH_QUALITY:

        return true;

    default:
@@ -190,12 +188,10 @@ AudioResampler* AudioResampler::create(int bitDepth, int inChannelCount, 
        ALOGV("Create linear Resampler");

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

        break;

#if 0   // disabled because it has not been qualified recently, if requested will use default:

    case MED_QUALITY:

        ALOGV("Create cubic Resampler");

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

        break;

#endif

    case HIGH_QUALITY:

        ALOGV("Create HIGH_QUALITY sinc Resampler");

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