diff options
| author | Paul Mclean <pmclean@google.com> | 2016-05-25 20:54:05 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2016-05-25 20:54:05 +0000 |
| commit | 86df5ad096224060eb5275e6b7c4a1d5552210ee (patch) | |
| tree | 17e68e0d5f34c03773c4d1f73e75acaa5e834777 | |
| parent | 6bd8429fe2efab5339c4a8446aaae53bd4d06422 (diff) | |
| parent | 9a1c30572b3b27e66cb7d50fd89ae52e22d8718c (diff) | |
| download | libhardware-86df5ad096224060eb5275e6b7c4a1d5552210ee.tar.gz | |
Merge "Ensure we get a default sample rate for "query" cases in open_input_device()." into nyc-dev
| -rw-r--r-- | modules/usbaudio/audio_hal.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/modules/usbaudio/audio_hal.c b/modules/usbaudio/audio_hal.c index 4b3305c7..fe4a88e8 100644 --- a/modules/usbaudio/audio_hal.c +++ b/modules/usbaudio/audio_hal.c @@ -912,11 +912,11 @@ static int adev_open_input_stream(struct audio_hw_device *dev, /* 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 + config->sample_rate = profile_get_default_sample_rate(in->profile); + } + + 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 */ 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)) { |