hal: bug fixes for PCM offload
When pcm offload is done, override the buffer size
that was calculated and use the value from the system property
Make write call blocking if small buffers are used in offload
Update latency value for pcm offload with small buffer hint based
on period size and period count.
Change-Id: Ic74caa6bd172c8e4554384e9fa98a5137117f07c
diff --git a/hal/audio_hw.c b/hal/audio_hw.c
index cd5e7b5..55179e7 100644
--- a/hal/audio_hw.c
+++ b/hal/audio_hw.c
@@ -1921,12 +1921,23 @@
static uint32_t out_get_latency(const struct audio_stream_out *stream)
{
struct stream_out *out = (struct stream_out *)stream;
+ uint32_t latency = 0;
- if (is_offload_usecase(out->usecase))
- return COMPRESS_OFFLOAD_PLAYBACK_LATENCY;
-
- return (out->config.period_count * out->config.period_size * 1000) /
+ if (is_offload_usecase(out->usecase)) {
+ if (out->use_small_bufs == true)
+ latency = ((out->compr_config.fragments *
+ out->compr_config.fragment_size * 1000) /
+ (out->sample_rate * out->compr_config.codec->ch_in *
+ audio_bytes_per_sample(out->format)));
+ else
+ latency = COMPRESS_OFFLOAD_PLAYBACK_LATENCY;
+ } else {
+ latency = (out->config.period_count * out->config.period_size * 1000) /
(out->config.rate);
+ }
+
+ ALOGV("%s: Latency %d", latency);
+ return latency;
}
static int out_set_volume(struct audio_stream_out *stream, float left,
@@ -2600,6 +2611,8 @@
out->supported_channel_masks[0] = AUDIO_CHANNEL_OUT_STEREO;
out->handle = handle;
out->bit_width = CODEC_BACKEND_DEFAULT_BIT_WIDTH;
+ out->non_blocking = 0;
+ out->use_small_bufs = false;
/* Init use case and pcm_config */
if ((out->flags == AUDIO_OUTPUT_FLAG_DIRECT) &&
@@ -2728,6 +2741,15 @@
if (flags & AUDIO_OUTPUT_FLAG_NON_BLOCKING)
out->non_blocking = 1;
+ if (config->offload_info.use_small_bufs) {
+ //this flag is set from framework only if its for PCM formats
+ //no need to check for PCM format again
+ out->non_blocking = 0;
+ out->use_small_bufs = true;
+ ALOGI("Keep write blocking for small buff: non_blockling %d",
+ out->non_blocking);
+ }
+
out->send_new_metadata = 1;
out->offload_state = OFFLOAD_STATE_IDLE;
out->playback_started = 0;