diff options
author | Lennart Poettering <lennart@poettering.net> | 2009-02-20 03:21:17 +0100 |
---|---|---|
committer | Lennart Poettering <lennart@poettering.net> | 2009-02-20 03:21:17 +0100 |
commit | 26a270a934f0f174f7bd7eb89e85301963721deb (patch) | |
tree | 03418fd3de4c0436d26989eb1135f9873bd09d8c /src/modules/alsa/alsa-sink.c | |
parent | adc9c2db6b4820be4d44faae4b0e523468cd3c14 (diff) |
big alsa module rework to make things more robust to broken sound drivers and make it easier to debug them
Diffstat (limited to 'src/modules/alsa/alsa-sink.c')
-rw-r--r-- | src/modules/alsa/alsa-sink.c | 343 |
1 files changed, 192 insertions, 151 deletions
diff --git a/src/modules/alsa/alsa-sink.c b/src/modules/alsa/alsa-sink.c index 529026869..239a9d786 100644 --- a/src/modules/alsa/alsa-sink.c +++ b/src/modules/alsa/alsa-sink.c @@ -58,2 +58,4 @@ +/* #define DEBUG_TIMING */ + #define DEFAULT_DEVICE "default" @@ -61,4 +63,4 @@ #define DEFAULT_TSCHED_WATERMARK_USEC (20*PA_USEC_PER_MSEC) /* 20ms */ -#define TSCHED_MIN_SLEEP_USEC (3*PA_USEC_PER_MSEC) /* 3ms */ -#define TSCHED_MIN_WAKEUP_USEC (3*PA_USEC_PER_MSEC) /* 3ms */ +#define TSCHED_MIN_SLEEP_USEC (10*PA_USEC_PER_MSEC) /* 10ms */ +#define TSCHED_MIN_WAKEUP_USEC (4*PA_USEC_PER_MSEC) /* 4ms */ @@ -80,7 +82,7 @@ struct userdata { long hw_dB_max, hw_dB_min; - pa_bool_t hw_dB_supported; - pa_bool_t mixer_seperate_channels; + pa_bool_t hw_dB_supported:1; + pa_bool_t mixer_seperate_channels:1; pa_cvolume hardware_volume; - size_t frame_size, fragment_size, hwbuf_size, tsched_watermark; + size_t frame_size, fragment_size, hwbuf_size, tsched_watermark, hwbuf_unused, min_sleep, min_wakeup; unsigned nfragments; @@ -90,3 +92,3 @@ struct userdata { - pa_bool_t use_mmap, use_tsched; + pa_bool_t use_mmap:1, use_tsched:1; @@ -99,6 +101,4 @@ struct userdata { pa_smoother *smoother; - int64_t frame_index; + uint64_t write_count; uint64_t since_start; - - snd_pcm_sframes_t hwbuf_unused_frames; }; @@ -107,27 +107,60 @@ static void userdata_free(struct userdata *u); +static void fix_min_sleep_wakeup(struct userdata *u) { + size_t max_use, max_use_2; + + pa_assert(u); + + max_use = u->hwbuf_size - u->hwbuf_unused; + max_use_2 = pa_frame_align(max_use/2, &u->sink->sample_spec); + + u->min_sleep = pa_usec_to_bytes(TSCHED_MIN_SLEEP_USEC, &u->sink->sample_spec); + u->min_sleep = PA_CLAMP(u->min_sleep, u->frame_size, max_use_2); + + u->min_wakeup = pa_usec_to_bytes(TSCHED_MIN_WAKEUP_USEC, &u->sink->sample_spec); + u->min_wakeup = PA_CLAMP(u->min_wakeup, u->frame_size, max_use_2); +} + static void fix_tsched_watermark(struct userdata *u) { size_t max_use; - size_t min_sleep, min_wakeup; pa_assert(u); - max_use = u->hwbuf_size - (size_t) u->hwbuf_unused_frames * u->frame_size; + max_use = u->hwbuf_size - u->hwbuf_unused; - min_sleep = pa_usec_to_bytes(TSCHED_MIN_SLEEP_USEC, &u->sink->sample_spec); - min_wakeup = pa_usec_to_bytes(TSCHED_MIN_WAKEUP_USEC, &u->sink->sample_spec); + if (u->tsched_watermark > max_use - u->min_sleep) + u->tsched_watermark = max_use - u->min_sleep; - if (min_sleep > max_use/2) - min_sleep = pa_frame_align(max_use/2, &u->sink->sample_spec); - if (min_sleep < u->frame_size) - min_sleep = u->frame_size; + if (u->tsched_watermark < u->min_wakeup) + u->tsched_watermark = u->min_wakeup; +} + +static void adjust_after_underrun(struct userdata *u) { + size_t old_watermark; + pa_usec_t old_min_latency, new_min_latency; - if (min_wakeup > max_use/2) - min_wakeup = pa_frame_align(max_use/2, &u->sink->sample_spec); - if (min_wakeup < u->frame_size) - min_wakeup = u->frame_size; + pa_assert(u); - if (u->tsched_watermark > max_use-min_sleep) - u->tsched_watermark = max_use-min_sleep; + /* First, just try to increase the watermark */ + old_watermark = u->tsched_watermark; + u->tsched_watermark *= 2; + fix_tsched_watermark(u); - if (u->tsched_watermark < min_wakeup) - u->tsched_watermark = min_wakeup; + if (old_watermark != u->tsched_watermark) { + pa_log_notice("Increasing wakeup watermark to %0.2f ms", + (double) pa_bytes_to_usec(u->tsched_watermark, &u->sink->sample_spec) / PA_USEC_PER_MSEC); + return; + } + + /* Hmm, we cannot increase the watermark any further, hence let's raise the latency */ + old_min_latency = u->sink->thread_info.min_latency; + new_min_latency = PA_MIN(old_min_latency * 2, u->sink->thread_info.max_latency); + + if (old_min_latency != new_min_latency) { + pa_log_notice("Increasing minimal latency to %0.2f ms", + (double) new_min_latency / PA_USEC_PER_MSEC); + + pa_sink_update_latency_range(u->sink, new_min_latency, u->sink->thread_info.max_latency); + return; + } + + /* When we reach this we're officialy fucked! */ } @@ -147,13 +180,16 @@ static void hw_sleep_time(struct userdata *u, pa_usec_t *sleep_usec, pa_usec_t*p -/* pa_log_debug("hw buffer time: %u ms", (unsigned) (usec / PA_USEC_PER_MSEC)); */ - wm = pa_bytes_to_usec(u->tsched_watermark, &u->sink->sample_spec); - if (usec >= wm) { - *sleep_usec = usec - wm; - *process_usec = wm; - } else - *process_usec = *sleep_usec = usec / 2; + if (wm > usec) + wm = usec/2; + + *sleep_usec = usec - wm; + *process_usec = wm; -/* pa_log_debug("after watermark: %u ms", (unsigned) (*sleep_usec / PA_USEC_PER_MSEC)); */ +#ifdef DEBUG_TIMING + pa_log_debug("Buffer time: %lu ms; Sleep time: %lu ms; Process time: %lu ms", + (unsigned long) (usec / PA_USEC_PER_MSEC), + (unsigned long) (*sleep_usec / PA_USEC_PER_MSEC), + (unsigned long) (*process_usec / PA_USEC_PER_MSEC)); +#endif } @@ -172,36 +208,41 @@ static int try_recover(struct userdata *u, const char *call, int err) { - if ((err = snd_pcm_recover(u->pcm_handle, err, 1)) == 0) { - u->first = TRUE; - u->since_start = 0; - return 0; + if ((err = snd_pcm_recover(u->pcm_handle, err, 1)) < 0) { + pa_log("%s: %s", call, snd_strerror(err)); + return -1; } - pa_log("%s: %s", call, snd_strerror(err)); - return -1; + u->first = TRUE; + u->since_start = 0; + return 0; } -static size_t check_left_to_play(struct userdata *u, snd_pcm_sframes_t n) { +static size_t check_left_to_play(struct userdata *u, size_t n_bytes) { size_t left_to_play; - if ((size_t) n*u->frame_size < u->hwbuf_size) - left_to_play = u->hwbuf_size - ((size_t) n*u->frame_size); - else - left_to_play = 0; + /* We use <= instead of < for this check here because an underrun + * only happens after the last sample was processed, not already when + * it is removed from the buffer. This is particularly important + * when block transfer is used. */ - if (left_to_play > 0) { -/* pa_log_debug("%0.2f ms left to play", (double) pa_bytes_to_usec(left_to_play, &u->sink->sample_spec) / PA_USEC_PER_MSEC); */ - } else if (!u->first && !u->after_rewind) { + if (n_bytes <= u->hwbuf_size) { + left_to_play = u->hwbuf_size - n_bytes; - if (pa_log_ratelimit()) - pa_log_info("Underrun!"); +#ifdef DEBUG_TIMING + pa_log_debug("%0.2f ms left to play", (double) pa_bytes_to_usec(left_to_play, &u->sink->sample_spec) / PA_USEC_PER_MSEC); +#endif - if (u->use_tsched) { - size_t old_watermark = u->tsched_watermark; + } else { + left_to_play = 0; - u->tsched_watermark *= 2; - fix_tsched_watermark(u); +#ifdef DEBUG_TIMING + PA_DEBUG_TRAP; +#endif + + if (!u->first && !u->after_rewind) { + + if (pa_log_ratelimit()) + pa_log_info("Underrun!"); - if (old_watermark != u->tsched_watermark) - pa_log_notice("Increasing wakeup watermark to %0.2f ms", - (double) pa_bytes_to_usec(u->tsched_watermark, &u->sink->sample_spec) / PA_USEC_PER_MSEC); + if (u->use_tsched) + adjust_after_underrun(u); } @@ -213,3 +254,3 @@ static size_t check_left_to_play(struct userdata *u, snd_pcm_sframes_t n) { static int mmap_write(struct userdata *u, pa_usec_t *sleep_usec, pa_bool_t polled) { - int work_done = 0; + pa_bool_t work_done = TRUE; pa_usec_t max_sleep_usec = 0, process_usec = 0; @@ -225,6 +266,5 @@ static int mmap_write(struct userdata *u, pa_usec_t *sleep_usec, pa_bool_t polle snd_pcm_sframes_t n; + size_t n_bytes; int r; - snd_pcm_hwsync(u->pcm_handle); - /* First we determine how many samples are missing to fill the @@ -232,5 +272,5 @@ static int mmap_write(struct userdata *u, pa_usec_t *sleep_usec, pa_bool_t polle - if (PA_UNLIKELY((n = pa_alsa_safe_avail_update(u->pcm_handle, u->hwbuf_size, &u->sink->sample_spec)) < 0)) { + if (PA_UNLIKELY((n = pa_alsa_safe_avail(u->pcm_handle, u->hwbuf_size, &u->sink->sample_spec)) < 0)) { - if ((r = try_recover(u, "snd_pcm_avail_update", (int) n)) == 0) + if ((r = try_recover(u, "snd_pcm_avail", (int) n)) == 0) continue; @@ -240,3 +280,9 @@ static int mmap_write(struct userdata *u, pa_usec_t *sleep_usec, pa_bool_t polle - left_to_play = check_left_to_play(u, n); + n_bytes = (size_t) n * u->frame_size; + +#ifdef DEBUG_TIMING + pa_log_debug("avail: %lu", (unsigned long) n_bytes); +#endif + + left_to_play = check_left_to_play(u, n_bytes); @@ -251,6 +297,10 @@ static int mmap_write(struct userdata *u, pa_usec_t *sleep_usec, pa_bool_t polle if (!polled && - pa_bytes_to_usec(left_to_play, &u->sink->sample_spec) > process_usec+max_sleep_usec/2) + pa_bytes_to_usec(left_to_play, &u->sink->sample_spec) > process_usec+max_sleep_usec/2) { +#ifdef DEBUG_TIMING + pa_log_debug("Not filling up, because too early."); +#endif break; + } - if (PA_UNLIKELY(n <= u->hwbuf_unused_frames)) { + if (PA_UNLIKELY(n_bytes <= u->hwbuf_unused)) { @@ -261,2 +311,5 @@ static int mmap_write(struct userdata *u, pa_usec_t *sleep_usec, pa_bool_t polle +#ifdef DEBUG_TIMING + pa_log_debug("Not filling up, because not necessary."); +#endif break; @@ -264,7 +317,8 @@ static int mmap_write(struct userdata *u, pa_usec_t *sleep_usec, pa_bool_t polle - n -= u->hwbuf_unused_frames; - + n_bytes -= u->hwbuf_unused; polled = FALSE; -/* pa_log_debug("Filling up"); */ +#ifdef DEBUG_TIMING + pa_log_debug("Filling up"); +#endif @@ -275,5 +329,6 @@ static int mmap_write(struct userdata *u, pa_usec_t *sleep_usec, pa_bool_t polle const snd_pcm_channel_area_t *areas; - snd_pcm_uframes_t offset, frames = (snd_pcm_uframes_t) n; + snd_pcm_uframes_t offset, frames; snd_pcm_sframes_t sframes; + frames = (snd_pcm_uframes_t) (n_bytes / u->frame_size); /* pa_log_debug("%lu frames to write", (unsigned long) frames); */ @@ -307,5 +362,2 @@ static int mmap_write(struct userdata *u, pa_usec_t *sleep_usec, pa_bool_t polle pa_sink_render_into_full(u->sink, &chunk); - - /* FIXME: Maybe we can do something to keep this memory block - * a little bit longer around? */ pa_memblock_unref_fixed(chunk.memblock); @@ -320,13 +372,15 @@ static int mmap_write(struct userdata *u, pa_usec_t *sleep_usec, pa_bool_t polle - work_done = 1; + work_done = TRUE; - u->frame_index += (int64_t) frames; + u->write_count += frames * u->frame_size; u->since_start += frames * u->frame_size; -/* pa_log_debug("wrote %lu frames", (unsigned long) frames); */ +#ifdef DEBUG_TIMING + pa_log_debug("Wrote %lu bytes", (unsigned long) (frames * u->frame_size)); +#endif - if (frames >= (snd_pcm_uframes_t) n) + if ((size_t) frames * u->frame_size >= n_bytes) break; - n -= (snd_pcm_sframes_t) frames; + n_bytes -= (size_t) frames * u->frame_size; } @@ -335,3 +389,3 @@ static int mmap_write(struct userdata *u, pa_usec_t *sleep_usec, pa_bool_t polle *sleep_usec = pa_bytes_to_usec(left_to_play, &u->sink->sample_spec) - process_usec; - return work_done; + return work_done ? 1 : 0; } @@ -339,3 +393,3 @@ static int mmap_write(struct userdata *u, pa_usec_t *sleep_usec, pa_bool_t polle static int unix_write(struct userdata *u, pa_usec_t *sleep_usec, pa_bool_t polled) { - int work_done = 0; + pa_bool_t work_done = FALSE; pa_usec_t max_sleep_usec = 0, process_usec = 0; @@ -351,9 +405,8 @@ static int unix_write(struct userdata *u, pa_usec_t *sleep_usec, pa_bool_t polle snd_pcm_sframes_t n; + size_t n_bytes; int r; - snd_pcm_hwsync(u->pcm_handle); + if (PA_UNLIKELY((n = pa_alsa_safe_avail(u->pcm_handle, u->hwbuf_size, &u->sink->sample_spec)) < 0)) { - if (PA_UNLIKELY((n = pa_alsa_safe_avail_update(u->pcm_handle, u->hwbuf_size, &u->sink->sample_spec)) < 0)) { - - if ((r = try_recover(u, "snd_pcm_avail_update", (int) n)) == 0) + if ((r = try_recover(u, "snd_pcm_avail", (int) n)) == 0) continue; @@ -363,3 +416,4 @@ static int unix_write(struct userdata *u, pa_usec_t *sleep_usec, pa_bool_t polle - left_to_play = check_left_to_play(u, n); + n_bytes = (size_t) n * u->frame_size; + left_to_play = check_left_to_play(u, n_bytes); @@ -377,3 +431,3 @@ static int unix_write(struct userdata *u, pa_usec_t *sleep_usec, pa_bool_t polle - if (PA_UNLIKELY(n <= u->hwbuf_unused_frames)) { + if (PA_UNLIKELY(n_bytes <= u->hwbuf_unused)) { @@ -387,4 +441,3 @@ static int unix_write(struct userdata *u, pa_usec_t *sleep_usec, pa_bool_t polle - n -= u->hwbuf_unused_frames; - + n_bytes -= u->hwbuf_unused; polled = FALSE; @@ -398,3 +451,3 @@ static int unix_write(struct userdata *u, pa_usec_t *sleep_usec, pa_bool_t polle if (u->memchunk.length <= 0) - pa_sink_render(u->sink, (size_t) n * u->frame_size, &u->memchunk); + pa_sink_render(u->sink, n_bytes, &u->memchunk); @@ -404,4 +457,4 @@ static int unix_write(struct userdata *u, pa_usec_t *sleep_usec, pa_bool_t polle - if (frames > n) - frames = n; + if (frames > (snd_pcm_sframes_t) (n_bytes/u->frame_size)) + frames = (snd_pcm_sframes_t) (n_bytes/u->frame_size); @@ -429,6 +482,6 @@ static int unix_write(struct userdata *u, pa_usec_t *sleep_usec, pa_bool_t polle - work_done = 1; + work_done = TRUE; - u->frame_index += frames; - u->since_start += (size_t) frames * u->frame_size; + u->write_count += frames * u->frame_size; + u->since_start += frames * u->frame_size; @@ -436,6 +489,6 @@ static int unix_write(struct userdata *u, pa_usec_t *sleep_usec, pa_bool_t polle - if (frames >= n) + if ((size_t) frames * u->frame_size >= n_bytes) break; - n -= frames; + n_bytes -= (size_t) frames * u->frame_size; } @@ -444,3 +497,3 @@ static int unix_write(struct userdata *u, pa_usec_t *sleep_usec, pa_bool_t polle *sleep_usec = pa_bytes_to_usec(left_to_play, &u->sink->sample_spec) - process_usec; - return work_done; + return work_done ? 1 : 0; } @@ -448,7 +501,6 @@ static int unix_write(struct userdata *u, pa_usec_t *sleep_usec, pa_bool_t polle static void update_smoother(struct userdata *u) { - snd_pcm_sframes_t delay = 0; - int64_t frames; + snd_pcm_sframes_t delay = 0; + int64_t position; int err; - pa_usec_t now1, now2; -/* struct timeval timestamp; */ + pa_usec_t now1 = 0, now2; snd_pcm_status_t *status; @@ -462,14 +514,4 @@ static void update_smoother(struct userdata *u) { - snd_pcm_hwsync(u->pcm_handle); - snd_pcm_avail_update(u->pcm_handle); - -/* if (PA_UNLIKELY((err = snd_pcm_status(u->pcm_handle, status)) < 0)) { */ -/* pa_log("Failed to query DSP status data: %s", snd_strerror(err)); */ -/* return; */ -/* } */ - -/* delay = snd_pcm_status_get_delay(status); */ - if (PA_UNLIKELY((err = snd_pcm_delay(u->pcm_handle, &delay)) < 0)) { - pa_log("Failed to query DSP status data: %s", snd_strerror(err)); + pa_log_warn("Failed to query DSP status data: %s", snd_strerror(err)); return; @@ -477,12 +519,21 @@ static void update_smoother(struct userdata *u) { - frames = u->frame_index - delay; + if (PA_UNLIKELY((err = snd_pcm_status(u->pcm_handle, status)) < 0)) + pa_log_warn("Failed to get timestamp: %s", snd_strerror(err)); + else { + snd_htimestamp_t htstamp = { 0, 0 }; + snd_pcm_status_get_htstamp(status, &htstamp); + now1 = pa_timespec_load(&htstamp); + } -/* pa_log_debug("frame_index = %llu, delay = %llu, p = %llu", (unsigned long long) u->frame_index, (unsigned long long) delay, (unsigned long long) frames); */ + position = (int64_t) u->write_count - ((int64_t) delay * (int64_t) u->frame_size); -/* snd_pcm_status_get_tstamp(status, ×tamp); */ -/* pa_rtclock_from_wallclock(×tamp); */ -/* now1 = pa_timeval_load(×tamp); */ + if (PA_UNLIKELY(position < 0)) + position = 0; + + /* Hmm, if the timestamp is 0, then it wasn't set and we take the current time */ + if (now1 <= 0) + now1 = pa_rtclock_usec(); + + now2 = pa_bytes_to_usec((uint64_t) position, &u->sink->sample_spec); - now1 = pa_rtclock_usec(); - now2 = pa_bytes_to_usec((uint64_t) frames * u->frame_size, &u->sink->sample_spec); pa_smoother_put(u->smoother, now1, now2); @@ -491,3 +542,3 @@ static void update_smoother(struct userdata *u) { static pa_usec_t sink_get_latency(struct userdata *u) { - pa_usec_t r = 0; + pa_usec_t r; int64_t delay; @@ -500,6 +551,5 @@ static pa_usec_t sink_get_latency(struct userdata *u) { - delay = (int64_t) pa_bytes_to_usec((uint64_t) u->frame_index * u->frame_size, &u->sink->sample_spec) - (int64_t) now2; + delay = (int64_t) pa_bytes_to_usec(u->write_count, &u->sink->sample_spec) - (int64_t) now2; - if (delay > 0) - r = (pa_usec_t) delay; + r = delay >= 0 ? (pa_usec_t) delay : 0; @@ -552,3 +602,3 @@ static int update_sw_params(struct userdata *u) { /* Use the full buffer if noone asked us for anything specific */ - u->hwbuf_unused_frames = 0; + u->hwbuf_unused = 0; @@ -560,3 +610,3 @@ static int update_sw_params(struct userdata *u) { - pa_log_debug("latency set to %0.2fms", (double) latency / PA_USEC_PER_MSEC); + pa_log_debug("Latency set to %0.2fms", (double) latency / PA_USEC_PER_MSEC); @@ -569,7 +619,6 @@ static int update_sw_params(struct userdata *u) { - u->hwbuf_unused_frames = (snd_pcm_sframes_t) - (PA_LIKELY(b < u->hwbuf_size) ? - ((u->hwbuf_size - b) / u->frame_size) : 0); + u->hwbuf_unused = PA_LIKELY(b < u->hwbuf_size) ? (u->hwbuf_size - b) : 0; } + fix_min_sleep_wakeup(u); fix_tsched_watermark(u); @@ -577,6 +626,6 @@ static int update_sw_params(struct userdata *u) { - pa_log_debug("hwbuf_unused_frames=%lu", (unsigned long) u->hwbuf_unused_frames); + pa_log_debug("hwbuf_unused=%lu", (unsigned long) u->hwbuf_unused); /* We need at last one frame in the used part of the buffer */ - avail_min = (snd_pcm_uframes_t) u->hwbuf_unused_frames + 1; + avail_min = (snd_pcm_uframes_t) u->hwbuf_unused / u->frame_size + 1; @@ -596,3 +645,3 @@ static int update_sw_params(struct userdata *u) { - pa_sink_set_max_request(u->sink, u->hwbuf_size - (size_t) u->hwbuf_unused_frames * u->frame_size); + pa_sink_set_max_request(u->sink, u->hwbuf_size - u->hwbuf_unused); @@ -657,4 +706,2 @@ static int unsuspend(struct userdata *u) { - /* FIXME: We need to reload the volume somehow */ - u->first = TRUE; @@ -983,3 +1030,3 @@ static void sink_update_requested_latency_cb(pa_sink *s) { struct userdata *u = s->userdata; - snd_pcm_sframes_t before; + size_t before; pa_assert(u); @@ -989,3 +1036,3 @@ static void sink_update_requested_latency_cb(pa_sink *s) { - before = u->hwbuf_unused_frames; + before = u->hwbuf_unused; update_sw_params(u); @@ -998,3 +1045,3 @@ static void sink_update_requested_latency_cb(pa_sink *s) { - if (u->hwbuf_unused_frames > before) { + if (u->hwbuf_unused > before) { pa_log_debug("Requesting rewind due to latency change."); @@ -1053,3 +1100,3 @@ static int process_rewind(struct userdata *u) { else { - u->frame_index -= out_frames; + u->write_count -= out_frames * u->frame_size; pa_log_debug("Rewound %lu bytes.", (unsigned long) rewind_nbytes); @@ -1088,3 +1135,5 @@ static void thread_func(void *userdata) { -/* pa_log_debug("loop"); */ +#ifdef DEBUG_TIMING + pa_log_debug("Loop"); +#endif @@ -1134,3 +1183,3 @@ static void thread_func(void *userdata) { - /*pa_log_debug("Cutting sleep time for the initial iterations by half.");*/ + pa_log_debug("Cutting sleep time for the initial iterations by half."); sleep_usec /= 2; @@ -1180,3 +1229,3 @@ static void thread_func(void *userdata) { - if (revents & (POLLIN|POLLERR|POLLNVAL|POLLHUP|POLLPRI)) { + if (revents & ~POLLOUT) { if (pa_alsa_recover_from_poll(u->pcm_handle, revents) < 0) @@ -1186,6 +1235,5 @@ static void thread_func(void *userdata) { u->since_start = 0; - } + } else if (revents && u->use_tsched && pa_log_ratelimit()) + pa_log_debug("Wakeup from ALSA!"); - if (revents && u->use_tsched && pa_log_ratelimit()) - pa_log_debug("Wakeup from ALSA!%s%s", (revents & POLLIN) ? " INPUT" : "", (revents & POLLOUT) ? " OUTPUT" : ""); } else @@ -1384,7 +1432,4 @@ pa_sink *pa_alsa_sink_new(pa_module *m, pa_modargs *ma, const char*driver, pa_ca u->first = TRUE; - u->since_start = 0; - u->after_rewind = FALSE; u->rtpoll = pa_rtpoll_new(); pa_thread_mq_init(&u->thread_mq, m->core->mainloop, u->rtpoll); - u->alsa_rtpoll_item = NULL; @@ -1505,13 +1550,9 @@ pa_sink *pa_alsa_sink_new(pa_module *m, pa_modargs *ma, const char*driver, pa_ca u->hwbuf_size = u->fragment_size * nfrags; - u->hwbuf_unused_frames = 0; u->tsched_watermark = tsched_watermark; - u->frame_index = 0; - u->hw_dB_supported = FALSE; - u->hw_dB_min = u->hw_dB_max = 0; - u->hw_volume_min = u->hw_volume_max = 0; - u->mixer_seperate_channels = FALSE; pa_cvolume_mute(&u->hardware_volume, u->sink->sample_spec.channels); - if (use_tsched) + if (use_tsched) { + fix_min_sleep_wakeup(u); fix_tsched_watermark(u); + } |