set fixed latencies at more places where appropriate

This commit is contained in:
Lennart Poettering 2009-04-10 02:26:59 +02:00
parent 80e18c8da3
commit 991cb06134
6 changed files with 16 additions and 9 deletions

View file

@ -1703,14 +1703,13 @@ pa_sink *pa_alsa_sink_new(pa_module *m, pa_modargs *ma, const char*driver, pa_ca
(double) pa_bytes_to_usec(u->hwbuf_size, &ss) / PA_USEC_PER_MSEC); (double) pa_bytes_to_usec(u->hwbuf_size, &ss) / PA_USEC_PER_MSEC);
pa_sink_set_max_request(u->sink, u->hwbuf_size); pa_sink_set_max_request(u->sink, u->hwbuf_size);
pa_sink_set_max_rewind(u->sink, u->hwbuf_size);
if (u->use_tsched) { if (u->use_tsched) {
fix_min_sleep_wakeup(u);
fix_tsched_watermark(u);
u->watermark_step = pa_usec_to_bytes(TSCHED_WATERMARK_STEP_USEC, &u->sink->sample_spec); u->watermark_step = pa_usec_to_bytes(TSCHED_WATERMARK_STEP_USEC, &u->sink->sample_spec);
pa_sink_set_max_rewind(u->sink, u->hwbuf_size); fix_min_sleep_wakeup(u);
fix_tsched_watermark(u);
pa_sink_set_latency_range(u->sink, pa_sink_set_latency_range(u->sink,
0, 0,
@ -1718,7 +1717,8 @@ pa_sink *pa_alsa_sink_new(pa_module *m, pa_modargs *ma, const char*driver, pa_ca
pa_log_info("Time scheduling watermark is %0.2fms", pa_log_info("Time scheduling watermark is %0.2fms",
(double) pa_bytes_to_usec(u->tsched_watermark, &ss) / PA_USEC_PER_MSEC); (double) pa_bytes_to_usec(u->tsched_watermark, &ss) / PA_USEC_PER_MSEC);
} } else
u->sink->fixed_latency = pa_bytes_to_usec(u->hwbuf_size, &ss);
reserve_update(u); reserve_update(u);

View file

@ -1558,18 +1558,19 @@ pa_source *pa_alsa_source_new(pa_module *m, pa_modargs *ma, const char*driver, p
(double) pa_bytes_to_usec(u->hwbuf_size, &ss) / PA_USEC_PER_MSEC); (double) pa_bytes_to_usec(u->hwbuf_size, &ss) / PA_USEC_PER_MSEC);
if (u->use_tsched) { if (u->use_tsched) {
u->watermark_step = pa_usec_to_bytes(TSCHED_WATERMARK_STEP_USEC, &u->source->sample_spec);
fix_min_sleep_wakeup(u); fix_min_sleep_wakeup(u);
fix_tsched_watermark(u); fix_tsched_watermark(u);
u->watermark_step = pa_usec_to_bytes(TSCHED_WATERMARK_STEP_USEC, &u->source->sample_spec);
pa_source_set_latency_range(u->source, pa_source_set_latency_range(u->source,
0, 0,
pa_bytes_to_usec(u->hwbuf_size, &ss)); pa_bytes_to_usec(u->hwbuf_size, &ss));
pa_log_info("Time scheduling watermark is %0.2fms", pa_log_info("Time scheduling watermark is %0.2fms",
(double) pa_bytes_to_usec(u->tsched_watermark, &ss) / PA_USEC_PER_MSEC); (double) pa_bytes_to_usec(u->tsched_watermark, &ss) / PA_USEC_PER_MSEC);
} } else
u->source->fixed_latency = pa_bytes_to_usec(u->hwbuf_size, &ss);
reserve_update(u); reserve_update(u);

View file

@ -293,6 +293,7 @@ int pa__init(pa_module*m) {
pa_sink_set_asyncmsgq(u->sink, u->thread_mq.inq); pa_sink_set_asyncmsgq(u->sink, u->thread_mq.inq);
pa_sink_set_rtpoll(u->sink, u->rtpoll); pa_sink_set_rtpoll(u->sink, u->rtpoll);
pa_sink_set_max_request(u->sink, PIPE_BUF); pa_sink_set_max_request(u->sink, PIPE_BUF);
u->sink->fixed_latency = pa_bytes_to_usec(PIPE_BUF, &u->sink->sample_spec);
u->rtpoll_item = pa_rtpoll_item_new(u->rtpoll, PA_RTPOLL_NEVER, 1); u->rtpoll_item = pa_rtpoll_item_new(u->rtpoll, PA_RTPOLL_NEVER, 1);
pollfd = pa_rtpoll_item_get_pollfd(u->rtpoll_item, NULL); pollfd = pa_rtpoll_item_get_pollfd(u->rtpoll_item, NULL);

View file

@ -277,6 +277,7 @@ int pa__init(pa_module*m) {
pa_source_set_asyncmsgq(u->source, u->thread_mq.inq); pa_source_set_asyncmsgq(u->source, u->thread_mq.inq);
pa_source_set_rtpoll(u->source, u->rtpoll); pa_source_set_rtpoll(u->source, u->rtpoll);
u->source->fixed_latency = pa_bytes_to_usec(PIPE_BUF, &u->source->sample_spec);
u->rtpoll_item = pa_rtpoll_item_new(u->rtpoll, PA_RTPOLL_NEVER, 1); u->rtpoll_item = pa_rtpoll_item_new(u->rtpoll, PA_RTPOLL_NEVER, 1);
pollfd = pa_rtpoll_item_get_pollfd(u->rtpoll_item, NULL); pollfd = pa_rtpoll_item_get_pollfd(u->rtpoll_item, NULL);

View file

@ -260,10 +260,12 @@ int pa__init(pa_module*m) {
u->source->update_requested_latency = source_update_requested_latency_cb; u->source->update_requested_latency = source_update_requested_latency_cb;
u->source->userdata = u; u->source->userdata = u;
u->block_usec = BLOCK_USEC;
pa_source_set_asyncmsgq(u->source, u->thread_mq.inq); pa_source_set_asyncmsgq(u->source, u->thread_mq.inq);
pa_source_set_rtpoll(u->source, u->rtpoll); pa_source_set_rtpoll(u->source, u->rtpoll);
u->source->fixed_latency = u->block_usec;
u->block_usec = BLOCK_USEC;
if (!(u->thread = pa_thread_new(thread_func, u))) { if (!(u->thread = pa_thread_new(thread_func, u))) {
pa_log("Failed to create thread."); pa_log("Failed to create thread.");

View file

@ -1326,6 +1326,7 @@ int pa__init(pa_module*m) {
pa_source_set_asyncmsgq(u->source, u->thread_mq.inq); pa_source_set_asyncmsgq(u->source, u->thread_mq.inq);
pa_source_set_rtpoll(u->source, u->rtpoll); pa_source_set_rtpoll(u->source, u->rtpoll);
u->source->refresh_volume = TRUE; u->source->refresh_volume = TRUE;
u->source->fixed_latency = pa_bytes_to_usec(u->in_hwbuf_size, &u->source->sample_spec);
if (use_mmap) if (use_mmap)
u->in_mmap_memblocks = pa_xnew0(pa_memblock*, u->in_nfrags); u->in_mmap_memblocks = pa_xnew0(pa_memblock*, u->in_nfrags);
@ -1387,6 +1388,7 @@ int pa__init(pa_module*m) {
pa_sink_set_asyncmsgq(u->sink, u->thread_mq.inq); pa_sink_set_asyncmsgq(u->sink, u->thread_mq.inq);
pa_sink_set_rtpoll(u->sink, u->rtpoll); pa_sink_set_rtpoll(u->sink, u->rtpoll);
u->sink->refresh_volume = TRUE; u->sink->refresh_volume = TRUE;
u->sink->fixed_latency = pa_bytes_to_usec(u->out_hwbuf_size, &u->sink->sample_spec);
pa_sink_set_max_request(u->sink, u->out_hwbuf_size); pa_sink_set_max_request(u->sink, u->out_hwbuf_size);