Commit 2b98fc61 authored by Daniel McArdle's avatar Daniel McArdle Committed by Commit Bot

Make WavAudioHandler accept same bps as AudioBus

Bug: 1052228
Change-Id: I2c14024f760148cc8ddaec96cbeea3cdee7edf96
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2065319Reviewed-by: default avatarDale Curtis <dalecurtis@chromium.org>
Commit-Queue: Dale Curtis <dalecurtis@chromium.org>
Commit-Queue: Dan McArdle <dmcardle@chromium.org>
Cr-Commit-Position: refs/heads/master@{#744026}
parent 25d4de4d
...@@ -58,10 +58,13 @@ struct WavAudioParameters { ...@@ -58,10 +58,13 @@ struct WavAudioParameters {
}; };
bool ParamsAreValid(const WavAudioParameters& params) { bool ParamsAreValid(const WavAudioParameters& params) {
const uint16_t bytes_per_sample = params.bits_per_sample / 8;
return (params.audio_format == kAudioFormatPCM && params.num_channels != 0u && return (params.audio_format == kAudioFormatPCM && params.num_channels != 0u &&
params.num_channels <= static_cast<uint16_t>(limits::kMaxChannels) && params.num_channels <= static_cast<uint16_t>(limits::kMaxChannels) &&
params.sample_rate != 0u && params.bits_per_sample != 0u && params.sample_rate != 0u && params.bits_per_sample != 0u &&
params.bits_per_sample % 8u == 0u && params.bits_per_sample % 8u == 0u &&
(bytes_per_sample == 1 || bytes_per_sample == 2 ||
bytes_per_sample == 4) &&
(!params.is_extensible || (!params.is_extensible ||
params.valid_bits_per_sample == params.bits_per_sample)); params.valid_bits_per_sample == params.bits_per_sample));
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment