hal: Increase PCM offload buffering
Increase PCM offload buffering to 40ms
CRs-Fixed: 856812
Change-Id: I67be148f85acc7c155ed222d652d5fedfb6a5e9b
diff --git a/hal/msm8916/platform.c b/hal/msm8916/platform.c
index b5b7cb7..6031099 100644
--- a/hal/msm8916/platform.c
+++ b/hal/msm8916/platform.c
@@ -68,10 +68,7 @@
#define COMPRESS_OFFLOAD_FRAGMENT_SIZE_FOR_AV_STREAMING (2 * 1024)
#define COMPRESS_OFFLOAD_FRAGMENT_SIZE (32 * 1024)
/* Used in calculating fragment size for pcm offload */
-#define PCM_OFFLOAD_BUFFER_DURATION_FOR_AV 1000 /* 1 sec */
-#define PCM_OFFLOAD_BUFFER_DURATION_FOR_AV_STREAMING 80 /* 80 millisecs */
-#define PCM_OFFLOAD_BUFFER_DURATION_FOR_SMALL_BUFFERS 20 /* 20 millisecs */
-#define PCM_OFFLOAD_BUFFER_DURATION_MAX 1200 /* 1200 millisecs */
+#define PCM_OFFLOAD_BUFFER_DURATION 40 /* 40 millisecs */
/* MAX PCM fragment size cannot be increased further due
* to flinger's cblk size of 1mb,and it has to be a multiple of
@@ -3268,25 +3265,13 @@
{
uint32_t fragment_size = 0;
uint32_t bits_per_sample = 16;
- uint32_t pcm_offload_time = PCM_OFFLOAD_BUFFER_DURATION_FOR_SMALL_BUFFERS;
+ uint32_t pcm_offload_time = PCM_OFFLOAD_BUFFER_DURATION;
if (info->format == AUDIO_FORMAT_PCM_24_BIT_OFFLOAD) {
bits_per_sample = 32;
}
- if (info->use_small_bufs) {
- pcm_offload_time = PCM_OFFLOAD_BUFFER_DURATION_FOR_SMALL_BUFFERS;
- } else {
- if (!info->has_video) {
- pcm_offload_time = PCM_OFFLOAD_BUFFER_DURATION_MAX;
- } else if (info->has_video && info->is_streaming) {
- pcm_offload_time = PCM_OFFLOAD_BUFFER_DURATION_FOR_AV_STREAMING;
- } else if (info->has_video) {
- pcm_offload_time = PCM_OFFLOAD_BUFFER_DURATION_FOR_AV;
- }
- }
-
- //duration is set to 20 ms worth of stereo data at 48Khz
+ //duration is set to 40 ms worth of stereo data at 48Khz
//with 16 bit per sample, modify this when the channel
//configuration is different
fragment_size = (pcm_offload_time
diff --git a/hal/msm8974/platform.c b/hal/msm8974/platform.c
index 28a75df..f8fe8ed 100644
--- a/hal/msm8974/platform.c
+++ b/hal/msm8974/platform.c
@@ -65,10 +65,7 @@
#define COMPRESS_OFFLOAD_FRAGMENT_SIZE (32 * 1024)
/* Used in calculating fragment size for pcm offload */
-#define PCM_OFFLOAD_BUFFER_DURATION_FOR_AV 1000 /* 1 sec */
-#define PCM_OFFLOAD_BUFFER_DURATION_FOR_AV_STREAMING 80 /* 80 millisecs */
-#define PCM_OFFLOAD_BUFFER_DURATION_FOR_SMALL_BUFFERS 20 /* 20 millisecs */
-#define PCM_OFFLOAD_BUFFER_DURATION_MAX 1200 /* 1200 millisecs */
+#define PCM_OFFLOAD_BUFFER_DURATION 40 /* 40 millisecs */
/* MAX PCM fragment size cannot be increased further due
* to flinger's cblk size of 1mb,and it has to be a multiple of
@@ -3150,25 +3147,13 @@
{
uint32_t fragment_size = 0;
uint32_t bits_per_sample = 16;
- uint32_t pcm_offload_time = PCM_OFFLOAD_BUFFER_DURATION_FOR_SMALL_BUFFERS;
+ uint32_t pcm_offload_time = PCM_OFFLOAD_BUFFER_DURATION;
if (info->format == AUDIO_FORMAT_PCM_24_BIT_OFFLOAD) {
bits_per_sample = 32;
}
- if (info->use_small_bufs) {
- pcm_offload_time = PCM_OFFLOAD_BUFFER_DURATION_FOR_SMALL_BUFFERS;
- } else {
- if (!info->has_video) {
- pcm_offload_time = PCM_OFFLOAD_BUFFER_DURATION_MAX;
- } else if (info->has_video && info->is_streaming) {
- pcm_offload_time = PCM_OFFLOAD_BUFFER_DURATION_FOR_AV_STREAMING;
- } else if (info->has_video) {
- pcm_offload_time = PCM_OFFLOAD_BUFFER_DURATION_FOR_AV;
- }
- }
-
- //duration is set to 20 ms worth of stereo data at 48Khz
+ //duration is set to 40 ms worth of stereo data at 48Khz
//with 16 bit per sample, modify this when the channel
//configuration is different
fragment_size = (pcm_offload_time