|
 |
f65aa27 |
From dd682d6f96fe7133b866c97b72edcb6136a9737c Mon Sep 17 00:00:00 2001
|
|
|
f65aa27 |
From: Lennart Poettering <lennart@poettering.net>
|
|
|
f65aa27 |
Date: Mon, 22 Feb 2010 04:54:24 +0100
|
|
|
f65aa27 |
Subject: [PATCH 59/62] alsa: reset max_rewind/max_request while suspending
|
|
|
f65aa27 |
|
|
|
f65aa27 |
---
|
|
|
f65aa27 |
src/modules/alsa/alsa-sink.c | 11 ++++++++++-
|
|
|
f65aa27 |
1 files changed, 10 insertions(+), 1 deletions(-)
|
|
|
f65aa27 |
|
|
|
f65aa27 |
diff --git a/src/modules/alsa/alsa-sink.c b/src/modules/alsa/alsa-sink.c
|
|
|
f65aa27 |
index 690480f..60c10c4 100644
|
|
|
f65aa27 |
--- a/src/modules/alsa/alsa-sink.c
|
|
|
f65aa27 |
+++ b/src/modules/alsa/alsa-sink.c
|
|
|
f65aa27 |
@@ -79,7 +79,7 @@
|
|
|
f65aa27 |
#define TSCHED_MIN_WAKEUP_USEC (4*PA_USEC_PER_MSEC) /* 4ms -- Wakeup at least this long before the buffer runs empty*/
|
|
|
f65aa27 |
|
|
|
f65aa27 |
#define SMOOTHER_MIN_INTERVAL (2*PA_USEC_PER_MSEC) /* 2ms -- min smoother update interval */
|
|
|
f65aa27 |
-#define SMOOTHER_MAX_INTERVAL (200*PA_USEC_PER_MSEC) /* 200ms -- max smoother update inteval */
|
|
|
f65aa27 |
+#define SMOOTHER_MAX_INTERVAL (200*PA_USEC_PER_MSEC) /* 200ms -- max smoother update interval */
|
|
|
f65aa27 |
|
|
|
f65aa27 |
#define VOLUME_ACCURACY (PA_VOLUME_NORM/100) /* don't require volume adjustments to be perfectly correct. don't necessarily extend granularity in software unless the differences get greater than this level */
|
|
|
f65aa27 |
|
|
|
f65aa27 |
@@ -876,6 +876,14 @@ static int suspend(struct userdata *u) {
|
|
|
f65aa27 |
u->alsa_rtpoll_item = NULL;
|
|
|
f65aa27 |
}
|
|
|
f65aa27 |
|
|
|
f65aa27 |
+ /* We reset max_rewind/max_request here to make sure that while we
|
|
|
f65aa27 |
+ * are suspended the old max_request/max_rewind values set before
|
|
|
f65aa27 |
+ * the suspend can influence the per-stream buffer of newly
|
|
|
f65aa27 |
+ * created streams, without their requirements having any
|
|
|
f65aa27 |
+ * influence on them. */
|
|
|
f65aa27 |
+ pa_sink_set_max_rewind_within_thread(u->sink, 0);
|
|
|
f65aa27 |
+ pa_sink_set_max_request_within_thread(u->sink, 0);
|
|
|
f65aa27 |
+
|
|
|
f65aa27 |
pa_log_info("Device suspended...");
|
|
|
f65aa27 |
|
|
|
f65aa27 |
return 0;
|
|
|
f65aa27 |
@@ -933,6 +941,7 @@ static int update_sw_params(struct userdata *u) {
|
|
|
f65aa27 |
}
|
|
|
f65aa27 |
|
|
|
f65aa27 |
pa_sink_set_max_request_within_thread(u->sink, u->hwbuf_size - u->hwbuf_unused);
|
|
|
f65aa27 |
+ pa_sink_set_max_rewind_within_thread(u->sink, u->hwbuf_size);
|
|
|
f65aa27 |
|
|
|
f65aa27 |
return 0;
|
|
|
f65aa27 |
}
|
|
|
f65aa27 |
--
|
|
|
f65aa27 |
1.7.0
|
|
|
f65aa27 |
|