diff options
| author | Paul McLean <pmclean@google.com> | 2016-05-25 21:11:35 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-05-25 21:11:35 +0000 |
| commit | 86196f57ef72e4a0153ceb48c7c9e7632f07df8c (patch) | |
| tree | 3ae283c106d60798a4b143ad9d63e22b59bbd97b | |
| parent | b096ff043df62aca6a673a4bdc4626ae40dcd0fe (diff) | |
| parent | 86df5ad096224060eb5275e6b7c4a1d5552210ee (diff) | |
| download | libhardware-86196f57ef72e4a0153ceb48c7c9e7632f07df8c.tar.gz | |
Merge "Ensure we get a default sample rate for "query" cases in open_input_device()." into nyc-dev
am: 86df5ad096
* commit '86df5ad096224060eb5275e6b7c4a1d5552210ee':
Ensure we get a default sample rate for "query" cases in open_input_device().
Change-Id: I484e88a6b8da002b40f2769e3d869434f0b9efb2
| -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)) { |