aumix: add aumix_latency and new defaults

Author: sreimers

include/rem_aumix.h

@@ -20,6 +20,7 @@ typedef void (aumix_read_h)(struct auframe *af, void *arg);
 
 int aumix_alloc(struct aumix **mixp, uint32_t srate,
 		uint8_t ch, uint32_t ptime);
+void aumix_latency(struct aumix *mix, uint16_t min, uint16_t max);
 void aumix_recordh(struct aumix *mix, aumix_record_h *recordh);
 void aumix_record_sumh(struct aumix *mix, aumix_record_h *recordh);
 int aumix_playfile(struct aumix *mix, const char *filepath);

rem/aumix/aumix.c

@@ -30,6 +30,10 @@ struct aumix {
 	uint32_t frame_size;
 	uint32_t srate;
 	uint8_t ch;
+	struct {
+		uint16_t min;
+		uint16_t max;
+	} latency;
 	aumix_record_h *recordh;
 	aumix_record_h *record_sumh;
 	struct auframe rec_sum;
@@ -278,11 +282,13 @@ int aumix_alloc(struct aumix **mixp, uint32_t srate,
 	if (!mix)
 		return ENOMEM;
 
-	mix->ptime      = ptime;
-	mix->frame_size = srate * ch * ptime / 1000;
-	mix->srate      = srate;
-	mix->ch         = ch;
-	mix->recordh    = NULL;
+	mix->ptime	 = ptime;
+	mix->frame_size	 = srate * ch * ptime / 1000;
+	mix->srate	 = srate;
+	mix->ch		 = ch;
+	mix->recordh	 = NULL;
+	mix->latency.min = 60;	/* ms */
+	mix->latency.max = 200; /* ms */
 
 	mix->rec_sum.ch	  = ch;
 	mix->rec_sum.srate = srate;
@@ -317,6 +323,25 @@ int aumix_alloc(struct aumix **mixp, uint32_t srate,
 }
 
 
+/**
+ * Set aumix aubuf default latency
+ *
+ * @param mix  Audio mixer
+ * @param min  Minimum value in [ms]
+ * @param max  Maximum value in [ms]
+ */
+void aumix_latency(struct aumix *mix, uint16_t min, uint16_t max)
+{
+	if (!mix)
+		return;
+
+	mtx_lock(mix->mutex);
+	mix->latency.min = min;
+	mix->latency.max = max;
+	mtx_unlock(mix->mutex);
+}
+
+
 /**
  * Add multitrack record handler (each source can be identified by auframe->id)
  *
@@ -447,7 +472,9 @@ int aumix_source_alloc(struct aumix_source **srcp, struct aumix *mix,
 	auframe_init(&src->af, AUFMT_S16LE, src->frame, mix->frame_size,
 		     mix->srate, mix->ch);
 
-	err = aubuf_alloc(&src->aubuf, sz * 6, sz * 12);
+	err = aubuf_alloc(&src->aubuf,
+			  auframe_ms_to_bytes(&src->af, mix->latency.min),
+			  auframe_ms_to_bytes(&src->af, mix->latency.max));
 	if (err)
 		goto out;