release-request-d3de000d-8c5a-4c3c-b63e-e989421d7762-for-git_oc-mr1-release-4176727 snap-temp-L91200000081901352

Change-Id: Ifdd34ecaff28b6d37e370d999c34ff785866bf6a
diff --git a/hal/audio_hw.c b/hal/audio_hw.c
index db7dc34..3a4729d 100644
--- a/hal/audio_hw.c
+++ b/hal/audio_hw.c
@@ -3616,7 +3616,8 @@
         out->config = is_hdmi ? pcm_config_hdmi_multi : pcm_config_hifi;
         out->config.rate = config->sample_rate;
         out->config.channels = audio_channel_count_from_out_mask(out->channel_mask);
-        out->config.period_size = HDMI_MULTI_PERIOD_BYTES / (out->config.channels * 2);
+        out->config.period_size = HDMI_MULTI_PERIOD_BYTES / (out->config.channels *
+                                                         audio_bytes_per_sample(config->format));
         out->config.format = pcm_format_from_audio_format(out->format);
     } else if (out->flags & AUDIO_OUTPUT_FLAG_COMPRESS_OFFLOAD) {
         pthread_mutex_lock(&adev->lock);