cc029e59f7
The existing openOutputStream API did not allow passing stream flags even though its audio hardware interface's open_output_stream counterpart does take a "flags" argument. This means that, when the audio hw_module is implemented using libhardware_legacy, the output flag was lost. This commit adds an API in libhardware_legacy's audio module, allowing to pass the flag, and updates the default wrapper in order to call this new API instead of the old version that missed the flag. Change-Id: I20c102d32b489f87fabbd7d02aa0b28fae13948b Signed-off-by: David Wagner <david.wagner@intel.com> Signed-off-by: Bruce Beare <bruce.j.beare@intel.com> Signed-off-by: Jack Ren <jack.ren@intel.com>
164 lines
4.2 KiB
C++
164 lines
4.2 KiB
C++
/*
|
|
**
|
|
** 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.
|
|
*/
|
|
|
|
#include <cutils/properties.h>
|
|
#include <string.h>
|
|
#include <unistd.h>
|
|
//#define LOG_NDEBUG 0
|
|
|
|
#define LOG_TAG "AudioHardwareInterface"
|
|
#include <utils/Log.h>
|
|
#include <utils/String8.h>
|
|
|
|
#include "AudioHardwareStub.h"
|
|
#include "AudioHardwareGeneric.h"
|
|
|
|
#ifdef ENABLE_AUDIO_DUMP
|
|
#include "AudioDumpInterface.h"
|
|
#endif
|
|
|
|
|
|
// change to 1 to log routing calls
|
|
#define LOG_ROUTING_CALLS 1
|
|
|
|
namespace android_audio_legacy {
|
|
|
|
#if LOG_ROUTING_CALLS
|
|
static const char* routingModeStrings[] =
|
|
{
|
|
"OUT OF RANGE",
|
|
"INVALID",
|
|
"CURRENT",
|
|
"NORMAL",
|
|
"RINGTONE",
|
|
"IN_CALL",
|
|
"IN_COMMUNICATION"
|
|
};
|
|
|
|
static const char* routeNone = "NONE";
|
|
|
|
static const char* displayMode(int mode)
|
|
{
|
|
if ((mode < AudioSystem::MODE_INVALID) || (mode >= AudioSystem::NUM_MODES))
|
|
return routingModeStrings[0];
|
|
return routingModeStrings[mode+3];
|
|
}
|
|
#endif
|
|
|
|
// ----------------------------------------------------------------------------
|
|
|
|
AudioHardwareInterface* AudioHardwareInterface::create()
|
|
{
|
|
return NULL;
|
|
}
|
|
|
|
AudioStreamOut::~AudioStreamOut()
|
|
{
|
|
}
|
|
|
|
// default implementation is unsupported
|
|
status_t AudioStreamOut::getNextWriteTimestamp(int64_t *timestamp)
|
|
{
|
|
return INVALID_OPERATION;
|
|
}
|
|
|
|
AudioStreamIn::~AudioStreamIn() {}
|
|
|
|
AudioHardwareBase::AudioHardwareBase()
|
|
{
|
|
mMode = 0;
|
|
}
|
|
|
|
status_t AudioHardwareBase::setMode(int mode)
|
|
{
|
|
#if LOG_ROUTING_CALLS
|
|
ALOGD("setMode(%s)", displayMode(mode));
|
|
#endif
|
|
if ((mode < 0) || (mode >= AudioSystem::NUM_MODES))
|
|
return BAD_VALUE;
|
|
if (mMode == mode)
|
|
return ALREADY_EXISTS;
|
|
mMode = mode;
|
|
return NO_ERROR;
|
|
}
|
|
|
|
// default implementation
|
|
status_t AudioHardwareBase::setParameters(const String8& keyValuePairs)
|
|
{
|
|
return NO_ERROR;
|
|
}
|
|
|
|
// default implementation
|
|
String8 AudioHardwareBase::getParameters(const String8& keys)
|
|
{
|
|
AudioParameter param = AudioParameter(keys);
|
|
return param.toString();
|
|
}
|
|
|
|
// default implementation
|
|
size_t AudioHardwareBase::getInputBufferSize(uint32_t sampleRate, int format, int channelCount)
|
|
{
|
|
if (sampleRate != 8000) {
|
|
ALOGW("getInputBufferSize bad sampling rate: %d", sampleRate);
|
|
return 0;
|
|
}
|
|
if (format != AudioSystem::PCM_16_BIT) {
|
|
ALOGW("getInputBufferSize bad format: %d", format);
|
|
return 0;
|
|
}
|
|
if (channelCount != 1) {
|
|
ALOGW("getInputBufferSize bad channel count: %d", channelCount);
|
|
return 0;
|
|
}
|
|
|
|
return 320;
|
|
}
|
|
|
|
// default implementation is unsupported
|
|
status_t AudioHardwareBase::getMasterVolume(float *volume)
|
|
{
|
|
return INVALID_OPERATION;
|
|
}
|
|
|
|
status_t AudioHardwareBase::dumpState(int fd, const Vector<String16>& args)
|
|
{
|
|
const size_t SIZE = 256;
|
|
char buffer[SIZE];
|
|
String8 result;
|
|
snprintf(buffer, SIZE, "AudioHardwareBase::dumpState\n");
|
|
result.append(buffer);
|
|
snprintf(buffer, SIZE, "\tmMode: %d\n", mMode);
|
|
result.append(buffer);
|
|
::write(fd, result.string(), result.size());
|
|
dump(fd, args); // Dump the state of the concrete child.
|
|
return NO_ERROR;
|
|
}
|
|
|
|
// default implementation calls its "without flags" counterpart
|
|
AudioStreamOut* AudioHardwareInterface::openOutputStreamWithFlags(uint32_t devices,
|
|
audio_output_flags_t flags,
|
|
int *format,
|
|
uint32_t *channels,
|
|
uint32_t *sampleRate,
|
|
status_t *status)
|
|
{
|
|
return openOutputStream(devices, format, channels, sampleRate, status);
|
|
}
|
|
|
|
// ----------------------------------------------------------------------------
|
|
|
|
}; // namespace android
|