AudioFlinger: Split off audio processing library
Test: native AudioResampler test, general playback test
Bug: 31015569
Change-Id: Ifb248f4402a583438d756c014dcd7a4577aef713
diff --git a/services/audioflinger/Android.mk b/services/audioflinger/Android.mk
index 51d785a..aa2cd95 100644
--- a/services/audioflinger/Android.mk
+++ b/services/audioflinger/Android.mk
@@ -28,8 +28,6 @@
AudioStreamOut.cpp \
SpdifStreamOut.cpp \
Effects.cpp \
- AudioMixer.cpp.arm \
- BufferProviders.cpp \
PatchPanel.cpp \
StateQueue.cpp \
BufLog.cpp
@@ -37,12 +35,11 @@
LOCAL_C_INCLUDES := \
$(TOPDIR)frameworks/av/services/audiopolicy \
$(TOPDIR)frameworks/av/services/medialog \
- $(TOPDIR)external/sonic \
$(call include-path-for, audio-utils)
LOCAL_SHARED_LIBRARIES := \
libaudiohal \
- libaudioresampler \
+ libaudioprocessing \
libaudiospdif \
libaudioutils \
libcutils \
@@ -55,7 +52,6 @@
libnbaio \
libpowermanager \
libserviceutility \
- libsonic \
libmediautils \
libmemunreachable \
libmedia_helper
@@ -87,59 +83,4 @@
include $(BUILD_SHARED_LIBRARY)
-#
-# build audio resampler test tool
-#
-include $(CLEAR_VARS)
-
-LOCAL_SRC_FILES:= \
- test-resample.cpp \
-
-LOCAL_C_INCLUDES := \
- $(call include-path-for, audio-utils)
-
-LOCAL_STATIC_LIBRARIES := \
- libsndfile
-
-LOCAL_SHARED_LIBRARIES := \
- libaudioresampler \
- libaudioutils \
- libdl \
- libcutils \
- libutils \
- liblog
-
-LOCAL_MODULE:= test-resample
-
-LOCAL_MODULE_TAGS := optional
-
-LOCAL_CFLAGS := -Werror -Wall
-
-include $(BUILD_EXECUTABLE)
-
-include $(CLEAR_VARS)
-
-LOCAL_SRC_FILES:= \
- AudioResampler.cpp.arm \
- AudioResamplerCubic.cpp.arm \
- AudioResamplerSinc.cpp.arm \
- AudioResamplerDyn.cpp.arm
-
-LOCAL_C_INCLUDES := \
- $(call include-path-for, audio-utils)
-
-LOCAL_SHARED_LIBRARIES := \
- libcutils \
- libdl \
- liblog
-
-LOCAL_MODULE := libaudioresampler
-
-LOCAL_CFLAGS := -Werror -Wall
-
-# uncomment to disable NEON on architectures that actually do support NEON, for benchmarking
-#LOCAL_CFLAGS += -DUSE_NEON=false
-
-include $(BUILD_SHARED_LIBRARY)
-
include $(call all-makefiles-under,$(LOCAL_PATH))
diff --git a/services/audioflinger/AudioFlinger.cpp b/services/audioflinger/AudioFlinger.cpp
index e4b73c6..a248912 100644
--- a/services/audioflinger/AudioFlinger.cpp
+++ b/services/audioflinger/AudioFlinger.cpp
@@ -46,7 +46,6 @@
#include <system/audio.h>
-#include "AudioMixer.h"
#include "AudioFlinger.h"
#include "ServiceUtilities.h"
diff --git a/services/audioflinger/AudioFlinger.h b/services/audioflinger/AudioFlinger.h
index 7056dc9..35eceb2 100644
--- a/services/audioflinger/AudioFlinger.h
+++ b/services/audioflinger/AudioFlinger.h
@@ -51,17 +51,17 @@
#include <media/audiohal/EffectBufferHalInterface.h>
#include <media/audiohal/StreamHalInterface.h>
#include <media/AudioBufferProvider.h>
+#include <media/AudioMixer.h>
#include <media/ExtendedAudioBufferProvider.h>
+#include <media/LinearMap.h>
#include "FastCapture.h"
#include "FastMixer.h"
#include <media/nbaio/NBAIO.h>
#include "AudioWatchdog.h"
-#include "AudioMixer.h"
#include "AudioStreamOut.h"
#include "SpdifStreamOut.h"
#include "AudioHwDevice.h"
-#include "LinearMap.h"
#include <powermanager/IPowerManager.h>
diff --git a/services/audioflinger/AudioMixer.cpp b/services/audioflinger/AudioMixer.cpp
deleted file mode 100644
index 945f4b3..0000000
--- a/services/audioflinger/AudioMixer.cpp
+++ /dev/null
@@ -1,2086 +0,0 @@
-/*
-**
-** Copyright 2007, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-** http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
-
-#define LOG_TAG "AudioMixer"
-//#define LOG_NDEBUG 0
-
-#include "Configuration.h"
-#include <stdint.h>
-#include <string.h>
-#include <stdlib.h>
-#include <math.h>
-#include <sys/types.h>
-
-#include <utils/Errors.h>
-#include <utils/Log.h>
-
-#include <cutils/bitops.h>
-#include <cutils/compiler.h>
-#include <utils/Debug.h>
-
-#include <system/audio.h>
-
-#include <audio_utils/primitives.h>
-#include <audio_utils/format.h>
-
-#include "AudioMixerOps.h"
-#include "AudioMixer.h"
-
-// The FCC_2 macro refers to the Fixed Channel Count of 2 for the legacy integer mixer.
-#ifndef FCC_2
-#define FCC_2 2
-#endif
-
-// Look for MONO_HACK for any Mono hack involving legacy mono channel to
-// stereo channel conversion.
-
-/* VERY_VERY_VERBOSE_LOGGING will show exactly which process hook and track hook is
- * being used. This is a considerable amount of log spam, so don't enable unless you
- * are verifying the hook based code.
- */
-//#define VERY_VERY_VERBOSE_LOGGING
-#ifdef VERY_VERY_VERBOSE_LOGGING
-#define ALOGVV ALOGV
-//define ALOGVV printf // for test-mixer.cpp
-#else
-#define ALOGVV(a...) do { } while (0)
-#endif
-
-#ifndef ARRAY_SIZE
-#define ARRAY_SIZE(x) (sizeof(x)/sizeof((x)[0]))
-#endif
-
-// TODO: Move these macro/inlines to a header file.
-template <typename T>
-static inline
-T max(const T& x, const T& y) {
- return x > y ? x : y;
-}
-
-// Set kUseNewMixer to true to use the new mixer engine always. Otherwise the
-// original code will be used for stereo sinks, the new mixer for multichannel.
-static const bool kUseNewMixer = true;
-
-// Set kUseFloat to true to allow floating input into the mixer engine.
-// If kUseNewMixer is false, this is ignored or may be overridden internally
-// because of downmix/upmix support.
-static const bool kUseFloat = true;
-
-// Set to default copy buffer size in frames for input processing.
-static const size_t kCopyBufferFrameCount = 256;
-
-namespace android {
-
-// ----------------------------------------------------------------------------
-
-template <typename T>
-T min(const T& a, const T& b)
-{
- return a < b ? a : b;
-}
-
-// ----------------------------------------------------------------------------
-
-// Ensure mConfiguredNames bitmask is initialized properly on all architectures.
-// The value of 1 << x is undefined in C when x >= 32.
-
-AudioMixer::AudioMixer(size_t frameCount, uint32_t sampleRate, uint32_t maxNumTracks)
- : mTrackNames(0), mConfiguredNames((maxNumTracks >= 32 ? 0 : 1 << maxNumTracks) - 1),
- mSampleRate(sampleRate)
-{
- ALOG_ASSERT(maxNumTracks <= MAX_NUM_TRACKS, "maxNumTracks %u > MAX_NUM_TRACKS %u",
- maxNumTracks, MAX_NUM_TRACKS);
-
- // AudioMixer is not yet capable of more than 32 active track inputs
- ALOG_ASSERT(32 >= MAX_NUM_TRACKS, "bad MAX_NUM_TRACKS %d", MAX_NUM_TRACKS);
-
- pthread_once(&sOnceControl, &sInitRoutine);
-
- mState.enabledTracks= 0;
- mState.needsChanged = 0;
- mState.frameCount = frameCount;
- mState.hook = process__nop;
- mState.outputTemp = NULL;
- mState.resampleTemp = NULL;
- mState.mLog = &mDummyLog;
- // mState.reserved
-
- // FIXME Most of the following initialization is probably redundant since
- // tracks[i] should only be referenced if (mTrackNames & (1 << i)) != 0
- // and mTrackNames is initially 0. However, leave it here until that's verified.
- track_t* t = mState.tracks;
- for (unsigned i=0 ; i < MAX_NUM_TRACKS ; i++) {
- t->resampler = NULL;
- t->downmixerBufferProvider = NULL;
- t->mReformatBufferProvider = NULL;
- t->mTimestretchBufferProvider = NULL;
- t++;
- }
-
-}
-
-AudioMixer::~AudioMixer()
-{
- track_t* t = mState.tracks;
- for (unsigned i=0 ; i < MAX_NUM_TRACKS ; i++) {
- delete t->resampler;
- delete t->downmixerBufferProvider;
- delete t->mReformatBufferProvider;
- delete t->mTimestretchBufferProvider;
- t++;
- }
- delete [] mState.outputTemp;
- delete [] mState.resampleTemp;
-}
-
-void AudioMixer::setLog(NBLog::Writer *log)
-{
- mState.mLog = log;
-}
-
-static inline audio_format_t selectMixerInFormat(audio_format_t inputFormat __unused) {
- return kUseFloat && kUseNewMixer ? AUDIO_FORMAT_PCM_FLOAT : AUDIO_FORMAT_PCM_16_BIT;
-}
-
-int AudioMixer::getTrackName(audio_channel_mask_t channelMask,
- audio_format_t format, int sessionId)
-{
- if (!isValidPcmTrackFormat(format)) {
- ALOGE("AudioMixer::getTrackName invalid format (%#x)", format);
- return -1;
- }
- uint32_t names = (~mTrackNames) & mConfiguredNames;
- if (names != 0) {
- int n = __builtin_ctz(names);
- ALOGV("add track (%d)", n);
- // assume default parameters for the track, except where noted below
- track_t* t = &mState.tracks[n];
- t->needs = 0;
-
- // Integer volume.
- // Currently integer volume is kept for the legacy integer mixer.
- // Will be removed when the legacy mixer path is removed.
- t->volume[0] = UNITY_GAIN_INT;
- t->volume[1] = UNITY_GAIN_INT;
- t->prevVolume[0] = UNITY_GAIN_INT << 16;
- t->prevVolume[1] = UNITY_GAIN_INT << 16;
- t->volumeInc[0] = 0;
- t->volumeInc[1] = 0;
- t->auxLevel = 0;
- t->auxInc = 0;
- t->prevAuxLevel = 0;
-
- // Floating point volume.
- t->mVolume[0] = UNITY_GAIN_FLOAT;
- t->mVolume[1] = UNITY_GAIN_FLOAT;
- t->mPrevVolume[0] = UNITY_GAIN_FLOAT;
- t->mPrevVolume[1] = UNITY_GAIN_FLOAT;
- t->mVolumeInc[0] = 0.;
- t->mVolumeInc[1] = 0.;
- t->mAuxLevel = 0.;
- t->mAuxInc = 0.;
- t->mPrevAuxLevel = 0.;
-
- // no initialization needed
- // t->frameCount
- t->channelCount = audio_channel_count_from_out_mask(channelMask);
- t->enabled = false;
- ALOGV_IF(audio_channel_mask_get_bits(channelMask) != AUDIO_CHANNEL_OUT_STEREO,
- "Non-stereo channel mask: %d\n", channelMask);
- t->channelMask = channelMask;
- t->sessionId = sessionId;
- // setBufferProvider(name, AudioBufferProvider *) is required before enable(name)
- t->bufferProvider = NULL;
- t->buffer.raw = NULL;
- // no initialization needed
- // t->buffer.frameCount
- t->hook = NULL;
- t->in = NULL;
- t->resampler = NULL;
- t->sampleRate = mSampleRate;
- // setParameter(name, TRACK, MAIN_BUFFER, mixBuffer) is required before enable(name)
- t->mainBuffer = NULL;
- t->auxBuffer = NULL;
- t->mInputBufferProvider = NULL;
- t->mReformatBufferProvider = NULL;
- t->downmixerBufferProvider = NULL;
- t->mPostDownmixReformatBufferProvider = NULL;
- t->mTimestretchBufferProvider = NULL;
- t->mMixerFormat = AUDIO_FORMAT_PCM_16_BIT;
- t->mFormat = format;
- t->mMixerInFormat = selectMixerInFormat(format);
- t->mDownmixRequiresFormat = AUDIO_FORMAT_INVALID; // no format required
- t->mMixerChannelMask = audio_channel_mask_from_representation_and_bits(
- AUDIO_CHANNEL_REPRESENTATION_POSITION, AUDIO_CHANNEL_OUT_STEREO);
- t->mMixerChannelCount = audio_channel_count_from_out_mask(t->mMixerChannelMask);
- t->mPlaybackRate = AUDIO_PLAYBACK_RATE_DEFAULT;
- // Check the downmixing (or upmixing) requirements.
- status_t status = t->prepareForDownmix();
- if (status != OK) {
- ALOGE("AudioMixer::getTrackName invalid channelMask (%#x)", channelMask);
- return -1;
- }
- // prepareForDownmix() may change mDownmixRequiresFormat
- ALOGVV("mMixerFormat:%#x mMixerInFormat:%#x\n", t->mMixerFormat, t->mMixerInFormat);
- t->prepareForReformat();
- mTrackNames |= 1 << n;
- return TRACK0 + n;
- }
- ALOGE("AudioMixer::getTrackName out of available tracks");
- return -1;
-}
-
-void AudioMixer::invalidateState(uint32_t mask)
-{
- if (mask != 0) {
- mState.needsChanged |= mask;
- mState.hook = process__validate;
- }
- }
-
-// Called when channel masks have changed for a track name
-// TODO: Fix DownmixerBufferProvider not to (possibly) change mixer input format,
-// which will simplify this logic.
-bool AudioMixer::setChannelMasks(int name,
- audio_channel_mask_t trackChannelMask, audio_channel_mask_t mixerChannelMask) {
- track_t &track = mState.tracks[name];
-
- if (trackChannelMask == track.channelMask
- && mixerChannelMask == track.mMixerChannelMask) {
- return false; // no need to change
- }
- // always recompute for both channel masks even if only one has changed.
- const uint32_t trackChannelCount = audio_channel_count_from_out_mask(trackChannelMask);
- const uint32_t mixerChannelCount = audio_channel_count_from_out_mask(mixerChannelMask);
- const bool mixerChannelCountChanged = track.mMixerChannelCount != mixerChannelCount;
-
- ALOG_ASSERT((trackChannelCount <= MAX_NUM_CHANNELS_TO_DOWNMIX)
- && trackChannelCount
- && mixerChannelCount);
- track.channelMask = trackChannelMask;
- track.channelCount = trackChannelCount;
- track.mMixerChannelMask = mixerChannelMask;
- track.mMixerChannelCount = mixerChannelCount;
-
- // channel masks have changed, does this track need a downmixer?
- // update to try using our desired format (if we aren't already using it)
- const audio_format_t prevDownmixerFormat = track.mDownmixRequiresFormat;
- const status_t status = mState.tracks[name].prepareForDownmix();
- ALOGE_IF(status != OK,
- "prepareForDownmix error %d, track channel mask %#x, mixer channel mask %#x",
- status, track.channelMask, track.mMixerChannelMask);
-
- if (prevDownmixerFormat != track.mDownmixRequiresFormat) {
- track.prepareForReformat(); // because of downmixer, track format may change!
- }
-
- if (track.resampler && mixerChannelCountChanged) {
- // resampler channels may have changed.
- const uint32_t resetToSampleRate = track.sampleRate;
- delete track.resampler;
- track.resampler = NULL;
- track.sampleRate = mSampleRate; // without resampler, track rate is device sample rate.
- // recreate the resampler with updated format, channels, saved sampleRate.
- track.setResampler(resetToSampleRate /*trackSampleRate*/, mSampleRate /*devSampleRate*/);
- }
- return true;
-}
-
-void AudioMixer::track_t::unprepareForDownmix() {
- ALOGV("AudioMixer::unprepareForDownmix(%p)", this);
-
- mDownmixRequiresFormat = AUDIO_FORMAT_INVALID;
- if (downmixerBufferProvider != NULL) {
- // this track had previously been configured with a downmixer, delete it
- ALOGV(" deleting old downmixer");
- delete downmixerBufferProvider;
- downmixerBufferProvider = NULL;
- reconfigureBufferProviders();
- } else {
- ALOGV(" nothing to do, no downmixer to delete");
- }
-}
-
-status_t AudioMixer::track_t::prepareForDownmix()
-{
- ALOGV("AudioMixer::prepareForDownmix(%p) with mask 0x%x",
- this, channelMask);
-
- // discard the previous downmixer if there was one
- unprepareForDownmix();
- // MONO_HACK Only remix (upmix or downmix) if the track and mixer/device channel masks
- // are not the same and not handled internally, as mono -> stereo currently is.
- if (channelMask == mMixerChannelMask
- || (channelMask == AUDIO_CHANNEL_OUT_MONO
- && mMixerChannelMask == AUDIO_CHANNEL_OUT_STEREO)) {
- return NO_ERROR;
- }
- // DownmixerBufferProvider is only used for position masks.
- if (audio_channel_mask_get_representation(channelMask)
- == AUDIO_CHANNEL_REPRESENTATION_POSITION
- && DownmixerBufferProvider::isMultichannelCapable()) {
- DownmixerBufferProvider* pDbp = new DownmixerBufferProvider(channelMask,
- mMixerChannelMask,
- AUDIO_FORMAT_PCM_16_BIT /* TODO: use mMixerInFormat, now only PCM 16 */,
- sampleRate, sessionId, kCopyBufferFrameCount);
-
- if (pDbp->isValid()) { // if constructor completed properly
- mDownmixRequiresFormat = AUDIO_FORMAT_PCM_16_BIT; // PCM 16 bit required for downmix
- downmixerBufferProvider = pDbp;
- reconfigureBufferProviders();
- return NO_ERROR;
- }
- delete pDbp;
- }
-
- // Effect downmixer does not accept the channel conversion. Let's use our remixer.
- RemixBufferProvider* pRbp = new RemixBufferProvider(channelMask,
- mMixerChannelMask, mMixerInFormat, kCopyBufferFrameCount);
- // Remix always finds a conversion whereas Downmixer effect above may fail.
- downmixerBufferProvider = pRbp;
- reconfigureBufferProviders();
- return NO_ERROR;
-}
-
-void AudioMixer::track_t::unprepareForReformat() {
- ALOGV("AudioMixer::unprepareForReformat(%p)", this);
- bool requiresReconfigure = false;
- if (mReformatBufferProvider != NULL) {
- delete mReformatBufferProvider;
- mReformatBufferProvider = NULL;
- requiresReconfigure = true;
- }
- if (mPostDownmixReformatBufferProvider != NULL) {
- delete mPostDownmixReformatBufferProvider;
- mPostDownmixReformatBufferProvider = NULL;
- requiresReconfigure = true;
- }
- if (requiresReconfigure) {
- reconfigureBufferProviders();
- }
-}
-
-status_t AudioMixer::track_t::prepareForReformat()
-{
- ALOGV("AudioMixer::prepareForReformat(%p) with format %#x", this, mFormat);
- // discard previous reformatters
- unprepareForReformat();
- // only configure reformatters as needed
- const audio_format_t targetFormat = mDownmixRequiresFormat != AUDIO_FORMAT_INVALID
- ? mDownmixRequiresFormat : mMixerInFormat;
- bool requiresReconfigure = false;
- if (mFormat != targetFormat) {
- mReformatBufferProvider = new ReformatBufferProvider(
- audio_channel_count_from_out_mask(channelMask),
- mFormat,
- targetFormat,
- kCopyBufferFrameCount);
- requiresReconfigure = true;
- }
- if (targetFormat != mMixerInFormat) {
- mPostDownmixReformatBufferProvider = new ReformatBufferProvider(
- audio_channel_count_from_out_mask(mMixerChannelMask),
- targetFormat,
- mMixerInFormat,
- kCopyBufferFrameCount);
- requiresReconfigure = true;
- }
- if (requiresReconfigure) {
- reconfigureBufferProviders();
- }
- return NO_ERROR;
-}
-
-void AudioMixer::track_t::reconfigureBufferProviders()
-{
- bufferProvider = mInputBufferProvider;
- if (mReformatBufferProvider) {
- mReformatBufferProvider->setBufferProvider(bufferProvider);
- bufferProvider = mReformatBufferProvider;
- }
- if (downmixerBufferProvider) {
- downmixerBufferProvider->setBufferProvider(bufferProvider);
- bufferProvider = downmixerBufferProvider;
- }
- if (mPostDownmixReformatBufferProvider) {
- mPostDownmixReformatBufferProvider->setBufferProvider(bufferProvider);
- bufferProvider = mPostDownmixReformatBufferProvider;
- }
- if (mTimestretchBufferProvider) {
- mTimestretchBufferProvider->setBufferProvider(bufferProvider);
- bufferProvider = mTimestretchBufferProvider;
- }
-}
-
-void AudioMixer::deleteTrackName(int name)
-{
- ALOGV("AudioMixer::deleteTrackName(%d)", name);
- name -= TRACK0;
- LOG_ALWAYS_FATAL_IF(name < 0 || name >= (int)MAX_NUM_TRACKS, "bad track name %d", name);
- ALOGV("deleteTrackName(%d)", name);
- track_t& track(mState.tracks[ name ]);
- if (track.enabled) {
- track.enabled = false;
- invalidateState(1<<name);
- }
- // delete the resampler
- delete track.resampler;
- track.resampler = NULL;
- // delete the downmixer
- mState.tracks[name].unprepareForDownmix();
- // delete the reformatter
- mState.tracks[name].unprepareForReformat();
- // delete the timestretch provider
- delete track.mTimestretchBufferProvider;
- track.mTimestretchBufferProvider = NULL;
- mTrackNames &= ~(1<<name);
-}
-
-void AudioMixer::enable(int name)
-{
- name -= TRACK0;
- ALOG_ASSERT(uint32_t(name) < MAX_NUM_TRACKS, "bad track name %d", name);
- track_t& track = mState.tracks[name];
-
- if (!track.enabled) {
- track.enabled = true;
- ALOGV("enable(%d)", name);
- invalidateState(1 << name);
- }
-}
-
-void AudioMixer::disable(int name)
-{
- name -= TRACK0;
- ALOG_ASSERT(uint32_t(name) < MAX_NUM_TRACKS, "bad track name %d", name);
- track_t& track = mState.tracks[name];
-
- if (track.enabled) {
- track.enabled = false;
- ALOGV("disable(%d)", name);
- invalidateState(1 << name);
- }
-}
-
-/* Sets the volume ramp variables for the AudioMixer.
- *
- * The volume ramp variables are used to transition from the previous
- * volume to the set volume. ramp controls the duration of the transition.
- * Its value is typically one state framecount period, but may also be 0,
- * meaning "immediate."
- *
- * FIXME: 1) Volume ramp is enabled only if there is a nonzero integer increment
- * even if there is a nonzero floating point increment (in that case, the volume
- * change is immediate). This restriction should be changed when the legacy mixer
- * is removed (see #2).
- * FIXME: 2) Integer volume variables are used for Legacy mixing and should be removed
- * when no longer needed.
- *
- * @param newVolume set volume target in floating point [0.0, 1.0].
- * @param ramp number of frames to increment over. if ramp is 0, the volume
- * should be set immediately. Currently ramp should not exceed 65535 (frames).
- * @param pIntSetVolume pointer to the U4.12 integer target volume, set on return.
- * @param pIntPrevVolume pointer to the U4.28 integer previous volume, set on return.
- * @param pIntVolumeInc pointer to the U4.28 increment per output audio frame, set on return.
- * @param pSetVolume pointer to the float target volume, set on return.
- * @param pPrevVolume pointer to the float previous volume, set on return.
- * @param pVolumeInc pointer to the float increment per output audio frame, set on return.
- * @return true if the volume has changed, false if volume is same.
- */
-static inline bool setVolumeRampVariables(float newVolume, int32_t ramp,
- int16_t *pIntSetVolume, int32_t *pIntPrevVolume, int32_t *pIntVolumeInc,
- float *pSetVolume, float *pPrevVolume, float *pVolumeInc) {
- // check floating point volume to see if it is identical to the previously
- // set volume.
- // We do not use a tolerance here (and reject changes too small)
- // as it may be confusing to use a different value than the one set.
- // If the resulting volume is too small to ramp, it is a direct set of the volume.
- if (newVolume == *pSetVolume) {
- return false;
- }
- if (newVolume < 0) {
- newVolume = 0; // should not have negative volumes
- } else {
- switch (fpclassify(newVolume)) {
- case FP_SUBNORMAL:
- case FP_NAN:
- newVolume = 0;
- break;
- case FP_ZERO:
- break; // zero volume is fine
- case FP_INFINITE:
- // Infinite volume could be handled consistently since
- // floating point math saturates at infinities,
- // but we limit volume to unity gain float.
- // ramp = 0; break;
- //
- newVolume = AudioMixer::UNITY_GAIN_FLOAT;
- break;
- case FP_NORMAL:
- default:
- // Floating point does not have problems with overflow wrap
- // that integer has. However, we limit the volume to
- // unity gain here.
- // TODO: Revisit the volume limitation and perhaps parameterize.
- if (newVolume > AudioMixer::UNITY_GAIN_FLOAT) {
- newVolume = AudioMixer::UNITY_GAIN_FLOAT;
- }
- break;
- }
- }
-
- // set floating point volume ramp
- if (ramp != 0) {
- // when the ramp completes, *pPrevVolume is set to *pSetVolume, so there
- // is no computational mismatch; hence equality is checked here.
- ALOGD_IF(*pPrevVolume != *pSetVolume, "previous float ramp hasn't finished,"
- " prev:%f set_to:%f", *pPrevVolume, *pSetVolume);
- const float inc = (newVolume - *pPrevVolume) / ramp; // could be inf, nan, subnormal
- const float maxv = max(newVolume, *pPrevVolume); // could be inf, cannot be nan, subnormal
-
- if (isnormal(inc) // inc must be a normal number (no subnormals, infinite, nan)
- && maxv + inc != maxv) { // inc must make forward progress
- *pVolumeInc = inc;
- // ramp is set now.
- // Note: if newVolume is 0, then near the end of the ramp,
- // it may be possible that the ramped volume may be subnormal or
- // temporarily negative by a small amount or subnormal due to floating
- // point inaccuracies.
- } else {
- ramp = 0; // ramp not allowed
- }
- }
-
- // compute and check integer volume, no need to check negative values
- // The integer volume is limited to "unity_gain" to avoid wrapping and other
- // audio artifacts, so it never reaches the range limit of U4.28.
- // We safely use signed 16 and 32 bit integers here.
- const float scaledVolume = newVolume * AudioMixer::UNITY_GAIN_INT; // not neg, subnormal, nan
- const int32_t intVolume = (scaledVolume >= (float)AudioMixer::UNITY_GAIN_INT) ?
- AudioMixer::UNITY_GAIN_INT : (int32_t)scaledVolume;
-
- // set integer volume ramp
- if (ramp != 0) {
- // integer volume is U4.12 (to use 16 bit multiplies), but ramping uses U4.28.
- // when the ramp completes, *pIntPrevVolume is set to *pIntSetVolume << 16, so there
- // is no computational mismatch; hence equality is checked here.
- ALOGD_IF(*pIntPrevVolume != *pIntSetVolume << 16, "previous int ramp hasn't finished,"
- " prev:%d set_to:%d", *pIntPrevVolume, *pIntSetVolume << 16);
- const int32_t inc = ((intVolume << 16) - *pIntPrevVolume) / ramp;
-
- if (inc != 0) { // inc must make forward progress
- *pIntVolumeInc = inc;
- } else {
- ramp = 0; // ramp not allowed
- }
- }
-
- // if no ramp, or ramp not allowed, then clear float and integer increments
- if (ramp == 0) {
- *pVolumeInc = 0;
- *pPrevVolume = newVolume;
- *pIntVolumeInc = 0;
- *pIntPrevVolume = intVolume << 16;
- }
- *pSetVolume = newVolume;
- *pIntSetVolume = intVolume;
- return true;
-}
-
-void AudioMixer::setParameter(int name, int target, int param, void *value)
-{
- name -= TRACK0;
- ALOG_ASSERT(uint32_t(name) < MAX_NUM_TRACKS, "bad track name %d", name);
- track_t& track = mState.tracks[name];
-
- int valueInt = static_cast<int>(reinterpret_cast<uintptr_t>(value));
- int32_t *valueBuf = reinterpret_cast<int32_t*>(value);
-
- switch (target) {
-
- case TRACK:
- switch (param) {
- case CHANNEL_MASK: {
- const audio_channel_mask_t trackChannelMask =
- static_cast<audio_channel_mask_t>(valueInt);
- if (setChannelMasks(name, trackChannelMask, track.mMixerChannelMask)) {
- ALOGV("setParameter(TRACK, CHANNEL_MASK, %x)", trackChannelMask);
- invalidateState(1 << name);
- }
- } break;
- case MAIN_BUFFER:
- if (track.mainBuffer != valueBuf) {
- track.mainBuffer = valueBuf;
- ALOGV("setParameter(TRACK, MAIN_BUFFER, %p)", valueBuf);
- invalidateState(1 << name);
- }
- break;
- case AUX_BUFFER:
- if (track.auxBuffer != valueBuf) {
- track.auxBuffer = valueBuf;
- ALOGV("setParameter(TRACK, AUX_BUFFER, %p)", valueBuf);
- invalidateState(1 << name);
- }
- break;
- case FORMAT: {
- audio_format_t format = static_cast<audio_format_t>(valueInt);
- if (track.mFormat != format) {
- ALOG_ASSERT(audio_is_linear_pcm(format), "Invalid format %#x", format);
- track.mFormat = format;
- ALOGV("setParameter(TRACK, FORMAT, %#x)", format);
- track.prepareForReformat();
- invalidateState(1 << name);
- }
- } break;
- // FIXME do we want to support setting the downmix type from AudioFlinger?
- // for a specific track? or per mixer?
- /* case DOWNMIX_TYPE:
- break */
- case MIXER_FORMAT: {
- audio_format_t format = static_cast<audio_format_t>(valueInt);
- if (track.mMixerFormat != format) {
- track.mMixerFormat = format;
- ALOGV("setParameter(TRACK, MIXER_FORMAT, %#x)", format);
- }
- } break;
- case MIXER_CHANNEL_MASK: {
- const audio_channel_mask_t mixerChannelMask =
- static_cast<audio_channel_mask_t>(valueInt);
- if (setChannelMasks(name, track.channelMask, mixerChannelMask)) {
- ALOGV("setParameter(TRACK, MIXER_CHANNEL_MASK, %#x)", mixerChannelMask);
- invalidateState(1 << name);
- }
- } break;
- default:
- LOG_ALWAYS_FATAL("setParameter track: bad param %d", param);
- }
- break;
-
- case RESAMPLE:
- switch (param) {
- case SAMPLE_RATE:
- ALOG_ASSERT(valueInt > 0, "bad sample rate %d", valueInt);
- if (track.setResampler(uint32_t(valueInt), mSampleRate)) {
- ALOGV("setParameter(RESAMPLE, SAMPLE_RATE, %u)",
- uint32_t(valueInt));
- invalidateState(1 << name);
- }
- break;
- case RESET:
- track.resetResampler();
- invalidateState(1 << name);
- break;
- case REMOVE:
- delete track.resampler;
- track.resampler = NULL;
- track.sampleRate = mSampleRate;
- invalidateState(1 << name);
- break;
- default:
- LOG_ALWAYS_FATAL("setParameter resample: bad param %d", param);
- }
- break;
-
- case RAMP_VOLUME:
- case VOLUME:
- switch (param) {
- case AUXLEVEL:
- if (setVolumeRampVariables(*reinterpret_cast<float*>(value),
- target == RAMP_VOLUME ? mState.frameCount : 0,
- &track.auxLevel, &track.prevAuxLevel, &track.auxInc,
- &track.mAuxLevel, &track.mPrevAuxLevel, &track.mAuxInc)) {
- ALOGV("setParameter(%s, AUXLEVEL: %04x)",
- target == VOLUME ? "VOLUME" : "RAMP_VOLUME", track.auxLevel);
- invalidateState(1 << name);
- }
- break;
- default:
- if ((unsigned)param >= VOLUME0 && (unsigned)param < VOLUME0 + MAX_NUM_VOLUMES) {
- if (setVolumeRampVariables(*reinterpret_cast<float*>(value),
- target == RAMP_VOLUME ? mState.frameCount : 0,
- &track.volume[param - VOLUME0], &track.prevVolume[param - VOLUME0],
- &track.volumeInc[param - VOLUME0],
- &track.mVolume[param - VOLUME0], &track.mPrevVolume[param - VOLUME0],
- &track.mVolumeInc[param - VOLUME0])) {
- ALOGV("setParameter(%s, VOLUME%d: %04x)",
- target == VOLUME ? "VOLUME" : "RAMP_VOLUME", param - VOLUME0,
- track.volume[param - VOLUME0]);
- invalidateState(1 << name);
- }
- } else {
- LOG_ALWAYS_FATAL("setParameter volume: bad param %d", param);
- }
- }
- break;
- case TIMESTRETCH:
- switch (param) {
- case PLAYBACK_RATE: {
- const AudioPlaybackRate *playbackRate =
- reinterpret_cast<AudioPlaybackRate*>(value);
- ALOGW_IF(!isAudioPlaybackRateValid(*playbackRate),
- "bad parameters speed %f, pitch %f",playbackRate->mSpeed,
- playbackRate->mPitch);
- if (track.setPlaybackRate(*playbackRate)) {
- ALOGV("setParameter(TIMESTRETCH, PLAYBACK_RATE, STRETCH_MODE, FALLBACK_MODE "
- "%f %f %d %d",
- playbackRate->mSpeed,
- playbackRate->mPitch,
- playbackRate->mStretchMode,
- playbackRate->mFallbackMode);
- // invalidateState(1 << name);
- }
- } break;
- default:
- LOG_ALWAYS_FATAL("setParameter timestretch: bad param %d", param);
- }
- break;
-
- default:
- LOG_ALWAYS_FATAL("setParameter: bad target %d", target);
- }
-}
-
-bool AudioMixer::track_t::setResampler(uint32_t trackSampleRate, uint32_t devSampleRate)
-{
- if (trackSampleRate != devSampleRate || resampler != NULL) {
- if (sampleRate != trackSampleRate) {
- sampleRate = trackSampleRate;
- if (resampler == NULL) {
- ALOGV("Creating resampler from track %d Hz to device %d Hz",
- trackSampleRate, devSampleRate);
- AudioResampler::src_quality quality;
- // force lowest quality level resampler if use case isn't music or video
- // FIXME this is flawed for dynamic sample rates, as we choose the resampler
- // quality level based on the initial ratio, but that could change later.
- // Should have a way to distinguish tracks with static ratios vs. dynamic ratios.
- if (isMusicRate(trackSampleRate)) {
- quality = AudioResampler::DEFAULT_QUALITY;
- } else {
- quality = AudioResampler::DYN_LOW_QUALITY;
- }
-
- // TODO: Remove MONO_HACK. Resampler sees #channels after the downmixer
- // but if none exists, it is the channel count (1 for mono).
- const int resamplerChannelCount = downmixerBufferProvider != NULL
- ? mMixerChannelCount : channelCount;
- ALOGVV("Creating resampler:"
- " format(%#x) channels(%d) devSampleRate(%u) quality(%d)\n",
- mMixerInFormat, resamplerChannelCount, devSampleRate, quality);
- resampler = AudioResampler::create(
- mMixerInFormat,
- resamplerChannelCount,
- devSampleRate, quality);
- }
- return true;
- }
- }
- return false;
-}
-
-bool AudioMixer::track_t::setPlaybackRate(const AudioPlaybackRate &playbackRate)
-{
- if ((mTimestretchBufferProvider == NULL &&
- fabs(playbackRate.mSpeed - mPlaybackRate.mSpeed) < AUDIO_TIMESTRETCH_SPEED_MIN_DELTA &&
- fabs(playbackRate.mPitch - mPlaybackRate.mPitch) < AUDIO_TIMESTRETCH_PITCH_MIN_DELTA) ||
- isAudioPlaybackRateEqual(playbackRate, mPlaybackRate)) {
- return false;
- }
- mPlaybackRate = playbackRate;
- if (mTimestretchBufferProvider == NULL) {
- // TODO: Remove MONO_HACK. Resampler sees #channels after the downmixer
- // but if none exists, it is the channel count (1 for mono).
- const int timestretchChannelCount = downmixerBufferProvider != NULL
- ? mMixerChannelCount : channelCount;
- mTimestretchBufferProvider = new TimestretchBufferProvider(timestretchChannelCount,
- mMixerInFormat, sampleRate, playbackRate);
- reconfigureBufferProviders();
- } else {
- reinterpret_cast<TimestretchBufferProvider*>(mTimestretchBufferProvider)
- ->setPlaybackRate(playbackRate);
- }
- return true;
-}
-
-/* Checks to see if the volume ramp has completed and clears the increment
- * variables appropriately.
- *
- * FIXME: There is code to handle int/float ramp variable switchover should it not
- * complete within a mixer buffer processing call, but it is preferred to avoid switchover
- * due to precision issues. The switchover code is included for legacy code purposes
- * and can be removed once the integer volume is removed.
- *
- * It is not sufficient to clear only the volumeInc integer variable because
- * if one channel requires ramping, all channels are ramped.
- *
- * There is a bit of duplicated code here, but it keeps backward compatibility.
- */
-inline void AudioMixer::track_t::adjustVolumeRamp(bool aux, bool useFloat)
-{
- if (useFloat) {
- for (uint32_t i = 0; i < MAX_NUM_VOLUMES; i++) {
- if ((mVolumeInc[i] > 0 && mPrevVolume[i] + mVolumeInc[i] >= mVolume[i]) ||
- (mVolumeInc[i] < 0 && mPrevVolume[i] + mVolumeInc[i] <= mVolume[i])) {
- volumeInc[i] = 0;
- prevVolume[i] = volume[i] << 16;
- mVolumeInc[i] = 0.;
- mPrevVolume[i] = mVolume[i];
- } else {
- //ALOGV("ramp: %f %f %f", mVolume[i], mPrevVolume[i], mVolumeInc[i]);
- prevVolume[i] = u4_28_from_float(mPrevVolume[i]);
- }
- }
- } else {
- for (uint32_t i = 0; i < MAX_NUM_VOLUMES; i++) {
- if (((volumeInc[i]>0) && (((prevVolume[i]+volumeInc[i])>>16) >= volume[i])) ||
- ((volumeInc[i]<0) && (((prevVolume[i]+volumeInc[i])>>16) <= volume[i]))) {
- volumeInc[i] = 0;
- prevVolume[i] = volume[i] << 16;
- mVolumeInc[i] = 0.;
- mPrevVolume[i] = mVolume[i];
- } else {
- //ALOGV("ramp: %d %d %d", volume[i] << 16, prevVolume[i], volumeInc[i]);
- mPrevVolume[i] = float_from_u4_28(prevVolume[i]);
- }
- }
- }
- /* TODO: aux is always integer regardless of output buffer type */
- if (aux) {
- if (((auxInc>0) && (((prevAuxLevel+auxInc)>>16) >= auxLevel)) ||
- ((auxInc<0) && (((prevAuxLevel+auxInc)>>16) <= auxLevel))) {
- auxInc = 0;
- prevAuxLevel = auxLevel << 16;
- mAuxInc = 0.;
- mPrevAuxLevel = mAuxLevel;
- } else {
- //ALOGV("aux ramp: %d %d %d", auxLevel << 16, prevAuxLevel, auxInc);
- }
- }
-}
-
-size_t AudioMixer::getUnreleasedFrames(int name) const
-{
- name -= TRACK0;
- if (uint32_t(name) < MAX_NUM_TRACKS) {
- return mState.tracks[name].getUnreleasedFrames();
- }
- return 0;
-}
-
-void AudioMixer::setBufferProvider(int name, AudioBufferProvider* bufferProvider)
-{
- name -= TRACK0;
- ALOG_ASSERT(uint32_t(name) < MAX_NUM_TRACKS, "bad track name %d", name);
-
- if (mState.tracks[name].mInputBufferProvider == bufferProvider) {
- return; // don't reset any buffer providers if identical.
- }
- if (mState.tracks[name].mReformatBufferProvider != NULL) {
- mState.tracks[name].mReformatBufferProvider->reset();
- } else if (mState.tracks[name].downmixerBufferProvider != NULL) {
- mState.tracks[name].downmixerBufferProvider->reset();
- } else if (mState.tracks[name].mPostDownmixReformatBufferProvider != NULL) {
- mState.tracks[name].mPostDownmixReformatBufferProvider->reset();
- } else if (mState.tracks[name].mTimestretchBufferProvider != NULL) {
- mState.tracks[name].mTimestretchBufferProvider->reset();
- }
-
- mState.tracks[name].mInputBufferProvider = bufferProvider;
- mState.tracks[name].reconfigureBufferProviders();
-}
-
-
-void AudioMixer::process()
-{
- mState.hook(&mState);
-}
-
-
-void AudioMixer::process__validate(state_t* state)
-{
- ALOGW_IF(!state->needsChanged,
- "in process__validate() but nothing's invalid");
-
- uint32_t changed = state->needsChanged;
- state->needsChanged = 0; // clear the validation flag
-
- // recompute which tracks are enabled / disabled
- uint32_t enabled = 0;
- uint32_t disabled = 0;
- while (changed) {
- const int i = 31 - __builtin_clz(changed);
- const uint32_t mask = 1<<i;
- changed &= ~mask;
- track_t& t = state->tracks[i];
- (t.enabled ? enabled : disabled) |= mask;
- }
- state->enabledTracks &= ~disabled;
- state->enabledTracks |= enabled;
-
- // compute everything we need...
- int countActiveTracks = 0;
- // TODO: fix all16BitsStereNoResample logic to
- // either properly handle muted tracks (it should ignore them)
- // or remove altogether as an obsolete optimization.
- bool all16BitsStereoNoResample = true;
- bool resampling = false;
- bool volumeRamp = false;
- uint32_t en = state->enabledTracks;
- while (en) {
- const int i = 31 - __builtin_clz(en);
- en &= ~(1<<i);
-
- countActiveTracks++;
- track_t& t = state->tracks[i];
- uint32_t n = 0;
- // FIXME can overflow (mask is only 3 bits)
- n |= NEEDS_CHANNEL_1 + t.channelCount - 1;
- if (t.doesResample()) {
- n |= NEEDS_RESAMPLE;
- }
- if (t.auxLevel != 0 && t.auxBuffer != NULL) {
- n |= NEEDS_AUX;
- }
-
- if (t.volumeInc[0]|t.volumeInc[1]) {
- volumeRamp = true;
- } else if (!t.doesResample() && t.volumeRL == 0) {
- n |= NEEDS_MUTE;
- }
- t.needs = n;
-
- if (n & NEEDS_MUTE) {
- t.hook = track__nop;
- } else {
- if (n & NEEDS_AUX) {
- all16BitsStereoNoResample = false;
- }
- if (n & NEEDS_RESAMPLE) {
- all16BitsStereoNoResample = false;
- resampling = true;
- t.hook = getTrackHook(TRACKTYPE_RESAMPLE, t.mMixerChannelCount,
- t.mMixerInFormat, t.mMixerFormat);
- ALOGV_IF((n & NEEDS_CHANNEL_COUNT__MASK) > NEEDS_CHANNEL_2,
- "Track %d needs downmix + resample", i);
- } else {
- if ((n & NEEDS_CHANNEL_COUNT__MASK) == NEEDS_CHANNEL_1){
- t.hook = getTrackHook(
- (t.mMixerChannelMask == AUDIO_CHANNEL_OUT_STEREO // TODO: MONO_HACK
- && t.channelMask == AUDIO_CHANNEL_OUT_MONO)
- ? TRACKTYPE_NORESAMPLEMONO : TRACKTYPE_NORESAMPLE,
- t.mMixerChannelCount,
- t.mMixerInFormat, t.mMixerFormat);
- all16BitsStereoNoResample = false;
- }
- if ((n & NEEDS_CHANNEL_COUNT__MASK) >= NEEDS_CHANNEL_2){
- t.hook = getTrackHook(TRACKTYPE_NORESAMPLE, t.mMixerChannelCount,
- t.mMixerInFormat, t.mMixerFormat);
- ALOGV_IF((n & NEEDS_CHANNEL_COUNT__MASK) > NEEDS_CHANNEL_2,
- "Track %d needs downmix", i);
- }
- }
- }
- }
-
- // select the processing hooks
- state->hook = process__nop;
- if (countActiveTracks > 0) {
- if (resampling) {
- if (!state->outputTemp) {
- state->outputTemp = new int32_t[MAX_NUM_CHANNELS * state->frameCount];
- }
- if (!state->resampleTemp) {
- state->resampleTemp = new int32_t[MAX_NUM_CHANNELS * state->frameCount];
- }
- state->hook = process__genericResampling;
- } else {
- if (state->outputTemp) {
- delete [] state->outputTemp;
- state->outputTemp = NULL;
- }
- if (state->resampleTemp) {
- delete [] state->resampleTemp;
- state->resampleTemp = NULL;
- }
- state->hook = process__genericNoResampling;
- if (all16BitsStereoNoResample && !volumeRamp) {
- if (countActiveTracks == 1) {
- const int i = 31 - __builtin_clz(state->enabledTracks);
- track_t& t = state->tracks[i];
- if ((t.needs & NEEDS_MUTE) == 0) {
- // The check prevents a muted track from acquiring a process hook.
- //
- // This is dangerous if the track is MONO as that requires
- // special case handling due to implicit channel duplication.
- // Stereo or Multichannel should actually be fine here.
- state->hook = getProcessHook(PROCESSTYPE_NORESAMPLEONETRACK,
- t.mMixerChannelCount, t.mMixerInFormat, t.mMixerFormat);
- }
- }
- }
- }
- }
-
- ALOGV("mixer configuration change: %d activeTracks (%08x) "
- "all16BitsStereoNoResample=%d, resampling=%d, volumeRamp=%d",
- countActiveTracks, state->enabledTracks,
- all16BitsStereoNoResample, resampling, volumeRamp);
-
- state->hook(state);
-
- // Now that the volume ramp has been done, set optimal state and
- // track hooks for subsequent mixer process
- if (countActiveTracks > 0) {
- bool allMuted = true;
- uint32_t en = state->enabledTracks;
- while (en) {
- const int i = 31 - __builtin_clz(en);
- en &= ~(1<<i);
- track_t& t = state->tracks[i];
- if (!t.doesResample() && t.volumeRL == 0) {
- t.needs |= NEEDS_MUTE;
- t.hook = track__nop;
- } else {
- allMuted = false;
- }
- }
- if (allMuted) {
- state->hook = process__nop;
- } else if (all16BitsStereoNoResample) {
- if (countActiveTracks == 1) {
- const int i = 31 - __builtin_clz(state->enabledTracks);
- track_t& t = state->tracks[i];
- // Muted single tracks handled by allMuted above.
- state->hook = getProcessHook(PROCESSTYPE_NORESAMPLEONETRACK,
- t.mMixerChannelCount, t.mMixerInFormat, t.mMixerFormat);
- }
- }
- }
-}
-
-
-void AudioMixer::track__genericResample(track_t* t, int32_t* out, size_t outFrameCount,
- int32_t* temp, int32_t* aux)
-{
- ALOGVV("track__genericResample\n");
- t->resampler->setSampleRate(t->sampleRate);
-
- // ramp gain - resample to temp buffer and scale/mix in 2nd step
- if (aux != NULL) {
- // always resample with unity gain when sending to auxiliary buffer to be able
- // to apply send level after resampling
- t->resampler->setVolume(UNITY_GAIN_FLOAT, UNITY_GAIN_FLOAT);
- memset(temp, 0, outFrameCount * t->mMixerChannelCount * sizeof(int32_t));
- t->resampler->resample(temp, outFrameCount, t->bufferProvider);
- if (CC_UNLIKELY(t->volumeInc[0]|t->volumeInc[1]|t->auxInc)) {
- volumeRampStereo(t, out, outFrameCount, temp, aux);
- } else {
- volumeStereo(t, out, outFrameCount, temp, aux);
- }
- } else {
- if (CC_UNLIKELY(t->volumeInc[0]|t->volumeInc[1])) {
- t->resampler->setVolume(UNITY_GAIN_FLOAT, UNITY_GAIN_FLOAT);
- memset(temp, 0, outFrameCount * MAX_NUM_CHANNELS * sizeof(int32_t));
- t->resampler->resample(temp, outFrameCount, t->bufferProvider);
- volumeRampStereo(t, out, outFrameCount, temp, aux);
- }
-
- // constant gain
- else {
- t->resampler->setVolume(t->mVolume[0], t->mVolume[1]);
- t->resampler->resample(out, outFrameCount, t->bufferProvider);
- }
- }
-}
-
-void AudioMixer::track__nop(track_t* t __unused, int32_t* out __unused,
- size_t outFrameCount __unused, int32_t* temp __unused, int32_t* aux __unused)
-{
-}
-
-void AudioMixer::volumeRampStereo(track_t* t, int32_t* out, size_t frameCount, int32_t* temp,
- int32_t* aux)
-{
- int32_t vl = t->prevVolume[0];
- int32_t vr = t->prevVolume[1];
- const int32_t vlInc = t->volumeInc[0];
- const int32_t vrInc = t->volumeInc[1];
-
- //ALOGD("[0] %p: inc=%f, v0=%f, v1=%d, final=%f, count=%d",
- // t, vlInc/65536.0f, vl/65536.0f, t->volume[0],
- // (vl + vlInc*frameCount)/65536.0f, frameCount);
-
- // ramp volume
- if (CC_UNLIKELY(aux != NULL)) {
- int32_t va = t->prevAuxLevel;
- const int32_t vaInc = t->auxInc;
- int32_t l;
- int32_t r;
-
- do {
- l = (*temp++ >> 12);
- r = (*temp++ >> 12);
- *out++ += (vl >> 16) * l;
- *out++ += (vr >> 16) * r;
- *aux++ += (va >> 17) * (l + r);
- vl += vlInc;
- vr += vrInc;
- va += vaInc;
- } while (--frameCount);
- t->prevAuxLevel = va;
- } else {
- do {
- *out++ += (vl >> 16) * (*temp++ >> 12);
- *out++ += (vr >> 16) * (*temp++ >> 12);
- vl += vlInc;
- vr += vrInc;
- } while (--frameCount);
- }
- t->prevVolume[0] = vl;
- t->prevVolume[1] = vr;
- t->adjustVolumeRamp(aux != NULL);
-}
-
-void AudioMixer::volumeStereo(track_t* t, int32_t* out, size_t frameCount, int32_t* temp,
- int32_t* aux)
-{
- const int16_t vl = t->volume[0];
- const int16_t vr = t->volume[1];
-
- if (CC_UNLIKELY(aux != NULL)) {
- const int16_t va = t->auxLevel;
- do {
- int16_t l = (int16_t)(*temp++ >> 12);
- int16_t r = (int16_t)(*temp++ >> 12);
- out[0] = mulAdd(l, vl, out[0]);
- int16_t a = (int16_t)(((int32_t)l + r) >> 1);
- out[1] = mulAdd(r, vr, out[1]);
- out += 2;
- aux[0] = mulAdd(a, va, aux[0]);
- aux++;
- } while (--frameCount);
- } else {
- do {
- int16_t l = (int16_t)(*temp++ >> 12);
- int16_t r = (int16_t)(*temp++ >> 12);
- out[0] = mulAdd(l, vl, out[0]);
- out[1] = mulAdd(r, vr, out[1]);
- out += 2;
- } while (--frameCount);
- }
-}
-
-void AudioMixer::track__16BitsStereo(track_t* t, int32_t* out, size_t frameCount,
- int32_t* temp __unused, int32_t* aux)
-{
- ALOGVV("track__16BitsStereo\n");
- const int16_t *in = static_cast<const int16_t *>(t->in);
-
- if (CC_UNLIKELY(aux != NULL)) {
- int32_t l;
- int32_t r;
- // ramp gain
- if (CC_UNLIKELY(t->volumeInc[0]|t->volumeInc[1]|t->auxInc)) {
- int32_t vl = t->prevVolume[0];
- int32_t vr = t->prevVolume[1];
- int32_t va = t->prevAuxLevel;
- const int32_t vlInc = t->volumeInc[0];
- const int32_t vrInc = t->volumeInc[1];
- const int32_t vaInc = t->auxInc;
- // ALOGD("[1] %p: inc=%f, v0=%f, v1=%d, final=%f, count=%d",
- // t, vlInc/65536.0f, vl/65536.0f, t->volume[0],
- // (vl + vlInc*frameCount)/65536.0f, frameCount);
-
- do {
- l = (int32_t)*in++;
- r = (int32_t)*in++;
- *out++ += (vl >> 16) * l;
- *out++ += (vr >> 16) * r;
- *aux++ += (va >> 17) * (l + r);
- vl += vlInc;
- vr += vrInc;
- va += vaInc;
- } while (--frameCount);
-
- t->prevVolume[0] = vl;
- t->prevVolume[1] = vr;
- t->prevAuxLevel = va;
- t->adjustVolumeRamp(true);
- }
-
- // constant gain
- else {
- const uint32_t vrl = t->volumeRL;
- const int16_t va = (int16_t)t->auxLevel;
- do {
- uint32_t rl = *reinterpret_cast<const uint32_t *>(in);
- int16_t a = (int16_t)(((int32_t)in[0] + in[1]) >> 1);
- in += 2;
- out[0] = mulAddRL(1, rl, vrl, out[0]);
- out[1] = mulAddRL(0, rl, vrl, out[1]);
- out += 2;
- aux[0] = mulAdd(a, va, aux[0]);
- aux++;
- } while (--frameCount);
- }
- } else {
- // ramp gain
- if (CC_UNLIKELY(t->volumeInc[0]|t->volumeInc[1])) {
- int32_t vl = t->prevVolume[0];
- int32_t vr = t->prevVolume[1];
- const int32_t vlInc = t->volumeInc[0];
- const int32_t vrInc = t->volumeInc[1];
-
- // ALOGD("[1] %p: inc=%f, v0=%f, v1=%d, final=%f, count=%d",
- // t, vlInc/65536.0f, vl/65536.0f, t->volume[0],
- // (vl + vlInc*frameCount)/65536.0f, frameCount);
-
- do {
- *out++ += (vl >> 16) * (int32_t) *in++;
- *out++ += (vr >> 16) * (int32_t) *in++;
- vl += vlInc;
- vr += vrInc;
- } while (--frameCount);
-
- t->prevVolume[0] = vl;
- t->prevVolume[1] = vr;
- t->adjustVolumeRamp(false);
- }
-
- // constant gain
- else {
- const uint32_t vrl = t->volumeRL;
- do {
- uint32_t rl = *reinterpret_cast<const uint32_t *>(in);
- in += 2;
- out[0] = mulAddRL(1, rl, vrl, out[0]);
- out[1] = mulAddRL(0, rl, vrl, out[1]);
- out += 2;
- } while (--frameCount);
- }
- }
- t->in = in;
-}
-
-void AudioMixer::track__16BitsMono(track_t* t, int32_t* out, size_t frameCount,
- int32_t* temp __unused, int32_t* aux)
-{
- ALOGVV("track__16BitsMono\n");
- const int16_t *in = static_cast<int16_t const *>(t->in);
-
- if (CC_UNLIKELY(aux != NULL)) {
- // ramp gain
- if (CC_UNLIKELY(t->volumeInc[0]|t->volumeInc[1]|t->auxInc)) {
- int32_t vl = t->prevVolume[0];
- int32_t vr = t->prevVolume[1];
- int32_t va = t->prevAuxLevel;
- const int32_t vlInc = t->volumeInc[0];
- const int32_t vrInc = t->volumeInc[1];
- const int32_t vaInc = t->auxInc;
-
- // ALOGD("[2] %p: inc=%f, v0=%f, v1=%d, final=%f, count=%d",
- // t, vlInc/65536.0f, vl/65536.0f, t->volume[0],
- // (vl + vlInc*frameCount)/65536.0f, frameCount);
-
- do {
- int32_t l = *in++;
- *out++ += (vl >> 16) * l;
- *out++ += (vr >> 16) * l;
- *aux++ += (va >> 16) * l;
- vl += vlInc;
- vr += vrInc;
- va += vaInc;
- } while (--frameCount);
-
- t->prevVolume[0] = vl;
- t->prevVolume[1] = vr;
- t->prevAuxLevel = va;
- t->adjustVolumeRamp(true);
- }
- // constant gain
- else {
- const int16_t vl = t->volume[0];
- const int16_t vr = t->volume[1];
- const int16_t va = (int16_t)t->auxLevel;
- do {
- int16_t l = *in++;
- out[0] = mulAdd(l, vl, out[0]);
- out[1] = mulAdd(l, vr, out[1]);
- out += 2;
- aux[0] = mulAdd(l, va, aux[0]);
- aux++;
- } while (--frameCount);
- }
- } else {
- // ramp gain
- if (CC_UNLIKELY(t->volumeInc[0]|t->volumeInc[1])) {
- int32_t vl = t->prevVolume[0];
- int32_t vr = t->prevVolume[1];
- const int32_t vlInc = t->volumeInc[0];
- const int32_t vrInc = t->volumeInc[1];
-
- // ALOGD("[2] %p: inc=%f, v0=%f, v1=%d, final=%f, count=%d",
- // t, vlInc/65536.0f, vl/65536.0f, t->volume[0],
- // (vl + vlInc*frameCount)/65536.0f, frameCount);
-
- do {
- int32_t l = *in++;
- *out++ += (vl >> 16) * l;
- *out++ += (vr >> 16) * l;
- vl += vlInc;
- vr += vrInc;
- } while (--frameCount);
-
- t->prevVolume[0] = vl;
- t->prevVolume[1] = vr;
- t->adjustVolumeRamp(false);
- }
- // constant gain
- else {
- const int16_t vl = t->volume[0];
- const int16_t vr = t->volume[1];
- do {
- int16_t l = *in++;
- out[0] = mulAdd(l, vl, out[0]);
- out[1] = mulAdd(l, vr, out[1]);
- out += 2;
- } while (--frameCount);
- }
- }
- t->in = in;
-}
-
-// no-op case
-void AudioMixer::process__nop(state_t* state)
-{
- ALOGVV("process__nop\n");
- uint32_t e0 = state->enabledTracks;
- while (e0) {
- // process by group of tracks with same output buffer to
- // avoid multiple memset() on same buffer
- uint32_t e1 = e0, e2 = e0;
- int i = 31 - __builtin_clz(e1);
- {
- track_t& t1 = state->tracks[i];
- e2 &= ~(1<<i);
- while (e2) {
- i = 31 - __builtin_clz(e2);
- e2 &= ~(1<<i);
- track_t& t2 = state->tracks[i];
- if (CC_UNLIKELY(t2.mainBuffer != t1.mainBuffer)) {
- e1 &= ~(1<<i);
- }
- }
- e0 &= ~(e1);
-
- memset(t1.mainBuffer, 0, state->frameCount * t1.mMixerChannelCount
- * audio_bytes_per_sample(t1.mMixerFormat));
- }
-
- while (e1) {
- i = 31 - __builtin_clz(e1);
- e1 &= ~(1<<i);
- {
- track_t& t3 = state->tracks[i];
- size_t outFrames = state->frameCount;
- while (outFrames) {
- t3.buffer.frameCount = outFrames;
- t3.bufferProvider->getNextBuffer(&t3.buffer);
- if (t3.buffer.raw == NULL) break;
- outFrames -= t3.buffer.frameCount;
- t3.bufferProvider->releaseBuffer(&t3.buffer);
- }
- }
- }
- }
-}
-
-// generic code without resampling
-void AudioMixer::process__genericNoResampling(state_t* state)
-{
- ALOGVV("process__genericNoResampling\n");
- int32_t outTemp[BLOCKSIZE * MAX_NUM_CHANNELS] __attribute__((aligned(32)));
-
- // acquire each track's buffer
- uint32_t enabledTracks = state->enabledTracks;
- uint32_t e0 = enabledTracks;
- while (e0) {
- const int i = 31 - __builtin_clz(e0);
- e0 &= ~(1<<i);
- track_t& t = state->tracks[i];
- t.buffer.frameCount = state->frameCount;
- t.bufferProvider->getNextBuffer(&t.buffer);
- t.frameCount = t.buffer.frameCount;
- t.in = t.buffer.raw;
- }
-
- e0 = enabledTracks;
- while (e0) {
- // process by group of tracks with same output buffer to
- // optimize cache use
- uint32_t e1 = e0, e2 = e0;
- int j = 31 - __builtin_clz(e1);
- track_t& t1 = state->tracks[j];
- e2 &= ~(1<<j);
- while (e2) {
- j = 31 - __builtin_clz(e2);
- e2 &= ~(1<<j);
- track_t& t2 = state->tracks[j];
- if (CC_UNLIKELY(t2.mainBuffer != t1.mainBuffer)) {
- e1 &= ~(1<<j);
- }
- }
- e0 &= ~(e1);
- // this assumes output 16 bits stereo, no resampling
- int32_t *out = t1.mainBuffer;
- size_t numFrames = 0;
- do {
- memset(outTemp, 0, sizeof(outTemp));
- e2 = e1;
- while (e2) {
- const int i = 31 - __builtin_clz(e2);
- e2 &= ~(1<<i);
- track_t& t = state->tracks[i];
- size_t outFrames = BLOCKSIZE;
- int32_t *aux = NULL;
- if (CC_UNLIKELY(t.needs & NEEDS_AUX)) {
- aux = t.auxBuffer + numFrames;
- }
- while (outFrames) {
- // t.in == NULL can happen if the track was flushed just after having
- // been enabled for mixing.
- if (t.in == NULL) {
- enabledTracks &= ~(1<<i);
- e1 &= ~(1<<i);
- break;
- }
- size_t inFrames = (t.frameCount > outFrames)?outFrames:t.frameCount;
- if (inFrames > 0) {
- t.hook(&t, outTemp + (BLOCKSIZE - outFrames) * t.mMixerChannelCount,
- inFrames, state->resampleTemp, aux);
- t.frameCount -= inFrames;
- outFrames -= inFrames;
- if (CC_UNLIKELY(aux != NULL)) {
- aux += inFrames;
- }
- }
- if (t.frameCount == 0 && outFrames) {
- t.bufferProvider->releaseBuffer(&t.buffer);
- t.buffer.frameCount = (state->frameCount - numFrames) -
- (BLOCKSIZE - outFrames);
- t.bufferProvider->getNextBuffer(&t.buffer);
- t.in = t.buffer.raw;
- if (t.in == NULL) {
- enabledTracks &= ~(1<<i);
- e1 &= ~(1<<i);
- break;
- }
- t.frameCount = t.buffer.frameCount;
- }
- }
- }
-
- convertMixerFormat(out, t1.mMixerFormat, outTemp, t1.mMixerInFormat,
- BLOCKSIZE * t1.mMixerChannelCount);
- // TODO: fix ugly casting due to choice of out pointer type
- out = reinterpret_cast<int32_t*>((uint8_t*)out
- + BLOCKSIZE * t1.mMixerChannelCount
- * audio_bytes_per_sample(t1.mMixerFormat));
- numFrames += BLOCKSIZE;
- } while (numFrames < state->frameCount);
- }
-
- // release each track's buffer
- e0 = enabledTracks;
- while (e0) {
- const int i = 31 - __builtin_clz(e0);
- e0 &= ~(1<<i);
- track_t& t = state->tracks[i];
- t.bufferProvider->releaseBuffer(&t.buffer);
- }
-}
-
-
-// generic code with resampling
-void AudioMixer::process__genericResampling(state_t* state)
-{
- ALOGVV("process__genericResampling\n");
- // this const just means that local variable outTemp doesn't change
- int32_t* const outTemp = state->outputTemp;
- size_t numFrames = state->frameCount;
-
- uint32_t e0 = state->enabledTracks;
- while (e0) {
- // process by group of tracks with same output buffer
- // to optimize cache use
- uint32_t e1 = e0, e2 = e0;
- int j = 31 - __builtin_clz(e1);
- track_t& t1 = state->tracks[j];
- e2 &= ~(1<<j);
- while (e2) {
- j = 31 - __builtin_clz(e2);
- e2 &= ~(1<<j);
- track_t& t2 = state->tracks[j];
- if (CC_UNLIKELY(t2.mainBuffer != t1.mainBuffer)) {
- e1 &= ~(1<<j);
- }
- }
- e0 &= ~(e1);
- int32_t *out = t1.mainBuffer;
- memset(outTemp, 0, sizeof(*outTemp) * t1.mMixerChannelCount * state->frameCount);
- while (e1) {
- const int i = 31 - __builtin_clz(e1);
- e1 &= ~(1<<i);
- track_t& t = state->tracks[i];
- int32_t *aux = NULL;
- if (CC_UNLIKELY(t.needs & NEEDS_AUX)) {
- aux = t.auxBuffer;
- }
-
- // this is a little goofy, on the resampling case we don't
- // acquire/release the buffers because it's done by
- // the resampler.
- if (t.needs & NEEDS_RESAMPLE) {
- t.hook(&t, outTemp, numFrames, state->resampleTemp, aux);
- } else {
-
- size_t outFrames = 0;
-
- while (outFrames < numFrames) {
- t.buffer.frameCount = numFrames - outFrames;
- t.bufferProvider->getNextBuffer(&t.buffer);
- t.in = t.buffer.raw;
- // t.in == NULL can happen if the track was flushed just after having
- // been enabled for mixing.
- if (t.in == NULL) break;
-
- if (CC_UNLIKELY(aux != NULL)) {
- aux += outFrames;
- }
- t.hook(&t, outTemp + outFrames * t.mMixerChannelCount, t.buffer.frameCount,
- state->resampleTemp, aux);
- outFrames += t.buffer.frameCount;
- t.bufferProvider->releaseBuffer(&t.buffer);
- }
- }
- }
- convertMixerFormat(out, t1.mMixerFormat,
- outTemp, t1.mMixerInFormat, numFrames * t1.mMixerChannelCount);
- }
-}
-
-// one track, 16 bits stereo without resampling is the most common case
-void AudioMixer::process__OneTrack16BitsStereoNoResampling(state_t* state)
-{
- ALOGVV("process__OneTrack16BitsStereoNoResampling\n");
- // This method is only called when state->enabledTracks has exactly
- // one bit set. The asserts below would verify this, but are commented out
- // since the whole point of this method is to optimize performance.
- //ALOG_ASSERT(0 != state->enabledTracks, "no tracks enabled");
- const int i = 31 - __builtin_clz(state->enabledTracks);
- //ALOG_ASSERT((1 << i) == state->enabledTracks, "more than 1 track enabled");
- const track_t& t = state->tracks[i];
-
- AudioBufferProvider::Buffer& b(t.buffer);
-
- int32_t* out = t.mainBuffer;
- float *fout = reinterpret_cast<float*>(out);
- size_t numFrames = state->frameCount;
-
- const int16_t vl = t.volume[0];
- const int16_t vr = t.volume[1];
- const uint32_t vrl = t.volumeRL;
- while (numFrames) {
- b.frameCount = numFrames;
- t.bufferProvider->getNextBuffer(&b);
- const int16_t *in = b.i16;
-
- // in == NULL can happen if the track was flushed just after having
- // been enabled for mixing.
- if (in == NULL || (((uintptr_t)in) & 3)) {
- if ( AUDIO_FORMAT_PCM_FLOAT == t.mMixerFormat ) {
- memset((char*)fout, 0, numFrames
- * t.mMixerChannelCount * audio_bytes_per_sample(t.mMixerFormat));
- } else {
- memset((char*)out, 0, numFrames
- * t.mMixerChannelCount * audio_bytes_per_sample(t.mMixerFormat));
- }
- ALOGE_IF((((uintptr_t)in) & 3),
- "process__OneTrack16BitsStereoNoResampling: misaligned buffer"
- " %p track %d, channels %d, needs %08x, volume %08x vfl %f vfr %f",
- in, i, t.channelCount, t.needs, vrl, t.mVolume[0], t.mVolume[1]);
- return;
- }
- size_t outFrames = b.frameCount;
-
- switch (t.mMixerFormat) {
- case AUDIO_FORMAT_PCM_FLOAT:
- do {
- uint32_t rl = *reinterpret_cast<const uint32_t *>(in);
- in += 2;
- int32_t l = mulRL(1, rl, vrl);
- int32_t r = mulRL(0, rl, vrl);
- *fout++ = float_from_q4_27(l);
- *fout++ = float_from_q4_27(r);
- // Note: In case of later int16_t sink output,
- // conversion and clamping is done by memcpy_to_i16_from_float().
- } while (--outFrames);
- break;
- case AUDIO_FORMAT_PCM_16_BIT:
- if (CC_UNLIKELY(uint32_t(vl) > UNITY_GAIN_INT || uint32_t(vr) > UNITY_GAIN_INT)) {
- // volume is boosted, so we might need to clamp even though
- // we process only one track.
- do {
- uint32_t rl = *reinterpret_cast<const uint32_t *>(in);
- in += 2;
- int32_t l = mulRL(1, rl, vrl) >> 12;
- int32_t r = mulRL(0, rl, vrl) >> 12;
- // clamping...
- l = clamp16(l);
- r = clamp16(r);
- *out++ = (r<<16) | (l & 0xFFFF);
- } while (--outFrames);
- } else {
- do {
- uint32_t rl = *reinterpret_cast<const uint32_t *>(in);
- in += 2;
- int32_t l = mulRL(1, rl, vrl) >> 12;
- int32_t r = mulRL(0, rl, vrl) >> 12;
- *out++ = (r<<16) | (l & 0xFFFF);
- } while (--outFrames);
- }
- break;
- default:
- LOG_ALWAYS_FATAL("bad mixer format: %d", t.mMixerFormat);
- }
- numFrames -= b.frameCount;
- t.bufferProvider->releaseBuffer(&b);
- }
-}
-
-/*static*/ pthread_once_t AudioMixer::sOnceControl = PTHREAD_ONCE_INIT;
-
-/*static*/ void AudioMixer::sInitRoutine()
-{
- DownmixerBufferProvider::init(); // for the downmixer
-}
-
-/* TODO: consider whether this level of optimization is necessary.
- * Perhaps just stick with a single for loop.
- */
-
-// Needs to derive a compile time constant (constexpr). Could be targeted to go
-// to a MONOVOL mixtype based on MAX_NUM_VOLUMES, but that's an unnecessary complication.
-#define MIXTYPE_MONOVOL(mixtype) ((mixtype) == MIXTYPE_MULTI ? MIXTYPE_MULTI_MONOVOL : \
- (mixtype) == MIXTYPE_MULTI_SAVEONLY ? MIXTYPE_MULTI_SAVEONLY_MONOVOL : (mixtype))
-
-/* MIXTYPE (see AudioMixerOps.h MIXTYPE_* enumeration)
- * TO: int32_t (Q4.27) or float
- * TI: int32_t (Q4.27) or int16_t (Q0.15) or float
- * TA: int32_t (Q4.27)
- */
-template <int MIXTYPE,
- typename TO, typename TI, typename TV, typename TA, typename TAV>
-static void volumeRampMulti(uint32_t channels, TO* out, size_t frameCount,
- const TI* in, TA* aux, TV *vol, const TV *volinc, TAV *vola, TAV volainc)
-{
- switch (channels) {
- case 1:
- volumeRampMulti<MIXTYPE, 1>(out, frameCount, in, aux, vol, volinc, vola, volainc);
- break;
- case 2:
- volumeRampMulti<MIXTYPE, 2>(out, frameCount, in, aux, vol, volinc, vola, volainc);
- break;
- case 3:
- volumeRampMulti<MIXTYPE_MONOVOL(MIXTYPE), 3>(out,
- frameCount, in, aux, vol, volinc, vola, volainc);
- break;
- case 4:
- volumeRampMulti<MIXTYPE_MONOVOL(MIXTYPE), 4>(out,
- frameCount, in, aux, vol, volinc, vola, volainc);
- break;
- case 5:
- volumeRampMulti<MIXTYPE_MONOVOL(MIXTYPE), 5>(out,
- frameCount, in, aux, vol, volinc, vola, volainc);
- break;
- case 6:
- volumeRampMulti<MIXTYPE_MONOVOL(MIXTYPE), 6>(out,
- frameCount, in, aux, vol, volinc, vola, volainc);
- break;
- case 7:
- volumeRampMulti<MIXTYPE_MONOVOL(MIXTYPE), 7>(out,
- frameCount, in, aux, vol, volinc, vola, volainc);
- break;
- case 8:
- volumeRampMulti<MIXTYPE_MONOVOL(MIXTYPE), 8>(out,
- frameCount, in, aux, vol, volinc, vola, volainc);
- break;
- }
-}
-
-/* MIXTYPE (see AudioMixerOps.h MIXTYPE_* enumeration)
- * TO: int32_t (Q4.27) or float
- * TI: int32_t (Q4.27) or int16_t (Q0.15) or float
- * TA: int32_t (Q4.27)
- */
-template <int MIXTYPE,
- typename TO, typename TI, typename TV, typename TA, typename TAV>
-static void volumeMulti(uint32_t channels, TO* out, size_t frameCount,
- const TI* in, TA* aux, const TV *vol, TAV vola)
-{
- switch (channels) {
- case 1:
- volumeMulti<MIXTYPE, 1>(out, frameCount, in, aux, vol, vola);
- break;
- case 2:
- volumeMulti<MIXTYPE, 2>(out, frameCount, in, aux, vol, vola);
- break;
- case 3:
- volumeMulti<MIXTYPE_MONOVOL(MIXTYPE), 3>(out, frameCount, in, aux, vol, vola);
- break;
- case 4:
- volumeMulti<MIXTYPE_MONOVOL(MIXTYPE), 4>(out, frameCount, in, aux, vol, vola);
- break;
- case 5:
- volumeMulti<MIXTYPE_MONOVOL(MIXTYPE), 5>(out, frameCount, in, aux, vol, vola);
- break;
- case 6:
- volumeMulti<MIXTYPE_MONOVOL(MIXTYPE), 6>(out, frameCount, in, aux, vol, vola);
- break;
- case 7:
- volumeMulti<MIXTYPE_MONOVOL(MIXTYPE), 7>(out, frameCount, in, aux, vol, vola);
- break;
- case 8:
- volumeMulti<MIXTYPE_MONOVOL(MIXTYPE), 8>(out, frameCount, in, aux, vol, vola);
- break;
- }
-}
-
-/* MIXTYPE (see AudioMixerOps.h MIXTYPE_* enumeration)
- * USEFLOATVOL (set to true if float volume is used)
- * ADJUSTVOL (set to true if volume ramp parameters needs adjustment afterwards)
- * TO: int32_t (Q4.27) or float
- * TI: int32_t (Q4.27) or int16_t (Q0.15) or float
- * TA: int32_t (Q4.27)
- */
-template <int MIXTYPE, bool USEFLOATVOL, bool ADJUSTVOL,
- typename TO, typename TI, typename TA>
-void AudioMixer::volumeMix(TO *out, size_t outFrames,
- const TI *in, TA *aux, bool ramp, AudioMixer::track_t *t)
-{
- if (USEFLOATVOL) {
- if (ramp) {
- volumeRampMulti<MIXTYPE>(t->mMixerChannelCount, out, outFrames, in, aux,
- t->mPrevVolume, t->mVolumeInc, &t->prevAuxLevel, t->auxInc);
- if (ADJUSTVOL) {
- t->adjustVolumeRamp(aux != NULL, true);
- }
- } else {
- volumeMulti<MIXTYPE>(t->mMixerChannelCount, out, outFrames, in, aux,
- t->mVolume, t->auxLevel);
- }
- } else {
- if (ramp) {
- volumeRampMulti<MIXTYPE>(t->mMixerChannelCount, out, outFrames, in, aux,
- t->prevVolume, t->volumeInc, &t->prevAuxLevel, t->auxInc);
- if (ADJUSTVOL) {
- t->adjustVolumeRamp(aux != NULL);
- }
- } else {
- volumeMulti<MIXTYPE>(t->mMixerChannelCount, out, outFrames, in, aux,
- t->volume, t->auxLevel);
- }
- }
-}
-
-/* This process hook is called when there is a single track without
- * aux buffer, volume ramp, or resampling.
- * TODO: Update the hook selection: this can properly handle aux and ramp.
- *
- * MIXTYPE (see AudioMixerOps.h MIXTYPE_* enumeration)
- * TO: int32_t (Q4.27) or float
- * TI: int32_t (Q4.27) or int16_t (Q0.15) or float
- * TA: int32_t (Q4.27)
- */
-template <int MIXTYPE, typename TO, typename TI, typename TA>
-void AudioMixer::process_NoResampleOneTrack(state_t* state)
-{
- ALOGVV("process_NoResampleOneTrack\n");
- // CLZ is faster than CTZ on ARM, though really not sure if true after 31 - clz.
- const int i = 31 - __builtin_clz(state->enabledTracks);
- ALOG_ASSERT((1 << i) == state->enabledTracks, "more than 1 track enabled");
- track_t *t = &state->tracks[i];
- const uint32_t channels = t->mMixerChannelCount;
- TO* out = reinterpret_cast<TO*>(t->mainBuffer);
- TA* aux = reinterpret_cast<TA*>(t->auxBuffer);
- const bool ramp = t->needsRamp();
-
- for (size_t numFrames = state->frameCount; numFrames; ) {
- AudioBufferProvider::Buffer& b(t->buffer);
- // get input buffer
- b.frameCount = numFrames;
- t->bufferProvider->getNextBuffer(&b);
- const TI *in = reinterpret_cast<TI*>(b.raw);
-
- // in == NULL can happen if the track was flushed just after having
- // been enabled for mixing.
- if (in == NULL || (((uintptr_t)in) & 3)) {
- memset(out, 0, numFrames
- * channels * audio_bytes_per_sample(t->mMixerFormat));
- ALOGE_IF((((uintptr_t)in) & 3), "process_NoResampleOneTrack: bus error: "
- "buffer %p track %p, channels %d, needs %#x",
- in, t, t->channelCount, t->needs);
- return;
- }
-
- const size_t outFrames = b.frameCount;
- volumeMix<MIXTYPE, is_same<TI, float>::value, false> (
- out, outFrames, in, aux, ramp, t);
-
- out += outFrames * channels;
- if (aux != NULL) {
- aux += channels;
- }
- numFrames -= b.frameCount;
-
- // release buffer
- t->bufferProvider->releaseBuffer(&b);
- }
- if (ramp) {
- t->adjustVolumeRamp(aux != NULL, is_same<TI, float>::value);
- }
-}
-
-/* This track hook is called to do resampling then mixing,
- * pulling from the track's upstream AudioBufferProvider.
- *
- * MIXTYPE (see AudioMixerOps.h MIXTYPE_* enumeration)
- * TO: int32_t (Q4.27) or float
- * TI: int32_t (Q4.27) or int16_t (Q0.15) or float
- * TA: int32_t (Q4.27)
- */
-template <int MIXTYPE, typename TO, typename TI, typename TA>
-void AudioMixer::track__Resample(track_t* t, TO* out, size_t outFrameCount, TO* temp, TA* aux)
-{
- ALOGVV("track__Resample\n");
- t->resampler->setSampleRate(t->sampleRate);
- const bool ramp = t->needsRamp();
- if (ramp || aux != NULL) {
- // if ramp: resample with unity gain to temp buffer and scale/mix in 2nd step.
- // if aux != NULL: resample with unity gain to temp buffer then apply send level.
-
- t->resampler->setVolume(UNITY_GAIN_FLOAT, UNITY_GAIN_FLOAT);
- memset(temp, 0, outFrameCount * t->mMixerChannelCount * sizeof(TO));
- t->resampler->resample((int32_t*)temp, outFrameCount, t->bufferProvider);
-
- volumeMix<MIXTYPE, is_same<TI, float>::value, true>(
- out, outFrameCount, temp, aux, ramp, t);
-
- } else { // constant volume gain
- t->resampler->setVolume(t->mVolume[0], t->mVolume[1]);
- t->resampler->resample((int32_t*)out, outFrameCount, t->bufferProvider);
- }
-}
-
-/* This track hook is called to mix a track, when no resampling is required.
- * The input buffer should be present in t->in.
- *
- * MIXTYPE (see AudioMixerOps.h MIXTYPE_* enumeration)
- * TO: int32_t (Q4.27) or float
- * TI: int32_t (Q4.27) or int16_t (Q0.15) or float
- * TA: int32_t (Q4.27)
- */
-template <int MIXTYPE, typename TO, typename TI, typename TA>
-void AudioMixer::track__NoResample(track_t* t, TO* out, size_t frameCount,
- TO* temp __unused, TA* aux)
-{
- ALOGVV("track__NoResample\n");
- const TI *in = static_cast<const TI *>(t->in);
-
- volumeMix<MIXTYPE, is_same<TI, float>::value, true>(
- out, frameCount, in, aux, t->needsRamp(), t);
-
- // MIXTYPE_MONOEXPAND reads a single input channel and expands to NCHAN output channels.
- // MIXTYPE_MULTI reads NCHAN input channels and places to NCHAN output channels.
- in += (MIXTYPE == MIXTYPE_MONOEXPAND) ? frameCount : frameCount * t->mMixerChannelCount;
- t->in = in;
-}
-
-/* The Mixer engine generates either int32_t (Q4_27) or float data.
- * We use this function to convert the engine buffers
- * to the desired mixer output format, either int16_t (Q.15) or float.
- */
-void AudioMixer::convertMixerFormat(void *out, audio_format_t mixerOutFormat,
- void *in, audio_format_t mixerInFormat, size_t sampleCount)
-{
- switch (mixerInFormat) {
- case AUDIO_FORMAT_PCM_FLOAT:
- switch (mixerOutFormat) {
- case AUDIO_FORMAT_PCM_FLOAT:
- memcpy(out, in, sampleCount * sizeof(float)); // MEMCPY. TODO optimize out
- break;
- case AUDIO_FORMAT_PCM_16_BIT:
- memcpy_to_i16_from_float((int16_t*)out, (float*)in, sampleCount);
- break;
- default:
- LOG_ALWAYS_FATAL("bad mixerOutFormat: %#x", mixerOutFormat);
- break;
- }
- break;
- case AUDIO_FORMAT_PCM_16_BIT:
- switch (mixerOutFormat) {
- case AUDIO_FORMAT_PCM_FLOAT:
- memcpy_to_float_from_q4_27((float*)out, (int32_t*)in, sampleCount);
- break;
- case AUDIO_FORMAT_PCM_16_BIT:
- // two int16_t are produced per iteration
- ditherAndClamp((int32_t*)out, (int32_t*)in, sampleCount >> 1);
- break;
- default:
- LOG_ALWAYS_FATAL("bad mixerOutFormat: %#x", mixerOutFormat);
- break;
- }
- break;
- default:
- LOG_ALWAYS_FATAL("bad mixerInFormat: %#x", mixerInFormat);
- break;
- }
-}
-
-/* Returns the proper track hook to use for mixing the track into the output buffer.
- */
-AudioMixer::hook_t AudioMixer::getTrackHook(int trackType, uint32_t channelCount,
- audio_format_t mixerInFormat, audio_format_t mixerOutFormat __unused)
-{
- if (!kUseNewMixer && channelCount == FCC_2 && mixerInFormat == AUDIO_FORMAT_PCM_16_BIT) {
- switch (trackType) {
- case TRACKTYPE_NOP:
- return track__nop;
- case TRACKTYPE_RESAMPLE:
- return track__genericResample;
- case TRACKTYPE_NORESAMPLEMONO:
- return track__16BitsMono;
- case TRACKTYPE_NORESAMPLE:
- return track__16BitsStereo;
- default:
- LOG_ALWAYS_FATAL("bad trackType: %d", trackType);
- break;
- }
- }
- LOG_ALWAYS_FATAL_IF(channelCount > MAX_NUM_CHANNELS);
- switch (trackType) {
- case TRACKTYPE_NOP:
- return track__nop;
- case TRACKTYPE_RESAMPLE:
- switch (mixerInFormat) {
- case AUDIO_FORMAT_PCM_FLOAT:
- return (AudioMixer::hook_t)
- track__Resample<MIXTYPE_MULTI, float /*TO*/, float /*TI*/, int32_t /*TA*/>;
- case AUDIO_FORMAT_PCM_16_BIT:
- return (AudioMixer::hook_t)\
- track__Resample<MIXTYPE_MULTI, int32_t, int16_t, int32_t>;
- default:
- LOG_ALWAYS_FATAL("bad mixerInFormat: %#x", mixerInFormat);
- break;
- }
- break;
- case TRACKTYPE_NORESAMPLEMONO:
- switch (mixerInFormat) {
- case AUDIO_FORMAT_PCM_FLOAT:
- return (AudioMixer::hook_t)
- track__NoResample<MIXTYPE_MONOEXPAND, float, float, int32_t>;
- case AUDIO_FORMAT_PCM_16_BIT:
- return (AudioMixer::hook_t)
- track__NoResample<MIXTYPE_MONOEXPAND, int32_t, int16_t, int32_t>;
- default:
- LOG_ALWAYS_FATAL("bad mixerInFormat: %#x", mixerInFormat);
- break;
- }
- break;
- case TRACKTYPE_NORESAMPLE:
- switch (mixerInFormat) {
- case AUDIO_FORMAT_PCM_FLOAT:
- return (AudioMixer::hook_t)
- track__NoResample<MIXTYPE_MULTI, float, float, int32_t>;
- case AUDIO_FORMAT_PCM_16_BIT:
- return (AudioMixer::hook_t)
- track__NoResample<MIXTYPE_MULTI, int32_t, int16_t, int32_t>;
- default:
- LOG_ALWAYS_FATAL("bad mixerInFormat: %#x", mixerInFormat);
- break;
- }
- break;
- default:
- LOG_ALWAYS_FATAL("bad trackType: %d", trackType);
- break;
- }
- return NULL;
-}
-
-/* Returns the proper process hook for mixing tracks. Currently works only for
- * PROCESSTYPE_NORESAMPLEONETRACK, a mix involving one track, no resampling.
- *
- * TODO: Due to the special mixing considerations of duplicating to
- * a stereo output track, the input track cannot be MONO. This should be
- * prevented by the caller.
- */
-AudioMixer::process_hook_t AudioMixer::getProcessHook(int processType, uint32_t channelCount,
- audio_format_t mixerInFormat, audio_format_t mixerOutFormat)
-{
- if (processType != PROCESSTYPE_NORESAMPLEONETRACK) { // Only NORESAMPLEONETRACK
- LOG_ALWAYS_FATAL("bad processType: %d", processType);
- return NULL;
- }
- if (!kUseNewMixer && channelCount == FCC_2 && mixerInFormat == AUDIO_FORMAT_PCM_16_BIT) {
- return process__OneTrack16BitsStereoNoResampling;
- }
- LOG_ALWAYS_FATAL_IF(channelCount > MAX_NUM_CHANNELS);
- switch (mixerInFormat) {
- case AUDIO_FORMAT_PCM_FLOAT:
- switch (mixerOutFormat) {
- case AUDIO_FORMAT_PCM_FLOAT:
- return process_NoResampleOneTrack<MIXTYPE_MULTI_SAVEONLY,
- float /*TO*/, float /*TI*/, int32_t /*TA*/>;
- case AUDIO_FORMAT_PCM_16_BIT:
- return process_NoResampleOneTrack<MIXTYPE_MULTI_SAVEONLY,
- int16_t, float, int32_t>;
- default:
- LOG_ALWAYS_FATAL("bad mixerOutFormat: %#x", mixerOutFormat);
- break;
- }
- break;
- case AUDIO_FORMAT_PCM_16_BIT:
- switch (mixerOutFormat) {
- case AUDIO_FORMAT_PCM_FLOAT:
- return process_NoResampleOneTrack<MIXTYPE_MULTI_SAVEONLY,
- float, int16_t, int32_t>;
- case AUDIO_FORMAT_PCM_16_BIT:
- return process_NoResampleOneTrack<MIXTYPE_MULTI_SAVEONLY,
- int16_t, int16_t, int32_t>;
- default:
- LOG_ALWAYS_FATAL("bad mixerOutFormat: %#x", mixerOutFormat);
- break;
- }
- break;
- default:
- LOG_ALWAYS_FATAL("bad mixerInFormat: %#x", mixerInFormat);
- break;
- }
- return NULL;
-}
-
-// ----------------------------------------------------------------------------
-} // namespace android
diff --git a/services/audioflinger/AudioMixer.h b/services/audioflinger/AudioMixer.h
deleted file mode 100644
index 540caac..0000000
--- a/services/audioflinger/AudioMixer.h
+++ /dev/null
@@ -1,390 +0,0 @@
-/*
-**
-** Copyright 2007, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-** http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
-
-#ifndef ANDROID_AUDIO_MIXER_H
-#define ANDROID_AUDIO_MIXER_H
-
-#include <stdint.h>
-#include <sys/types.h>
-
-#include <media/AudioBufferProvider.h>
-#include <media/AudioResamplerPublic.h>
-#include <media/nbaio/NBLog.h>
-#include <system/audio.h>
-#include <utils/Compat.h>
-#include <utils/threads.h>
-
-#include "AudioResampler.h"
-#include "BufferProviders.h"
-
-// FIXME This is actually unity gain, which might not be max in future, expressed in U.12
-#define MAX_GAIN_INT AudioMixer::UNITY_GAIN_INT
-
-namespace android {
-
-// ----------------------------------------------------------------------------
-
-class AudioMixer
-{
-public:
- AudioMixer(size_t frameCount, uint32_t sampleRate,
- uint32_t maxNumTracks = MAX_NUM_TRACKS);
-
- /*virtual*/ ~AudioMixer(); // non-virtual saves a v-table, restore if sub-classed
-
-
- // This mixer has a hard-coded upper limit of 32 active track inputs.
- // Adding support for > 32 tracks would require more than simply changing this value.
- static const uint32_t MAX_NUM_TRACKS = 32;
- // maximum number of channels supported by the mixer
-
- // This mixer has a hard-coded upper limit of 8 channels for output.
- static const uint32_t MAX_NUM_CHANNELS = 8;
- static const uint32_t MAX_NUM_VOLUMES = 2; // stereo volume only
- // maximum number of channels supported for the content
- static const uint32_t MAX_NUM_CHANNELS_TO_DOWNMIX = AUDIO_CHANNEL_COUNT_MAX;
-
- static const uint16_t UNITY_GAIN_INT = 0x1000;
- static const CONSTEXPR float UNITY_GAIN_FLOAT = 1.0f;
-
- enum { // names
-
- // track names (MAX_NUM_TRACKS units)
- TRACK0 = 0x1000,
-
- // 0x2000 is unused
-
- // setParameter targets
- TRACK = 0x3000,
- RESAMPLE = 0x3001,
- RAMP_VOLUME = 0x3002, // ramp to new volume
- VOLUME = 0x3003, // don't ramp
- TIMESTRETCH = 0x3004,
-
- // set Parameter names
- // for target TRACK
- CHANNEL_MASK = 0x4000,
- FORMAT = 0x4001,
- MAIN_BUFFER = 0x4002,
- AUX_BUFFER = 0x4003,
- DOWNMIX_TYPE = 0X4004,
- MIXER_FORMAT = 0x4005, // AUDIO_FORMAT_PCM_(FLOAT|16_BIT)
- MIXER_CHANNEL_MASK = 0x4006, // Channel mask for mixer output
- // for target RESAMPLE
- SAMPLE_RATE = 0x4100, // Configure sample rate conversion on this track name;
- // parameter 'value' is the new sample rate in Hz.
- // Only creates a sample rate converter the first time that
- // the track sample rate is different from the mix sample rate.
- // If the new sample rate is the same as the mix sample rate,
- // and a sample rate converter already exists,
- // then the sample rate converter remains present but is a no-op.
- RESET = 0x4101, // Reset sample rate converter without changing sample rate.
- // This clears out the resampler's input buffer.
- REMOVE = 0x4102, // Remove the sample rate converter on this track name;
- // the track is restored to the mix sample rate.
- // for target RAMP_VOLUME and VOLUME (8 channels max)
- // FIXME use float for these 3 to improve the dynamic range
- VOLUME0 = 0x4200,
- VOLUME1 = 0x4201,
- AUXLEVEL = 0x4210,
- // for target TIMESTRETCH
- PLAYBACK_RATE = 0x4300, // Configure timestretch on this track name;
- // parameter 'value' is a pointer to the new playback rate.
- };
-
-
- // For all APIs with "name": TRACK0 <= name < TRACK0 + MAX_NUM_TRACKS
-
- // Allocate a track name. Returns new track name if successful, -1 on failure.
- // The failure could be because of an invalid channelMask or format, or that
- // the track capacity of the mixer is exceeded.
- int getTrackName(audio_channel_mask_t channelMask,
- audio_format_t format, int sessionId);
-
- // Free an allocated track by name
- void deleteTrackName(int name);
-
- // Enable or disable an allocated track by name
- void enable(int name);
- void disable(int name);
-
- void setParameter(int name, int target, int param, void *value);
-
- void setBufferProvider(int name, AudioBufferProvider* bufferProvider);
- void process();
-
- uint32_t trackNames() const { return mTrackNames; }
-
- size_t getUnreleasedFrames(int name) const;
-
- static inline bool isValidPcmTrackFormat(audio_format_t format) {
- switch (format) {
- case AUDIO_FORMAT_PCM_8_BIT:
- case AUDIO_FORMAT_PCM_16_BIT:
- case AUDIO_FORMAT_PCM_24_BIT_PACKED:
- case AUDIO_FORMAT_PCM_32_BIT:
- case AUDIO_FORMAT_PCM_FLOAT:
- return true;
- default:
- return false;
- }
- }
-
-private:
-
- enum {
- // FIXME this representation permits up to 8 channels
- NEEDS_CHANNEL_COUNT__MASK = 0x00000007,
- };
-
- enum {
- NEEDS_CHANNEL_1 = 0x00000000, // mono
- NEEDS_CHANNEL_2 = 0x00000001, // stereo
-
- // sample format is not explicitly specified, and is assumed to be AUDIO_FORMAT_PCM_16_BIT
-
- NEEDS_MUTE = 0x00000100,
- NEEDS_RESAMPLE = 0x00001000,
- NEEDS_AUX = 0x00010000,
- };
-
- struct state_t;
- struct track_t;
-
- typedef void (*hook_t)(track_t* t, int32_t* output, size_t numOutFrames, int32_t* temp,
- int32_t* aux);
- static const int BLOCKSIZE = 16; // 4 cache lines
-
- struct track_t {
- uint32_t needs;
-
- // TODO: Eventually remove legacy integer volume settings
- union {
- int16_t volume[MAX_NUM_VOLUMES]; // U4.12 fixed point (top bit should be zero)
- int32_t volumeRL;
- };
-
- int32_t prevVolume[MAX_NUM_VOLUMES];
-
- // 16-byte boundary
-
- int32_t volumeInc[MAX_NUM_VOLUMES];
- int32_t auxInc;
- int32_t prevAuxLevel;
-
- // 16-byte boundary
-
- int16_t auxLevel; // 0 <= auxLevel <= MAX_GAIN_INT, but signed for mul performance
- uint16_t frameCount;
-
- uint8_t channelCount; // 1 or 2, redundant with (needs & NEEDS_CHANNEL_COUNT__MASK)
- uint8_t unused_padding; // formerly format, was always 16
- uint16_t enabled; // actually bool
- audio_channel_mask_t channelMask;
-
- // actual buffer provider used by the track hooks, see DownmixerBufferProvider below
- // for how the Track buffer provider is wrapped by another one when dowmixing is required
- AudioBufferProvider* bufferProvider;
-
- // 16-byte boundary
-
- mutable AudioBufferProvider::Buffer buffer; // 8 bytes
-
- hook_t hook;
- const void* in; // current location in buffer
-
- // 16-byte boundary
-
- AudioResampler* resampler;
- uint32_t sampleRate;
- int32_t* mainBuffer;
- int32_t* auxBuffer;
-
- // 16-byte boundary
-
- /* Buffer providers are constructed to translate the track input data as needed.
- *
- * TODO: perhaps make a single PlaybackConverterProvider class to move
- * all pre-mixer track buffer conversions outside the AudioMixer class.
- *
- * 1) mInputBufferProvider: The AudioTrack buffer provider.
- * 2) mReformatBufferProvider: If not NULL, performs the audio reformat to
- * match either mMixerInFormat or mDownmixRequiresFormat, if the downmixer
- * requires reformat. For example, it may convert floating point input to
- * PCM_16_bit if that's required by the downmixer.
- * 3) downmixerBufferProvider: If not NULL, performs the channel remixing to match
- * the number of channels required by the mixer sink.
- * 4) mPostDownmixReformatBufferProvider: If not NULL, performs reformatting from
- * the downmixer requirements to the mixer engine input requirements.
- * 5) mTimestretchBufferProvider: Adds timestretching for playback rate
- */
- AudioBufferProvider* mInputBufferProvider; // externally provided buffer provider.
- PassthruBufferProvider* mReformatBufferProvider; // provider wrapper for reformatting.
- PassthruBufferProvider* downmixerBufferProvider; // wrapper for channel conversion.
- PassthruBufferProvider* mPostDownmixReformatBufferProvider;
- PassthruBufferProvider* mTimestretchBufferProvider;
-
- int32_t sessionId;
-
- audio_format_t mMixerFormat; // output mix format: AUDIO_FORMAT_PCM_(FLOAT|16_BIT)
- audio_format_t mFormat; // input track format
- audio_format_t mMixerInFormat; // mix internal format AUDIO_FORMAT_PCM_(FLOAT|16_BIT)
- // each track must be converted to this format.
- audio_format_t mDownmixRequiresFormat; // required downmixer format
- // AUDIO_FORMAT_PCM_16_BIT if 16 bit necessary
- // AUDIO_FORMAT_INVALID if no required format
-
- float mVolume[MAX_NUM_VOLUMES]; // floating point set volume
- float mPrevVolume[MAX_NUM_VOLUMES]; // floating point previous volume
- float mVolumeInc[MAX_NUM_VOLUMES]; // floating point volume increment
-
- float mAuxLevel; // floating point set aux level
- float mPrevAuxLevel; // floating point prev aux level
- float mAuxInc; // floating point aux increment
-
- audio_channel_mask_t mMixerChannelMask;
- uint32_t mMixerChannelCount;
-
- AudioPlaybackRate mPlaybackRate;
-
- bool needsRamp() { return (volumeInc[0] | volumeInc[1] | auxInc) != 0; }
- bool setResampler(uint32_t trackSampleRate, uint32_t devSampleRate);
- bool doesResample() const { return resampler != NULL; }
- void resetResampler() { if (resampler != NULL) resampler->reset(); }
- void adjustVolumeRamp(bool aux, bool useFloat = false);
- size_t getUnreleasedFrames() const { return resampler != NULL ?
- resampler->getUnreleasedFrames() : 0; };
-
- status_t prepareForDownmix();
- void unprepareForDownmix();
- status_t prepareForReformat();
- void unprepareForReformat();
- bool setPlaybackRate(const AudioPlaybackRate &playbackRate);
- void reconfigureBufferProviders();
- };
-
- typedef void (*process_hook_t)(state_t* state);
-
- // pad to 32-bytes to fill cache line
- struct state_t {
- uint32_t enabledTracks;
- uint32_t needsChanged;
- size_t frameCount;
- process_hook_t hook; // one of process__*, never NULL
- int32_t *outputTemp;
- int32_t *resampleTemp;
- NBLog::Writer* mLog;
- int32_t reserved[1];
- // FIXME allocate dynamically to save some memory when maxNumTracks < MAX_NUM_TRACKS
- track_t tracks[MAX_NUM_TRACKS] __attribute__((aligned(32)));
- };
-
- // bitmask of allocated track names, where bit 0 corresponds to TRACK0 etc.
- uint32_t mTrackNames;
-
- // bitmask of configured track names; ~0 if maxNumTracks == MAX_NUM_TRACKS,
- // but will have fewer bits set if maxNumTracks < MAX_NUM_TRACKS
- const uint32_t mConfiguredNames;
-
- const uint32_t mSampleRate;
-
- NBLog::Writer mDummyLog;
-public:
- void setLog(NBLog::Writer* log);
-private:
- state_t mState __attribute__((aligned(32)));
-
- // Call after changing either the enabled status of a track, or parameters of an enabled track.
- // OK to call more often than that, but unnecessary.
- void invalidateState(uint32_t mask);
-
- bool setChannelMasks(int name,
- audio_channel_mask_t trackChannelMask, audio_channel_mask_t mixerChannelMask);
-
- static void track__genericResample(track_t* t, int32_t* out, size_t numFrames, int32_t* temp,
- int32_t* aux);
- static void track__nop(track_t* t, int32_t* out, size_t numFrames, int32_t* temp, int32_t* aux);
- static void track__16BitsStereo(track_t* t, int32_t* out, size_t numFrames, int32_t* temp,
- int32_t* aux);
- static void track__16BitsMono(track_t* t, int32_t* out, size_t numFrames, int32_t* temp,
- int32_t* aux);
- static void volumeRampStereo(track_t* t, int32_t* out, size_t frameCount, int32_t* temp,
- int32_t* aux);
- static void volumeStereo(track_t* t, int32_t* out, size_t frameCount, int32_t* temp,
- int32_t* aux);
-
- static void process__validate(state_t* state);
- static void process__nop(state_t* state);
- static void process__genericNoResampling(state_t* state);
- static void process__genericResampling(state_t* state);
- static void process__OneTrack16BitsStereoNoResampling(state_t* state);
-
- static pthread_once_t sOnceControl;
- static void sInitRoutine();
-
- /* multi-format volume mixing function (calls template functions
- * in AudioMixerOps.h). The template parameters are as follows:
- *
- * MIXTYPE (see AudioMixerOps.h MIXTYPE_* enumeration)
- * USEFLOATVOL (set to true if float volume is used)
- * ADJUSTVOL (set to true if volume ramp parameters needs adjustment afterwards)
- * TO: int32_t (Q4.27) or float
- * TI: int32_t (Q4.27) or int16_t (Q0.15) or float
- * TA: int32_t (Q4.27)
- */
- template <int MIXTYPE, bool USEFLOATVOL, bool ADJUSTVOL,
- typename TO, typename TI, typename TA>
- static void volumeMix(TO *out, size_t outFrames,
- const TI *in, TA *aux, bool ramp, AudioMixer::track_t *t);
-
- // multi-format process hooks
- template <int MIXTYPE, typename TO, typename TI, typename TA>
- static void process_NoResampleOneTrack(state_t* state);
-
- // multi-format track hooks
- template <int MIXTYPE, typename TO, typename TI, typename TA>
- static void track__Resample(track_t* t, TO* out, size_t frameCount,
- TO* temp __unused, TA* aux);
- template <int MIXTYPE, typename TO, typename TI, typename TA>
- static void track__NoResample(track_t* t, TO* out, size_t frameCount,
- TO* temp __unused, TA* aux);
-
- static void convertMixerFormat(void *out, audio_format_t mixerOutFormat,
- void *in, audio_format_t mixerInFormat, size_t sampleCount);
-
- // hook types
- enum {
- PROCESSTYPE_NORESAMPLEONETRACK,
- };
- enum {
- TRACKTYPE_NOP,
- TRACKTYPE_RESAMPLE,
- TRACKTYPE_NORESAMPLE,
- TRACKTYPE_NORESAMPLEMONO,
- };
-
- // functions for determining the proper process and track hooks.
- static process_hook_t getProcessHook(int processType, uint32_t channelCount,
- audio_format_t mixerInFormat, audio_format_t mixerOutFormat);
- static hook_t getTrackHook(int trackType, uint32_t channelCount,
- audio_format_t mixerInFormat, audio_format_t mixerOutFormat);
-};
-
-// ----------------------------------------------------------------------------
-} // namespace android
-
-#endif // ANDROID_AUDIO_MIXER_H
diff --git a/services/audioflinger/AudioMixerOps.h b/services/audioflinger/AudioMixerOps.h
deleted file mode 100644
index 8d74024..0000000
--- a/services/audioflinger/AudioMixerOps.h
+++ /dev/null
@@ -1,450 +0,0 @@
-/*
- * Copyright (C) 2014 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef ANDROID_AUDIO_MIXER_OPS_H
-#define ANDROID_AUDIO_MIXER_OPS_H
-
-namespace android {
-
-/* Behavior of is_same<>::value is true if the types are identical,
- * false otherwise. Identical to the STL std::is_same.
- */
-template<typename T, typename U>
-struct is_same
-{
- static const bool value = false;
-};
-
-template<typename T>
-struct is_same<T, T> // partial specialization
-{
- static const bool value = true;
-};
-
-
-/* MixMul is a multiplication operator to scale an audio input signal
- * by a volume gain, with the formula:
- *
- * O(utput) = I(nput) * V(olume)
- *
- * The output, input, and volume may have different types.
- * There are 27 variants, of which 14 are actually defined in an
- * explicitly templated class.
- *
- * The following type variables and the underlying meaning:
- *
- * Output type TO: int32_t (Q4.27) or int16_t (Q.15) or float [-1,1]
- * Input signal type TI: int32_t (Q4.27) or int16_t (Q.15) or float [-1,1]
- * Volume type TV: int32_t (U4.28) or int16_t (U4.12) or float [-1,1]
- *
- * For high precision audio, only the <TO, TI, TV> = <float, float, float>
- * needs to be accelerated. This is perhaps the easiest form to do quickly as well.
- *
- * A generic version is NOT defined to catch any mistake of using it.
- */
-
-template <typename TO, typename TI, typename TV>
-TO MixMul(TI value, TV volume);
-
-template <>
-inline int32_t MixMul<int32_t, int16_t, int16_t>(int16_t value, int16_t volume) {
- return value * volume;
-}
-
-template <>
-inline int32_t MixMul<int32_t, int32_t, int16_t>(int32_t value, int16_t volume) {
- return (value >> 12) * volume;
-}
-
-template <>
-inline int32_t MixMul<int32_t, int16_t, int32_t>(int16_t value, int32_t volume) {
- return value * (volume >> 16);
-}
-
-template <>
-inline int32_t MixMul<int32_t, int32_t, int32_t>(int32_t value, int32_t volume) {
- return (value >> 12) * (volume >> 16);
-}
-
-template <>
-inline float MixMul<float, float, int16_t>(float value, int16_t volume) {
- static const float norm = 1. / (1 << 12);
- return value * volume * norm;
-}
-
-template <>
-inline float MixMul<float, float, int32_t>(float value, int32_t volume) {
- static const float norm = 1. / (1 << 28);
- return value * volume * norm;
-}
-
-template <>
-inline int16_t MixMul<int16_t, float, int16_t>(float value, int16_t volume) {
- return clamp16_from_float(MixMul<float, float, int16_t>(value, volume));
-}
-
-template <>
-inline int16_t MixMul<int16_t, float, int32_t>(float value, int32_t volume) {
- return clamp16_from_float(MixMul<float, float, int32_t>(value, volume));
-}
-
-template <>
-inline float MixMul<float, int16_t, int16_t>(int16_t value, int16_t volume) {
- static const float norm = 1. / (1 << (15 + 12));
- return static_cast<float>(value) * static_cast<float>(volume) * norm;
-}
-
-template <>
-inline float MixMul<float, int16_t, int32_t>(int16_t value, int32_t volume) {
- static const float norm = 1. / (1ULL << (15 + 28));
- return static_cast<float>(value) * static_cast<float>(volume) * norm;
-}
-
-template <>
-inline int16_t MixMul<int16_t, int16_t, int16_t>(int16_t value, int16_t volume) {
- return clamp16(MixMul<int32_t, int16_t, int16_t>(value, volume) >> 12);
-}
-
-template <>
-inline int16_t MixMul<int16_t, int32_t, int16_t>(int32_t value, int16_t volume) {
- return clamp16(MixMul<int32_t, int32_t, int16_t>(value, volume) >> 12);
-}
-
-template <>
-inline int16_t MixMul<int16_t, int16_t, int32_t>(int16_t value, int32_t volume) {
- return clamp16(MixMul<int32_t, int16_t, int32_t>(value, volume) >> 12);
-}
-
-template <>
-inline int16_t MixMul<int16_t, int32_t, int32_t>(int32_t value, int32_t volume) {
- return clamp16(MixMul<int32_t, int32_t, int32_t>(value, volume) >> 12);
-}
-
-/* Required for floating point volume. Some are needed for compilation but
- * are not needed in execution and should be removed from the final build by
- * an optimizing compiler.
- */
-template <>
-inline float MixMul<float, float, float>(float value, float volume) {
- return value * volume;
-}
-
-template <>
-inline float MixMul<float, int16_t, float>(int16_t value, float volume) {
- static const float float_from_q_15 = 1. / (1 << 15);
- return value * volume * float_from_q_15;
-}
-
-template <>
-inline int32_t MixMul<int32_t, int32_t, float>(int32_t value, float volume) {
- LOG_ALWAYS_FATAL("MixMul<int32_t, int32_t, float> Runtime Should not be here");
- return value * volume;
-}
-
-template <>
-inline int32_t MixMul<int32_t, int16_t, float>(int16_t value, float volume) {
- LOG_ALWAYS_FATAL("MixMul<int32_t, int16_t, float> Runtime Should not be here");
- static const float u4_12_from_float = (1 << 12);
- return value * volume * u4_12_from_float;
-}
-
-template <>
-inline int16_t MixMul<int16_t, int16_t, float>(int16_t value, float volume) {
- LOG_ALWAYS_FATAL("MixMul<int16_t, int16_t, float> Runtime Should not be here");
- return clamp16_from_float(MixMul<float, int16_t, float>(value, volume));
-}
-
-template <>
-inline int16_t MixMul<int16_t, float, float>(float value, float volume) {
- return clamp16_from_float(value * volume);
-}
-
-/*
- * MixAccum is used to add into an accumulator register of a possibly different
- * type. The TO and TI types are the same as MixMul.
- */
-
-template <typename TO, typename TI>
-inline void MixAccum(TO *auxaccum, TI value) {
- if (!is_same<TO, TI>::value) {
- LOG_ALWAYS_FATAL("MixAccum type not properly specialized: %zu %zu\n",
- sizeof(TO), sizeof(TI));
- }
- *auxaccum += value;
-}
-
-template<>
-inline void MixAccum<float, int16_t>(float *auxaccum, int16_t value) {
- static const float norm = 1. / (1 << 15);
- *auxaccum += norm * value;
-}
-
-template<>
-inline void MixAccum<float, int32_t>(float *auxaccum, int32_t value) {
- static const float norm = 1. / (1 << 27);
- *auxaccum += norm * value;
-}
-
-template<>
-inline void MixAccum<int32_t, int16_t>(int32_t *auxaccum, int16_t value) {
- *auxaccum += value << 12;
-}
-
-template<>
-inline void MixAccum<int32_t, float>(int32_t *auxaccum, float value) {
- *auxaccum += clampq4_27_from_float(value);
-}
-
-/* MixMulAux is just like MixMul except it combines with
- * an accumulator operation MixAccum.
- */
-
-template <typename TO, typename TI, typename TV, typename TA>
-inline TO MixMulAux(TI value, TV volume, TA *auxaccum) {
- MixAccum<TA, TI>(auxaccum, value);
- return MixMul<TO, TI, TV>(value, volume);
-}
-
-/* MIXTYPE is used to determine how the samples in the input frame
- * are mixed with volume gain into the output frame.
- * See the volumeRampMulti functions below for more details.
- */
-enum {
- MIXTYPE_MULTI,
- MIXTYPE_MONOEXPAND,
- MIXTYPE_MULTI_SAVEONLY,
- MIXTYPE_MULTI_MONOVOL,
- MIXTYPE_MULTI_SAVEONLY_MONOVOL,
-};
-
-/*
- * The volumeRampMulti and volumeRamp functions take a MIXTYPE
- * which indicates the per-frame mixing and accumulation strategy.
- *
- * MIXTYPE_MULTI:
- * NCHAN represents number of input and output channels.
- * TO: int32_t (Q4.27) or float
- * TI: int32_t (Q4.27) or int16_t (Q0.15) or float
- * TV: int32_t (U4.28) or int16_t (U4.12) or float
- * vol: represents a volume array.
- *
- * This accumulates into the out pointer.
- *
- * MIXTYPE_MONOEXPAND:
- * Single input channel. NCHAN represents number of output channels.
- * TO: int32_t (Q4.27) or float
- * TI: int32_t (Q4.27) or int16_t (Q0.15) or float
- * TV: int32_t (U4.28) or int16_t (U4.12) or float
- * Input channel count is 1.
- * vol: represents volume array.
- *
- * This accumulates into the out pointer.
- *
- * MIXTYPE_MULTI_SAVEONLY:
- * NCHAN represents number of input and output channels.
- * TO: int16_t (Q.15) or float
- * TI: int32_t (Q4.27) or int16_t (Q0.15) or float
- * TV: int32_t (U4.28) or int16_t (U4.12) or float
- * vol: represents a volume array.
- *
- * MIXTYPE_MULTI_SAVEONLY does not accumulate into the out pointer.
- *
- * MIXTYPE_MULTI_MONOVOL:
- * Same as MIXTYPE_MULTI, but uses only volume[0].
- *
- * MIXTYPE_MULTI_SAVEONLY_MONOVOL:
- * Same as MIXTYPE_MULTI_SAVEONLY, but uses only volume[0].
- *
- */
-
-template <int MIXTYPE, int NCHAN,
- typename TO, typename TI, typename TV, typename TA, typename TAV>
-inline void volumeRampMulti(TO* out, size_t frameCount,
- const TI* in, TA* aux, TV *vol, const TV *volinc, TAV *vola, TAV volainc)
-{
-#ifdef ALOGVV
- ALOGVV("volumeRampMulti, MIXTYPE:%d\n", MIXTYPE);
-#endif
- if (aux != NULL) {
- do {
- TA auxaccum = 0;
- switch (MIXTYPE) {
- case MIXTYPE_MULTI:
- for (int i = 0; i < NCHAN; ++i) {
- *out++ += MixMulAux<TO, TI, TV, TA>(*in++, vol[i], &auxaccum);
- vol[i] += volinc[i];
- }
- break;
- case MIXTYPE_MONOEXPAND:
- for (int i = 0; i < NCHAN; ++i) {
- *out++ += MixMulAux<TO, TI, TV, TA>(*in, vol[i], &auxaccum);
- vol[i] += volinc[i];
- }
- in++;
- break;
- case MIXTYPE_MULTI_SAVEONLY:
- for (int i = 0; i < NCHAN; ++i) {
- *out++ = MixMulAux<TO, TI, TV, TA>(*in++, vol[i], &auxaccum);
- vol[i] += volinc[i];
- }
- break;
- case MIXTYPE_MULTI_MONOVOL:
- for (int i = 0; i < NCHAN; ++i) {
- *out++ += MixMulAux<TO, TI, TV, TA>(*in++, vol[0], &auxaccum);
- }
- vol[0] += volinc[0];
- break;
- case MIXTYPE_MULTI_SAVEONLY_MONOVOL:
- for (int i = 0; i < NCHAN; ++i) {
- *out++ = MixMulAux<TO, TI, TV, TA>(*in++, vol[0], &auxaccum);
- }
- vol[0] += volinc[0];
- break;
- default:
- LOG_ALWAYS_FATAL("invalid mixtype %d", MIXTYPE);
- break;
- }
- auxaccum /= NCHAN;
- *aux++ += MixMul<TA, TA, TAV>(auxaccum, *vola);
- vola[0] += volainc;
- } while (--frameCount);
- } else {
- do {
- switch (MIXTYPE) {
- case MIXTYPE_MULTI:
- for (int i = 0; i < NCHAN; ++i) {
- *out++ += MixMul<TO, TI, TV>(*in++, vol[i]);
- vol[i] += volinc[i];
- }
- break;
- case MIXTYPE_MONOEXPAND:
- for (int i = 0; i < NCHAN; ++i) {
- *out++ += MixMul<TO, TI, TV>(*in, vol[i]);
- vol[i] += volinc[i];
- }
- in++;
- break;
- case MIXTYPE_MULTI_SAVEONLY:
- for (int i = 0; i < NCHAN; ++i) {
- *out++ = MixMul<TO, TI, TV>(*in++, vol[i]);
- vol[i] += volinc[i];
- }
- break;
- case MIXTYPE_MULTI_MONOVOL:
- for (int i = 0; i < NCHAN; ++i) {
- *out++ += MixMul<TO, TI, TV>(*in++, vol[0]);
- }
- vol[0] += volinc[0];
- break;
- case MIXTYPE_MULTI_SAVEONLY_MONOVOL:
- for (int i = 0; i < NCHAN; ++i) {
- *out++ = MixMul<TO, TI, TV>(*in++, vol[0]);
- }
- vol[0] += volinc[0];
- break;
- default:
- LOG_ALWAYS_FATAL("invalid mixtype %d", MIXTYPE);
- break;
- }
- } while (--frameCount);
- }
-}
-
-template <int MIXTYPE, int NCHAN,
- typename TO, typename TI, typename TV, typename TA, typename TAV>
-inline void volumeMulti(TO* out, size_t frameCount,
- const TI* in, TA* aux, const TV *vol, TAV vola)
-{
-#ifdef ALOGVV
- ALOGVV("volumeMulti MIXTYPE:%d\n", MIXTYPE);
-#endif
- if (aux != NULL) {
- do {
- TA auxaccum = 0;
- switch (MIXTYPE) {
- case MIXTYPE_MULTI:
- for (int i = 0; i < NCHAN; ++i) {
- *out++ += MixMulAux<TO, TI, TV, TA>(*in++, vol[i], &auxaccum);
- }
- break;
- case MIXTYPE_MONOEXPAND:
- for (int i = 0; i < NCHAN; ++i) {
- *out++ += MixMulAux<TO, TI, TV, TA>(*in, vol[i], &auxaccum);
- }
- in++;
- break;
- case MIXTYPE_MULTI_SAVEONLY:
- for (int i = 0; i < NCHAN; ++i) {
- *out++ = MixMulAux<TO, TI, TV, TA>(*in++, vol[i], &auxaccum);
- }
- break;
- case MIXTYPE_MULTI_MONOVOL:
- for (int i = 0; i < NCHAN; ++i) {
- *out++ += MixMulAux<TO, TI, TV, TA>(*in++, vol[0], &auxaccum);
- }
- break;
- case MIXTYPE_MULTI_SAVEONLY_MONOVOL:
- for (int i = 0; i < NCHAN; ++i) {
- *out++ = MixMulAux<TO, TI, TV, TA>(*in++, vol[0], &auxaccum);
- }
- break;
- default:
- LOG_ALWAYS_FATAL("invalid mixtype %d", MIXTYPE);
- break;
- }
- auxaccum /= NCHAN;
- *aux++ += MixMul<TA, TA, TAV>(auxaccum, vola);
- } while (--frameCount);
- } else {
- do {
- switch (MIXTYPE) {
- case MIXTYPE_MULTI:
- for (int i = 0; i < NCHAN; ++i) {
- *out++ += MixMul<TO, TI, TV>(*in++, vol[i]);
- }
- break;
- case MIXTYPE_MONOEXPAND:
- for (int i = 0; i < NCHAN; ++i) {
- *out++ += MixMul<TO, TI, TV>(*in, vol[i]);
- }
- in++;
- break;
- case MIXTYPE_MULTI_SAVEONLY:
- for (int i = 0; i < NCHAN; ++i) {
- *out++ = MixMul<TO, TI, TV>(*in++, vol[i]);
- }
- break;
- case MIXTYPE_MULTI_MONOVOL:
- for (int i = 0; i < NCHAN; ++i) {
- *out++ += MixMul<TO, TI, TV>(*in++, vol[0]);
- }
- break;
- case MIXTYPE_MULTI_SAVEONLY_MONOVOL:
- for (int i = 0; i < NCHAN; ++i) {
- *out++ = MixMul<TO, TI, TV>(*in++, vol[0]);
- }
- break;
- default:
- LOG_ALWAYS_FATAL("invalid mixtype %d", MIXTYPE);
- break;
- }
- } while (--frameCount);
- }
-}
-
-};
-
-#endif /* ANDROID_AUDIO_MIXER_OPS_H */
diff --git a/services/audioflinger/AudioResampler.cpp b/services/audioflinger/AudioResampler.cpp
deleted file mode 100644
index 8b7259d..0000000
--- a/services/audioflinger/AudioResampler.cpp
+++ /dev/null
@@ -1,787 +0,0 @@
-/*
- * Copyright (C) 2007 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#define LOG_TAG "AudioResampler"
-//#define LOG_NDEBUG 0
-
-#include <pthread.h>
-#include <stdint.h>
-#include <stdlib.h>
-#include <sys/types.h>
-
-#include <cutils/properties.h>
-#include <log/log.h>
-
-#include <audio_utils/primitives.h>
-#include "AudioResampler.h"
-#include "AudioResamplerSinc.h"
-#include "AudioResamplerCubic.h"
-#include "AudioResamplerDyn.h"
-
-#ifdef __arm__
- // bug 13102576
- //#define ASM_ARM_RESAMP1 // enable asm optimisation for ResamplerOrder1
-#endif
-
-namespace android {
-
-// ----------------------------------------------------------------------------
-
-class AudioResamplerOrder1 : public AudioResampler {
-public:
- AudioResamplerOrder1(int inChannelCount, int32_t sampleRate) :
- AudioResampler(inChannelCount, sampleRate, LOW_QUALITY), mX0L(0), mX0R(0) {
- }
- virtual size_t resample(int32_t* out, size_t outFrameCount,
- AudioBufferProvider* provider);
-private:
- // number of bits used in interpolation multiply - 15 bits avoids overflow
- static const int kNumInterpBits = 15;
-
- // bits to shift the phase fraction down to avoid overflow
- static const int kPreInterpShift = kNumPhaseBits - kNumInterpBits;
-
- void init() {}
- size_t resampleMono16(int32_t* out, size_t outFrameCount,
- AudioBufferProvider* provider);
- size_t resampleStereo16(int32_t* out, size_t outFrameCount,
- AudioBufferProvider* provider);
-#ifdef ASM_ARM_RESAMP1 // asm optimisation for ResamplerOrder1
- void AsmMono16Loop(int16_t *in, int32_t* maxOutPt, int32_t maxInIdx,
- size_t &outputIndex, int32_t* out, size_t &inputIndex, int32_t vl, int32_t vr,
- uint32_t &phaseFraction, uint32_t phaseIncrement);
- void AsmStereo16Loop(int16_t *in, int32_t* maxOutPt, int32_t maxInIdx,
- size_t &outputIndex, int32_t* out, size_t &inputIndex, int32_t vl, int32_t vr,
- uint32_t &phaseFraction, uint32_t phaseIncrement);
-#endif // ASM_ARM_RESAMP1
-
- static inline int32_t Interp(int32_t x0, int32_t x1, uint32_t f) {
- return x0 + (((x1 - x0) * (int32_t)(f >> kPreInterpShift)) >> kNumInterpBits);
- }
- static inline void Advance(size_t* index, uint32_t* frac, uint32_t inc) {
- *frac += inc;
- *index += (size_t)(*frac >> kNumPhaseBits);
- *frac &= kPhaseMask;
- }
- int mX0L;
- int mX0R;
-};
-
-/*static*/
-const double AudioResampler::kPhaseMultiplier = 1L << AudioResampler::kNumPhaseBits;
-
-bool AudioResampler::qualityIsSupported(src_quality quality)
-{
- switch (quality) {
- case DEFAULT_QUALITY:
- case LOW_QUALITY:
- case MED_QUALITY:
- case HIGH_QUALITY:
- case VERY_HIGH_QUALITY:
- case DYN_LOW_QUALITY:
- case DYN_MED_QUALITY:
- case DYN_HIGH_QUALITY:
- return true;
- default:
- return false;
- }
-}
-
-// ----------------------------------------------------------------------------
-
-static pthread_once_t once_control = PTHREAD_ONCE_INIT;
-static AudioResampler::src_quality defaultQuality = AudioResampler::DEFAULT_QUALITY;
-
-void AudioResampler::init_routine()
-{
- char value[PROPERTY_VALUE_MAX];
- if (property_get("af.resampler.quality", value, NULL) > 0) {
- char *endptr;
- unsigned long l = strtoul(value, &endptr, 0);
- if (*endptr == '\0') {
- defaultQuality = (src_quality) l;
- ALOGD("forcing AudioResampler quality to %d", defaultQuality);
- if (defaultQuality < DEFAULT_QUALITY || defaultQuality > DYN_HIGH_QUALITY) {
- defaultQuality = DEFAULT_QUALITY;
- }
- }
- }
-}
-
-uint32_t AudioResampler::qualityMHz(src_quality quality)
-{
- switch (quality) {
- default:
- case DEFAULT_QUALITY:
- case LOW_QUALITY:
- return 3;
- case MED_QUALITY:
- return 6;
- case HIGH_QUALITY:
- return 20;
- case VERY_HIGH_QUALITY:
- return 34;
- case DYN_LOW_QUALITY:
- return 4;
- case DYN_MED_QUALITY:
- return 6;
- case DYN_HIGH_QUALITY:
- return 12;
- }
-}
-
-static const uint32_t maxMHz = 130; // an arbitrary number that permits 3 VHQ, should be tunable
-static pthread_mutex_t mutex = PTHREAD_MUTEX_INITIALIZER;
-static uint32_t currentMHz = 0;
-
-AudioResampler* AudioResampler::create(audio_format_t format, int inChannelCount,
- int32_t sampleRate, src_quality quality) {
-
- bool atFinalQuality;
- if (quality == DEFAULT_QUALITY) {
- // read the resampler default quality property the first time it is needed
- int ok = pthread_once(&once_control, init_routine);
- if (ok != 0) {
- ALOGE("%s pthread_once failed: %d", __func__, ok);
- }
- quality = defaultQuality;
- atFinalQuality = false;
- } else {
- 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 (;;) {
- uint32_t deltaMHz = qualityMHz(quality);
- uint32_t newMHz = currentMHz + deltaMHz;
- if ((qualityIsSupported(quality) && newMHz <= maxMHz) || atFinalQuality) {
- ALOGV("resampler load %u -> %u MHz due to delta +%u MHz from quality %d",
- currentMHz, newMHz, deltaMHz, quality);
- currentMHz = newMHz;
- break;
- }
- // not enough CPU available for proposed quality level, so try next lowest level
- switch (quality) {
- default:
- case LOW_QUALITY:
- atFinalQuality = true;
- break;
- case MED_QUALITY:
- quality = LOW_QUALITY;
- break;
- case HIGH_QUALITY:
- quality = MED_QUALITY;
- break;
- case VERY_HIGH_QUALITY:
- quality = HIGH_QUALITY;
- break;
- case DYN_LOW_QUALITY:
- atFinalQuality = true;
- break;
- case DYN_MED_QUALITY:
- quality = DYN_LOW_QUALITY;
- break;
- case DYN_HIGH_QUALITY:
- quality = DYN_MED_QUALITY;
- break;
- }
- }
- pthread_mutex_unlock(&mutex);
-
- AudioResampler* resampler;
-
- switch (quality) {
- default:
- case LOW_QUALITY:
- ALOGV("Create linear Resampler");
- LOG_ALWAYS_FATAL_IF(format != AUDIO_FORMAT_PCM_16_BIT);
- resampler = new AudioResamplerOrder1(inChannelCount, sampleRate);
- break;
- case MED_QUALITY:
- ALOGV("Create cubic Resampler");
- LOG_ALWAYS_FATAL_IF(format != AUDIO_FORMAT_PCM_16_BIT);
- resampler = new AudioResamplerCubic(inChannelCount, sampleRate);
- break;
- case HIGH_QUALITY:
- ALOGV("Create HIGH_QUALITY sinc Resampler");
- LOG_ALWAYS_FATAL_IF(format != AUDIO_FORMAT_PCM_16_BIT);
- resampler = new AudioResamplerSinc(inChannelCount, sampleRate);
- break;
- case VERY_HIGH_QUALITY:
- ALOGV("Create VERY_HIGH_QUALITY sinc Resampler = %d", quality);
- LOG_ALWAYS_FATAL_IF(format != AUDIO_FORMAT_PCM_16_BIT);
- resampler = new AudioResamplerSinc(inChannelCount, sampleRate, quality);
- break;
- case DYN_LOW_QUALITY:
- case DYN_MED_QUALITY:
- case DYN_HIGH_QUALITY:
- ALOGV("Create dynamic Resampler = %d", quality);
- if (format == AUDIO_FORMAT_PCM_FLOAT) {
- resampler = new AudioResamplerDyn<float, float, float>(inChannelCount,
- sampleRate, quality);
- } else {
- LOG_ALWAYS_FATAL_IF(format != AUDIO_FORMAT_PCM_16_BIT);
- if (quality == DYN_HIGH_QUALITY) {
- resampler = new AudioResamplerDyn<int32_t, int16_t, int32_t>(inChannelCount,
- sampleRate, quality);
- } else {
- resampler = new AudioResamplerDyn<int16_t, int16_t, int32_t>(inChannelCount,
- sampleRate, quality);
- }
- }
- break;
- }
-
- // initialize resampler
- resampler->init();
- return resampler;
-}
-
-AudioResampler::AudioResampler(int inChannelCount,
- int32_t sampleRate, src_quality quality) :
- mChannelCount(inChannelCount),
- mSampleRate(sampleRate), mInSampleRate(sampleRate), mInputIndex(0),
- mPhaseFraction(0),
- mQuality(quality) {
-
- const int maxChannels = quality < DYN_LOW_QUALITY ? 2 : 8;
- if (inChannelCount < 1
- || inChannelCount > maxChannels) {
- LOG_ALWAYS_FATAL("Unsupported sample format %d quality %d channels",
- quality, inChannelCount);
- }
- if (sampleRate <= 0) {
- LOG_ALWAYS_FATAL("Unsupported sample rate %d Hz", sampleRate);
- }
-
- // initialize common members
- mVolume[0] = mVolume[1] = 0;
- mBuffer.frameCount = 0;
-}
-
-AudioResampler::~AudioResampler() {
- pthread_mutex_lock(&mutex);
- src_quality quality = getQuality();
- uint32_t deltaMHz = qualityMHz(quality);
- int32_t newMHz = currentMHz - deltaMHz;
- ALOGV("resampler load %u -> %d MHz due to delta -%u MHz from quality %d",
- currentMHz, newMHz, deltaMHz, quality);
- LOG_ALWAYS_FATAL_IF(newMHz < 0, "negative resampler load %d MHz", newMHz);
- currentMHz = newMHz;
- pthread_mutex_unlock(&mutex);
-}
-
-void AudioResampler::setSampleRate(int32_t inSampleRate) {
- mInSampleRate = inSampleRate;
- mPhaseIncrement = (uint32_t)((kPhaseMultiplier * inSampleRate) / mSampleRate);
-}
-
-void AudioResampler::setVolume(float left, float right) {
- // TODO: Implement anti-zipper filter
- // convert to U4.12 for internal integer use (round down)
- // integer volume values are clamped to 0 to UNITY_GAIN.
- mVolume[0] = u4_12_from_float(clampFloatVol(left));
- mVolume[1] = u4_12_from_float(clampFloatVol(right));
-}
-
-void AudioResampler::reset() {
- mInputIndex = 0;
- mPhaseFraction = 0;
- mBuffer.frameCount = 0;
-}
-
-// ----------------------------------------------------------------------------
-
-size_t AudioResamplerOrder1::resample(int32_t* out, size_t outFrameCount,
- AudioBufferProvider* provider) {
-
- // should never happen, but we overflow if it does
- // ALOG_ASSERT(outFrameCount < 32767);
-
- // select the appropriate resampler
- switch (mChannelCount) {
- case 1:
- return resampleMono16(out, outFrameCount, provider);
- case 2:
- return resampleStereo16(out, outFrameCount, provider);
- default:
- LOG_ALWAYS_FATAL("invalid channel count: %d", mChannelCount);
- return 0;
- }
-}
-
-size_t AudioResamplerOrder1::resampleStereo16(int32_t* out, size_t outFrameCount,
- AudioBufferProvider* provider) {
-
- int32_t vl = mVolume[0];
- int32_t vr = mVolume[1];
-
- size_t inputIndex = mInputIndex;
- uint32_t phaseFraction = mPhaseFraction;
- uint32_t phaseIncrement = mPhaseIncrement;
- size_t outputIndex = 0;
- size_t outputSampleCount = outFrameCount * 2;
- size_t inFrameCount = getInFrameCountRequired(outFrameCount);
-
- // ALOGE("starting resample %d frames, inputIndex=%d, phaseFraction=%d, phaseIncrement=%d",
- // outFrameCount, inputIndex, phaseFraction, phaseIncrement);
-
- while (outputIndex < outputSampleCount) {
-
- // buffer is empty, fetch a new one
- while (mBuffer.frameCount == 0) {
- mBuffer.frameCount = inFrameCount;
- provider->getNextBuffer(&mBuffer);
- if (mBuffer.raw == NULL) {
- goto resampleStereo16_exit;
- }
-
- // ALOGE("New buffer fetched: %d frames", mBuffer.frameCount);
- if (mBuffer.frameCount > inputIndex) break;
-
- inputIndex -= mBuffer.frameCount;
- mX0L = mBuffer.i16[mBuffer.frameCount*2-2];
- mX0R = mBuffer.i16[mBuffer.frameCount*2-1];
- provider->releaseBuffer(&mBuffer);
- // mBuffer.frameCount == 0 now so we reload a new buffer
- }
-
- int16_t *in = mBuffer.i16;
-
- // handle boundary case
- while (inputIndex == 0) {
- // ALOGE("boundary case");
- out[outputIndex++] += vl * Interp(mX0L, in[0], phaseFraction);
- out[outputIndex++] += vr * Interp(mX0R, in[1], phaseFraction);
- Advance(&inputIndex, &phaseFraction, phaseIncrement);
- if (outputIndex == outputSampleCount) {
- break;
- }
- }
-
- // process input samples
- // ALOGE("general case");
-
-#ifdef ASM_ARM_RESAMP1 // asm optimisation for ResamplerOrder1
- if (inputIndex + 2 < mBuffer.frameCount) {
- int32_t* maxOutPt;
- int32_t maxInIdx;
-
- maxOutPt = out + (outputSampleCount - 2); // 2 because 2 frames per loop
- maxInIdx = mBuffer.frameCount - 2;
- AsmStereo16Loop(in, maxOutPt, maxInIdx, outputIndex, out, inputIndex, vl, vr,
- phaseFraction, phaseIncrement);
- }
-#endif // ASM_ARM_RESAMP1
-
- while (outputIndex < outputSampleCount && inputIndex < mBuffer.frameCount) {
- out[outputIndex++] += vl * Interp(in[inputIndex*2-2],
- in[inputIndex*2], phaseFraction);
- out[outputIndex++] += vr * Interp(in[inputIndex*2-1],
- in[inputIndex*2+1], phaseFraction);
- Advance(&inputIndex, &phaseFraction, phaseIncrement);
- }
-
- // ALOGE("loop done - outputIndex=%d, inputIndex=%d", outputIndex, inputIndex);
-
- // if done with buffer, save samples
- if (inputIndex >= mBuffer.frameCount) {
- inputIndex -= mBuffer.frameCount;
-
- // ALOGE("buffer done, new input index %d", inputIndex);
-
- mX0L = mBuffer.i16[mBuffer.frameCount*2-2];
- mX0R = mBuffer.i16[mBuffer.frameCount*2-1];
- provider->releaseBuffer(&mBuffer);
-
- // verify that the releaseBuffer resets the buffer frameCount
- // ALOG_ASSERT(mBuffer.frameCount == 0);
- }
- }
-
- // ALOGE("output buffer full - outputIndex=%d, inputIndex=%d", outputIndex, inputIndex);
-
-resampleStereo16_exit:
- // save state
- mInputIndex = inputIndex;
- mPhaseFraction = phaseFraction;
- return outputIndex / 2 /* channels for stereo */;
-}
-
-size_t AudioResamplerOrder1::resampleMono16(int32_t* out, size_t outFrameCount,
- AudioBufferProvider* provider) {
-
- int32_t vl = mVolume[0];
- int32_t vr = mVolume[1];
-
- size_t inputIndex = mInputIndex;
- uint32_t phaseFraction = mPhaseFraction;
- uint32_t phaseIncrement = mPhaseIncrement;
- size_t outputIndex = 0;
- size_t outputSampleCount = outFrameCount * 2;
- size_t inFrameCount = getInFrameCountRequired(outFrameCount);
-
- // ALOGE("starting resample %d frames, inputIndex=%d, phaseFraction=%d, phaseIncrement=%d",
- // outFrameCount, inputIndex, phaseFraction, phaseIncrement);
- while (outputIndex < outputSampleCount) {
- // buffer is empty, fetch a new one
- while (mBuffer.frameCount == 0) {
- mBuffer.frameCount = inFrameCount;
- provider->getNextBuffer(&mBuffer);
- if (mBuffer.raw == NULL) {
- mInputIndex = inputIndex;
- mPhaseFraction = phaseFraction;
- goto resampleMono16_exit;
- }
- // ALOGE("New buffer fetched: %d frames", mBuffer.frameCount);
- if (mBuffer.frameCount > inputIndex) break;
-
- inputIndex -= mBuffer.frameCount;
- mX0L = mBuffer.i16[mBuffer.frameCount-1];
- provider->releaseBuffer(&mBuffer);
- // mBuffer.frameCount == 0 now so we reload a new buffer
- }
- int16_t *in = mBuffer.i16;
-
- // handle boundary case
- while (inputIndex == 0) {
- // ALOGE("boundary case");
- int32_t sample = Interp(mX0L, in[0], phaseFraction);
- out[outputIndex++] += vl * sample;
- out[outputIndex++] += vr * sample;
- Advance(&inputIndex, &phaseFraction, phaseIncrement);
- if (outputIndex == outputSampleCount) {
- break;
- }
- }
-
- // process input samples
- // ALOGE("general case");
-
-#ifdef ASM_ARM_RESAMP1 // asm optimisation for ResamplerOrder1
- if (inputIndex + 2 < mBuffer.frameCount) {
- int32_t* maxOutPt;
- int32_t maxInIdx;
-
- maxOutPt = out + (outputSampleCount - 2);
- maxInIdx = (int32_t)mBuffer.frameCount - 2;
- AsmMono16Loop(in, maxOutPt, maxInIdx, outputIndex, out, inputIndex, vl, vr,
- phaseFraction, phaseIncrement);
- }
-#endif // ASM_ARM_RESAMP1
-
- while (outputIndex < outputSampleCount && inputIndex < mBuffer.frameCount) {
- int32_t sample = Interp(in[inputIndex-1], in[inputIndex],
- phaseFraction);
- out[outputIndex++] += vl * sample;
- out[outputIndex++] += vr * sample;
- Advance(&inputIndex, &phaseFraction, phaseIncrement);
- }
-
-
- // ALOGE("loop done - outputIndex=%d, inputIndex=%d", outputIndex, inputIndex);
-
- // if done with buffer, save samples
- if (inputIndex >= mBuffer.frameCount) {
- inputIndex -= mBuffer.frameCount;
-
- // ALOGE("buffer done, new input index %d", inputIndex);
-
- mX0L = mBuffer.i16[mBuffer.frameCount-1];
- provider->releaseBuffer(&mBuffer);
-
- // verify that the releaseBuffer resets the buffer frameCount
- // ALOG_ASSERT(mBuffer.frameCount == 0);
- }
- }
-
- // ALOGE("output buffer full - outputIndex=%d, inputIndex=%d", outputIndex, inputIndex);
-
-resampleMono16_exit:
- // save state
- mInputIndex = inputIndex;
- mPhaseFraction = phaseFraction;
- return outputIndex;
-}
-
-#ifdef ASM_ARM_RESAMP1 // asm optimisation for ResamplerOrder1
-
-/*******************************************************************
-*
-* AsmMono16Loop
-* asm optimized monotonic loop version; one loop is 2 frames
-* Input:
-* in : pointer on input samples
-* maxOutPt : pointer on first not filled
-* maxInIdx : index on first not used
-* outputIndex : pointer on current output index
-* out : pointer on output buffer
-* inputIndex : pointer on current input index
-* vl, vr : left and right gain
-* phaseFraction : pointer on current phase fraction
-* phaseIncrement
-* Ouput:
-* outputIndex :
-* out : updated buffer
-* inputIndex : index of next to use
-* phaseFraction : phase fraction for next interpolation
-*
-*******************************************************************/
-__attribute__((noinline))
-void AudioResamplerOrder1::AsmMono16Loop(int16_t *in, int32_t* maxOutPt, int32_t maxInIdx,
- size_t &outputIndex, int32_t* out, size_t &inputIndex, int32_t vl, int32_t vr,
- uint32_t &phaseFraction, uint32_t phaseIncrement)
-{
- (void)maxOutPt; // remove unused parameter warnings
- (void)maxInIdx;
- (void)outputIndex;
- (void)out;
- (void)inputIndex;
- (void)vl;
- (void)vr;
- (void)phaseFraction;
- (void)phaseIncrement;
- (void)in;
-#define MO_PARAM5 "36" // offset of parameter 5 (outputIndex)
-
- asm(
- "stmfd sp!, {r4, r5, r6, r7, r8, r9, r10, r11, lr}\n"
- // get parameters
- " ldr r6, [sp, #" MO_PARAM5 " + 20]\n" // &phaseFraction
- " ldr r6, [r6]\n" // phaseFraction
- " ldr r7, [sp, #" MO_PARAM5 " + 8]\n" // &inputIndex
- " ldr r7, [r7]\n" // inputIndex
- " ldr r8, [sp, #" MO_PARAM5 " + 4]\n" // out
- " ldr r0, [sp, #" MO_PARAM5 " + 0]\n" // &outputIndex
- " ldr r0, [r0]\n" // outputIndex
- " add r8, r8, r0, asl #2\n" // curOut
- " ldr r9, [sp, #" MO_PARAM5 " + 24]\n" // phaseIncrement
- " ldr r10, [sp, #" MO_PARAM5 " + 12]\n" // vl
- " ldr r11, [sp, #" MO_PARAM5 " + 16]\n" // vr
-
- // r0 pin, x0, Samp
-
- // r1 in
- // r2 maxOutPt
- // r3 maxInIdx
-
- // r4 x1, i1, i3, Out1
- // r5 out0
-
- // r6 frac
- // r7 inputIndex
- // r8 curOut
-
- // r9 inc
- // r10 vl
- // r11 vr
-
- // r12
- // r13 sp
- // r14
-
- // the following loop works on 2 frames
-
- "1:\n"
- " cmp r8, r2\n" // curOut - maxCurOut
- " bcs 2f\n"
-
-#define MO_ONE_FRAME \
- " add r0, r1, r7, asl #1\n" /* in + inputIndex */\
- " ldrsh r4, [r0]\n" /* in[inputIndex] */\
- " ldr r5, [r8]\n" /* out[outputIndex] */\
- " ldrsh r0, [r0, #-2]\n" /* in[inputIndex-1] */\
- " bic r6, r6, #0xC0000000\n" /* phaseFraction & ... */\
- " sub r4, r4, r0\n" /* in[inputIndex] - in[inputIndex-1] */\
- " mov r4, r4, lsl #2\n" /* <<2 */\
- " smulwt r4, r4, r6\n" /* (x1-x0)*.. */\
- " add r6, r6, r9\n" /* phaseFraction + phaseIncrement */\
- " add r0, r0, r4\n" /* x0 - (..) */\
- " mla r5, r0, r10, r5\n" /* vl*interp + out[] */\
- " ldr r4, [r8, #4]\n" /* out[outputIndex+1] */\
- " str r5, [r8], #4\n" /* out[outputIndex++] = ... */\
- " mla r4, r0, r11, r4\n" /* vr*interp + out[] */\
- " add r7, r7, r6, lsr #30\n" /* inputIndex + phaseFraction>>30 */\
- " str r4, [r8], #4\n" /* out[outputIndex++] = ... */
-
- MO_ONE_FRAME // frame 1
- MO_ONE_FRAME // frame 2
-
- " cmp r7, r3\n" // inputIndex - maxInIdx
- " bcc 1b\n"
- "2:\n"
-
- " bic r6, r6, #0xC0000000\n" // phaseFraction & ...
- // save modified values
- " ldr r0, [sp, #" MO_PARAM5 " + 20]\n" // &phaseFraction
- " str r6, [r0]\n" // phaseFraction
- " ldr r0, [sp, #" MO_PARAM5 " + 8]\n" // &inputIndex
- " str r7, [r0]\n" // inputIndex
- " ldr r0, [sp, #" MO_PARAM5 " + 4]\n" // out
- " sub r8, r0\n" // curOut - out
- " asr r8, #2\n" // new outputIndex
- " ldr r0, [sp, #" MO_PARAM5 " + 0]\n" // &outputIndex
- " str r8, [r0]\n" // save outputIndex
-
- " ldmfd sp!, {r4, r5, r6, r7, r8, r9, r10, r11, pc}\n"
- );
-}
-
-/*******************************************************************
-*
-* AsmStereo16Loop
-* asm optimized stereo loop version; one loop is 2 frames
-* Input:
-* in : pointer on input samples
-* maxOutPt : pointer on first not filled
-* maxInIdx : index on first not used
-* outputIndex : pointer on current output index
-* out : pointer on output buffer
-* inputIndex : pointer on current input index
-* vl, vr : left and right gain
-* phaseFraction : pointer on current phase fraction
-* phaseIncrement
-* Ouput:
-* outputIndex :
-* out : updated buffer
-* inputIndex : index of next to use
-* phaseFraction : phase fraction for next interpolation
-*
-*******************************************************************/
-__attribute__((noinline))
-void AudioResamplerOrder1::AsmStereo16Loop(int16_t *in, int32_t* maxOutPt, int32_t maxInIdx,
- size_t &outputIndex, int32_t* out, size_t &inputIndex, int32_t vl, int32_t vr,
- uint32_t &phaseFraction, uint32_t phaseIncrement)
-{
- (void)maxOutPt; // remove unused parameter warnings
- (void)maxInIdx;
- (void)outputIndex;
- (void)out;
- (void)inputIndex;
- (void)vl;
- (void)vr;
- (void)phaseFraction;
- (void)phaseIncrement;
- (void)in;
-#define ST_PARAM5 "40" // offset of parameter 5 (outputIndex)
- asm(
- "stmfd sp!, {r4, r5, r6, r7, r8, r9, r10, r11, r12, lr}\n"
- // get parameters
- " ldr r6, [sp, #" ST_PARAM5 " + 20]\n" // &phaseFraction
- " ldr r6, [r6]\n" // phaseFraction
- " ldr r7, [sp, #" ST_PARAM5 " + 8]\n" // &inputIndex
- " ldr r7, [r7]\n" // inputIndex
- " ldr r8, [sp, #" ST_PARAM5 " + 4]\n" // out
- " ldr r0, [sp, #" ST_PARAM5 " + 0]\n" // &outputIndex
- " ldr r0, [r0]\n" // outputIndex
- " add r8, r8, r0, asl #2\n" // curOut
- " ldr r9, [sp, #" ST_PARAM5 " + 24]\n" // phaseIncrement
- " ldr r10, [sp, #" ST_PARAM5 " + 12]\n" // vl
- " ldr r11, [sp, #" ST_PARAM5 " + 16]\n" // vr
-
- // r0 pin, x0, Samp
-
- // r1 in
- // r2 maxOutPt
- // r3 maxInIdx
-
- // r4 x1, i1, i3, out1
- // r5 out0
-
- // r6 frac
- // r7 inputIndex
- // r8 curOut
-
- // r9 inc
- // r10 vl
- // r11 vr
-
- // r12 temporary
- // r13 sp
- // r14
-
- "3:\n"
- " cmp r8, r2\n" // curOut - maxCurOut
- " bcs 4f\n"
-
-#define ST_ONE_FRAME \
- " bic r6, r6, #0xC0000000\n" /* phaseFraction & ... */\
-\
- " add r0, r1, r7, asl #2\n" /* in + 2*inputIndex */\
-\
- " ldrsh r4, [r0]\n" /* in[2*inputIndex] */\
- " ldr r5, [r8]\n" /* out[outputIndex] */\
- " ldrsh r12, [r0, #-4]\n" /* in[2*inputIndex-2] */\
- " sub r4, r4, r12\n" /* in[2*InputIndex] - in[2*InputIndex-2] */\
- " mov r4, r4, lsl #2\n" /* <<2 */\
- " smulwt r4, r4, r6\n" /* (x1-x0)*.. */\
- " add r12, r12, r4\n" /* x0 - (..) */\
- " mla r5, r12, r10, r5\n" /* vl*interp + out[] */\
- " ldr r4, [r8, #4]\n" /* out[outputIndex+1] */\
- " str r5, [r8], #4\n" /* out[outputIndex++] = ... */\
-\
- " ldrsh r12, [r0, #+2]\n" /* in[2*inputIndex+1] */\
- " ldrsh r0, [r0, #-2]\n" /* in[2*inputIndex-1] */\
- " sub r12, r12, r0\n" /* in[2*InputIndex] - in[2*InputIndex-2] */\
- " mov r12, r12, lsl #2\n" /* <<2 */\
- " smulwt r12, r12, r6\n" /* (x1-x0)*.. */\
- " add r12, r0, r12\n" /* x0 - (..) */\
- " mla r4, r12, r11, r4\n" /* vr*interp + out[] */\
- " str r4, [r8], #4\n" /* out[outputIndex++] = ... */\
-\
- " add r6, r6, r9\n" /* phaseFraction + phaseIncrement */\
- " add r7, r7, r6, lsr #30\n" /* inputIndex + phaseFraction>>30 */
-
- ST_ONE_FRAME // frame 1
- ST_ONE_FRAME // frame 1
-
- " cmp r7, r3\n" // inputIndex - maxInIdx
- " bcc 3b\n"
- "4:\n"
-
- " bic r6, r6, #0xC0000000\n" // phaseFraction & ...
- // save modified values
- " ldr r0, [sp, #" ST_PARAM5 " + 20]\n" // &phaseFraction
- " str r6, [r0]\n" // phaseFraction
- " ldr r0, [sp, #" ST_PARAM5 " + 8]\n" // &inputIndex
- " str r7, [r0]\n" // inputIndex
- " ldr r0, [sp, #" ST_PARAM5 " + 4]\n" // out
- " sub r8, r0\n" // curOut - out
- " asr r8, #2\n" // new outputIndex
- " ldr r0, [sp, #" ST_PARAM5 " + 0]\n" // &outputIndex
- " str r8, [r0]\n" // save outputIndex
-
- " ldmfd sp!, {r4, r5, r6, r7, r8, r9, r10, r11, r12, pc}\n"
- );
-}
-
-#endif // ASM_ARM_RESAMP1
-
-
-// ----------------------------------------------------------------------------
-
-} // namespace android
diff --git a/services/audioflinger/AudioResampler.h b/services/audioflinger/AudioResampler.h
deleted file mode 100644
index c4627e8..0000000
--- a/services/audioflinger/AudioResampler.h
+++ /dev/null
@@ -1,173 +0,0 @@
-/*
- * Copyright (C) 2007 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef ANDROID_AUDIO_RESAMPLER_H
-#define ANDROID_AUDIO_RESAMPLER_H
-
-#include <stdint.h>
-#include <sys/types.h>
-
-#include <cutils/compiler.h>
-#include <utils/Compat.h>
-
-#include <media/AudioBufferProvider.h>
-#include <system/audio.h>
-
-namespace android {
-// ----------------------------------------------------------------------------
-
-class ANDROID_API AudioResampler {
-public:
- // Determines quality of SRC.
- // LOW_QUALITY: linear interpolator (1st order)
- // MED_QUALITY: cubic interpolator (3rd order)
- // HIGH_QUALITY: fixed multi-tap FIR (e.g. 48KHz->44.1KHz)
- // NOTE: high quality SRC will only be supported for
- // certain fixed rate conversions. Sample rate cannot be
- // changed dynamically.
- enum src_quality {
- DEFAULT_QUALITY=0,
- LOW_QUALITY=1,
- MED_QUALITY=2,
- HIGH_QUALITY=3,
- VERY_HIGH_QUALITY=4,
- DYN_LOW_QUALITY=5,
- DYN_MED_QUALITY=6,
- DYN_HIGH_QUALITY=7,
- };
-
- static const CONSTEXPR float UNITY_GAIN_FLOAT = 1.0f;
-
- static AudioResampler* create(audio_format_t format, int inChannelCount,
- int32_t sampleRate, src_quality quality=DEFAULT_QUALITY);
-
- virtual ~AudioResampler();
-
- virtual void init() = 0;
- virtual void setSampleRate(int32_t inSampleRate);
- virtual void setVolume(float left, float right);
-
- // Resample int16_t samples from provider and accumulate into 'out'.
- // A mono provider delivers a sequence of samples.
- // A stereo provider delivers a sequence of interleaved pairs of samples.
- //
- // In either case, 'out' holds interleaved pairs of fixed-point Q4.27.
- // That is, for a mono provider, there is an implicit up-channeling.
- // Since this method accumulates, the caller is responsible for clearing 'out' initially.
- //
- // For a float resampler, 'out' holds interleaved pairs of float samples.
- //
- // Multichannel interleaved frames for n > 2 is supported for quality DYN_LOW_QUALITY,
- // DYN_MED_QUALITY, and DYN_HIGH_QUALITY.
- //
- // Returns the number of frames resampled into the out buffer.
- virtual size_t resample(int32_t* out, size_t outFrameCount,
- AudioBufferProvider* provider) = 0;
-
- virtual void reset();
- virtual size_t getUnreleasedFrames() const { return mInputIndex; }
-
- // called from destructor, so must not be virtual
- src_quality getQuality() const { return mQuality; }
-
-protected:
- // number of bits for phase fraction - 30 bits allows nearly 2x downsampling
- static const int kNumPhaseBits = 30;
-
- // phase mask for fraction
- static const uint32_t kPhaseMask = (1LU<<kNumPhaseBits)-1;
-
- // multiplier to calculate fixed point phase increment
- static const double kPhaseMultiplier;
-
- AudioResampler(int inChannelCount, int32_t sampleRate, src_quality quality);
-
- // prevent copying
- AudioResampler(const AudioResampler&);
- AudioResampler& operator=(const AudioResampler&);
-
- const int32_t mChannelCount;
- const int32_t mSampleRate;
- int32_t mInSampleRate;
- AudioBufferProvider::Buffer mBuffer;
- union {
- int16_t mVolume[2];
- uint32_t mVolumeRL;
- };
- int16_t mTargetVolume[2];
- size_t mInputIndex;
- int32_t mPhaseIncrement;
- uint32_t mPhaseFraction;
-
- // returns the inFrameCount required to generate outFrameCount frames.
- //
- // Placed here to be a consistent for all resamplers.
- //
- // Right now, we use the upper bound without regards to the current state of the
- // input buffer using integer arithmetic, as follows:
- //
- // (static_cast<uint64_t>(outFrameCount)*mInSampleRate + (mSampleRate - 1))/mSampleRate;
- //
- // The double precision equivalent (float may not be precise enough):
- // ceil(static_cast<double>(outFrameCount) * mInSampleRate / mSampleRate);
- //
- // this relies on the fact that the mPhaseIncrement is rounded down from
- // #phases * mInSampleRate/mSampleRate and the fact that Sum(Floor(x)) <= Floor(Sum(x)).
- // http://www.proofwiki.org/wiki/Sum_of_Floors_Not_Greater_Than_Floor_of_Sums
- //
- // (so long as double precision is computed accurately enough to be considered
- // greater than or equal to the Floor(x) value in int32_t arithmetic; thus this
- // will not necessarily hold for floats).
- //
- // TODO:
- // Greater accuracy and a tight bound is obtained by:
- // 1) subtract and adjust for the current state of the AudioBufferProvider buffer.
- // 2) using the exact integer formula where (ignoring 64b casting)
- // inFrameCount = (mPhaseIncrement * (outFrameCount - 1) + mPhaseFraction) / phaseWrapLimit;
- // phaseWrapLimit is the wraparound (1 << kNumPhaseBits), if not specified explicitly.
- //
- inline size_t getInFrameCountRequired(size_t outFrameCount) {
- return (static_cast<uint64_t>(outFrameCount)*mInSampleRate
- + (mSampleRate - 1))/mSampleRate;
- }
-
- inline float clampFloatVol(float volume) {
- if (volume > UNITY_GAIN_FLOAT) {
- return UNITY_GAIN_FLOAT;
- } else if (volume >= 0.) {
- return volume;
- }
- return 0.; // NaN or negative volume maps to 0.
- }
-
-private:
- const src_quality mQuality;
-
- // Return 'true' if the quality level is supported without explicit request
- static bool qualityIsSupported(src_quality quality);
-
- // For pthread_once()
- static void init_routine();
-
- // Return the estimated CPU load for specific resampler in MHz.
- // The absolute number is irrelevant, it's the relative values that matter.
- static uint32_t qualityMHz(src_quality quality);
-};
-
-// ----------------------------------------------------------------------------
-} // namespace android
-
-#endif // ANDROID_AUDIO_RESAMPLER_H
diff --git a/services/audioflinger/AudioResamplerCubic.cpp b/services/audioflinger/AudioResamplerCubic.cpp
deleted file mode 100644
index 9fb6699..0000000
--- a/services/audioflinger/AudioResamplerCubic.cpp
+++ /dev/null
@@ -1,189 +0,0 @@
-/*
- * Copyright (C) 2007 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#define LOG_TAG "AudioResamplerCubic"
-
-#include <stdint.h>
-#include <string.h>
-#include <sys/types.h>
-
-#include <log/log.h>
-
-#include "AudioResampler.h"
-#include "AudioResamplerCubic.h"
-
-namespace android {
-// ----------------------------------------------------------------------------
-
-void AudioResamplerCubic::init() {
- memset(&left, 0, sizeof(state));
- memset(&right, 0, sizeof(state));
-}
-
-size_t AudioResamplerCubic::resample(int32_t* out, size_t outFrameCount,
- AudioBufferProvider* provider) {
-
- // should never happen, but we overflow if it does
- // ALOG_ASSERT(outFrameCount < 32767);
-
- // select the appropriate resampler
- switch (mChannelCount) {
- case 1:
- return resampleMono16(out, outFrameCount, provider);
- case 2:
- return resampleStereo16(out, outFrameCount, provider);
- default:
- LOG_ALWAYS_FATAL("invalid channel count: %d", mChannelCount);
- return 0;
- }
-}
-
-size_t AudioResamplerCubic::resampleStereo16(int32_t* out, size_t outFrameCount,
- AudioBufferProvider* provider) {
-
- int32_t vl = mVolume[0];
- int32_t vr = mVolume[1];
-
- size_t inputIndex = mInputIndex;
- uint32_t phaseFraction = mPhaseFraction;
- uint32_t phaseIncrement = mPhaseIncrement;
- size_t outputIndex = 0;
- size_t outputSampleCount = outFrameCount * 2;
- size_t inFrameCount = getInFrameCountRequired(outFrameCount);
-
- // fetch first buffer
- if (mBuffer.frameCount == 0) {
- mBuffer.frameCount = inFrameCount;
- provider->getNextBuffer(&mBuffer);
- if (mBuffer.raw == NULL) {
- return 0;
- }
- // ALOGW("New buffer: offset=%p, frames=%dn", mBuffer.raw, mBuffer.frameCount);
- }
- int16_t *in = mBuffer.i16;
-
- while (outputIndex < outputSampleCount) {
- int32_t x;
-
- // calculate output sample
- x = phaseFraction >> kPreInterpShift;
- out[outputIndex++] += vl * interp(&left, x);
- out[outputIndex++] += vr * interp(&right, x);
- // out[outputIndex++] += vr * in[inputIndex*2];
-
- // increment phase
- phaseFraction += phaseIncrement;
- uint32_t indexIncrement = (phaseFraction >> kNumPhaseBits);
- phaseFraction &= kPhaseMask;
-
- // time to fetch another sample
- while (indexIncrement--) {
-
- inputIndex++;
- if (inputIndex == mBuffer.frameCount) {
- inputIndex = 0;
- provider->releaseBuffer(&mBuffer);
- mBuffer.frameCount = inFrameCount;
- provider->getNextBuffer(&mBuffer);
- if (mBuffer.raw == NULL) {
- goto save_state; // ugly, but efficient
- }
- in = mBuffer.i16;
- // ALOGW("New buffer: offset=%p, frames=%d", mBuffer.raw, mBuffer.frameCount);
- }
-
- // advance sample state
- advance(&left, in[inputIndex*2]);
- advance(&right, in[inputIndex*2+1]);
- }
- }
-
-save_state:
- // ALOGW("Done: index=%d, fraction=%u", inputIndex, phaseFraction);
- mInputIndex = inputIndex;
- mPhaseFraction = phaseFraction;
- return outputIndex / 2 /* channels for stereo */;
-}
-
-size_t AudioResamplerCubic::resampleMono16(int32_t* out, size_t outFrameCount,
- AudioBufferProvider* provider) {
-
- int32_t vl = mVolume[0];
- int32_t vr = mVolume[1];
-
- size_t inputIndex = mInputIndex;
- uint32_t phaseFraction = mPhaseFraction;
- uint32_t phaseIncrement = mPhaseIncrement;
- size_t outputIndex = 0;
- size_t outputSampleCount = outFrameCount * 2;
- size_t inFrameCount = getInFrameCountRequired(outFrameCount);
-
- // fetch first buffer
- if (mBuffer.frameCount == 0) {
- mBuffer.frameCount = inFrameCount;
- provider->getNextBuffer(&mBuffer);
- if (mBuffer.raw == NULL) {
- return 0;
- }
- // ALOGW("New buffer: offset=%p, frames=%d", mBuffer.raw, mBuffer.frameCount);
- }
- int16_t *in = mBuffer.i16;
-
- while (outputIndex < outputSampleCount) {
- int32_t sample;
- int32_t x;
-
- // calculate output sample
- x = phaseFraction >> kPreInterpShift;
- sample = interp(&left, x);
- out[outputIndex++] += vl * sample;
- out[outputIndex++] += vr * sample;
-
- // increment phase
- phaseFraction += phaseIncrement;
- uint32_t indexIncrement = (phaseFraction >> kNumPhaseBits);
- phaseFraction &= kPhaseMask;
-
- // time to fetch another sample
- while (indexIncrement--) {
-
- inputIndex++;
- if (inputIndex == mBuffer.frameCount) {
- inputIndex = 0;
- provider->releaseBuffer(&mBuffer);
- mBuffer.frameCount = inFrameCount;
- provider->getNextBuffer(&mBuffer);
- if (mBuffer.raw == NULL) {
- goto save_state; // ugly, but efficient
- }
- // ALOGW("New buffer: offset=%p, frames=%dn", mBuffer.raw, mBuffer.frameCount);
- in = mBuffer.i16;
- }
-
- // advance sample state
- advance(&left, in[inputIndex]);
- }
- }
-
-save_state:
- // ALOGW("Done: index=%d, fraction=%u", inputIndex, phaseFraction);
- mInputIndex = inputIndex;
- mPhaseFraction = phaseFraction;
- return outputIndex;
-}
-
-// ----------------------------------------------------------------------------
-} // namespace android
diff --git a/services/audioflinger/AudioResamplerCubic.h b/services/audioflinger/AudioResamplerCubic.h
deleted file mode 100644
index f218fd9..0000000
--- a/services/audioflinger/AudioResamplerCubic.h
+++ /dev/null
@@ -1,68 +0,0 @@
-/*
- * Copyright (C) 2007 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef ANDROID_AUDIO_RESAMPLER_CUBIC_H
-#define ANDROID_AUDIO_RESAMPLER_CUBIC_H
-
-#include <stdint.h>
-#include <sys/types.h>
-#include <android/log.h>
-
-#include "AudioResampler.h"
-
-namespace android {
-// ----------------------------------------------------------------------------
-
-class AudioResamplerCubic : public AudioResampler {
-public:
- AudioResamplerCubic(int inChannelCount, int32_t sampleRate) :
- AudioResampler(inChannelCount, sampleRate, MED_QUALITY) {
- }
- virtual size_t resample(int32_t* out, size_t outFrameCount,
- AudioBufferProvider* provider);
-private:
- // number of bits used in interpolation multiply - 14 bits avoids overflow
- static const int kNumInterpBits = 14;
-
- // bits to shift the phase fraction down to avoid overflow
- static const int kPreInterpShift = kNumPhaseBits - kNumInterpBits;
- typedef struct {
- int32_t a, b, c, y0, y1, y2, y3;
- } state;
- void init();
- size_t resampleMono16(int32_t* out, size_t outFrameCount,
- AudioBufferProvider* provider);
- size_t resampleStereo16(int32_t* out, size_t outFrameCount,
- AudioBufferProvider* provider);
- static inline int32_t interp(state* p, int32_t x) {
- return (((((p->a * x >> 14) + p->b) * x >> 14) + p->c) * x >> 14) + p->y1;
- }
- static inline void advance(state* p, int16_t in) {
- p->y0 = p->y1;
- p->y1 = p->y2;
- p->y2 = p->y3;
- p->y3 = in;
- p->a = (3 * (p->y1 - p->y2) - p->y0 + p->y3) >> 1;
- p->b = (p->y2 << 1) + p->y0 - (((5 * p->y1 + p->y3)) >> 1);
- p->c = (p->y2 - p->y0) >> 1;
- }
- state left, right;
-};
-
-// ----------------------------------------------------------------------------
-} // namespace android
-
-#endif /*ANDROID_AUDIO_RESAMPLER_CUBIC_H*/
diff --git a/services/audioflinger/AudioResamplerDyn.cpp b/services/audioflinger/AudioResamplerDyn.cpp
deleted file mode 100644
index 8f7b982..0000000
--- a/services/audioflinger/AudioResamplerDyn.cpp
+++ /dev/null
@@ -1,633 +0,0 @@
-/*
- * Copyright (C) 2013 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#define LOG_TAG "AudioResamplerDyn"
-//#define LOG_NDEBUG 0
-
-#include <malloc.h>
-#include <string.h>
-#include <stdlib.h>
-#include <dlfcn.h>
-#include <math.h>
-
-#include <cutils/compiler.h>
-#include <cutils/properties.h>
-#include <utils/Debug.h>
-#include <utils/Log.h>
-#include <audio_utils/primitives.h>
-
-#include "AudioResamplerFirOps.h" // USE_NEON, USE_SSE and USE_INLINE_ASSEMBLY defined here
-#include "AudioResamplerFirProcess.h"
-#include "AudioResamplerFirProcessNeon.h"
-#include "AudioResamplerFirProcessSSE.h"
-#include "AudioResamplerFirGen.h" // requires math.h
-#include "AudioResamplerDyn.h"
-
-//#define DEBUG_RESAMPLER
-
-namespace android {
-
-/*
- * InBuffer is a type agnostic input buffer.
- *
- * Layout of the state buffer for halfNumCoefs=8.
- *
- * [rrrrrrppppppppnnnnnnnnrrrrrrrrrrrrrrrrrrr.... rrrrrrr]
- * S I R
- *
- * S = mState
- * I = mImpulse
- * R = mRingFull
- * p = past samples, convoluted with the (p)ositive side of sinc()
- * n = future samples, convoluted with the (n)egative side of sinc()
- * r = extra space for implementing the ring buffer
- */
-
-template<typename TC, typename TI, typename TO>
-AudioResamplerDyn<TC, TI, TO>::InBuffer::InBuffer()
- : mState(NULL), mImpulse(NULL), mRingFull(NULL), mStateCount(0)
-{
-}
-
-template<typename TC, typename TI, typename TO>
-AudioResamplerDyn<TC, TI, TO>::InBuffer::~InBuffer()
-{
- init();
-}
-
-template<typename TC, typename TI, typename TO>
-void AudioResamplerDyn<TC, TI, TO>::InBuffer::init()
-{
- free(mState);
- mState = NULL;
- mImpulse = NULL;
- mRingFull = NULL;
- mStateCount = 0;
-}
-
-// resizes the state buffer to accommodate the appropriate filter length
-template<typename TC, typename TI, typename TO>
-void AudioResamplerDyn<TC, TI, TO>::InBuffer::resize(int CHANNELS, int halfNumCoefs)
-{
- // calculate desired state size
- size_t stateCount = halfNumCoefs * CHANNELS * 2 * kStateSizeMultipleOfFilterLength;
-
- // check if buffer needs resizing
- if (mState
- && stateCount == mStateCount
- && mRingFull-mState == (ssize_t) (mStateCount-halfNumCoefs*CHANNELS)) {
- return;
- }
-
- // create new buffer
- TI* state = NULL;
- (void)posix_memalign(reinterpret_cast<void**>(&state), 32, stateCount*sizeof(*state));
- memset(state, 0, stateCount*sizeof(*state));
-
- // attempt to preserve state
- if (mState) {
- TI* srcLo = mImpulse - halfNumCoefs*CHANNELS;
- TI* srcHi = mImpulse + halfNumCoefs*CHANNELS;
- TI* dst = state;
-
- if (srcLo < mState) {
- dst += mState-srcLo;
- srcLo = mState;
- }
- if (srcHi > mState + mStateCount) {
- srcHi = mState + mStateCount;
- }
- memcpy(dst, srcLo, (srcHi - srcLo) * sizeof(*srcLo));
- free(mState);
- }
-
- // set class member vars
- mState = state;
- mStateCount = stateCount;
- mImpulse = state + halfNumCoefs*CHANNELS; // actually one sample greater than needed
- mRingFull = state + mStateCount - halfNumCoefs*CHANNELS;
-}
-
-// copy in the input data into the head (impulse+halfNumCoefs) of the buffer.
-template<typename TC, typename TI, typename TO>
-template<int CHANNELS>
-void AudioResamplerDyn<TC, TI, TO>::InBuffer::readAgain(TI*& impulse, const int halfNumCoefs,
- const TI* const in, const size_t inputIndex)
-{
- TI* head = impulse + halfNumCoefs*CHANNELS;
- for (size_t i=0 ; i<CHANNELS ; i++) {
- head[i] = in[inputIndex*CHANNELS + i];
- }
-}
-
-// advance the impulse pointer, and load in data into the head (impulse+halfNumCoefs)
-template<typename TC, typename TI, typename TO>
-template<int CHANNELS>
-void AudioResamplerDyn<TC, TI, TO>::InBuffer::readAdvance(TI*& impulse, const int halfNumCoefs,
- const TI* const in, const size_t inputIndex)
-{
- impulse += CHANNELS;
-
- if (CC_UNLIKELY(impulse >= mRingFull)) {
- const size_t shiftDown = mRingFull - mState - halfNumCoefs*CHANNELS;
- memcpy(mState, mState+shiftDown, halfNumCoefs*CHANNELS*2*sizeof(TI));
- impulse -= shiftDown;
- }
- readAgain<CHANNELS>(impulse, halfNumCoefs, in, inputIndex);
-}
-
-template<typename TC, typename TI, typename TO>
-void AudioResamplerDyn<TC, TI, TO>::InBuffer::reset()
-{
- // clear resampler state
- if (mState != nullptr) {
- memset(mState, 0, mStateCount * sizeof(TI));
- }
-}
-
-template<typename TC, typename TI, typename TO>
-void AudioResamplerDyn<TC, TI, TO>::Constants::set(
- int L, int halfNumCoefs, int inSampleRate, int outSampleRate)
-{
- int bits = 0;
- int lscale = inSampleRate/outSampleRate < 2 ? L - 1 :
- static_cast<int>(static_cast<uint64_t>(L)*inSampleRate/outSampleRate);
- for (int i=lscale; i; ++bits, i>>=1)
- ;
- mL = L;
- mShift = kNumPhaseBits - bits;
- mHalfNumCoefs = halfNumCoefs;
-}
-
-template<typename TC, typename TI, typename TO>
-AudioResamplerDyn<TC, TI, TO>::AudioResamplerDyn(
- int inChannelCount, int32_t sampleRate, src_quality quality)
- : AudioResampler(inChannelCount, sampleRate, quality),
- mResampleFunc(0), mFilterSampleRate(0), mFilterQuality(DEFAULT_QUALITY),
- mCoefBuffer(NULL)
-{
- mVolumeSimd[0] = mVolumeSimd[1] = 0;
- // The AudioResampler base class assumes we are always ready for 1:1 resampling.
- // We reset mInSampleRate to 0, so setSampleRate() will calculate filters for
- // setSampleRate() for 1:1. (May be removed if precalculated filters are used.)
- mInSampleRate = 0;
- mConstants.set(128, 8, mSampleRate, mSampleRate); // TODO: set better
-}
-
-template<typename TC, typename TI, typename TO>
-AudioResamplerDyn<TC, TI, TO>::~AudioResamplerDyn()
-{
- free(mCoefBuffer);
-}
-
-template<typename TC, typename TI, typename TO>
-void AudioResamplerDyn<TC, TI, TO>::init()
-{
- mFilterSampleRate = 0; // always trigger new filter generation
- mInBuffer.init();
-}
-
-template<typename TC, typename TI, typename TO>
-void AudioResamplerDyn<TC, TI, TO>::setVolume(float left, float right)
-{
- AudioResampler::setVolume(left, right);
- if (is_same<TO, float>::value || is_same<TO, double>::value) {
- mVolumeSimd[0] = static_cast<TO>(left);
- mVolumeSimd[1] = static_cast<TO>(right);
- } else { // integer requires scaling to U4_28 (rounding down)
- // integer volumes are clamped to 0 to UNITY_GAIN so there
- // are no issues with signed overflow.
- mVolumeSimd[0] = u4_28_from_float(clampFloatVol(left));
- mVolumeSimd[1] = u4_28_from_float(clampFloatVol(right));
- }
-}
-
-template<typename T> T max(T a, T b) {return a > b ? a : b;}
-
-template<typename T> T absdiff(T a, T b) {return a > b ? a - b : b - a;}
-
-template<typename TC, typename TI, typename TO>
-void AudioResamplerDyn<TC, TI, TO>::createKaiserFir(Constants &c,
- double stopBandAtten, int inSampleRate, int outSampleRate, double tbwCheat)
-{
- TC* buf = NULL;
- static const double atten = 0.9998; // to avoid ripple overflow
- double fcr;
- double tbw = firKaiserTbw(c.mHalfNumCoefs, stopBandAtten);
-
- (void)posix_memalign(reinterpret_cast<void**>(&buf), 32, (c.mL+1)*c.mHalfNumCoefs*sizeof(TC));
- if (inSampleRate < outSampleRate) { // upsample
- fcr = max(0.5*tbwCheat - tbw/2, tbw/2);
- } else { // downsample
- fcr = max(0.5*tbwCheat*outSampleRate/inSampleRate - tbw/2, tbw/2);
- }
- // create and set filter
- firKaiserGen(buf, c.mL, c.mHalfNumCoefs, stopBandAtten, fcr, atten);
- c.mFirCoefs = buf;
- if (mCoefBuffer) {
- free(mCoefBuffer);
- }
- mCoefBuffer = buf;
-#ifdef DEBUG_RESAMPLER
- // print basic filter stats
- printf("L:%d hnc:%d stopBandAtten:%lf fcr:%lf atten:%lf tbw:%lf\n",
- c.mL, c.mHalfNumCoefs, stopBandAtten, fcr, atten, tbw);
- // test the filter and report results
- double fp = (fcr - tbw/2)/c.mL;
- double fs = (fcr + tbw/2)/c.mL;
- double passMin, passMax, passRipple;
- double stopMax, stopRipple;
- testFir(buf, c.mL, c.mHalfNumCoefs, fp, fs, /*passSteps*/ 1000, /*stopSteps*/ 100000,
- passMin, passMax, passRipple, stopMax, stopRipple);
- printf("passband(%lf, %lf): %.8lf %.8lf %.8lf\n", 0., fp, passMin, passMax, passRipple);
- printf("stopband(%lf, %lf): %.8lf %.3lf\n", fs, 0.5, stopMax, stopRipple);
-#endif
-}
-
-// recursive gcd. Using objdump, it appears the tail recursion is converted to a while loop.
-static int gcd(int n, int m)
-{
- if (m == 0) {
- return n;
- }
- return gcd(m, n % m);
-}
-
-static bool isClose(int32_t newSampleRate, int32_t prevSampleRate,
- int32_t filterSampleRate, int32_t outSampleRate)
-{
-
- // different upsampling ratios do not need a filter change.
- if (filterSampleRate != 0
- && filterSampleRate < outSampleRate
- && newSampleRate < outSampleRate)
- return true;
-
- // check design criteria again if downsampling is detected.
- int pdiff = absdiff(newSampleRate, prevSampleRate);
- int adiff = absdiff(newSampleRate, filterSampleRate);
-
- // allow up to 6% relative change increments.
- // allow up to 12% absolute change increments (from filter design)
- return pdiff < prevSampleRate>>4 && adiff < filterSampleRate>>3;
-}
-
-template<typename TC, typename TI, typename TO>
-void AudioResamplerDyn<TC, TI, TO>::setSampleRate(int32_t inSampleRate)
-{
- if (mInSampleRate == inSampleRate) {
- return;
- }
- int32_t oldSampleRate = mInSampleRate;
- uint32_t oldPhaseWrapLimit = mConstants.mL << mConstants.mShift;
- bool useS32 = false;
-
- mInSampleRate = inSampleRate;
-
- // TODO: Add precalculated Equiripple filters
-
- if (mFilterQuality != getQuality() ||
- !isClose(inSampleRate, oldSampleRate, mFilterSampleRate, mSampleRate)) {
- mFilterSampleRate = inSampleRate;
- mFilterQuality = getQuality();
-
- // Begin Kaiser Filter computation
- //
- // The quantization floor for S16 is about 96db - 10*log_10(#length) + 3dB.
- // Keep the stop band attenuation no greater than 84-85dB for 32 length S16 filters
- //
- // For s32 we keep the stop band attenuation at the same as 16b resolution, about
- // 96-98dB
- //
-
- double stopBandAtten;
- double tbwCheat = 1.; // how much we "cheat" into aliasing
- int halfLength;
- if (mFilterQuality == DYN_HIGH_QUALITY) {
- // 32b coefficients, 64 length
- useS32 = true;
- stopBandAtten = 98.;
- if (inSampleRate >= mSampleRate * 4) {
- halfLength = 48;
- } else if (inSampleRate >= mSampleRate * 2) {
- halfLength = 40;
- } else {
- halfLength = 32;
- }
- } else if (mFilterQuality == DYN_LOW_QUALITY) {
- // 16b coefficients, 16-32 length
- useS32 = false;
- stopBandAtten = 80.;
- if (inSampleRate >= mSampleRate * 4) {
- halfLength = 24;
- } else if (inSampleRate >= mSampleRate * 2) {
- halfLength = 16;
- } else {
- halfLength = 8;
- }
- if (inSampleRate <= mSampleRate) {
- tbwCheat = 1.05;
- } else {
- tbwCheat = 1.03;
- }
- } else { // DYN_MED_QUALITY
- // 16b coefficients, 32-64 length
- // note: > 64 length filters with 16b coefs can have quantization noise problems
- useS32 = false;
- stopBandAtten = 84.;
- if (inSampleRate >= mSampleRate * 4) {
- halfLength = 32;
- } else if (inSampleRate >= mSampleRate * 2) {
- halfLength = 24;
- } else {
- halfLength = 16;
- }
- if (inSampleRate <= mSampleRate) {
- tbwCheat = 1.03;
- } else {
- tbwCheat = 1.01;
- }
- }
-
- // determine the number of polyphases in the filterbank.
- // for 16b, it is desirable to have 2^(16/2) = 256 phases.
- // https://ccrma.stanford.edu/~jos/resample/Relation_Interpolation_Error_Quantization.html
- //
- // We are a bit more lax on this.
-
- int phases = mSampleRate / gcd(mSampleRate, inSampleRate);
-
- // TODO: Once dynamic sample rate change is an option, the code below
- // should be modified to execute only when dynamic sample rate change is enabled.
- //
- // as above, #phases less than 63 is too few phases for accurate linear interpolation.
- // we increase the phases to compensate, but more phases means more memory per
- // filter and more time to compute the filter.
- //
- // if we know that the filter will be used for dynamic sample rate changes,
- // that would allow us skip this part for fixed sample rate resamplers.
- //
- while (phases<63) {
- phases *= 2; // this code only needed to support dynamic rate changes
- }
-
- if (phases>=256) { // too many phases, always interpolate
- phases = 127;
- }
-
- // create the filter
- mConstants.set(phases, halfLength, inSampleRate, mSampleRate);
- createKaiserFir(mConstants, stopBandAtten,
- inSampleRate, mSampleRate, tbwCheat);
- } // End Kaiser filter
-
- // update phase and state based on the new filter.
- const Constants& c(mConstants);
- mInBuffer.resize(mChannelCount, c.mHalfNumCoefs);
- const uint32_t phaseWrapLimit = c.mL << c.mShift;
- // try to preserve as much of the phase fraction as possible for on-the-fly changes
- mPhaseFraction = static_cast<unsigned long long>(mPhaseFraction)
- * phaseWrapLimit / oldPhaseWrapLimit;
- mPhaseFraction %= phaseWrapLimit; // should not do anything, but just in case.
- mPhaseIncrement = static_cast<uint32_t>(static_cast<uint64_t>(phaseWrapLimit)
- * inSampleRate / mSampleRate);
-
- // determine which resampler to use
- // check if locked phase (works only if mPhaseIncrement has no "fractional phase bits")
- int locked = (mPhaseIncrement << (sizeof(mPhaseIncrement)*8 - c.mShift)) == 0;
- if (locked) {
- mPhaseFraction = mPhaseFraction >> c.mShift << c.mShift; // remove fractional phase
- }
-
- // stride is the minimum number of filter coefficients processed per loop iteration.
- // We currently only allow a stride of 16 to match with SIMD processing.
- // This means that the filter length must be a multiple of 16,
- // or half the filter length (mHalfNumCoefs) must be a multiple of 8.
- //
- // Note: A stride of 2 is achieved with non-SIMD processing.
- int stride = ((c.mHalfNumCoefs & 7) == 0) ? 16 : 2;
- LOG_ALWAYS_FATAL_IF(stride < 16, "Resampler stride must be 16 or more");
- LOG_ALWAYS_FATAL_IF(mChannelCount < 1 || mChannelCount > 8,
- "Resampler channels(%d) must be between 1 to 8", mChannelCount);
- // stride 16 (falls back to stride 2 for machines that do not support NEON)
- if (locked) {
- switch (mChannelCount) {
- case 1:
- mResampleFunc = &AudioResamplerDyn<TC, TI, TO>::resample<1, true, 16>;
- break;
- case 2:
- mResampleFunc = &AudioResamplerDyn<TC, TI, TO>::resample<2, true, 16>;
- break;
- case 3:
- mResampleFunc = &AudioResamplerDyn<TC, TI, TO>::resample<3, true, 16>;
- break;
- case 4:
- mResampleFunc = &AudioResamplerDyn<TC, TI, TO>::resample<4, true, 16>;
- break;
- case 5:
- mResampleFunc = &AudioResamplerDyn<TC, TI, TO>::resample<5, true, 16>;
- break;
- case 6:
- mResampleFunc = &AudioResamplerDyn<TC, TI, TO>::resample<6, true, 16>;
- break;
- case 7:
- mResampleFunc = &AudioResamplerDyn<TC, TI, TO>::resample<7, true, 16>;
- break;
- case 8:
- mResampleFunc = &AudioResamplerDyn<TC, TI, TO>::resample<8, true, 16>;
- break;
- }
- } else {
- switch (mChannelCount) {
- case 1:
- mResampleFunc = &AudioResamplerDyn<TC, TI, TO>::resample<1, false, 16>;
- break;
- case 2:
- mResampleFunc = &AudioResamplerDyn<TC, TI, TO>::resample<2, false, 16>;
- break;
- case 3:
- mResampleFunc = &AudioResamplerDyn<TC, TI, TO>::resample<3, false, 16>;
- break;
- case 4:
- mResampleFunc = &AudioResamplerDyn<TC, TI, TO>::resample<4, false, 16>;
- break;
- case 5:
- mResampleFunc = &AudioResamplerDyn<TC, TI, TO>::resample<5, false, 16>;
- break;
- case 6:
- mResampleFunc = &AudioResamplerDyn<TC, TI, TO>::resample<6, false, 16>;
- break;
- case 7:
- mResampleFunc = &AudioResamplerDyn<TC, TI, TO>::resample<7, false, 16>;
- break;
- case 8:
- mResampleFunc = &AudioResamplerDyn<TC, TI, TO>::resample<8, false, 16>;
- break;
- }
- }
-#ifdef DEBUG_RESAMPLER
- printf("channels:%d %s stride:%d %s coef:%d shift:%d\n",
- mChannelCount, locked ? "locked" : "interpolated",
- stride, useS32 ? "S32" : "S16", 2*c.mHalfNumCoefs, c.mShift);
-#endif
-}
-
-template<typename TC, typename TI, typename TO>
-size_t AudioResamplerDyn<TC, TI, TO>::resample(int32_t* out, size_t outFrameCount,
- AudioBufferProvider* provider)
-{
- return (this->*mResampleFunc)(reinterpret_cast<TO*>(out), outFrameCount, provider);
-}
-
-template<typename TC, typename TI, typename TO>
-template<int CHANNELS, bool LOCKED, int STRIDE>
-size_t AudioResamplerDyn<TC, TI, TO>::resample(TO* out, size_t outFrameCount,
- AudioBufferProvider* provider)
-{
- // TODO Mono -> Mono is not supported. OUTPUT_CHANNELS reflects minimum of stereo out.
- const int OUTPUT_CHANNELS = (CHANNELS < 2) ? 2 : CHANNELS;
- const Constants& c(mConstants);
- const TC* const coefs = mConstants.mFirCoefs;
- TI* impulse = mInBuffer.getImpulse();
- size_t inputIndex = 0;
- uint32_t phaseFraction = mPhaseFraction;
- const uint32_t phaseIncrement = mPhaseIncrement;
- size_t outputIndex = 0;
- size_t outputSampleCount = outFrameCount * OUTPUT_CHANNELS;
- const uint32_t phaseWrapLimit = c.mL << c.mShift;
- size_t inFrameCount = (phaseIncrement * (uint64_t)outFrameCount + phaseFraction)
- / phaseWrapLimit;
- // sanity check that inFrameCount is in signed 32 bit integer range.
- ALOG_ASSERT(0 <= inFrameCount && inFrameCount < (1U << 31));
-
- //ALOGV("inFrameCount:%d outFrameCount:%d"
- // " phaseIncrement:%u phaseFraction:%u phaseWrapLimit:%u",
- // inFrameCount, outFrameCount, phaseIncrement, phaseFraction, phaseWrapLimit);
-
- // NOTE: be very careful when modifying the code here. register
- // pressure is very high and a small change might cause the compiler
- // to generate far less efficient code.
- // Always sanity check the result with objdump or test-resample.
-
- // the following logic is a bit convoluted to keep the main processing loop
- // as tight as possible with register allocation.
- while (outputIndex < outputSampleCount) {
- //ALOGV("LOOP: inFrameCount:%d outputIndex:%d outFrameCount:%d"
- // " phaseFraction:%u phaseWrapLimit:%u",
- // inFrameCount, outputIndex, outFrameCount, phaseFraction, phaseWrapLimit);
-
- // check inputIndex overflow
- ALOG_ASSERT(inputIndex <= mBuffer.frameCount, "inputIndex%zu > frameCount%zu",
- inputIndex, mBuffer.frameCount);
- // Buffer is empty, fetch a new one if necessary (inFrameCount > 0).
- // We may not fetch a new buffer if the existing data is sufficient.
- while (mBuffer.frameCount == 0 && inFrameCount > 0) {
- mBuffer.frameCount = inFrameCount;
- provider->getNextBuffer(&mBuffer);
- if (mBuffer.raw == NULL) {
- // We are either at the end of playback or in an underrun situation.
- // Reset buffer to prevent pop noise at the next buffer.
- mInBuffer.reset();
- goto resample_exit;
- }
- inFrameCount -= mBuffer.frameCount;
- if (phaseFraction >= phaseWrapLimit) { // read in data
- mInBuffer.template readAdvance<CHANNELS>(
- impulse, c.mHalfNumCoefs,
- reinterpret_cast<TI*>(mBuffer.raw), inputIndex);
- inputIndex++;
- phaseFraction -= phaseWrapLimit;
- while (phaseFraction >= phaseWrapLimit) {
- if (inputIndex >= mBuffer.frameCount) {
- inputIndex = 0;
- provider->releaseBuffer(&mBuffer);
- break;
- }
- mInBuffer.template readAdvance<CHANNELS>(
- impulse, c.mHalfNumCoefs,
- reinterpret_cast<TI*>(mBuffer.raw), inputIndex);
- inputIndex++;
- phaseFraction -= phaseWrapLimit;
- }
- }
- }
- const TI* const in = reinterpret_cast<const TI*>(mBuffer.raw);
- const size_t frameCount = mBuffer.frameCount;
- const int coefShift = c.mShift;
- const int halfNumCoefs = c.mHalfNumCoefs;
- const TO* const volumeSimd = mVolumeSimd;
-
- // main processing loop
- while (CC_LIKELY(outputIndex < outputSampleCount)) {
- // caution: fir() is inlined and may be large.
- // output will be loaded with the appropriate values
- //
- // from the input samples in impulse[-halfNumCoefs+1]... impulse[halfNumCoefs]
- // from the polyphase filter of (phaseFraction / phaseWrapLimit) in coefs.
- //
- //ALOGV("LOOP2: inFrameCount:%d outputIndex:%d outFrameCount:%d"
- // " phaseFraction:%u phaseWrapLimit:%u",
- // inFrameCount, outputIndex, outFrameCount, phaseFraction, phaseWrapLimit);
- ALOG_ASSERT(phaseFraction < phaseWrapLimit);
- fir<CHANNELS, LOCKED, STRIDE>(
- &out[outputIndex],
- phaseFraction, phaseWrapLimit,
- coefShift, halfNumCoefs, coefs,
- impulse, volumeSimd);
-
- outputIndex += OUTPUT_CHANNELS;
-
- phaseFraction += phaseIncrement;
- while (phaseFraction >= phaseWrapLimit) {
- if (inputIndex >= frameCount) {
- goto done; // need a new buffer
- }
- mInBuffer.template readAdvance<CHANNELS>(impulse, halfNumCoefs, in, inputIndex);
- inputIndex++;
- phaseFraction -= phaseWrapLimit;
- }
- }
-done:
- // We arrive here when we're finished or when the input buffer runs out.
- // Regardless we need to release the input buffer if we've acquired it.
- if (inputIndex > 0) { // we've acquired a buffer (alternatively could check frameCount)
- ALOG_ASSERT(inputIndex == frameCount, "inputIndex(%zu) != frameCount(%zu)",
- inputIndex, frameCount); // must have been fully read.
- inputIndex = 0;
- provider->releaseBuffer(&mBuffer);
- ALOG_ASSERT(mBuffer.frameCount == 0);
- }
- }
-
-resample_exit:
- // inputIndex must be zero in all three cases:
- // (1) the buffer never was been acquired; (2) the buffer was
- // released at "done:"; or (3) getNextBuffer() failed.
- ALOG_ASSERT(inputIndex == 0, "Releasing: inputindex:%zu frameCount:%zu phaseFraction:%u",
- inputIndex, mBuffer.frameCount, phaseFraction);
- ALOG_ASSERT(mBuffer.frameCount == 0); // there must be no frames in the buffer
- mInBuffer.setImpulse(impulse);
- mPhaseFraction = phaseFraction;
- return outputIndex / OUTPUT_CHANNELS;
-}
-
-/* instantiate templates used by AudioResampler::create */
-template class AudioResamplerDyn<float, float, float>;
-template class AudioResamplerDyn<int16_t, int16_t, int32_t>;
-template class AudioResamplerDyn<int32_t, int16_t, int32_t>;
-
-// ----------------------------------------------------------------------------
-} // namespace android
diff --git a/services/audioflinger/AudioResamplerDyn.h b/services/audioflinger/AudioResamplerDyn.h
deleted file mode 100644
index 6af9017..0000000
--- a/services/audioflinger/AudioResamplerDyn.h
+++ /dev/null
@@ -1,134 +0,0 @@
-/*
- * Copyright (C) 2013 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef ANDROID_AUDIO_RESAMPLER_DYN_H
-#define ANDROID_AUDIO_RESAMPLER_DYN_H
-
-#include <stdint.h>
-#include <sys/types.h>
-#include <android/log.h>
-
-#include "AudioResampler.h"
-
-namespace android {
-
-/* AudioResamplerDyn
- *
- * This class template is used for floating point and integer resamplers.
- *
- * Type variables:
- * TC = filter coefficient type (one of int16_t, int32_t, or float)
- * TI = input data type (one of int16_t or float)
- * TO = output data type (one of int32_t or float)
- *
- * For integer input data types TI, the coefficient type TC is either int16_t or int32_t.
- * For float input data types TI, the coefficient type TC is float.
- */
-
-template<typename TC, typename TI, typename TO>
-class AudioResamplerDyn: public AudioResampler {
-public:
- AudioResamplerDyn(int inChannelCount,
- int32_t sampleRate, src_quality quality);
-
- virtual ~AudioResamplerDyn();
-
- virtual void init();
-
- virtual void setSampleRate(int32_t inSampleRate);
-
- virtual void setVolume(float left, float right);
-
- virtual size_t resample(int32_t* out, size_t outFrameCount,
- AudioBufferProvider* provider);
-
-private:
-
- class Constants { // stores the filter constants.
- public:
- Constants() :
- mL(0), mShift(0), mHalfNumCoefs(0), mFirCoefs(NULL)
- {}
- void set(int L, int halfNumCoefs,
- int inSampleRate, int outSampleRate);
-
- int mL; // interpolation phases in the filter.
- int mShift; // right shift to get polyphase index
- unsigned int mHalfNumCoefs; // filter half #coefs
- const TC* mFirCoefs; // polyphase filter bank
- };
-
- class InBuffer { // buffer management for input type TI
- public:
- InBuffer();
- ~InBuffer();
- void init();
-
- void resize(int CHANNELS, int halfNumCoefs);
-
- // used for direct management of the mImpulse pointer
- inline TI* getImpulse() {
- return mImpulse;
- }
-
- inline void setImpulse(TI *impulse) {
- mImpulse = impulse;
- }
-
- template<int CHANNELS>
- inline void readAgain(TI*& impulse, const int halfNumCoefs,
- const TI* const in, const size_t inputIndex);
-
- template<int CHANNELS>
- inline void readAdvance(TI*& impulse, const int halfNumCoefs,
- const TI* const in, const size_t inputIndex);
-
- void reset();
-
- private:
- // tuning parameter guidelines: 2 <= multiple <= 8
- static const int kStateSizeMultipleOfFilterLength = 4;
-
- // in general, mRingFull = mState + mStateSize - halfNumCoefs*CHANNELS.
- TI* mState; // base pointer for the input buffer storage
- TI* mImpulse; // current location of the impulse response (centered)
- TI* mRingFull; // mState <= mImpulse < mRingFull
- size_t mStateCount; // size of state in units of TI.
- };
-
- void createKaiserFir(Constants &c, double stopBandAtten,
- int inSampleRate, int outSampleRate, double tbwCheat);
-
- template<int CHANNELS, bool LOCKED, int STRIDE>
- size_t resample(TO* out, size_t outFrameCount, AudioBufferProvider* provider);
-
- // define a pointer to member function type for resample
- typedef size_t (AudioResamplerDyn<TC, TI, TO>::*resample_ABP_t)(TO* out,
- size_t outFrameCount, AudioBufferProvider* provider);
-
- // data - the contiguous storage and layout of these is important.
- InBuffer mInBuffer;
- Constants mConstants; // current set of coefficient parameters
- TO __attribute__ ((aligned (8))) mVolumeSimd[2]; // must be aligned or NEON may crash
- resample_ABP_t mResampleFunc; // called function for resampling
- int32_t mFilterSampleRate; // designed filter sample rate.
- src_quality mFilterQuality; // designed filter quality.
- void* mCoefBuffer; // if a filter is created, this is not null
-};
-
-} // namespace android
-
-#endif /*ANDROID_AUDIO_RESAMPLER_DYN_H*/
diff --git a/services/audioflinger/AudioResamplerFirGen.h b/services/audioflinger/AudioResamplerFirGen.h
deleted file mode 100644
index ad18965..0000000
--- a/services/audioflinger/AudioResamplerFirGen.h
+++ /dev/null
@@ -1,712 +0,0 @@
-/*
- * Copyright (C) 2013 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef ANDROID_AUDIO_RESAMPLER_FIR_GEN_H
-#define ANDROID_AUDIO_RESAMPLER_FIR_GEN_H
-
-#include "utils/Compat.h"
-
-namespace android {
-
-/*
- * generates a sine wave at equal steps.
- *
- * As most of our functions use sine or cosine at equal steps,
- * it is very efficient to compute them that way (single multiply and subtract),
- * rather than invoking the math library sin() or cos() each time.
- *
- * SineGen uses Goertzel's Algorithm (as a generator not a filter)
- * to calculate sine(wstart + n * wstep) or cosine(wstart + n * wstep)
- * by stepping through 0, 1, ... n.
- *
- * e^i(wstart+wstep) = 2cos(wstep) * e^i(wstart) - e^i(wstart-wstep)
- *
- * or looking at just the imaginary sine term, as the cosine follows identically:
- *
- * sin(wstart+wstep) = 2cos(wstep) * sin(wstart) - sin(wstart-wstep)
- *
- * Goertzel's algorithm is more efficient than the angle addition formula,
- * e^i(wstart+wstep) = e^i(wstart) * e^i(wstep), which takes up to
- * 4 multiplies and 2 adds (or 3* and 3+) and requires both sine and
- * cosine generation due to the complex * complex multiply (full rotation).
- *
- * See: http://en.wikipedia.org/wiki/Goertzel_algorithm
- *
- */
-
-class SineGen {
-public:
- SineGen(double wstart, double wstep, bool cosine = false) {
- if (cosine) {
- mCurrent = cos(wstart);
- mPrevious = cos(wstart - wstep);
- } else {
- mCurrent = sin(wstart);
- mPrevious = sin(wstart - wstep);
- }
- mTwoCos = 2.*cos(wstep);
- }
- SineGen(double expNow, double expPrev, double twoCosStep) {
- mCurrent = expNow;
- mPrevious = expPrev;
- mTwoCos = twoCosStep;
- }
- inline double value() const {
- return mCurrent;
- }
- inline void advance() {
- double tmp = mCurrent;
- mCurrent = mCurrent*mTwoCos - mPrevious;
- mPrevious = tmp;
- }
- inline double valueAdvance() {
- double tmp = mCurrent;
- mCurrent = mCurrent*mTwoCos - mPrevious;
- mPrevious = tmp;
- return tmp;
- }
-
-private:
- double mCurrent; // current value of sine/cosine
- double mPrevious; // previous value of sine/cosine
- double mTwoCos; // stepping factor
-};
-
-/*
- * generates a series of sine generators, phase offset by fixed steps.
- *
- * This is used to generate polyphase sine generators, one per polyphase
- * in the filter code below.
- *
- * The SineGen returned by value() starts at innerStart = outerStart + n*outerStep;
- * increments by innerStep.
- *
- */
-
-class SineGenGen {
-public:
- SineGenGen(double outerStart, double outerStep, double innerStep, bool cosine = false)
- : mSineInnerCur(outerStart, outerStep, cosine),
- mSineInnerPrev(outerStart-innerStep, outerStep, cosine)
- {
- mTwoCos = 2.*cos(innerStep);
- }
- inline SineGen value() {
- return SineGen(mSineInnerCur.value(), mSineInnerPrev.value(), mTwoCos);
- }
- inline void advance() {
- mSineInnerCur.advance();
- mSineInnerPrev.advance();
- }
- inline SineGen valueAdvance() {
- return SineGen(mSineInnerCur.valueAdvance(), mSineInnerPrev.valueAdvance(), mTwoCos);
- }
-
-private:
- SineGen mSineInnerCur; // generate the inner sine values (stepped by outerStep).
- SineGen mSineInnerPrev; // generate the inner sine previous values
- // (behind by innerStep, stepped by outerStep).
- double mTwoCos; // the inner stepping factor for the returned SineGen.
-};
-
-static inline double sqr(double x) {
- return x * x;
-}
-
-/*
- * rounds a double to the nearest integer for FIR coefficients.
- *
- * One variant uses noise shaping, which must keep error history
- * to work (the err parameter, initialized to 0).
- * The other variant is a non-noise shaped version for
- * S32 coefficients (noise shaping doesn't gain much).
- *
- * Caution: No bounds saturation is applied, but isn't needed in this case.
- *
- * @param x is the value to round.
- *
- * @param maxval is the maximum integer scale factor expressed as an int64 (for headroom).
- * Typically this may be the maximum positive integer+1 (using the fact that double precision
- * FIR coefficients generated here are never that close to 1.0 to pose an overflow condition).
- *
- * @param err is the previous error (actual - rounded) for the previous rounding op.
- * For 16b coefficients this can improve stopband dB performance by up to 2dB.
- *
- * Many variants exist for the noise shaping: http://en.wikipedia.org/wiki/Noise_shaping
- *
- */
-
-static inline int64_t toint(double x, int64_t maxval, double& err) {
- double val = x * maxval;
- double ival = floor(val + 0.5 + err*0.2);
- err = val - ival;
- return static_cast<int64_t>(ival);
-}
-
-static inline int64_t toint(double x, int64_t maxval) {
- return static_cast<int64_t>(floor(x * maxval + 0.5));
-}
-
-/*
- * Modified Bessel function of the first kind
- * http://en.wikipedia.org/wiki/Bessel_function
- *
- * The formulas are taken from Abramowitz and Stegun,
- * _Handbook of Mathematical Functions_ (links below):
- *
- * http://people.math.sfu.ca/~cbm/aands/page_375.htm
- * http://people.math.sfu.ca/~cbm/aands/page_378.htm
- *
- * http://dlmf.nist.gov/10.25
- * http://dlmf.nist.gov/10.40
- *
- * Note we assume x is nonnegative (the function is symmetric,
- * pass in the absolute value as needed).
- *
- * Constants are compile time derived with templates I0Term<> and
- * I0ATerm<> to the precision of the compiler. The series can be expanded
- * to any precision needed, but currently set around 24b precision.
- *
- * We use a bit of template math here, constexpr would probably be
- * more appropriate for a C++11 compiler.
- *
- * For the intermediate range 3.75 < x < 15, we use minimax polynomial fit.
- *
- */
-
-template <int N>
-struct I0Term {
- static const CONSTEXPR double value = I0Term<N-1>::value / (4. * N * N);
-};
-
-template <>
-struct I0Term<0> {
- static const CONSTEXPR double value = 1.;
-};
-
-template <int N>
-struct I0ATerm {
- static const CONSTEXPR double value = I0ATerm<N-1>::value * (2.*N-1.) * (2.*N-1.) / (8. * N);
-};
-
-template <>
-struct I0ATerm<0> { // 1/sqrt(2*PI);
- static const CONSTEXPR double value =
- 0.398942280401432677939946059934381868475858631164934657665925;
-};
-
-#if USE_HORNERS_METHOD
-/* Polynomial evaluation of A + Bx + Cx^2 + Dx^3 + ...
- * using Horner's Method: http://en.wikipedia.org/wiki/Horner's_method
- *
- * This has fewer multiplications than Estrin's method below, but has back to back
- * floating point dependencies.
- *
- * On ARM this appears to work slower, so USE_HORNERS_METHOD is not default enabled.
- */
-
-inline double Poly2(double A, double B, double x) {
- return A + x * B;
-}
-
-inline double Poly4(double A, double B, double C, double D, double x) {
- return A + x * (B + x * (C + x * (D)));
-}
-
-inline double Poly7(double A, double B, double C, double D, double E, double F, double G,
- double x) {
- return A + x * (B + x * (C + x * (D + x * (E + x * (F + x * (G))))));
-}
-
-inline double Poly9(double A, double B, double C, double D, double E, double F, double G,
- double H, double I, double x) {
- return A + x * (B + x * (C + x * (D + x * (E + x * (F + x * (G + x * (H + x * (I))))))));
-}
-
-#else
-/* Polynomial evaluation of A + Bx + Cx^2 + Dx^3 + ...
- * using Estrin's Method: http://en.wikipedia.org/wiki/Estrin's_scheme
- *
- * This is typically faster, perhaps gains about 5-10% overall on ARM processors
- * over Horner's method above.
- */
-
-inline double Poly2(double A, double B, double x) {
- return A + B * x;
-}
-
-inline double Poly3(double A, double B, double C, double x, double x2) {
- return Poly2(A, B, x) + C * x2;
-}
-
-inline double Poly3(double A, double B, double C, double x) {
- return Poly2(A, B, x) + C * x * x;
-}
-
-inline double Poly4(double A, double B, double C, double D, double x, double x2) {
- return Poly2(A, B, x) + Poly2(C, D, x) * x2; // same as poly2(poly2, poly2, x2);
-}
-
-inline double Poly4(double A, double B, double C, double D, double x) {
- return Poly4(A, B, C, D, x, x * x);
-}
-
-inline double Poly7(double A, double B, double C, double D, double E, double F, double G,
- double x) {
- double x2 = x * x;
- return Poly4(A, B, C, D, x, x2) + Poly3(E, F, G, x, x2) * (x2 * x2);
-}
-
-inline double Poly8(double A, double B, double C, double D, double E, double F, double G,
- double H, double x, double x2, double x4) {
- return Poly4(A, B, C, D, x, x2) + Poly4(E, F, G, H, x, x2) * x4;
-}
-
-inline double Poly9(double A, double B, double C, double D, double E, double F, double G,
- double H, double I, double x) {
- double x2 = x * x;
-#if 1
- // It does not seem faster to explicitly decompose Poly8 into Poly4, but
- // could depend on compiler floating point scheduling.
- double x4 = x2 * x2;
- return Poly8(A, B, C, D, E, F, G, H, x, x2, x4) + I * (x4 * x4);
-#else
- double val = Poly4(A, B, C, D, x, x2);
- double x4 = x2 * x2;
- return val + Poly4(E, F, G, H, x, x2) * x4 + I * (x4 * x4);
-#endif
-}
-#endif
-
-static inline double I0(double x) {
- if (x < 3.75) {
- x *= x;
- return Poly7(I0Term<0>::value, I0Term<1>::value,
- I0Term<2>::value, I0Term<3>::value,
- I0Term<4>::value, I0Term<5>::value,
- I0Term<6>::value, x); // e < 1.6e-7
- }
- if (1) {
- /*
- * Series expansion coefs are easy to calculate, but are expanded around 0,
- * so error is unequal over the interval 0 < x < 3.75, the error being
- * significantly better near 0.
- *
- * A better solution is to use precise minimax polynomial fits.
- *
- * We use a slightly more complicated solution for 3.75 < x < 15, based on
- * the tables in Blair and Edwards, "Stable Rational Minimax Approximations
- * to the Modified Bessel Functions I0(x) and I1(x)", Chalk Hill Nuclear Laboratory,
- * AECL-4928.
- *
- * http://www.iaea.org/inis/collection/NCLCollectionStore/_Public/06/178/6178667.pdf
- *
- * See Table 11 for 0 < x < 15; e < 10^(-7.13).
- *
- * Note: Beta cannot exceed 15 (hence Stopband cannot exceed 144dB = 24b).
- *
- * This speeds up overall computation by about 40% over using the else clause below,
- * which requires sqrt and exp.
- *
- */
-
- x *= x;
- double num = Poly9(-0.13544938430e9, -0.33153754512e8,
- -0.19406631946e7, -0.48058318783e5,
- -0.63269783360e3, -0.49520779070e1,
- -0.24970910370e-1, -0.74741159550e-4,
- -0.18257612460e-6, x);
- double y = x - 225.; // reflection around 15 (squared)
- double den = Poly4(-0.34598737196e8, 0.23852643181e6,
- -0.70699387620e3, 0.10000000000e1, y);
- return num / den;
-
-#if IO_EXTENDED_BETA
- /* Table 42 for x > 15; e < 10^(-8.11).
- * This is used for Beta>15, but is disabled here as
- * we never use Beta that high.
- *
- * NOTE: This should be enabled only for x > 15.
- */
-
- double y = 1./x;
- double z = y - (1./15);
- double num = Poly2(0.415079861746e1, -0.5149092496e1, z);
- double den = Poly3(0.103150763823e2, -0.14181687413e2,
- 0.1000000000e1, z);
- return exp(x) * sqrt(y) * num / den;
-#endif
- } else {
- /*
- * NOT USED, but reference for large Beta.
- *
- * Abramowitz and Stegun asymptotic formula.
- * works for x > 3.75.
- */
- double y = 1./x;
- return exp(x) * sqrt(y) *
- // note: reciprocal squareroot may be easier!
- // http://en.wikipedia.org/wiki/Fast_inverse_square_root
- Poly9(I0ATerm<0>::value, I0ATerm<1>::value,
- I0ATerm<2>::value, I0ATerm<3>::value,
- I0ATerm<4>::value, I0ATerm<5>::value,
- I0ATerm<6>::value, I0ATerm<7>::value,
- I0ATerm<8>::value, y); // (... e) < 1.9e-7
- }
-}
-
-/* A speed optimized version of the Modified Bessel I0() which incorporates
- * the sqrt and numerator multiply and denominator divide into the computation.
- * This speeds up filter computation by about 10-15%.
- */
-static inline double I0SqrRat(double x2, double num, double den) {
- if (x2 < (3.75 * 3.75)) {
- return Poly7(I0Term<0>::value, I0Term<1>::value,
- I0Term<2>::value, I0Term<3>::value,
- I0Term<4>::value, I0Term<5>::value,
- I0Term<6>::value, x2) * num / den; // e < 1.6e-7
- }
- num *= Poly9(-0.13544938430e9, -0.33153754512e8,
- -0.19406631946e7, -0.48058318783e5,
- -0.63269783360e3, -0.49520779070e1,
- -0.24970910370e-1, -0.74741159550e-4,
- -0.18257612460e-6, x2); // e < 10^(-7.13).
- double y = x2 - 225.; // reflection around 15 (squared)
- den *= Poly4(-0.34598737196e8, 0.23852643181e6,
- -0.70699387620e3, 0.10000000000e1, y);
- return num / den;
-}
-
-/*
- * calculates the transition bandwidth for a Kaiser filter
- *
- * Formula 3.2.8, Vaidyanathan, _Multirate Systems and Filter Banks_, p. 48
- * Formula 7.76, Oppenheim and Schafer, _Discrete-time Signal Processing, 3e_, p. 542
- *
- * @param halfNumCoef is half the number of coefficients per filter phase.
- *
- * @param stopBandAtten is the stop band attenuation desired.
- *
- * @return the transition bandwidth in normalized frequency (0 <= f <= 0.5)
- */
-static inline double firKaiserTbw(int halfNumCoef, double stopBandAtten) {
- return (stopBandAtten - 7.95)/((2.*14.36)*halfNumCoef);
-}
-
-/*
- * calculates the fir transfer response of the overall polyphase filter at w.
- *
- * Calculates the DTFT transfer coefficient H(w) for 0 <= w <= PI, utilizing the
- * fact that h[n] is symmetric (cosines only, no complex arithmetic).
- *
- * We use Goertzel's algorithm to accelerate the computation to essentially
- * a single multiply and 2 adds per filter coefficient h[].
- *
- * Be careful be careful to consider that h[n] is the overall polyphase filter,
- * with L phases, so rescaling H(w)/L is probably what you expect for "unity gain",
- * as you only use one of the polyphases at a time.
- */
-template <typename T>
-static inline double firTransfer(const T* coef, int L, int halfNumCoef, double w) {
- double accum = static_cast<double>(coef[0])*0.5; // "center coefficient" from first bank
- coef += halfNumCoef; // skip first filterbank (picked up by the last filterbank).
-#if SLOW_FIRTRANSFER
- /* Original code for reference. This is equivalent to the code below, but slower. */
- for (int i=1 ; i<=L ; ++i) {
- for (int j=0, ix=i ; j<halfNumCoef ; ++j, ix+=L) {
- accum += cos(ix*w)*static_cast<double>(*coef++);
- }
- }
-#else
- /*
- * Our overall filter is stored striped by polyphases, not a contiguous h[n].
- * We could fetch coefficients in a non-contiguous fashion
- * but that will not scale to vector processing.
- *
- * We apply Goertzel's algorithm directly to each polyphase filter bank instead of
- * using cosine generation/multiplication, thereby saving one multiply per inner loop.
- *
- * See: http://en.wikipedia.org/wiki/Goertzel_algorithm
- * Also: Oppenheim and Schafer, _Discrete Time Signal Processing, 3e_, p. 720.
- *
- * We use the basic recursion to incorporate the cosine steps into real sequence x[n]:
- * s[n] = x[n] + (2cosw)*s[n-1] + s[n-2]
- *
- * y[n] = s[n] - e^(iw)s[n-1]
- * = sum_{k=-\infty}^{n} x[k]e^(-iw(n-k))
- * = e^(-iwn) sum_{k=0}^{n} x[k]e^(iwk)
- *
- * The summation contains the frequency steps we want multiplied by the source
- * (similar to a DTFT).
- *
- * Using symmetry, and just the real part (be careful, this must happen
- * after any internal complex multiplications), the polyphase filterbank
- * transfer function is:
- *
- * Hpp[n, w, w_0] = sum_{k=0}^{n} x[k] * cos(wk + w_0)
- * = Re{ e^(iwn + iw_0) y[n]}
- * = cos(wn+w_0) * s[n] - cos(w(n+1)+w_0) * s[n-1]
- *
- * using the fact that s[n] of real x[n] is real.
- *
- */
- double dcos = 2. * cos(L*w);
- int start = ((halfNumCoef)*L + 1);
- SineGen cc((start - L) * w, w, true); // cosine
- SineGen cp(start * w, w, true); // cosine
- for (int i=1 ; i<=L ; ++i) {
- double sc = 0;
- double sp = 0;
- for (int j=0 ; j<halfNumCoef ; ++j) {
- double tmp = sc;
- sc = static_cast<double>(*coef++) + dcos*sc - sp;
- sp = tmp;
- }
- // If we are awfully clever, we can apply Goertzel's algorithm
- // again on the sc and sp sequences returned here.
- accum += cc.valueAdvance() * sc - cp.valueAdvance() * sp;
- }
-#endif
- return accum*2.;
-}
-
-/*
- * evaluates the minimum and maximum |H(f)| bound in a band region.
- *
- * This is usually done with equally spaced increments in the target band in question.
- * The passband is often very small, and sampled that way. The stopband is often much
- * larger.
- *
- * We use the fact that the overall polyphase filter has an additional bank at the end
- * for interpolation; hence it is overspecified for the H(f) computation. Thus the
- * first polyphase is never actually checked, excepting its first term.
- *
- * In this code we use the firTransfer() evaluator above, which uses Goertzel's
- * algorithm to calculate the transfer function at each point.
- *
- * TODO: An alternative with equal spacing is the FFT/DFT. An alternative with unequal
- * spacing is a chirp transform.
- *
- * @param coef is the designed polyphase filter banks
- *
- * @param L is the number of phases (for interpolation)
- *
- * @param halfNumCoef should be half the number of coefficients for a single
- * polyphase.
- *
- * @param fstart is the normalized frequency start.
- *
- * @param fend is the normalized frequency end.
- *
- * @param steps is the number of steps to take (sampling) between frequency start and end
- *
- * @param firMin returns the minimum transfer |H(f)| found
- *
- * @param firMax returns the maximum transfer |H(f)| found
- *
- * 0 <= f <= 0.5.
- * This is used to test passband and stopband performance.
- */
-template <typename T>
-static void testFir(const T* coef, int L, int halfNumCoef,
- double fstart, double fend, int steps, double &firMin, double &firMax) {
- double wstart = fstart*(2.*M_PI);
- double wend = fend*(2.*M_PI);
- double wstep = (wend - wstart)/steps;
- double fmax, fmin;
- double trf = firTransfer(coef, L, halfNumCoef, wstart);
- if (trf<0) {
- trf = -trf;
- }
- fmin = fmax = trf;
- wstart += wstep;
- for (int i=1; i<steps; ++i) {
- trf = firTransfer(coef, L, halfNumCoef, wstart);
- if (trf<0) {
- trf = -trf;
- }
- if (trf>fmax) {
- fmax = trf;
- }
- else if (trf<fmin) {
- fmin = trf;
- }
- wstart += wstep;
- }
- // renormalize - this is only needed for integer filter types
- double norm = 1./((1ULL<<(sizeof(T)*8-1))*L);
-
- firMin = fmin * norm;
- firMax = fmax * norm;
-}
-
-/*
- * evaluates the |H(f)| lowpass band characteristics.
- *
- * This function tests the lowpass characteristics for the overall polyphase filter,
- * and is used to verify the design. For this case, fp should be set to the
- * passband normalized frequency from 0 to 0.5 for the overall filter (thus it
- * is the designed polyphase bank value / L). Likewise for fs.
- *
- * @param coef is the designed polyphase filter banks
- *
- * @param L is the number of phases (for interpolation)
- *
- * @param halfNumCoef should be half the number of coefficients for a single
- * polyphase.
- *
- * @param fp is the passband normalized frequency, 0 < fp < fs < 0.5.
- *
- * @param fs is the stopband normalized frequency, 0 < fp < fs < 0.5.
- *
- * @param passSteps is the number of passband sampling steps.
- *
- * @param stopSteps is the number of stopband sampling steps.
- *
- * @param passMin is the minimum value in the passband
- *
- * @param passMax is the maximum value in the passband (useful for scaling). This should
- * be less than 1., to avoid sine wave test overflow.
- *
- * @param passRipple is the passband ripple. Typically this should be less than 0.1 for
- * an audio filter. Generally speaker/headphone device characteristics will dominate
- * the passband term.
- *
- * @param stopMax is the maximum value in the stopband.
- *
- * @param stopRipple is the stopband ripple, also known as stopband attenuation.
- * Typically this should be greater than ~80dB for low quality, and greater than
- * ~100dB for full 16b quality, otherwise aliasing may become noticeable.
- *
- */
-template <typename T>
-static void testFir(const T* coef, int L, int halfNumCoef,
- double fp, double fs, int passSteps, int stopSteps,
- double &passMin, double &passMax, double &passRipple,
- double &stopMax, double &stopRipple) {
- double fmin, fmax;
- testFir(coef, L, halfNumCoef, 0., fp, passSteps, fmin, fmax);
- double d1 = (fmax - fmin)/2.;
- passMin = fmin;
- passMax = fmax;
- passRipple = -20.*log10(1. - d1); // passband ripple
- testFir(coef, L, halfNumCoef, fs, 0.5, stopSteps, fmin, fmax);
- // fmin is really not important for the stopband.
- stopMax = fmax;
- stopRipple = -20.*log10(fmax); // stopband ripple/attenuation
-}
-
-/*
- * Calculates the overall polyphase filter based on a windowed sinc function.
- *
- * The windowed sinc is an odd length symmetric filter of exactly L*halfNumCoef*2+1
- * taps for the entire kernel. This is then decomposed into L+1 polyphase filterbanks.
- * The last filterbank is used for interpolation purposes (and is mostly composed
- * of the first bank shifted by one sample), and is unnecessary if one does
- * not do interpolation.
- *
- * We use the last filterbank for some transfer function calculation purposes,
- * so it needs to be generated anyways.
- *
- * @param coef is the caller allocated space for coefficients. This should be
- * exactly (L+1)*halfNumCoef in size.
- *
- * @param L is the number of phases (for interpolation)
- *
- * @param halfNumCoef should be half the number of coefficients for a single
- * polyphase.
- *
- * @param stopBandAtten is the stopband value, should be >50dB.
- *
- * @param fcr is cutoff frequency/sampling rate (<0.5). At this point, the energy
- * should be 6dB less. (fcr is where the amplitude drops by half). Use the
- * firKaiserTbw() to calculate the transition bandwidth. fcr is the midpoint
- * between the stop band and the pass band (fstop+fpass)/2.
- *
- * @param atten is the attenuation (generally slightly less than 1).
- */
-
-template <typename T>
-static inline void firKaiserGen(T* coef, int L, int halfNumCoef,
- double stopBandAtten, double fcr, double atten) {
- //
- // Formula 3.2.5, 3.2.7, Vaidyanathan, _Multirate Systems and Filter Banks_, p. 48
- // Formula 7.75, Oppenheim and Schafer, _Discrete-time Signal Processing, 3e_, p. 542
- //
- // See also: http://melodi.ee.washington.edu/courses/ee518/notes/lec17.pdf
- //
- // Kaiser window and beta parameter
- //
- // | 0.1102*(A - 8.7) A > 50
- // beta = | 0.5842*(A - 21)^0.4 + 0.07886*(A - 21) 21 <= A <= 50
- // | 0. A < 21
- //
- // with A is the desired stop-band attenuation in dBFS
- //
- // 30 dB 2.210
- // 40 dB 3.384
- // 50 dB 4.538
- // 60 dB 5.658
- // 70 dB 6.764
- // 80 dB 7.865
- // 90 dB 8.960
- // 100 dB 10.056
-
- const int N = L * halfNumCoef; // non-negative half
- const double beta = 0.1102 * (stopBandAtten - 8.7); // >= 50dB always
- const double xstep = (2. * M_PI) * fcr / L;
- const double xfrac = 1. / N;
- const double yscale = atten * L / (I0(beta) * M_PI);
- const double sqrbeta = sqr(beta);
-
- // We use sine generators, which computes sines on regular step intervals.
- // This speeds up overall computation about 40% from computing the sine directly.
-
- SineGenGen sgg(0., xstep, L*xstep); // generates sine generators (one per polyphase)
-
- for (int i=0 ; i<=L ; ++i) { // generate an extra set of coefs for interpolation
-
- // computation for a single polyphase of the overall filter.
- SineGen sg = sgg.valueAdvance(); // current sine generator for "j" inner loop.
- double err = 0; // for noise shaping on int16_t coefficients (over each polyphase)
-
- for (int j=0, ix=i ; j<halfNumCoef ; ++j, ix+=L) {
- double y;
- if (CC_LIKELY(ix)) {
- double x = static_cast<double>(ix);
-
- // sine generator: sg.valueAdvance() returns sin(ix*xstep);
- // y = I0(beta * sqrt(1.0 - sqr(x * xfrac))) * yscale * sg.valueAdvance() / x;
- y = I0SqrRat(sqrbeta * (1.0 - sqr(x * xfrac)), yscale * sg.valueAdvance(), x);
- } else {
- y = 2. * atten * fcr; // center of filter, sinc(0) = 1.
- sg.advance();
- }
-
- if (is_same<T, int16_t>::value) { // int16_t needs noise shaping
- *coef++ = static_cast<T>(toint(y, 1ULL<<(sizeof(T)*8-1), err));
- } else if (is_same<T, int32_t>::value) {
- *coef++ = static_cast<T>(toint(y, 1ULL<<(sizeof(T)*8-1)));
- } else { // assumed float or double
- *coef++ = static_cast<T>(y);
- }
- }
- }
-}
-
-} // namespace android
-
-#endif /*ANDROID_AUDIO_RESAMPLER_FIR_GEN_H*/
diff --git a/services/audioflinger/AudioResamplerFirOps.h b/services/audioflinger/AudioResamplerFirOps.h
deleted file mode 100644
index 2e4cee3..0000000
--- a/services/audioflinger/AudioResamplerFirOps.h
+++ /dev/null
@@ -1,174 +0,0 @@
-/*
- * Copyright (C) 2013 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef ANDROID_AUDIO_RESAMPLER_FIR_OPS_H
-#define ANDROID_AUDIO_RESAMPLER_FIR_OPS_H
-
-namespace android {
-
-#if defined(__arm__) && !defined(__thumb__)
-#define USE_INLINE_ASSEMBLY (true)
-#else
-#define USE_INLINE_ASSEMBLY (false)
-#endif
-
-#if defined(__aarch64__) || defined(__ARM_NEON__)
-#ifndef USE_NEON
-#define USE_NEON (true)
-#endif
-#else
-#define USE_NEON (false)
-#endif
-#if USE_NEON
-#include <arm_neon.h>
-#endif
-
-#if defined(__SSSE3__) // Should be supported in x86 ABI for both 32 & 64-bit.
-#define USE_SSE (true)
-#include <tmmintrin.h>
-#else
-#define USE_SSE (false)
-#endif
-
-template<typename T, typename U>
-struct is_same
-{
- static const bool value = false;
-};
-
-template<typename T>
-struct is_same<T, T> // partial specialization
-{
- static const bool value = true;
-};
-
-static inline
-int32_t mulRL(int left, int32_t in, uint32_t vRL)
-{
-#if USE_INLINE_ASSEMBLY
- int32_t out;
- if (left) {
- asm( "smultb %[out], %[in], %[vRL] \n"
- : [out]"=r"(out)
- : [in]"%r"(in), [vRL]"r"(vRL)
- : );
- } else {
- asm( "smultt %[out], %[in], %[vRL] \n"
- : [out]"=r"(out)
- : [in]"%r"(in), [vRL]"r"(vRL)
- : );
- }
- return out;
-#else
- int16_t v = left ? static_cast<int16_t>(vRL) : static_cast<int16_t>(vRL>>16);
- return static_cast<int32_t>((static_cast<int64_t>(in) * v) >> 16);
-#endif
-}
-
-static inline
-int32_t mulAdd(int16_t in, int16_t v, int32_t a)
-{
-#if USE_INLINE_ASSEMBLY
- int32_t out;
- asm( "smlabb %[out], %[v], %[in], %[a] \n"
- : [out]"=r"(out)
- : [in]"%r"(in), [v]"r"(v), [a]"r"(a)
- : );
- return out;
-#else
- return a + v * in;
-#endif
-}
-
-static inline
-int32_t mulAdd(int16_t in, int32_t v, int32_t a)
-{
-#if USE_INLINE_ASSEMBLY
- int32_t out;
- asm( "smlawb %[out], %[v], %[in], %[a] \n"
- : [out]"=r"(out)
- : [in]"%r"(in), [v]"r"(v), [a]"r"(a)
- : );
- return out;
-#else
- return a + static_cast<int32_t>((static_cast<int64_t>(v) * in) >> 16);
-#endif
-}
-
-static inline
-int32_t mulAdd(int32_t in, int32_t v, int32_t a)
-{
-#if USE_INLINE_ASSEMBLY
- int32_t out;
- asm( "smmla %[out], %[v], %[in], %[a] \n"
- : [out]"=r"(out)
- : [in]"%r"(in), [v]"r"(v), [a]"r"(a)
- : );
- return out;
-#else
- return a + static_cast<int32_t>((static_cast<int64_t>(v) * in) >> 32);
-#endif
-}
-
-static inline
-int32_t mulAddRL(int left, uint32_t inRL, int16_t v, int32_t a)
-{
-#if 0 // USE_INLINE_ASSEMBLY Seems to fail with Clang b/34110890
- int32_t out;
- if (left) {
- asm( "smlabb %[out], %[v], %[inRL], %[a] \n"
- : [out]"=r"(out)
- : [inRL]"%r"(inRL), [v]"r"(v), [a]"r"(a)
- : );
- } else {
- asm( "smlabt %[out], %[v], %[inRL], %[a] \n"
- : [out]"=r"(out)
- : [inRL]"%r"(inRL), [v]"r"(v), [a]"r"(a)
- : );
- }
- return out;
-#else
- int16_t s = left ? static_cast<int16_t>(inRL) : static_cast<int16_t>(inRL>>16);
- return a + v * s;
-#endif
-}
-
-static inline
-int32_t mulAddRL(int left, uint32_t inRL, int32_t v, int32_t a)
-{
-#if 0 // USE_INLINE_ASSEMBLY Seems to fail with Clang b/34110890
- int32_t out;
- if (left) {
- asm( "smlawb %[out], %[v], %[inRL], %[a] \n"
- : [out]"=r"(out)
- : [inRL]"%r"(inRL), [v]"r"(v), [a]"r"(a)
- : );
- } else {
- asm( "smlawt %[out], %[v], %[inRL], %[a] \n"
- : [out]"=r"(out)
- : [inRL]"%r"(inRL), [v]"r"(v), [a]"r"(a)
- : );
- }
- return out;
-#else
- int16_t s = left ? static_cast<int16_t>(inRL) : static_cast<int16_t>(inRL>>16);
- return a + static_cast<int32_t>((static_cast<int64_t>(v) * s) >> 16);
-#endif
-}
-
-} // namespace android
-
-#endif /*ANDROID_AUDIO_RESAMPLER_FIR_OPS_H*/
diff --git a/services/audioflinger/AudioResamplerFirProcess.h b/services/audioflinger/AudioResamplerFirProcess.h
deleted file mode 100644
index 176202e..0000000
--- a/services/audioflinger/AudioResamplerFirProcess.h
+++ /dev/null
@@ -1,439 +0,0 @@
-/*
- * Copyright (C) 2013 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef ANDROID_AUDIO_RESAMPLER_FIR_PROCESS_H
-#define ANDROID_AUDIO_RESAMPLER_FIR_PROCESS_H
-
-namespace android {
-
-// depends on AudioResamplerFirOps.h
-
-/* variant for input type TI = int16_t input samples */
-template<typename TC>
-static inline
-void mac(int32_t& l, int32_t& r, TC coef, const int16_t* samples)
-{
- uint32_t rl = *reinterpret_cast<const uint32_t*>(samples);
- l = mulAddRL(1, rl, coef, l);
- r = mulAddRL(0, rl, coef, r);
-}
-
-template<typename TC>
-static inline
-void mac(int32_t& l, TC coef, const int16_t* samples)
-{
- l = mulAdd(samples[0], coef, l);
-}
-
-/* variant for input type TI = float input samples */
-template<typename TC>
-static inline
-void mac(float& l, float& r, TC coef, const float* samples)
-{
- l += *samples++ * coef;
- r += *samples * coef;
-}
-
-template<typename TC>
-static inline
-void mac(float& l, TC coef, const float* samples)
-{
- l += *samples * coef;
-}
-
-/* variant for output type TO = int32_t output samples */
-static inline
-int32_t volumeAdjust(int32_t value, int32_t volume)
-{
- return 2 * mulRL(0, value, volume); // Note: only use top 16b
-}
-
-/* variant for output type TO = float output samples */
-static inline
-float volumeAdjust(float value, float volume)
-{
- return value * volume;
-}
-
-/*
- * Helper template functions for loop unrolling accumulator operations.
- *
- * Unrolling the loops achieves about 2x gain.
- * Using a recursive template rather than an array of TO[] for the accumulator
- * values is an additional 10-20% gain.
- */
-
-template<int CHANNELS, typename TO>
-class Accumulator : public Accumulator<CHANNELS-1, TO> // recursive
-{
-public:
- inline void clear() {
- value = 0;
- Accumulator<CHANNELS-1, TO>::clear();
- }
- template<typename TC, typename TI>
- inline void acc(TC coef, const TI*& data) {
- mac(value, coef, data++);
- Accumulator<CHANNELS-1, TO>::acc(coef, data);
- }
- inline void volume(TO*& out, TO gain) {
- *out++ = volumeAdjust(value, gain);
- Accumulator<CHANNELS-1, TO>::volume(out, gain);
- }
-
- TO value; // one per recursive inherited base class
-};
-
-template<typename TO>
-class Accumulator<0, TO> {
-public:
- inline void clear() {
- }
- template<typename TC, typename TI>
- inline void acc(TC coef __unused, const TI*& data __unused) {
- }
- inline void volume(TO*& out __unused, TO gain __unused) {
- }
-};
-
-template<typename TC, typename TINTERP>
-inline
-TC interpolate(TC coef_0, TC coef_1, TINTERP lerp)
-{
- return lerp * (coef_1 - coef_0) + coef_0;
-}
-
-template<>
-inline
-int16_t interpolate<int16_t, uint32_t>(int16_t coef_0, int16_t coef_1, uint32_t lerp)
-{ // in some CPU architectures 16b x 16b multiplies are faster.
- return (static_cast<int16_t>(lerp) * static_cast<int16_t>(coef_1 - coef_0) >> 15) + coef_0;
-}
-
-template<>
-inline
-int32_t interpolate<int32_t, uint32_t>(int32_t coef_0, int32_t coef_1, uint32_t lerp)
-{
- return (lerp * static_cast<int64_t>(coef_1 - coef_0) >> 31) + coef_0;
-}
-
-/* class scope for passing in functions into templates */
-struct InterpCompute {
- template<typename TC, typename TINTERP>
- static inline
- TC interpolatep(TC coef_0, TC coef_1, TINTERP lerp) {
- return interpolate(coef_0, coef_1, lerp);
- }
-
- template<typename TC, typename TINTERP>
- static inline
- TC interpolaten(TC coef_0, TC coef_1, TINTERP lerp) {
- return interpolate(coef_0, coef_1, lerp);
- }
-};
-
-struct InterpNull {
- template<typename TC, typename TINTERP>
- static inline
- TC interpolatep(TC coef_0, TC coef_1 __unused, TINTERP lerp __unused) {
- return coef_0;
- }
-
- template<typename TC, typename TINTERP>
- static inline
- TC interpolaten(TC coef_0 __unused, TC coef_1, TINTERP lerp __unused) {
- return coef_1;
- }
-};
-
-/*
- * Calculates a single output frame (two samples).
- *
- * The Process*() functions compute both the positive half FIR dot product and
- * the negative half FIR dot product, accumulates, and then applies the volume.
- *
- * Use fir() to compute the proper coefficient pointers for a polyphase
- * filter bank.
- *
- * ProcessBase() is the fundamental processing template function.
- *
- * ProcessL() calls ProcessBase() with TFUNC = InterpNull, for fixed/locked phase.
- * Process() calls ProcessBase() with TFUNC = InterpCompute, for interpolated phase.
- */
-
-template <int CHANNELS, int STRIDE, typename TFUNC, typename TC, typename TI, typename TO,
- typename TINTERP>
-static inline
-void ProcessBase(TO* const out,
- size_t count,
- const TC* coefsP,
- const TC* coefsN,
- const TI* sP,
- const TI* sN,
- TINTERP lerpP,
- const TO* const volumeLR)
-{
- COMPILE_TIME_ASSERT_FUNCTION_SCOPE(CHANNELS > 0)
-
- if (CHANNELS > 2) {
- // TO accum[CHANNELS];
- Accumulator<CHANNELS, TO> accum;
-
- // for (int j = 0; j < CHANNELS; ++j) accum[j] = 0;
- accum.clear();
- for (size_t i = 0; i < count; ++i) {
- TC c = TFUNC::interpolatep(coefsP[0], coefsP[count], lerpP);
-
- // for (int j = 0; j < CHANNELS; ++j) mac(accum[j], c, sP + j);
- const TI *tmp_data = sP; // tmp_ptr seems to work better
- accum.acc(c, tmp_data);
-
- coefsP++;
- sP -= CHANNELS;
- c = TFUNC::interpolaten(coefsN[count], coefsN[0], lerpP);
-
- // for (int j = 0; j < CHANNELS; ++j) mac(accum[j], c, sN + j);
- tmp_data = sN; // tmp_ptr seems faster than directly using sN
- accum.acc(c, tmp_data);
-
- coefsN++;
- sN += CHANNELS;
- }
- // for (int j = 0; j < CHANNELS; ++j) out[j] += volumeAdjust(accum[j], volumeLR[0]);
- TO *tmp_out = out; // may remove if const out definition changes.
- accum.volume(tmp_out, volumeLR[0]);
- } else if (CHANNELS == 2) {
- TO l = 0;
- TO r = 0;
- for (size_t i = 0; i < count; ++i) {
- mac(l, r, TFUNC::interpolatep(coefsP[0], coefsP[count], lerpP), sP);
- coefsP++;
- sP -= CHANNELS;
- mac(l, r, TFUNC::interpolaten(coefsN[count], coefsN[0], lerpP), sN);
- coefsN++;
- sN += CHANNELS;
- }
- out[0] += volumeAdjust(l, volumeLR[0]);
- out[1] += volumeAdjust(r, volumeLR[1]);
- } else { /* CHANNELS == 1 */
- TO l = 0;
- for (size_t i = 0; i < count; ++i) {
- mac(l, TFUNC::interpolatep(coefsP[0], coefsP[count], lerpP), sP);
- coefsP++;
- sP -= CHANNELS;
- mac(l, TFUNC::interpolaten(coefsN[count], coefsN[0], lerpP), sN);
- coefsN++;
- sN += CHANNELS;
- }
- out[0] += volumeAdjust(l, volumeLR[0]);
- out[1] += volumeAdjust(l, volumeLR[1]);
- }
-}
-
-/* Calculates a single output frame from a polyphase resampling filter.
- * See Process() for parameter details.
- */
-template <int CHANNELS, int STRIDE, typename TC, typename TI, typename TO>
-static inline
-void ProcessL(TO* const out,
- int count,
- const TC* coefsP,
- const TC* coefsN,
- const TI* sP,
- const TI* sN,
- const TO* const volumeLR)
-{
- ProcessBase<CHANNELS, STRIDE, InterpNull>(out, count, coefsP, coefsN, sP, sN, 0, volumeLR);
-}
-
-/*
- * Calculates a single output frame from a polyphase resampling filter,
- * with filter phase interpolation.
- *
- * @param out should point to the output buffer with space for at least one output frame.
- *
- * @param count should be half the size of the total filter length (halfNumCoefs), as we
- * use symmetry in filter coefficients to evaluate two dot products.
- *
- * @param coefsP is one phase of the polyphase filter bank of size halfNumCoefs, corresponding
- * to the positive sP.
- *
- * @param coefsN is one phase of the polyphase filter bank of size halfNumCoefs, corresponding
- * to the negative sN.
- *
- * @param coefsP1 is the next phase of coefsP (used for interpolation).
- *
- * @param coefsN1 is the next phase of coefsN (used for interpolation).
- *
- * @param sP is the positive half of the coefficients (as viewed by a convolution),
- * starting at the original samples pointer and decrementing (by CHANNELS).
- *
- * @param sN is the negative half of the samples (as viewed by a convolution),
- * starting at the original samples pointer + CHANNELS and incrementing (by CHANNELS).
- *
- * @param lerpP The fractional siting between the polyphase indices is given by the bits
- * below coefShift. See fir() for details.
- *
- * @param volumeLR is a pointer to an array of two 32 bit volume values, one per stereo channel,
- * expressed as a S32 integer or float. A negative value inverts the channel 180 degrees.
- * The pointer volumeLR should be aligned to a minimum of 8 bytes.
- * A typical value for volume is 0x1000 to align to a unity gain output of 20.12.
- */
-template <int CHANNELS, int STRIDE, typename TC, typename TI, typename TO, typename TINTERP>
-static inline
-void Process(TO* const out,
- int count,
- const TC* coefsP,
- const TC* coefsN,
- const TC* coefsP1 __unused,
- const TC* coefsN1 __unused,
- const TI* sP,
- const TI* sN,
- TINTERP lerpP,
- const TO* const volumeLR)
-{
- ProcessBase<CHANNELS, STRIDE, InterpCompute>(out, count, coefsP, coefsN, sP, sN, lerpP,
- volumeLR);
-}
-
-/*
- * Calculates a single output frame from input sample pointer.
- *
- * This sets up the params for the accelerated Process() and ProcessL()
- * functions to do the appropriate dot products.
- *
- * @param out should point to the output buffer with space for at least one output frame.
- *
- * @param phase is the fractional distance between input frames for interpolation:
- * phase >= 0 && phase < phaseWrapLimit. It can be thought of as a rational fraction
- * of phase/phaseWrapLimit.
- *
- * @param phaseWrapLimit is #polyphases<<coefShift, where #polyphases is the number of polyphases
- * in the polyphase filter. Likewise, #polyphases can be obtained as (phaseWrapLimit>>coefShift).
- *
- * @param coefShift gives the bit alignment of the polyphase index in the phase parameter.
- *
- * @param halfNumCoefs is the half the number of coefficients per polyphase filter. Since the
- * overall filterbank is odd-length symmetric, only halfNumCoefs need be stored.
- *
- * @param coefs is the polyphase filter bank, starting at from polyphase index 0, and ranging to
- * and including the #polyphases. Each polyphase of the filter has half-length halfNumCoefs
- * (due to symmetry). The total size of the filter bank in coefficients is
- * (#polyphases+1)*halfNumCoefs.
- *
- * The filter bank coefs should be aligned to a minimum of 16 bytes (preferrably to cache line).
- *
- * The coefs should be attenuated (to compensate for passband ripple)
- * if storing back into the native format.
- *
- * @param samples are unaligned input samples. The position is in the "middle" of the
- * sample array with respect to the FIR filter:
- * the negative half of the filter is dot product from samples+1 to samples+halfNumCoefs;
- * the positive half of the filter is dot product from samples to samples-halfNumCoefs+1.
- *
- * @param volumeLR is a pointer to an array of two 32 bit volume values, one per stereo channel,
- * expressed as a S32 integer or float. A negative value inverts the channel 180 degrees.
- * The pointer volumeLR should be aligned to a minimum of 8 bytes.
- * A typical value for volume is 0x1000 to align to a unity gain output of 20.12.
- *
- * In between calls to filterCoefficient, the phase is incremented by phaseIncrement, where
- * phaseIncrement is calculated as inputSampling * phaseWrapLimit / outputSampling.
- *
- * The filter polyphase index is given by indexP = phase >> coefShift. Due to
- * odd length symmetric filter, the polyphase index of the negative half depends on
- * whether interpolation is used.
- *
- * The fractional siting between the polyphase indices is given by the bits below coefShift:
- *
- * lerpP = phase << 32 - coefShift >> 1; // for 32 bit unsigned phase multiply
- * lerpP = phase << 32 - coefShift >> 17; // for 16 bit unsigned phase multiply
- *
- * For integer types, this is expressed as:
- *
- * lerpP = phase << sizeof(phase)*8 - coefShift
- * >> (sizeof(phase)-sizeof(*coefs))*8 + 1;
- *
- * For floating point, lerpP is the fractional phase scaled to [0.0, 1.0):
- *
- * lerpP = (phase << 32 - coefShift) / (1 << 32); // floating point equivalent
- */
-
-template<int CHANNELS, bool LOCKED, int STRIDE, typename TC, typename TI, typename TO>
-static inline
-void fir(TO* const out,
- const uint32_t phase, const uint32_t phaseWrapLimit,
- const int coefShift, const int halfNumCoefs, const TC* const coefs,
- const TI* const samples, const TO* const volumeLR)
-{
- // NOTE: be very careful when modifying the code here. register
- // pressure is very high and a small change might cause the compiler
- // to generate far less efficient code.
- // Always sanity check the result with objdump or test-resample.
-
- if (LOCKED) {
- // locked polyphase (no interpolation)
- // Compute the polyphase filter index on the positive and negative side.
- uint32_t indexP = phase >> coefShift;
- uint32_t indexN = (phaseWrapLimit - phase) >> coefShift;
- const TC* coefsP = coefs + indexP*halfNumCoefs;
- const TC* coefsN = coefs + indexN*halfNumCoefs;
- const TI* sP = samples;
- const TI* sN = samples + CHANNELS;
-
- // dot product filter.
- ProcessL<CHANNELS, STRIDE>(out,
- halfNumCoefs, coefsP, coefsN, sP, sN, volumeLR);
- } else {
- // interpolated polyphase
- // Compute the polyphase filter index on the positive and negative side.
- uint32_t indexP = phase >> coefShift;
- uint32_t indexN = (phaseWrapLimit - phase - 1) >> coefShift; // one's complement.
- const TC* coefsP = coefs + indexP*halfNumCoefs;
- const TC* coefsN = coefs + indexN*halfNumCoefs;
- const TC* coefsP1 = coefsP + halfNumCoefs;
- const TC* coefsN1 = coefsN + halfNumCoefs;
- const TI* sP = samples;
- const TI* sN = samples + CHANNELS;
-
- // Interpolation fraction lerpP derived by shifting all the way up and down
- // to clear the appropriate bits and align to the appropriate level
- // for the integer multiply. The constants should resolve in compile time.
- //
- // The interpolated filter coefficient is derived as follows for the pos/neg half:
- //
- // interpolated[P] = index[P]*lerpP + index[P+1]*(1-lerpP)
- // interpolated[N] = index[N+1]*lerpP + index[N]*(1-lerpP)
-
- // on-the-fly interpolated dot product filter
- if (is_same<TC, float>::value || is_same<TC, double>::value) {
- static const TC scale = 1. / (65536. * 65536.); // scale phase bits to [0.0, 1.0)
- TC lerpP = TC(phase << (sizeof(phase)*8 - coefShift)) * scale;
-
- Process<CHANNELS, STRIDE>(out,
- halfNumCoefs, coefsP, coefsN, coefsP1, coefsN1, sP, sN, lerpP, volumeLR);
- } else {
- uint32_t lerpP = phase << (sizeof(phase)*8 - coefShift)
- >> ((sizeof(phase)-sizeof(*coefs))*8 + 1);
-
- Process<CHANNELS, STRIDE>(out,
- halfNumCoefs, coefsP, coefsN, coefsP1, coefsN1, sP, sN, lerpP, volumeLR);
- }
- }
-}
-
-} // namespace android
-
-#endif /*ANDROID_AUDIO_RESAMPLER_FIR_PROCESS_H*/
diff --git a/services/audioflinger/AudioResamplerFirProcessNeon.h b/services/audioflinger/AudioResamplerFirProcessNeon.h
deleted file mode 100644
index 1ce76a8..0000000
--- a/services/audioflinger/AudioResamplerFirProcessNeon.h
+++ /dev/null
@@ -1,1214 +0,0 @@
-/*
- * Copyright (C) 2013 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef ANDROID_AUDIO_RESAMPLER_FIR_PROCESS_NEON_H
-#define ANDROID_AUDIO_RESAMPLER_FIR_PROCESS_NEON_H
-
-namespace android {
-
-// depends on AudioResamplerFirOps.h, AudioResamplerFirProcess.h
-
-#if USE_NEON
-
-// use intrinsics if inline arm32 assembly is not possible
-#if !USE_INLINE_ASSEMBLY
-#define USE_INTRINSIC
-#endif
-
-// following intrinsics available only on ARM 64 bit ACLE
-#ifndef __aarch64__
-#undef vld1q_f32_x2
-#undef vld1q_s32_x2
-#endif
-
-#define TO_STRING2(x) #x
-#define TO_STRING(x) TO_STRING2(x)
-// uncomment to print GCC version, may be relevant for intrinsic optimizations
-/* #pragma message ("GCC version: " TO_STRING(__GNUC__) \
- "." TO_STRING(__GNUC_MINOR__) \
- "." TO_STRING(__GNUC_PATCHLEVEL__)) */
-
-//
-// NEON specializations are enabled for Process() and ProcessL() in AudioResamplerFirProcess.h
-//
-// Two variants are presented here:
-// ARM NEON inline assembly which appears up to 10-15% faster than intrinsics (gcc 4.9) for arm32.
-// ARM NEON intrinsics which can also be used by arm64 and x86/64 with NEON header.
-//
-
-// Macros to save a mono/stereo accumulator sample in q0 (and q4) as stereo out.
-// These are only used for inline assembly.
-#define ASSEMBLY_ACCUMULATE_MONO \
- "vld1.s32 {d2}, [%[vLR]:64] \n"/* (1) load volumes */\
- "vld1.s32 {d3}, %[out] \n"/* (2) unaligned load the output */\
- "vpadd.s32 d0, d0, d1 \n"/* (1) add all 4 partial sums */\
- "vpadd.s32 d0, d0, d0 \n"/* (1+4d) and replicate L/R */\
- "vqrdmulh.s32 d0, d0, d2 \n"/* (2+3d) apply volume */\
- "vqadd.s32 d3, d3, d0 \n"/* (1+4d) accumulate result (saturating) */\
- "vst1.s32 {d3}, %[out] \n"/* (2+2d) store result */
-
-#define ASSEMBLY_ACCUMULATE_STEREO \
- "vld1.s32 {d2}, [%[vLR]:64] \n"/* (1) load volumes*/\
- "vld1.s32 {d3}, %[out] \n"/* (2) unaligned load the output*/\
- "vpadd.s32 d0, d0, d1 \n"/* (1) add all 4 partial sums from q0*/\
- "vpadd.s32 d8, d8, d9 \n"/* (1) add all 4 partial sums from q4*/\
- "vpadd.s32 d0, d0, d8 \n"/* (1+4d) combine into L/R*/\
- "vqrdmulh.s32 d0, d0, d2 \n"/* (2+3d) apply volume*/\
- "vqadd.s32 d3, d3, d0 \n"/* (1+4d) accumulate result (saturating)*/\
- "vst1.s32 {d3}, %[out] \n"/* (2+2d)store result*/
-
-template <int CHANNELS, int STRIDE, bool FIXED>
-static inline void ProcessNeonIntrinsic(int32_t* out,
- int count,
- const int16_t* coefsP,
- const int16_t* coefsN,
- const int16_t* sP,
- const int16_t* sN,
- const int32_t* volumeLR,
- uint32_t lerpP,
- const int16_t* coefsP1,
- const int16_t* coefsN1)
-{
- ALOG_ASSERT(count > 0 && (count & 7) == 0); // multiple of 8
- COMPILE_TIME_ASSERT_FUNCTION_SCOPE(CHANNELS == 1 || CHANNELS == 2);
-
- sP -= CHANNELS*((STRIDE>>1)-1);
- coefsP = (const int16_t*)__builtin_assume_aligned(coefsP, 16);
- coefsN = (const int16_t*)__builtin_assume_aligned(coefsN, 16);
-
- int16x4_t interp;
- if (!FIXED) {
- interp = vdup_n_s16(lerpP);
- //interp = (int16x4_t)vset_lane_s32 ((int32x2_t)lerpP, interp, 0);
- coefsP1 = (const int16_t*)__builtin_assume_aligned(coefsP1, 16);
- coefsN1 = (const int16_t*)__builtin_assume_aligned(coefsN1, 16);
- }
- int32x4_t accum, accum2;
- // warning uninitialized if we use veorq_s32
- // (alternative to below) accum = veorq_s32(accum, accum);
- accum = vdupq_n_s32(0);
- if (CHANNELS == 2) {
- // (alternative to below) accum2 = veorq_s32(accum2, accum2);
- accum2 = vdupq_n_s32(0);
- }
- do {
- int16x8_t posCoef = vld1q_s16(coefsP);
- coefsP += 8;
- int16x8_t negCoef = vld1q_s16(coefsN);
- coefsN += 8;
- if (!FIXED) { // interpolate
- int16x8_t posCoef1 = vld1q_s16(coefsP1);
- coefsP1 += 8;
- int16x8_t negCoef1 = vld1q_s16(coefsN1);
- coefsN1 += 8;
-
- posCoef1 = vsubq_s16(posCoef1, posCoef);
- negCoef = vsubq_s16(negCoef, negCoef1);
-
- posCoef1 = vqrdmulhq_lane_s16(posCoef1, interp, 0);
- negCoef = vqrdmulhq_lane_s16(negCoef, interp, 0);
-
- posCoef = vaddq_s16(posCoef, posCoef1);
- negCoef = vaddq_s16(negCoef, negCoef1);
- }
- switch (CHANNELS) {
- case 1: {
- int16x8_t posSamp = vld1q_s16(sP);
- int16x8_t negSamp = vld1q_s16(sN);
- sN += 8;
- posSamp = vrev64q_s16(posSamp);
-
- // dot product
- accum = vmlal_s16(accum, vget_low_s16(posSamp), vget_high_s16(posCoef)); // reversed
- accum = vmlal_s16(accum, vget_high_s16(posSamp), vget_low_s16(posCoef)); // reversed
- accum = vmlal_s16(accum, vget_low_s16(negSamp), vget_low_s16(negCoef));
- accum = vmlal_s16(accum, vget_high_s16(negSamp), vget_high_s16(negCoef));
- sP -= 8;
- } break;
- case 2: {
- int16x8x2_t posSamp = vld2q_s16(sP);
- int16x8x2_t negSamp = vld2q_s16(sN);
- sN += 16;
- posSamp.val[0] = vrev64q_s16(posSamp.val[0]);
- posSamp.val[1] = vrev64q_s16(posSamp.val[1]);
-
- // dot product
- accum = vmlal_s16(accum, vget_low_s16(posSamp.val[0]), vget_high_s16(posCoef)); // r
- accum = vmlal_s16(accum, vget_high_s16(posSamp.val[0]), vget_low_s16(posCoef)); // r
- accum2 = vmlal_s16(accum2, vget_low_s16(posSamp.val[1]), vget_high_s16(posCoef)); // r
- accum2 = vmlal_s16(accum2, vget_high_s16(posSamp.val[1]), vget_low_s16(posCoef)); // r
- accum = vmlal_s16(accum, vget_low_s16(negSamp.val[0]), vget_low_s16(negCoef));
- accum = vmlal_s16(accum, vget_high_s16(negSamp.val[0]), vget_high_s16(negCoef));
- accum2 = vmlal_s16(accum2, vget_low_s16(negSamp.val[1]), vget_low_s16(negCoef));
- accum2 = vmlal_s16(accum2, vget_high_s16(negSamp.val[1]), vget_high_s16(negCoef));
- sP -= 16;
- } break;
- }
- } while (count -= 8);
-
- // multiply by volume and save
- volumeLR = (const int32_t*)__builtin_assume_aligned(volumeLR, 8);
- int32x2_t vLR = vld1_s32(volumeLR);
- int32x2_t outSamp = vld1_s32(out);
- // combine and funnel down accumulator
- int32x2_t outAccum = vpadd_s32(vget_low_s32(accum), vget_high_s32(accum));
- if (CHANNELS == 1) {
- // duplicate accum to both L and R
- outAccum = vpadd_s32(outAccum, outAccum);
- } else if (CHANNELS == 2) {
- // accum2 contains R, fold in
- int32x2_t outAccum2 = vpadd_s32(vget_low_s32(accum2), vget_high_s32(accum2));
- outAccum = vpadd_s32(outAccum, outAccum2);
- }
- outAccum = vqrdmulh_s32(outAccum, vLR);
- outSamp = vqadd_s32(outSamp, outAccum);
- vst1_s32(out, outSamp);
-}
-
-template <int CHANNELS, int STRIDE, bool FIXED>
-static inline void ProcessNeonIntrinsic(int32_t* out,
- int count,
- const int32_t* coefsP,
- const int32_t* coefsN,
- const int16_t* sP,
- const int16_t* sN,
- const int32_t* volumeLR,
- uint32_t lerpP,
- const int32_t* coefsP1,
- const int32_t* coefsN1)
-{
- ALOG_ASSERT(count > 0 && (count & 7) == 0); // multiple of 8
- COMPILE_TIME_ASSERT_FUNCTION_SCOPE(CHANNELS == 1 || CHANNELS == 2);
-
- sP -= CHANNELS*((STRIDE>>1)-1);
- coefsP = (const int32_t*)__builtin_assume_aligned(coefsP, 16);
- coefsN = (const int32_t*)__builtin_assume_aligned(coefsN, 16);
-
- int32x2_t interp;
- if (!FIXED) {
- interp = vdup_n_s32(lerpP);
- coefsP1 = (const int32_t*)__builtin_assume_aligned(coefsP1, 16);
- coefsN1 = (const int32_t*)__builtin_assume_aligned(coefsN1, 16);
- }
- int32x4_t accum, accum2;
- // warning uninitialized if we use veorq_s32
- // (alternative to below) accum = veorq_s32(accum, accum);
- accum = vdupq_n_s32(0);
- if (CHANNELS == 2) {
- // (alternative to below) accum2 = veorq_s32(accum2, accum2);
- accum2 = vdupq_n_s32(0);
- }
- do {
-#ifdef vld1q_s32_x2
- int32x4x2_t posCoef = vld1q_s32_x2(coefsP);
- coefsP += 8;
- int32x4x2_t negCoef = vld1q_s32_x2(coefsN);
- coefsN += 8;
-#else
- int32x4x2_t posCoef;
- posCoef.val[0] = vld1q_s32(coefsP);
- coefsP += 4;
- posCoef.val[1] = vld1q_s32(coefsP);
- coefsP += 4;
- int32x4x2_t negCoef;
- negCoef.val[0] = vld1q_s32(coefsN);
- coefsN += 4;
- negCoef.val[1] = vld1q_s32(coefsN);
- coefsN += 4;
-#endif
- if (!FIXED) { // interpolate
-#ifdef vld1q_s32_x2
- int32x4x2_t posCoef1 = vld1q_s32_x2(coefsP1);
- coefsP1 += 8;
- int32x4x2_t negCoef1 = vld1q_s32_x2(coefsN1);
- coefsN1 += 8;
-#else
- int32x4x2_t posCoef1;
- posCoef1.val[0] = vld1q_s32(coefsP1);
- coefsP1 += 4;
- posCoef1.val[1] = vld1q_s32(coefsP1);
- coefsP1 += 4;
- int32x4x2_t negCoef1;
- negCoef1.val[0] = vld1q_s32(coefsN1);
- coefsN1 += 4;
- negCoef1.val[1] = vld1q_s32(coefsN1);
- coefsN1 += 4;
-#endif
-
- posCoef1.val[0] = vsubq_s32(posCoef1.val[0], posCoef.val[0]);
- posCoef1.val[1] = vsubq_s32(posCoef1.val[1], posCoef.val[1]);
- negCoef.val[0] = vsubq_s32(negCoef.val[0], negCoef1.val[0]);
- negCoef.val[1] = vsubq_s32(negCoef.val[1], negCoef1.val[1]);
-
- posCoef1.val[0] = vqrdmulhq_lane_s32(posCoef1.val[0], interp, 0);
- posCoef1.val[1] = vqrdmulhq_lane_s32(posCoef1.val[1], interp, 0);
- negCoef.val[0] = vqrdmulhq_lane_s32(negCoef.val[0], interp, 0);
- negCoef.val[1] = vqrdmulhq_lane_s32(negCoef.val[1], interp, 0);
-
- posCoef.val[0] = vaddq_s32(posCoef.val[0], posCoef1.val[0]);
- posCoef.val[1] = vaddq_s32(posCoef.val[1], posCoef1.val[1]);
- negCoef.val[0] = vaddq_s32(negCoef.val[0], negCoef1.val[0]);
- negCoef.val[1] = vaddq_s32(negCoef.val[1], negCoef1.val[1]);
- }
- switch (CHANNELS) {
- case 1: {
- int16x8_t posSamp = vld1q_s16(sP);
- int16x8_t negSamp = vld1q_s16(sN);
- sN += 8;
- posSamp = vrev64q_s16(posSamp);
-
- int32x4_t posSamp0 = vshll_n_s16(vget_low_s16(posSamp), 15);
- int32x4_t posSamp1 = vshll_n_s16(vget_high_s16(posSamp), 15);
- int32x4_t negSamp0 = vshll_n_s16(vget_low_s16(negSamp), 15);
- int32x4_t negSamp1 = vshll_n_s16(vget_high_s16(negSamp), 15);
-
- // dot product
- posSamp0 = vqrdmulhq_s32(posSamp0, posCoef.val[1]); // reversed
- posSamp1 = vqrdmulhq_s32(posSamp1, posCoef.val[0]); // reversed
- negSamp0 = vqrdmulhq_s32(negSamp0, negCoef.val[0]);
- negSamp1 = vqrdmulhq_s32(negSamp1, negCoef.val[1]);
-
- accum = vaddq_s32(accum, posSamp0);
- negSamp0 = vaddq_s32(negSamp0, negSamp1);
- accum = vaddq_s32(accum, posSamp1);
- accum = vaddq_s32(accum, negSamp0);
-
- sP -= 8;
- } break;
- case 2: {
- int16x8x2_t posSamp = vld2q_s16(sP);
- int16x8x2_t negSamp = vld2q_s16(sN);
- sN += 16;
- posSamp.val[0] = vrev64q_s16(posSamp.val[0]);
- posSamp.val[1] = vrev64q_s16(posSamp.val[1]);
-
- // left
- int32x4_t posSamp0 = vshll_n_s16(vget_low_s16(posSamp.val[0]), 15);
- int32x4_t posSamp1 = vshll_n_s16(vget_high_s16(posSamp.val[0]), 15);
- int32x4_t negSamp0 = vshll_n_s16(vget_low_s16(negSamp.val[0]), 15);
- int32x4_t negSamp1 = vshll_n_s16(vget_high_s16(negSamp.val[0]), 15);
-
- // dot product
- posSamp0 = vqrdmulhq_s32(posSamp0, posCoef.val[1]); // reversed
- posSamp1 = vqrdmulhq_s32(posSamp1, posCoef.val[0]); // reversed
- negSamp0 = vqrdmulhq_s32(negSamp0, negCoef.val[0]);
- negSamp1 = vqrdmulhq_s32(negSamp1, negCoef.val[1]);
-
- accum = vaddq_s32(accum, posSamp0);
- negSamp0 = vaddq_s32(negSamp0, negSamp1);
- accum = vaddq_s32(accum, posSamp1);
- accum = vaddq_s32(accum, negSamp0);
-
- // right
- posSamp0 = vshll_n_s16(vget_low_s16(posSamp.val[1]), 15);
- posSamp1 = vshll_n_s16(vget_high_s16(posSamp.val[1]), 15);
- negSamp0 = vshll_n_s16(vget_low_s16(negSamp.val[1]), 15);
- negSamp1 = vshll_n_s16(vget_high_s16(negSamp.val[1]), 15);
-
- // dot product
- posSamp0 = vqrdmulhq_s32(posSamp0, posCoef.val[1]); // reversed
- posSamp1 = vqrdmulhq_s32(posSamp1, posCoef.val[0]); // reversed
- negSamp0 = vqrdmulhq_s32(negSamp0, negCoef.val[0]);
- negSamp1 = vqrdmulhq_s32(negSamp1, negCoef.val[1]);
-
- accum2 = vaddq_s32(accum2, posSamp0);
- negSamp0 = vaddq_s32(negSamp0, negSamp1);
- accum2 = vaddq_s32(accum2, posSamp1);
- accum2 = vaddq_s32(accum2, negSamp0);
-
- sP -= 16;
- } break;
- }
- } while (count -= 8);
-
- // multiply by volume and save
- volumeLR = (const int32_t*)__builtin_assume_aligned(volumeLR, 8);
- int32x2_t vLR = vld1_s32(volumeLR);
- int32x2_t outSamp = vld1_s32(out);
- // combine and funnel down accumulator
- int32x2_t outAccum = vpadd_s32(vget_low_s32(accum), vget_high_s32(accum));
- if (CHANNELS == 1) {
- // duplicate accum to both L and R
- outAccum = vpadd_s32(outAccum, outAccum);
- } else if (CHANNELS == 2) {
- // accum2 contains R, fold in
- int32x2_t outAccum2 = vpadd_s32(vget_low_s32(accum2), vget_high_s32(accum2));
- outAccum = vpadd_s32(outAccum, outAccum2);
- }
- outAccum = vqrdmulh_s32(outAccum, vLR);
- outSamp = vqadd_s32(outSamp, outAccum);
- vst1_s32(out, outSamp);
-}
-
-template <int CHANNELS, int STRIDE, bool FIXED>
-static inline void ProcessNeonIntrinsic(float* out,
- int count,
- const float* coefsP,
- const float* coefsN,
- const float* sP,
- const float* sN,
- const float* volumeLR,
- float lerpP,
- const float* coefsP1,
- const float* coefsN1)
-{
- ALOG_ASSERT(count > 0 && (count & 7) == 0); // multiple of 8
- COMPILE_TIME_ASSERT_FUNCTION_SCOPE(CHANNELS == 1 || CHANNELS == 2);
-
- sP -= CHANNELS*((STRIDE>>1)-1);
- coefsP = (const float*)__builtin_assume_aligned(coefsP, 16);
- coefsN = (const float*)__builtin_assume_aligned(coefsN, 16);
-
- float32x2_t interp;
- if (!FIXED) {
- interp = vdup_n_f32(lerpP);
- coefsP1 = (const float*)__builtin_assume_aligned(coefsP1, 16);
- coefsN1 = (const float*)__builtin_assume_aligned(coefsN1, 16);
- }
- float32x4_t accum, accum2;
- // warning uninitialized if we use veorq_s32
- // (alternative to below) accum = veorq_s32(accum, accum);
- accum = vdupq_n_f32(0);
- if (CHANNELS == 2) {
- // (alternative to below) accum2 = veorq_s32(accum2, accum2);
- accum2 = vdupq_n_f32(0);
- }
- do {
-#ifdef vld1q_f32_x2
- float32x4x2_t posCoef = vld1q_f32_x2(coefsP);
- coefsP += 8;
- float32x4x2_t negCoef = vld1q_f32_x2(coefsN);
- coefsN += 8;
-#else
- float32x4x2_t posCoef;
- posCoef.val[0] = vld1q_f32(coefsP);
- coefsP += 4;
- posCoef.val[1] = vld1q_f32(coefsP);
- coefsP += 4;
- float32x4x2_t negCoef;
- negCoef.val[0] = vld1q_f32(coefsN);
- coefsN += 4;
- negCoef.val[1] = vld1q_f32(coefsN);
- coefsN += 4;
-#endif
- if (!FIXED) { // interpolate
-#ifdef vld1q_f32_x2
- float32x4x2_t posCoef1 = vld1q_f32_x2(coefsP1);
- coefsP1 += 8;
- float32x4x2_t negCoef1 = vld1q_f32_x2(coefsN1);
- coefsN1 += 8;
-#else
- float32x4x2_t posCoef1;
- posCoef1.val[0] = vld1q_f32(coefsP1);
- coefsP1 += 4;
- posCoef1.val[1] = vld1q_f32(coefsP1);
- coefsP1 += 4;
- float32x4x2_t negCoef1;
- negCoef1.val[0] = vld1q_f32(coefsN1);
- coefsN1 += 4;
- negCoef1.val[1] = vld1q_f32(coefsN1);
- coefsN1 += 4;
-#endif
- posCoef1.val[0] = vsubq_f32(posCoef1.val[0], posCoef.val[0]);
- posCoef1.val[1] = vsubq_f32(posCoef1.val[1], posCoef.val[1]);
- negCoef.val[0] = vsubq_f32(negCoef.val[0], negCoef1.val[0]);
- negCoef.val[1] = vsubq_f32(negCoef.val[1], negCoef1.val[1]);
-
- posCoef.val[0] = vmlaq_lane_f32(posCoef.val[0], posCoef1.val[0], interp, 0);
- posCoef.val[1] = vmlaq_lane_f32(posCoef.val[1], posCoef1.val[1], interp, 0);
- negCoef.val[0] = vmlaq_lane_f32(negCoef1.val[0], negCoef.val[0], interp, 0); // rev
- negCoef.val[1] = vmlaq_lane_f32(negCoef1.val[1], negCoef.val[1], interp, 0); // rev
- }
- switch (CHANNELS) {
- case 1: {
-#ifdef vld1q_f32_x2
- float32x4x2_t posSamp = vld1q_f32_x2(sP);
- float32x4x2_t negSamp = vld1q_f32_x2(sN);
- sN += 8;
- sP -= 8;
-#else
- float32x4x2_t posSamp;
- posSamp.val[0] = vld1q_f32(sP);
- sP += 4;
- posSamp.val[1] = vld1q_f32(sP);
- sP -= 12;
- float32x4x2_t negSamp;
- negSamp.val[0] = vld1q_f32(sN);
- sN += 4;
- negSamp.val[1] = vld1q_f32(sN);
- sN += 4;
-#endif
- // effectively we want a vrev128q_f32()
- posSamp.val[0] = vrev64q_f32(posSamp.val[0]);
- posSamp.val[1] = vrev64q_f32(posSamp.val[1]);
- posSamp.val[0] = vcombine_f32(
- vget_high_f32(posSamp.val[0]), vget_low_f32(posSamp.val[0]));
- posSamp.val[1] = vcombine_f32(
- vget_high_f32(posSamp.val[1]), vget_low_f32(posSamp.val[1]));
-
- accum = vmlaq_f32(accum, posSamp.val[0], posCoef.val[1]);
- accum = vmlaq_f32(accum, posSamp.val[1], posCoef.val[0]);
- accum = vmlaq_f32(accum, negSamp.val[0], negCoef.val[0]);
- accum = vmlaq_f32(accum, negSamp.val[1], negCoef.val[1]);
- } break;
- case 2: {
- float32x4x2_t posSamp0 = vld2q_f32(sP);
- sP += 8;
- float32x4x2_t negSamp0 = vld2q_f32(sN);
- sN += 8;
- posSamp0.val[0] = vrev64q_f32(posSamp0.val[0]);
- posSamp0.val[1] = vrev64q_f32(posSamp0.val[1]);
- posSamp0.val[0] = vcombine_f32(
- vget_high_f32(posSamp0.val[0]), vget_low_f32(posSamp0.val[0]));
- posSamp0.val[1] = vcombine_f32(
- vget_high_f32(posSamp0.val[1]), vget_low_f32(posSamp0.val[1]));
-
- float32x4x2_t posSamp1 = vld2q_f32(sP);
- sP -= 24;
- float32x4x2_t negSamp1 = vld2q_f32(sN);
- sN += 8;
- posSamp1.val[0] = vrev64q_f32(posSamp1.val[0]);
- posSamp1.val[1] = vrev64q_f32(posSamp1.val[1]);
- posSamp1.val[0] = vcombine_f32(
- vget_high_f32(posSamp1.val[0]), vget_low_f32(posSamp1.val[0]));
- posSamp1.val[1] = vcombine_f32(
- vget_high_f32(posSamp1.val[1]), vget_low_f32(posSamp1.val[1]));
-
- // Note: speed is affected by accumulation order.
- // Also, speed appears slower using vmul/vadd instead of vmla for
- // stereo case, comparable for mono.
-
- accum = vmlaq_f32(accum, negSamp0.val[0], negCoef.val[0]);
- accum = vmlaq_f32(accum, negSamp1.val[0], negCoef.val[1]);
- accum2 = vmlaq_f32(accum2, negSamp0.val[1], negCoef.val[0]);
- accum2 = vmlaq_f32(accum2, negSamp1.val[1], negCoef.val[1]);
-
- accum = vmlaq_f32(accum, posSamp0.val[0], posCoef.val[1]); // reversed
- accum = vmlaq_f32(accum, posSamp1.val[0], posCoef.val[0]); // reversed
- accum2 = vmlaq_f32(accum2, posSamp0.val[1], posCoef.val[1]); // reversed
- accum2 = vmlaq_f32(accum2, posSamp1.val[1], posCoef.val[0]); // reversed
- } break;
- }
- } while (count -= 8);
-
- // multiply by volume and save
- volumeLR = (const float*)__builtin_assume_aligned(volumeLR, 8);
- float32x2_t vLR = vld1_f32(volumeLR);
- float32x2_t outSamp = vld1_f32(out);
- // combine and funnel down accumulator
- float32x2_t outAccum = vpadd_f32(vget_low_f32(accum), vget_high_f32(accum));
- if (CHANNELS == 1) {
- // duplicate accum to both L and R
- outAccum = vpadd_f32(outAccum, outAccum);
- } else if (CHANNELS == 2) {
- // accum2 contains R, fold in
- float32x2_t outAccum2 = vpadd_f32(vget_low_f32(accum2), vget_high_f32(accum2));
- outAccum = vpadd_f32(outAccum, outAccum2);
- }
- outSamp = vmla_f32(outSamp, outAccum, vLR);
- vst1_f32(out, outSamp);
-}
-
-template <>
-inline void ProcessL<1, 16>(int32_t* const out,
- int count,
- const int16_t* coefsP,
- const int16_t* coefsN,
- const int16_t* sP,
- const int16_t* sN,
- const int32_t* const volumeLR)
-{
-#ifdef USE_INTRINSIC
- ProcessNeonIntrinsic<1, 16, true>(out, count, coefsP, coefsN, sP, sN, volumeLR,
- 0 /*lerpP*/, NULL /*coefsP1*/, NULL /*coefsN1*/);
-#else
- const int CHANNELS = 1; // template specialization does not preserve params
- const int STRIDE = 16;
- sP -= CHANNELS*((STRIDE>>1)-1);
- asm (
- "veor q0, q0, q0 \n"// (0 - combines+) accumulator = 0
-
- "1: \n"
-
- "vld1.16 {q2}, [%[sP]] \n"// (2+0d) load 8 16-bits mono samples
- "vld1.16 {q3}, [%[sN]]! \n"// (2) load 8 16-bits mono samples
- "vld1.16 {q8}, [%[coefsP0]:128]! \n"// (1) load 8 16-bits coefs
- "vld1.16 {q10}, [%[coefsN0]:128]! \n"// (1) load 8 16-bits coefs
-
- "vrev64.16 q2, q2 \n"// (1) reverse s3, s2, s1, s0, s7, s6, s5, s4
-
- // reordering the vmal to do d6, d7 before d4, d5 is slower(?)
- "vmlal.s16 q0, d4, d17 \n"// (1+0d) multiply (reversed)samples by coef
- "vmlal.s16 q0, d5, d16 \n"// (1) multiply (reversed)samples by coef
- "vmlal.s16 q0, d6, d20 \n"// (1) multiply neg samples
- "vmlal.s16 q0, d7, d21 \n"// (1) multiply neg samples
-
- // moving these ARM instructions before neon above seems to be slower
- "subs %[count], %[count], #8 \n"// (1) update loop counter
- "sub %[sP], %[sP], #16 \n"// (0) move pointer to next set of samples
-
- // sP used after branch (warning)
- "bne 1b \n"// loop
-
- ASSEMBLY_ACCUMULATE_MONO
-
- : [out] "=Uv" (out[0]),
- [count] "+r" (count),
- [coefsP0] "+r" (coefsP),
- [coefsN0] "+r" (coefsN),
- [sP] "+r" (sP),
- [sN] "+r" (sN)
- : [vLR] "r" (volumeLR)
- : "cc", "memory",
- "q0", "q1", "q2", "q3",
- "q8", "q10"
- );
-#endif
-}
-
-template <>
-inline void ProcessL<2, 16>(int32_t* const out,
- int count,
- const int16_t* coefsP,
- const int16_t* coefsN,
- const int16_t* sP,
- const int16_t* sN,
- const int32_t* const volumeLR)
-{
-#ifdef USE_INTRINSIC
- ProcessNeonIntrinsic<2, 16, true>(out, count, coefsP, coefsN, sP, sN, volumeLR,
- 0 /*lerpP*/, NULL /*coefsP1*/, NULL /*coefsN1*/);
-#else
- const int CHANNELS = 2; // template specialization does not preserve params
- const int STRIDE = 16;
- sP -= CHANNELS*((STRIDE>>1)-1);
- asm (
- "veor q0, q0, q0 \n"// (1) acc_L = 0
- "veor q4, q4, q4 \n"// (0 combines+) acc_R = 0
-
- "1: \n"
-
- "vld2.16 {q2, q3}, [%[sP]] \n"// (3+0d) load 8 16-bits stereo frames
- "vld2.16 {q5, q6}, [%[sN]]! \n"// (3) load 8 16-bits stereo frames
- "vld1.16 {q8}, [%[coefsP0]:128]! \n"// (1) load 8 16-bits coefs
- "vld1.16 {q10}, [%[coefsN0]:128]! \n"// (1) load 8 16-bits coefs
-
- "vrev64.16 q2, q2 \n"// (1) reverse 8 samples of positive left
- "vrev64.16 q3, q3 \n"// (0 combines+) reverse positive right
-
- "vmlal.s16 q0, d4, d17 \n"// (1) multiply (reversed) samples left
- "vmlal.s16 q0, d5, d16 \n"// (1) multiply (reversed) samples left
- "vmlal.s16 q4, d6, d17 \n"// (1) multiply (reversed) samples right
- "vmlal.s16 q4, d7, d16 \n"// (1) multiply (reversed) samples right
- "vmlal.s16 q0, d10, d20 \n"// (1) multiply samples left
- "vmlal.s16 q0, d11, d21 \n"// (1) multiply samples left
- "vmlal.s16 q4, d12, d20 \n"// (1) multiply samples right
- "vmlal.s16 q4, d13, d21 \n"// (1) multiply samples right
-
- // moving these ARM before neon seems to be slower
- "subs %[count], %[count], #8 \n"// (1) update loop counter
- "sub %[sP], %[sP], #32 \n"// (0) move pointer to next set of samples
-
- // sP used after branch (warning)
- "bne 1b \n"// loop
-
- ASSEMBLY_ACCUMULATE_STEREO
-
- : [out] "=Uv" (out[0]),
- [count] "+r" (count),
- [coefsP0] "+r" (coefsP),
- [coefsN0] "+r" (coefsN),
- [sP] "+r" (sP),
- [sN] "+r" (sN)
- : [vLR] "r" (volumeLR)
- : "cc", "memory",
- "q0", "q1", "q2", "q3",
- "q4", "q5", "q6",
- "q8", "q10"
- );
-#endif
-}
-
-template <>
-inline void Process<1, 16>(int32_t* const out,
- int count,
- const int16_t* coefsP,
- const int16_t* coefsN,
- const int16_t* coefsP1,
- const int16_t* coefsN1,
- const int16_t* sP,
- const int16_t* sN,
- uint32_t lerpP,
- const int32_t* const volumeLR)
-{
-#ifdef USE_INTRINSIC
- ProcessNeonIntrinsic<1, 16, false>(out, count, coefsP, coefsN, sP, sN, volumeLR,
- lerpP, coefsP1, coefsN1);
-#else
-
- const int CHANNELS = 1; // template specialization does not preserve params
- const int STRIDE = 16;
- sP -= CHANNELS*((STRIDE>>1)-1);
- asm (
- "vmov.32 d2[0], %[lerpP] \n"// load the positive phase S32 Q15
- "veor q0, q0, q0 \n"// (0 - combines+) accumulator = 0
-
- "1: \n"
-
- "vld1.16 {q2}, [%[sP]] \n"// (2+0d) load 8 16-bits mono samples
- "vld1.16 {q3}, [%[sN]]! \n"// (2) load 8 16-bits mono samples
- "vld1.16 {q8}, [%[coefsP0]:128]! \n"// (1) load 8 16-bits coefs
- "vld1.16 {q9}, [%[coefsP1]:128]! \n"// (1) load 8 16-bits coefs for interpolation
- "vld1.16 {q10}, [%[coefsN1]:128]! \n"// (1) load 8 16-bits coefs
- "vld1.16 {q11}, [%[coefsN0]:128]! \n"// (1) load 8 16-bits coefs for interpolation
-
- "vsub.s16 q9, q9, q8 \n"// (1) interpolate (step1) 1st set of coefs
- "vsub.s16 q11, q11, q10 \n"// (1) interpolate (step1) 2nd set of coets
-
- "vqrdmulh.s16 q9, q9, d2[0] \n"// (2) interpolate (step2) 1st set of coefs
- "vqrdmulh.s16 q11, q11, d2[0] \n"// (2) interpolate (step2) 2nd set of coefs
-
- "vrev64.16 q2, q2 \n"// (1) reverse s3, s2, s1, s0, s7, s6, s5, s4
-
- "vadd.s16 q8, q8, q9 \n"// (1+2d) interpolate (step3) 1st set
- "vadd.s16 q10, q10, q11 \n"// (1+1d) interpolate (step3) 2nd set
-
- // reordering the vmal to do d6, d7 before d4, d5 is slower(?)
- "vmlal.s16 q0, d4, d17 \n"// (1+0d) multiply reversed samples by coef
- "vmlal.s16 q0, d5, d16 \n"// (1) multiply reversed samples by coef
- "vmlal.s16 q0, d6, d20 \n"// (1) multiply neg samples
- "vmlal.s16 q0, d7, d21 \n"// (1) multiply neg samples
-
- // moving these ARM instructions before neon above seems to be slower
- "subs %[count], %[count], #8 \n"// (1) update loop counter
- "sub %[sP], %[sP], #16 \n"// (0) move pointer to next set of samples
-
- // sP used after branch (warning)
- "bne 1b \n"// loop
-
- ASSEMBLY_ACCUMULATE_MONO
-
- : [out] "=Uv" (out[0]),
- [count] "+r" (count),
- [coefsP0] "+r" (coefsP),
- [coefsN0] "+r" (coefsN),
- [coefsP1] "+r" (coefsP1),
- [coefsN1] "+r" (coefsN1),
- [sP] "+r" (sP),
- [sN] "+r" (sN)
- : [lerpP] "r" (lerpP),
- [vLR] "r" (volumeLR)
- : "cc", "memory",
- "q0", "q1", "q2", "q3",
- "q8", "q9", "q10", "q11"
- );
-#endif
-}
-
-template <>
-inline void Process<2, 16>(int32_t* const out,
- int count,
- const int16_t* coefsP,
- const int16_t* coefsN,
- const int16_t* coefsP1,
- const int16_t* coefsN1,
- const int16_t* sP,
- const int16_t* sN,
- uint32_t lerpP,
- const int32_t* const volumeLR)
-{
-#ifdef USE_INTRINSIC
- ProcessNeonIntrinsic<2, 16, false>(out, count, coefsP, coefsN, sP, sN, volumeLR,
- lerpP, coefsP1, coefsN1);
-#else
- const int CHANNELS = 2; // template specialization does not preserve params
- const int STRIDE = 16;
- sP -= CHANNELS*((STRIDE>>1)-1);
- asm (
- "vmov.32 d2[0], %[lerpP] \n"// load the positive phase
- "veor q0, q0, q0 \n"// (1) acc_L = 0
- "veor q4, q4, q4 \n"// (0 combines+) acc_R = 0
-
- "1: \n"
-
- "vld2.16 {q2, q3}, [%[sP]] \n"// (3+0d) load 8 16-bits stereo frames
- "vld2.16 {q5, q6}, [%[sN]]! \n"// (3) load 8 16-bits stereo frames
- "vld1.16 {q8}, [%[coefsP0]:128]! \n"// (1) load 8 16-bits coefs
- "vld1.16 {q9}, [%[coefsP1]:128]! \n"// (1) load 8 16-bits coefs for interpolation
- "vld1.16 {q10}, [%[coefsN1]:128]! \n"// (1) load 8 16-bits coefs
- "vld1.16 {q11}, [%[coefsN0]:128]! \n"// (1) load 8 16-bits coefs for interpolation
-
- "vsub.s16 q9, q9, q8 \n"// (1) interpolate (step1) 1st set of coefs
- "vsub.s16 q11, q11, q10 \n"// (1) interpolate (step1) 2nd set of coets
-
- "vqrdmulh.s16 q9, q9, d2[0] \n"// (2) interpolate (step2) 1st set of coefs
- "vqrdmulh.s16 q11, q11, d2[0] \n"// (2) interpolate (step2) 2nd set of coefs
-
- "vrev64.16 q2, q2 \n"// (1) reverse 8 samples of positive left
- "vrev64.16 q3, q3 \n"// (1) reverse 8 samples of positive right
-
- "vadd.s16 q8, q8, q9 \n"// (1+1d) interpolate (step3) 1st set
- "vadd.s16 q10, q10, q11 \n"// (1+1d) interpolate (step3) 2nd set
-
- "vmlal.s16 q0, d4, d17 \n"// (1) multiply reversed samples left
- "vmlal.s16 q0, d5, d16 \n"// (1) multiply reversed samples left
- "vmlal.s16 q4, d6, d17 \n"// (1) multiply reversed samples right
- "vmlal.s16 q4, d7, d16 \n"// (1) multiply reversed samples right
- "vmlal.s16 q0, d10, d20 \n"// (1) multiply samples left
- "vmlal.s16 q0, d11, d21 \n"// (1) multiply samples left
- "vmlal.s16 q4, d12, d20 \n"// (1) multiply samples right
- "vmlal.s16 q4, d13, d21 \n"// (1) multiply samples right
-
- // moving these ARM before neon seems to be slower
- "subs %[count], %[count], #8 \n"// (1) update loop counter
- "sub %[sP], %[sP], #32 \n"// (0) move pointer to next set of samples
-
- // sP used after branch (warning)
- "bne 1b \n"// loop
-
- ASSEMBLY_ACCUMULATE_STEREO
-
- : [out] "=Uv" (out[0]),
- [count] "+r" (count),
- [coefsP0] "+r" (coefsP),
- [coefsN0] "+r" (coefsN),
- [coefsP1] "+r" (coefsP1),
- [coefsN1] "+r" (coefsN1),
- [sP] "+r" (sP),
- [sN] "+r" (sN)
- : [lerpP] "r" (lerpP),
- [vLR] "r" (volumeLR)
- : "cc", "memory",
- "q0", "q1", "q2", "q3",
- "q4", "q5", "q6",
- "q8", "q9", "q10", "q11"
- );
-#endif
-}
-
-template <>
-inline void ProcessL<1, 16>(int32_t* const out,
- int count,
- const int32_t* coefsP,
- const int32_t* coefsN,
- const int16_t* sP,
- const int16_t* sN,
- const int32_t* const volumeLR)
-{
-#ifdef USE_INTRINSIC
- ProcessNeonIntrinsic<1, 16, true>(out, count, coefsP, coefsN, sP, sN, volumeLR,
- 0 /*lerpP*/, NULL /*coefsP1*/, NULL /*coefsN1*/);
-#else
- const int CHANNELS = 1; // template specialization does not preserve params
- const int STRIDE = 16;
- sP -= CHANNELS*((STRIDE>>1)-1);
- asm (
- "veor q0, q0, q0 \n"// result, initialize to 0
-
- "1: \n"
-
- "vld1.16 {q2}, [%[sP]] \n"// load 8 16-bits mono samples
- "vld1.16 {q3}, [%[sN]]! \n"// load 8 16-bits mono samples
- "vld1.32 {q8, q9}, [%[coefsP0]:128]! \n"// load 8 32-bits coefs
- "vld1.32 {q10, q11}, [%[coefsN0]:128]! \n"// load 8 32-bits coefs
-
- "vrev64.16 q2, q2 \n"// reverse 8 samples of the positive side
-
- "vshll.s16 q12, d4, #15 \n"// extend samples to 31 bits
- "vshll.s16 q13, d5, #15 \n"// extend samples to 31 bits
-
- "vshll.s16 q14, d6, #15 \n"// extend samples to 31 bits
- "vshll.s16 q15, d7, #15 \n"// extend samples to 31 bits
-
- "vqrdmulh.s32 q12, q12, q9 \n"// multiply samples
- "vqrdmulh.s32 q13, q13, q8 \n"// multiply samples
- "vqrdmulh.s32 q14, q14, q10 \n"// multiply samples
- "vqrdmulh.s32 q15, q15, q11 \n"// multiply samples
-
- "vadd.s32 q0, q0, q12 \n"// accumulate result
- "vadd.s32 q13, q13, q14 \n"// accumulate result
- "vadd.s32 q0, q0, q15 \n"// accumulate result
- "vadd.s32 q0, q0, q13 \n"// accumulate result
-
- "sub %[sP], %[sP], #16 \n"// move pointer to next set of samples
- "subs %[count], %[count], #8 \n"// update loop counter
-
- "bne 1b \n"// loop
-
- ASSEMBLY_ACCUMULATE_MONO
-
- : [out] "=Uv" (out[0]),
- [count] "+r" (count),
- [coefsP0] "+r" (coefsP),
- [coefsN0] "+r" (coefsN),
- [sP] "+r" (sP),
- [sN] "+r" (sN)
- : [vLR] "r" (volumeLR)
- : "cc", "memory",
- "q0", "q1", "q2", "q3",
- "q8", "q9", "q10", "q11",
- "q12", "q13", "q14", "q15"
- );
-#endif
-}
-
-template <>
-inline void ProcessL<2, 16>(int32_t* const out,
- int count,
- const int32_t* coefsP,
- const int32_t* coefsN,
- const int16_t* sP,
- const int16_t* sN,
- const int32_t* const volumeLR)
-{
-#ifdef USE_INTRINSIC
- ProcessNeonIntrinsic<2, 16, true>(out, count, coefsP, coefsN, sP, sN, volumeLR,
- 0 /*lerpP*/, NULL /*coefsP1*/, NULL /*coefsN1*/);
-#else
- const int CHANNELS = 2; // template specialization does not preserve params
- const int STRIDE = 16;
- sP -= CHANNELS*((STRIDE>>1)-1);
- asm (
- "veor q0, q0, q0 \n"// result, initialize to 0
- "veor q4, q4, q4 \n"// result, initialize to 0
-
- "1: \n"
-
- "vld2.16 {q2, q3}, [%[sP]] \n"// load 8 16-bits stereo frames
- "vld2.16 {q5, q6}, [%[sN]]! \n"// load 8 16-bits stereo frames
- "vld1.32 {q8, q9}, [%[coefsP0]:128]! \n"// load 8 32-bits coefs
- "vld1.32 {q10, q11}, [%[coefsN0]:128]! \n"// load 8 32-bits coefs
-
- "vrev64.16 q2, q2 \n"// reverse 8 samples of positive left
- "vrev64.16 q3, q3 \n"// reverse 8 samples of positive right
-
- "vshll.s16 q12, d4, #15 \n"// extend samples to 31 bits
- "vshll.s16 q13, d5, #15 \n"// extend samples to 31 bits
-
- "vshll.s16 q14, d10, #15 \n"// extend samples to 31 bits
- "vshll.s16 q15, d11, #15 \n"// extend samples to 31 bits
-
- "vqrdmulh.s32 q12, q12, q9 \n"// multiply samples by coef
- "vqrdmulh.s32 q13, q13, q8 \n"// multiply samples by coef
- "vqrdmulh.s32 q14, q14, q10 \n"// multiply samples by coef
- "vqrdmulh.s32 q15, q15, q11 \n"// multiply samples by coef
-
- "vadd.s32 q0, q0, q12 \n"// accumulate result
- "vadd.s32 q13, q13, q14 \n"// accumulate result
- "vadd.s32 q0, q0, q15 \n"// accumulate result
- "vadd.s32 q0, q0, q13 \n"// accumulate result
-
- "vshll.s16 q12, d6, #15 \n"// extend samples to 31 bits
- "vshll.s16 q13, d7, #15 \n"// extend samples to 31 bits
-
- "vshll.s16 q14, d12, #15 \n"// extend samples to 31 bits
- "vshll.s16 q15, d13, #15 \n"// extend samples to 31 bits
-
- "vqrdmulh.s32 q12, q12, q9 \n"// multiply samples by coef
- "vqrdmulh.s32 q13, q13, q8 \n"// multiply samples by coef
- "vqrdmulh.s32 q14, q14, q10 \n"// multiply samples by coef
- "vqrdmulh.s32 q15, q15, q11 \n"// multiply samples by coef
-
- "vadd.s32 q4, q4, q12 \n"// accumulate result
- "vadd.s32 q13, q13, q14 \n"// accumulate result
- "vadd.s32 q4, q4, q15 \n"// accumulate result
- "vadd.s32 q4, q4, q13 \n"// accumulate result
-
- "subs %[count], %[count], #8 \n"// update loop counter
- "sub %[sP], %[sP], #32 \n"// move pointer to next set of samples
-
- "bne 1b \n"// loop
-
- ASSEMBLY_ACCUMULATE_STEREO
-
- : [out] "=Uv" (out[0]),
- [count] "+r" (count),
- [coefsP0] "+r" (coefsP),
- [coefsN0] "+r" (coefsN),
- [sP] "+r" (sP),
- [sN] "+r" (sN)
- : [vLR] "r" (volumeLR)
- : "cc", "memory",
- "q0", "q1", "q2", "q3",
- "q4", "q5", "q6",
- "q8", "q9", "q10", "q11",
- "q12", "q13", "q14", "q15"
- );
-#endif
-}
-
-template <>
-inline void Process<1, 16>(int32_t* const out,
- int count,
- const int32_t* coefsP,
- const int32_t* coefsN,
- const int32_t* coefsP1,
- const int32_t* coefsN1,
- const int16_t* sP,
- const int16_t* sN,
- uint32_t lerpP,
- const int32_t* const volumeLR)
-{
-#ifdef USE_INTRINSIC
- ProcessNeonIntrinsic<1, 16, false>(out, count, coefsP, coefsN, sP, sN, volumeLR,
- lerpP, coefsP1, coefsN1);
-#else
- const int CHANNELS = 1; // template specialization does not preserve params
- const int STRIDE = 16;
- sP -= CHANNELS*((STRIDE>>1)-1);
- asm (
- "vmov.32 d2[0], %[lerpP] \n"// load the positive phase
- "veor q0, q0, q0 \n"// result, initialize to 0
-
- "1: \n"
-
- "vld1.16 {q2}, [%[sP]] \n"// load 8 16-bits mono samples
- "vld1.16 {q3}, [%[sN]]! \n"// load 8 16-bits mono samples
- "vld1.32 {q8, q9}, [%[coefsP0]:128]! \n"// load 8 32-bits coefs
- "vld1.32 {q12, q13}, [%[coefsP1]:128]! \n"// load 8 32-bits coefs
- "vld1.32 {q10, q11}, [%[coefsN1]:128]! \n"// load 8 32-bits coefs
- "vld1.32 {q14, q15}, [%[coefsN0]:128]! \n"// load 8 32-bits coefs
-
- "vsub.s32 q12, q12, q8 \n"// interpolate (step1)
- "vsub.s32 q13, q13, q9 \n"// interpolate (step1)
- "vsub.s32 q14, q14, q10 \n"// interpolate (step1)
- "vsub.s32 q15, q15, q11 \n"// interpolate (step1)
-
- "vqrdmulh.s32 q12, q12, d2[0] \n"// interpolate (step2)
- "vqrdmulh.s32 q13, q13, d2[0] \n"// interpolate (step2)
- "vqrdmulh.s32 q14, q14, d2[0] \n"// interpolate (step2)
- "vqrdmulh.s32 q15, q15, d2[0] \n"// interpolate (step2)
-
- "vadd.s32 q8, q8, q12 \n"// interpolate (step3)
- "vadd.s32 q9, q9, q13 \n"// interpolate (step3)
- "vadd.s32 q10, q10, q14 \n"// interpolate (step3)
- "vadd.s32 q11, q11, q15 \n"// interpolate (step3)
-
- "vrev64.16 q2, q2 \n"// reverse 8 samples of the positive side
-
- "vshll.s16 q12, d4, #15 \n"// extend samples to 31 bits
- "vshll.s16 q13, d5, #15 \n"// extend samples to 31 bits
-
- "vshll.s16 q14, d6, #15 \n"// extend samples to 31 bits
- "vshll.s16 q15, d7, #15 \n"// extend samples to 31 bits
-
- "vqrdmulh.s32 q12, q12, q9 \n"// multiply samples by interpolated coef
- "vqrdmulh.s32 q13, q13, q8 \n"// multiply samples by interpolated coef
- "vqrdmulh.s32 q14, q14, q10 \n"// multiply samples by interpolated coef
- "vqrdmulh.s32 q15, q15, q11 \n"// multiply samples by interpolated coef
-
- "vadd.s32 q0, q0, q12 \n"// accumulate result
- "vadd.s32 q13, q13, q14 \n"// accumulate result
- "vadd.s32 q0, q0, q15 \n"// accumulate result
- "vadd.s32 q0, q0, q13 \n"// accumulate result
-
- "sub %[sP], %[sP], #16 \n"// move pointer to next set of samples
- "subs %[count], %[count], #8 \n"// update loop counter
-
- "bne 1b \n"// loop
-
- ASSEMBLY_ACCUMULATE_MONO
-
- : [out] "=Uv" (out[0]),
- [count] "+r" (count),
- [coefsP0] "+r" (coefsP),
- [coefsN0] "+r" (coefsN),
- [coefsP1] "+r" (coefsP1),
- [coefsN1] "+r" (coefsN1),
- [sP] "+r" (sP),
- [sN] "+r" (sN)
- : [lerpP] "r" (lerpP),
- [vLR] "r" (volumeLR)
- : "cc", "memory",
- "q0", "q1", "q2", "q3",
- "q8", "q9", "q10", "q11",
- "q12", "q13", "q14", "q15"
- );
-#endif
-}
-
-template <>
-inline void Process<2, 16>(int32_t* const out,
- int count,
- const int32_t* coefsP,
- const int32_t* coefsN,
- const int32_t* coefsP1,
- const int32_t* coefsN1,
- const int16_t* sP,
- const int16_t* sN,
- uint32_t lerpP,
- const int32_t* const volumeLR)
-{
-#ifdef USE_INTRINSIC
- ProcessNeonIntrinsic<2, 16, false>(out, count, coefsP, coefsN, sP, sN, volumeLR,
- lerpP, coefsP1, coefsN1);
-#else
- const int CHANNELS = 2; // template specialization does not preserve params
- const int STRIDE = 16;
- sP -= CHANNELS*((STRIDE>>1)-1);
- asm (
- "vmov.32 d2[0], %[lerpP] \n"// load the positive phase
- "veor q0, q0, q0 \n"// result, initialize to 0
- "veor q4, q4, q4 \n"// result, initialize to 0
-
- "1: \n"
-
- "vld2.16 {q2, q3}, [%[sP]] \n"// load 8 16-bits stereo frames
- "vld2.16 {q5, q6}, [%[sN]]! \n"// load 8 16-bits stereo frames
- "vld1.32 {q8, q9}, [%[coefsP0]:128]! \n"// load 8 32-bits coefs
- "vld1.32 {q12, q13}, [%[coefsP1]:128]! \n"// load 8 32-bits coefs
- "vld1.32 {q10, q11}, [%[coefsN1]:128]! \n"// load 8 32-bits coefs
- "vld1.32 {q14, q15}, [%[coefsN0]:128]! \n"// load 8 32-bits coefs
-
- "vsub.s32 q12, q12, q8 \n"// interpolate (step1)
- "vsub.s32 q13, q13, q9 \n"// interpolate (step1)
- "vsub.s32 q14, q14, q10 \n"// interpolate (step1)
- "vsub.s32 q15, q15, q11 \n"// interpolate (step1)
-
- "vqrdmulh.s32 q12, q12, d2[0] \n"// interpolate (step2)
- "vqrdmulh.s32 q13, q13, d2[0] \n"// interpolate (step2)
- "vqrdmulh.s32 q14, q14, d2[0] \n"// interpolate (step2)
- "vqrdmulh.s32 q15, q15, d2[0] \n"// interpolate (step2)
-
- "vadd.s32 q8, q8, q12 \n"// interpolate (step3)
- "vadd.s32 q9, q9, q13 \n"// interpolate (step3)
- "vadd.s32 q10, q10, q14 \n"// interpolate (step3)
- "vadd.s32 q11, q11, q15 \n"// interpolate (step3)
-
- "vrev64.16 q2, q2 \n"// reverse 8 samples of positive left
- "vrev64.16 q3, q3 \n"// reverse 8 samples of positive right
-
- "vshll.s16 q12, d4, #15 \n"// extend samples to 31 bits
- "vshll.s16 q13, d5, #15 \n"// extend samples to 31 bits
-
- "vshll.s16 q14, d10, #15 \n"// extend samples to 31 bits
- "vshll.s16 q15, d11, #15 \n"// extend samples to 31 bits
-
- "vqrdmulh.s32 q12, q12, q9 \n"// multiply samples by interpolated coef
- "vqrdmulh.s32 q13, q13, q8 \n"// multiply samples by interpolated coef
- "vqrdmulh.s32 q14, q14, q10 \n"// multiply samples by interpolated coef
- "vqrdmulh.s32 q15, q15, q11 \n"// multiply samples by interpolated coef
-
- "vadd.s32 q0, q0, q12 \n"// accumulate result
- "vadd.s32 q13, q13, q14 \n"// accumulate result
- "vadd.s32 q0, q0, q15 \n"// accumulate result
- "vadd.s32 q0, q0, q13 \n"// accumulate result
-
- "vshll.s16 q12, d6, #15 \n"// extend samples to 31 bits
- "vshll.s16 q13, d7, #15 \n"// extend samples to 31 bits
-
- "vshll.s16 q14, d12, #15 \n"// extend samples to 31 bits
- "vshll.s16 q15, d13, #15 \n"// extend samples to 31 bits
-
- "vqrdmulh.s32 q12, q12, q9 \n"// multiply samples by interpolated coef
- "vqrdmulh.s32 q13, q13, q8 \n"// multiply samples by interpolated coef
- "vqrdmulh.s32 q14, q14, q10 \n"// multiply samples by interpolated coef
- "vqrdmulh.s32 q15, q15, q11 \n"// multiply samples by interpolated coef
-
- "vadd.s32 q4, q4, q12 \n"// accumulate result
- "vadd.s32 q13, q13, q14 \n"// accumulate result
- "vadd.s32 q4, q4, q15 \n"// accumulate result
- "vadd.s32 q4, q4, q13 \n"// accumulate result
-
- "subs %[count], %[count], #8 \n"// update loop counter
- "sub %[sP], %[sP], #32 \n"// move pointer to next set of samples
-
- "bne 1b \n"// loop
-
- ASSEMBLY_ACCUMULATE_STEREO
-
- : [out] "=Uv" (out[0]),
- [count] "+r" (count),
- [coefsP0] "+r" (coefsP),
- [coefsN0] "+r" (coefsN),
- [coefsP1] "+r" (coefsP1),
- [coefsN1] "+r" (coefsN1),
- [sP] "+r" (sP),
- [sN] "+r" (sN)
- : [lerpP] "r" (lerpP),
- [vLR] "r" (volumeLR)
- : "cc", "memory",
- "q0", "q1", "q2", "q3",
- "q4", "q5", "q6",
- "q8", "q9", "q10", "q11",
- "q12", "q13", "q14", "q15"
- );
-#endif
-}
-
-template<>
-inline void ProcessL<1, 16>(float* const out,
- int count,
- const float* coefsP,
- const float* coefsN,
- const float* sP,
- const float* sN,
- const float* const volumeLR)
-{
- ProcessNeonIntrinsic<1, 16, true>(out, count, coefsP, coefsN, sP, sN, volumeLR,
- 0 /*lerpP*/, NULL /*coefsP1*/, NULL /*coefsN1*/);
-}
-
-template<>
-inline void ProcessL<2, 16>(float* const out,
- int count,
- const float* coefsP,
- const float* coefsN,
- const float* sP,
- const float* sN,
- const float* const volumeLR)
-{
- ProcessNeonIntrinsic<2, 16, true>(out, count, coefsP, coefsN, sP, sN, volumeLR,
- 0 /*lerpP*/, NULL /*coefsP1*/, NULL /*coefsN1*/);
-}
-
-template<>
-inline void Process<1, 16>(float* const out,
- int count,
- const float* coefsP,
- const float* coefsN,
- const float* coefsP1,
- const float* coefsN1,
- const float* sP,
- const float* sN,
- float lerpP,
- const float* const volumeLR)
-{
- ProcessNeonIntrinsic<1, 16, false>(out, count, coefsP, coefsN, sP, sN, volumeLR,
- lerpP, coefsP1, coefsN1);
-}
-
-template<>
-inline void Process<2, 16>(float* const out,
- int count,
- const float* coefsP,
- const float* coefsN,
- const float* coefsP1,
- const float* coefsN1,
- const float* sP,
- const float* sN,
- float lerpP,
- const float* const volumeLR)
-{
- ProcessNeonIntrinsic<2, 16, false>(out, count, coefsP, coefsN, sP, sN, volumeLR,
- lerpP, coefsP1, coefsN1);
-}
-
-#endif //USE_NEON
-
-} // namespace android
-
-#endif /*ANDROID_AUDIO_RESAMPLER_FIR_PROCESS_NEON_H*/
diff --git a/services/audioflinger/AudioResamplerFirProcessSSE.h b/services/audioflinger/AudioResamplerFirProcessSSE.h
deleted file mode 100644
index 63ed052..0000000
--- a/services/audioflinger/AudioResamplerFirProcessSSE.h
+++ /dev/null
@@ -1,215 +0,0 @@
-/*
- * Copyright (C) 2016 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef ANDROID_AUDIO_RESAMPLER_FIR_PROCESS_SSE_H
-#define ANDROID_AUDIO_RESAMPLER_FIR_PROCESS_SSE_H
-
-namespace android {
-
-// depends on AudioResamplerFirOps.h, AudioResamplerFirProcess.h
-
-#if USE_SSE
-
-#define TO_STRING2(x) #x
-#define TO_STRING(x) TO_STRING2(x)
-// uncomment to print GCC version, may be relevant for intrinsic optimizations
-/* #pragma message ("GCC version: " TO_STRING(__GNUC__) \
- "." TO_STRING(__GNUC_MINOR__) \
- "." TO_STRING(__GNUC_PATCHLEVEL__)) */
-
-//
-// SSEx specializations are enabled for Process() and ProcessL() in AudioResamplerFirProcess.h
-//
-
-template <int CHANNELS, int STRIDE, bool FIXED>
-static inline void ProcessSSEIntrinsic(float* out,
- int count,
- const float* coefsP,
- const float* coefsN,
- const float* sP,
- const float* sN,
- const float* volumeLR,
- float lerpP,
- const float* coefsP1,
- const float* coefsN1)
-{
- ALOG_ASSERT(count > 0 && (count & 7) == 0); // multiple of 8
- COMPILE_TIME_ASSERT_FUNCTION_SCOPE(CHANNELS == 1 || CHANNELS == 2);
-
- sP -= CHANNELS*(4-1); // adjust sP for a loop iteration of four
-
- __m128 interp;
- if (!FIXED) {
- interp = _mm_set1_ps(lerpP);
- }
-
- __m128 accL, accR;
- accL = _mm_setzero_ps();
- if (CHANNELS == 2) {
- accR = _mm_setzero_ps();
- }
-
- do {
- __m128 posCoef = _mm_load_ps(coefsP);
- __m128 negCoef = _mm_load_ps(coefsN);
- coefsP += 4;
- coefsN += 4;
-
- if (!FIXED) { // interpolate
- __m128 posCoef1 = _mm_load_ps(coefsP1);
- __m128 negCoef1 = _mm_load_ps(coefsN1);
- coefsP1 += 4;
- coefsN1 += 4;
-
- // Calculate the final coefficient for interpolation
- // posCoef = interp * (posCoef1 - posCoef) + posCoef
- // negCoef = interp * (negCoef - negCoef1) + negCoef1
- posCoef1 = _mm_sub_ps(posCoef1, posCoef);
- negCoef = _mm_sub_ps(negCoef, negCoef1);
-
- posCoef1 = _mm_mul_ps(posCoef1, interp);
- negCoef = _mm_mul_ps(negCoef, interp);
-
- posCoef = _mm_add_ps(posCoef1, posCoef);
- negCoef = _mm_add_ps(negCoef, negCoef1);
- }
- switch (CHANNELS) {
- case 1: {
- __m128 posSamp = _mm_loadu_ps(sP);
- __m128 negSamp = _mm_loadu_ps(sN);
- sP -= 4;
- sN += 4;
-
- posSamp = _mm_shuffle_ps(posSamp, posSamp, 0x1B);
- posSamp = _mm_mul_ps(posSamp, posCoef);
- negSamp = _mm_mul_ps(negSamp, negCoef);
-
- accL = _mm_add_ps(accL, posSamp);
- accL = _mm_add_ps(accL, negSamp);
- } break;
- case 2: {
- __m128 posSamp0 = _mm_loadu_ps(sP);
- __m128 posSamp1 = _mm_loadu_ps(sP+4);
- __m128 negSamp0 = _mm_loadu_ps(sN);
- __m128 negSamp1 = _mm_loadu_ps(sN+4);
- sP -= 8;
- sN += 8;
-
- // deinterleave everything and reverse the positives
- __m128 posSampL = _mm_shuffle_ps(posSamp1, posSamp0, 0x22);
- __m128 posSampR = _mm_shuffle_ps(posSamp1, posSamp0, 0x77);
- __m128 negSampL = _mm_shuffle_ps(negSamp0, negSamp1, 0x88);
- __m128 negSampR = _mm_shuffle_ps(negSamp0, negSamp1, 0xDD);
-
- posSampL = _mm_mul_ps(posSampL, posCoef);
- posSampR = _mm_mul_ps(posSampR, posCoef);
- negSampL = _mm_mul_ps(negSampL, negCoef);
- negSampR = _mm_mul_ps(negSampR, negCoef);
-
- accL = _mm_add_ps(accL, posSampL);
- accR = _mm_add_ps(accR, posSampR);
- accL = _mm_add_ps(accL, negSampL);
- accR = _mm_add_ps(accR, negSampR);
- } break;
- }
- } while (count -= 4);
-
- // multiply by volume and save
- __m128 vLR = _mm_setzero_ps();
- __m128 outSamp;
- vLR = _mm_loadl_pi(vLR, reinterpret_cast<const __m64*>(volumeLR));
- outSamp = _mm_loadl_pi(vLR, reinterpret_cast<__m64*>(out));
-
- // combine and funnel down accumulator
- __m128 outAccum = _mm_setzero_ps();
- if (CHANNELS == 1) {
- // duplicate accL to both L and R
- outAccum = _mm_add_ps(accL, _mm_movehl_ps(accL, accL));
- outAccum = _mm_add_ps(outAccum, _mm_shuffle_ps(outAccum, outAccum, 0x11));
- } else if (CHANNELS == 2) {
- // accR contains R, fold in
- outAccum = _mm_hadd_ps(accL, accR);
- outAccum = _mm_hadd_ps(outAccum, outAccum);
- }
-
- outAccum = _mm_mul_ps(outAccum, vLR);
- outSamp = _mm_add_ps(outSamp, outAccum);
- _mm_storel_pi(reinterpret_cast<__m64*>(out), outSamp);
-}
-
-template<>
-inline void ProcessL<1, 16>(float* const out,
- int count,
- const float* coefsP,
- const float* coefsN,
- const float* sP,
- const float* sN,
- const float* const volumeLR)
-{
- ProcessSSEIntrinsic<1, 16, true>(out, count, coefsP, coefsN, sP, sN, volumeLR,
- 0 /*lerpP*/, NULL /*coefsP1*/, NULL /*coefsN1*/);
-}
-
-template<>
-inline void ProcessL<2, 16>(float* const out,
- int count,
- const float* coefsP,
- const float* coefsN,
- const float* sP,
- const float* sN,
- const float* const volumeLR)
-{
- ProcessSSEIntrinsic<2, 16, true>(out, count, coefsP, coefsN, sP, sN, volumeLR,
- 0 /*lerpP*/, NULL /*coefsP1*/, NULL /*coefsN1*/);
-}
-
-template<>
-inline void Process<1, 16>(float* const out,
- int count,
- const float* coefsP,
- const float* coefsN,
- const float* coefsP1,
- const float* coefsN1,
- const float* sP,
- const float* sN,
- float lerpP,
- const float* const volumeLR)
-{
- ProcessSSEIntrinsic<1, 16, false>(out, count, coefsP, coefsN, sP, sN, volumeLR,
- lerpP, coefsP1, coefsN1);
-}
-
-template<>
-inline void Process<2, 16>(float* const out,
- int count,
- const float* coefsP,
- const float* coefsN,
- const float* coefsP1,
- const float* coefsN1,
- const float* sP,
- const float* sN,
- float lerpP,
- const float* const volumeLR)
-{
- ProcessSSEIntrinsic<2, 16, false>(out, count, coefsP, coefsN, sP, sN, volumeLR,
- lerpP, coefsP1, coefsN1);
-}
-
-#endif //USE_SSE
-
-} // namespace android
-
-#endif /*ANDROID_AUDIO_RESAMPLER_FIR_PROCESS_SSE_H*/
diff --git a/services/audioflinger/AudioResamplerSinc.cpp b/services/audioflinger/AudioResamplerSinc.cpp
deleted file mode 100644
index 320b8cf..0000000
--- a/services/audioflinger/AudioResamplerSinc.cpp
+++ /dev/null
@@ -1,613 +0,0 @@
-/*
- * Copyright (C) 2007 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#define LOG_TAG "AudioResamplerSinc"
-//#define LOG_NDEBUG 0
-
-#define __STDC_CONSTANT_MACROS
-#include <malloc.h>
-#include <string.h>
-#include <stdlib.h>
-#include <dlfcn.h>
-
-#include <cutils/compiler.h>
-#include <cutils/properties.h>
-
-#include <utils/Log.h>
-#include <audio_utils/primitives.h>
-
-#include "AudioResamplerSinc.h"
-
-#if defined(__clang__) && !__has_builtin(__builtin_assume_aligned)
-#define __builtin_assume_aligned(p, a) \
- (((uintptr_t(p) % (a)) == 0) ? (p) : (__builtin_unreachable(), (p)))
-#endif
-
-#if defined(__arm__) && !defined(__thumb__)
-#define USE_INLINE_ASSEMBLY (true)
-#else
-#define USE_INLINE_ASSEMBLY (false)
-#endif
-
-#if defined(__aarch64__) || defined(__ARM_NEON__)
-#ifndef USE_NEON
-#define USE_NEON (true)
-#endif
-#else
-#define USE_NEON (false)
-#endif
-#if USE_NEON
-#include <arm_neon.h>
-#endif
-
-#define UNUSED(x) ((void)(x))
-
-namespace android {
-// ----------------------------------------------------------------------------
-
-
-/*
- * These coeficients are computed with the "fir" utility found in
- * tools/resampler_tools
- * cmd-line: fir -l 7 -s 48000 -c 20478
- */
-const uint32_t AudioResamplerSinc::mFirCoefsUp[] __attribute__ ((aligned (32))) = {
-#include "AudioResamplerSincUp.h"
-};
-
-/*
- * These coefficients are optimized for 48KHz -> 44.1KHz
- * cmd-line: fir -l 7 -s 48000 -c 17189
- */
-const uint32_t AudioResamplerSinc::mFirCoefsDown[] __attribute__ ((aligned (32))) = {
-#include "AudioResamplerSincDown.h"
-};
-
-// we use 15 bits to interpolate between these samples
-// this cannot change because the mul below rely on it.
-static const int pLerpBits = 15;
-
-static pthread_once_t once_control = PTHREAD_ONCE_INIT;
-static readCoefficientsFn readResampleCoefficients = NULL;
-
-/*static*/ AudioResamplerSinc::Constants AudioResamplerSinc::highQualityConstants;
-/*static*/ AudioResamplerSinc::Constants AudioResamplerSinc::veryHighQualityConstants;
-
-void AudioResamplerSinc::init_routine()
-{
- // for high quality resampler, the parameters for coefficients are compile-time constants
- Constants *c = &highQualityConstants;
- c->coefsBits = RESAMPLE_FIR_LERP_INT_BITS;
- c->cShift = kNumPhaseBits - c->coefsBits;
- c->cMask = ((1<< c->coefsBits)-1) << c->cShift;
- c->pShift = kNumPhaseBits - c->coefsBits - pLerpBits;
- c->pMask = ((1<< pLerpBits)-1) << c->pShift;
- c->halfNumCoefs = RESAMPLE_FIR_NUM_COEF;
-
- // for very high quality resampler, the parameters are load-time constants
- veryHighQualityConstants = highQualityConstants;
-
- // Open the dll to get the coefficients for VERY_HIGH_QUALITY
- void *resampleCoeffLib = dlopen("libaudio-resampler.so", RTLD_NOW);
- ALOGV("Open libaudio-resampler library = %p", resampleCoeffLib);
- if (resampleCoeffLib == NULL) {
- ALOGE("Could not open audio-resampler library: %s", dlerror());
- return;
- }
-
- readResampleFirNumCoeffFn readResampleFirNumCoeff;
- readResampleFirLerpIntBitsFn readResampleFirLerpIntBits;
-
- readResampleCoefficients = (readCoefficientsFn)
- dlsym(resampleCoeffLib, "readResamplerCoefficients");
- readResampleFirNumCoeff = (readResampleFirNumCoeffFn)
- dlsym(resampleCoeffLib, "readResampleFirNumCoeff");
- readResampleFirLerpIntBits = (readResampleFirLerpIntBitsFn)
- dlsym(resampleCoeffLib, "readResampleFirLerpIntBits");
-
- if (!readResampleCoefficients || !readResampleFirNumCoeff || !readResampleFirLerpIntBits) {
- readResampleCoefficients = NULL;
- dlclose(resampleCoeffLib);
- resampleCoeffLib = NULL;
- ALOGE("Could not find symbol: %s", dlerror());
- return;
- }
-
- c = &veryHighQualityConstants;
- c->coefsBits = readResampleFirLerpIntBits();
- c->cShift = kNumPhaseBits - c->coefsBits;
- c->cMask = ((1<<c->coefsBits)-1) << c->cShift;
- c->pShift = kNumPhaseBits - c->coefsBits - pLerpBits;
- c->pMask = ((1<<pLerpBits)-1) << c->pShift;
- // number of zero-crossing on each side
- c->halfNumCoefs = readResampleFirNumCoeff();
- ALOGV("coefsBits = %d", c->coefsBits);
- ALOGV("halfNumCoefs = %d", c->halfNumCoefs);
- // note that we "leak" resampleCoeffLib until the process exits
-}
-
-// ----------------------------------------------------------------------------
-
-#if !USE_NEON
-
-static inline
-int32_t mulRL(int left, int32_t in, uint32_t vRL)
-{
-#if USE_INLINE_ASSEMBLY
- int32_t out;
- if (left) {
- asm( "smultb %[out], %[in], %[vRL] \n"
- : [out]"=r"(out)
- : [in]"%r"(in), [vRL]"r"(vRL)
- : );
- } else {
- asm( "smultt %[out], %[in], %[vRL] \n"
- : [out]"=r"(out)
- : [in]"%r"(in), [vRL]"r"(vRL)
- : );
- }
- return out;
-#else
- int16_t v = left ? int16_t(vRL) : int16_t(vRL>>16);
- return int32_t((int64_t(in) * v) >> 16);
-#endif
-}
-
-static inline
-int32_t mulAdd(int16_t in, int32_t v, int32_t a)
-{
-#if USE_INLINE_ASSEMBLY
- int32_t out;
- asm( "smlawb %[out], %[v], %[in], %[a] \n"
- : [out]"=r"(out)
- : [in]"%r"(in), [v]"r"(v), [a]"r"(a)
- : );
- return out;
-#else
- return a + int32_t((int64_t(v) * in) >> 16);
-#endif
-}
-
-static inline
-int32_t mulAddRL(int left, uint32_t inRL, int32_t v, int32_t a)
-{
-#if USE_INLINE_ASSEMBLY
- int32_t out;
- if (left) {
- asm( "smlawb %[out], %[v], %[inRL], %[a] \n"
- : [out]"=r"(out)
- : [inRL]"%r"(inRL), [v]"r"(v), [a]"r"(a)
- : );
- } else {
- asm( "smlawt %[out], %[v], %[inRL], %[a] \n"
- : [out]"=r"(out)
- : [inRL]"%r"(inRL), [v]"r"(v), [a]"r"(a)
- : );
- }
- return out;
-#else
- int16_t s = left ? int16_t(inRL) : int16_t(inRL>>16);
- return a + int32_t((int64_t(v) * s) >> 16);
-#endif
-}
-
-#endif // !USE_NEON
-
-// ----------------------------------------------------------------------------
-
-AudioResamplerSinc::AudioResamplerSinc(
- int inChannelCount, int32_t sampleRate, src_quality quality)
- : AudioResampler(inChannelCount, sampleRate, quality),
- mState(0), mImpulse(0), mRingFull(0), mFirCoefs(0)
-{
- /*
- * Layout of the state buffer for 32 tap:
- *
- * "present" sample beginning of 2nd buffer
- * v v
- * 0 01 2 23 3
- * 0 F0 0 F0 F
- * [pppppppppppppppInnnnnnnnnnnnnnnnpppppppppppppppInnnnnnnnnnnnnnnn]
- * ^ ^ head
- *
- * p = past samples, convoluted with the (p)ositive side of sinc()
- * n = future samples, convoluted with the (n)egative side of sinc()
- * r = extra space for implementing the ring buffer
- *
- */
-
- mVolumeSIMD[0] = 0;
- mVolumeSIMD[1] = 0;
-
- // Load the constants for coefficients
- int ok = pthread_once(&once_control, init_routine);
- if (ok != 0) {
- ALOGE("%s pthread_once failed: %d", __func__, ok);
- }
- mConstants = (quality == VERY_HIGH_QUALITY) ?
- &veryHighQualityConstants : &highQualityConstants;
-}
-
-
-AudioResamplerSinc::~AudioResamplerSinc() {
- free(mState);
-}
-
-void AudioResamplerSinc::init() {
- const Constants& c(*mConstants);
- const size_t numCoefs = 2 * c.halfNumCoefs;
- const size_t stateSize = numCoefs * mChannelCount * 2;
- mState = (int16_t*)memalign(32, stateSize*sizeof(int16_t));
- memset(mState, 0, sizeof(int16_t)*stateSize);
- mImpulse = mState + (c.halfNumCoefs-1)*mChannelCount;
- mRingFull = mImpulse + (numCoefs+1)*mChannelCount;
-}
-
-void AudioResamplerSinc::setVolume(float left, float right) {
- AudioResampler::setVolume(left, right);
- // convert to U4_28 (rounding down).
- // integer volume values are clamped to 0 to UNITY_GAIN.
- mVolumeSIMD[0] = u4_28_from_float(clampFloatVol(left));
- mVolumeSIMD[1] = u4_28_from_float(clampFloatVol(right));
-}
-
-size_t AudioResamplerSinc::resample(int32_t* out, size_t outFrameCount,
- AudioBufferProvider* provider)
-{
- // FIXME store current state (up or down sample) and only load the coefs when the state
- // changes. Or load two pointers one for up and one for down in the init function.
- // Not critical now since the read functions are fast, but would be important if read was slow.
- if (mConstants == &veryHighQualityConstants && readResampleCoefficients) {
- mFirCoefs = readResampleCoefficients( mInSampleRate <= mSampleRate );
- } else {
- mFirCoefs = (const int32_t *)
- ((mInSampleRate <= mSampleRate) ? mFirCoefsUp : mFirCoefsDown);
- }
-
- // select the appropriate resampler
- switch (mChannelCount) {
- case 1:
- return resample<1>(out, outFrameCount, provider);
- case 2:
- return resample<2>(out, outFrameCount, provider);
- default:
- LOG_ALWAYS_FATAL("invalid channel count: %d", mChannelCount);
- return 0;
- }
-}
-
-
-template<int CHANNELS>
-size_t AudioResamplerSinc::resample(int32_t* out, size_t outFrameCount,
- AudioBufferProvider* provider)
-{
- const Constants& c(*mConstants);
- const size_t headOffset = c.halfNumCoefs*CHANNELS;
- int16_t* impulse = mImpulse;
- uint32_t vRL = mVolumeRL;
- size_t inputIndex = mInputIndex;
- uint32_t phaseFraction = mPhaseFraction;
- uint32_t phaseIncrement = mPhaseIncrement;
- size_t outputIndex = 0;
- size_t outputSampleCount = outFrameCount * 2;
- size_t inFrameCount = getInFrameCountRequired(outFrameCount);
-
- while (outputIndex < outputSampleCount) {
- // buffer is empty, fetch a new one
- while (mBuffer.frameCount == 0) {
- mBuffer.frameCount = inFrameCount;
- provider->getNextBuffer(&mBuffer);
- if (mBuffer.raw == NULL) {
- goto resample_exit;
- }
- const uint32_t phaseIndex = phaseFraction >> kNumPhaseBits;
- if (phaseIndex == 1) {
- // read one frame
- read<CHANNELS>(impulse, phaseFraction, mBuffer.i16, inputIndex);
- } else if (phaseIndex == 2) {
- // read 2 frames
- read<CHANNELS>(impulse, phaseFraction, mBuffer.i16, inputIndex);
- inputIndex++;
- if (inputIndex >= mBuffer.frameCount) {
- inputIndex -= mBuffer.frameCount;
- provider->releaseBuffer(&mBuffer);
- } else {
- read<CHANNELS>(impulse, phaseFraction, mBuffer.i16, inputIndex);
- }
- }
- }
- int16_t const * const in = mBuffer.i16;
- const size_t frameCount = mBuffer.frameCount;
-
- // Always read-in the first samples from the input buffer
- int16_t* head = impulse + headOffset;
- for (size_t i=0 ; i<CHANNELS ; i++) {
- head[i] = in[inputIndex*CHANNELS + i];
- }
-
- // handle boundary case
- while (CC_LIKELY(outputIndex < outputSampleCount)) {
- filterCoefficient<CHANNELS>(&out[outputIndex], phaseFraction, impulse, vRL);
- outputIndex += 2;
-
- phaseFraction += phaseIncrement;
- const size_t phaseIndex = phaseFraction >> kNumPhaseBits;
- for (size_t i=0 ; i<phaseIndex ; i++) {
- inputIndex++;
- if (inputIndex >= frameCount) {
- goto done; // need a new buffer
- }
- read<CHANNELS>(impulse, phaseFraction, in, inputIndex);
- }
- }
-done:
- // if done with buffer, save samples
- if (inputIndex >= frameCount) {
- inputIndex -= frameCount;
- provider->releaseBuffer(&mBuffer);
- }
- }
-
-resample_exit:
- mImpulse = impulse;
- mInputIndex = inputIndex;
- mPhaseFraction = phaseFraction;
- return outputIndex / CHANNELS;
-}
-
-template<int CHANNELS>
-/***
-* read()
-*
-* This function reads only one frame from input buffer and writes it in
-* state buffer
-*
-**/
-void AudioResamplerSinc::read(
- int16_t*& impulse, uint32_t& phaseFraction,
- const int16_t* in, size_t inputIndex)
-{
- impulse += CHANNELS;
- phaseFraction -= 1LU<<kNumPhaseBits;
-
- const Constants& c(*mConstants);
- if (CC_UNLIKELY(impulse >= mRingFull)) {
- const size_t stateSize = (c.halfNumCoefs*2)*CHANNELS;
- memcpy(mState, mState+stateSize, sizeof(int16_t)*stateSize);
- impulse -= stateSize;
- }
-
- int16_t* head = impulse + c.halfNumCoefs*CHANNELS;
- for (size_t i=0 ; i<CHANNELS ; i++) {
- head[i] = in[inputIndex*CHANNELS + i];
- }
-}
-
-template<int CHANNELS>
-void AudioResamplerSinc::filterCoefficient(int32_t* out, uint32_t phase,
- const int16_t *samples, uint32_t vRL)
-{
- // NOTE: be very careful when modifying the code here. register
- // pressure is very high and a small change might cause the compiler
- // to generate far less efficient code.
- // Always sanity check the result with objdump or test-resample.
-
- // compute the index of the coefficient on the positive side and
- // negative side
- const Constants& c(*mConstants);
- const int32_t ONE = c.cMask | c.pMask;
- uint32_t indexP = ( phase & c.cMask) >> c.cShift;
- uint32_t lerpP = ( phase & c.pMask) >> c.pShift;
- uint32_t indexN = ((ONE-phase) & c.cMask) >> c.cShift;
- uint32_t lerpN = ((ONE-phase) & c.pMask) >> c.pShift;
-
- const size_t offset = c.halfNumCoefs;
- indexP *= offset;
- indexN *= offset;
-
- int32_t const* coefsP = mFirCoefs + indexP;
- int32_t const* coefsN = mFirCoefs + indexN;
- int16_t const* sP = samples;
- int16_t const* sN = samples + CHANNELS;
-
- size_t count = offset;
-
-#if !USE_NEON
- int32_t l = 0;
- int32_t r = 0;
- for (size_t i=0 ; i<count ; i++) {
- interpolate<CHANNELS>(l, r, coefsP++, offset, lerpP, sP);
- sP -= CHANNELS;
- interpolate<CHANNELS>(l, r, coefsN++, offset, lerpN, sN);
- sN += CHANNELS;
- }
- out[0] += 2 * mulRL(1, l, vRL);
- out[1] += 2 * mulRL(0, r, vRL);
-#else
- UNUSED(vRL);
- if (CHANNELS == 1) {
- int32_t const* coefsP1 = coefsP + offset;
- int32_t const* coefsN1 = coefsN + offset;
- sP -= CHANNELS*3;
-
- int32x4_t sum;
- int32x2_t lerpPN;
- lerpPN = vdup_n_s32(0);
- lerpPN = vld1_lane_s32((int32_t *)&lerpP, lerpPN, 0);
- lerpPN = vld1_lane_s32((int32_t *)&lerpN, lerpPN, 1);
- lerpPN = vshl_n_s32(lerpPN, 16);
- sum = vdupq_n_s32(0);
-
- int16x4_t sampleP, sampleN;
- int32x4_t samplePExt, sampleNExt;
- int32x4_t coefsPV0, coefsPV1, coefsNV0, coefsNV1;
-
- coefsP = (const int32_t*)__builtin_assume_aligned(coefsP, 16);
- coefsN = (const int32_t*)__builtin_assume_aligned(coefsN, 16);
- coefsP1 = (const int32_t*)__builtin_assume_aligned(coefsP1, 16);
- coefsN1 = (const int32_t*)__builtin_assume_aligned(coefsN1, 16);
- for (; count > 0; count -= 4) {
- sampleP = vld1_s16(sP);
- sampleN = vld1_s16(sN);
- coefsPV0 = vld1q_s32(coefsP);
- coefsNV0 = vld1q_s32(coefsN);
- coefsPV1 = vld1q_s32(coefsP1);
- coefsNV1 = vld1q_s32(coefsN1);
- sP -= 4;
- sN += 4;
- coefsP += 4;
- coefsN += 4;
- coefsP1 += 4;
- coefsN1 += 4;
-
- sampleP = vrev64_s16(sampleP);
-
- // interpolate (step1)
- coefsPV1 = vsubq_s32(coefsPV1, coefsPV0);
- coefsNV1 = vsubq_s32(coefsNV1, coefsNV0);
- samplePExt = vshll_n_s16(sampleP, 15);
- // interpolate (step2)
- coefsPV1 = vqrdmulhq_lane_s32(coefsPV1, lerpPN, 0);
- coefsNV1 = vqrdmulhq_lane_s32(coefsNV1, lerpPN, 1);
- sampleNExt = vshll_n_s16(sampleN, 15);
- // interpolate (step3)
- coefsPV0 = vaddq_s32(coefsPV0, coefsPV1);
- coefsNV0 = vaddq_s32(coefsNV0, coefsNV1);
-
- samplePExt = vqrdmulhq_s32(samplePExt, coefsPV0);
- sampleNExt = vqrdmulhq_s32(sampleNExt, coefsNV0);
- sum = vaddq_s32(sum, samplePExt);
- sum = vaddq_s32(sum, sampleNExt);
- }
- int32x2_t volumesV, outV;
- volumesV = vld1_s32(mVolumeSIMD);
- outV = vld1_s32(out);
-
- //add all 4 partial sums
- int32x2_t sumLow, sumHigh;
- sumLow = vget_low_s32(sum);
- sumHigh = vget_high_s32(sum);
- sumLow = vpadd_s32(sumLow, sumHigh);
- sumLow = vpadd_s32(sumLow, sumLow);
-
- sumLow = vqrdmulh_s32(sumLow, volumesV);
- outV = vadd_s32(outV, sumLow);
- vst1_s32(out, outV);
- } else if (CHANNELS == 2) {
- int32_t const* coefsP1 = coefsP + offset;
- int32_t const* coefsN1 = coefsN + offset;
- sP -= CHANNELS*3;
-
- int32x4_t sum0, sum1;
- int32x2_t lerpPN;
-
- lerpPN = vdup_n_s32(0);
- lerpPN = vld1_lane_s32((int32_t *)&lerpP, lerpPN, 0);
- lerpPN = vld1_lane_s32((int32_t *)&lerpN, lerpPN, 1);
- lerpPN = vshl_n_s32(lerpPN, 16);
- sum0 = vdupq_n_s32(0);
- sum1 = vdupq_n_s32(0);
-
- int16x4x2_t sampleP, sampleN;
- int32x4x2_t samplePExt, sampleNExt;
- int32x4_t coefsPV0, coefsPV1, coefsNV0, coefsNV1;
-
- coefsP = (const int32_t*)__builtin_assume_aligned(coefsP, 16);
- coefsN = (const int32_t*)__builtin_assume_aligned(coefsN, 16);
- coefsP1 = (const int32_t*)__builtin_assume_aligned(coefsP1, 16);
- coefsN1 = (const int32_t*)__builtin_assume_aligned(coefsN1, 16);
- for (; count > 0; count -= 4) {
- sampleP = vld2_s16(sP);
- sampleN = vld2_s16(sN);
- coefsPV0 = vld1q_s32(coefsP);
- coefsNV0 = vld1q_s32(coefsN);
- coefsPV1 = vld1q_s32(coefsP1);
- coefsNV1 = vld1q_s32(coefsN1);
- sP -= 8;
- sN += 8;
- coefsP += 4;
- coefsN += 4;
- coefsP1 += 4;
- coefsN1 += 4;
-
- sampleP.val[0] = vrev64_s16(sampleP.val[0]);
- sampleP.val[1] = vrev64_s16(sampleP.val[1]);
-
- // interpolate (step1)
- coefsPV1 = vsubq_s32(coefsPV1, coefsPV0);
- coefsNV1 = vsubq_s32(coefsNV1, coefsNV0);
- samplePExt.val[0] = vshll_n_s16(sampleP.val[0], 15);
- samplePExt.val[1] = vshll_n_s16(sampleP.val[1], 15);
- // interpolate (step2)
- coefsPV1 = vqrdmulhq_lane_s32(coefsPV1, lerpPN, 0);
- coefsNV1 = vqrdmulhq_lane_s32(coefsNV1, lerpPN, 1);
- sampleNExt.val[0] = vshll_n_s16(sampleN.val[0], 15);
- sampleNExt.val[1] = vshll_n_s16(sampleN.val[1], 15);
- // interpolate (step3)
- coefsPV0 = vaddq_s32(coefsPV0, coefsPV1);
- coefsNV0 = vaddq_s32(coefsNV0, coefsNV1);
-
- samplePExt.val[0] = vqrdmulhq_s32(samplePExt.val[0], coefsPV0);
- samplePExt.val[1] = vqrdmulhq_s32(samplePExt.val[1], coefsPV0);
- sampleNExt.val[0] = vqrdmulhq_s32(sampleNExt.val[0], coefsNV0);
- sampleNExt.val[1] = vqrdmulhq_s32(sampleNExt.val[1], coefsNV0);
- sum0 = vaddq_s32(sum0, samplePExt.val[0]);
- sum1 = vaddq_s32(sum1, samplePExt.val[1]);
- sum0 = vaddq_s32(sum0, sampleNExt.val[0]);
- sum1 = vaddq_s32(sum1, sampleNExt.val[1]);
- }
- int32x2_t volumesV, outV;
- volumesV = vld1_s32(mVolumeSIMD);
- outV = vld1_s32(out);
-
- //add all 4 partial sums
- int32x2_t sumLow0, sumHigh0, sumLow1, sumHigh1;
- sumLow0 = vget_low_s32(sum0);
- sumHigh0 = vget_high_s32(sum0);
- sumLow1 = vget_low_s32(sum1);
- sumHigh1 = vget_high_s32(sum1);
- sumLow0 = vpadd_s32(sumLow0, sumHigh0);
- sumLow0 = vpadd_s32(sumLow0, sumLow0);
- sumLow1 = vpadd_s32(sumLow1, sumHigh1);
- sumLow1 = vpadd_s32(sumLow1, sumLow1);
-
- sumLow0 = vtrn_s32(sumLow0, sumLow1).val[0];
- sumLow0 = vqrdmulh_s32(sumLow0, volumesV);
- outV = vadd_s32(outV, sumLow0);
- vst1_s32(out, outV);
- }
-#endif
-}
-
-template<int CHANNELS>
-void AudioResamplerSinc::interpolate(
- int32_t& l, int32_t& r,
- const int32_t* coefs, size_t offset,
- int32_t lerp, const int16_t* samples)
-{
- int32_t c0 = coefs[0];
- int32_t c1 = coefs[offset];
- int32_t sinc = mulAdd(lerp, (c1-c0)<<1, c0);
- if (CHANNELS == 2) {
- uint32_t rl = *reinterpret_cast<const uint32_t*>(samples);
- l = mulAddRL(1, rl, sinc, l);
- r = mulAddRL(0, rl, sinc, r);
- } else {
- r = l = mulAdd(samples[0], sinc, l);
- }
-}
-// ----------------------------------------------------------------------------
-} // namespace android
diff --git a/services/audioflinger/AudioResamplerSinc.h b/services/audioflinger/AudioResamplerSinc.h
deleted file mode 100644
index df8b45a..0000000
--- a/services/audioflinger/AudioResamplerSinc.h
+++ /dev/null
@@ -1,100 +0,0 @@
-/*
- * Copyright (C) 2007 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef ANDROID_AUDIO_RESAMPLER_SINC_H
-#define ANDROID_AUDIO_RESAMPLER_SINC_H
-
-#include <stdint.h>
-#include <sys/types.h>
-#include <android/log.h>
-
-#include "AudioResampler.h"
-
-namespace android {
-
-
-typedef const int32_t * (*readCoefficientsFn)(bool upDownSample);
-typedef int32_t (*readResampleFirNumCoeffFn)();
-typedef int32_t (*readResampleFirLerpIntBitsFn)();
-
-// ----------------------------------------------------------------------------
-
-class AudioResamplerSinc : public AudioResampler {
-public:
- AudioResamplerSinc(int inChannelCount, int32_t sampleRate,
- src_quality quality = HIGH_QUALITY);
-
- virtual ~AudioResamplerSinc();
-
- virtual size_t resample(int32_t* out, size_t outFrameCount,
- AudioBufferProvider* provider);
-private:
- void init();
-
- virtual void setVolume(float left, float right);
-
- template<int CHANNELS>
- size_t resample(int32_t* out, size_t outFrameCount,
- AudioBufferProvider* provider);
-
- template<int CHANNELS>
- inline void filterCoefficient(
- int32_t* out, uint32_t phase, const int16_t *samples, uint32_t vRL);
-
- template<int CHANNELS>
- inline void interpolate(
- int32_t& l, int32_t& r,
- const int32_t* coefs, size_t offset,
- int32_t lerp, const int16_t* samples);
-
- template<int CHANNELS>
- inline void read(int16_t*& impulse, uint32_t& phaseFraction,
- const int16_t* in, size_t inputIndex);
-
- int16_t *mState;
- int16_t *mImpulse;
- int16_t *mRingFull;
- int32_t mVolumeSIMD[2];
-
- const int32_t * mFirCoefs;
- static const uint32_t mFirCoefsDown[];
- static const uint32_t mFirCoefsUp[];
-
- // ----------------------------------------------------------------------------
- static const int32_t RESAMPLE_FIR_NUM_COEF = 8;
- static const int32_t RESAMPLE_FIR_LERP_INT_BITS = 7;
-
- struct Constants {
- int coefsBits;
- int cShift;
- uint32_t cMask;
- int pShift;
- uint32_t pMask;
- // number of zero-crossing on each side
- unsigned int halfNumCoefs;
- };
-
- static Constants highQualityConstants;
- static Constants veryHighQualityConstants;
- const Constants *mConstants; // points to appropriate set of coefficient parameters
-
- static void init_routine();
-};
-
-// ----------------------------------------------------------------------------
-} // namespace android
-
-#endif /*ANDROID_AUDIO_RESAMPLER_SINC_H*/
diff --git a/services/audioflinger/AudioResamplerSincDown.h b/services/audioflinger/AudioResamplerSincDown.h
deleted file mode 100644
index 2d0fb86..0000000
--- a/services/audioflinger/AudioResamplerSincDown.h
+++ /dev/null
@@ -1,131 +0,0 @@
-// cmd-line: fir -l 7 -s48000 -c 17189
-
- 0x5bacb6f4, 0x1ded1a1d, 0xf0398d56, 0x0394f674, 0x0193a5f9, 0xfe66dbeb, 0x00791043, 0xfffe6631,
- 0x5bab6c81, 0x1d3ddccd, 0xf0421d2c, 0x03af9995, 0x01818dc9, 0xfe6bb63e, 0x0079812a, 0xfffdc37d,
- 0x5ba78d37, 0x1c8f2cf9, 0xf04beb1d, 0x03c9a04a, 0x016f8aca, 0xfe70a511, 0x0079e34d, 0xfffd2545,
- 0x5ba1194f, 0x1be11231, 0xf056f2c7, 0x03e309fe, 0x015d9e64, 0xfe75a79f, 0x007a36e2, 0xfffc8b86,
- 0x5b981122, 0x1b3393f8, 0xf0632fb7, 0x03fbd625, 0x014bc9fa, 0xfe7abd23, 0x007a7c20, 0xfffbf639,
- 0x5b8c7530, 0x1a86b9bf, 0xf0709d74, 0x04140449, 0x013a0ee9, 0xfe7fe4db, 0x007ab33d, 0xfffb655b,
- 0x5b7e461a, 0x19da8ae5, 0xf07f3776, 0x042b93fd, 0x01286e86, 0xfe851e05, 0x007adc72, 0xfffad8e4,
- 0x5b6d84a8, 0x192f0eb7, 0xf08ef92d, 0x044284e6, 0x0116ea22, 0xfe8a67dd, 0x007af7f6, 0xfffa50ce,
- 0x5b5a31c6, 0x18844c70, 0xf09fddfe, 0x0458d6b7, 0x01058306, 0xfe8fc1a5, 0x007b0603, 0xfff9cd12,
- 0x5b444e81, 0x17da4b37, 0xf0b1e143, 0x046e8933, 0x00f43a74, 0xfe952a9b, 0x007b06d4, 0xfff94da9,
- 0x5b2bdc0e, 0x17311222, 0xf0c4fe50, 0x04839c29, 0x00e311a9, 0xfe9aa201, 0x007afaa1, 0xfff8d28c,
- 0x5b10dbc2, 0x1688a832, 0xf0d9306d, 0x04980f79, 0x00d209db, 0xfea02719, 0x007ae1a7, 0xfff85bb1,
- 0x5af34f18, 0x15e11453, 0xf0ee72db, 0x04abe310, 0x00c12439, 0xfea5b926, 0x007abc20, 0xfff7e910,
- 0x5ad337af, 0x153a5d5e, 0xf104c0d2, 0x04bf16e9, 0x00b061eb, 0xfeab576d, 0x007a8a49, 0xfff77a9f,
- 0x5ab09748, 0x14948a16, 0xf11c1583, 0x04d1ab0d, 0x009fc413, 0xfeb10134, 0x007a4c5d, 0xfff71057,
- 0x5a8b6fc7, 0x13efa12c, 0xf1346c17, 0x04e39f93, 0x008f4bcb, 0xfeb6b5c0, 0x007a029a, 0xfff6aa2b,
- 0x5a63c336, 0x134ba937, 0xf14dbfb1, 0x04f4f4a2, 0x007efa29, 0xfebc745c, 0x0079ad3d, 0xfff64812,
- 0x5a3993c0, 0x12a8a8bb, 0xf1680b6e, 0x0505aa6a, 0x006ed038, 0xfec23c50, 0x00794c82, 0xfff5ea02,
- 0x5a0ce3b2, 0x1206a625, 0xf1834a63, 0x0515c12d, 0x005ecf01, 0xfec80ce8, 0x0078e0a9, 0xfff58ff0,
- 0x59ddb57f, 0x1165a7cc, 0xf19f77a0, 0x05253938, 0x004ef782, 0xfecde571, 0x007869ee, 0xfff539cf,
- 0x59ac0bba, 0x10c5b3ef, 0xf1bc8e31, 0x053412e4, 0x003f4ab4, 0xfed3c538, 0x0077e891, 0xfff4e794,
- 0x5977e919, 0x1026d0b8, 0xf1da891b, 0x05424e9b, 0x002fc98a, 0xfed9ab8f, 0x00775ccf, 0xfff49934,
- 0x59415075, 0x0f890437, 0xf1f96360, 0x054feccf, 0x002074ed, 0xfedf97c6, 0x0076c6e8, 0xfff44ea3,
- 0x590844c9, 0x0eec5465, 0xf21917ff, 0x055cee03, 0x00114dc3, 0xfee58932, 0x00762719, 0xfff407d2,
- 0x58ccc930, 0x0e50c723, 0xf239a1ef, 0x056952c3, 0x000254e8, 0xfeeb7f27, 0x00757da3, 0xfff3c4b7,
- 0x588ee0ea, 0x0db6623b, 0xf25afc29, 0x05751baa, 0xfff38b32, 0xfef178fc, 0x0074cac4, 0xfff38542,
- 0x584e8f56, 0x0d1d2b5d, 0xf27d219f, 0x0580495c, 0xffe4f171, 0xfef7760c, 0x00740ebb, 0xfff34968,
- 0x580bd7f4, 0x0c85281f, 0xf2a00d43, 0x058adc8d, 0xffd6886d, 0xfefd75af, 0x007349c7, 0xfff3111b,
- 0x57c6be67, 0x0bee5dff, 0xf2c3ba04, 0x0594d5fa, 0xffc850e6, 0xff037744, 0x00727c27, 0xfff2dc4c,
- 0x577f4670, 0x0b58d262, 0xf2e822ce, 0x059e366c, 0xffba4b98, 0xff097a29, 0x0071a61b, 0xfff2aaef,
- 0x573573f2, 0x0ac48a92, 0xf30d428e, 0x05a6feb9, 0xffac7936, 0xff0f7dbf, 0x0070c7e1, 0xfff27cf3,
- 0x56e94af1, 0x0a318bc1, 0xf333142f, 0x05af2fbf, 0xff9eda6d, 0xff15816a, 0x006fe1b8, 0xfff2524c,
- 0x569acf90, 0x099fdb04, 0xf359929a, 0x05b6ca6b, 0xff916fe1, 0xff1b848e, 0x006ef3df, 0xfff22aea,
- 0x564a0610, 0x090f7d57, 0xf380b8ba, 0x05bdcfb2, 0xff843a32, 0xff218692, 0x006dfe94, 0xfff206bf,
- 0x55f6f2d3, 0x0880779d, 0xf3a88179, 0x05c44095, 0xff7739f7, 0xff2786e1, 0x006d0217, 0xfff1e5bb,
- 0x55a19a5c, 0x07f2ce9b, 0xf3d0e7c2, 0x05ca1e1f, 0xff6a6fc1, 0xff2d84e5, 0x006bfea4, 0xfff1c7d0,
- 0x554a0148, 0x076686fc, 0xf3f9e680, 0x05cf6965, 0xff5ddc1a, 0xff33800e, 0x006af47b, 0xfff1acef,
- 0x54f02c56, 0x06dba551, 0xf42378a0, 0x05d42387, 0xff517f86, 0xff3977cb, 0x0069e3d9, 0xfff19508,
- 0x54942061, 0x06522e0f, 0xf44d9912, 0x05d84daf, 0xff455a80, 0xff3f6b8f, 0x0068ccfa, 0xfff1800b,
- 0x5435e263, 0x05ca258f, 0xf47842c5, 0x05dbe90f, 0xff396d7f, 0xff455acf, 0x0067b01e, 0xfff16de9,
- 0x53d57774, 0x0543900d, 0xf4a370ad, 0x05def6e4, 0xff2db8f2, 0xff4b4503, 0x00668d80, 0xfff15e93,
- 0x5372e4c6, 0x04be71ab, 0xf4cf1dbf, 0x05e17873, 0xff223d40, 0xff5129a3, 0x0065655d, 0xfff151f9,
- 0x530e2fac, 0x043ace6e, 0xf4fb44f4, 0x05e36f0d, 0xff16faca, 0xff57082e, 0x006437f1, 0xfff1480b,
- 0x52a75d90, 0x03b8aa40, 0xf527e149, 0x05e4dc08, 0xff0bf1ed, 0xff5ce021, 0x00630577, 0xfff140b9,
- 0x523e73fd, 0x033808eb, 0xf554edbd, 0x05e5c0c6, 0xff0122fc, 0xff62b0fd, 0x0061ce2c, 0xfff13bf3,
- 0x51d37897, 0x02b8ee22, 0xf5826555, 0x05e61eae, 0xfef68e45, 0xff687a47, 0x00609249, 0xfff139aa,
- 0x5166711c, 0x023b5d76, 0xf5b0431a, 0x05e5f733, 0xfeec340f, 0xff6e3b84, 0x005f520a, 0xfff139cd,
- 0x50f76368, 0x01bf5a5e, 0xf5de8218, 0x05e54bcd, 0xfee2149b, 0xff73f43d, 0x005e0da8, 0xfff13c4c,
- 0x5086556f, 0x0144e834, 0xf60d1d63, 0x05e41dfe, 0xfed83023, 0xff79a3fe, 0x005cc55c, 0xfff14119,
- 0x50134d3e, 0x00cc0a36, 0xf63c1012, 0x05e26f4e, 0xfece86db, 0xff7f4a54, 0x005b7961, 0xfff14821,
- 0x4f9e50ff, 0x0054c382, 0xf66b5544, 0x05e0414d, 0xfec518f1, 0xff84e6d0, 0x005a29ed, 0xfff15156,
- 0x4f2766f2, 0xffdf171b, 0xf69ae81d, 0x05dd9593, 0xfebbe68c, 0xff8a7905, 0x0058d738, 0xfff15ca8,
- 0x4eae9571, 0xff6b07e7, 0xf6cac3c7, 0x05da6dbe, 0xfeb2efcd, 0xff900089, 0x0057817b, 0xfff16a07,
- 0x4e33e2ee, 0xfef898ae, 0xf6fae373, 0x05d6cb72, 0xfeaa34d0, 0xff957cf4, 0x005628ec, 0xfff17962,
- 0x4db755f3, 0xfe87cc1b, 0xf72b425b, 0x05d2b05c, 0xfea1b5a9, 0xff9aede0, 0x0054cdc0, 0xfff18aab,
- 0x4d38f520, 0xfe18a4bc, 0xf75bdbbd, 0x05ce1e2d, 0xfe997268, 0xffa052ec, 0x0053702d, 0xfff19dd1,
- 0x4cb8c72e, 0xfdab2501, 0xf78caae0, 0x05c9169d, 0xfe916b15, 0xffa5abb8, 0x00521068, 0xfff1b2c5,
- 0x4c36d2eb, 0xfd3f4f3d, 0xf7bdab16, 0x05c39b6a, 0xfe899fb2, 0xffaaf7e6, 0x0050aea5, 0xfff1c976,
- 0x4bb31f3c, 0xfcd525a5, 0xf7eed7b4, 0x05bdae57, 0xfe82103f, 0xffb0371c, 0x004f4b17, 0xfff1e1d6,
- 0x4b2db31a, 0xfc6caa53, 0xf8202c1c, 0x05b7512e, 0xfe7abcb1, 0xffb56902, 0x004de5f1, 0xfff1fbd5,
- 0x4aa69594, 0xfc05df40, 0xf851a3b6, 0x05b085bc, 0xfe73a4fb, 0xffba8d44, 0x004c7f66, 0xfff21764,
- 0x4a1dcdce, 0xfba0c64b, 0xf88339f5, 0x05a94dd5, 0xfe6cc909, 0xffbfa38d, 0x004b17a6, 0xfff23473,
- 0x499362ff, 0xfb3d6133, 0xf8b4ea55, 0x05a1ab52, 0xfe6628c1, 0xffc4ab8f, 0x0049aee3, 0xfff252f3,
- 0x49075c72, 0xfadbb19a, 0xf8e6b059, 0x0599a00e, 0xfe5fc405, 0xffc9a4fc, 0x0048454b, 0xfff272d6,
- 0x4879c185, 0xfa7bb908, 0xf9188793, 0x05912dea, 0xfe599aaf, 0xffce8f8a, 0x0046db0f, 0xfff2940b,
- 0x47ea99a9, 0xfa1d78e3, 0xf94a6b9b, 0x058856cd, 0xfe53ac97, 0xffd36af1, 0x0045705c, 0xfff2b686,
- 0x4759ec60, 0xf9c0f276, 0xf97c5815, 0x057f1c9e, 0xfe4df98e, 0xffd836eb, 0x00440561, 0xfff2da36,
- 0x46c7c140, 0xf96626f0, 0xf9ae48af, 0x0575814c, 0xfe48815e, 0xffdcf336, 0x00429a4a, 0xfff2ff0d,
- 0x46341fed, 0xf90d1761, 0xf9e03924, 0x056b86c6, 0xfe4343d0, 0xffe19f91, 0x00412f43, 0xfff324fd,
- 0x459f101d, 0xf8b5c4be, 0xfa122537, 0x05612f00, 0xfe3e40a6, 0xffe63bc0, 0x003fc478, 0xfff34bf9,
- 0x45089996, 0xf8602fdc, 0xfa4408ba, 0x05567bf1, 0xfe39779a, 0xffeac787, 0x003e5a12, 0xfff373f0,
- 0x4470c42d, 0xf80c5977, 0xfa75df87, 0x054b6f92, 0xfe34e867, 0xffef42af, 0x003cf03d, 0xfff39cd7,
- 0x43d797c7, 0xf7ba422b, 0xfaa7a586, 0x05400be1, 0xfe3092bf, 0xfff3ad01, 0x003b871f, 0xfff3c69f,
- 0x433d1c56, 0xf769ea78, 0xfad956ab, 0x053452dc, 0xfe2c7650, 0xfff8064b, 0x003a1ee3, 0xfff3f13a,
- 0x42a159dc, 0xf71b52c4, 0xfb0aeef6, 0x05284685, 0xfe2892c5, 0xfffc4e5c, 0x0038b7ae, 0xfff41c9c,
- 0x42045865, 0xf6ce7b57, 0xfb3c6a73, 0x051be8dd, 0xfe24e7c3, 0x00008507, 0x003751a7, 0xfff448b7,
- 0x4166200e, 0xf683645a, 0xfb6dc53c, 0x050f3bec, 0xfe2174ec, 0x0004aa1f, 0x0035ecf4, 0xfff4757e,
- 0x40c6b8fd, 0xf63a0ddf, 0xfb9efb77, 0x050241b6, 0xfe1e39da, 0x0008bd7c, 0x003489b9, 0xfff4a2e5,
- 0x40262b65, 0xf5f277d9, 0xfbd00956, 0x04f4fc46, 0xfe1b3628, 0x000cbef7, 0x0033281a, 0xfff4d0de,
- 0x3f847f83, 0xf5aca21f, 0xfc00eb1b, 0x04e76da3, 0xfe18696a, 0x0010ae6e, 0x0031c83a, 0xfff4ff5d,
- 0x3ee1bda2, 0xf5688c6d, 0xfc319d13, 0x04d997d8, 0xfe15d32f, 0x00148bbd, 0x00306a3b, 0xfff52e57,
- 0x3e3dee13, 0xf5263665, 0xfc621b9a, 0x04cb7cf2, 0xfe137304, 0x001856c7, 0x002f0e3f, 0xfff55dbf,
- 0x3d991932, 0xf4e59f8a, 0xfc926319, 0x04bd1efb, 0xfe114872, 0x001c0f6e, 0x002db466, 0xfff58d89,
- 0x3cf34766, 0xf4a6c748, 0xfcc27008, 0x04ae8000, 0xfe0f52fc, 0x001fb599, 0x002c5cd0, 0xfff5bdaa,
- 0x3c4c811c, 0xf469aced, 0xfcf23eec, 0x049fa20f, 0xfe0d9224, 0x0023492f, 0x002b079a, 0xfff5ee17,
- 0x3ba4cec9, 0xf42e4faf, 0xfd21cc59, 0x04908733, 0xfe0c0567, 0x0026ca1c, 0x0029b4e4, 0xfff61ec5,
- 0x3afc38eb, 0xf3f4aea6, 0xfd5114f0, 0x0481317a, 0xfe0aac3f, 0x002a384c, 0x002864c9, 0xfff64fa8,
- 0x3a52c805, 0xf3bcc8d3, 0xfd801564, 0x0471a2ef, 0xfe098622, 0x002d93ae, 0x00271766, 0xfff680b5,
- 0x39a884a1, 0xf3869d1a, 0xfdaeca73, 0x0461dda0, 0xfe089283, 0x0030dc34, 0x0025ccd7, 0xfff6b1e4,
- 0x38fd774e, 0xf3522a49, 0xfddd30eb, 0x0451e396, 0xfe07d0d3, 0x003411d2, 0x00248535, 0xfff6e329,
- 0x3851a8a2, 0xf31f6f0f, 0xfe0b45aa, 0x0441b6dd, 0xfe07407d, 0x0037347d, 0x0023409a, 0xfff7147a,
- 0x37a52135, 0xf2ee6a07, 0xfe39059b, 0x0431597d, 0xfe06e0eb, 0x003a442e, 0x0021ff1f, 0xfff745cd,
- 0x36f7e9a4, 0xf2bf19ae, 0xfe666dbc, 0x0420cd80, 0xfe06b184, 0x003d40e0, 0x0020c0dc, 0xfff7771a,
- 0x364a0a90, 0xf2917c6d, 0xfe937b15, 0x041014eb, 0xfe06b1ac, 0x00402a8e, 0x001f85e6, 0xfff7a857,
- 0x359b8c9d, 0xf265908f, 0xfec02ac2, 0x03ff31c3, 0xfe06e0c4, 0x00430137, 0x001e4e56, 0xfff7d97a,
- 0x34ec786f, 0xf23b544b, 0xfeec79ec, 0x03ee260d, 0xfe073e2a, 0x0045c4dd, 0x001d1a3f, 0xfff80a7c,
- 0x343cd6af, 0xf212c5be, 0xff1865cd, 0x03dcf3ca, 0xfe07c93a, 0x00487582, 0x001be9b7, 0xfff83b52,
- 0x338cb004, 0xf1ebe2ec, 0xff43ebac, 0x03cb9cf9, 0xfe08814e, 0x004b132b, 0x001abcd0, 0xfff86bf6,
- 0x32dc0d17, 0xf1c6a9c3, 0xff6f08e4, 0x03ba2398, 0xfe0965bc, 0x004d9dde, 0x0019939d, 0xfff89c60,
- 0x322af693, 0xf1a3181a, 0xff99badb, 0x03a889a1, 0xfe0a75da, 0x005015a5, 0x00186e31, 0xfff8cc86,
- 0x3179751f, 0xf1812bb0, 0xffc3ff0c, 0x0396d10c, 0xfe0bb0f9, 0x00527a8a, 0x00174c9c, 0xfff8fc62,
- 0x30c79163, 0xf160e22d, 0xffedd2fd, 0x0384fbd1, 0xfe0d166b, 0x0054cc9a, 0x00162eef, 0xfff92bec,
- 0x30155404, 0xf1423924, 0x00173447, 0x03730be0, 0xfe0ea57e, 0x00570be4, 0x00151538, 0xfff95b1e,
- 0x2f62c5a7, 0xf1252e0f, 0x00402092, 0x0361032a, 0xfe105d7e, 0x00593877, 0x0013ff88, 0xfff989ef,
- 0x2eafeeed, 0xf109be56, 0x00689598, 0x034ee39b, 0xfe123db6, 0x005b5267, 0x0012edea, 0xfff9b85b,
- 0x2dfcd873, 0xf0efe748, 0x0090911f, 0x033caf1d, 0xfe144570, 0x005d59c6, 0x0011e06d, 0xfff9e65a,
- 0x2d498ad3, 0xf0d7a622, 0x00b81102, 0x032a6796, 0xfe1673f2, 0x005f4eac, 0x0010d71d, 0xfffa13e5,
- 0x2c960ea3, 0xf0c0f808, 0x00df1328, 0x03180ee7, 0xfe18c884, 0x0061312e, 0x000fd205, 0xfffa40f8,
- 0x2be26c73, 0xf0abda0e, 0x0105958c, 0x0305a6f0, 0xfe1b4268, 0x00630167, 0x000ed130, 0xfffa6d8d,
- 0x2b2eaccf, 0xf0984931, 0x012b9635, 0x02f3318a, 0xfe1de0e2, 0x0064bf71, 0x000dd4a7, 0xfffa999d,
- 0x2a7ad83c, 0xf086425a, 0x0151133e, 0x02e0b08d, 0xfe20a335, 0x00666b68, 0x000cdc74, 0xfffac525,
- 0x29c6f738, 0xf075c260, 0x01760ad1, 0x02ce25ca, 0xfe2388a1, 0x0068056b, 0x000be89f, 0xfffaf01e,
- 0x2913123c, 0xf066c606, 0x019a7b27, 0x02bb9310, 0xfe269065, 0x00698d98, 0x000af931, 0xfffb1a84,
- 0x285f31b7, 0xf05949fb, 0x01be628c, 0x02a8fa2a, 0xfe29b9c1, 0x006b0411, 0x000a0e2f, 0xfffb4453,
- 0x27ab5e12, 0xf04d4ade, 0x01e1bf58, 0x02965cdb, 0xfe2d03f2, 0x006c68f8, 0x000927a0, 0xfffb6d86,
- 0x26f79fab, 0xf042c539, 0x02048ff8, 0x0283bce6, 0xfe306e35, 0x006dbc71, 0x00084589, 0xfffb961a,
- 0x2643feda, 0xf039b587, 0x0226d2e6, 0x02711c05, 0xfe33f7c7, 0x006efea0, 0x000767f0, 0xfffbbe09,
- 0x259083eb, 0xf032182f, 0x024886ad, 0x025e7bf0, 0xfe379fe3, 0x00702fae, 0x00068ed8, 0xfffbe552,
- 0x24dd3721, 0xf02be98a, 0x0269a9e9, 0x024bde5a, 0xfe3b65c4, 0x00714fc0, 0x0005ba46, 0xfffc0bef,
- 0x242a20b3, 0xf02725dc, 0x028a3b44, 0x023944ee, 0xfe3f48a5, 0x00725f02, 0x0004ea3a, 0xfffc31df,
- 0x237748cf, 0xf023c95d, 0x02aa397b, 0x0226b156, 0xfe4347c0, 0x00735d9c, 0x00041eb9, 0xfffc571e,
- 0x22c4b795, 0xf021d031, 0x02c9a359, 0x02142533, 0xfe476250, 0x00744bba, 0x000357c2, 0xfffc7ba9,
- 0x2212751a, 0xf0213671, 0x02e877b9, 0x0201a223, 0xfe4b978e, 0x0075298a, 0x00029558, 0xfffc9f7e,
- 0x21608968, 0xf021f823, 0x0306b586, 0x01ef29be, 0xfe4fe6b3, 0x0075f739, 0x0001d779, 0xfffcc29a,
- 0x20aefc79, 0xf0241140, 0x03245bbc, 0x01dcbd96, 0xfe544efb, 0x0076b4f5, 0x00011e26, 0xfffce4fc,
- 0x1ffdd63b, 0xf0277db1, 0x03416966, 0x01ca5f37, 0xfe58cf9d, 0x007762f0, 0x0000695e, 0xfffd06a1,
- 0x1f4d1e8e, 0xf02c3953, 0x035ddd9e, 0x01b81028, 0xfe5d67d4, 0x0078015a, 0xffffb91f, 0xfffd2787,
- 0x1e9cdd43, 0xf0323ff5, 0x0379b790, 0x01a5d1ea, 0xfe6216db, 0x00789065, 0xffff0d66, 0xfffd47ae,
- 0x1ded1a1d, 0xf0398d56, 0x0394f674, 0x0193a5f9, 0xfe66dbeb, 0x00791043, 0xfffe6631, 0xfffd6713,
diff --git a/services/audioflinger/AudioResamplerSincUp.h b/services/audioflinger/AudioResamplerSincUp.h
deleted file mode 100644
index fd5367e..0000000
--- a/services/audioflinger/AudioResamplerSincUp.h
+++ /dev/null
@@ -1,131 +0,0 @@
-// cmd-line: fir -l 7 -s48000 -c 20478
-
- 0x6d374bc7, 0x111c6ba0, 0xf3240e61, 0x07d14a38, 0xfc509e64, 0x0139cee9, 0xffc8c866, 0xfffcc300,
- 0x6d35278a, 0x103e8192, 0xf36b9dfd, 0x07bdfaa5, 0xfc5102d0, 0x013d618d, 0xffc663b9, 0xfffd9592,
- 0x6d2ebafe, 0x0f62811a, 0xf3b3d8ac, 0x07a9f399, 0xfc51d9a6, 0x0140bea5, 0xffc41212, 0xfffe631e,
- 0x6d24069d, 0x0e8875ad, 0xf3fcb43e, 0x07953976, 0xfc53216f, 0x0143e67c, 0xffc1d373, 0xffff2b9f,
- 0x6d150b35, 0x0db06a89, 0xf4462690, 0x077fd0ac, 0xfc54d8ae, 0x0146d965, 0xffbfa7d9, 0xffffef10,
- 0x6d01c9e3, 0x0cda6ab5, 0xf4902587, 0x0769bdaf, 0xfc56fdda, 0x014997bb, 0xffbd8f40, 0x0000ad6e,
- 0x6cea4418, 0x0c0680fe, 0xf4daa718, 0x07530501, 0xfc598f60, 0x014c21db, 0xffbb89a1, 0x000166b6,
- 0x6cce7b97, 0x0b34b7f5, 0xf525a143, 0x073bab28, 0xfc5c8ba5, 0x014e782a, 0xffb996f3, 0x00021ae5,
- 0x6cae7272, 0x0a6519f4, 0xf5710a17, 0x0723b4b4, 0xfc5ff105, 0x01509b14, 0xffb7b728, 0x0002c9fd,
- 0x6c8a2b0f, 0x0997b116, 0xf5bcd7b1, 0x070b2639, 0xfc63bdd3, 0x01528b08, 0xffb5ea31, 0x000373fb,
- 0x6c61a823, 0x08cc873c, 0xf609003f, 0x06f20453, 0xfc67f05a, 0x0154487b, 0xffb42ffc, 0x000418e2,
- 0x6c34ecb5, 0x0803a60a, 0xf6557a00, 0x06d853a2, 0xfc6c86dd, 0x0155d3e8, 0xffb28876, 0x0004b8b3,
- 0x6c03fc1c, 0x073d16e7, 0xf6a23b44, 0x06be18cd, 0xfc717f97, 0x01572dcf, 0xffb0f388, 0x00055371,
- 0x6bced9ff, 0x0678e2fc, 0xf6ef3a6e, 0x06a3587e, 0xfc76d8bc, 0x015856b6, 0xffaf7118, 0x0005e921,
- 0x6b958a54, 0x05b71332, 0xf73c6df4, 0x06881761, 0xfc7c9079, 0x01594f25, 0xffae010b, 0x000679c5,
- 0x6b581163, 0x04f7b037, 0xf789cc61, 0x066c5a27, 0xfc82a4f4, 0x015a17ab, 0xffaca344, 0x00070564,
- 0x6b1673c1, 0x043ac276, 0xf7d74c53, 0x06502583, 0xfc89144d, 0x015ab0db, 0xffab57a1, 0x00078c04,
- 0x6ad0b652, 0x0380521c, 0xf824e480, 0x06337e2a, 0xfc8fdc9f, 0x015b1b4e, 0xffaa1e02, 0x00080dab,
- 0x6a86de48, 0x02c86715, 0xf8728bb3, 0x061668d2, 0xfc96fbfc, 0x015b579e, 0xffa8f641, 0x00088a62,
- 0x6a38f123, 0x0213090c, 0xf8c038d0, 0x05f8ea30, 0xfc9e7074, 0x015b666c, 0xffa7e039, 0x00090230,
- 0x69e6f4b1, 0x01603f6e, 0xf90de2d1, 0x05db06fc, 0xfca63810, 0x015b485b, 0xffa6dbc0, 0x0009751e,
- 0x6990ef0b, 0x00b01162, 0xf95b80cb, 0x05bcc3ed, 0xfcae50d6, 0x015afe14, 0xffa5e8ad, 0x0009e337,
- 0x6936e697, 0x000285d0, 0xf9a909ea, 0x059e25b5, 0xfcb6b8c4, 0x015a8843, 0xffa506d2, 0x000a4c85,
- 0x68d8e206, 0xff57a35e, 0xf9f67577, 0x057f310a, 0xfcbf6dd8, 0x0159e796, 0xffa43603, 0x000ab112,
- 0x6876e855, 0xfeaf706f, 0xfa43bad2, 0x055fea9d, 0xfcc86e09, 0x01591cc0, 0xffa3760e, 0x000b10ec,
- 0x681100c9, 0xfe09f323, 0xfa90d17b, 0x0540571a, 0xfcd1b74c, 0x01582878, 0xffa2c6c2, 0x000b6c1d,
- 0x67a732f4, 0xfd673159, 0xfaddb10c, 0x05207b2f, 0xfcdb4793, 0x01570b77, 0xffa227ec, 0x000bc2b3,
- 0x673986ac, 0xfcc730aa, 0xfb2a513b, 0x05005b82, 0xfce51ccb, 0x0155c678, 0xffa19957, 0x000c14bb,
- 0x66c80413, 0xfc29f670, 0xfb76a9dd, 0x04dffcb6, 0xfcef34e1, 0x01545a3c, 0xffa11acb, 0x000c6244,
- 0x6652b392, 0xfb8f87bd, 0xfbc2b2e4, 0x04bf6369, 0xfcf98dbe, 0x0152c783, 0xffa0ac11, 0x000cab5c,
- 0x65d99dd5, 0xfaf7e963, 0xfc0e6461, 0x049e9433, 0xfd04254a, 0x01510f13, 0xffa04cf0, 0x000cf012,
- 0x655ccbd3, 0xfa631fef, 0xfc59b685, 0x047d93a8, 0xfd0ef969, 0x014f31b2, 0xff9ffd2c, 0x000d3075,
- 0x64dc46c3, 0xf9d12fab, 0xfca4a19f, 0x045c6654, 0xfd1a0801, 0x014d3029, 0xff9fbc89, 0x000d6c97,
- 0x64581823, 0xf9421c9d, 0xfcef1e20, 0x043b10bd, 0xfd254ef4, 0x014b0b45, 0xff9f8ac9, 0x000da486,
- 0x63d049b4, 0xf8b5ea87, 0xfd392498, 0x04199760, 0xfd30cc24, 0x0148c3d2, 0xff9f67ae, 0x000dd854,
- 0x6344e578, 0xf82c9ce7, 0xfd82adba, 0x03f7feb4, 0xfd3c7d73, 0x01465a9f, 0xff9f52f7, 0x000e0812,
- 0x62b5f5b2, 0xf7a636fa, 0xfdcbb25a, 0x03d64b27, 0xfd4860c2, 0x0143d07f, 0xff9f4c65, 0x000e33d3,
- 0x622384e8, 0xf722bbb5, 0xfe142b6e, 0x03b4811d, 0xfd5473f3, 0x01412643, 0xff9f53b4, 0x000e5ba7,
- 0x618d9ddc, 0xf6a22dcf, 0xfe5c120f, 0x0392a4f4, 0xfd60b4e7, 0x013e5cc0, 0xff9f68a1, 0x000e7fa1,
- 0x60f44b91, 0xf6248fb6, 0xfea35f79, 0x0370bafc, 0xfd6d2180, 0x013b74ca, 0xff9f8ae9, 0x000e9fd5,
- 0x60579947, 0xf5a9e398, 0xfeea0d0c, 0x034ec77f, 0xfd79b7a1, 0x01386f3a, 0xff9fba47, 0x000ebc54,
- 0x5fb79278, 0xf5322b61, 0xff30144a, 0x032ccebb, 0xfd86752e, 0x01354ce7, 0xff9ff674, 0x000ed533,
- 0x5f1442dc, 0xf4bd68b6, 0xff756edc, 0x030ad4e1, 0xfd93580d, 0x01320ea9, 0xffa03f2b, 0x000eea84,
- 0x5e6db665, 0xf44b9cfe, 0xffba168d, 0x02e8de19, 0xfda05e23, 0x012eb55a, 0xffa09425, 0x000efc5c,
- 0x5dc3f93c, 0xf3dcc959, 0xfffe054e, 0x02c6ee7f, 0xfdad855b, 0x012b41d3, 0xffa0f519, 0x000f0ace,
- 0x5d1717c4, 0xf370eea9, 0x00413536, 0x02a50a22, 0xfdbacb9e, 0x0127b4f1, 0xffa161bf, 0x000f15ef,
- 0x5c671e96, 0xf3080d8c, 0x0083a081, 0x02833506, 0xfdc82edb, 0x01240f8e, 0xffa1d9cf, 0x000f1dd2,
- 0x5bb41a80, 0xf2a2265e, 0x00c54190, 0x02617321, 0xfdd5ad01, 0x01205285, 0xffa25cfe, 0x000f228d,
- 0x5afe1886, 0xf23f393b, 0x010612eb, 0x023fc85c, 0xfde34403, 0x011c7eb2, 0xffa2eb04, 0x000f2434,
- 0x5a4525df, 0xf1df45fd, 0x01460f41, 0x021e3891, 0xfdf0f1d6, 0x011894f0, 0xffa38395, 0x000f22dc,
- 0x59894ff3, 0xf1824c3e, 0x01853165, 0x01fcc78f, 0xfdfeb475, 0x0114961b, 0xffa42668, 0x000f1e99,
- 0x58caa45b, 0xf1284b58, 0x01c37452, 0x01db7914, 0xfe0c89db, 0x0110830f, 0xffa4d332, 0x000f1781,
- 0x580930e1, 0xf0d14267, 0x0200d32c, 0x01ba50d2, 0xfe1a7009, 0x010c5ca6, 0xffa589a6, 0x000f0da8,
- 0x5745037c, 0xf07d3043, 0x023d493c, 0x0199526b, 0xfe286505, 0x010823ba, 0xffa6497c, 0x000f0125,
- 0x567e2a51, 0xf02c138a, 0x0278d1f2, 0x01788170, 0xfe3666d5, 0x0103d927, 0xffa71266, 0x000ef20b,
- 0x55b4b3af, 0xefddea9a, 0x02b368e6, 0x0157e166, 0xfe447389, 0x00ff7dc4, 0xffa7e41a, 0x000ee070,
- 0x54e8ae13, 0xef92b393, 0x02ed09d7, 0x013775bf, 0xfe528931, 0x00fb126b, 0xffa8be4c, 0x000ecc69,
- 0x541a281e, 0xef4a6c58, 0x0325b0ad, 0x011741df, 0xfe60a5e5, 0x00f697f3, 0xffa9a0b1, 0x000eb60b,
- 0x5349309e, 0xef051290, 0x035d5977, 0x00f7491a, 0xfe6ec7c0, 0x00f20f32, 0xffaa8afe, 0x000e9d6b,
- 0x5275d684, 0xeec2a3a3, 0x0394006a, 0x00d78eb3, 0xfe7cece2, 0x00ed78ff, 0xffab7ce7, 0x000e829e,
- 0x51a028e8, 0xee831cc3, 0x03c9a1e5, 0x00b815da, 0xfe8b1373, 0x00e8d62d, 0xffac7621, 0x000e65ba,
- 0x50c83704, 0xee467ae1, 0x03fe3a6f, 0x0098e1b3, 0xfe99399f, 0x00e4278f, 0xffad7662, 0x000e46d3,
- 0x4fee1037, 0xee0cbab9, 0x0431c6b5, 0x0079f54c, 0xfea75d97, 0x00df6df7, 0xffae7d5f, 0x000e25fd,
- 0x4f11c3fe, 0xedd5d8ca, 0x0464438c, 0x005b53a4, 0xfeb57d92, 0x00daaa34, 0xffaf8acd, 0x000e034f,
- 0x4e3361f7, 0xeda1d15c, 0x0495adf2, 0x003cffa9, 0xfec397cf, 0x00d5dd16, 0xffb09e63, 0x000ddedb,
- 0x4d52f9df, 0xed70a07d, 0x04c6030d, 0x001efc35, 0xfed1aa92, 0x00d10769, 0xffb1b7d8, 0x000db8b7,
- 0x4c709b8e, 0xed424205, 0x04f54029, 0x00014c12, 0xfedfb425, 0x00cc29f7, 0xffb2d6e1, 0x000d90f6,
- 0x4b8c56f8, 0xed16b196, 0x052362ba, 0xffe3f1f7, 0xfeedb2da, 0x00c7458a, 0xffb3fb37, 0x000d67ae,
- 0x4aa63c2c, 0xecedea99, 0x0550685d, 0xffc6f08a, 0xfefba508, 0x00c25ae8, 0xffb52490, 0x000d3cf1,
- 0x49be5b50, 0xecc7e845, 0x057c4ed4, 0xffaa4a5d, 0xff09890f, 0x00bd6ad7, 0xffb652a7, 0x000d10d5,
- 0x48d4c4a2, 0xeca4a59b, 0x05a7140b, 0xff8e01f1, 0xff175d53, 0x00b87619, 0xffb78533, 0x000ce36b,
- 0x47e98874, 0xec841d68, 0x05d0b612, 0xff7219b3, 0xff252042, 0x00b37d70, 0xffb8bbed, 0x000cb4c8,
- 0x46fcb72d, 0xec664a48, 0x05f93324, 0xff5693fe, 0xff32d04f, 0x00ae8198, 0xffb9f691, 0x000c84ff,
- 0x460e6148, 0xec4b26a2, 0x0620899e, 0xff3b731b, 0xff406bf8, 0x00a9834e, 0xffbb34d8, 0x000c5422,
- 0x451e9750, 0xec32acb0, 0x0646b808, 0xff20b93e, 0xff4df1be, 0x00a4834c, 0xffbc767f, 0x000c2245,
- 0x442d69de, 0xec1cd677, 0x066bbd0d, 0xff066889, 0xff5b602c, 0x009f8249, 0xffbdbb42, 0x000bef79,
- 0x433ae99c, 0xec099dcf, 0x068f9781, 0xfeec830d, 0xff68b5d5, 0x009a80f8, 0xffbf02dd, 0x000bbbd2,
- 0x4247273f, 0xebf8fc64, 0x06b2465b, 0xfed30ac5, 0xff75f153, 0x0095800c, 0xffc04d0f, 0x000b8760,
- 0x41523389, 0xebeaebaf, 0x06d3c8bb, 0xfeba0199, 0xff831148, 0x00908034, 0xffc19996, 0x000b5235,
- 0x405c1f43, 0xebdf6500, 0x06f41de3, 0xfea16960, 0xff90145e, 0x008b821b, 0xffc2e832, 0x000b1c64,
- 0x3f64fb40, 0xebd6617b, 0x0713453d, 0xfe8943dc, 0xff9cf947, 0x0086866b, 0xffc438a3, 0x000ae5fc,
- 0x3e6cd85b, 0xebcfda19, 0x07313e56, 0xfe7192bd, 0xffa9bebe, 0x00818dcb, 0xffc58aaa, 0x000aaf0f,
- 0x3d73c772, 0xebcbc7a7, 0x074e08e0, 0xfe5a579d, 0xffb66386, 0x007c98de, 0xffc6de09, 0x000a77ac,
- 0x3c79d968, 0xebca22cc, 0x0769a4b2, 0xfe439407, 0xffc2e669, 0x0077a845, 0xffc83285, 0x000a3fe5,
- 0x3b7f1f23, 0xebcae405, 0x078411c7, 0xfe2d496f, 0xffcf463a, 0x0072bc9d, 0xffc987e0, 0x000a07c9,
- 0x3a83a989, 0xebce03aa, 0x079d503b, 0xfe177937, 0xffdb81d6, 0x006dd680, 0xffcadde1, 0x0009cf67,
- 0x3987897f, 0xebd379eb, 0x07b56051, 0xfe0224b0, 0xffe79820, 0x0068f687, 0xffcc344c, 0x000996ce,
- 0x388acfe9, 0xebdb3ed5, 0x07cc426c, 0xfded4d13, 0xfff38806, 0x00641d44, 0xffcd8aeb, 0x00095e0e,
- 0x378d8da8, 0xebe54a4f, 0x07e1f712, 0xfdd8f38b, 0xffff507b, 0x005f4b4a, 0xffcee183, 0x00092535,
- 0x368fd397, 0xebf1941f, 0x07f67eec, 0xfdc5192d, 0x000af07f, 0x005a8125, 0xffd037e0, 0x0008ec50,
- 0x3591b28b, 0xec0013e8, 0x0809dac3, 0xfdb1befc, 0x00166718, 0x0055bf60, 0xffd18dcc, 0x0008b36e,
- 0x34933b50, 0xec10c12c, 0x081c0b84, 0xfd9ee5e7, 0x0021b355, 0x00510682, 0xffd2e311, 0x00087a9c,
- 0x33947eab, 0xec23934f, 0x082d1239, 0xfd8c8ecc, 0x002cd44d, 0x004c570f, 0xffd4377d, 0x000841e8,
- 0x32958d55, 0xec388194, 0x083cf010, 0xfd7aba74, 0x0037c922, 0x0047b186, 0xffd58ade, 0x0008095d,
- 0x319677fa, 0xec4f8322, 0x084ba654, 0xfd696998, 0x004290fc, 0x00431666, 0xffd6dd02, 0x0007d108,
- 0x30974f3b, 0xec688f02, 0x08593671, 0xfd589cdc, 0x004d2b0e, 0x003e8628, 0xffd82dba, 0x000798f5,
- 0x2f9823a8, 0xec839c22, 0x0865a1f1, 0xfd4854d3, 0x00579691, 0x003a0141, 0xffd97cd6, 0x00076130,
- 0x2e9905c1, 0xeca0a156, 0x0870ea7e, 0xfd3891fd, 0x0061d2ca, 0x00358824, 0xffdaca2a, 0x000729c4,
- 0x2d9a05f4, 0xecbf9558, 0x087b11de, 0xfd2954c8, 0x006bdf05, 0x00311b41, 0xffdc1588, 0x0006f2bb,
- 0x2c9b349e, 0xece06ecb, 0x088419f6, 0xfd1a9d91, 0x0075ba95, 0x002cbb03, 0xffdd5ec6, 0x0006bc21,
- 0x2b9ca203, 0xed032439, 0x088c04c8, 0xfd0c6ca2, 0x007f64da, 0x002867d2, 0xffdea5bb, 0x000685ff,
- 0x2a9e5e57, 0xed27ac16, 0x0892d470, 0xfcfec233, 0x0088dd38, 0x00242213, 0xffdfea3c, 0x0006505f,
- 0x29a079b2, 0xed4dfcc2, 0x08988b2a, 0xfcf19e6b, 0x0092231e, 0x001fea27, 0xffe12c22, 0x00061b4b,
- 0x28a30416, 0xed760c88, 0x089d2b4a, 0xfce50161, 0x009b3605, 0x001bc06b, 0xffe26b48, 0x0005e6cb,
- 0x27a60d6a, 0xed9fd1a2, 0x08a0b740, 0xfcd8eb17, 0x00a4156b, 0x0017a53b, 0xffe3a788, 0x0005b2e8,
- 0x26a9a57b, 0xedcb4237, 0x08a33196, 0xfccd5b82, 0x00acc0da, 0x001398ec, 0xffe4e0bf, 0x00057faa,
- 0x25addbf9, 0xedf8545b, 0x08a49cf0, 0xfcc25285, 0x00b537e1, 0x000f9bd2, 0xffe616c8, 0x00054d1a,
- 0x24b2c075, 0xee26fe17, 0x08a4fc0d, 0xfcb7cff0, 0x00bd7a1c, 0x000bae3c, 0xffe74984, 0x00051b3e,
- 0x23b86263, 0xee573562, 0x08a451c0, 0xfcadd386, 0x00c5872a, 0x0007d075, 0xffe878d3, 0x0004ea1d,
- 0x22bed116, 0xee88f026, 0x08a2a0f8, 0xfca45cf7, 0x00cd5eb7, 0x000402c8, 0xffe9a494, 0x0004b9c0,
- 0x21c61bc0, 0xeebc2444, 0x089fecbb, 0xfc9b6be5, 0x00d50075, 0x00004579, 0xffeaccaa, 0x00048a2b,
- 0x20ce516f, 0xeef0c78d, 0x089c3824, 0xfc92ffe1, 0x00dc6c1e, 0xfffc98c9, 0xffebf0fa, 0x00045b65,
- 0x1fd7810f, 0xef26cfca, 0x08978666, 0xfc8b186d, 0x00e3a175, 0xfff8fcf7, 0xffed1166, 0x00042d74,
- 0x1ee1b965, 0xef5e32bd, 0x0891dac8, 0xfc83b4fc, 0x00eaa045, 0xfff5723d, 0xffee2dd7, 0x0004005e,
- 0x1ded0911, 0xef96e61c, 0x088b38a9, 0xfc7cd4f0, 0x00f16861, 0xfff1f8d2, 0xffef4632, 0x0003d426,
- 0x1cf97e8b, 0xefd0df9a, 0x0883a378, 0xfc76779e, 0x00f7f9a3, 0xffee90eb, 0xfff05a60, 0x0003a8d2,
- 0x1c072823, 0xf00c14e1, 0x087b1ebc, 0xfc709c4d, 0x00fe53ef, 0xffeb3ab8, 0xfff16a4a, 0x00037e65,
- 0x1b1613ff, 0xf0487b98, 0x0871ae0d, 0xfc6b4233, 0x0104772e, 0xffe7f666, 0xfff275db, 0x000354e5,
- 0x1a26501b, 0xf0860962, 0x08675516, 0xfc66687a, 0x010a6353, 0xffe4c41e, 0xfff37d00, 0x00032c54,
- 0x1937ea47, 0xf0c4b3e0, 0x085c1794, 0xfc620e3d, 0x01101858, 0xffe1a408, 0xfff47fa5, 0x000304b7,
- 0x184af025, 0xf10470b0, 0x084ff957, 0xfc5e328c, 0x0115963d, 0xffde9646, 0xfff57db8, 0x0002de0e,
- 0x175f6f2b, 0xf1453571, 0x0842fe3d, 0xfc5ad465, 0x011add0b, 0xffdb9af8, 0xfff67729, 0x0002b85f,
- 0x1675749e, 0xf186f7c0, 0x08352a35, 0xfc57f2be, 0x011fecd3, 0xffd8b23b, 0xfff76be9, 0x000293aa,
- 0x158d0d95, 0xf1c9ad40, 0x0826813e, 0xfc558c7c, 0x0124c5ab, 0xffd5dc28, 0xfff85be8, 0x00026ff2,
- 0x14a646f6, 0xf20d4b92, 0x08170767, 0xfc53a07b, 0x012967b1, 0xffd318d6, 0xfff9471b, 0x00024d39,
- 0x13c12d73, 0xf251c85d, 0x0806c0cb, 0xfc522d88, 0x012dd30a, 0xffd06858, 0xfffa2d74, 0x00022b7f,
- 0x12ddcd8f, 0xf297194d, 0x07f5b193, 0xfc513266, 0x013207e4, 0xffcdcabe, 0xfffb0ee9, 0x00020ac7,
- 0x11fc3395, 0xf2dd3411, 0x07e3ddf7, 0xfc50adcc, 0x01360670, 0xffcb4014, 0xfffbeb70, 0x0001eb10,
- 0x111c6ba0, 0xf3240e61, 0x07d14a38, 0xfc509e64, 0x0139cee9, 0xffc8c866, 0xfffcc300, 0x0001cc5c,
diff --git a/services/audioflinger/BufferProviders.cpp b/services/audioflinger/BufferProviders.cpp
deleted file mode 100644
index 7c8798c..0000000
--- a/services/audioflinger/BufferProviders.cpp
+++ /dev/null
@@ -1,592 +0,0 @@
-/*
- * Copyright (C) 2015 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#define LOG_TAG "BufferProvider"
-//#define LOG_NDEBUG 0
-
-#include <audio_utils/primitives.h>
-#include <audio_utils/format.h>
-#include <media/audiohal/EffectBufferHalInterface.h>
-#include <media/audiohal/EffectHalInterface.h>
-#include <media/audiohal/EffectsFactoryHalInterface.h>
-#include <media/AudioResamplerPublic.h>
-#include <system/audio_effects/effect_downmix.h>
-
-#include <utils/Log.h>
-
-#include "Configuration.h"
-#include "BufferProviders.h"
-
-#ifndef ARRAY_SIZE
-#define ARRAY_SIZE(x) (sizeof(x)/sizeof((x)[0]))
-#endif
-
-namespace android {
-
-// ----------------------------------------------------------------------------
-
-template <typename T>
-static inline T min(const T& a, const T& b)
-{
- return a < b ? a : b;
-}
-
-CopyBufferProvider::CopyBufferProvider(size_t inputFrameSize,
- size_t outputFrameSize, size_t bufferFrameCount) :
- mInputFrameSize(inputFrameSize),
- mOutputFrameSize(outputFrameSize),
- mLocalBufferFrameCount(bufferFrameCount),
- mLocalBufferData(NULL),
- mConsumed(0)
-{
- ALOGV("CopyBufferProvider(%p)(%zu, %zu, %zu)", this,
- inputFrameSize, outputFrameSize, bufferFrameCount);
- LOG_ALWAYS_FATAL_IF(inputFrameSize < outputFrameSize && bufferFrameCount == 0,
- "Requires local buffer if inputFrameSize(%zu) < outputFrameSize(%zu)",
- inputFrameSize, outputFrameSize);
- if (mLocalBufferFrameCount) {
- (void)posix_memalign(&mLocalBufferData, 32, mLocalBufferFrameCount * mOutputFrameSize);
- }
- mBuffer.frameCount = 0;
-}
-
-CopyBufferProvider::~CopyBufferProvider()
-{
- ALOGV("~CopyBufferProvider(%p)", this);
- if (mBuffer.frameCount != 0) {
- mTrackBufferProvider->releaseBuffer(&mBuffer);
- }
- free(mLocalBufferData);
-}
-
-status_t CopyBufferProvider::getNextBuffer(AudioBufferProvider::Buffer *pBuffer)
-{
- //ALOGV("CopyBufferProvider(%p)::getNextBuffer(%p (%zu))",
- // this, pBuffer, pBuffer->frameCount);
- if (mLocalBufferFrameCount == 0) {
- status_t res = mTrackBufferProvider->getNextBuffer(pBuffer);
- if (res == OK) {
- copyFrames(pBuffer->raw, pBuffer->raw, pBuffer->frameCount);
- }
- return res;
- }
- if (mBuffer.frameCount == 0) {
- mBuffer.frameCount = pBuffer->frameCount;
- status_t res = mTrackBufferProvider->getNextBuffer(&mBuffer);
- // At one time an upstream buffer provider had
- // res == OK and mBuffer.frameCount == 0, doesn't seem to happen now 7/18/2014.
- //
- // By API spec, if res != OK, then mBuffer.frameCount == 0.
- // but there may be improper implementations.
- ALOG_ASSERT(res == OK || mBuffer.frameCount == 0);
- if (res != OK || mBuffer.frameCount == 0) { // not needed by API spec, but to be safe.
- pBuffer->raw = NULL;
- pBuffer->frameCount = 0;
- return res;
- }
- mConsumed = 0;
- }
- ALOG_ASSERT(mConsumed < mBuffer.frameCount);
- size_t count = min(mLocalBufferFrameCount, mBuffer.frameCount - mConsumed);
- count = min(count, pBuffer->frameCount);
- pBuffer->raw = mLocalBufferData;
- pBuffer->frameCount = count;
- copyFrames(pBuffer->raw, (uint8_t*)mBuffer.raw + mConsumed * mInputFrameSize,
- pBuffer->frameCount);
- return OK;
-}
-
-void CopyBufferProvider::releaseBuffer(AudioBufferProvider::Buffer *pBuffer)
-{
- //ALOGV("CopyBufferProvider(%p)::releaseBuffer(%p(%zu))",
- // this, pBuffer, pBuffer->frameCount);
- if (mLocalBufferFrameCount == 0) {
- mTrackBufferProvider->releaseBuffer(pBuffer);
- return;
- }
- // LOG_ALWAYS_FATAL_IF(pBuffer->frameCount == 0, "Invalid framecount");
- mConsumed += pBuffer->frameCount; // TODO: update for efficiency to reuse existing content
- if (mConsumed != 0 && mConsumed >= mBuffer.frameCount) {
- mTrackBufferProvider->releaseBuffer(&mBuffer);
- ALOG_ASSERT(mBuffer.frameCount == 0);
- }
- pBuffer->raw = NULL;
- pBuffer->frameCount = 0;
-}
-
-void CopyBufferProvider::reset()
-{
- if (mBuffer.frameCount != 0) {
- mTrackBufferProvider->releaseBuffer(&mBuffer);
- }
- mConsumed = 0;
-}
-
-DownmixerBufferProvider::DownmixerBufferProvider(
- audio_channel_mask_t inputChannelMask,
- audio_channel_mask_t outputChannelMask, audio_format_t format,
- uint32_t sampleRate, int32_t sessionId, size_t bufferFrameCount) :
- CopyBufferProvider(
- audio_bytes_per_sample(format) * audio_channel_count_from_out_mask(inputChannelMask),
- audio_bytes_per_sample(format) * audio_channel_count_from_out_mask(outputChannelMask),
- bufferFrameCount) // set bufferFrameCount to 0 to do in-place
-{
- ALOGV("DownmixerBufferProvider(%p)(%#x, %#x, %#x %u %d)",
- this, inputChannelMask, outputChannelMask, format,
- sampleRate, sessionId);
- if (!sIsMultichannelCapable) {
- ALOGE("DownmixerBufferProvider() error: not multichannel capable");
- return;
- }
- mEffectsFactory = EffectsFactoryHalInterface::create();
- if (mEffectsFactory == 0) {
- ALOGE("DownmixerBufferProvider() error: could not obtain the effects factory");
- return;
- }
- if (mEffectsFactory->createEffect(&sDwnmFxDesc.uuid,
- sessionId,
- SESSION_ID_INVALID_AND_IGNORED,
- &mDownmixInterface) != 0) {
- ALOGE("DownmixerBufferProvider() error creating downmixer effect");
- mDownmixInterface.clear();
- mEffectsFactory.clear();
- return;
- }
- // channel input configuration will be overridden per-track
- mDownmixConfig.inputCfg.channels = inputChannelMask; // FIXME: Should be bits
- mDownmixConfig.outputCfg.channels = outputChannelMask; // FIXME: should be bits
- mDownmixConfig.inputCfg.format = format;
- mDownmixConfig.outputCfg.format = format;
- mDownmixConfig.inputCfg.samplingRate = sampleRate;
- mDownmixConfig.outputCfg.samplingRate = sampleRate;
- mDownmixConfig.inputCfg.accessMode = EFFECT_BUFFER_ACCESS_READ;
- mDownmixConfig.outputCfg.accessMode = EFFECT_BUFFER_ACCESS_WRITE;
- // input and output buffer provider, and frame count will not be used as the downmix effect
- // process() function is called directly (see DownmixerBufferProvider::getNextBuffer())
- mDownmixConfig.inputCfg.mask = EFFECT_CONFIG_SMP_RATE | EFFECT_CONFIG_CHANNELS |
- EFFECT_CONFIG_FORMAT | EFFECT_CONFIG_ACC_MODE;
- mDownmixConfig.outputCfg.mask = mDownmixConfig.inputCfg.mask;
-
- status_t status;
- status = EffectBufferHalInterface::mirror(
- nullptr,
- audio_bytes_per_sample(format) * audio_channel_count_from_out_mask(inputChannelMask),
- &mInBuffer);
- if (status != 0) {
- ALOGE("DownmixerBufferProvider() error %d while creating input buffer", status);
- mDownmixInterface.clear();
- mEffectsFactory.clear();
- return;
- }
- status = EffectBufferHalInterface::mirror(
- nullptr,
- audio_bytes_per_sample(format) * audio_channel_count_from_out_mask(outputChannelMask),
- &mOutBuffer);
- if (status != 0) {
- ALOGE("DownmixerBufferProvider() error %d while creating output buffer", status);
- mInBuffer.clear();
- mDownmixInterface.clear();
- mEffectsFactory.clear();
- return;
- }
-
- int cmdStatus;
- uint32_t replySize = sizeof(int);
-
- // Configure downmixer
- status = mDownmixInterface->command(
- EFFECT_CMD_SET_CONFIG /*cmdCode*/, sizeof(effect_config_t) /*cmdSize*/,
- &mDownmixConfig /*pCmdData*/,
- &replySize, &cmdStatus /*pReplyData*/);
- if (status != 0 || cmdStatus != 0) {
- ALOGE("DownmixerBufferProvider() error %d cmdStatus %d while configuring downmixer",
- status, cmdStatus);
- mOutBuffer.clear();
- mInBuffer.clear();
- mDownmixInterface.clear();
- mEffectsFactory.clear();
- return;
- }
-
- // Enable downmixer
- replySize = sizeof(int);
- status = mDownmixInterface->command(
- EFFECT_CMD_ENABLE /*cmdCode*/, 0 /*cmdSize*/, NULL /*pCmdData*/,
- &replySize, &cmdStatus /*pReplyData*/);
- if (status != 0 || cmdStatus != 0) {
- ALOGE("DownmixerBufferProvider() error %d cmdStatus %d while enabling downmixer",
- status, cmdStatus);
- mOutBuffer.clear();
- mInBuffer.clear();
- mDownmixInterface.clear();
- mEffectsFactory.clear();
- return;
- }
-
- // Set downmix type
- // parameter size rounded for padding on 32bit boundary
- const int psizePadded = ((sizeof(downmix_params_t) - 1)/sizeof(int) + 1) * sizeof(int);
- const int downmixParamSize =
- sizeof(effect_param_t) + psizePadded + sizeof(downmix_type_t);
- effect_param_t * const param = (effect_param_t *) malloc(downmixParamSize);
- param->psize = sizeof(downmix_params_t);
- const downmix_params_t downmixParam = DOWNMIX_PARAM_TYPE;
- memcpy(param->data, &downmixParam, param->psize);
- const downmix_type_t downmixType = DOWNMIX_TYPE_FOLD;
- param->vsize = sizeof(downmix_type_t);
- memcpy(param->data + psizePadded, &downmixType, param->vsize);
- replySize = sizeof(int);
- status = mDownmixInterface->command(
- EFFECT_CMD_SET_PARAM /* cmdCode */, downmixParamSize /* cmdSize */,
- param /*pCmdData*/, &replySize, &cmdStatus /*pReplyData*/);
- free(param);
- if (status != 0 || cmdStatus != 0) {
- ALOGE("DownmixerBufferProvider() error %d cmdStatus %d while setting downmix type",
- status, cmdStatus);
- mOutBuffer.clear();
- mInBuffer.clear();
- mDownmixInterface.clear();
- mEffectsFactory.clear();
- return;
- }
- ALOGV("DownmixerBufferProvider() downmix type set to %d", (int) downmixType);
-}
-
-DownmixerBufferProvider::~DownmixerBufferProvider()
-{
- ALOGV("~DownmixerBufferProvider (%p)", this);
- if (mDownmixInterface != 0) {
- mDownmixInterface->close();
- }
-}
-
-void DownmixerBufferProvider::copyFrames(void *dst, const void *src, size_t frames)
-{
- mInBuffer->setExternalData(const_cast<void*>(src));
- mInBuffer->setFrameCount(frames);
- mInBuffer->update();
- mOutBuffer->setExternalData(dst);
- mOutBuffer->setFrameCount(frames);
- mOutBuffer->update();
- // may be in-place if src == dst.
- status_t res = mDownmixInterface->process();
- if (res == OK) {
- mOutBuffer->commit();
- } else {
- ALOGE("DownmixBufferProvider error %d", res);
- }
-}
-
-/* call once in a pthread_once handler. */
-/*static*/ status_t DownmixerBufferProvider::init()
-{
- // find multichannel downmix effect if we have to play multichannel content
- sp<EffectsFactoryHalInterface> effectsFactory = EffectsFactoryHalInterface::create();
- if (effectsFactory == 0) {
- ALOGE("AudioMixer() error: could not obtain the effects factory");
- return NO_INIT;
- }
- uint32_t numEffects = 0;
- int ret = effectsFactory->queryNumberEffects(&numEffects);
- if (ret != 0) {
- ALOGE("AudioMixer() error %d querying number of effects", ret);
- return NO_INIT;
- }
- ALOGV("EffectQueryNumberEffects() numEffects=%d", numEffects);
-
- for (uint32_t i = 0 ; i < numEffects ; i++) {
- if (effectsFactory->getDescriptor(i, &sDwnmFxDesc) == 0) {
- ALOGV("effect %d is called %s", i, sDwnmFxDesc.name);
- if (memcmp(&sDwnmFxDesc.type, EFFECT_UIID_DOWNMIX, sizeof(effect_uuid_t)) == 0) {
- ALOGI("found effect \"%s\" from %s",
- sDwnmFxDesc.name, sDwnmFxDesc.implementor);
- sIsMultichannelCapable = true;
- break;
- }
- }
- }
- ALOGW_IF(!sIsMultichannelCapable, "unable to find downmix effect");
- return NO_INIT;
-}
-
-/*static*/ bool DownmixerBufferProvider::sIsMultichannelCapable = false;
-/*static*/ effect_descriptor_t DownmixerBufferProvider::sDwnmFxDesc;
-
-RemixBufferProvider::RemixBufferProvider(audio_channel_mask_t inputChannelMask,
- audio_channel_mask_t outputChannelMask, audio_format_t format,
- size_t bufferFrameCount) :
- CopyBufferProvider(
- audio_bytes_per_sample(format)
- * audio_channel_count_from_out_mask(inputChannelMask),
- audio_bytes_per_sample(format)
- * audio_channel_count_from_out_mask(outputChannelMask),
- bufferFrameCount),
- mFormat(format),
- mSampleSize(audio_bytes_per_sample(format)),
- mInputChannels(audio_channel_count_from_out_mask(inputChannelMask)),
- mOutputChannels(audio_channel_count_from_out_mask(outputChannelMask))
-{
- ALOGV("RemixBufferProvider(%p)(%#x, %#x, %#x) %zu %zu",
- this, format, inputChannelMask, outputChannelMask,
- mInputChannels, mOutputChannels);
- (void) memcpy_by_index_array_initialization_from_channel_mask(
- mIdxAry, ARRAY_SIZE(mIdxAry), outputChannelMask, inputChannelMask);
-}
-
-void RemixBufferProvider::copyFrames(void *dst, const void *src, size_t frames)
-{
- memcpy_by_index_array(dst, mOutputChannels,
- src, mInputChannels, mIdxAry, mSampleSize, frames);
-}
-
-ReformatBufferProvider::ReformatBufferProvider(int32_t channelCount,
- audio_format_t inputFormat, audio_format_t outputFormat,
- size_t bufferFrameCount) :
- CopyBufferProvider(
- channelCount * audio_bytes_per_sample(inputFormat),
- channelCount * audio_bytes_per_sample(outputFormat),
- bufferFrameCount),
- mChannelCount(channelCount),
- mInputFormat(inputFormat),
- mOutputFormat(outputFormat)
-{
- ALOGV("ReformatBufferProvider(%p)(%u, %#x, %#x)",
- this, channelCount, inputFormat, outputFormat);
-}
-
-void ReformatBufferProvider::copyFrames(void *dst, const void *src, size_t frames)
-{
- memcpy_by_audio_format(dst, mOutputFormat, src, mInputFormat, frames * mChannelCount);
-}
-
-TimestretchBufferProvider::TimestretchBufferProvider(int32_t channelCount,
- audio_format_t format, uint32_t sampleRate, const AudioPlaybackRate &playbackRate) :
- mChannelCount(channelCount),
- mFormat(format),
- mSampleRate(sampleRate),
- mFrameSize(channelCount * audio_bytes_per_sample(format)),
- mLocalBufferFrameCount(0),
- mLocalBufferData(NULL),
- mRemaining(0),
- mSonicStream(sonicCreateStream(sampleRate, mChannelCount)),
- mFallbackFailErrorShown(false),
- mAudioPlaybackRateValid(false)
-{
- LOG_ALWAYS_FATAL_IF(mSonicStream == NULL,
- "TimestretchBufferProvider can't allocate Sonic stream");
-
- setPlaybackRate(playbackRate);
- ALOGV("TimestretchBufferProvider(%p)(%u, %#x, %u %f %f %d %d)",
- this, channelCount, format, sampleRate, playbackRate.mSpeed,
- playbackRate.mPitch, playbackRate.mStretchMode, playbackRate.mFallbackMode);
- mBuffer.frameCount = 0;
-}
-
-TimestretchBufferProvider::~TimestretchBufferProvider()
-{
- ALOGV("~TimestretchBufferProvider(%p)", this);
- sonicDestroyStream(mSonicStream);
- if (mBuffer.frameCount != 0) {
- mTrackBufferProvider->releaseBuffer(&mBuffer);
- }
- free(mLocalBufferData);
-}
-
-status_t TimestretchBufferProvider::getNextBuffer(
- AudioBufferProvider::Buffer *pBuffer)
-{
- ALOGV("TimestretchBufferProvider(%p)::getNextBuffer(%p (%zu))",
- this, pBuffer, pBuffer->frameCount);
-
- // BYPASS
- //return mTrackBufferProvider->getNextBuffer(pBuffer);
-
- // check if previously processed data is sufficient.
- if (pBuffer->frameCount <= mRemaining) {
- ALOGV("previous sufficient");
- pBuffer->raw = mLocalBufferData;
- return OK;
- }
-
- // do we need to resize our buffer?
- if (pBuffer->frameCount > mLocalBufferFrameCount) {
- void *newmem;
- if (posix_memalign(&newmem, 32, pBuffer->frameCount * mFrameSize) == OK) {
- if (mRemaining != 0) {
- memcpy(newmem, mLocalBufferData, mRemaining * mFrameSize);
- }
- free(mLocalBufferData);
- mLocalBufferData = newmem;
- mLocalBufferFrameCount = pBuffer->frameCount;
- }
- }
-
- // need to fetch more data
- const size_t outputDesired = pBuffer->frameCount - mRemaining;
- size_t dstAvailable;
- do {
- mBuffer.frameCount = mPlaybackRate.mSpeed == AUDIO_TIMESTRETCH_SPEED_NORMAL
- ? outputDesired : outputDesired * mPlaybackRate.mSpeed + 1;
-
- status_t res = mTrackBufferProvider->getNextBuffer(&mBuffer);
-
- ALOG_ASSERT(res == OK || mBuffer.frameCount == 0);
- if (res != OK || mBuffer.frameCount == 0) { // not needed by API spec, but to be safe.
- ALOGV("upstream provider cannot provide data");
- if (mRemaining == 0) {
- pBuffer->raw = NULL;
- pBuffer->frameCount = 0;
- return res;
- } else { // return partial count
- pBuffer->raw = mLocalBufferData;
- pBuffer->frameCount = mRemaining;
- return OK;
- }
- }
-
- // time-stretch the data
- dstAvailable = min(mLocalBufferFrameCount - mRemaining, outputDesired);
- size_t srcAvailable = mBuffer.frameCount;
- processFrames((uint8_t*)mLocalBufferData + mRemaining * mFrameSize, &dstAvailable,
- mBuffer.raw, &srcAvailable);
-
- // release all data consumed
- mBuffer.frameCount = srcAvailable;
- mTrackBufferProvider->releaseBuffer(&mBuffer);
- } while (dstAvailable == 0); // try until we get output data or upstream provider fails.
-
- // update buffer vars with the actual data processed and return with buffer
- mRemaining += dstAvailable;
-
- pBuffer->raw = mLocalBufferData;
- pBuffer->frameCount = mRemaining;
-
- return OK;
-}
-
-void TimestretchBufferProvider::releaseBuffer(AudioBufferProvider::Buffer *pBuffer)
-{
- ALOGV("TimestretchBufferProvider(%p)::releaseBuffer(%p (%zu))",
- this, pBuffer, pBuffer->frameCount);
-
- // BYPASS
- //return mTrackBufferProvider->releaseBuffer(pBuffer);
-
- // LOG_ALWAYS_FATAL_IF(pBuffer->frameCount == 0, "Invalid framecount");
- if (pBuffer->frameCount < mRemaining) {
- memcpy(mLocalBufferData,
- (uint8_t*)mLocalBufferData + pBuffer->frameCount * mFrameSize,
- (mRemaining - pBuffer->frameCount) * mFrameSize);
- mRemaining -= pBuffer->frameCount;
- } else if (pBuffer->frameCount == mRemaining) {
- mRemaining = 0;
- } else {
- LOG_ALWAYS_FATAL("Releasing more frames(%zu) than available(%zu)",
- pBuffer->frameCount, mRemaining);
- }
-
- pBuffer->raw = NULL;
- pBuffer->frameCount = 0;
-}
-
-void TimestretchBufferProvider::reset()
-{
- mRemaining = 0;
-}
-
-status_t TimestretchBufferProvider::setPlaybackRate(const AudioPlaybackRate &playbackRate)
-{
- mPlaybackRate = playbackRate;
- mFallbackFailErrorShown = false;
- sonicSetSpeed(mSonicStream, mPlaybackRate.mSpeed);
- //TODO: pitch is ignored for now
- //TODO: optimize: if parameters are the same, don't do any extra computation.
-
- mAudioPlaybackRateValid = isAudioPlaybackRateValid(mPlaybackRate);
- return OK;
-}
-
-void TimestretchBufferProvider::processFrames(void *dstBuffer, size_t *dstFrames,
- const void *srcBuffer, size_t *srcFrames)
-{
- ALOGV("processFrames(%zu %zu) remaining(%zu)", *dstFrames, *srcFrames, mRemaining);
- // Note dstFrames is the required number of frames.
-
- if (!mAudioPlaybackRateValid) {
- //fallback mode
- // Ensure consumption from src is as expected.
- // TODO: add logic to track "very accurate" consumption related to speed, original sampling
- // rate, actual frames processed.
-
- const size_t targetSrc = *dstFrames * mPlaybackRate.mSpeed;
- if (*srcFrames < targetSrc) { // limit dst frames to that possible
- *dstFrames = *srcFrames / mPlaybackRate.mSpeed;
- } else if (*srcFrames > targetSrc + 1) {
- *srcFrames = targetSrc + 1;
- }
- if (*dstFrames > 0) {
- switch(mPlaybackRate.mFallbackMode) {
- case AUDIO_TIMESTRETCH_FALLBACK_CUT_REPEAT:
- if (*dstFrames <= *srcFrames) {
- size_t copySize = mFrameSize * *dstFrames;
- memcpy(dstBuffer, srcBuffer, copySize);
- } else {
- // cyclically repeat the source.
- for (size_t count = 0; count < *dstFrames; count += *srcFrames) {
- size_t remaining = min(*srcFrames, *dstFrames - count);
- memcpy((uint8_t*)dstBuffer + mFrameSize * count,
- srcBuffer, mFrameSize * remaining);
- }
- }
- break;
- case AUDIO_TIMESTRETCH_FALLBACK_DEFAULT:
- case AUDIO_TIMESTRETCH_FALLBACK_MUTE:
- memset(dstBuffer,0, mFrameSize * *dstFrames);
- break;
- case AUDIO_TIMESTRETCH_FALLBACK_FAIL:
- default:
- if(!mFallbackFailErrorShown) {
- ALOGE("invalid parameters in TimestretchBufferProvider fallbackMode:%d",
- mPlaybackRate.mFallbackMode);
- mFallbackFailErrorShown = true;
- }
- break;
- }
- }
- } else {
- switch (mFormat) {
- case AUDIO_FORMAT_PCM_FLOAT:
- if (sonicWriteFloatToStream(mSonicStream, (float*)srcBuffer, *srcFrames) != 1) {
- ALOGE("sonicWriteFloatToStream cannot realloc");
- *srcFrames = 0; // cannot consume all of srcBuffer
- }
- *dstFrames = sonicReadFloatFromStream(mSonicStream, (float*)dstBuffer, *dstFrames);
- break;
- case AUDIO_FORMAT_PCM_16_BIT:
- if (sonicWriteShortToStream(mSonicStream, (short*)srcBuffer, *srcFrames) != 1) {
- ALOGE("sonicWriteShortToStream cannot realloc");
- *srcFrames = 0; // cannot consume all of srcBuffer
- }
- *dstFrames = sonicReadShortFromStream(mSonicStream, (short*)dstBuffer, *dstFrames);
- break;
- default:
- // could also be caught on construction
- LOG_ALWAYS_FATAL("invalid format %#x for TimestretchBufferProvider", mFormat);
- }
- }
-}
-// ----------------------------------------------------------------------------
-} // namespace android
diff --git a/services/audioflinger/BufferProviders.h b/services/audioflinger/BufferProviders.h
deleted file mode 100644
index 4e3f89f..0000000
--- a/services/audioflinger/BufferProviders.h
+++ /dev/null
@@ -1,205 +0,0 @@
-/*
- * Copyright (C) 2015 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef ANDROID_BUFFER_PROVIDERS_H
-#define ANDROID_BUFFER_PROVIDERS_H
-
-#include <stdint.h>
-#include <sys/types.h>
-
-#include <media/AudioBufferProvider.h>
-#include <system/audio.h>
-#include <system/audio_effect.h>
-#include <sonic.h>
-#include <utils/StrongPointer.h>
-
-namespace android {
-
-class EffectBufferHalInterface;
-class EffectHalInterface;
-class EffectsFactoryHalInterface;
-
-// ----------------------------------------------------------------------------
-
-class PassthruBufferProvider : public AudioBufferProvider {
-public:
- PassthruBufferProvider() : mTrackBufferProvider(NULL) { }
-
- virtual ~PassthruBufferProvider() { }
-
- // call this to release the buffer to the upstream provider.
- // treat it as an audio discontinuity for future samples.
- virtual void reset() { }
-
- // set the upstream buffer provider. Consider calling "reset" before this function.
- virtual void setBufferProvider(AudioBufferProvider *p) {
- mTrackBufferProvider = p;
- }
-
-protected:
- AudioBufferProvider *mTrackBufferProvider;
-};
-
-// Base AudioBufferProvider class used for DownMixerBufferProvider, RemixBufferProvider,
-// and ReformatBufferProvider.
-// It handles a private buffer for use in converting format or channel masks from the
-// input data to a form acceptable by the mixer.
-// TODO: Make a ResamplerBufferProvider when integers are entirely removed from the
-// processing pipeline.
-class CopyBufferProvider : public PassthruBufferProvider {
-public:
- // Use a private buffer of bufferFrameCount frames (each frame is outputFrameSize bytes).
- // If bufferFrameCount is 0, no private buffer is created and in-place modification of
- // the upstream buffer provider's buffers is performed by copyFrames().
- CopyBufferProvider(size_t inputFrameSize, size_t outputFrameSize,
- size_t bufferFrameCount);
- virtual ~CopyBufferProvider();
-
- // Overrides AudioBufferProvider methods
- virtual status_t getNextBuffer(Buffer *buffer);
- virtual void releaseBuffer(Buffer *buffer);
-
- // Overrides PassthruBufferProvider
- virtual void reset();
-
- // this function should be supplied by the derived class. It converts
- // #frames in the *src pointer to the *dst pointer. It is public because
- // some providers will allow this to work on arbitrary buffers outside
- // of the internal buffers.
- virtual void copyFrames(void *dst, const void *src, size_t frames) = 0;
-
-protected:
- const size_t mInputFrameSize;
- const size_t mOutputFrameSize;
-private:
- AudioBufferProvider::Buffer mBuffer;
- const size_t mLocalBufferFrameCount;
- void *mLocalBufferData;
- size_t mConsumed;
-};
-
-// DownmixerBufferProvider derives from CopyBufferProvider to provide
-// position dependent downmixing by an Audio Effect.
-class DownmixerBufferProvider : public CopyBufferProvider {
-public:
- DownmixerBufferProvider(audio_channel_mask_t inputChannelMask,
- audio_channel_mask_t outputChannelMask, audio_format_t format,
- uint32_t sampleRate, int32_t sessionId, size_t bufferFrameCount);
- virtual ~DownmixerBufferProvider();
- //Overrides
- virtual void copyFrames(void *dst, const void *src, size_t frames);
-
- bool isValid() const { return mDownmixInterface.get() != NULL; }
- static status_t init();
- static bool isMultichannelCapable() { return sIsMultichannelCapable; }
-
-protected:
- sp<EffectsFactoryHalInterface> mEffectsFactory;
- sp<EffectHalInterface> mDownmixInterface;
- sp<EffectBufferHalInterface> mInBuffer;
- sp<EffectBufferHalInterface> mOutBuffer;
- effect_config_t mDownmixConfig;
-
- // effect descriptor for the downmixer used by the mixer
- static effect_descriptor_t sDwnmFxDesc;
- // indicates whether a downmix effect has been found and is usable by this mixer
- static bool sIsMultichannelCapable;
- // FIXME: should we allow effects outside of the framework?
- // We need to here. A special ioId that must be <= -2 so it does not map to a session.
- static const int32_t SESSION_ID_INVALID_AND_IGNORED = -2;
-};
-
-// RemixBufferProvider derives from CopyBufferProvider to perform an
-// upmix or downmix to the proper channel count and mask.
-class RemixBufferProvider : public CopyBufferProvider {
-public:
- RemixBufferProvider(audio_channel_mask_t inputChannelMask,
- audio_channel_mask_t outputChannelMask, audio_format_t format,
- size_t bufferFrameCount);
- //Overrides
- virtual void copyFrames(void *dst, const void *src, size_t frames);
-
-protected:
- const audio_format_t mFormat;
- const size_t mSampleSize;
- const size_t mInputChannels;
- const size_t mOutputChannels;
- int8_t mIdxAry[sizeof(uint32_t) * 8]; // 32 bits => channel indices
-};
-
-// ReformatBufferProvider derives from CopyBufferProvider to convert the input data
-// to an acceptable mixer input format type.
-class ReformatBufferProvider : public CopyBufferProvider {
-public:
- ReformatBufferProvider(int32_t channelCount,
- audio_format_t inputFormat, audio_format_t outputFormat,
- size_t bufferFrameCount);
- virtual void copyFrames(void *dst, const void *src, size_t frames);
-
-protected:
- const uint32_t mChannelCount;
- const audio_format_t mInputFormat;
- const audio_format_t mOutputFormat;
-};
-
-// TimestretchBufferProvider derives from PassthruBufferProvider for time stretching
-class TimestretchBufferProvider : public PassthruBufferProvider {
-public:
- TimestretchBufferProvider(int32_t channelCount,
- audio_format_t format, uint32_t sampleRate,
- const AudioPlaybackRate &playbackRate);
- virtual ~TimestretchBufferProvider();
-
- // Overrides AudioBufferProvider methods
- virtual status_t getNextBuffer(Buffer* buffer);
- virtual void releaseBuffer(Buffer* buffer);
-
- // Overrides PassthruBufferProvider
- virtual void reset();
-
- virtual status_t setPlaybackRate(const AudioPlaybackRate &playbackRate);
-
- // processes frames
- // dstBuffer is where to place the data
- // dstFrames [in/out] is the desired frames (return with actual placed in buffer)
- // srcBuffer is the source data
- // srcFrames [in/out] is the available source frames (return with consumed)
- virtual void processFrames(void *dstBuffer, size_t *dstFrames,
- const void *srcBuffer, size_t *srcFrames);
-
-protected:
- const uint32_t mChannelCount;
- const audio_format_t mFormat;
- const uint32_t mSampleRate; // const for now (TODO change this)
- const size_t mFrameSize;
- AudioPlaybackRate mPlaybackRate;
-
-private:
- AudioBufferProvider::Buffer mBuffer; // for upstream request
- size_t mLocalBufferFrameCount; // size of local buffer
- void *mLocalBufferData; // internally allocated buffer for data returned
- // to caller
- size_t mRemaining; // remaining data in local buffer
- sonicStream mSonicStream; // handle to sonic timestretch object
- //FIXME: this dependency should be abstracted out
- bool mFallbackFailErrorShown; // log fallback error only once
- bool mAudioPlaybackRateValid; // flag for current parameters validity
-};
-
-// ----------------------------------------------------------------------------
-} // namespace android
-
-#endif // ANDROID_BUFFER_PROVIDERS_H
diff --git a/services/audioflinger/FastMixer.cpp b/services/audioflinger/FastMixer.cpp
index 93f7ce5..7182f32 100644
--- a/services/audioflinger/FastMixer.cpp
+++ b/services/audioflinger/FastMixer.cpp
@@ -39,7 +39,7 @@
#endif
#include <audio_utils/conversion.h>
#include <audio_utils/format.h>
-#include "AudioMixer.h"
+#include <media/AudioMixer.h>
#include "FastMixer.h"
namespace android {
diff --git a/services/audioflinger/LinearMap.h b/services/audioflinger/LinearMap.h
deleted file mode 100644
index 2220a0c..0000000
--- a/services/audioflinger/LinearMap.h
+++ /dev/null
@@ -1,366 +0,0 @@
-/*
- * Copyright 2015 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef ANDROID_LINEAR_MAP_H
-#define ANDROID_LINEAR_MAP_H
-
-#include <stdint.h>
-
-namespace android {
-
-/*
-A general purpose lookup utility that defines a mapping between X and Y as a
-continuous set of line segments with shared (x, y) end-points.
-The (x, y) points must be added in order, monotonically increasing in both x and y;
-a log warning is emitted if this does not happen (See general usage notes below).
-
-A limited history of (x, y) points is kept for space reasons (See general usage notes).
-
-In AudioFlinger, we use the LinearMap to associate track frames to
-sink frames. When we want to obtain a client track timestamp, we first
-get a timestamp from the sink. The sink timestamp's position (mPosition)
-corresponds to the sink frames written. We use LinearMap to figure out which track frame
-the sink frame corresponds to. This allows us to substitute a track frame for the
-the sink frame (keeping the mTime identical) and return that timestamp back to the client.
-
-The method findX() can be used to retrieve an x value from a given y value and is
-used for timestamps, similarly for findY() which is provided for completeness.
-
-We update the (track frame, sink frame) points in the LinearMap each time we write data
-to the sink by the AudioFlinger PlaybackThread (MixerThread).
-
-
-AudioFlinger Timestamp Notes:
-
-1) Example: Obtaining a track timestamp during playback. In this case, the LinearMap
-looks something like this:
-
-Track Frame Sink Frame
-(track start)
-0 50000 (track starts here, the sink may already be running)
-1000 51000
-2000 52000
-
-When we request a track timestamp, we call the sink getTimestamp() and get for example
-mPosition = 51020. Using the LinearMap, we find we have played to track frame 1020.
-We substitute the sink mPosition of 51020 with the track position 1020,
-and return that timestamp to the app.
-
-2) Example: Obtaining a track timestamp duing pause. In this case, the LinearMap
-looks something like this:
-
-Track Frame Sink Frame
-... (some time has gone by)
-15000 30000
-16000 31000
-17000 32000
-(pause here)
-(suppose we call sink getTimestamp() here and get sink mPosition = 31100; that means
- we have played to track frame 16100. The track timestamp mPosition will
- continue to advance until the sink timestamp returns a value of mPosition
- greater than 32000, corresponding to track frame 17000 when the pause was called).
-17000 33000
-17000 34000
-...
-
-3) If the track underruns, it appears as if a pause was called on that track.
-
-4) If there is an underrun in the HAL layer, then it may be possible that
-the sink getTimestamp() will return a value greater than the number of frames written
-(it should always be less). This should be rare, if not impossible by some
-HAL implementations of the sink getTimestamp. In that case, timing is lost
-and we will return the most recent track frame written.
-
-5) When called with no points in the map, findX() returns the start value (default 0).
-This is consistent with starting after a stop() or flush().
-
-6) Resuming after Track standby will be similar to coming out of pause, as the HAL ensures
-framesWritten() and getTimestamp() are contiguous for non-offloaded/direct tracks.
-
-7) LinearMap works for different speeds and sample rates as it uses
-linear interpolation. Since AudioFlinger only updates speed and sample rate
-exactly at the sample points pushed into the LinearMap, the returned values
-from findX() and findY() are accurate regardless of how many speed or sample
-rate changes are made, so long as the coordinate looked up is within the
-sample history.
-
-General usage notes:
-
-1) In order for the LinearMap to work reliably, you cannot look backwards more
-than the size of its circular buffer history, set upon creation (typically 16).
-If you look back further, the position is extrapolated either from a passed in
-extrapolation parameter or from the oldest line segment.
-
-2) Points must monotonically increase in x and y. The increment between adjacent
-points cannot be greater than signed 32 bits. Wrap in the x, y coordinates are supported,
-since we use differences in our computation.
-
-3) If the frame data is discontinuous (due to stop or flush) call reset() to clear
-the sample counter.
-
-4) If (x, y) are not strictly monotonic increasing, i.e. (x2 > x1) and (y2 > y1),
-then one or both of the inverses y = f(x) or x = g(y) may have multiple solutions.
-In that case, the most recent solution is returned by findX() or findY(). We
-do not warn if (x2 == x1) or (y2 == y1), but we do logcat warn if (x2 < x1) or
-(y2 < y1).
-
-5) Due to rounding it is possible x != findX(findY(x)) or y != findY(findX(y))
-even when the inverse exists. Nevertheless, the values should be close.
-
-*/
-
-template <typename T>
-class LinearMap {
-public:
- // This enumeration describes the reliability of the findX() or findY() estimation
- // in descending order.
- enum FindMethod {
- FIND_METHOD_INTERPOLATION, // High reliability (errors due to rounding)
- FIND_METHOD_FORWARD_EXTRAPOLATION, // Reliability based on no future speed changes
- FIND_METHOD_BACKWARD_EXTRAPOLATION, // Reliability based on prior estimated speed
- FIND_METHOD_START_VALUE, // No samples in history, using start value
- };
-
- explicit LinearMap(size_t size)
- : mSize(size),
- mPos(0), // a circular buffer, so could start anywhere. the first sample is at 1.
- mSamples(0),
- // mStepValid(false), // only valid if mSamples > 1
- // mExtrapolateTail(false), // only valid if mSamples > 0
- mX(new T[size]),
- mY(new T[size]) { }
-
- ~LinearMap() {
- delete[] mX;
- delete[] mY;
- }
-
- // Add a new sample point to the linear map.
- //
- // The difference between the new sample and the previous sample
- // in the x or y coordinate must be less than INT32_MAX for purposes
- // of the linear interpolation or extrapolation.
- //
- // The value should be monotonic increasing (e.g. diff >= 0);
- // logcat warnings are issued if they are not.
- __attribute__((no_sanitize("integer")))
- void push(T x, T y) {
- // Assumption: we assume x, y are monotonic increasing values,
- // which (can) wrap in precision no less than 32 bits and have
- // "step" or differences between adjacent points less than 32 bits.
-
- if (mSamples > 0) {
- const bool lastStepValid = mStepValid;
- int32_t xdiff;
- int32_t ydiff;
- // check difference assumption here
- mStepValid = checkedDiff(&xdiff, x, mX[mPos], "x")
- & /* bitwise AND to always warn for ydiff, though logical AND is also OK */
- checkedDiff(&ydiff, y, mY[mPos], "y");
-
- // Optimization: do not add a new sample if the line segment would
- // simply extend the previous line segment. This extends the useful
- // history by removing redundant points.
- if (mSamples > 1 && mStepValid && lastStepValid) {
- const size_t prev = previousPosition();
- const int32_t xdiff2 = x - mX[prev];
- const int32_t ydiff2 = y - mY[prev];
-
- // if both current step and previous step are valid (non-negative and
- // less than INT32_MAX for precision greater than 4 bytes)
- // then the sum of the two steps is valid when the
- // int32_t difference is non-negative.
- if (xdiff2 >= 0 && ydiff2 >= 0
- && (int64_t)xdiff2 * ydiff == (int64_t)ydiff2 * xdiff) {
- // ALOGD("reusing sample! (%u, %u) sample depth %zd", x, y, mSamples);
- mX[mPos] = x;
- mY[mPos] = y;
- return;
- }
- }
- }
- if (++mPos >= mSize) {
- mPos = 0;
- }
- if (mSamples < mSize) {
- mExtrapolateTail = false;
- ++mSamples;
- } else {
- // we enable extrapolation beyond the oldest sample
- // if the sample buffers are completely full and we
- // no longer know the full history.
- mExtrapolateTail = true;
- }
- mX[mPos] = x;
- mY[mPos] = y;
- }
-
- // clear all samples from the circular array
- void reset() {
- // no need to reset mPos, we use a circular buffer.
- // computed values such as mStepValid are set after a subsequent push().
- mSamples = 0;
- }
-
- // returns true if LinearMap contains at least one sample.
- bool hasData() const {
- return mSamples != 0;
- }
-
- // find the corresponding X point from a Y point.
- // See findU for details.
- __attribute__((no_sanitize("integer")))
- T findX(T y, FindMethod *method = NULL, double extrapolation = 0.0, T startValue = 0) const {
- return findU(y, mX, mY, method, extrapolation, startValue);
- }
-
- // find the corresponding Y point from a X point.
- // See findU for details.
- __attribute__((no_sanitize("integer")))
- T findY(T x, FindMethod *method = NULL, double extrapolation = 0.0, T startValue = 0) const {
- return findU(x, mY, mX, method, extrapolation, startValue);
- }
-
-protected:
-
- // returns false if the diff is out of int32_t bounds or negative.
- __attribute__((no_sanitize("integer")))
- static inline bool checkedDiff(int32_t *diff, T x2, T x1, const char *coord) {
- if (sizeof(T) >= 8) {
- const int64_t diff64 = x2 - x1;
- *diff = (int32_t)diff64; // intentionally lose precision
- if (diff64 > INT32_MAX) {
- ALOGW("LinearMap: %s overflow diff(%lld) from %llu - %llu exceeds INT32_MAX",
- coord, (long long)diff64,
- (unsigned long long)x2, (unsigned long long)x1);
- return false;
- } else if (diff64 < 0) {
- ALOGW("LinearMap: %s negative diff(%lld) from %llu - %llu",
- coord, (long long)diff64,
- (unsigned long long)x2, (unsigned long long)x1);
- return false;
- }
- return true;
- }
- // for 32 bit integers we cannot detect overflow (it
- // shows up as a negative difference).
- *diff = x2 - x1;
- if (*diff < 0) {
- ALOGW("LinearMap: %s negative diff(%d) from %u - %u",
- coord, *diff, (unsigned)x2, (unsigned)x1);
- return false;
- }
- return true;
- }
-
- // Returns the previous position in the mSamples array
- // going backwards back steps.
- //
- // Parameters:
- // back: number of backward steps, cannot be less than zero or greater than mSamples.
- //
- __attribute__((no_sanitize("integer")))
- size_t previousPosition(ssize_t back = 1) const {
- LOG_ALWAYS_FATAL_IF(back < 0 || (size_t)back > mSamples, "Invalid back(%zd)", back);
- ssize_t position = mPos - back;
- if (position < 0) position += mSize;
- return (size_t)position;
- }
-
- // A generic implementation of finding the "other coordinate" with coordinates
- // (u, v) = (x, y) or (u, v) = (y, x).
- //
- // Parameters:
- // uArray: the u axis samples.
- // vArray: the v axis samples.
- // method: [out] how the returned value was computed.
- // extrapolation: the slope used when extrapolating from the
- // first sample value or the last sample value in the history.
- // If mExtrapolateTail is set, the slope of the last line segment
- // is used if the extrapolation parameter is zero to continue the tail of history.
- // At this time, we do not use a different value for forward extrapolation from the
- // head of history from backward extrapolation from the tail of history.
- // TODO: back extrapolation value could be stored along with mX, mY in history.
- // startValue: used only when there are no samples in history. One can detect
- // whether there are samples in history by the method hasData().
- //
- __attribute__((no_sanitize("integer")))
- T findU(T v, T *uArray, T *vArray, FindMethod *method,
- double extrapolation, T startValue) const {
- if (mSamples == 0) {
- if (method != NULL) {
- *method = FIND_METHOD_START_VALUE;
- }
- return startValue; // nothing yet
- }
- ssize_t previous = 0;
- int32_t diff = 0;
- for (ssize_t i = 0; i < (ssize_t)mSamples; ++i) {
- size_t current = previousPosition(i);
-
- // Assumption: even though the type "T" may have precision greater
- // than 32 bits, the difference between adjacent points is limited to 32 bits.
- diff = v - vArray[current];
- if (diff >= 0 ||
- (i == (ssize_t)mSamples - 1 && mExtrapolateTail && extrapolation == 0.0)) {
- // ALOGD("depth = %zd out of %zd", i, limit);
- if (i == 0) {
- if (method != NULL) {
- *method = FIND_METHOD_FORWARD_EXTRAPOLATION;
- }
- return uArray[current] + diff * extrapolation;
- }
- // interpolate / extrapolate: For this computation, we
- // must use differentials here otherwise we have inconsistent
- // values on modulo wrap. previous is always valid here since
- // i > 0. we also perform rounding with the assumption
- // that uStep, vStep, and diff are non-negative.
- int32_t uStep = uArray[previous] - uArray[current]; // non-negative
- int32_t vStep = vArray[previous] - vArray[current]; // positive
- T u = uStep <= 0 || vStep <= 0 ? // we do not permit negative ustep or vstep
- uArray[current]
- : ((int64_t)diff * uStep + (vStep >> 1)) / vStep + uArray[current];
- // ALOGD("u:%u diff:%d uStep:%d vStep:%d u_current:%d",
- // u, diff, uStep, vStep, uArray[current]);
- if (method != NULL) {
- *method = (diff >= 0) ?
- FIND_METHOD_INTERPOLATION : FIND_METHOD_BACKWARD_EXTRAPOLATION;
- }
- return u;
- }
- previous = current;
- }
- // previous is always valid here.
- if (method != NULL) {
- *method = FIND_METHOD_BACKWARD_EXTRAPOLATION;
- }
- return uArray[previous] + diff * extrapolation;
- }
-
-private:
- const size_t mSize; // Size of mX and mY arrays (history).
- size_t mPos; // Index in mX and mY of last pushed data;
- // (incremented after push) [0, mSize - 1].
- size_t mSamples; // Number of valid samples in the array [0, mSize].
- bool mStepValid; // Last sample step was valid (non-negative)
- bool mExtrapolateTail; // extrapolate tail using oldest line segment
- T * const mX; // History of X values as a circular array.
- T * const mY; // History of Y values as a circular array.
-};
-
-} // namespace android
-
-#endif // ANDROID_LINEAR_MAP_H
diff --git a/services/audioflinger/Threads.cpp b/services/audioflinger/Threads.cpp
index 424d2e5..e025316 100644
--- a/services/audioflinger/Threads.cpp
+++ b/services/audioflinger/Threads.cpp
@@ -56,8 +56,6 @@
#include <powermanager/PowerManager.h>
#include "AudioFlinger.h"
-#include "AudioMixer.h"
-#include "BufferProviders.h"
#include "FastMixer.h"
#include "FastCapture.h"
#include "ServiceUtilities.h"
diff --git a/services/audioflinger/Tracks.cpp b/services/audioflinger/Tracks.cpp
index 9746075..48e09c7 100644
--- a/services/audioflinger/Tracks.cpp
+++ b/services/audioflinger/Tracks.cpp
@@ -27,7 +27,6 @@
#include <private/media/AudioTrackShared.h>
-#include "AudioMixer.h"
#include "AudioFlinger.h"
#include "ServiceUtilities.h"
diff --git a/services/audioflinger/audio-resampler/Android.mk b/services/audioflinger/audio-resampler/Android.mk
deleted file mode 100644
index bb2807c..0000000
--- a/services/audioflinger/audio-resampler/Android.mk
+++ /dev/null
@@ -1,16 +0,0 @@
-LOCAL_PATH := $(call my-dir)
-
-include $(CLEAR_VARS)
-
-LOCAL_SRC_FILES := \
- AudioResamplerCoefficients.cpp
-
-LOCAL_MODULE := libaudio-resampler
-
-LOCAL_MODULE_TAGS := optional
-
-LOCAL_SHARED_LIBRARIES := libutils liblog
-
-LOCAL_CFLAGS += -Werror -Wall
-
-include $(BUILD_SHARED_LIBRARY)
diff --git a/services/audioflinger/audio-resampler/AudioResamplerCoefficients.cpp b/services/audioflinger/audio-resampler/AudioResamplerCoefficients.cpp
deleted file mode 100644
index 7fc03a6..0000000
--- a/services/audioflinger/audio-resampler/AudioResamplerCoefficients.cpp
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * Copyright (C) 2012 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#define LOG_TAG "ResamplerCoefficients"
-//#define LOG_NDEBUG 0
-
-#include <utils/Log.h>
-
-#include "filter_coefficients.h"
-
-const int32_t RESAMPLE_FIR_NUM_COEF = 16;
-const int32_t RESAMPLE_FIR_LERP_INT_BITS = 7;
-
-using namespace android;
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-const int32_t* readResamplerCoefficients(bool upSample) {
-
- ALOGV("readResamplerCoefficients");
- if (upSample) {
- return (const int32_t *) up_sampler_filter_coefficients;
- } else {
- return (const int32_t *) dn_sampler_filter_coefficients;
- }
-
-}
-
-int32_t readResampleFirNumCoeff() {
- return RESAMPLE_FIR_NUM_COEF;
-}
-
-int32_t readResampleFirLerpIntBits() {
- return RESAMPLE_FIR_LERP_INT_BITS;
-}
-
-#ifdef __cplusplus
-}
-#endif
diff --git a/services/audioflinger/audio-resampler/filter_coefficients.h b/services/audioflinger/audio-resampler/filter_coefficients.h
deleted file mode 100644
index 8b082b3..0000000
--- a/services/audioflinger/audio-resampler/filter_coefficients.h
+++ /dev/null
@@ -1,285 +0,0 @@
-/*
- * Copyright (C) 2012 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-#include <stdlib.h>
-
-namespace android {
-
-// cmd-line: fir -l 7 -s 48000 -c 23400 -n 16 -b 9.62
-const uint32_t up_sampler_filter_coefficients[] __attribute__ ((aligned (32))) = {
- 0x7ccccccd, 0x0323eb7f, 0xfd086246, 0x02b2aa5c, 0xfda45e2c, 0x01fa5183, 0xfe694e12, 0x0137e672, 0xff1c87d3, 0x009ce6d8, 0xff9a68b0, 0x003d150d, 0xffde727a, 0x00106595, 0xfff93679, 0x00021fc5,
- 0x7cc9b757, 0x022ac835, 0xfd7e3a71, 0x026b7da1, 0xfdd2b905, 0x01db7c90, 0xfe7db77c, 0x012aa7bf, 0xff24dc32, 0x0097dfc9, 0xff9d4ae9, 0x003b8742, 0xffdf38e5, 0x00100be5, 0xfff959f5, 0x0002144b,
- 0x7cc0773c, 0x01354bc1, 0xfdf365e8, 0x0224726d, 0xfe011d2e, 0x01bc908b, 0xfe923a2b, 0x011d528d, 0xff2d426f, 0x0092cbc0, 0xffa035cc, 0x0039f42e, 0xffe00236, 0x000fb0d2, 0xfff97dfa, 0x000208b0,
- 0x7cb10d52, 0x0043843f, 0xfe67d5a8, 0x01dd92df, 0xfe2f83c1, 0x019d9230, 0xfea6d2e5, 0x010fe901, 0xff35b924, 0x008dab9d, 0xffa328d4, 0x00385c1d, 0xffe0ce46, 0x000f5471, 0xfff9a27f, 0x0001fcf5,
- 0x7c9b7afd, 0xff557f58, 0xfedb7ae9, 0x0196e8fe, 0xfe5de5e3, 0x017e8635, 0xfebb7e75, 0x01026d40, 0xff3e3eed, 0x0088803e, 0xffa6237a, 0x0036bf58, 0xffe19cec, 0x000ef6d4, 0xfff9c77d, 0x0001f11e,
- 0x7c7fc22f, 0xfe6b4a44, 0xff4e471d, 0x01507eb8, 0xfe8c3cc3, 0x015f714d, 0xfed039a8, 0x00f4e16f, 0xff46d266, 0x00834a83, 0xffa9253b, 0x00351e2d, 0xffe26e01, 0x000e980f, 0xfff9eceb, 0x0001e52e,
- 0x7c5de56a, 0xfd84f1c8, 0xffc02bf2, 0x010a5de2, 0xfeba819d, 0x01405821, 0xfee5014c, 0x00e747b0, 0xff4f722b, 0x007e0b4b, 0xffac2d8f, 0x003378e7, 0xffe3415d, 0x000e3834, 0xfffa12c0, 0x0001d927,
- 0x7c35e7bb, 0xfca28234, 0x00311b54, 0x00c49034, 0xfee8adba, 0x01213f58, 0xfef9d232, 0x00d9a226, 0xff581cd8, 0x0078c375, 0xffaf3bf2, 0x0031cfd1, 0xffe416d8, 0x000dd758, 0xfffa38f5, 0x0001cd0d,
- 0x7c07ccbe, 0xfbc40766, 0x00a1076e, 0x007f1f4b, 0xff16ba71, 0x01022b90, 0xff0ea931, 0x00cbf2f0, 0xff60d10b, 0x007373de, 0xffb24fde, 0x00302337, 0xffe4ee4b, 0x000d758d, 0xfffa5f81, 0x0001c0e1,
- 0x7bd3989d, 0xfae98cc5, 0x010fe2ab, 0x003a14a6, 0xff44a128, 0x00e3215e, 0xff238322, 0x00be3c2d, 0xff698d62, 0x006e1d66, 0xffb568ce, 0x002e7363, 0xffe5c78d, 0x000d12e6, 0xfffa865d, 0x0001b4a8,
- 0x7b99500c, 0xfa131d41, 0x017d9fb8, 0xfff579a3, 0xff725b54, 0x00c42551, 0xff385ce3, 0x00b07ff8, 0xff72507e, 0x0068c0e9, 0xffb8863e, 0x002cc0a2, 0xffe6a277, 0x000caf76, 0xfffaad81, 0x0001a863,
- 0x7b58f84d, 0xf940c355, 0x01ea3184, 0xffb15783, 0xff9fe27d, 0x00a53bed, 0xff4d3358, 0x00a2c06b, 0xff7b18fe, 0x00635f45, 0xffbba7aa, 0x002b0b3d, 0xffe77ee2, 0x000c4b50, 0xfffad4e4, 0x00019c15,
- 0x7b12972d, 0xf8728902, 0x02558b43, 0xff6db764, 0xffcd303b, 0x008669ae, 0xff620368, 0x0094ff9b, 0xff83e586, 0x005df954, 0xffbecc8d, 0x00295380, 0xffe85ca7, 0x000be687, 0xfffafc7f, 0x00018fc1,
- 0x7ac63304, 0xf7a877d4, 0x02bfa06d, 0xff2aa243, 0xfffa3e37, 0x0067b303, 0xff76ca02, 0x00873f9b, 0xff8cb4bb, 0x00588ff1, 0xffc1f465, 0x002799b3, 0xffe93b9e, 0x000b812d, 0xfffb244a, 0x0001836a,
- 0x7a73d2b5, 0xf6e298db, 0x032864c1, 0xfee820f8, 0x00270631, 0x00491c54, 0xff8b841a, 0x0079827a, 0xff958542, 0x005323f7, 0xffc51eaf, 0x0025de22, 0xffea1ba2, 0x000b1b55, 0xfffb4c3e, 0x00017712,
- 0x7a1b7daa, 0xf620f4b2, 0x038fcc44, 0xfea63c38, 0x005381fa, 0x002aa9fa, 0xffa02eac, 0x006bca44, 0xff9e55c6, 0x004db63c, 0xffc84ae9, 0x00242115, 0xffeafc8b, 0x000ab510, 0xfffb7452, 0x00016abb,
- 0x79bd3bd8, 0xf5639376, 0x03f5cb46, 0xfe64fc93, 0x007fab77, 0x000c6043, 0xffb4c6b9, 0x005e1900, 0xffa724f0, 0x00484799, 0xffcb7893, 0x002262d6, 0xffebde33, 0x000a4e72, 0xfffb9c80, 0x00015e68,
- 0x795915bc, 0xf4aa7cce, 0x045a565c, 0xfe246a72, 0x00ab7ca6, 0xffee4372, 0xffc9494b, 0x005070b0, 0xffaff16f, 0x0042d8e1, 0xffcea72c, 0x0020a3ad, 0xffecc075, 0x0009e78c, 0xfffbc4bf, 0x0001521b,
- 0x78ef1457, 0xf3f5b7e4, 0x04bd6269, 0xfde48e17, 0x00d6ef99, 0xffd057bb, 0xffddb374, 0x0042d353, 0xffb8b9f3, 0x003d6aea, 0xffd1d635, 0x001ee3e1, 0xffeda32a, 0x00098070, 0xfffbed0a, 0x000145d7,
- 0x787f4134, 0xf3454b6a, 0x051ee498, 0xfda56f9c, 0x0101fe7a, 0xffb2a145, 0xfff2024e, 0x003542e2, 0xffc17d30, 0x0037fe85, 0xffd50530, 0x001d23b9, 0xffee862e, 0x0009192f, 0xfffc1558, 0x0001399e,
- 0x7809a65e, 0xf2993d95, 0x057ed264, 0xfd6716f2, 0x012ca389, 0xff952429, 0x000632fa, 0x0027c151, 0xffca39dd, 0x00329483, 0xffd833a0, 0x001b637e, 0xffef695c, 0x0008b1db, 0xfffc3da2, 0x00012d72,
- 0x778e4e68, 0xf1f19421, 0x05dd218f, 0xfd298be0, 0x0156d920, 0xff77e470, 0x001a42a4, 0x001a508e, 0xffd2eeb3, 0x002d2db0, 0xffdb6109, 0x0019a373, 0xfff04c8f, 0x00084a86, 0xfffc65e2, 0x00012155,
- 0x770d4466, 0xf14e544f, 0x0639c82d, 0xfcecd602, 0x018099b2, 0xff5ae614, 0x002e2e82, 0x000cf281, 0xffdb9a70, 0x0027cada, 0xffde8cf1, 0x0017e3df, 0xfff12fa3, 0x0007e33f, 0xfffc8e11, 0x0001154a,
- 0x768693ec, 0xf0af82e4, 0x0694bca0, 0xfcb0fcca, 0x01a9dfcc, 0xff3e2d01, 0x0041f3d2, 0xffffa90e, 0xffe43bd5, 0x00226ccb, 0xffe1b6dd, 0x00162507, 0xfff21275, 0x00077c17, 0xfffcb628, 0x00010952,
- 0x75fa4911, 0xf015242b, 0x06edf595, 0xfc76077b, 0x01d2a615, 0xff21bd11, 0x00558fdc, 0xfff27611, 0xffecd1a6, 0x001d144a, 0xffe4de56, 0x0014672d, 0xfff2f4e0, 0x00071520, 0xfffcde20, 0x0000fd6f,
- 0x75687068, 0xef7f3bf5, 0x07456a0e, 0xfc3bfd2e, 0x01fae74e, 0xff059a0e, 0x0068fff3, 0xffe55b60, 0xfff55aae, 0x0017c21c, 0xffe802e6, 0x0012aa95, 0xfff3d6c3, 0x0006ae6a, 0xfffd05f3, 0x0000f1a4,
- 0x74d11703, 0xeeedcd98, 0x079b1158, 0xfc02e4cc, 0x02229e57, 0xfee9c7af, 0x007c4177, 0xffd85ac9, 0xfffdd5b8, 0x00127704, 0xffeb2416, 0x0010ef82, 0xfff4b7fb, 0x00064804, 0xfffd2d9b, 0x0000e5f3,
- 0x74344a70, 0xee60dbee, 0x07eee314, 0xfbcac510, 0x0249c629, 0xfece499d, 0x008f51cf, 0xffcb7615, 0x00064197, 0x000d33c3, 0xffee4174, 0x000f3633, 0xfff59866, 0x0005e1fe, 0xfffd5511, 0x0000da5c,
- 0x739218b8, 0xedd86958, 0x0840d732, 0xfb93a486, 0x027059da, 0xfeb3236b, 0x00a22e71, 0xffbeaf06, 0x000e9d1f, 0x0007f915, 0xfff15a8d, 0x000d7eea, 0xfff677e2, 0x00057c68, 0xfffd7c4f, 0x0000cee3,
- 0x72ea905a, 0xed5477be, 0x0890e5f7, 0xfb5d898c, 0x029654a0, 0xfe98589b, 0x00b4d4dd, 0xffb20754, 0x0016e72c, 0x0002c7b6, 0xfff46ef1, 0x000bc9e6, 0xfff75650, 0x00051750, 0xfffda350, 0x0000c388,
- 0x723dc051, 0xecd5088e, 0x08df07f6, 0xfb287a4d, 0x02bbb1cc, 0xfe7dec9c, 0x00c7429f, 0xffa580b1, 0x001f1e9b, 0xfffda05c, 0xfff77e31, 0x000a1765, 0xfff8338e, 0x0004b2c7, 0xfffdca0d, 0x0000b84d,
- 0x718bb80b, 0xec5a1cbc, 0x092b3617, 0xfaf47cc4, 0x02e06ccf, 0xfe63e2cc, 0x00d97550, 0xff991cc9, 0x00274253, 0xfff883be, 0xfffa87df, 0x000867a5, 0xfff90f7c, 0x00044eda, 0xfffdf080, 0x0000ad34,
- 0x70d4876b, 0xebe3b4c5, 0x09756994, 0xfac196bb, 0x03048139, 0xfe4a3e70, 0x00eb6a95, 0xff8cdd3c, 0x002f513a, 0xfff3728d, 0xfffd8b92, 0x0006bae1, 0xfff9e9fd, 0x0003eb98, 0xfffe16a6, 0x0000a23f,
- 0x70183ec5, 0xeb71d0ab, 0x09bd9bfb, 0xfa8fcdca, 0x0327eab8, 0xfe3102bd, 0x00fd2022, 0xff80c3a4, 0x00374a40, 0xffee6d78, 0x000088df, 0x00051157, 0xfffac2f0, 0x0003890e, 0xfffe3c76, 0x0000976e,
- 0x6f56eee1, 0xeb046ffc, 0x0a03c72b, 0xfa5f2755, 0x034aa51b, 0xfe1832d4, 0x010e93b5, 0xff74d194, 0x003f2c57, 0xffe97529, 0x00037f60, 0x00036b3f, 0xfffb9a38, 0x0003274c, 0xfffe61ee, 0x00008cc4,
- 0x6e90a8f2, 0xea9b91cc, 0x0a47e559, 0xfa2fa890, 0x036cac52, 0xfdffd1bd, 0x011fc31c, 0xff690894, 0x0046f679, 0xffe48a4a, 0x00066eae, 0x0001c8d2, 0xfffc6fb8, 0x0002c65d, 0xfffe8707, 0x00008241,
- 0x6dc57e9b, 0xea3734bb, 0x0a89f10c, 0xfa015679, 0x038dfc6c, 0xfde7e26f, 0x0130ac31, 0xff5d6a24, 0x004ea7a3, 0xffdfad7f, 0x00095666, 0x00002a4a, 0xfffd4352, 0x00026650, 0xfffeabbd, 0x000077e8,
- 0x6cf581e8, 0xe9d756f3, 0x0ac9e521, 0xf9d435dc, 0x03ae919a, 0xfdd067ca, 0x01414cdd, 0xff51f7bb, 0x00563edb, 0xffdadf69, 0x000c3627, 0xfffe8fdc, 0xfffe14eb, 0x00020730, 0xfffed00a, 0x00006db9,
- 0x6c20c550, 0xe97bf627, 0x0b07bcc6, 0xf9a84b50, 0x03ce682d, 0xfdb96498, 0x0151a317, 0xff46b2c7, 0x005dbb29, 0xffd620a6, 0x000f0d91, 0xfffcf9be, 0xfffee466, 0x0001a90b, 0xfffef3ea, 0x000063b5,
- 0x6b475bb0, 0xe9250f99, 0x0b437380, 0xf97d9b37, 0x03ed7c9a, 0xfda2db8c, 0x0161ace5, 0xff3b9cad, 0x00651b9c, 0xffd171d1, 0x0011dc47, 0xfffb6825, 0xffffb1aa, 0x00014bed, 0xffff1759, 0x000059dd,
- 0x6a69584a, 0xe8d2a017, 0x0b7d0525, 0xf95429c0, 0x040bcb77, 0xfd8ccf46, 0x01716859, 0xff30b6c8, 0x006c5f4b, 0xffccd380, 0x0014a1ee, 0xfff9db44, 0x00007c9c, 0x0000efe1, 0xffff3a53, 0x00005033,
- 0x6986cec4, 0xe884a3fb, 0x0bb46de2, 0xf92bfae4, 0x0429517b, 0xfd77424c, 0x0180d397, 0xff260269, 0x00738551, 0xffc84645, 0x00175e2d, 0xfff8534d, 0x00014521, 0x000094f3, 0xffff5cd2, 0x000046b8,
- 0x689fd324, 0xe83b1731, 0x0be9aa34, 0xf9051266, 0x04460b81, 0xfd62370e, 0x018fecd1, 0xff1b80da, 0x007a8cd0, 0xffc3cab1, 0x001a10ad, 0xfff6d070, 0x00020b23, 0x00003b2e, 0xffff7ed3, 0x00003d6c,
- 0x67b479cf, 0xe7f5f531, 0x0c1cb6ef, 0xf8df73d6, 0x0461f688, 0xfd4dafe6, 0x019eb246, 0xff113358, 0x008174ef, 0xffbf614e, 0x001cb91a, 0xfff552de, 0x0002ce87, 0xffffe29d, 0xffffa052, 0x00003450,
- 0x66c4d787, 0xe7b53908, 0x0c4d913a, 0xf8bb228c, 0x047d0fb1, 0xfd39af17, 0x01ad2249, 0xff071b16, 0x00883cdc, 0xffbb0aa3, 0x001f5723, 0xfff3dac3, 0x00038f37, 0xffff8b4b, 0xffffc14b, 0x00002b66,
- 0x65d10168, 0xe778dd50, 0x0c7c368d, 0xf89821ac, 0x0497543f, 0xfd2636ca, 0x01bb3b37, 0xfefd3941, 0x008ee3cd, 0xffb6c735, 0x0021ea76, 0xfff2684e, 0x00044d1b, 0xffff3540, 0xffffe1bc, 0x000022ad,
- 0x64d90ce7, 0xe740dc3c, 0x0ca8a4b7, 0xf8767422, 0x04b0c19a, 0xfd134913, 0x01c8fb81, 0xfef38ef6, 0x009568fc, 0xffb29782, 0x002472c8, 0xfff0fba9, 0x0005081f, 0xfffee088, 0x0000019f, 0x00001a28,
- 0x63dd0fcd, 0xe70d2f8d, 0x0cd2d9d5, 0xf8561ca7, 0x04c9554e, 0xfd00e7ec, 0x01d661a6, 0xfeea1d4c, 0x009bcbab, 0xffae7c06, 0x0026efcc, 0xffef94fe, 0x0005c02c, 0xfffe8d2c, 0x000020f3, 0x000011d5,
- 0x62dd2039, 0xe6ddd09f, 0x0cfad45a, 0xf8371dbb, 0x04e10d0a, 0xfcef153a, 0x01e36c34, 0xfee0e54e, 0x00a20b23, 0xffaa7538, 0x0029613a, 0xffee3477, 0x0006752d, 0xfffe3b35, 0x00003fb3, 0x000009b6,
- 0x61d95497, 0xe6b2b862, 0x0d209309, 0xf81979ab, 0x04f7e6a2, 0xfcddd2c7, 0x01f019cb, 0xfed7e7fd, 0x00a826b2, 0xffa6838c, 0x002bc6cd, 0xffecda3b, 0x0007270f, 0xfffdeaaa, 0x00005ddd, 0x000001cc,
- 0x60d1c3a6, 0xe68bdf5e, 0x0d4414f9, 0xf7fd328c, 0x050de00d, 0xfccd2246, 0x01fc691b, 0xfecf2650, 0x00ae1dae, 0xffa2a770, 0x002e2040, 0xffeb866f, 0x0007d5bf, 0xfffd9b96, 0x00007b6f, 0xfffffa17,
- 0x5fc68470, 0xe6693db5, 0x0d65598f, 0xf7e24a3c, 0x0522f766, 0xfcbd0551, 0x020858e2, 0xfec6a130, 0x00b3ef73, 0xff9ee150, 0x00306d52, 0xffea3939, 0x0008812a, 0xfffd4dff, 0x00009865, 0xfffff297,
- 0x5eb7ae46, 0xe64acb24, 0x0d846084, 0xf7c8c267, 0x05372aee, 0xfcad7d6b, 0x0213e7f0, 0xfebe5980, 0x00b99b65, 0xff9b3192, 0x0032adc4, 0xffe8f2bb, 0x0009293e, 0xfffd01ee, 0x0000b4bd, 0xffffeb4c,
- 0x5da558c5, 0xe6307f05, 0x0da129df, 0xf7b09c7f, 0x054a7909, 0xfc9e8bfd, 0x021f1526, 0xfeb65015, 0x00bf20ee, 0xff979898, 0x0034e15b, 0xffe7b317, 0x0009cdeb, 0xfffcb769, 0x0000d074, 0xffffe438,
- 0x5c8f9bcb, 0xe61a504f, 0x0dbbb5f6, 0xf799d9c4, 0x055ce03f, 0xfc903258, 0x0229df75, 0xfeae85bb, 0x00c47f7f, 0xff9416c1, 0x003707dc, 0xffe67a6f, 0x000a6f20, 0xfffc6e78, 0x0000eb89, 0xffffdd5a,
- 0x5b768f7a, 0xe6083599, 0x0dd40571, 0xf7847b3d, 0x056e5f3d, 0xfc8271b4, 0x023445dd, 0xfea6fb32, 0x00c9b691, 0xff90ac66, 0x00392111, 0xffe548e0, 0x000b0cce, 0xfffc2720, 0x000105f9, 0xffffd6b2,
- 0x5a5a4c32, 0xe5fa2519, 0x0dea1943, 0xf77081be, 0x057ef4d3, 0xfc754b32, 0x023e4772, 0xfe9fb12e, 0x00cec5a1, 0xff8d59dd, 0x003b2cc5, 0xffe41e88, 0x000ba6e5, 0xfffbe169, 0x00011fc3, 0xffffd041,
- 0x593aea93, 0xe5f014aa, 0x0dfdf2ae, 0xf75dede5, 0x058e9ff8, 0xfc68bfd7, 0x0247e354, 0xfe98a85b, 0x00d3ac38, 0xff8a1f77, 0x003d2ac6, 0xffe2fb83, 0x000c3d59, 0xfffb9d59, 0x000138e4, 0xffffca06,
- 0x58188376, 0xe5e9f9ca, 0x0e0f9342, 0xf74cc01c, 0x059d5fc5, 0xfc5cd092, 0x025118b8, 0xfe91e159, 0x00d869e1, 0xff86fd81, 0x003f1ae4, 0xffe1dfec, 0x000cd01b, 0xfffb5af3, 0x0001515c, 0xffffc402,
- 0x56f32fea, 0xe5e7c99e, 0x0e1efcdb, 0xf73cf898, 0x05ab3377, 0xfc517e38, 0x0259e6e1, 0xfe8b5cba, 0x00dcfe32, 0xff83f443, 0x0040fcf3, 0xffe0cbdc, 0x000d5f1f, 0xfffb1a3f, 0x00016928, 0xffffbe35,
- 0x55cb0935, 0xe5e978f0, 0x0e2c319d, 0xf72e9758, 0x05b81a70, 0xfc46c987, 0x02624d23, 0xfe851b09, 0x00e168c5, 0xff810401, 0x0042d0c9, 0xffdfbf6b, 0x000dea5a, 0xfffadb40, 0x00018048, 0xffffb89f,
- 0x54a028d0, 0xe5eefc35, 0x0e3733fc, 0xf7219c2a, 0x05c41435, 0xfc3cb323, 0x026a4ae5, 0xfe7f1cc4, 0x00e5a93c, 0xff7e2cfb, 0x0044963d, 0xffdebaaf, 0x000e71c1, 0xfffa9dfa, 0x000196ba, 0xffffb340,
- 0x5372a862, 0xe5f8478d, 0x0e4006b2, 0xf71606a6, 0x05cf2070, 0xfc333b97, 0x0271df9c, 0xfe79625e, 0x00e9bf43, 0xff7b6f6c, 0x00464d2b, 0xffddbdbd, 0x000ef549, 0xfffa6273, 0x0001ac7d, 0xffffae17,
- 0x5242a1c1, 0xe6054ec6, 0x0e46acc4, 0xf70bd632, 0x05d93eee, 0xfc2a6356, 0x02790ace, 0xfe73ec40, 0x00edaa88, 0xff78cb8c, 0x0047f571, 0xffdcc8a9, 0x000f74e9, 0xfffa28ad, 0x0001c191, 0xffffa924,
- 0x51102eec, 0xe616055a, 0x0e4b297c, 0xf7030a01, 0x05e26f9f, 0xfc222abb, 0x027fcc12, 0xfe6ebac6, 0x00f16ac4, 0xff76418b, 0x00498eed, 0xffdbdb84, 0x000ff098, 0xfff9f0ac, 0x0001d5f4, 0xffffa467,
- 0x4fdb6a09, 0xe62a5e76, 0x0e4d806f, 0xf6fba113, 0x05eab296, 0xfc1a9208, 0x02862311, 0xfe69ce43, 0x00f4ffb6, 0xff73d199, 0x004b1984, 0xffdaf65e, 0x0010684e, 0xfff9ba73, 0x0001e9a7, 0xffff9fe0,
- 0x4ea46d66, 0xe6424cf8, 0x0e4db575, 0xf6f59a36, 0x05f20809, 0xfc139968, 0x028c0f83, 0xfe6526fe, 0x00f86924, 0xff717bdf, 0x004c951b, 0xffda1948, 0x0010dc05, 0xfff98604, 0x0001fca8, 0xffff9b8f,
- 0x4d6b536f, 0xe65dc373, 0x0e4bccac, 0xf6f0f407, 0x05f87053, 0xfc0d40ec, 0x0291912f, 0xfe60c533, 0x00fba6da, 0xff6f4083, 0x004e0199, 0xffd9444e, 0x00114bb4, 0xfff95363, 0x00020ef7, 0xffff9773,
- 0x4c3036b2, 0xe67cb42f, 0x0e47ca78, 0xf6edacf2, 0x05fdebee, 0xfc07888e, 0x0296a7f0, 0xfe5ca913, 0x00feb8ad, 0xff6d1fa5, 0x004f5ee9, 0xffd8777d, 0x0011b757, 0xfff92290, 0x00022095, 0xffff938c,
- 0x4af331d9, 0xe69f112f, 0x0e41b37c, 0xf6ebc332, 0x06027b78, 0xfc027031, 0x029b53af, 0xfe58d2c5, 0x01019e78, 0xff6b1961, 0x0050acf7, 0xffd7b2e0, 0x00121ee9, 0xfff8f38e, 0x00023181, 0xffff8fd9,
- 0x49b45fa8, 0xe6c4cc2e, 0x0e398c9f, 0xf6eb34d4, 0x06061fb2, 0xfbfdf79e, 0x029f9466, 0xfe554265, 0x0104581c, 0xff692dd2, 0x0051ebb4, 0xffd6f67f, 0x00128265, 0xfff8c65d, 0x000241bb, 0xffff8c5a,
- 0x4873daf7, 0xe6edd6a4, 0x0e2f5b0b, 0xf6ebffb2, 0x0608d97c, 0xfbfa1e88, 0x02a36a1e, 0xfe51f802, 0x0106e583, 0xff675d09, 0x00531b12, 0xffd64264, 0x0012e1c8, 0xfff89b00, 0x00025143, 0xffff890e,
- 0x4731beb7, 0xe71a21c7, 0x0e232425, 0xf6ee217b, 0x060aa9da, 0xfbf6e48c, 0x02a6d4f0, 0xfe4ef3a4, 0x0109469d, 0xff65a718, 0x00543b04, 0xffd59695, 0x00133d0e, 0xfff87176, 0x0002601b, 0xffff85f5,
- 0x45ee25e7, 0xe7499e8f, 0x0e14ed93, 0xf6f197ad, 0x060b91ee, 0xfbf4492d, 0x02a9d508, 0xfe4c3546, 0x010b7b61, 0xff640c08, 0x00554b83, 0xffd4f316, 0x00139436, 0xfff849c0, 0x00026e41, 0xffff830e,
- 0x44a92b96, 0xe77c3db4, 0x0e04bd39, 0xf6f65f9b, 0x060b92ff, 0xfbf24bd9, 0x02ac6a9e, 0xfe49bcd9, 0x010d83cb, 0xff628be3, 0x00564c88, 0xffd457ec, 0x0013e73e, 0xfff823dd, 0x00027bb8, 0xffff805a,
- 0x4362eadc, 0xe7b1efb4, 0x0df29936, 0xf6fc766a, 0x060aae6e, 0xfbf0ebe7, 0x02ae95fb, 0xfe478a42, 0x010f5fe2, 0xff6126a9, 0x00573e0f, 0xffd3c519, 0x00143626, 0xfff7ffce, 0x0002887f, 0xffff7dd6,
- 0x421b7edf, 0xe7eaa4d4, 0x0dde87e2, 0xf703d912, 0x0608e5c2, 0xfbf02896, 0x02b05779, 0xfe459d5e, 0x01110faf, 0xff5fdc5b, 0x00582016, 0xffd33a9e, 0x001480ec, 0xfff7dd92, 0x00029497, 0xffff7b82,
- 0x40d302c5, 0xe8264d21, 0x0dc88fd2, 0xf70c8461, 0x06063a9d, 0xfbf00112, 0x02b1af7f, 0xfe43f5ff, 0x01129344, 0xff5eacf3, 0x0058f29f, 0xffd2b87c, 0x0014c792, 0xfff7bd28, 0x0002a002, 0xffff795f,
- 0x3f8991bd, 0xe864d874, 0x0db0b7d1, 0xf71674fa, 0x0602aec3, 0xfbf0746e, 0x02b29e84, 0xfe4293ec, 0x0113eabb, 0xff5d9867, 0x0059b5ad, 0xffd23eaf, 0x00150a19, 0xfff79e8f, 0x0002aac0, 0xffff776a,
- 0x3e3f46f2, 0xe8a63671, 0x0d9706e1, 0xf721a756, 0x05fe4414, 0xfbf181a9, 0x02b3250f, 0xfe4176e2, 0x01151632, 0xff5c9eaa, 0x005a6946, 0xffd1cd37, 0x00154883, 0xfff781c5, 0x0002b4d2, 0xffff75a3,
- 0x3cf43d8f, 0xe8ea568f, 0x0d7b843b, 0xf72e17c4, 0x05f8fc8f, 0xfbf327ab, 0x02b343b5, 0xfe409e95, 0x011615ce, 0xff5bbfaa, 0x005b0d72, 0xffd1640e, 0x001582d3, 0xfff766c8, 0x0002be3b, 0xffff740a,
- 0x3ba890b9, 0xe9312813, 0x0d5e3749, 0xf73bc26b, 0x05f2da52, 0xfbf56549, 0x02b2fb1a, 0xfe400aae, 0x0116e9bc, 0xff5afb53, 0x005ba23b, 0xffd1032f, 0x0015b90b, 0xfff74d97, 0x0002c6fa, 0xffff729e,
- 0x3a5c5b8e, 0xe97a9a17, 0x0d3f27ab, 0xf74aa34c, 0x05ebdf97, 0xfbf83941, 0x02b24bf1, 0xfe3fbacd, 0x0117922f, 0xff5a5189, 0x005c27af, 0xffd0aa93, 0x0015eb2f, 0xfff7362f, 0x0002cf12, 0xffff715d,
- 0x390fb920, 0xe9c69b8c, 0x0d1e5d32, 0xf75ab63f, 0x05e40eb3, 0xfbfba23f, 0x02b136f9, 0xfe3fae87, 0x01180f5d, 0xff59c230, 0x005c9ddc, 0xffd05a33, 0x00161944, 0xfff7208d, 0x0002d684, 0xffff7047,
- 0x37c2c474, 0xea151b3a, 0x0cfbdfdd, 0xf76bf6f7, 0x05db6a19, 0xfbff9ed7, 0x02afbd02, 0xfe3fe569, 0x01186187, 0xff594d27, 0x005d04d4, 0xffd01205, 0x0016434f, 0xfff70caf, 0x0002dd53, 0xffff6f5c,
- 0x36759880, 0xea6607c4, 0x0cd7b7dd, 0xf77e6103, 0x05d1f459, 0xfc042d8e, 0x02addee8, 0xfe405ef6, 0x011888f2, 0xff58f249, 0x005d5cab, 0xffcfd1ff, 0x00166956, 0xfff6fa92, 0x0002e37e, 0xffff6e99,
- 0x35285026, 0xeab94fa9, 0x0cb1ed8c, 0xf791efcb, 0x05c7b01a, 0xfc094cd2, 0x02ab9d96, 0xfe411aa8, 0x011885e7, 0xff58b16c, 0x005da575, 0xffcf9a15, 0x00168b5e, 0xfff6ea31, 0x0002e90a, 0xffff6dff,
- 0x33db0631, 0xeb0ee148, 0x0c8a8973, 0xf7a69e96, 0x05bca021, 0xfc0efafe, 0x02a8fa03, 0xfe4217ef, 0x011858b9, 0xff588a65, 0x005ddf4c, 0xffcf6a3b, 0x0016a96f, 0xfff6db89, 0x0002edf6, 0xffff6d8d,
- 0x328dd556, 0xeb66aae0, 0x0c619444, 0xf7bc6889, 0x05b0c74b, 0xfc15365c, 0x02a5f535, 0xfe435633, 0x011801be, 0xff587d03, 0x005e0a48, 0xffcf4262, 0x0016c390, 0xfff6ce97, 0x0002f246, 0xffff6d40,
- 0x3140d82e, 0xebc09a94, 0x0c3716da, 0xf7d348a4, 0x05a42890, 0xfc1bfd22, 0x02a2903e, 0xfe44d4d3, 0x01178152, 0xff588913, 0x005e2687, 0xffcf227b, 0x0016d9c9, 0xfff6c356, 0x0002f5fc, 0xffff6d1a,
- 0x2ff42933, 0xec1c9e6d, 0x0c0b1a37, 0xf7eb39cc, 0x0596c6ff, 0xfc234d75, 0x029ecc3c, 0xfe469325, 0x0116d7d7, 0xff58ae5d, 0x005e3427, 0xffcf0a77, 0x0016ec22, 0xfff6b9c1, 0x0002f919, 0xffff6d17,
- 0x2ea7e2c0, 0xec7aa45b, 0x0bdda783, 0xf80436c0, 0x0588a5bf, 0xfc2b2567, 0x029aaa5a, 0xfe489077, 0x011605b5, 0xff58eca8, 0x005e3347, 0xffcefa44, 0x0016faa5, 0xfff6b1d5, 0x0002fba0, 0xffff6d38,
- 0x2d5c1f0e, 0xecda9a39, 0x0baec80a, 0xf81e3a25, 0x0579c812, 0xfc3382fb, 0x02962bd1, 0xfe4acc0e, 0x01150b5a, 0xff5943b4, 0x005e240a, 0xffcef1cf, 0x0017055b, 0xfff6ab8c, 0x0002fd94, 0xffff6d7c,
- 0x2c10f82d, 0xed3c6dce, 0x0b7e853c, 0xf8393e81, 0x056a314b, 0xfc3c6420, 0x029151e3, 0xfe4d4526, 0x0113e937, 0xff59b340, 0x005e0694, 0xffcef106, 0x00170c4f, 0xfff6a6e2, 0x0002fef6, 0xffff6de2,
- 0x2ac68807, 0xeda00cd1, 0x0b4ce8a8, 0xf8553e3c, 0x0559e4da, 0xfc45c6b6, 0x028c1de0, 0xfe4ffaf6, 0x01129fc5, 0xff5a3b09, 0x005ddb0b, 0xffcef7d4, 0x00170f8a, 0xfff6a3d0, 0x0002ffc9, 0xffff6e67,
- 0x297ce85a, 0xee0564e8, 0x0b19fbfe, 0xf87233a4, 0x0548e63f, 0xfc4fa88f, 0x02869122, 0xfe52ecab, 0x01112f81, 0xff5adac6, 0x005da198, 0xffcf0623, 0x00170f18, 0xfff6a252, 0x00030010, 0xffff6f0d,
- 0x283432b9, 0xee6c63ad, 0x0ae5c90b, 0xf89018eb, 0x05373912, 0xfc5a076a, 0x0280ad0f, 0xfe561969, 0x010f98eb, 0xff5b922d, 0x005d5a62, 0xffcf1bde, 0x00170b04, 0xfff6a262, 0x0002ffcd, 0xffff6fd1,
- 0x26ec8083, 0xeed4f6b0, 0x0ab059bc, 0xf8aee828, 0x0524e100, 0xfc64e0f9, 0x027a7318, 0xfe598050, 0x010ddc8c, 0xff5c60ee, 0x005d0597, 0xffcf38ec, 0x0017035a, 0xfff6a3f9, 0x0002ff03, 0xffff70b2,
- 0x25a5eae8, 0xef3f0b78, 0x0a79b814, 0xf8ce9b5d, 0x0511e1c6, 0xfc7032de, 0x0273e4b8, 0xfe5d2075, 0x010bfaee, 0xff5d46bb, 0x005ca363, 0xffcf5d36, 0x0016f828, 0xfff6a713, 0x0002fdb4, 0xffff71b0,
- 0x24608ae2, 0xefaa8f87, 0x0a41ee32, 0xf8ef2c71, 0x04fe3f39, 0xfc7bfaad, 0x026d0374, 0xfe60f8ea, 0x0109f4a2, 0xff5e433e, 0x005c33f6, 0xffcf88a2, 0x0016e979, 0xfff6aba9, 0x0002fbe4, 0xffff72c9,
- 0x231c7932, 0xf017705a, 0x0a09064e, 0xf9109535, 0x04e9fd3c, 0xfc8835ed, 0x0265d0dd, 0xfe6508b6, 0x0107ca3c, 0xff5f5621, 0x005bb77f, 0xffcfbb17, 0x0016d75b, 0xfff6b1b4, 0x0002f995, 0xffff73fc,
- 0x21d9ce63, 0xf0859b6e, 0x09cf0ab4, 0xf932cf65, 0x04d51fc6, 0xfc94e216, 0x025e4e8b, 0xfe694edd, 0x01057c57, 0xff607f0b, 0x005b2e31, 0xffcff478, 0x0016c1dc, 0xfff6b92d, 0x0002f6c9, 0xffff7549,
- 0x2098a2bf, 0xf0f4fe3d, 0x099405c6, 0xf955d4a7, 0x04bfaadf, 0xfca1fc96, 0x02567e22, 0xfe6dca58, 0x01030b8e, 0xff61bd9f, 0x005a9840, 0xffd034ac, 0x0016a90a, 0xfff6c20f, 0x0002f385, 0xffff76ae,
- 0x1f590e55, 0xf1658649, 0x095801f8, 0xf9799e8f, 0x04a9a29e, 0xfcaf82ca, 0x024e614c, 0xfe727a1f, 0x01007885, 0xff631180, 0x0059f5e1, 0xffd07b95, 0x00168cf2, 0xfff6cc52, 0x0002efca, 0xffff782a,
- 0x1e1b28f2, 0xf1d72114, 0x091b09d1, 0xf99e269e, 0x04930b2b, 0xfcbd7206, 0x0245f9bf, 0xfe775d1f, 0x00fdc3e0, 0xff647a4b, 0x0059474a, 0xffd0c915, 0x00166da5, 0xfff6d7f0, 0x0002eb9c, 0xffff79bc,
- 0x1cdf0a20, 0xf249bc2c, 0x08dd27e6, 0xf9c36642, 0x047be8bc, 0xfccbc793, 0x023d4937, 0xfe7c7243, 0x00faee49, 0xff65f79e, 0x00588cb4, 0xffd11d0f, 0x00164b32, 0xfff6e4e1, 0x0002e6fe, 0xffff7b63,
- 0x1ba4c923, 0xf2bd4523, 0x089e66dd, 0xf9e956da, 0x04643f95, 0xfcda80ad, 0x0234517a, 0xfe81b86d, 0x00f7f86e, 0xff678912, 0x0057c658, 0xffd17764, 0x001625a7, 0xfff6f31d, 0x0002e1f3, 0xffff7d1f,
- 0x1a6c7cf9, 0xf331a99b, 0x085ed167, 0xfa0ff1b6, 0x044c1409, 0xfce99a86, 0x022b1455, 0xfe872e7c, 0x00f4e2ff, 0xff692e3f, 0x0056f471, 0xffd1d7f5, 0x0015fd15, 0xfff7029f, 0x0002dc7d, 0xffff7eed,
- 0x19363c54, 0xf3a6d741, 0x081e7241, 0xfa373017, 0x04336a75, 0xfcf91246, 0x0221939d, 0xfe8cd349, 0x00f1aeb2, 0xff6ae6ba, 0x0056173b, 0xffd23ea1, 0x0015d18b, 0xfff7135d, 0x0002d6a0, 0xffff80cd,
- 0x18021d9d, 0xf41cbbd3, 0x07dd5430, 0xfa5f0b30, 0x041a4744, 0xfd08e50c, 0x0217d12d, 0xfe92a5a7, 0x00ee5c3e, 0xff6cb218, 0x00552ef3, 0xffd2ab47, 0x0015a31b, 0xfff72551, 0x0002d060, 0xffff82bf,
- 0x16d036eb, 0xf493451f, 0x079b8203, 0xfa877c29, 0x0400aeec, 0xfd190fed, 0x020dcee8, 0xfe98a466, 0x00eaec5e, 0xff6e8fe9, 0x00543bd8, 0xffd31dc7, 0x001571d5, 0xfff73873, 0x0002c9be, 0xffff84c0,
- 0x15a09e09, 0xf50a610a, 0x0759068f, 0xfab07c1d, 0x03e6a5ee, 0xfd298ff6, 0x02038eb7, 0xfe9ece4f, 0x00e75fd1, 0xff707fbd, 0x00533e29, 0xffd395fd, 0x00153dca, 0xfff74cba, 0x0002c2be, 0xffff86d0,
- 0x1473686d, 0xf581fd8b, 0x0715ecae, 0xfada0420, 0x03cc30d4, 0xfd3a622b, 0x01f9128a, 0xfea52227, 0x00e3b758, 0xff728121, 0x00523626, 0xffd413c9, 0x0015070b, 0xfff76220, 0x0002bb64, 0xffff88ee,
- 0x1348ab3a, 0xf5fa08b5, 0x06d23f3d, 0xfb040d3b, 0x03b15431, 0xfd4b8389, 0x01ee5c55, 0xfeab9eb2, 0x00dff3b7, 0xff7493a2, 0x00512412, 0xffd49705, 0x0014cdab, 0xfff7789c, 0x0002b3b3, 0xffff8b19,
- 0x12207b3e, 0xf67270b1, 0x068e091c, 0xfb2e906f, 0x039614a1, 0xfd5cf105, 0x01e36e14, 0xfeb242ac, 0x00dc15b4, 0xff76b6ca, 0x0050082f, 0xffd51f90, 0x001491b9, 0xfff79026, 0x0002abad, 0xffff8d50,
- 0x10faecee, 0xf6eb23c6, 0x0649552a, 0xfb5986b6, 0x037a76c7, 0xfd6ea790, 0x01d849c7, 0xfeb90cce, 0x00d81e1a, 0xff78ea20, 0x004ee2c1, 0xffd5ad44, 0x00145349, 0xfff7a8b6, 0x0002a357, 0xffff8f92,
- 0x0fd81464, 0xf7641059, 0x06042e45, 0xfb84e906, 0x035e7f4e, 0xfd80a411, 0x01ccf173, 0xfebffbd0, 0x00d40db3, 0xff7b2d2d, 0x004db40c, 0xffd63ffe, 0x0014126c, 0xfff7c245, 0x00029ab2, 0xffff91de,
- 0x0eb80562, 0xf7dd24ef, 0x05be9f49, 0xfbb0b04e, 0x034232e6, 0xfd92e36c, 0x01c16720, 0xfec70e64, 0x00cfe54f, 0xff7d7f76, 0x004c7c55, 0xffd6d798, 0x0013cf36, 0xfff7dcc8, 0x000291c3, 0xffff9434,
- 0x0d9ad348, 0xf856502d, 0x0578b30e, 0xfbdcd57a, 0x03259644, 0xfda5627e, 0x01b5acdd, 0xfece433a, 0x00cba5bc, 0xff7fe07f, 0x004b3be3, 0xffd773ed, 0x001389b7, 0xfff7f83a, 0x0002888c, 0xffff9691,
- 0x0c80911b, 0xf8cf80de, 0x05327467, 0xfc095174, 0x0308ae24, 0xfdb81e22, 0x01a9c4bc, 0xfed598fe, 0x00c74fce, 0xff824fca, 0x0049f2fc, 0xffd814d7, 0x00134204, 0xfff81490, 0x00027f11, 0xffff98f5,
- 0x0b69517e, 0xf948a5f0, 0x04ebee1c, 0xfc361d25, 0x02eb7f44, 0xfdcb132d, 0x019db0d0, 0xfedd0e5c, 0x00c2e457, 0xff84ccdb, 0x0048a1e7, 0xffd8ba31, 0x0012f82e, 0xfff831c3, 0x00027555, 0xffff9b60,
- 0x0a5526b0, 0xf9c1ae7b, 0x04a52af2, 0xfc633173, 0x02ce0e67, 0xfdde3e6f, 0x01917334, 0xfee4a1fa, 0x00be642f, 0xff875731, 0x004748ed, 0xffd963d4, 0x0012ac48, 0xfff84fcb, 0x00026b5b, 0xffff9dd0,
- 0x0944228e, 0xfa3a89be, 0x045e359f, 0xfc908746, 0x02b0604f, 0xfdf19cb9, 0x01850e00, 0xfeec527e, 0x00b9d02b, 0xff89ee4d, 0x0045e856, 0xffda1199, 0x00125e66, 0xfff86e9e, 0x00026126, 0xffffa045,
- 0x08365690, 0xfab32723, 0x041718d2, 0xfcbe1789, 0x029279c4, 0xfe052ad4, 0x01788354, 0xfef41e8c, 0x00b52925, 0xff8c91ad, 0x0044806c, 0xffdac35a, 0x00120e9b, 0xfff88e35, 0x000256b9, 0xffffa2be,
- 0x072bd3c5, 0xfb2b7641, 0x03cfdf29, 0xfcebdb26, 0x02745f8c, 0xfe18e58c, 0x016bd54f, 0xfefc04c6, 0x00b06ff7, 0xff8f40d0, 0x00431177, 0xffdb78ef, 0x0011bcf9, 0xfff8ae88, 0x00024c18, 0xffffa539,
- 0x0624aad6, 0xfba366df, 0x03889336, 0xfd19cb0e, 0x02561670, 0xfe2cc9a7, 0x015f0612, 0xff0403cc, 0x00aba57c, 0xff91fb31, 0x00419bc2, 0xffdc3231, 0x00116994, 0xfff8cf8d, 0x00024146, 0xffffa7b7,
- 0x0520ec00, 0xfc1ae8f2, 0x03413f7b, 0xfd47e035, 0x0237a337, 0xfe40d3ed, 0x015217c0, 0xff0c1a3c, 0x00a6ca90, 0xff94c04f, 0x00401f98, 0xffdceef9, 0x00111480, 0xfff8f13c, 0x00023645, 0xffffaa35,
- 0x0420a716, 0xfc91eca1, 0x02f9ee68, 0xfd761395, 0x02190aa6, 0xfe550124, 0x01450c7f, 0xff1446b5, 0x00a1e00f, 0xff978fa6, 0x003e9d42, 0xffddaf1e, 0x0010bdcf, 0xfff9138e, 0x00022b19, 0xffffacb4,
- 0x0323eb7f, 0xfd086246, 0x02b2aa5c, 0xfda45e2c, 0x01fa5183, 0xfe694e12, 0x0137e672, 0xff1c87d3, 0x009ce6d8, 0xff9a68b0, 0x003d150d, 0xffde727a, 0x00106595, 0xfff93679, 0x00021fc5, 0xffffaf33,
-};
-
-// cmd-line: fir -l 7 -s 44100 -c 19876 -n 16 -b 9.62
-const uint32_t dn_sampler_filter_coefficients[] __attribute__ ((aligned (32))) = {
- 0x736144b5, 0x0c333a22, 0xf4fca390, 0x09424904, 0xf8c92a41, 0x052ac04c, 0xfca4fc64, 0x01ed8cc7, 0xff119cc0, 0x0053ba6e, 0xfff9a80d, 0xffeaeaab, 0x001690d9, 0xfff11dcd, 0x000715d9, 0xfffdb4b9,
- 0x735ed3aa, 0x0b433de8, 0xf560f0f3, 0x091282c4, 0xf8dd5ccf, 0x0525cb66, 0xfca23e3d, 0x01f33960, 0xff0bc9c2, 0x00586127, 0xfff68603, 0xffecbad5, 0x0015ab8b, 0xfff17c10, 0x0006f71a, 0xfffdbc2f,
- 0x735780bb, 0x0a55a98f, 0xf5c5b2a1, 0x08e1ea27, 0xf8f25767, 0x0520366d, 0xfc9ff262, 0x01f89c98, 0xff0620a4, 0x005cf349, 0xfff36c0d, 0xffee8913, 0x0014c5dc, 0xfff1db1a, 0x0006d7d7, 0xfffdc3db,
- 0x734b4c77, 0x096a8a51, 0xf62adb7c, 0x08b086aa, 0xf9081629, 0x051a030f, 0xfc9e186a, 0x01fdb637, 0xff00a1d8, 0x00617065, 0xfff05a84, 0xfff0552d, 0x0013dfed, 0xfff23ada, 0x0006b817, 0xfffdcbba,
- 0x733a37d2, 0x0881ed1f, 0xf6905e79, 0x087e5fd7, 0xf91e9521, 0x05133308, 0xfc9cafe0, 0x0202860e, 0xfefb4dc7, 0x0065d80c, 0xffed51bc, 0xfff21ee8, 0x0012f9de, 0xfff29b40, 0x000697e0, 0xfffdd3ca,
- 0x7324441e, 0x079bdea7, 0xf6f62e9d, 0x084b7d43, 0xf935d048, 0x050bc828, 0xfc9bb83e, 0x02070bf9, 0xfef624d8, 0x006a29d6, 0xffea520a, 0xfff3e60f, 0x001213d0, 0xfff2fc3d, 0x00067739, 0xfffddc07,
- 0x7309730f, 0x06b86b52, 0xf75c3eff, 0x0817e68c, 0xf94dc388, 0x0503c44d, 0xfc9b30f3, 0x020b47dd, 0xfef12766, 0x006e655c, 0xffe75bbe, 0xfff5aa69, 0x00112de1, 0xfff35dc1, 0x00065629, 0xfffde470,
- 0x72e9c6b8, 0x05d79f40, 0xf7c282cb, 0x07e3a35a, 0xf9666ab7, 0x04fb2969, 0xfc9b195f, 0x020f39ab, 0xfeec55cc, 0x00728a3d, 0xffe46f2a, 0xfff76bc2, 0x00104831, 0xfff3bfbc, 0x000634b6, 0xfffded03,
- 0x72c5418e, 0x04f98649, 0xf828ed43, 0x07aebb5d, 0xf97fc19e, 0x04f1f97c, 0xfc9b70d6, 0x0212e15c, 0xfee7b059, 0x0076981a, 0xffe18c9a, 0xfff929e3, 0x000f62de, 0xfff4221f, 0x000612e8, 0xfffdf5bc,
- 0x729be665, 0x041e2bfe, 0xf88f71bf, 0x0779364a, 0xf999c3f4, 0x04e83697, 0xfc9c369c, 0x02163ef1, 0xfee33759, 0x007a8e98, 0xffdeb45b, 0xfffae49b, 0x000e7e08, 0xfff484db, 0x0005f0c4, 0xfffdfe9b,
- 0x726db871, 0x03459ba4, 0xf8f603ae, 0x07431bdf, 0xf9b46d64, 0x04dde2da, 0xfc9d69eb, 0x02195278, 0xfedeeb11, 0x007e6d61, 0xffdbe6b6, 0xfffc9bb4, 0x000d99cc, 0xfff4e7e1, 0x0005ce51, 0xfffe079b,
- 0x723abb44, 0x026fe039, 0xf95c9699, 0x070c73dd, 0xf9cfb988, 0x04d30074, 0xfc9f09ee, 0x021c1c06, 0xfedacbbf, 0x00823422, 0xffd923f4, 0xfffe4efd, 0x000cb647, 0xfff54b20, 0x0005ab95, 0xfffe10bc,
- 0x7202f2d3, 0x019d046d, 0xf9c31e22, 0x06d5460b, 0xf9eba3ef, 0x04c791a4, 0xfca115c5, 0x021e9bbb, 0xfed6d99c, 0x0085e28b, 0xffd66c59, 0xfffffe46, 0x000bd397, 0xfff5ae8c, 0x00058898, 0xfffe19fa,
- 0x71c6636d, 0x00cd12a4, 0xfa298e07, 0x069d9a31, 0xfa082817, 0x04bb98b5, 0xfca38c83, 0x0220d1bf, 0xfed314da, 0x00897851, 0xffd3c02a, 0x0001a95d, 0x000af1d9, 0xfff61214, 0x0005655e, 0xfffe2354,
- 0x718511c2, 0x000014f8, 0xfa8fda21, 0x0665781b, 0xfa254176, 0x04af1804, 0xfca66d2e, 0x0222be45, 0xfecf7da3, 0x008cf52d, 0xffd11fa9, 0x00035015, 0x000a1129, 0xfff675ab, 0x000541f0, 0xfffe2cc8,
- 0x713f02e0, 0xff361534, 0xfaf5f669, 0x062ce795, 0xfa42eb75, 0x04a211f8, 0xfca9b6bf, 0x02246187, 0xfecc141d, 0x009058da, 0xffce8b13, 0x0004f23e, 0x000931a3, 0xfff6d942, 0x00051e52, 0xfffe3652,
- 0x70f43c32, 0xfe6f1cd7, 0xfb5bd6f4, 0x05f3f06b, 0xfa61216f, 0x04948906, 0xfcad6827, 0x0225bbca, 0xfec8d867, 0x0093a31a, 0xffcc02a8, 0x00068fad, 0x00085362, 0xfff73ccb, 0x0004fa8b, 0xfffe3ff2,
- 0x70a4c37f, 0xfdab350f, 0xfbc16ff6, 0x05ba9a6b, 0xfa7fdeba, 0x04867fb3, 0xfcb18047, 0x0226cd5b, 0xfec5ca9a, 0x0096d3af, 0xffc986a1, 0x00082835, 0x00077681, 0xfff7a037, 0x0004d6a1, 0xfffe49a4,
- 0x70509eec, 0xfcea66be, 0xfc26b5c5, 0x0580ed5f, 0xfa9f1e9e, 0x0477f88d, 0xfcb5fdf7, 0x02279691, 0xfec2eaca, 0x0099ea62, 0xffc71738, 0x0009bbab, 0x00069b1b, 0xfff8037a, 0x0004b29a, 0xfffe5367,
- 0x6ff7d4f8, 0xfc2cba75, 0xfc8b9cda, 0x0546f10f, 0xfabedc5a, 0x0468f62e, 0xfcbae002, 0x022817ca, 0xfec03901, 0x009ce6fe, 0xffc4b4a4, 0x000b49e6, 0x0005c149, 0xfff86686, 0x00048e7c, 0xfffe5d38,
- 0x6f9a6c7f, 0xfb723876, 0xfcf019cd, 0x050cad3f, 0xfadf1328, 0x04597b40, 0xfcc0252b, 0x0228516f, 0xfebdb547, 0x009fc954, 0xffc25f1a, 0x000cd2bd, 0x0004e926, 0xfff8c94c, 0x00046a4c, 0xfffe6716,
- 0x6f386cb6, 0xfabae8b2, 0xfd54215c, 0x04d229b1, 0xfaffbe36, 0x04498a72, 0xfcc5cc26, 0x022843f0, 0xfebb5f9b, 0x00a29136, 0xffc016cb, 0x000e5609, 0x000412c9, 0xfff92bc0, 0x00044612, 0xfffe70ff,
- 0x6ed1dd2e, 0xfa06d2ca, 0xfdb7a869, 0x04976e20, 0xfb20d8ad, 0x04392684, 0xfccbd3a0, 0x0227efc6, 0xfeb937f9, 0x00a53e7b, 0xffbddbe8, 0x000fd3a3, 0x00033e4c, 0xfff98dd6, 0x000421d2, 0xfffe7aef,
- 0x6e66c5ce, 0xf955fe0c, 0xfe1aa3fc, 0x045c8240, 0xfb425db0, 0x0428523d, 0xfcd23a3a, 0x02275572, 0xfeb73e54, 0x00a7d0ff, 0xffbbae9f, 0x00114b67, 0x00026bc6, 0xfff9ef80, 0x0003fd92, 0xfffe84e7,
- 0x6df72ed9, 0xf8a87178, 0xfe7d0942, 0x04216dc0, 0xfb64485b, 0x0417106e, 0xfcd8fe8b, 0x0226757e, 0xfeb5729b, 0x00aa48a0, 0xffb98f1c, 0x0012bd30, 0x00019b4e, 0xfffa50b1, 0x0003d957, 0xfffe8ee3,
- 0x6d8320e6, 0xf7fe33ba, 0xfedecd90, 0x03e63846, 0xfb8693c6, 0x040563f4, 0xfce01f21, 0x0225507c, 0xfeb3d4b7, 0x00aca542, 0xffb77d88, 0x001428db, 0x0000ccfc, 0xfffab15e, 0x0003b527, 0xfffe98e2,
- 0x6d0aa4e6, 0xf7574b2b, 0xff3fe663, 0x03aae970, 0xfba93b01, 0x03f34fb2, 0xfce79a7f, 0x0223e706, 0xfeb26489, 0x00aee6ca, 0xffb57a0b, 0x00158e47, 0x000000e6, 0xfffb117a, 0x00039108, 0xfffea2e1,
- 0x6c8dc41f, 0xf6b3bdd3, 0xffa04963, 0x036f88d2, 0xfbcc391d, 0x03e0d697, 0xfcef6f20, 0x022239bc, 0xfeb121ee, 0x00b10d23, 0xffb384ca, 0x0016ed53, 0xffff3721, 0xfffb70fa, 0x00036cfe, 0xfffeacdf,
- 0x6c0c882a, 0xf6139169, 0xffffec5f, 0x03341df4, 0xfbef8924, 0x03cdfb99, 0xfcf79b75, 0x02204949, 0xfeb00cbf, 0x00b3183c, 0xffb19de7, 0x001845e0, 0xfffe6fc3, 0xfffbcfd2, 0x00034910, 0xfffeb6db,
- 0x6b86faf8, 0xf576cb4e, 0x005ec552, 0x02f8b055, 0xfc13261f, 0x03bac1b4, 0xfd001de8, 0x021e165d, 0xfeaf24cc, 0x00b50805, 0xffafc584, 0x001997d0, 0xfffdaadf, 0xfffc2df6, 0x00032541, 0xfffec0d2,
- 0x6afd26cb, 0xf4dd7092, 0x00bcca63, 0x02bd4768, 0xfc370b14, 0x03a72bf0, 0xfd08f4d6, 0x021ba1b2, 0xfeae69e1, 0x00b6dc75, 0xffadfbbe, 0x001ae306, 0xfffce88b, 0xfffc8b5c, 0x00030196, 0xfffecac3,
- 0x6a6f1638, 0xf44785f1, 0x0119f1e4, 0x0281ea90, 0xfc5b3309, 0x03933d58, 0xfd121e99, 0x0218ec06, 0xfeaddbc4, 0x00b89584, 0xffac40b3, 0x001c2765, 0xfffc28d9, 0xfffce7f8, 0x0002de16, 0xfffed4ab,
- 0x69dcd425, 0xf3b50fd6, 0x01763256, 0x0246a125, 0xfc7f9902, 0x037ef900, 0xfd1b9980, 0x0215f621, 0xfead7a37, 0x00ba3330, 0xffaa947c, 0x001d64d5, 0xfffb6bdd, 0xfffd43c1, 0x0002bac4, 0xfffede8a,
- 0x69466bc8, 0xf3261255, 0x01d18265, 0x020b726f, 0xfca43803, 0x036a6201, 0xfd2563d3, 0x0212c0d2, 0xfead44f4, 0x00bbb579, 0xffa8f730, 0x001e9b3a, 0xfffab1a8, 0xfffd9eab, 0x000297a5, 0xfffee85e,
- 0x68abe8a8, 0xf29a9133, 0x022bd8ee, 0x01d065a8, 0xfcc90b12, 0x03557b7a, 0xfd2f7bd1, 0x020f4cec, 0xfead3bb2, 0x00bd1c63, 0xffa768e6, 0x001fca7d, 0xfff9fa4d, 0xfffdf8ae, 0x000274be, 0xfffef225,
- 0x680d5698, 0xf2128fde, 0x02852cfc, 0x019581f9, 0xfcee0d33, 0x03404890, 0xfd39dfb4, 0x020b9b4c, 0xfead5e22, 0x00be67f6, 0xffa5e9b1, 0x0020f288, 0xfff945dc, 0xfffe51be, 0x00025214, 0xfffefbde,
- 0x676ac1bb, 0xf18e1174, 0x02dd75ca, 0x015ace79, 0xfd133970, 0x032acc6d, 0xfd448dae, 0x0207acd4, 0xfeadabef, 0x00bf983d, 0xffa479a2, 0x00221344, 0xfff89465, 0xfffea9d2, 0x00022fa9, 0xffff0587,
- 0x66c4367d, 0xf10d18bd, 0x0334aac4, 0x0120522f, 0xfd388ad1, 0x03150a3f, 0xfd4f83eb, 0x0203826c, 0xfeae24c1, 0x00c0ad48, 0xffa318c7, 0x00232c9d, 0xfff7e5f9, 0xffff00e1, 0x00020d84, 0xffff0f1f,
- 0x6619c197, 0xf08fa82f, 0x038ac385, 0x00e6140f, 0xfd5dfc63, 0x02ff0538, 0xfd5ac08e, 0x01ff1d04, 0xfeaec838, 0x00c1a728, 0xffa1c72f, 0x00243e7f, 0xfff73aa7, 0xffff56e3, 0x0001eba8, 0xffff18a4,
- 0x656b700a, 0xf015c1ee, 0x03dfb7dd, 0x00ac1af9, 0xfd838938, 0x02e8c08e, 0xfd6641b8, 0x01fa7d91, 0xfeaf95f2, 0x00c285f4, 0xffa084e3, 0x002548d9, 0xfff6927e, 0xffffabcd, 0x0001ca18, 0xffff2215,
- 0x64b94f22, 0xef9f67cb, 0x04337fcb, 0x00726dbb, 0xfda92c63, 0x02d23f7a, 0xfd720581, 0x01f5a50d, 0xfeb08d86, 0x00c349c4, 0xff9f51eb, 0x00264b9a, 0xfff5ed8b, 0xffffff99, 0x0001a8da, 0xffff2b70,
- 0x64036c6f, 0xef2c9b43, 0x04861383, 0x0039130c, 0xfdcee0ff, 0x02bb8537, 0xfd7e09fc, 0x01f0947a, 0xfeb1ae87, 0x00c3f2b6, 0xff9e2e50, 0x002746b2, 0xfff54bdc, 0x0000523d, 0x000187f0, 0xffff34b6,
- 0x6349d5c9, 0xeebd5d81, 0x04d76b6b, 0x00001191, 0xfdf4a22a, 0x02a49505, 0xfd8a4d37, 0x01eb4cde, 0xfeb2f884, 0x00c480e9, 0xff9d1a14, 0x00283a12, 0xfff4ad7e, 0x0000a3b3, 0x0001675f, 0xffff3de3,
- 0x628c994c, 0xee51af5f, 0x0527801d, 0xffc76fd5, 0xfe1a6b08, 0x028d7223, 0xfd96cd3d, 0x01e5cf44, 0xfeb46b07, 0x00c4f480, 0xff9c1539, 0x002925ae, 0xfff4127d, 0x0000f3f1, 0x00014729, 0xffff46f7,
- 0x61cbc559, 0xede99165, 0x05764a68, 0xff8f344f, 0xfe4036c5, 0x02761fd3, 0xfda3880f, 0x01e01cbe, 0xfeb60596, 0x00c54da2, 0xff9b1fc1, 0x002a0979, 0xfff37ae4, 0x000142f1, 0x00012754, 0xffff4ff1,
- 0x61076890, 0xed8503c7, 0x05c3c34e, 0xff576560, 0xfe660094, 0x025ea157, 0xfdb07bb0, 0x01da3661, 0xfeb7c7b0, 0x00c58c79, 0xff9a39a9, 0x002ae568, 0xfff2e6bf, 0x000190ac, 0x000107e1, 0xffff58d0,
- 0x603f91d5, 0xed24066b, 0x060fe408, 0xff20094d, 0xfe8bc3ad, 0x0246f9f3, 0xfdbda61a, 0x01d41d4a, 0xfeb9b0d3, 0x00c5b132, 0xff9962ec, 0x002bb971, 0xfff25619, 0x0001dd1b, 0x0000e8d4, 0xffff6192,
- 0x5f745049, 0xecc698e6, 0x065aa604, 0xfee92646, 0xfeb17b53, 0x022f2cea, 0xfdcb0546, 0x01cdd297, 0xfebbc078, 0x00c5bbfc, 0xff989b85, 0x002c858d, 0xfff1c8fa, 0x00022837, 0x0000ca30, 0xffff6a38,
- 0x5ea5b34c, 0xec6cba79, 0x06a402e4, 0xfeb2c261, 0xfed722d0, 0x02173d81, 0xfdd89727, 0x01c7576d, 0xfebdf613, 0x00c5ad0a, 0xff97e36c, 0x002d49b4, 0xfff13f6c, 0x000271fa, 0x0000abf8, 0xffff72be,
- 0x5dd3ca7a, 0xec166a19, 0x06ebf483, 0xfe7ce399, 0xfefcb57a, 0x01ff2ef9, 0xfde659af, 0x01c0acf5, 0xfec05114, 0x00c58494, 0xff973a96, 0x002e05df, 0xfff0b977, 0x0002ba5f, 0x00008e30, 0xffff7b26,
- 0x5cfea5aa, 0xebc3a669, 0x073274f1, 0xfe478fd2, 0xff222eac, 0x01e70494, 0xfdf44acc, 0x01b9d45b, 0xfec2d0e8, 0x00c542d1, 0xff96a0f8, 0x002eba0a, 0xfff03724, 0x0003015f, 0x000070d9, 0xffff836d,
- 0x5c2654ed, 0xeb746dbe, 0x07777e74, 0xfe12ccd1, 0xff4789d1, 0x01cec194, 0xfe026869, 0x01b2ced1, 0xfec574f9, 0x00c4e7fe, 0xff961684, 0x002f6630, 0xffefb87a, 0x000346f6, 0x000053f7, 0xffff8b93,
- 0x5b4ae88d, 0xeb28be1f, 0x07bb0b8b, 0xfddea042, 0xff6cc25a, 0x01b66936, 0xfe10b06f, 0x01ab9d8b, 0xfec83caa, 0x00c47459, 0xff959b29, 0x00300a4f, 0xffef3d7f, 0x00038b1d, 0x0000378c, 0xffff9398,
- 0x5a6c7108, 0xeae09544, 0x07fd16eb, 0xfdab0fb6, 0xff91d3c6, 0x019dfeb6, 0xfe1f20c5, 0x01a441c2, 0xfecb275e, 0x00c3e824, 0xff952ed7, 0x0030a665, 0xffeec63a, 0x0003cdd1, 0x00001b9a, 0xffff9b7a,
- 0x598aff13, 0xea9bf097, 0x083d9b81, 0xfd7820a0, 0xffb6b99f, 0x0185854f, 0xfe2db74f, 0x019cbcb1, 0xfece3472, 0x00c343a4, 0xff94d178, 0x00313a72, 0xffee52b1, 0x00040f0d, 0x00000024, 0xffffa339,
- 0x58a6a397, 0xea5acd38, 0x087c9471, 0xfd45d856, 0xffdb6f7c, 0x016d0037, 0xfe3c71f1, 0x01950f98, 0xfed16342, 0x00c2871f, 0xff9482f8, 0x0031c677, 0xffede2e7, 0x00044ecb, 0xffffe52d, 0xffffaad3,
- 0x57bf6fae, 0xea1d27f7, 0x08b9fd18, 0xfd143c12, 0xfffff100, 0x015472a1, 0xfe4b4e8c, 0x018d3bb8, 0xfed4b325, 0x00c1b2e0, 0xff944340, 0x00324a74, 0xffed76e3, 0x00048d0a, 0xffffcab5, 0xffffb249,
- 0x56d574a2, 0xe9e2fd5b, 0x08f5d10a, 0xfce350f0, 0x002439db, 0x013bdfbc, 0xfe5a4b03, 0x01854258, 0xfed82370, 0x00c0c731, 0xff941236, 0x0032c66e, 0xffed0ea7, 0x0004c9c4, 0xffffb0bf, 0xffffb99a,
- 0x55e8c3ee, 0xe9ac49a0, 0x09300c14, 0xfcb31bec, 0x004845cc, 0x01234ab4, 0xfe696534, 0x017d24bf, 0xfedbb373, 0x00bfc463, 0xff93efbf, 0x00333a67, 0xffecaa36, 0x000504f6, 0xffff974d, 0xffffc0c5,
- 0x54f96f37, 0xe97908b8, 0x0968aa3b, 0xfc83a1e5, 0x006c10a0, 0x010ab6b0, 0xfe789b01, 0x0174e437, 0xfedf627d, 0x00beaac6, 0xff93dbc0, 0x0033a665, 0xffec4994, 0x00053e9e, 0xffff7e61, 0xffffc7ca,
- 0x54078851, 0xe9493649, 0x099fa7bb, 0xfc54e79a, 0x008f9631, 0x00f226d0, 0xfe87ea47, 0x016c820d, 0xfee32fdb, 0x00bd7aae, 0xff93d618, 0x00340a6d, 0xffebecc2, 0x000576b8, 0xffff65fc, 0xffffcea8,
- 0x53132138, 0xe91ccdb5, 0x09d5010b, 0xfc26f1ad, 0x00b2d26b, 0x00d99e31, 0xfe9750e8, 0x0163ff90, 0xfee71ad4, 0x00bc3470, 0xff93deaa, 0x00346687, 0xffeb93c3, 0x0005ad41, 0xffff4e20, 0xffffd55f,
- 0x521c4c10, 0xe8f3ca12, 0x0a08b2d9, 0xfbf9c49d, 0x00d5c147, 0x00c11feb, 0xfea6ccc3, 0x015b5e11, 0xfeeb22af, 0x00bad866, 0xff93f552, 0x0034babb, 0xffeb3e96, 0x0005e238, 0xffff36ce, 0xffffdbee,
- 0x51231b26, 0xe8ce2631, 0x0a3aba09, 0xfbcd64ca, 0x00f85ecf, 0x00a8af0c, 0xfeb65bb9, 0x01529ee3, 0xfeef46b0, 0x00b966e9, 0xff9419ef, 0x00350711, 0xffeaed3c, 0x00061599, 0xffff2007, 0xffffe255,
- 0x5027a0e9, 0xe8abdc9d, 0x0a6b13bc, 0xfba1d673, 0x011aa71d, 0x00904ea0, 0xfec5fbac, 0x0149c35a, 0xfef3861a, 0x00b7e055, 0xff944c5a, 0x00354b94, 0xffea9fb6, 0x00064764, 0xffff09ce, 0xffffe894,
- 0x4f29efed, 0xe88ce79a, 0x0a99bd47, 0xfb771db9, 0x013c965b, 0x007801aa, 0xfed5aa7e, 0x0140cccb, 0xfef7e02a, 0x00b6450a, 0xff948c6e, 0x0035884f, 0xffea5602, 0x00067797, 0xfffef421, 0xffffeeaa,
- 0x4e2a1ae8, 0xe871412a, 0x0ac6b43a, 0xfb4d3e97, 0x015e28c7, 0x005fcb26, 0xfee56614, 0x0137bc8f, 0xfefc541e, 0x00b49568, 0xff94da03, 0x0035bd4e, 0xffea1020, 0x0006a630, 0xfffedf04, 0xfffff498,
- 0x4d2834b0, 0xe858e30a, 0x0af1f65d, 0xfb243cea, 0x017f5aad, 0x0047ae09, 0xfef52c54, 0x012e93fc, 0xff00e133, 0x00b2d1d1, 0xff9534f0, 0x0035ea9d, 0xffe9ce0d, 0x0006d32f, 0xfffeca76, 0xfffffa5d,
- 0x4c245038, 0xe843c6b5, 0x0b1b81ad, 0xfafc1c6e, 0x01a0286c, 0x002fad3f, 0xff04fb25, 0x0125546c, 0xff0586a0, 0x00b0faaa, 0xff959d0a, 0x0036104b, 0xffe98fc8, 0x0006fe92, 0xfffeb678, 0xfffffff8,
- 0x4b1e8091, 0xe831e563, 0x0b435462, 0xfad4e0b9, 0x01c08e78, 0x0017cbae, 0xff14d073, 0x011bff38, 0xff0a439e, 0x00af1059, 0xff961224, 0x00362e66, 0xffe9554c, 0x00072859, 0xfffea30b, 0x0000056a,
- 0x4a16d8e5, 0xe823380d, 0x0b696ceb, 0xfaae8d43, 0x01e08952, 0x00000c33, 0xff24aa2a, 0x011295bb, 0xff0f1762, 0x00ad1346, 0xff969412, 0x003644fd, 0xffe91e99, 0x00075084, 0xfffe9030, 0x00000ab3,
- 0x490d6c79, 0xe817b76c, 0x0b8dc9ed, 0xfa89255f, 0x02001593, 0xffe871a0, 0xff348639, 0x0109194f, 0xff140121, 0x00ab03da, 0xff9722a5, 0x00365422, 0xffe8eba8, 0x00077712, 0xfffe7de7, 0x00000fd2,
- 0x48024ea7, 0xe80f5bfb, 0x0bb06a47, 0xfa64ac3f, 0x021f2fe5, 0xffd0fec1, 0xff446293, 0x00ff8b4f, 0xff19000e, 0x00a8e282, 0xff97bdac, 0x00365be6, 0xffe8bc77, 0x00079c04, 0xfffe6c2f, 0x000014c8,
- 0x46f592e2, 0xe80a1df5, 0x0bd14d0b, 0xfa4124f2, 0x023dd505, 0xffb9b656, 0xff543d2e, 0x00f5ed15, 0xff1e135b, 0x00a6afa8, 0xff9864f6, 0x00365c5b, 0xffe89101, 0x0007bf5b, 0xfffe5b0b, 0x00001994,
- 0x45e74cad, 0xe807f55b, 0x0bf07186, 0xfa1e9262, 0x025c01c5, 0xffa29b18, 0xff641402, 0x00ec3ffc, 0xff233a39, 0x00a46bbc, 0xff991851, 0x00365594, 0xffe8693f, 0x0007e116, 0xfffe4a79, 0x00001e37,
- 0x44d78fa0, 0xe808d9f1, 0x0c0dd738, 0xf9fcf758, 0x0279b30b, 0xff8bafb3, 0xff73e50e, 0x00e2855d, 0xff2873d6, 0x00a2172d, 0xff99d789, 0x003647a5, 0xffe8452d, 0x00080137, 0xfffe3a79, 0x000022b1,
- 0x43c66f62, 0xe80cc342, 0x0c297dd9, 0xf9dc567b, 0x0296e5d0, 0xff74f6cc, 0xff83ae52, 0x00d8be92, 0xff2dbf61, 0x009fb26c, 0xff9aa268, 0x003632a2, 0xffe824c5, 0x00081fbf, 0xfffe2b0d, 0x00002701,
- 0x42b3ffa9, 0xe813a89f, 0x0c436557, 0xf9bcb24a, 0x02b39724, 0xff5e72fb, 0xff936dd2, 0x00ceecf5, 0xff331c08, 0x009d3deb, 0xff9b78ba, 0x003616a2, 0xffe807ff, 0x00083cb0, 0xfffe1c32, 0x00002b28,
- 0x41a05437, 0xe81d8122, 0x0c5b8dd4, 0xf99e0d26, 0x02cfc429, 0xff4826cf, 0xffa3219a, 0x00c511dc, 0xff3888f8, 0x009aba1d, 0xff9c5a47, 0x0035f3b9, 0xffe7eed5, 0x0008580a, 0xfffe0dea, 0x00002f26,
- 0x408b80d9, 0xe82a43ac, 0x0c71f7a9, 0xf980694a, 0x02eb6a18, 0xff3214c9, 0xffb2c7b6, 0x00bb2e9f, 0xff3e055d, 0x00982778, 0xff9d46d6, 0x0035ca00, 0xffe7d93f, 0x000871cf, 0xfffe0034, 0x000032fb,
- 0x3f759967, 0xe839e6e9, 0x0c86a361, 0xf963c8cc, 0x03068640, 0xff1c3f63, 0xffc25e3b, 0x00b14493, 0xff439064, 0x0095866f, 0xff9e3e30, 0x0035998d, 0xffe7c735, 0x00088a02, 0xfffdf310, 0x000036a8,
- 0x3e5eb1bd, 0xe84c6152, 0x0c9991be, 0xf9482da0, 0x03211603, 0xff06a907, 0xffd1e340, 0x00a7550c, 0xff492937, 0x0092d77b, 0xff9f4019, 0x00356279, 0xffe7b8af, 0x0008a0a5, 0xfffde67c, 0x00003a2d,
- 0x3d46ddc1, 0xe861a92b, 0x0caac3b5, 0xf92d9997, 0x033b16dc, 0xfef15417, 0xffe154e3, 0x009d615d, 0xff4ecf02, 0x00901b11, 0xffa04c57, 0x003524dd, 0xffe7ada5, 0x0008b5ba, 0xfffdda79, 0x00003d89,
- 0x3c2e315a, 0xe879b487, 0x0cba3a6d, 0xf9140e5e, 0x03548659, 0xfedc42e7, 0xfff0b148, 0x00936ad6, 0xff5480f0, 0x008d51ab, 0xffa162ae, 0x0034e0d3, 0xffe7a60d, 0x0008c944, 0xfffdcf05, 0x000040be,
- 0x3b14c072, 0xe8947947, 0x0cc7f742, 0xf8fb8d7d, 0x036d621f, 0xfec777be, 0xfffff697, 0x008972c7, 0xff5a3e2c, 0x008a7bc1, 0xffa282e1, 0x00349674, 0xffe7a1de, 0x0008db46, 0xfffdc421, 0x000043cc,
- 0x39fa9ef3, 0xe8b1ed1c, 0x0cd3fbc0, 0xf8e4185a, 0x0385a7eb, 0xfeb2f4d9, 0x000f22fe, 0x007f7a7c, 0xff6005e1, 0x008799cd, 0xffa3acb4, 0x003445dc, 0xffe7a10d, 0x0008ebc1, 0xfffdb9cb, 0x000046b2,
- 0x38dfe0c6, 0xe8d2058b, 0x0cde49a8, 0xf8cdb036, 0x039d558e, 0xfe9ebc66, 0x001e34b4, 0x00758341, 0xff65d73a, 0x0084ac48, 0xffa4dfe8, 0x0033ef25, 0xffe7a391, 0x0008fabb, 0xfffdb002, 0x00004972,
- 0x37c499d0, 0xe8f4b7e9, 0x0ce6e2ea, 0xf8b85631, 0x03b468f1, 0xfe8ad087, 0x002d29f3, 0x006b8e5c, 0xff6bb163, 0x0081b3af, 0xffa61c3e, 0x0033926d, 0xffe7a95f, 0x00090836, 0xfffda6c5, 0x00004c0b,
- 0x36a8ddf3, 0xe919f961, 0x0cedc9a7, 0xf8a40b44, 0x03cae014, 0xfe773351, 0x003c00fd, 0x00619d15, 0xff719388, 0x007eb07b, 0xffa76176, 0x00332fcf, 0xffe7b26c, 0x00091435, 0xfffd9e13, 0x00004e7f,
- 0x358cc109, 0xe941bef3, 0x0cf30031, 0xf890d048, 0x03e0b90d, 0xfe63e6cb, 0x004ab81b, 0x0057b0ae, 0xff777cd6, 0x007ba32a, 0xffa8af51, 0x0032c769, 0xffe7bead, 0x00091ebd, 0xfffd95eb, 0x000050cd,
- 0x347056e3, 0xe96bfd76, 0x0cf6890a, 0xf87ea5f1, 0x03f5f20a, 0xfe50ecf0, 0x00594d9d, 0x004dca68, 0xff7d6c79, 0x00788c36, 0xffaa058d, 0x00325958, 0xffe7ce16, 0x000927d1, 0xfffd8e4d, 0x000052f7,
- 0x3353b349, 0xe998a999, 0x0cf866e1, 0xf86d8cd1, 0x040a894e, 0xfe3e47ac, 0x0067bfd8, 0x0043eb7f, 0xff83619f, 0x00756c1d, 0xffab63ea, 0x0031e5ba, 0xffe7e09c, 0x00092f75, 0xfffd8735, 0x000054fc,
- 0x3236e9f7, 0xe9c7b7e3, 0x0cf89c96, 0xf85d8555, 0x041e7d34, 0xfe2bf8de, 0x00760d2a, 0x003a152f, 0xff895b77, 0x0072435b, 0xffacca25, 0x00316cae, 0xffe7f631, 0x000935ad, 0xfffd80a4, 0x000056dd,
- 0x311a0e9b, 0xe9f91cb9, 0x0cf72d34, 0xf84e8fc9, 0x0431cc31, 0xfe1a0256, 0x008433f9, 0x003048ae, 0xff8f5930, 0x006f126b, 0xffae37fd, 0x0030ee53, 0xffe80eca, 0x00093a7f, 0xfffd7a98, 0x0000589b,
- 0x2ffd34d4, 0xea2ccc59, 0x0cf41bf7, 0xf840ac57, 0x044474ce, 0xfe0865d7, 0x009232b2, 0x0026872f, 0xff9559fb, 0x006bd9cd, 0xffafad2e, 0x00306ac8, 0xffe82a59, 0x00093ded, 0xfffd750f, 0x00005a36,
- 0x2ee07030, 0xea62bae0, 0x0cef6c43, 0xf833db04, 0x045675ab, 0xfdf72515, 0x00a007c9, 0x001cd1e4, 0xff9b5d0a, 0x006899fb, 0xffb12976, 0x002fe22c, 0xffe848d3, 0x00093ffe, 0xfffd7008, 0x00005baf,
- 0x2dc3d429, 0xea9adc49, 0x0ce921ab, 0xf8281bb6, 0x0467cd83, 0xfde641b7, 0x00adb1bb, 0x001329f7, 0xffa16190, 0x00655372, 0xffb2ac90, 0x002f54a1, 0xffe86a29, 0x000940b6, 0xfffd6b81, 0x00005d06,
- 0x2ca77428, 0xead52471, 0x0ce13feb, 0xf81d6e2e, 0x04787b24, 0xfdd5bd53, 0x00bb2f0b, 0x00099093, 0xffa766c0, 0x006206b1, 0xffb4363a, 0x002ec246, 0xffe88e4d, 0x00094019, 0xfffd6779, 0x00005e3d,
- 0x2b8b637b, 0xeb118714, 0x0cd7caec, 0xf813d20d, 0x04887d76, 0xfdc59972, 0x00c87e47, 0x000006db, 0xffad6bd0, 0x005eb431, 0xffb5c630, 0x002e2b3c, 0xffe8b532, 0x00093e2e, 0xfffd63ed, 0x00005f52,
- 0x2a6fb55e, 0xeb4ff7d4, 0x0cccc6bc, 0xf80b46d3, 0x0497d378, 0xfdb5d78f, 0x00d59e03, 0xfff68df1, 0xffb36ff9, 0x005b5c71, 0xffb75c2c, 0x002d8fa4, 0xffe8decb, 0x00093af8, 0xfffd60dd, 0x00006048,
- 0x29547ced, 0xeb906a35, 0x0cc03797, 0xf803cbdc, 0x04a67c41, 0xfda67913, 0x00e28cdd, 0xffed26f0, 0xffb97271, 0x0057ffec, 0xffb8f7ea, 0x002cefa1, 0xffe90b08, 0x0009367e, 0xfffd5e46, 0x0000611f,
- 0x2839cd30, 0xebd2d1a1, 0x0cb221de, 0xf7fd6065, 0x04b476fe, 0xfd977f5d, 0x00ef497a, 0xffe3d2f2, 0xffbf7274, 0x00549f1c, 0xffba9927, 0x002c4b53, 0xffe939db, 0x000930c4, 0xfffd5c26, 0x000061d8,
- 0x271fb90d, 0xec17216b, 0x0ca28a1a, 0xf7f8038c, 0x04c1c2f3, 0xfd88ebb9, 0x00fbd28a, 0xffda930a, 0xffc56f3e, 0x00513a7e, 0xffbc3f9d, 0x002ba2dc, 0xffe96b35, 0x000929d1, 0xfffd5a7c, 0x00006272,
- 0x2606534e, 0xec5d4ccd, 0x0c9174fa, 0xf7f3b44b, 0x04ce5f7d, 0xfd7abf64, 0x010826c4, 0xffd16848, 0xffcb680e, 0x004dd28c, 0xffbdeb07, 0x002af65f, 0xffe99f08, 0x000921aa, 0xfffd5945, 0x000062f0,
- 0x24edae9c, 0xeca546eb, 0x0c7ee754, 0xf7f0717e, 0x04da4c10, 0xfd6cfb8e, 0x011444e7, 0xffc853b6, 0xffd15c22, 0x004a67c0, 0xffbf9b21, 0x002a45fe, 0xffe9d545, 0x00091854, 0xfffd5880, 0x00006351,
- 0x23d5dd81, 0xecef02d5, 0x0c6ae622, 0xf7ee39e2, 0x04e58836, 0xfd5fa157, 0x01202bbe, 0xffbf565a, 0xffd74abe, 0x0046fa93, 0xffc14fa5, 0x002991db, 0xffea0ddc, 0x00090dd6, 0xfffd582a, 0x00006396,
- 0x22bef262, 0xed3a7388, 0x0c557681, 0xf7ed0c12, 0x04f01392, 0xfd52b1cf, 0x012bda1b, 0xffb67137, 0xffdd3325, 0x00438b7e, 0xffc3084f, 0x0028da1a, 0xffea48be, 0x00090236, 0xfffd5842, 0x000063c0,
- 0x21a8ff7e, 0xed878bf0, 0x0c3e9db5, 0xf7ece68c, 0x04f9edda, 0xfd462df6, 0x01374eda, 0xffada547, 0xffe3149e, 0x00401af9, 0xffc4c4da, 0x00281edd, 0xffea85dc, 0x0008f57a, 0xfffd58c5, 0x000063d0,
- 0x209416f2, 0xedd63ee5, 0x0c26611f, 0xf7edc7af, 0x050316e0, 0xfd3a16c0, 0x014288e0, 0xffa4f383, 0xffe8ee72, 0x003ca97b, 0xffc68502, 0x00276046, 0xffeac525, 0x0008e7a7, 0xfffd59b2, 0x000063c6,
- 0x1f804ab0, 0xee267f35, 0x0c0cc646, 0xf7efadbd, 0x050b8e8a, 0xfd2e6d0d, 0x014d871b, 0xff9c5cdc, 0xffeebfec, 0x0039377a, 0xffc84881, 0x00269e7a, 0xffeb068a, 0x0008d8c4, 0xfffd5b05, 0x000063a3,
- 0x1e6dac83, 0xee783f9e, 0x0bf1d2d0, 0xf7f296d7, 0x051354d5, 0xfd2331b0, 0x01584883, 0xff93e241, 0xfff48859, 0x0035c56c, 0xffca0f14, 0x0025d99b, 0xffeb49fc, 0x0008c8d7, 0xfffd5cbe, 0x00006368,
- 0x1d5c4e09, 0xeecb72d1, 0x0bd58c81, 0xf7f68103, 0x051a69d4, 0xfd18656f, 0x0162cc19, 0xff8b8498, 0xfffa470a, 0x003253c6, 0xffcbd876, 0x002511cd, 0xffeb8f6a, 0x0008b7e7, 0xfffd5ed8, 0x00006316,
- 0x1c4c40b6, 0xef200b76, 0x0bb7f940, 0xf7fb6a29, 0x0520cdb1, 0xfd0e08fb, 0x016d10e9, 0xff8344c4, 0xfffffb51, 0x002ee2fa, 0xffcda463, 0x00244733, 0xffebd6c4, 0x0008a5fa, 0xfffd6154, 0x000062ad,
- 0x1b3d95d1, 0xef75fc2b, 0x0b991f0f, 0xf8015015, 0x052680ae, 0xfd041cfa, 0x01771608, 0xff7b23a1, 0x0005a483, 0x002b737b, 0xffcf7299, 0x002379ef, 0xffec1ffa, 0x00089316, 0xfffd642d, 0x0000622e,
- 0x1a305e70, 0xefcd3787, 0x0b79040c, 0xf8083077, 0x052b8320, 0xfcfaa200, 0x0180da94, 0xff732209, 0x000b41fa, 0x002805ba, 0xffd142d3, 0x0022aa26, 0xffec6afc, 0x00087f43, 0xfffd6762, 0x0000619a,
- 0x1924ab7b, 0xf025b01a, 0x0b57ae75, 0xf81008e2, 0x052fd573, 0xfcf19894, 0x018a5db5, 0xff6b40cb, 0x0010d30e, 0x00249a28, 0xffd314cf, 0x0021d7fa, 0xffecb7b9, 0x00086a86, 0xfffd6af1, 0x000060f1,
- 0x181a8da5, 0xf07f586e, 0x0b3524a0, 0xf818d6cf, 0x0533782a, 0xfce9012c, 0x01939e9e, 0xff6380b5, 0x00165720, 0x00213134, 0xffd4e84a, 0x00210390, 0xffed0621, 0x000854e6, 0xfffd6ed6, 0x00006035,
- 0x17121573, 0xf0da230b, 0x0b116cff, 0xf822979b, 0x05366bdc, 0xfce0dc2f, 0x019c9c8b, 0xff5be28d, 0x001bcd8e, 0x001dcb4a, 0xffd6bd01, 0x00202d09, 0xffed5624, 0x00083e6a, 0xfffd7310, 0x00005f66,
- 0x160b5331, 0xf1360276, 0x0aec8e1c, 0xf82d488c, 0x0538b136, 0xfcd929f4, 0x01a556c1, 0xff546713, 0x002135bd, 0x001a68d8, 0xffd892b4, 0x001f5489, 0xffeda7b1, 0x00082718, 0xfffd779d, 0x00005e84,
- 0x150656f8, 0xf192e932, 0x0ac68e9b, 0xf838e6c9, 0x053a48fa, 0xfcd1eac3, 0x01adcc91, 0xff4d0f02, 0x00268f13, 0x00170a47, 0xffda6921, 0x001e7a33, 0xffedfab8, 0x00080ef7, 0xfffd7c7a, 0x00005d92,
- 0x140330a9, 0xf1f0c9c5, 0x0a9f7537, 0xf8456f65, 0x053b3400, 0xfccb1ed7, 0x01b5fd54, 0xff45db10, 0x002bd8fa, 0x0013b003, 0xffdc4007, 0x001d9e2a, 0xffee4f29, 0x0007f60f, 0xfffd81a4, 0x00005c8e,
- 0x1301efed, 0xf24f96b5, 0x0a7748c0, 0xf852df56, 0x053b7332, 0xfcc4c658, 0x01bde86f, 0xff3ecbea, 0x003112e0, 0x00105a72, 0xffde1726, 0x001cc091, 0xffeea4f2, 0x0007dc65, 0xfffd8719, 0x00005b7b,
- 0x1202a434, 0xf2af428c, 0x0a4e101f, 0xf861337c, 0x053b0791, 0xfcbee162, 0x01c58d50, 0xff37e23b, 0x00363c35, 0x000d09fc, 0xffdfee3f, 0x001be18a, 0xffeefc04, 0x0007c201, 0xfffd8cd7, 0x00005a58,
- 0x11055cb4, 0xf30fbfd7, 0x0a23d24e, 0xf870689f, 0x0539f231, 0xfcb97001, 0x01cceb6e, 0xff311ea4, 0x003b546b, 0x0009bf05, 0xffe1c511, 0x001b0138, 0xffef544e, 0x0007a6e9, 0xfffd92db, 0x00005927,
- 0x100a2864, 0xf371012c, 0x09f8965d, 0xf8807b70, 0x0538343a, 0xfcb47232, 0x01d4024c, 0xff2a81c4, 0x00405afa, 0x000679f2, 0xffe39b60, 0x001a1fbc, 0xffefadc0, 0x00078b24, 0xfffd9923, 0x000057e9,
- 0x0f111603, 0xf3d2f926, 0x09cc636e, 0xf8916889, 0x0535cee9, 0xfcafe7e2, 0x01dad175, 0xff240c2f, 0x00454f5d, 0x00033b23, 0xffe570ed, 0x00193d3a, 0xfff00849, 0x00076eba, 0xfffd9fac, 0x0000569d,
- 0x0e1a340d, 0xf4359a6a, 0x099f40b5, 0xf8a32c6e, 0x0532c38c, 0xfcabd0f2, 0x01e15880, 0xff1dbe77, 0x004a310f, 0x000002f9, 0xffe7457c, 0x001859d2, 0xfff063d9, 0x000751b0, 0xfffda675, 0x00005545,
- 0x0d2590c3, 0xf498d7a5, 0x09713575, 0xf8b5c38d, 0x052f1386, 0xfca82d32, 0x01e7970e, 0xff179926, 0x004eff94, 0xfffcd1d3, 0xffe918ce, 0x001775a7, 0xfff0c060, 0x0007340d, 0xfffdad79, 0x000053e2,
- 0x0c333a22, 0xf4fca390, 0x09424904, 0xf8c92a41, 0x052ac04c, 0xfca4fc64, 0x01ed8cc7, 0xff119cc0, 0x0053ba6e, 0xfff9a80d, 0xffeaeaab, 0x001690d9, 0xfff11dcd, 0x000715d9, 0xfffdb4b9, 0x00005274,
-};
-}
diff --git a/services/audioflinger/test-resample.cpp b/services/audioflinger/test-resample.cpp
deleted file mode 100644
index bae3c5b..0000000
--- a/services/audioflinger/test-resample.cpp
+++ /dev/null
@@ -1,515 +0,0 @@
-/*
- * Copyright (C) 2012 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include <unistd.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <fcntl.h>
-#include <string.h>
-#include <sys/mman.h>
-#include <sys/stat.h>
-#include <errno.h>
-#include <inttypes.h>
-#include <time.h>
-#include <math.h>
-#include <audio_utils/primitives.h>
-#include <audio_utils/sndfile.h>
-#include <utils/Vector.h>
-#include <media/AudioBufferProvider.h>
-#include "AudioResampler.h"
-
-using namespace android;
-
-static bool gVerbose = false;
-
-static int usage(const char* name) {
- fprintf(stderr,"Usage: %s [-p] [-f] [-F] [-v] [-c channels]"
- " [-q {dq|lq|mq|hq|vhq|dlq|dmq|dhq}]"
- " [-i input-sample-rate] [-o output-sample-rate]"
- " [-O csv] [-P csv] [<input-file>]"
- " <output-file>\n", name);
- fprintf(stderr," -p enable profiling\n");
- fprintf(stderr," -f enable filter profiling\n");
- fprintf(stderr," -F enable floating point -q {dlq|dmq|dhq} only");
- fprintf(stderr," -v verbose : log buffer provider calls\n");
- fprintf(stderr," -c # channels (1-2 for lq|mq|hq; 1-8 for dlq|dmq|dhq)\n");
- fprintf(stderr," -q resampler quality\n");
- fprintf(stderr," dq : default quality\n");
- fprintf(stderr," lq : low quality\n");
- fprintf(stderr," mq : medium quality\n");
- fprintf(stderr," hq : high quality\n");
- fprintf(stderr," vhq : very high quality\n");
- fprintf(stderr," dlq : dynamic low quality\n");
- fprintf(stderr," dmq : dynamic medium quality\n");
- fprintf(stderr," dhq : dynamic high quality\n");
- fprintf(stderr," -i input file sample rate (ignored if input file is specified)\n");
- fprintf(stderr," -o output file sample rate\n");
- fprintf(stderr," -O # frames output per call to resample() in CSV format\n");
- fprintf(stderr," -P # frames provided per call to resample() in CSV format\n");
- return -1;
-}
-
-// Convert a list of integers in CSV format to a Vector of those values.
-// Returns the number of elements in the list, or -1 on error.
-int parseCSV(const char *string, Vector<int>& values)
-{
- // pass 1: count the number of values and do syntax check
- size_t numValues = 0;
- bool hadDigit = false;
- for (const char *p = string; ; ) {
- switch (*p++) {
- case '0': case '1': case '2': case '3': case '4':
- case '5': case '6': case '7': case '8': case '9':
- hadDigit = true;
- break;
- case '\0':
- if (hadDigit) {
- // pass 2: allocate and initialize vector of values
- values.resize(++numValues);
- values.editItemAt(0) = atoi(p = optarg);
- for (size_t i = 1; i < numValues; ) {
- if (*p++ == ',') {
- values.editItemAt(i++) = atoi(p);
- }
- }
- return numValues;
- }
- // fall through
- case ',':
- if (hadDigit) {
- hadDigit = false;
- numValues++;
- break;
- }
- // fall through
- default:
- return -1;
- }
- }
-}
-
-int main(int argc, char* argv[]) {
- const char* const progname = argv[0];
- bool profileResample = false;
- bool profileFilter = false;
- bool useFloat = false;
- int channels = 1;
- int input_freq = 0;
- int output_freq = 0;
- AudioResampler::src_quality quality = AudioResampler::DEFAULT_QUALITY;
- Vector<int> Ovalues;
- Vector<int> Pvalues;
-
- int ch;
- while ((ch = getopt(argc, argv, "pfFvc:q:i:o:O:P:")) != -1) {
- switch (ch) {
- case 'p':
- profileResample = true;
- break;
- case 'f':
- profileFilter = true;
- break;
- case 'F':
- useFloat = true;
- break;
- case 'v':
- gVerbose = true;
- break;
- case 'c':
- channels = atoi(optarg);
- break;
- case 'q':
- if (!strcmp(optarg, "dq"))
- quality = AudioResampler::DEFAULT_QUALITY;
- else if (!strcmp(optarg, "lq"))
- quality = AudioResampler::LOW_QUALITY;
- else if (!strcmp(optarg, "mq"))
- quality = AudioResampler::MED_QUALITY;
- else if (!strcmp(optarg, "hq"))
- quality = AudioResampler::HIGH_QUALITY;
- else if (!strcmp(optarg, "vhq"))
- quality = AudioResampler::VERY_HIGH_QUALITY;
- else if (!strcmp(optarg, "dlq"))
- quality = AudioResampler::DYN_LOW_QUALITY;
- else if (!strcmp(optarg, "dmq"))
- quality = AudioResampler::DYN_MED_QUALITY;
- else if (!strcmp(optarg, "dhq"))
- quality = AudioResampler::DYN_HIGH_QUALITY;
- else {
- usage(progname);
- return -1;
- }
- break;
- case 'i':
- input_freq = atoi(optarg);
- break;
- case 'o':
- output_freq = atoi(optarg);
- break;
- case 'O':
- if (parseCSV(optarg, Ovalues) < 0) {
- fprintf(stderr, "incorrect syntax for -O option\n");
- return -1;
- }
- break;
- case 'P':
- if (parseCSV(optarg, Pvalues) < 0) {
- fprintf(stderr, "incorrect syntax for -P option\n");
- return -1;
- }
- break;
- case '?':
- default:
- usage(progname);
- return -1;
- }
- }
-
- if (channels < 1
- || channels > (quality < AudioResampler::DYN_LOW_QUALITY ? 2 : 8)) {
- fprintf(stderr, "invalid number of audio channels %d\n", channels);
- return -1;
- }
- if (useFloat && quality < AudioResampler::DYN_LOW_QUALITY) {
- fprintf(stderr, "float processing is only possible for dynamic resamplers\n");
- return -1;
- }
-
- argc -= optind;
- argv += optind;
-
- const char* file_in = NULL;
- const char* file_out = NULL;
- if (argc == 1) {
- file_out = argv[0];
- } else if (argc == 2) {
- file_in = argv[0];
- file_out = argv[1];
- } else {
- usage(progname);
- return -1;
- }
-
- // ----------------------------------------------------------
-
- size_t input_size;
- void* input_vaddr;
- if (argc == 2) {
- SF_INFO info;
- info.format = 0;
- SNDFILE *sf = sf_open(file_in, SFM_READ, &info);
- if (sf == NULL) {
- perror(file_in);
- return EXIT_FAILURE;
- }
- input_size = info.frames * info.channels * sizeof(short);
- input_vaddr = malloc(input_size);
- (void) sf_readf_short(sf, (short *) input_vaddr, info.frames);
- sf_close(sf);
- channels = info.channels;
- input_freq = info.samplerate;
- } else {
- // data for testing is exactly (input sampling rate/1000)/2 seconds
- // so 44.1khz input is 22.05 seconds
- double k = 1000; // Hz / s
- double time = (input_freq / 2) / k;
- size_t input_frames = size_t(input_freq * time);
- input_size = channels * sizeof(int16_t) * input_frames;
- input_vaddr = malloc(input_size);
- int16_t* in = (int16_t*)input_vaddr;
- for (size_t i=0 ; i<input_frames ; i++) {
- double t = double(i) / input_freq;
- double y = sin(M_PI * k * t * t);
- int16_t yi = floor(y * 32767.0 + 0.5);
- for (int j = 0; j < channels; j++) {
- in[i*channels + j] = yi / (1 + j);
- }
- }
- }
- size_t input_framesize = channels * sizeof(int16_t);
- size_t input_frames = input_size / input_framesize;
-
- // For float processing, convert input int16_t to float array
- if (useFloat) {
- void *new_vaddr;
-
- input_framesize = channels * sizeof(float);
- input_size = input_frames * input_framesize;
- new_vaddr = malloc(input_size);
- memcpy_to_float_from_i16(reinterpret_cast<float*>(new_vaddr),
- reinterpret_cast<int16_t*>(input_vaddr), input_frames * channels);
- free(input_vaddr);
- input_vaddr = new_vaddr;
- }
-
- // ----------------------------------------------------------
-
- class Provider: public AudioBufferProvider {
- const void* mAddr; // base address
- const size_t mNumFrames; // total frames
- const size_t mFrameSize; // size of each frame in bytes
- size_t mNextFrame; // index of next frame to provide
- size_t mUnrel; // number of frames not yet released
- const Vector<int> mPvalues; // number of frames provided per call
- size_t mNextPidx; // index of next entry in mPvalues to use
- public:
- Provider(const void* addr, size_t frames, size_t frameSize, const Vector<int>& Pvalues)
- : mAddr(addr),
- mNumFrames(frames),
- mFrameSize(frameSize),
- mNextFrame(0), mUnrel(0), mPvalues(Pvalues), mNextPidx(0) {
- }
- virtual status_t getNextBuffer(Buffer* buffer) {
- size_t requestedFrames = buffer->frameCount;
- if (requestedFrames > mNumFrames - mNextFrame) {
- buffer->frameCount = mNumFrames - mNextFrame;
- }
- if (!mPvalues.isEmpty()) {
- size_t provided = mPvalues[mNextPidx++];
- printf("mPvalue[%zu]=%zu not %zu\n", mNextPidx-1, provided, buffer->frameCount);
- if (provided < buffer->frameCount) {
- buffer->frameCount = provided;
- }
- if (mNextPidx >= mPvalues.size()) {
- mNextPidx = 0;
- }
- }
- if (gVerbose) {
- printf("getNextBuffer() requested %zu frames out of %zu frames available,"
- " and returned %zu frames\n",
- requestedFrames, (size_t) (mNumFrames - mNextFrame), buffer->frameCount);
- }
- mUnrel = buffer->frameCount;
- if (buffer->frameCount > 0) {
- buffer->raw = (char *)mAddr + mFrameSize * mNextFrame;
- return NO_ERROR;
- } else {
- buffer->raw = NULL;
- return NOT_ENOUGH_DATA;
- }
- }
- virtual void releaseBuffer(Buffer* buffer) {
- if (buffer->frameCount > mUnrel) {
- fprintf(stderr, "ERROR releaseBuffer() released %zu frames but only %zu available "
- "to release\n", buffer->frameCount, mUnrel);
- mNextFrame += mUnrel;
- mUnrel = 0;
- } else {
- if (gVerbose) {
- printf("releaseBuffer() released %zu frames out of %zu frames available "
- "to release\n", buffer->frameCount, mUnrel);
- }
- mNextFrame += buffer->frameCount;
- mUnrel -= buffer->frameCount;
- }
- buffer->frameCount = 0;
- buffer->raw = NULL;
- }
- void reset() {
- mNextFrame = 0;
- }
- } provider(input_vaddr, input_frames, input_framesize, Pvalues);
-
- if (gVerbose) {
- printf("%zu input frames\n", input_frames);
- }
-
- audio_format_t format = useFloat ? AUDIO_FORMAT_PCM_FLOAT : AUDIO_FORMAT_PCM_16_BIT;
- int output_channels = channels > 2 ? channels : 2; // output is at least stereo samples
- size_t output_framesize = output_channels * (useFloat ? sizeof(float) : sizeof(int32_t));
- size_t output_frames = ((int64_t) input_frames * output_freq) / input_freq;
- size_t output_size = output_frames * output_framesize;
-
- if (profileFilter) {
- // Check how fast sample rate changes are that require filter changes.
- // The delta sample rate changes must indicate a downsampling ratio,
- // and must be larger than 10% changes.
- //
- // On fast devices, filters should be generated between 0.1ms - 1ms.
- // (single threaded).
- AudioResampler* resampler = AudioResampler::create(format, channels,
- 8000, quality);
- int looplimit = 100;
- timespec start, end;
- clock_gettime(CLOCK_MONOTONIC, &start);
- for (int i = 0; i < looplimit; ++i) {
- resampler->setSampleRate(9000);
- resampler->setSampleRate(12000);
- resampler->setSampleRate(20000);
- resampler->setSampleRate(30000);
- }
- clock_gettime(CLOCK_MONOTONIC, &end);
- int64_t start_ns = start.tv_sec * 1000000000LL + start.tv_nsec;
- int64_t end_ns = end.tv_sec * 1000000000LL + end.tv_nsec;
- int64_t time = end_ns - start_ns;
- printf("%.2f sample rate changes with filter calculation/sec\n",
- looplimit * 4 / (time / 1e9));
-
- // Check how fast sample rate changes are without filter changes.
- // This should be very fast, probably 0.1us - 1us per sample rate
- // change.
- resampler->setSampleRate(1000);
- looplimit = 1000;
- clock_gettime(CLOCK_MONOTONIC, &start);
- for (int i = 0; i < looplimit; ++i) {
- resampler->setSampleRate(1000+i);
- }
- clock_gettime(CLOCK_MONOTONIC, &end);
- start_ns = start.tv_sec * 1000000000LL + start.tv_nsec;
- end_ns = end.tv_sec * 1000000000LL + end.tv_nsec;
- time = end_ns - start_ns;
- printf("%.2f sample rate changes without filter calculation/sec\n",
- looplimit / (time / 1e9));
- resampler->reset();
- delete resampler;
- }
-
- void* output_vaddr = malloc(output_size);
- AudioResampler* resampler = AudioResampler::create(format, channels,
- output_freq, quality);
-
- resampler->setSampleRate(input_freq);
- resampler->setVolume(AudioResampler::UNITY_GAIN_FLOAT, AudioResampler::UNITY_GAIN_FLOAT);
-
- if (profileResample) {
- /*
- * For profiling on mobile devices, upon experimentation
- * it is better to run a few trials with a shorter loop limit,
- * and take the minimum time.
- *
- * Long tests can cause CPU temperature to build up and thermal throttling
- * to reduce CPU frequency.
- *
- * For frequency checks (index=0, or 1, etc.):
- * "cat /sys/devices/system/cpu/cpu${index}/cpufreq/scaling_*_freq"
- *
- * For temperature checks (index=0, or 1, etc.):
- * "cat /sys/class/thermal/thermal_zone${index}/temp"
- *
- * Another way to avoid thermal throttling is to fix the CPU frequency
- * at a lower level which prevents excessive temperatures.
- */
- const int trials = 4;
- const int looplimit = 4;
- timespec start, end;
- int64_t time = 0;
-
- for (int n = 0; n < trials; ++n) {
- clock_gettime(CLOCK_MONOTONIC, &start);
- for (int i = 0; i < looplimit; ++i) {
- resampler->resample((int*) output_vaddr, output_frames, &provider);
- provider.reset(); // during benchmarking reset only the provider
- }
- clock_gettime(CLOCK_MONOTONIC, &end);
- int64_t start_ns = start.tv_sec * 1000000000LL + start.tv_nsec;
- int64_t end_ns = end.tv_sec * 1000000000LL + end.tv_nsec;
- int64_t diff_ns = end_ns - start_ns;
- if (n == 0 || diff_ns < time) {
- time = diff_ns; // save the best out of our trials.
- }
- }
- // Mfrms/s is "Millions of output frames per second".
- printf("quality: %d channels: %d msec: %" PRId64 " Mfrms/s: %.2lf\n",
- quality, channels, time/1000000, output_frames * looplimit / (time / 1e9) / 1e6);
- resampler->reset();
-
- // TODO fix legacy bug: reset does not clear buffers.
- // delete and recreate resampler here.
- delete resampler;
- resampler = AudioResampler::create(format, channels,
- output_freq, quality);
- resampler->setSampleRate(input_freq);
- resampler->setVolume(AudioResampler::UNITY_GAIN_FLOAT, AudioResampler::UNITY_GAIN_FLOAT);
- }
-
- memset(output_vaddr, 0, output_size);
- if (gVerbose) {
- printf("resample() %zu output frames\n", output_frames);
- }
- if (Ovalues.isEmpty()) {
- Ovalues.push(output_frames);
- }
- for (size_t i = 0, j = 0; i < output_frames; ) {
- size_t thisFrames = Ovalues[j++];
- if (j >= Ovalues.size()) {
- j = 0;
- }
- if (thisFrames == 0 || thisFrames > output_frames - i) {
- thisFrames = output_frames - i;
- }
- resampler->resample((int*) output_vaddr + output_channels*i, thisFrames, &provider);
- i += thisFrames;
- }
- if (gVerbose) {
- printf("resample() complete\n");
- }
- resampler->reset();
- if (gVerbose) {
- printf("reset() complete\n");
- }
- delete resampler;
- resampler = NULL;
-
- // For float processing, convert output format from float to Q4.27,
- // which is then converted to int16_t for final storage.
- if (useFloat) {
- memcpy_to_q4_27_from_float(reinterpret_cast<int32_t*>(output_vaddr),
- reinterpret_cast<float*>(output_vaddr), output_frames * output_channels);
- }
-
- // mono takes left channel only (out of stereo output pair)
- // stereo and multichannel preserve all channels.
- int32_t* out = (int32_t*) output_vaddr;
- int16_t* convert = (int16_t*) malloc(output_frames * channels * sizeof(int16_t));
-
- const int volumeShift = 12; // shift requirement for Q4.27 to Q.15
- // round to half towards zero and saturate at int16 (non-dithered)
- const int roundVal = (1<<(volumeShift-1)) - 1; // volumePrecision > 0
-
- for (size_t i = 0; i < output_frames; i++) {
- for (int j = 0; j < channels; j++) {
- int32_t s = out[i * output_channels + j] + roundVal; // add offset here
- if (s < 0) {
- s = (s + 1) >> volumeShift; // round to 0
- if (s < -32768) {
- s = -32768;
- }
- } else {
- s = s >> volumeShift;
- if (s > 32767) {
- s = 32767;
- }
- }
- convert[i * channels + j] = int16_t(s);
- }
- }
-
- // write output to disk
- SF_INFO info;
- info.frames = 0;
- info.samplerate = output_freq;
- info.channels = channels;
- info.format = SF_FORMAT_WAV | SF_FORMAT_PCM_16;
- SNDFILE *sf = sf_open(file_out, SFM_WRITE, &info);
- if (sf == NULL) {
- perror(file_out);
- return EXIT_FAILURE;
- }
- (void) sf_writef_short(sf, convert, output_frames);
- sf_close(sf);
-
- return EXIT_SUCCESS;
-}
diff --git a/services/audioflinger/tests/Android.mk b/services/audioflinger/tests/Android.mk
deleted file mode 100644
index a741079..0000000
--- a/services/audioflinger/tests/Android.mk
+++ /dev/null
@@ -1,68 +0,0 @@
-# Build the unit tests for audioflinger
-
-#
-# resampler unit test
-#
-LOCAL_PATH:= $(call my-dir)
-include $(CLEAR_VARS)
-
-LOCAL_SHARED_LIBRARIES := \
- liblog \
- libutils \
- libcutils \
- libaudioutils \
- libaudioresampler
-
-LOCAL_C_INCLUDES := \
- $(call include-path-for, audio-utils) \
- frameworks/av/services/audioflinger
-
-LOCAL_SRC_FILES := \
- resampler_tests.cpp
-
-LOCAL_MODULE := resampler_tests
-LOCAL_MODULE_TAGS := tests
-
-LOCAL_CFLAGS := -Werror -Wall
-
-include $(BUILD_NATIVE_TEST)
-
-#
-# audio mixer test tool
-#
-include $(CLEAR_VARS)
-
-LOCAL_SRC_FILES:= \
- test-mixer.cpp \
- ../AudioMixer.cpp.arm \
- ../BufferProviders.cpp
-
-LOCAL_C_INCLUDES := \
- $(call include-path-for, audio-utils) \
- frameworks/av/services/audioflinger \
- external/sonic
-
-LOCAL_STATIC_LIBRARIES := \
- libsndfile
-
-LOCAL_SHARED_LIBRARIES := \
- libaudiohal \
- libeffects \
- libnbaio \
- libaudioresampler \
- libaudioutils \
- libdl \
- libcutils \
- libutils \
- liblog \
- libsonic
-
-LOCAL_MODULE:= test-mixer
-
-LOCAL_MODULE_TAGS := optional
-
-LOCAL_CXX_STL := libc++
-
-LOCAL_CFLAGS := -Werror -Wall
-
-include $(BUILD_EXECUTABLE)
diff --git a/services/audioflinger/tests/README b/services/audioflinger/tests/README
deleted file mode 100644
index 508e960..0000000
--- a/services/audioflinger/tests/README
+++ /dev/null
@@ -1,13 +0,0 @@
-For libsonic dependency:
-pushd external/sonic
-mm
-popd
-
-To build resampler library:
-pushd ..
-Optionally uncomment USE_NEON=false in Android.mk
-mm
-popd
-
-Then build here:
-mm
diff --git a/services/audioflinger/tests/build_and_run_all_unit_tests.sh b/services/audioflinger/tests/build_and_run_all_unit_tests.sh
deleted file mode 100755
index 9a71096..0000000
--- a/services/audioflinger/tests/build_and_run_all_unit_tests.sh
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/bin/bash
-
-if [ -z "$ANDROID_BUILD_TOP" ]; then
- echo "Android build environment not set"
- exit -1
-fi
-
-# ensure we have mm
-. $ANDROID_BUILD_TOP/build/envsetup.sh
-
-pushd $ANDROID_BUILD_TOP/frameworks/av/services/audioflinger/
-pwd
-mm
-
-echo "waiting for device"
-adb root && adb wait-for-device remount
-adb push $OUT/system/lib/libaudioresampler.so /system/lib
-adb push $OUT/system/lib64/libaudioresampler.so /system/lib64
-adb push $OUT/data/nativetest/resampler_tests/resampler_tests /data/nativetest/resampler_tests/resampler_tests
-adb push $OUT/data/nativetest64/resampler_tests/resampler_tests /data/nativetest64/resampler_tests/resampler_tests
-
-sh $ANDROID_BUILD_TOP/frameworks/av/services/audioflinger/tests/run_all_unit_tests.sh
-
-popd
diff --git a/services/audioflinger/tests/mixer_to_wav_tests.sh b/services/audioflinger/tests/mixer_to_wav_tests.sh
deleted file mode 100755
index d0482a1..0000000
--- a/services/audioflinger/tests/mixer_to_wav_tests.sh
+++ /dev/null
@@ -1,144 +0,0 @@
-#!/bin/bash
-#
-# This script uses test-mixer to generate WAV files
-# for evaluation of the AudioMixer component.
-#
-# Sine and chirp signals are used for input because they
-# show up as clear lines, either horizontal or diagonal,
-# on a spectrogram. This means easy verification of multiple
-# track mixing.
-#
-# After execution, look for created subdirectories like
-# mixer_i_i
-# mixer_i_f
-# mixer_f_f
-#
-# Recommend using a program such as audacity to evaluate
-# the output WAV files, e.g.
-#
-# cd testdir
-# audacity *.wav
-#
-# Using Audacity:
-#
-# Under "Waveform" view mode you can zoom into the
-# start of the WAV file to verify proper ramping.
-#
-# Select "Spectrogram" to see verify the lines
-# (sine = horizontal, chirp = diagonal) which should
-# be clear (except for around the start as the volume
-# ramping causes spectral distortion).
-
-if [ -z "$ANDROID_BUILD_TOP" ]; then
- echo "Android build environment not set"
- exit -1
-fi
-
-# ensure we have mm
-. $ANDROID_BUILD_TOP/build/envsetup.sh
-
-pushd $ANDROID_BUILD_TOP/frameworks/av/services/audioflinger/
-
-# build
-pwd
-mm
-
-# send to device
-echo "waiting for device"
-adb root && adb wait-for-device remount
-adb push $OUT/system/lib/libaudioresampler.so /system/lib
-adb push $OUT/system/bin/test-mixer /system/bin
-
-# createwav creates a series of WAV files testing various
-# mixer settings
-# $1 = flags
-# $2 = directory
-function createwav() {
-# create directory if it doesn't exist
- if [ ! -d $2 ]; then
- mkdir $2
- fi
-
-# Test:
-# process__genericResampling with mixed integer and float track input
-# track__Resample / track__genericResample
- adb shell test-mixer $1 -s 48000 \
- -o /sdcard/tm48000grif.wav \
- sine:2,4000,7520 chirp:2,9200 sine:1,3000,18000 \
- sine:f,6,6000,19000 chirp:i,4,30000
- adb pull /sdcard/tm48000grif.wav $2
-
-# Test:
-# process__genericResampling
-# track__Resample / track__genericResample
- adb shell test-mixer $1 -s 48000 \
- -o /sdcard/tm48000gr.wav \
- sine:2,4000,7520 chirp:2,9200 sine:1,3000,18000 \
- sine:6,6000,19000
- adb pull /sdcard/tm48000gr.wav $2
-
-# Test:
-# process__genericResample
-# track__Resample / track__genericResample
-# track__NoResample / track__16BitsStereo / track__16BitsMono
-# Aux buffer
- adb shell test-mixer $1 -c 5 -s 9307 \
- -a /sdcard/aux9307gra.wav -o /sdcard/tm9307gra.wav \
- sine:4,1000,3000 sine:1,2000,9307 chirp:3,9307
- adb pull /sdcard/tm9307gra.wav $2
- adb pull /sdcard/aux9307gra.wav $2
-
-# Test:
-# process__genericNoResampling
-# track__NoResample / track__16BitsStereo / track__16BitsMono
- adb shell test-mixer $1 -s 32000 \
- -o /sdcard/tm32000gnr.wav \
- sine:2,1000,32000 chirp:2,32000 sine:1,3000,32000
- adb pull /sdcard/tm32000gnr.wav $2
-
-# Test:
-# process__genericNoResampling
-# track__NoResample / track__16BitsStereo / track__16BitsMono
-# Aux buffer
- adb shell test-mixer $1 -s 32000 \
- -a /sdcard/aux32000gnra.wav -o /sdcard/tm32000gnra.wav \
- sine:2,1000,32000 chirp:2,32000 sine:1,3000,32000
- adb pull /sdcard/tm32000gnra.wav $2
- adb pull /sdcard/aux32000gnra.wav $2
-
-# Test:
-# process__NoResampleOneTrack / process__OneTrack16BitsStereoNoResampling
-# Downmixer
- adb shell test-mixer $1 -s 32000 \
- -o /sdcard/tm32000nrot.wav \
- sine:6,1000,32000
- adb pull /sdcard/tm32000nrot.wav $2
-
-# Test:
-# process__NoResampleOneTrack / OneTrack16BitsStereoNoResampling
-# Aux buffer
- adb shell test-mixer $1 -s 44100 \
- -a /sdcard/aux44100nrota.wav -o /sdcard/tm44100nrota.wav \
- sine:2,2000,44100
- adb pull /sdcard/tm44100nrota.wav $2
- adb pull /sdcard/aux44100nrota.wav $2
-}
-
-#
-# Call createwav to generate WAV files in various combinations
-#
-# i_i = integer input track, integer mixer output
-# f_f = float input track, float mixer output
-# i_f = integer input track, float_mixer output
-#
-# If the mixer output is float, then the output WAV file is pcm float.
-#
-# TODO: create a "snr" like "diff" to automatically
-# compare files in these directories together.
-#
-
-createwav "" "tests/mixer_i_i"
-createwav "-f -m" "tests/mixer_f_f"
-createwav "-m" "tests/mixer_i_f"
-
-popd
diff --git a/services/audioflinger/tests/resampler_tests.cpp b/services/audioflinger/tests/resampler_tests.cpp
deleted file mode 100644
index 77a265f..0000000
--- a/services/audioflinger/tests/resampler_tests.cpp
+++ /dev/null
@@ -1,486 +0,0 @@
-/*
- * Copyright (C) 2014 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-//#define LOG_NDEBUG 0
-#define LOG_TAG "audioflinger_resampler_tests"
-
-#include <errno.h>
-#include <fcntl.h>
-#include <math.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <sys/mman.h>
-#include <sys/stat.h>
-#include <time.h>
-#include <unistd.h>
-
-#include <iostream>
-#include <utility>
-#include <vector>
-
-#include <android/log.h>
-#include <gtest/gtest.h>
-#include <media/AudioBufferProvider.h>
-
-#include "AudioResampler.h"
-#include "test_utils.h"
-
-template <typename T>
-static void printData(T *data, size_t size) {
- const size_t stride = 8;
- for (size_t i = 0; i < size; ) {
- for (size_t j = 0; j < stride && i < size; ++j) {
- std::cout << data[i++] << ' '; // extra space before newline
- }
- std::cout << '\n'; // or endl
- }
-}
-
-void resample(int channels, void *output,
- size_t outputFrames, const std::vector<size_t> &outputIncr,
- android::AudioBufferProvider *provider, android::AudioResampler *resampler)
-{
- for (size_t i = 0, j = 0; i < outputFrames; ) {
- size_t thisFrames = outputIncr[j++];
- if (j >= outputIncr.size()) {
- j = 0;
- }
- if (thisFrames == 0 || thisFrames > outputFrames - i) {
- thisFrames = outputFrames - i;
- }
- size_t framesResampled = resampler->resample(
- (int32_t*) output + channels*i, thisFrames, provider);
- // we should have enough buffer space, so there is no short count.
- ASSERT_EQ(thisFrames, framesResampled);
- i += thisFrames;
- }
-}
-
-void buffercmp(const void *reference, const void *test,
- size_t outputFrameSize, size_t outputFrames)
-{
- for (size_t i = 0; i < outputFrames; ++i) {
- int check = memcmp((const char*)reference + i * outputFrameSize,
- (const char*)test + i * outputFrameSize, outputFrameSize);
- if (check) {
- ALOGE("Failure at frame %zu", i);
- ASSERT_EQ(check, 0); /* fails */
- }
- }
-}
-
-void testBufferIncrement(size_t channels, bool useFloat,
- unsigned inputFreq, unsigned outputFreq,
- enum android::AudioResampler::src_quality quality)
-{
- const audio_format_t format = useFloat ? AUDIO_FORMAT_PCM_FLOAT : AUDIO_FORMAT_PCM_16_BIT;
- // create the provider
- std::vector<int> inputIncr;
- SignalProvider provider;
- if (useFloat) {
- provider.setChirp<float>(channels,
- 0., outputFreq/2., outputFreq, outputFreq/2000.);
- } else {
- provider.setChirp<int16_t>(channels,
- 0., outputFreq/2., outputFreq, outputFreq/2000.);
- }
- provider.setIncr(inputIncr);
-
- // calculate the output size
- size_t outputFrames = ((int64_t) provider.getNumFrames() * outputFreq) / inputFreq;
- size_t outputFrameSize = (channels == 1 ? 2 : channels) * (useFloat ? sizeof(float) : sizeof(int32_t));
- size_t outputSize = outputFrameSize * outputFrames;
- outputSize &= ~7;
-
- // create the resampler
- android::AudioResampler* resampler;
-
- resampler = android::AudioResampler::create(format, channels, outputFreq, quality);
- resampler->setSampleRate(inputFreq);
- resampler->setVolume(android::AudioResampler::UNITY_GAIN_FLOAT,
- android::AudioResampler::UNITY_GAIN_FLOAT);
-
- // set up the reference run
- std::vector<size_t> refIncr;
- refIncr.push_back(outputFrames);
- void* reference = calloc(outputFrames, outputFrameSize);
- resample(channels, reference, outputFrames, refIncr, &provider, resampler);
-
- provider.reset();
-
-#if 0
- /* this test will fail - API interface issue: reset() does not clear internal buffers */
- resampler->reset();
-#else
- delete resampler;
- resampler = android::AudioResampler::create(format, channels, outputFreq, quality);
- resampler->setSampleRate(inputFreq);
- resampler->setVolume(android::AudioResampler::UNITY_GAIN_FLOAT,
- android::AudioResampler::UNITY_GAIN_FLOAT);
-#endif
-
- // set up the test run
- std::vector<size_t> outIncr;
- outIncr.push_back(1);
- outIncr.push_back(2);
- outIncr.push_back(3);
- void* test = calloc(outputFrames, outputFrameSize);
- inputIncr.push_back(1);
- inputIncr.push_back(3);
- provider.setIncr(inputIncr);
- resample(channels, test, outputFrames, outIncr, &provider, resampler);
-
- // check
- buffercmp(reference, test, outputFrameSize, outputFrames);
-
- free(reference);
- free(test);
- delete resampler;
-}
-
-template <typename T>
-inline double sqr(T v)
-{
- double dv = static_cast<double>(v);
- return dv * dv;
-}
-
-template <typename T>
-double signalEnergy(T *start, T *end, unsigned stride)
-{
- double accum = 0;
-
- for (T *p = start; p < end; p += stride) {
- accum += sqr(*p);
- }
- unsigned count = (end - start + stride - 1) / stride;
- return accum / count;
-}
-
-// TI = resampler input type, int16_t or float
-// TO = resampler output type, int32_t or float
-template <typename TI, typename TO>
-void testStopbandDownconversion(size_t channels,
- unsigned inputFreq, unsigned outputFreq,
- unsigned passband, unsigned stopband,
- enum android::AudioResampler::src_quality quality)
-{
- // create the provider
- std::vector<int> inputIncr;
- SignalProvider provider;
- provider.setChirp<TI>(channels,
- 0., inputFreq/2., inputFreq, inputFreq/2000.);
- provider.setIncr(inputIncr);
-
- // calculate the output size
- size_t outputFrames = ((int64_t) provider.getNumFrames() * outputFreq) / inputFreq;
- size_t outputFrameSize = (channels == 1 ? 2 : channels) * sizeof(TO);
- size_t outputSize = outputFrameSize * outputFrames;
- outputSize &= ~7;
-
- // create the resampler
- android::AudioResampler* resampler;
-
- resampler = android::AudioResampler::create(
- is_same<TI, int16_t>::value ? AUDIO_FORMAT_PCM_16_BIT : AUDIO_FORMAT_PCM_FLOAT,
- channels, outputFreq, quality);
- resampler->setSampleRate(inputFreq);
- resampler->setVolume(android::AudioResampler::UNITY_GAIN_FLOAT,
- android::AudioResampler::UNITY_GAIN_FLOAT);
-
- // set up the reference run
- std::vector<size_t> refIncr;
- refIncr.push_back(outputFrames);
- void* reference = calloc(outputFrames, outputFrameSize);
- resample(channels, reference, outputFrames, refIncr, &provider, resampler);
-
- TO *out = reinterpret_cast<TO *>(reference);
-
- // check signal energy in passband
- const unsigned passbandFrame = passband * outputFreq / 1000.;
- const unsigned stopbandFrame = stopband * outputFreq / 1000.;
-
- // check each channel separately
- if (channels == 1) channels = 2; // workaround (mono duplicates output channel)
-
- for (size_t i = 0; i < channels; ++i) {
- double passbandEnergy = signalEnergy(out, out + passbandFrame * channels, channels);
- double stopbandEnergy = signalEnergy(out + stopbandFrame * channels,
- out + outputFrames * channels, channels);
- double dbAtten = -10. * log10(stopbandEnergy / passbandEnergy);
- ASSERT_GT(dbAtten, 60.);
-
-#if 0
- // internal verification
- printf("if:%d of:%d pbf:%d sbf:%d sbe: %f pbe: %f db: %.2f\n",
- provider.getNumFrames(), outputFrames,
- passbandFrame, stopbandFrame, stopbandEnergy, passbandEnergy, dbAtten);
- for (size_t i = 0; i < 10; ++i) {
- std::cout << out[i+passbandFrame*channels] << std::endl;
- }
- for (size_t i = 0; i < 10; ++i) {
- std::cout << out[i+stopbandFrame*channels] << std::endl;
- }
-#endif
- }
-
- free(reference);
- delete resampler;
-}
-
-/* Buffer increment test
- *
- * We compare a reference output, where we consume and process the entire
- * buffer at a time, and a test output, where we provide small chunks of input
- * data and process small chunks of output (which may not be equivalent in size).
- *
- * Two subtests - fixed phase (3:2 down) and interpolated phase (147:320 up)
- */
-TEST(audioflinger_resampler, bufferincrement_fixedphase) {
- // all of these work
- static const enum android::AudioResampler::src_quality kQualityArray[] = {
- android::AudioResampler::LOW_QUALITY,
- android::AudioResampler::MED_QUALITY,
- android::AudioResampler::HIGH_QUALITY,
- android::AudioResampler::VERY_HIGH_QUALITY,
- android::AudioResampler::DYN_LOW_QUALITY,
- android::AudioResampler::DYN_MED_QUALITY,
- android::AudioResampler::DYN_HIGH_QUALITY,
- };
-
- for (size_t i = 0; i < ARRAY_SIZE(kQualityArray); ++i) {
- testBufferIncrement(2, false, 48000, 32000, kQualityArray[i]);
- }
-}
-
-TEST(audioflinger_resampler, bufferincrement_interpolatedphase) {
- // all of these work except low quality
- static const enum android::AudioResampler::src_quality kQualityArray[] = {
-// android::AudioResampler::LOW_QUALITY,
- android::AudioResampler::MED_QUALITY,
- android::AudioResampler::HIGH_QUALITY,
- android::AudioResampler::VERY_HIGH_QUALITY,
- android::AudioResampler::DYN_LOW_QUALITY,
- android::AudioResampler::DYN_MED_QUALITY,
- android::AudioResampler::DYN_HIGH_QUALITY,
- };
-
- for (size_t i = 0; i < ARRAY_SIZE(kQualityArray); ++i) {
- testBufferIncrement(2, false, 22050, 48000, kQualityArray[i]);
- }
-}
-
-TEST(audioflinger_resampler, bufferincrement_fixedphase_multi) {
- // only dynamic quality
- static const enum android::AudioResampler::src_quality kQualityArray[] = {
- android::AudioResampler::DYN_LOW_QUALITY,
- android::AudioResampler::DYN_MED_QUALITY,
- android::AudioResampler::DYN_HIGH_QUALITY,
- };
-
- for (size_t i = 0; i < ARRAY_SIZE(kQualityArray); ++i) {
- testBufferIncrement(4, false, 48000, 32000, kQualityArray[i]);
- }
-}
-
-TEST(audioflinger_resampler, bufferincrement_interpolatedphase_multi_float) {
- // only dynamic quality
- static const enum android::AudioResampler::src_quality kQualityArray[] = {
- android::AudioResampler::DYN_LOW_QUALITY,
- android::AudioResampler::DYN_MED_QUALITY,
- android::AudioResampler::DYN_HIGH_QUALITY,
- };
-
- for (size_t i = 0; i < ARRAY_SIZE(kQualityArray); ++i) {
- testBufferIncrement(8, true, 22050, 48000, kQualityArray[i]);
- }
-}
-
-/* Simple aliasing test
- *
- * This checks stopband response of the chirp signal to make sure frequencies
- * are properly suppressed. It uses downsampling because the stopband can be
- * clearly isolated by input frequencies exceeding the output sample rate (nyquist).
- */
-TEST(audioflinger_resampler, stopbandresponse_integer) {
- // not all of these may work (old resamplers fail on downsampling)
- static const enum android::AudioResampler::src_quality kQualityArray[] = {
- //android::AudioResampler::LOW_QUALITY,
- //android::AudioResampler::MED_QUALITY,
- //android::AudioResampler::HIGH_QUALITY,
- //android::AudioResampler::VERY_HIGH_QUALITY,
- android::AudioResampler::DYN_LOW_QUALITY,
- android::AudioResampler::DYN_MED_QUALITY,
- android::AudioResampler::DYN_HIGH_QUALITY,
- };
-
- // in this test we assume a maximum transition band between 12kHz and 20kHz.
- // there must be at least 60dB relative attenuation between stopband and passband.
- for (size_t i = 0; i < ARRAY_SIZE(kQualityArray); ++i) {
- testStopbandDownconversion<int16_t, int32_t>(
- 2, 48000, 32000, 12000, 20000, kQualityArray[i]);
- }
-
- // in this test we assume a maximum transition band between 7kHz and 15kHz.
- // there must be at least 60dB relative attenuation between stopband and passband.
- // (the weird ratio triggers interpolative resampling)
- for (size_t i = 0; i < ARRAY_SIZE(kQualityArray); ++i) {
- testStopbandDownconversion<int16_t, int32_t>(
- 2, 48000, 22101, 7000, 15000, kQualityArray[i]);
- }
-}
-
-TEST(audioflinger_resampler, stopbandresponse_integer_mono) {
- // not all of these may work (old resamplers fail on downsampling)
- static const enum android::AudioResampler::src_quality kQualityArray[] = {
- //android::AudioResampler::LOW_QUALITY,
- //android::AudioResampler::MED_QUALITY,
- //android::AudioResampler::HIGH_QUALITY,
- //android::AudioResampler::VERY_HIGH_QUALITY,
- android::AudioResampler::DYN_LOW_QUALITY,
- android::AudioResampler::DYN_MED_QUALITY,
- android::AudioResampler::DYN_HIGH_QUALITY,
- };
-
- // in this test we assume a maximum transition band between 12kHz and 20kHz.
- // there must be at least 60dB relative attenuation between stopband and passband.
- for (size_t i = 0; i < ARRAY_SIZE(kQualityArray); ++i) {
- testStopbandDownconversion<int16_t, int32_t>(
- 1, 48000, 32000, 12000, 20000, kQualityArray[i]);
- }
-
- // in this test we assume a maximum transition band between 7kHz and 15kHz.
- // there must be at least 60dB relative attenuation between stopband and passband.
- // (the weird ratio triggers interpolative resampling)
- for (size_t i = 0; i < ARRAY_SIZE(kQualityArray); ++i) {
- testStopbandDownconversion<int16_t, int32_t>(
- 1, 48000, 22101, 7000, 15000, kQualityArray[i]);
- }
-}
-
-TEST(audioflinger_resampler, stopbandresponse_integer_multichannel) {
- // not all of these may work (old resamplers fail on downsampling)
- static const enum android::AudioResampler::src_quality kQualityArray[] = {
- //android::AudioResampler::LOW_QUALITY,
- //android::AudioResampler::MED_QUALITY,
- //android::AudioResampler::HIGH_QUALITY,
- //android::AudioResampler::VERY_HIGH_QUALITY,
- android::AudioResampler::DYN_LOW_QUALITY,
- android::AudioResampler::DYN_MED_QUALITY,
- android::AudioResampler::DYN_HIGH_QUALITY,
- };
-
- // in this test we assume a maximum transition band between 12kHz and 20kHz.
- // there must be at least 60dB relative attenuation between stopband and passband.
- for (size_t i = 0; i < ARRAY_SIZE(kQualityArray); ++i) {
- testStopbandDownconversion<int16_t, int32_t>(
- 8, 48000, 32000, 12000, 20000, kQualityArray[i]);
- }
-
- // in this test we assume a maximum transition band between 7kHz and 15kHz.
- // there must be at least 60dB relative attenuation between stopband and passband.
- // (the weird ratio triggers interpolative resampling)
- for (size_t i = 0; i < ARRAY_SIZE(kQualityArray); ++i) {
- testStopbandDownconversion<int16_t, int32_t>(
- 8, 48000, 22101, 7000, 15000, kQualityArray[i]);
- }
-}
-
-TEST(audioflinger_resampler, stopbandresponse_float) {
- // not all of these may work (old resamplers fail on downsampling)
- static const enum android::AudioResampler::src_quality kQualityArray[] = {
- //android::AudioResampler::LOW_QUALITY,
- //android::AudioResampler::MED_QUALITY,
- //android::AudioResampler::HIGH_QUALITY,
- //android::AudioResampler::VERY_HIGH_QUALITY,
- android::AudioResampler::DYN_LOW_QUALITY,
- android::AudioResampler::DYN_MED_QUALITY,
- android::AudioResampler::DYN_HIGH_QUALITY,
- };
-
- // in this test we assume a maximum transition band between 12kHz and 20kHz.
- // there must be at least 60dB relative attenuation between stopband and passband.
- for (size_t i = 0; i < ARRAY_SIZE(kQualityArray); ++i) {
- testStopbandDownconversion<float, float>(
- 2, 48000, 32000, 12000, 20000, kQualityArray[i]);
- }
-
- // in this test we assume a maximum transition band between 7kHz and 15kHz.
- // there must be at least 60dB relative attenuation between stopband and passband.
- // (the weird ratio triggers interpolative resampling)
- for (size_t i = 0; i < ARRAY_SIZE(kQualityArray); ++i) {
- testStopbandDownconversion<float, float>(
- 2, 48000, 22101, 7000, 15000, kQualityArray[i]);
- }
-}
-
-TEST(audioflinger_resampler, stopbandresponse_float_mono) {
- // not all of these may work (old resamplers fail on downsampling)
- static const enum android::AudioResampler::src_quality kQualityArray[] = {
- //android::AudioResampler::LOW_QUALITY,
- //android::AudioResampler::MED_QUALITY,
- //android::AudioResampler::HIGH_QUALITY,
- //android::AudioResampler::VERY_HIGH_QUALITY,
- android::AudioResampler::DYN_LOW_QUALITY,
- android::AudioResampler::DYN_MED_QUALITY,
- android::AudioResampler::DYN_HIGH_QUALITY,
- };
-
- // in this test we assume a maximum transition band between 12kHz and 20kHz.
- // there must be at least 60dB relative attenuation between stopband and passband.
- for (size_t i = 0; i < ARRAY_SIZE(kQualityArray); ++i) {
- testStopbandDownconversion<float, float>(
- 1, 48000, 32000, 12000, 20000, kQualityArray[i]);
- }
-
- // in this test we assume a maximum transition band between 7kHz and 15kHz.
- // there must be at least 60dB relative attenuation between stopband and passband.
- // (the weird ratio triggers interpolative resampling)
- for (size_t i = 0; i < ARRAY_SIZE(kQualityArray); ++i) {
- testStopbandDownconversion<float, float>(
- 1, 48000, 22101, 7000, 15000, kQualityArray[i]);
- }
-}
-
-TEST(audioflinger_resampler, stopbandresponse_float_multichannel) {
- // not all of these may work (old resamplers fail on downsampling)
- static const enum android::AudioResampler::src_quality kQualityArray[] = {
- //android::AudioResampler::LOW_QUALITY,
- //android::AudioResampler::MED_QUALITY,
- //android::AudioResampler::HIGH_QUALITY,
- //android::AudioResampler::VERY_HIGH_QUALITY,
- android::AudioResampler::DYN_LOW_QUALITY,
- android::AudioResampler::DYN_MED_QUALITY,
- android::AudioResampler::DYN_HIGH_QUALITY,
- };
-
- // in this test we assume a maximum transition band between 12kHz and 20kHz.
- // there must be at least 60dB relative attenuation between stopband and passband.
- for (size_t i = 0; i < ARRAY_SIZE(kQualityArray); ++i) {
- testStopbandDownconversion<float, float>(
- 8, 48000, 32000, 12000, 20000, kQualityArray[i]);
- }
-
- // in this test we assume a maximum transition band between 7kHz and 15kHz.
- // there must be at least 60dB relative attenuation between stopband and passband.
- // (the weird ratio triggers interpolative resampling)
- for (size_t i = 0; i < ARRAY_SIZE(kQualityArray); ++i) {
- testStopbandDownconversion<float, float>(
- 8, 48000, 22101, 7000, 15000, kQualityArray[i]);
- }
-}
-
diff --git a/services/audioflinger/tests/run_all_unit_tests.sh b/services/audioflinger/tests/run_all_unit_tests.sh
deleted file mode 100755
index 15a94c2..0000000
--- a/services/audioflinger/tests/run_all_unit_tests.sh
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/bin/bash
-
-if [ -z "$ANDROID_BUILD_TOP" ]; then
- echo "Android build environment not set"
- exit -1
-fi
-
-echo "waiting for device"
-adb root && adb wait-for-device remount
-
-adb shell /data/nativetest/resampler_tests/resampler_tests
-adb shell /data/nativetest64/resampler_tests/resampler_tests
diff --git a/services/audioflinger/tests/test-mixer.cpp b/services/audioflinger/tests/test-mixer.cpp
deleted file mode 100644
index 65e22da..0000000
--- a/services/audioflinger/tests/test-mixer.cpp
+++ /dev/null
@@ -1,328 +0,0 @@
-/*
- * Copyright (C) 2014 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include <stdio.h>
-#include <inttypes.h>
-#include <math.h>
-#include <vector>
-#include <audio_utils/primitives.h>
-#include <audio_utils/sndfile.h>
-#include <media/AudioBufferProvider.h>
-#include "AudioMixer.h"
-#include "test_utils.h"
-
-/* Testing is typically through creation of an output WAV file from several
- * source inputs, to be later analyzed by an audio program such as Audacity.
- *
- * Sine or chirp functions are typically more useful as input to the mixer
- * as they show up as straight lines on a spectrogram if successfully mixed.
- *
- * A sample shell script is provided: mixer_to_wave_tests.sh
- */
-
-using namespace android;
-
-static void usage(const char* name) {
- fprintf(stderr, "Usage: %s [-f] [-m] [-c channels]"
- " [-s sample-rate] [-o <output-file>] [-a <aux-buffer-file>] [-P csv]"
- " (<input-file> | <command>)+\n", name);
- fprintf(stderr, " -f enable floating point input track by default\n");
- fprintf(stderr, " -m enable floating point mixer output\n");
- fprintf(stderr, " -c number of mixer output channels\n");
- fprintf(stderr, " -s mixer sample-rate\n");
- fprintf(stderr, " -o <output-file> WAV file, pcm16 (or float if -m specified)\n");
- fprintf(stderr, " -a <aux-buffer-file>\n");
- fprintf(stderr, " -P # frames provided per call to resample() in CSV format\n");
- fprintf(stderr, " <input-file> is a WAV file\n");
- fprintf(stderr, " <command> can be 'sine:[(i|f),]<channels>,<frequency>,<samplerate>'\n");
- fprintf(stderr, " 'chirp:[(i|f),]<channels>,<samplerate>'\n");
-}
-
-static int writeFile(const char *filename, const void *buffer,
- uint32_t sampleRate, uint32_t channels, size_t frames, bool isBufferFloat) {
- if (filename == NULL) {
- return 0; // ok to pass in NULL filename
- }
- // write output to file.
- SF_INFO info;
- info.frames = 0;
- info.samplerate = sampleRate;
- info.channels = channels;
- info.format = SF_FORMAT_WAV | (isBufferFloat ? SF_FORMAT_FLOAT : SF_FORMAT_PCM_16);
- printf("saving file:%s channels:%u samplerate:%u frames:%zu\n",
- filename, info.channels, info.samplerate, frames);
- SNDFILE *sf = sf_open(filename, SFM_WRITE, &info);
- if (sf == NULL) {
- perror(filename);
- return EXIT_FAILURE;
- }
- if (isBufferFloat) {
- (void) sf_writef_float(sf, (float*)buffer, frames);
- } else {
- (void) sf_writef_short(sf, (short*)buffer, frames);
- }
- sf_close(sf);
- return EXIT_SUCCESS;
-}
-
-const char *parseFormat(const char *s, bool *useFloat) {
- if (!strncmp(s, "f,", 2)) {
- *useFloat = true;
- return s + 2;
- }
- if (!strncmp(s, "i,", 2)) {
- *useFloat = false;
- return s + 2;
- }
- return s;
-}
-
-int main(int argc, char* argv[]) {
- const char* const progname = argv[0];
- bool useInputFloat = false;
- bool useMixerFloat = false;
- bool useRamp = true;
- uint32_t outputSampleRate = 48000;
- uint32_t outputChannels = 2; // stereo for now
- std::vector<int> Pvalues;
- const char* outputFilename = NULL;
- const char* auxFilename = NULL;
- std::vector<int32_t> names;
- std::vector<SignalProvider> providers;
- std::vector<audio_format_t> formats;
-
- for (int ch; (ch = getopt(argc, argv, "fmc:s:o:a:P:")) != -1;) {
- switch (ch) {
- case 'f':
- useInputFloat = true;
- break;
- case 'm':
- useMixerFloat = true;
- break;
- case 'c':
- outputChannels = atoi(optarg);
- break;
- case 's':
- outputSampleRate = atoi(optarg);
- break;
- case 'o':
- outputFilename = optarg;
- break;
- case 'a':
- auxFilename = optarg;
- break;
- case 'P':
- if (parseCSV(optarg, Pvalues) < 0) {
- fprintf(stderr, "incorrect syntax for -P option\n");
- return EXIT_FAILURE;
- }
- break;
- case '?':
- default:
- usage(progname);
- return EXIT_FAILURE;
- }
- }
- argc -= optind;
- argv += optind;
-
- if (argc == 0) {
- usage(progname);
- return EXIT_FAILURE;
- }
- if ((unsigned)argc > AudioMixer::MAX_NUM_TRACKS) {
- fprintf(stderr, "too many tracks: %d > %u", argc, AudioMixer::MAX_NUM_TRACKS);
- return EXIT_FAILURE;
- }
-
- size_t outputFrames = 0;
-
- // create providers for each track
- names.resize(argc);
- providers.resize(argc);
- formats.resize(argc);
- for (int i = 0; i < argc; ++i) {
- static const char chirp[] = "chirp:";
- static const char sine[] = "sine:";
- static const double kSeconds = 1;
- bool useFloat = useInputFloat;
-
- if (!strncmp(argv[i], chirp, strlen(chirp))) {
- std::vector<int> v;
- const char *s = parseFormat(argv[i] + strlen(chirp), &useFloat);
-
- parseCSV(s, v);
- if (v.size() == 2) {
- printf("creating chirp(%d %d)\n", v[0], v[1]);
- if (useFloat) {
- providers[i].setChirp<float>(v[0], 0, v[1]/2, v[1], kSeconds);
- formats[i] = AUDIO_FORMAT_PCM_FLOAT;
- } else {
- providers[i].setChirp<int16_t>(v[0], 0, v[1]/2, v[1], kSeconds);
- formats[i] = AUDIO_FORMAT_PCM_16_BIT;
- }
- providers[i].setIncr(Pvalues);
- } else {
- fprintf(stderr, "malformed input '%s'\n", argv[i]);
- }
- } else if (!strncmp(argv[i], sine, strlen(sine))) {
- std::vector<int> v;
- const char *s = parseFormat(argv[i] + strlen(sine), &useFloat);
-
- parseCSV(s, v);
- if (v.size() == 3) {
- printf("creating sine(%d %d %d)\n", v[0], v[1], v[2]);
- if (useFloat) {
- providers[i].setSine<float>(v[0], v[1], v[2], kSeconds);
- formats[i] = AUDIO_FORMAT_PCM_FLOAT;
- } else {
- providers[i].setSine<int16_t>(v[0], v[1], v[2], kSeconds);
- formats[i] = AUDIO_FORMAT_PCM_16_BIT;
- }
- providers[i].setIncr(Pvalues);
- } else {
- fprintf(stderr, "malformed input '%s'\n", argv[i]);
- }
- } else {
- printf("creating filename(%s)\n", argv[i]);
- if (useInputFloat) {
- providers[i].setFile<float>(argv[i]);
- formats[i] = AUDIO_FORMAT_PCM_FLOAT;
- } else {
- providers[i].setFile<short>(argv[i]);
- formats[i] = AUDIO_FORMAT_PCM_16_BIT;
- }
- providers[i].setIncr(Pvalues);
- }
- // calculate the number of output frames
- size_t nframes = (int64_t) providers[i].getNumFrames() * outputSampleRate
- / providers[i].getSampleRate();
- if (i == 0 || outputFrames > nframes) { // choose minimum for outputFrames
- outputFrames = nframes;
- }
- }
-
- // create the output buffer.
- const size_t outputFrameSize = outputChannels
- * (useMixerFloat ? sizeof(float) : sizeof(int16_t));
- const size_t outputSize = outputFrames * outputFrameSize;
- const audio_channel_mask_t outputChannelMask =
- audio_channel_out_mask_from_count(outputChannels);
- void *outputAddr = NULL;
- (void) posix_memalign(&outputAddr, 32, outputSize);
- memset(outputAddr, 0, outputSize);
-
- // create the aux buffer, if needed.
- const size_t auxFrameSize = sizeof(int32_t); // Q4.27 always
- const size_t auxSize = outputFrames * auxFrameSize;
- void *auxAddr = NULL;
- if (auxFilename) {
- (void) posix_memalign(&auxAddr, 32, auxSize);
- memset(auxAddr, 0, auxSize);
- }
-
- // create the mixer.
- const size_t mixerFrameCount = 320; // typical numbers may range from 240 or 960
- AudioMixer *mixer = new AudioMixer(mixerFrameCount, outputSampleRate);
- audio_format_t mixerFormat = useMixerFloat
- ? AUDIO_FORMAT_PCM_FLOAT : AUDIO_FORMAT_PCM_16_BIT;
- float f = AudioMixer::UNITY_GAIN_FLOAT / providers.size(); // normalize volume by # tracks
- static float f0; // zero
-
- // set up the tracks.
- for (size_t i = 0; i < providers.size(); ++i) {
- //printf("track %d out of %d\n", i, providers.size());
- uint32_t channelMask = audio_channel_out_mask_from_count(providers[i].getNumChannels());
- int32_t name = mixer->getTrackName(channelMask,
- formats[i], AUDIO_SESSION_OUTPUT_MIX);
- ALOG_ASSERT(name >= 0);
- names[i] = name;
- mixer->setBufferProvider(name, &providers[i]);
- mixer->setParameter(name, AudioMixer::TRACK, AudioMixer::MAIN_BUFFER,
- (void *)outputAddr);
- mixer->setParameter(
- name,
- AudioMixer::TRACK,
- AudioMixer::MIXER_FORMAT,
- (void *)(uintptr_t)mixerFormat);
- mixer->setParameter(
- name,
- AudioMixer::TRACK,
- AudioMixer::FORMAT,
- (void *)(uintptr_t)formats[i]);
- mixer->setParameter(
- name,
- AudioMixer::TRACK,
- AudioMixer::MIXER_CHANNEL_MASK,
- (void *)(uintptr_t)outputChannelMask);
- mixer->setParameter(
- name,
- AudioMixer::TRACK,
- AudioMixer::CHANNEL_MASK,
- (void *)(uintptr_t)channelMask);
- mixer->setParameter(
- name,
- AudioMixer::RESAMPLE,
- AudioMixer::SAMPLE_RATE,
- (void *)(uintptr_t)providers[i].getSampleRate());
- if (useRamp) {
- mixer->setParameter(name, AudioMixer::VOLUME, AudioMixer::VOLUME0, &f0);
- mixer->setParameter(name, AudioMixer::VOLUME, AudioMixer::VOLUME1, &f0);
- mixer->setParameter(name, AudioMixer::RAMP_VOLUME, AudioMixer::VOLUME0, &f);
- mixer->setParameter(name, AudioMixer::RAMP_VOLUME, AudioMixer::VOLUME1, &f);
- } else {
- mixer->setParameter(name, AudioMixer::VOLUME, AudioMixer::VOLUME0, &f);
- mixer->setParameter(name, AudioMixer::VOLUME, AudioMixer::VOLUME1, &f);
- }
- if (auxFilename) {
- mixer->setParameter(name, AudioMixer::TRACK, AudioMixer::AUX_BUFFER,
- (void *) auxAddr);
- mixer->setParameter(name, AudioMixer::VOLUME, AudioMixer::AUXLEVEL, &f0);
- mixer->setParameter(name, AudioMixer::RAMP_VOLUME, AudioMixer::AUXLEVEL, &f);
- }
- mixer->enable(name);
- }
-
- // pump the mixer to process data.
- size_t i;
- for (i = 0; i < outputFrames - mixerFrameCount; i += mixerFrameCount) {
- for (size_t j = 0; j < names.size(); ++j) {
- mixer->setParameter(names[j], AudioMixer::TRACK, AudioMixer::MAIN_BUFFER,
- (char *) outputAddr + i * outputFrameSize);
- if (auxFilename) {
- mixer->setParameter(names[j], AudioMixer::TRACK, AudioMixer::AUX_BUFFER,
- (char *) auxAddr + i * auxFrameSize);
- }
- }
- mixer->process();
- }
- outputFrames = i; // reset output frames to the data actually produced.
-
- // write to files
- writeFile(outputFilename, outputAddr,
- outputSampleRate, outputChannels, outputFrames, useMixerFloat);
- if (auxFilename) {
- // Aux buffer is always in q4_27 format for now.
- // memcpy_to_i16_from_q4_27(), but with stereo frame count (not sample count)
- ditherAndClamp((int32_t*)auxAddr, (int32_t*)auxAddr, outputFrames >> 1);
- writeFile(auxFilename, auxAddr, outputSampleRate, 1, outputFrames, false);
- }
-
- delete mixer;
- free(outputAddr);
- free(auxAddr);
- return EXIT_SUCCESS;
-}
diff --git a/services/audioflinger/tests/test_utils.h b/services/audioflinger/tests/test_utils.h
deleted file mode 100644
index b61a929..0000000
--- a/services/audioflinger/tests/test_utils.h
+++ /dev/null
@@ -1,313 +0,0 @@
-/*
- * Copyright (C) 2014 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef ANDROID_AUDIO_TEST_UTILS_H
-#define ANDROID_AUDIO_TEST_UTILS_H
-
-#ifndef LOG_TAG
-#define LOG_TAG "test_utils"
-#endif
-
-#include <log/log.h>
-
-#include <audio_utils/sndfile.h>
-
-#ifndef ARRAY_SIZE
-#define ARRAY_SIZE(a) (sizeof(a) / sizeof((a)[0]))
-#endif
-
-template<typename T, typename U>
-struct is_same
-{
- static const bool value = false;
-};
-
-template<typename T>
-struct is_same<T, T> // partial specialization
-{
- static const bool value = true;
-};
-
-template<typename T>
-static inline T convertValue(double val)
-{
- if (is_same<T, int16_t>::value) {
- return floor(val * 32767.0 + 0.5);
- } else if (is_same<T, int32_t>::value) {
- return floor(val * (1UL<<31) + 0.5);
- }
- return val; // assume float or double
-}
-
-// Convert a list of integers in CSV format to a Vector of those values.
-// Returns the number of elements in the list, or -1 on error.
-static inline int parseCSV(const char *string, std::vector<int>& values)
-{
- // pass 1: count the number of values and do syntax check
- size_t numValues = 0;
- bool hadDigit = false;
- for (const char *p = string; ; ) {
- switch (*p++) {
- case '0': case '1': case '2': case '3': case '4':
- case '5': case '6': case '7': case '8': case '9':
- hadDigit = true;
- break;
- case '\0':
- if (hadDigit) {
- // pass 2: allocate and initialize vector of values
- values.resize(++numValues);
- values[0] = atoi(p = string);
- for (size_t i = 1; i < numValues; ) {
- if (*p++ == ',') {
- values[i++] = atoi(p);
- }
- }
- return numValues;
- }
- // fall through
- case ',':
- if (hadDigit) {
- hadDigit = false;
- numValues++;
- break;
- }
- // fall through
- default:
- return -1;
- }
- }
-}
-
-/* Creates a type-independent audio buffer provider from
- * a buffer base address, size, framesize, and input increment array.
- *
- * No allocation or deallocation of the provided buffer is done.
- */
-class TestProvider : public android::AudioBufferProvider {
-public:
- TestProvider(void* addr, size_t frames, size_t frameSize,
- const std::vector<int>& inputIncr)
- : mAddr(addr),
- mNumFrames(frames),
- mFrameSize(frameSize),
- mNextFrame(0), mUnrel(0), mInputIncr(inputIncr), mNextIdx(0)
- {
- }
-
- TestProvider()
- : mAddr(NULL), mNumFrames(0), mFrameSize(0),
- mNextFrame(0), mUnrel(0), mNextIdx(0)
- {
- }
-
- void setIncr(const std::vector<int>& inputIncr) {
- mInputIncr = inputIncr;
- mNextIdx = 0;
- }
-
- virtual android::status_t getNextBuffer(Buffer* buffer)
- {
- size_t requestedFrames = buffer->frameCount;
- if (requestedFrames > mNumFrames - mNextFrame) {
- buffer->frameCount = mNumFrames - mNextFrame;
- }
- if (!mInputIncr.empty()) {
- size_t provided = mInputIncr[mNextIdx++];
- ALOGV("getNextBuffer() mValue[%zu]=%zu not %zu",
- mNextIdx-1, provided, buffer->frameCount);
- if (provided < buffer->frameCount) {
- buffer->frameCount = provided;
- }
- if (mNextIdx >= mInputIncr.size()) {
- mNextIdx = 0;
- }
- }
- ALOGV("getNextBuffer() requested %zu frames out of %zu frames available"
- " and returned %zu frames",
- requestedFrames, mNumFrames - mNextFrame, buffer->frameCount);
- mUnrel = buffer->frameCount;
- if (buffer->frameCount > 0) {
- buffer->raw = (char *)mAddr + mFrameSize * mNextFrame;
- return android::NO_ERROR;
- } else {
- buffer->raw = NULL;
- return android::NOT_ENOUGH_DATA;
- }
- }
-
- virtual void releaseBuffer(Buffer* buffer)
- {
- if (buffer->frameCount > mUnrel) {
- ALOGE("releaseBuffer() released %zu frames but only %zu available "
- "to release", buffer->frameCount, mUnrel);
- mNextFrame += mUnrel;
- mUnrel = 0;
- } else {
-
- ALOGV("releaseBuffer() released %zu frames out of %zu frames available "
- "to release", buffer->frameCount, mUnrel);
- mNextFrame += buffer->frameCount;
- mUnrel -= buffer->frameCount;
- }
- buffer->frameCount = 0;
- buffer->raw = NULL;
- }
-
- void reset()
- {
- mNextFrame = 0;
- }
-
- size_t getNumFrames()
- {
- return mNumFrames;
- }
-
-
-protected:
- void* mAddr; // base address
- size_t mNumFrames; // total frames
- int mFrameSize; // frame size (# channels * bytes per sample)
- size_t mNextFrame; // index of next frame to provide
- size_t mUnrel; // number of frames not yet released
- std::vector<int> mInputIncr; // number of frames provided per call
- size_t mNextIdx; // index of next entry in mInputIncr to use
-};
-
-/* Creates a buffer filled with a sine wave.
- */
-template<typename T>
-static void createSine(void *vbuffer, size_t frames,
- size_t channels, double sampleRate, double freq)
-{
- double tscale = 1. / sampleRate;
- T* buffer = reinterpret_cast<T*>(vbuffer);
- for (size_t i = 0; i < frames; ++i) {
- double t = i * tscale;
- double y = sin(2. * M_PI * freq * t);
- T yt = convertValue<T>(y);
-
- for (size_t j = 0; j < channels; ++j) {
- buffer[i*channels + j] = yt / T(j + 1);
- }
- }
-}
-
-/* Creates a buffer filled with a chirp signal (a sine wave sweep).
- *
- * When creating the Chirp, note that the frequency is the true sinusoidal
- * frequency not the sampling rate.
- *
- * http://en.wikipedia.org/wiki/Chirp
- */
-template<typename T>
-static void createChirp(void *vbuffer, size_t frames,
- size_t channels, double sampleRate, double minfreq, double maxfreq)
-{
- double tscale = 1. / sampleRate;
- T *buffer = reinterpret_cast<T*>(vbuffer);
- // note the chirp constant k has a divide-by-two.
- double k = (maxfreq - minfreq) / (2. * tscale * frames);
- for (size_t i = 0; i < frames; ++i) {
- double t = i * tscale;
- double y = sin(2. * M_PI * (k * t + minfreq) * t);
- T yt = convertValue<T>(y);
-
- for (size_t j = 0; j < channels; ++j) {
- buffer[i*channels + j] = yt / T(j + 1);
- }
- }
-}
-
-/* This derived class creates a buffer provider of datatype T,
- * consisting of an input signal, e.g. from createChirp().
- * The number of frames can be obtained from the base class
- * TestProvider::getNumFrames().
- */
-
-class SignalProvider : public TestProvider {
-public:
- SignalProvider()
- : mSampleRate(0),
- mChannels(0)
- {
- }
-
- virtual ~SignalProvider()
- {
- free(mAddr);
- mAddr = NULL;
- }
-
- template <typename T>
- void setChirp(size_t channels, double minfreq, double maxfreq, double sampleRate, double time)
- {
- createBufferByFrames<T>(channels, sampleRate, sampleRate*time);
- createChirp<T>(mAddr, mNumFrames, mChannels, mSampleRate, minfreq, maxfreq);
- }
-
- template <typename T>
- void setSine(size_t channels,
- double freq, double sampleRate, double time)
- {
- createBufferByFrames<T>(channels, sampleRate, sampleRate*time);
- createSine<T>(mAddr, mNumFrames, mChannels, mSampleRate, freq);
- }
-
- template <typename T>
- void setFile(const char *file_in)
- {
- SF_INFO info;
- info.format = 0;
- SNDFILE *sf = sf_open(file_in, SFM_READ, &info);
- if (sf == NULL) {
- perror(file_in);
- return;
- }
- createBufferByFrames<T>(info.channels, info.samplerate, info.frames);
- if (is_same<T, float>::value) {
- (void) sf_readf_float(sf, (float *) mAddr, mNumFrames);
- } else if (is_same<T, short>::value) {
- (void) sf_readf_short(sf, (short *) mAddr, mNumFrames);
- }
- sf_close(sf);
- }
-
- template <typename T>
- void createBufferByFrames(size_t channels, uint32_t sampleRate, size_t frames)
- {
- mNumFrames = frames;
- mChannels = channels;
- mFrameSize = mChannels * sizeof(T);
- free(mAddr);
- mAddr = malloc(mFrameSize * mNumFrames);
- mSampleRate = sampleRate;
- }
-
- uint32_t getSampleRate() const {
- return mSampleRate;
- }
-
- uint32_t getNumChannels() const {
- return mChannels;
- }
-
-protected:
- uint32_t mSampleRate;
- uint32_t mChannels;
-};
-
-#endif // ANDROID_AUDIO_TEST_UTILS_H