commit 7ecf62325d7409feecce9d6e903dc1a5c191c3cd
author Glenn Kasten <gkasten@google.com> Fri Sep 28 12:01:31 2012 -0700
committer Glenn Kasten <gkasten@google.com> Fri Sep 28 12:01:31 2012 -0700
tree eb73027c69ab1035a145843224921b05ddfa053f
parent 3c0a16babf743dafd87354de0b6430c5036d192e

audio: restore higher period size for capture

This is needed since capture thread is running with CFS.

Bug: 7248927, 7237669
Change-Id: Ib79ba687b2e962707869aec56935b464ed5dd35f

audio/audio_hw.c

diff --git a/audio/audio_hw.c b/audio/audio_hw.c
index 0e3c11f..5ecf398 100644
--- a/audio/audio_hw.c
+++ b/audio/audio_hw.c
@@ -69,6 +69,14 @@
     .format = PCM_FORMAT_S16_LE,
 };
 
+struct pcm_config pcm_config_in = {
+    .channels = 2,
+    .rate = 44100,
+    .period_size = 1024,
+    .period_count = 2,
+    .format = PCM_FORMAT_S16_LE,
+};
+
 struct pcm_config pcm_config_sco = {
     .channels = 1,
     .rate = 8000,
@@ -538,7 +546,7 @@
 {
     struct audio_device *adev = in->dev;
 
-    in->pcm = pcm_open(PCM_CARD, PCM_DEVICE, PCM_IN, &pcm_config);
+    in->pcm = pcm_open(PCM_CARD, PCM_DEVICE, PCM_IN, &pcm_config_in);
 
     if (in->pcm && !pcm_is_ready(in->pcm)) {
         ALOGE("pcm_open() failed: %s", pcm_get_error(in->pcm));
@@ -630,7 +638,7 @@
      * multiple of 16 frames, as audioflinger expects audio buffers to
      * be a multiple of 16 frames
      */
-    size = (pcm_config.period_size * sample_rate) / pcm_config.rate;
+    size = (pcm_config_in.period_size * sample_rate) / pcm_config_in.rate;
     size = ((size + 15) / 16) * 16;
 
     return size * channel_count * audio_bytes_per_sample(format);
@@ -658,7 +666,7 @@
     if (in->frames_in == 0) {
         in->read_status = pcm_read(in->pcm,
                                    (void*)in->buffer,
-                                   pcm_frames_to_bytes(in->pcm, pcm_config.period_size));
+                                   pcm_frames_to_bytes(in->pcm, pcm_config_in.period_size));
         if (in->read_status != 0) {
             ALOGE("get_next_buffer() pcm_read error %d", in->read_status);
             buffer->raw = NULL;
@@ -666,7 +674,7 @@
             return in->read_status;
         }
 
-        in->frames_in = pcm_config.period_size;
+        in->frames_in = pcm_config_in.period_size;
 
         /* Do stereo to mono conversion in place by discarding right channel */
         for (i = 1; i < in->frames_in; i++)
@@ -675,7 +683,7 @@
 
     buffer->frame_count = (buffer->frame_count > in->frames_in) ?
                                 in->frames_in : buffer->frame_count;
-    buffer->i16 = in->buffer + (pcm_config.period_size - in->frames_in);
+    buffer->i16 = in->buffer + (pcm_config_in.period_size - in->frames_in);
 
     return in->read_status;
 
@@ -1399,7 +1407,7 @@
     in->requested_rate = config->sample_rate;
     in->input_source = AUDIO_SOURCE_DEFAULT;
 
-    in->buffer = malloc(pcm_config.period_size * pcm_config.channels
+    in->buffer = malloc(pcm_config_in.period_size * pcm_config_in.channels
                                                * audio_stream_frame_size(&in->stream.common));
 
     if (!in->buffer) {
@@ -1407,11 +1415,11 @@
         goto err_malloc;
     }
 
-    if (in->requested_rate != pcm_config.rate) {
+    if (in->requested_rate != pcm_config_in.rate) {
         in->buf_provider.get_next_buffer = get_next_buffer;
         in->buf_provider.release_buffer = release_buffer;
 
-        ret = create_resampler(pcm_config.rate,
+        ret = create_resampler(pcm_config_in.rate,
                                in->requested_rate,
                                1,
                                RESAMPLER_QUALITY_DEFAULT,