65b65459e6
First drop of audio framework modifications for audio effects support. - AudioTrack/AudioRecord: Added support for auxiliary effects in AudioTrack Added support for audio sessions Fixed left right channel inversion in setVolume() - IAudioFlinger: Added interface methods for effect enumeraiton and instantiation Added support for audio sessions. - IAudioTrack: Added method to attach auxiliary effect. - AudioFlinger Created new classes to control effect engines in effect library and manage effect connections to tracks or output mix: EffectModule: wrapper object controlling the effect engine implementation in the effect library. There is one EffectModule per instance of an effect in a given audio session EffectChain: group of effects associated to one audio session. There is one EffectChain per audio session. EffectChain for session 0 is for output mix effects, other chains are attached to audio tracks with same session ID. Each chain contains a variable number of EffectModules EffectHandle: implements the IEffect interface. There is one EffectHandle object for each application controlling (or using) an effect module. THe EffectModule maintians a list of EffectHandles. Added support for effect modules and effect chains creation in PlaybackThread. modified mixer thread loop to allow track volume control by effect modules and call effect processing. -AudioMixer Each track now specifies its output buffer used by mixer for accumulation Modified mixer process functions to process tracks by groups of tracks with same buffer Modified track process functions to support accumulation to auxiliary channel Change-Id: I26d5f7c9e070a89bdd383e1a659f8b7ca150379c
99 lines
3.9 KiB
C++
99 lines
3.9 KiB
C++
/*
|
|
* 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_TRACK_SHARED_H
|
|
#define ANDROID_AUDIO_TRACK_SHARED_H
|
|
|
|
#include <stdint.h>
|
|
#include <sys/types.h>
|
|
|
|
#include <utils/threads.h>
|
|
|
|
namespace android {
|
|
|
|
// ----------------------------------------------------------------------------
|
|
|
|
#define THREAD_PRIORITY_AUDIO_CLIENT (ANDROID_PRIORITY_AUDIO)
|
|
// Maximum cumulated timeout milliseconds before restarting audioflinger thread
|
|
#define MAX_STARTUP_TIMEOUT_MS 3000 // Longer timeout period at startup to cope with A2DP init time
|
|
#define MAX_RUN_TIMEOUT_MS 1000
|
|
#define WAIT_PERIOD_MS 10
|
|
|
|
#define CBLK_UNDERRUN_MSK 0x0001
|
|
#define CBLK_UNDERRUN_ON 0x0001 // underrun (out) or overrrun (in) indication
|
|
#define CBLK_UNDERRUN_OFF 0x0000 // no underrun
|
|
#define CBLK_DIRECTION_MSK 0x0002
|
|
#define CBLK_DIRECTION_OUT 0x0002 // this cblk is for an AudioTrack
|
|
#define CBLK_DIRECTION_IN 0x0000 // this cblk is for an AudioRecord
|
|
#define CBLK_FORCEREADY_MSK 0x0004
|
|
#define CBLK_FORCEREADY_ON 0x0004 // track is considered ready immediately by AudioFlinger
|
|
#define CBLK_FORCEREADY_OFF 0x0000 // track is ready when buffer full
|
|
#define CBLK_INVALID_MSK 0x0008
|
|
#define CBLK_INVALID_ON 0x0008 // track buffer is invalidated by AudioFlinger: must be re-created
|
|
#define CBLK_INVALID_OFF 0x0000
|
|
|
|
struct audio_track_cblk_t
|
|
{
|
|
|
|
// The data members are grouped so that members accessed frequently and in the same context
|
|
// are in the same line of data cache.
|
|
Mutex lock;
|
|
Condition cv;
|
|
volatile uint32_t user;
|
|
volatile uint32_t server;
|
|
uint32_t userBase;
|
|
uint32_t serverBase;
|
|
void* buffers;
|
|
uint32_t frameCount;
|
|
// Cache line boundary
|
|
uint32_t loopStart;
|
|
uint32_t loopEnd;
|
|
int loopCount;
|
|
volatile union {
|
|
uint16_t volume[2];
|
|
uint32_t volumeLR;
|
|
};
|
|
uint32_t sampleRate;
|
|
// NOTE: audio_track_cblk_t::frameSize is not equal to AudioTrack::frameSize() for
|
|
// 8 bit PCM data: in this case, mCblk->frameSize is based on a sample size of
|
|
// 16 bit because data is converted to 16 bit before being stored in buffer
|
|
|
|
uint8_t frameSize;
|
|
uint8_t channelCount;
|
|
uint16_t flags;
|
|
|
|
uint16_t bufferTimeoutMs; // Maximum cumulated timeout before restarting audioflinger
|
|
uint16_t waitTimeMs; // Cumulated wait time
|
|
|
|
uint16_t sendLevel;
|
|
uint16_t reserved;
|
|
// Cache line boundary (32 bytes)
|
|
audio_track_cblk_t();
|
|
uint32_t stepUser(uint32_t frameCount);
|
|
bool stepServer(uint32_t frameCount);
|
|
void* buffer(uint32_t offset) const;
|
|
uint32_t framesAvailable();
|
|
uint32_t framesAvailable_l();
|
|
uint32_t framesReady();
|
|
};
|
|
|
|
|
|
// ----------------------------------------------------------------------------
|
|
|
|
}; // namespace android
|
|
|
|
#endif // ANDROID_AUDIO_TRACK_SHARED_H
|