cras_iodev: Add processing argument to fill zeros

In certain cases where we need to fill zeros in the main thread, we
don't want audio processing. Filling zeros from the main thread is
needed to prevent underrun from devices without start ops.

Add an argument `processing` to cras_iodev_fill_odev_zeros to choose to
skip the audio processing.

BUG=b:340138001
TEST=tast run $DUT audio.CrasMultiChannelCapture.\* audio.CrasAEC.\*

Change-Id: I4c51d944ce03aeab8c1f270ea9b59e55f80ca9d0
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/third_party/adhd/+/5541353
Commit-Queue: Baili Deng <[email protected]>
Reviewed-by: Li-Yu Yu <[email protected]>
Tested-by: [email protected] <[email protected]>
Reviewed-by: Yu-Hsuan Hsu <[email protected]>

Author: baili0411

cras/src/server/audio_thread.c

@@ -272,7 +272,7 @@ static int audio_thread_read_command(struct audio_thread* thread,
 // Builds an initial buffer to avoid an underrun. Adds min_level of latency.
 static void fill_odevs_zeros_min_level(struct cras_iodev* odev) {
   int rc;
-  rc = cras_iodev_fill_odev_zeros(odev, odev->min_buffer_level);
+  rc = cras_iodev_fill_odev_zeros(odev, odev->min_buffer_level, false);
   if (rc < 0) {
     syslog(LOG_WARNING, "failed to fill odev with %u length of zeros:%d",
            odev->min_buffer_level, rc);

cras/src/server/cras_a2dp_iodev.c

@@ -151,8 +151,8 @@ static int fill_zeros_to_target_level(struct cras_iodev* iodev,
   unsigned int local_queued_frames = bt_local_queued_frames(iodev);
 
   if (local_queued_frames < target_level) {
-    return cras_iodev_fill_odev_zeros(iodev,
-                                      target_level - local_queued_frames);
+    return cras_iodev_fill_odev_zeros(iodev, target_level - local_queued_frames,
+                                      true);
   }
   return 0;
 }
@@ -185,7 +185,7 @@ static int output_underrun(struct cras_iodev* iodev) {
     return 0;
   }
 
-  return cras_iodev_fill_odev_zeros(iodev, iodev->min_cb_level);
+  return cras_iodev_fill_odev_zeros(iodev, iodev->min_cb_level, true);
 }
 
 /*

cras/src/server/cras_alsa_io.c

@@ -1711,7 +1711,7 @@ static int adjust_appl_ptr_samples_remaining(struct cras_iodev* odev) {
 
   // Fill zeros to make sure there are enough zero samples in device buffer.
   if (offset > real_hw_level) {
-    rc = cras_iodev_fill_odev_zeros(odev, offset - real_hw_level);
+    rc = cras_iodev_fill_odev_zeros(odev, offset - real_hw_level, true);
     if (rc < 0) {
       return rc;
     }
@@ -1781,7 +1781,7 @@ static int possibly_enter_free_run(struct cras_iodev* odev) {
   fr_to_write = MIN(cras_time_to_frames(&no_stream_fill_zeros_duration,
                                         odev->format->frame_rate),
                     odev->buffer_size - real_hw_level);
-  rc = cras_iodev_fill_odev_zeros(odev, fr_to_write);
+  rc = cras_iodev_fill_odev_zeros(odev, fr_to_write, true);
   if (rc < 0) {
     return rc;
   }

cras/src/server/cras_alsa_usb_io.c

@@ -1272,7 +1272,7 @@ static int usb_adjust_appl_ptr_samples_remaining(struct cras_iodev* odev) {
 
   // Fill zeros to make sure there are enough zero samples in device buffer.
   if (offset > real_hw_level) {
-    rc = cras_iodev_fill_odev_zeros(odev, offset - real_hw_level);
+    rc = cras_iodev_fill_odev_zeros(odev, offset - real_hw_level, true);
     if (rc < 0) {
       return rc;
     }
@@ -1342,7 +1342,7 @@ static int usb_possibly_enter_free_run(struct cras_iodev* odev) {
   fr_to_write = MIN(cras_time_to_frames(&no_stream_fill_zeros_duration,
                                         odev->format->frame_rate),
                     odev->buffer_size - real_hw_level);
-  rc = cras_iodev_fill_odev_zeros(odev, fr_to_write);
+  rc = cras_iodev_fill_odev_zeros(odev, fr_to_write, true);
   if (rc < 0) {
     return rc;
   }

cras/src/server/cras_fl_pcm_iodev.c

@@ -159,8 +159,8 @@ static int fill_zeros_to_target_level(struct cras_iodev* iodev,
   unsigned int local_queued_frames = bt_local_queued_frames(iodev);
 
   if (local_queued_frames < target_level) {
-    return cras_iodev_fill_odev_zeros(iodev,
-                                      target_level - local_queued_frames);
+    return cras_iodev_fill_odev_zeros(iodev, target_level - local_queued_frames,
+                                      true);
   }
   return 0;
 }
@@ -250,7 +250,7 @@ static int hfp_output_underrun(struct cras_iodev* iodev) {
   }
 
   // Handle it the same way as cras_iodev_output_underrun().
-  return cras_iodev_fill_odev_zeros(iodev, iodev->min_cb_level);
+  return cras_iodev_fill_odev_zeros(iodev, iodev->min_cb_level, true);
 }
 
 static int hfp_no_stream(struct cras_iodev* iodev, int enable) {
@@ -343,7 +343,7 @@ static int a2dp_configure_dev(struct cras_iodev* iodev) {
 
   /* Send one block of silence to Floss as jitter buffer to handle the
    * variation in packet scheduling caused by clock drift and state-polling. */
-  cras_iodev_fill_odev_zeros(iodev, a2dpio->write_block);
+  cras_iodev_fill_odev_zeros(iodev, a2dpio->write_block, true);
   init_level = a2dpio->write_block * cras_get_format_bytes(iodev->format);
 
   buf = buf_read_pointer_size(a2dpio->pcm_buf, &to_send);

cras/src/server/cras_hfp_iodev.c

@@ -146,7 +146,7 @@ static int frames_queued(const struct cras_iodev* iodev,
 
 static int output_underrun(struct cras_iodev* iodev) {
   // Handle it the same way as cras_iodev_output_underrun().
-  return cras_iodev_fill_odev_zeros(iodev, iodev->min_cb_level);
+  return cras_iodev_fill_odev_zeros(iodev, iodev->min_cb_level, true);
 }
 
 /* Handles cras sr bt enabling and disabling cases.

cras/src/server/cras_iodev.c

@@ -121,7 +121,7 @@ static int default_no_stream_playback(struct cras_iodev* odev) {
   fr_to_write = cras_iodev_buffer_avail(odev, hw_level);
   if (hw_level <= target_hw_level) {
     fr_to_write = MIN(target_hw_level - hw_level, fr_to_write);
-    rc = cras_iodev_fill_odev_zeros(odev, fr_to_write);
+    rc = cras_iodev_fill_odev_zeros(odev, fr_to_write, true);
     if (rc < 0) {
       return rc;
     }
@@ -306,7 +306,7 @@ static int cras_iodev_output_event_sample_ready(struct cras_iodev* odev) {
      * stream, fill 1 min_cb_level of zeros first and fill sample
      * from stream later.
      * Starts the device here to finish state transition. */
-    rc = cras_iodev_fill_odev_zeros(odev, odev->min_cb_level);
+    rc = cras_iodev_fill_odev_zeros(odev, odev->min_cb_level, true);
     if (rc < 0) {
       syslog(LOG_WARNING, "Failed to fill zeros to device %s before start",
              odev->info.name);
@@ -1218,7 +1218,7 @@ int cras_iodev_open(struct cras_iodev* iodev,
     } else {
       iodev->state = CRAS_IODEV_STATE_NO_STREAM_RUN;
 
-      rc = cras_iodev_fill_odev_zeros(iodev, iodev->min_cb_level);
+      rc = cras_iodev_fill_odev_zeros(iodev, iodev->min_cb_level, false);
       if (rc < 0) {
         syslog(LOG_WARNING, "Failed to fill zeros to device %s while open",
                iodev->info.name);
@@ -1600,7 +1600,9 @@ int cras_iodev_buffer_avail(struct cras_iodev* iodev, unsigned hw_level) {
   return iodev->buffer_size - iodev->min_buffer_level - hw_level;
 }
 
-int cras_iodev_fill_odev_zeros(struct cras_iodev* odev, unsigned int frames) {
+int cras_iodev_fill_odev_zeros(struct cras_iodev* odev,
+                               unsigned int frames,
+                               bool processing) {
   struct cras_audio_area* area = NULL;
   unsigned int frame_bytes, frames_writable;
   int rc = 0, filled_frames = 0;
@@ -1650,7 +1652,11 @@ int cras_iodev_fill_odev_zeros(struct cras_iodev* odev, unsigned int frames) {
     }
     // Update offsets to mark existing valid data as written.
     cras_iodev_all_streams_written(odev, frames_writable);
-    rc = cras_iodev_put_output_buffer(odev, buf, frames_writable, NULL, NULL);
+    if (processing) {
+      rc = cras_iodev_put_output_buffer(odev, buf, frames_writable, NULL, NULL);
+    } else {
+      rc = odev->put_buffer(odev, frames_writable);
+    }
     if (rc < 0) {
       syslog(LOG_WARNING, "Put output buffer failed: %d", rc);
       return rc;
@@ -1676,7 +1682,7 @@ int cras_iodev_output_underrun(struct cras_iodev* odev,
   if (odev->output_underrun) {
     return odev->output_underrun(odev);
   } else {
-    rc = cras_iodev_fill_odev_zeros(odev, odev->min_cb_level);
+    rc = cras_iodev_fill_odev_zeros(odev, odev->min_cb_level, true);
     if (rc > 0) {
       cras_iodev_update_underrun_duration(odev, rc);
     }

cras/src/server/cras_iodev.h

@@ -807,11 +807,13 @@ void cras_iodev_set_dsp_offload_disallow_by_aec_ref(struct cras_iodev* iodev,
  * Args:
  *    odev - The device.
  *    frames - The number of frames of zero samples to put into the device.
+ *    processing - Whether to handle audio processing or not.
  * Returns:
  *    Number of frames filled with zeros, negative errno if failed.
  */
-int cras_iodev_fill_odev_zeros(struct cras_iodev* odev, unsigned int frames);
-
+int cras_iodev_fill_odev_zeros(struct cras_iodev* odev,
+                               unsigned int frames,
+                               bool processing);
 /*
  * The default implementation of frames_to_play_in_sleep ops, used when an
  * iodev doesn't have its own logic.

cras/src/server/cras_lea_iodev.c

@@ -19,9 +19,9 @@
 #include "cras/src/server/audio_thread_log.h"
 #include "cras/src/server/cras_audio_area.h"
 #include "cras/src/server/cras_audio_thread_monitor.h"
-#include "cras/src/server/cras_lea_manager.h"
 #include "cras/src/server/cras_iodev.h"
 #include "cras/src/server/cras_iodev_list.h"
+#include "cras/src/server/cras_lea_manager.h"
 #include "cras/src/server/cras_utf8.h"
 #include "cras_types.h"
 #include "cras_util.h"
@@ -130,7 +130,7 @@ static int output_underrun(struct cras_iodev* iodev) {
   }
 
   // Handle it the same way as cras_iodev_output_underrun().
-  return cras_iodev_fill_odev_zeros(iodev, iodev->min_cb_level);
+  return cras_iodev_fill_odev_zeros(iodev, iodev->min_cb_level, true);
 }
 
 static int no_stream(struct cras_iodev* iodev, int enable) {

cras/src/server/cras_stream_apm.c

@@ -936,12 +936,7 @@ int cras_stream_apm_destroy(struct cras_stream_apm* stream) {
 static int process_reverse(struct float_buffer* fbuf,
                            unsigned int frame_rate,
                            const struct cras_iodev* echo_ref) {
-  // TODO(b/340138001): Switch back to checked_audio_ctx() after we stop
-  // calling this function in the main thread.
-  struct cras_audio_ctx* actx = get_audio_ctx_or_null();
-  if (!actx) {
-    return 0;
-  }
+  struct cras_audio_ctx* actx = checked_audio_ctx();
 
   struct active_apm* active;
   int ret;

cras/src/tests/a2dp_iodev_unittest.cc

@@ -907,7 +907,9 @@ void cras_iodev_init_audio_area(struct cras_iodev* iodev) {
 
 void cras_iodev_free_audio_area(struct cras_iodev* iodev) {}
 
-int cras_iodev_fill_odev_zeros(struct cras_iodev* odev, unsigned int frames) {
+int cras_iodev_fill_odev_zeros(struct cras_iodev* odev,
+                               unsigned int frames,
+                               bool processing) {
   struct cras_audio_area* area;
   cras_iodev_fill_odev_zeros_called++;
   cras_iodev_fill_odev_zeros_frames = frames;

cras/src/tests/alsa_io_unittest.cc

@@ -3204,7 +3204,9 @@ int cras_iodev_buffer_avail(struct cras_iodev* iodev, unsigned hw_level) {
   return cras_iodev_buffer_avail_ret;
 }
 
-int cras_iodev_fill_odev_zeros(struct cras_iodev* odev, unsigned int frames) {
+int cras_iodev_fill_odev_zeros(struct cras_iodev* odev,
+                               unsigned int frames,
+                               bool processing) {
   cras_iodev_fill_odev_zeros_called++;
   cras_iodev_fill_odev_zeros_frames = frames;
   return (int)frames;

cras/src/tests/audio_thread_unittest.cc

@@ -1325,7 +1325,9 @@ int cras_iodev_buffer_avail(struct cras_iodev* iodev, unsigned hw_level) {
   return iodev->buffer_size - iodev->frames_queued(iodev, &tstamp);
 }
 
-int cras_iodev_fill_odev_zeros(struct cras_iodev* odev, unsigned int frames) {
+int cras_iodev_fill_odev_zeros(struct cras_iodev* odev,
+                               unsigned int frames,
+                               bool processing) {
   cras_iodev_fill_odev_zeros_frames = frames;
   return (int)frames;
 }

cras/src/tests/cras_alsa_usb_io_unittest.cc

@@ -1599,7 +1599,9 @@ int cras_iodev_buffer_avail(struct cras_iodev* iodev, unsigned hw_level) {
   return cras_iodev_buffer_avail_ret;
 }
 
-int cras_iodev_fill_odev_zeros(struct cras_iodev* odev, unsigned int frames) {
+int cras_iodev_fill_odev_zeros(struct cras_iodev* odev,
+                               unsigned int frames,
+                               bool processing) {
   cras_iodev_fill_odev_zeros_called++;
   cras_iodev_fill_odev_zeros_frames = frames;
   return (int)frames;

cras/src/tests/fl_pcm_iodev_unittest.cc

@@ -768,7 +768,9 @@ void cras_audio_area_config_buf_pointers(struct cras_audio_area* area,
   mock_audio_area->channels[0].buf = base_buffer;
 }
 
-int cras_iodev_fill_odev_zeros(struct cras_iodev* odev, unsigned int frames) {
+int cras_iodev_fill_odev_zeros(struct cras_iodev* odev,
+                               unsigned int frames,
+                               bool processing) {
   return (int)frames;
 }
 

cras/src/tests/hfp_iodev_unittest.cc

@@ -528,7 +528,9 @@ void cras_iodev_free_resources(struct cras_iodev* iodev) {
   cras_iodev_free_resources_called++;
 }
 
-int cras_iodev_fill_odev_zeros(struct cras_iodev* odev, unsigned int frames) {
+int cras_iodev_fill_odev_zeros(struct cras_iodev* odev,
+                               unsigned int frames,
+                               bool processing) {
   return (int)frames;
 }
 

cras/src/tests/iodev_unittest.cc

@@ -1683,11 +1683,11 @@ TEST(IoDev, FillZeros) {
   iodev.put_buffer = put_buffer;
 
   iodev.direction = CRAS_STREAM_INPUT;
-  rc = cras_iodev_fill_odev_zeros(&iodev, frames);
+  rc = cras_iodev_fill_odev_zeros(&iodev, frames, true);
   EXPECT_EQ(-EINVAL, rc);
 
   iodev.direction = CRAS_STREAM_OUTPUT;
-  rc = cras_iodev_fill_odev_zeros(&iodev, frames);
+  rc = cras_iodev_fill_odev_zeros(&iodev, frames, true);
 
   EXPECT_EQ(frames, rc);
   EXPECT_EQ(frames, put_buffer_nframes);

cras/src/tests/lea_iodev_unittest.cc

@@ -10,9 +10,9 @@
 #include "cras/src/server/audio_thread.h"
 #include "cras/src/server/audio_thread_log.h"
 #include "cras/src/server/cras_audio_area.h"
-#include "cras/src/server/cras_lea_manager.h"
 #include "cras/src/server/cras_iodev.h"
 #include "cras/src/server/cras_iodev_list.h"
+#include "cras/src/server/cras_lea_manager.h"
 #include "cras/src/tests/test_util.hh"
 #include "third_party/utlist/utlist.h"
 
@@ -505,7 +505,9 @@ void cras_audio_area_config_buf_pointers(struct cras_audio_area* area,
   mock_audio_area->channels[0].buf = base_buffer;
 }
 
-int cras_iodev_fill_odev_zeros(struct cras_iodev* odev, unsigned int frames) {
+int cras_iodev_fill_odev_zeros(struct cras_iodev* odev,
+                               unsigned int frames,
+                               bool processing) {
   return (int)frames;
 }