#define DEFAULT_INPUT_BUFFER_SIZE_MS 20
+/* Lock play & record samples rates at or above this threshold */
+#define RATELOCK_THRESHOLD 96000
+
struct audio_device {
struct audio_hw_device hw_device;
/* input */
alsa_device_profile in_profile;
+ /* lock input & output sample rates */
+ /*FIXME - How do we address multiple output streams? */
+ uint32_t device_sample_rate;
+
bool mic_muted;
bool standby;
profile_read_device_info(out->profile);
- pthread_mutex_unlock(&adev->lock);
-
int ret = 0;
/* Rate */
ret = -EINVAL;
}
+ out->dev->device_sample_rate = config->sample_rate;
+ pthread_mutex_unlock(&adev->lock);
+
/* Format */
if (config->format == AUDIO_FORMAT_DEFAULT) {
proxy_config.format = profile_get_default_format(out->profile);
out->conversion_buffer = NULL;
out->conversion_buffer_size = 0;
+ pthread_mutex_lock(&out->dev->lock);
+ out->dev->device_sample_rate = 0;
+ pthread_mutex_unlock(&out->dev->lock);
+
free(stream);
}
/* must be called with hw device and output stream mutexes locked */
static int start_input_stream(struct stream_in *in)
{
- ALOGV("ustart_input_stream(card:%d device:%d)", in->profile->card, in->profile->device);
+ ALOGV("start_input_stream(card:%d device:%d)", in->profile->card, in->profile->device);
return proxy_open(&in->proxy);
}
const char *address /*__unused*/,
audio_source_t source __unused)
{
- ALOGV("in adev_open_input_stream() rate:%" PRIu32 ", chanMask:0x%" PRIX32 ", fmt:%" PRIu8,
+ ALOGV("adev_open_input_stream() rate:%" PRIu32 ", chanMask:0x%" PRIX32 ", fmt:%" PRIu8,
config->sample_rate, config->channel_mask, config->format);
struct stream_in *in = (struct stream_in *)calloc(1, sizeof(struct stream_in));
parse_card_device_params(address, &(in->profile->card), &(in->profile->device));
profile_read_device_info(in->profile);
- pthread_mutex_unlock(&in->dev->lock);
/* Rate */
if (config->sample_rate == 0) {
proxy_config.rate = config->sample_rate = profile_get_default_sample_rate(in->profile);
+ } else if (in->dev->device_sample_rate != 0 && /* we are playing, so lock the rate */
+ in->dev->device_sample_rate >= RATELOCK_THRESHOLD) { /* but only for high
+ sample rates */
+ // Lock the rate to the output rate
+ ret = config->sample_rate != in->dev->device_sample_rate ? -EINVAL : 0;
+ proxy_config.rate = config->sample_rate = in->dev->device_sample_rate;
} else if (profile_is_sample_rate_valid(in->profile, config->sample_rate)) {
- proxy_config.rate = config->sample_rate;
+ in->dev->device_sample_rate = proxy_config.rate = config->sample_rate;
} else {
proxy_config.rate = config->sample_rate = profile_get_default_sample_rate(in->profile);
ret = -EINVAL;
}
+ pthread_mutex_unlock(&in->dev->lock);
/* Format */
if (config->format == AUDIO_FORMAT_DEFAULT) {