commit bae13e89c53611af65589635de1654585c3417d4
author Linux Build Service Account <lnxbuild@localhost> Sat Sep 03 01:05:58 2016 -0700
committer Gerrit - the friendly Code Review server <code-review@localhost> Sat Sep 03 01:05:58 2016 -0700
tree f47c18e244bee202ab758c719cf1a62d84988e22
parent 9213265b84cca7f90c69fa6cdb2064c3a0f18f83
parent a99f753a12d41a1ee83c3c617d1e5a7bdc9575f0

Merge "audio: Calculate proper channel count for bytes per frame" into audio-userspace.lnx.2.1-dev

hal/audio_hw.c

diff --git a/hal/audio_hw.c b/hal/audio_hw.c
index b617407..9894446 100644
--- a/hal/audio_hw.c
+++ b/hal/audio_hw.c
@@ -2688,8 +2688,11 @@
             /* increase written size during SSR to avoid mismatch
              * with the written frames count in AF
              */
-            if (audio_bytes_per_sample(out->format) != 0)
-                out->written += bytes / (out->config.channels * audio_bytes_per_sample(out->format));
+            // bytes per frame
+            size_t bpf = audio_bytes_per_sample(out->format) *
+                         audio_channel_count_from_out_mask(out->channel_mask);
+            if (bpf != 0)
+                out->written += bytes / bpf;
             ALOGD(" %s: sound card is not active/SSR state", __func__);
             ret= -EIO;
             goto exit;
@@ -3653,7 +3656,12 @@
         else if (config->channel_mask) {
             out->channel_mask = config->channel_mask;
             config->offload_info.channel_mask = config->channel_mask;
+        } else {
+            ALOGE("out->channel_mask not set for OFFLOAD/DIRECT_PCM");
+            ret = -EINVAL;
+            goto error_open;
         }
+
         format = out->format = config->offload_info.format;
         out->sample_rate = config->offload_info.sample_rate;