From 5e8e1856f103a34e4ed7627eb91acaf1bfdb7492 Mon Sep 17 00:00:00 2001 From: Jay Sorg Date: Fri, 29 Mar 2013 22:14:51 -0700 Subject: [PATCH] chansrv: work on pulse sink --- sesman/chansrv/pulse/Makefile | 15 + .../chansrv/pulse/module-xrdp-sink-symdef.h | 29 ++ sesman/chansrv/pulse/module-xrdp-sink.c | 444 ++++++++++++++++++ sesman/chansrv/pulse/pulse-notes.txt | 26 + sesman/chansrv/sound.c | 14 +- 5 files changed, 522 insertions(+), 6 deletions(-) create mode 100644 sesman/chansrv/pulse/Makefile create mode 100644 sesman/chansrv/pulse/module-xrdp-sink-symdef.h create mode 100644 sesman/chansrv/pulse/module-xrdp-sink.c create mode 100644 sesman/chansrv/pulse/pulse-notes.txt diff --git a/sesman/chansrv/pulse/Makefile b/sesman/chansrv/pulse/Makefile new file mode 100644 index 00000000..f1353cdd --- /dev/null +++ b/sesman/chansrv/pulse/Makefile @@ -0,0 +1,15 @@ + + +PULSE_DIR=/home/jay/pulseaudio-0.9.22 + +OBJS = module-xrdp-sink.o + +CFLAGS = -Wall -O2 -I$(PULSE_DIR) -I$(PULSE_DIR)/src -DHAVE_CONFIG_H + +all: module-xrdp-sink.so + +module-xrdp-sink.so: $(OBJS) + $(CC) $(LDFLAGS) -shared -o module-xrdp-sink.so $(OBJS) + +clean: + rm -f $(OBJS) module-xrdp-sink.so diff --git a/sesman/chansrv/pulse/module-xrdp-sink-symdef.h b/sesman/chansrv/pulse/module-xrdp-sink-symdef.h new file mode 100644 index 00000000..14443d31 --- /dev/null +++ b/sesman/chansrv/pulse/module-xrdp-sink-symdef.h @@ -0,0 +1,29 @@ +#ifndef foomodulexrdpsinksymdeffoo +#define foomodulexrdpsinksymdeffoo + +#include +#include +#include + +#define pa__init module_xrdp_sink_LTX_pa__init +#define pa__done module_xrdp_sink_LTX_pa__done +#define pa__get_author module_xrdp_sink_LTX_pa__get_author +#define pa__get_description module_xrdp_sink_LTX_pa__get_description +#define pa__get_usage module_xrdp_sink_LTX_pa__get_usage +#define pa__get_version module_xrdp_sink_LTX_pa__get_version +#define pa__get_deprecated module_xrdp_sink_LTX_pa__get_deprecated +#define pa__load_once module_xrdp_sink_LTX_pa__load_once +#define pa__get_n_used module_xrdp_sink_LTX_pa__get_n_used + +int pa__init(pa_module*m); +void pa__done(pa_module*m); +int pa__get_n_used(pa_module*m); + +const char* pa__get_author(void); +const char* pa__get_description(void); +const char* pa__get_usage(void); +const char* pa__get_version(void); +const char* pa__get_deprecated(void); +pa_bool_t pa__load_once(void); + +#endif diff --git a/sesman/chansrv/pulse/module-xrdp-sink.c b/sesman/chansrv/pulse/module-xrdp-sink.c new file mode 100644 index 00000000..b94db41c --- /dev/null +++ b/sesman/chansrv/pulse/module-xrdp-sink.c @@ -0,0 +1,444 @@ +/** + * xrdp: A Remote Desktop Protocol server. + * pulse sink + * + * Copyright (C) Jay Sorg 2013 + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +/* + To stop its respawning habit, open /etc/pulse/client.conf, change + autospawn = yes to autospawn = no, and set daemon-binary to /bin/true. + Make sure these lines are uncommented, like this: + +autospawn = no +daemon-binary = /bin/true + +*/ + +#ifdef HAVE_CONFIG_H +#include +#endif + +#include +#include +#include +#include +#include +#include +#include + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include +#include +#include +#include + +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include "module-xrdp-sink-symdef.h" + +PA_MODULE_AUTHOR("Jay Sorg"); +PA_MODULE_DESCRIPTION("xrdp sink"); +PA_MODULE_VERSION(PACKAGE_VERSION); +PA_MODULE_LOAD_ONCE(FALSE); +PA_MODULE_USAGE( + "sink_name= " + "sink_properties= " + "format= " + "rate=" + "channels= " + "channel_map="); + +//#define DEFAULT_FILE_NAME "fifo_output" +#define DEFAULT_SINK_NAME "xrdp" +#define BLOCK_USEC (PA_USEC_PER_SEC * 2) + +struct userdata { + pa_core *core; + pa_module *module; + pa_sink *sink; + + pa_thread *thread; + pa_thread_mq thread_mq; + pa_rtpoll *rtpoll; + + pa_usec_t block_usec; + pa_usec_t timestamp; + + int fd; /* unix domain socket connection to chansrv */ + pa_memchunk memchunk; + +}; + +static const char* const valid_modargs[] = { + "sink_name", + "sink_properties", + "format", + "rate", + "channels", + "channel_map", + NULL +}; + +static int sink_process_msg(pa_msgobject *o, int code, void *data, int64_t offset, pa_memchunk *chunk) { + + struct userdata *u = PA_SINK(o)->userdata; + + switch (code) { + case PA_SINK_MESSAGE_SET_STATE: + + if (PA_PTR_TO_UINT(data) == PA_SINK_RUNNING) + u->timestamp = pa_rtclock_now(); + + break; + + case PA_SINK_MESSAGE_GET_LATENCY: { + pa_usec_t now; + + now = pa_rtclock_now(); + *((pa_usec_t*) data) = u->timestamp > now ? u->timestamp - now : 0ULL; + + return 0; + } + } + + return pa_sink_process_msg(o, code, data, offset, chunk); +} + +static void sink_update_requested_latency_cb(pa_sink *s) { + struct userdata *u; + size_t nbytes; + + pa_sink_assert_ref(s); + pa_assert_se(u = s->userdata); + + u->block_usec = pa_sink_get_requested_latency_within_thread(s); + + if (u->block_usec == (pa_usec_t) -1) + u->block_usec = s->thread_info.max_latency; + + nbytes = pa_usec_to_bytes(u->block_usec, &s->sample_spec); + pa_sink_set_max_rewind_within_thread(s, nbytes); + pa_sink_set_max_request_within_thread(s, nbytes); +} + +static void process_rewind(struct userdata *u, pa_usec_t now) { + size_t rewind_nbytes, in_buffer; + pa_usec_t delay; + + pa_assert(u); + + /* Figure out how much we shall rewind and reset the counter */ + rewind_nbytes = u->sink->thread_info.rewind_nbytes; + u->sink->thread_info.rewind_nbytes = 0; + + pa_assert(rewind_nbytes > 0); + pa_log_debug("Requested to rewind %lu bytes.", (unsigned long) rewind_nbytes); + + if (u->timestamp <= now) + goto do_nothing; + + delay = u->timestamp - now; + in_buffer = pa_usec_to_bytes(delay, &u->sink->sample_spec); + + if (in_buffer <= 0) + goto do_nothing; + + if (rewind_nbytes > in_buffer) + rewind_nbytes = in_buffer; + + pa_sink_process_rewind(u->sink, rewind_nbytes); + u->timestamp -= pa_bytes_to_usec(rewind_nbytes, &u->sink->sample_spec); + + pa_log_debug("Rewound %lu bytes.", (unsigned long) rewind_nbytes); + return; + +do_nothing: + + pa_sink_process_rewind(u->sink, 0); +} + +struct header +{ + int code; + int bytes; +}; + +static int data_send(struct userdata *u) { + char *data; + int bytes; + int sent; + struct header h; + + if (u->fd == 0) { + int fd = socket(PF_LOCAL, SOCK_STREAM, 0); + struct sockaddr_un s = { 0 }; + s.sun_family = AF_UNIX; + strcpy(s.sun_path, "/tmp/.xrdp/xrdp_chansrv_audio_socket_10"); + if (connect(fd, (struct sockaddr *)&s, sizeof(struct sockaddr_un)) != 0) { + pa_log("Connected failed"); + close(fd); + return 0; + } + u->fd = fd; + pa_log("Connected ok fd %d", fd); + } + + bytes = u->memchunk.length; + pa_log("bytes %d", bytes); + + h.code = 0; + h.bytes = bytes + 8; + if (send(u->fd, &h, 8, 0) != 8) { + pa_log("data_send: send failed"); + close(u->fd); + u->fd = 0; + return 0; + } + else { + pa_log("data_send: sent header ok bytes %d", bytes); + } + + data = (char*)pa_memblock_acquire(u->memchunk.memblock); + data += u->memchunk.index; + sent = send(u->fd, data, bytes, 0); + pa_memblock_release(u->memchunk.memblock); + + if (sent != bytes) { + pa_log("data_send: send failed sent %d bytes %d", sent, bytes); + close(u->fd); + u->fd = 0; + return 0; + } + + u->memchunk.index += sent; + u->memchunk.length -= sent; + + if (u->memchunk.length <= 0) { + pa_memblock_unref(u->memchunk.memblock); + pa_memchunk_reset(&u->memchunk); + } + + return sent; +} + +static void process_render(struct userdata *u, pa_usec_t now) { + + pa_log("%d", u->memchunk.length); + + pa_log("a"); + + if (u->memchunk.length <= 0) + pa_sink_render(u->sink, 8192, &u->memchunk); + + pa_log("b"); + data_send(u); + pa_log("c"); + +} + +static void thread_func(void *userdata) { + struct userdata *u = userdata; + + pa_assert(u); + + pa_log_debug("Thread starting up"); + + pa_thread_mq_install(&u->thread_mq); + + u->timestamp = pa_rtclock_now(); + + for (;;) { + int ret; + + /* Render some data and drop it immediately */ + if (PA_SINK_IS_OPENED(u->sink->thread_info.state)) { + pa_usec_t now; + + now = pa_rtclock_now(); + + if (u->sink->thread_info.rewind_requested) { + if (u->sink->thread_info.rewind_nbytes > 0) + process_rewind(u, now); + else + pa_sink_process_rewind(u->sink, 0); + } + + if (u->timestamp <= now) + process_render(u, now); + + pa_rtpoll_set_timer_absolute(u->rtpoll, u->timestamp); + } else + pa_rtpoll_set_timer_disabled(u->rtpoll); + + /* Hmm, nothing to do. Let's sleep */ + if ((ret = pa_rtpoll_run(u->rtpoll, TRUE)) < 0) + goto fail; + + if (ret == 0) + goto finish; + } + +fail: + /* If this was no regular exit from the loop we have to continue + * processing messages until we received PA_MESSAGE_SHUTDOWN */ + pa_asyncmsgq_post(u->thread_mq.outq, PA_MSGOBJECT(u->core), PA_CORE_MESSAGE_UNLOAD_MODULE, u->module, 0, NULL, NULL); + pa_asyncmsgq_wait_for(u->thread_mq.inq, PA_MESSAGE_SHUTDOWN); + +finish: + pa_log_debug("Thread shutting down"); +} + +int pa__init(pa_module*m) { + struct userdata *u = NULL; + pa_sample_spec ss; + pa_channel_map map; + pa_modargs *ma = NULL; + pa_sink_new_data data; + size_t nbytes; + + pa_assert(m); + + if (!(ma = pa_modargs_new(m->argument, valid_modargs))) { + pa_log("Failed to parse module arguments."); + goto fail; + } + + ss = m->core->default_sample_spec; + map = m->core->default_channel_map; + if (pa_modargs_get_sample_spec_and_channel_map(ma, &ss, &map, PA_CHANNEL_MAP_DEFAULT) < 0) { + pa_log("Invalid sample format specification or channel map"); + goto fail; + } + + m->userdata = u = pa_xnew0(struct userdata, 1); + u->core = m->core; + u->module = m; + u->rtpoll = pa_rtpoll_new(); + pa_thread_mq_init(&u->thread_mq, m->core->mainloop, u->rtpoll); + + pa_sink_new_data_init(&data); + data.driver = __FILE__; + data.module = m; + pa_sink_new_data_set_name(&data, pa_modargs_get_value(ma, "sink_name", DEFAULT_SINK_NAME)); + pa_sink_new_data_set_sample_spec(&data, &ss); + pa_sink_new_data_set_channel_map(&data, &map); + pa_proplist_sets(data.proplist, PA_PROP_DEVICE_DESCRIPTION, "xrdp sink"); + pa_proplist_sets(data.proplist, PA_PROP_DEVICE_CLASS, "abstract"); + + if (pa_modargs_get_proplist(ma, "sink_properties", data.proplist, PA_UPDATE_REPLACE) < 0) { + pa_log("Invalid properties"); + pa_sink_new_data_done(&data); + goto fail; + } + + u->sink = pa_sink_new(m->core, &data, PA_SINK_LATENCY|PA_SINK_DYNAMIC_LATENCY); + pa_sink_new_data_done(&data); + + if (!u->sink) { + pa_log("Failed to create sink object."); + goto fail; + } + + u->sink->parent.process_msg = sink_process_msg; + u->sink->update_requested_latency = sink_update_requested_latency_cb; + u->sink->userdata = u; + + pa_sink_set_asyncmsgq(u->sink, u->thread_mq.inq); + pa_sink_set_rtpoll(u->sink, u->rtpoll); + + u->block_usec = BLOCK_USEC; + nbytes = pa_usec_to_bytes(u->block_usec, &u->sink->sample_spec); + pa_sink_set_max_rewind(u->sink, nbytes); + pa_sink_set_max_request(u->sink, nbytes); + + pa_memchunk_reset(&u->memchunk); + + if (!(u->thread = pa_thread_new("xrdp-sink", thread_func, u))) { + pa_log("Failed to create thread."); + goto fail; + } + + pa_sink_put(u->sink); + + pa_modargs_free(ma); + + return 0; + +fail: + if (ma) + pa_modargs_free(ma); + + pa__done(m); + + return -1; +} + +int pa__get_n_used(pa_module *m) { + struct userdata *u; + + pa_assert(m); + pa_assert_se(u = m->userdata); + + return pa_sink_linked_by(u->sink); +} + +void pa__done(pa_module*m) { + struct userdata *u; + + pa_assert(m); + + if (!(u = m->userdata)) + return; + + if (u->sink) + pa_sink_unlink(u->sink); + + if (u->memchunk.memblock) + pa_memblock_unref(u->memchunk.memblock); + + if (u->thread) { + pa_asyncmsgq_send(u->thread_mq.inq, NULL, PA_MESSAGE_SHUTDOWN, NULL, 0, NULL); + pa_thread_free(u->thread); + } + + pa_thread_mq_done(&u->thread_mq); + + if (u->sink) + pa_sink_unref(u->sink); + + if (u->rtpoll) + pa_rtpoll_free(u->rtpoll); + + pa_xfree(u); +} diff --git a/sesman/chansrv/pulse/pulse-notes.txt b/sesman/chansrv/pulse/pulse-notes.txt new file mode 100644 index 00000000..4e6512c2 --- /dev/null +++ b/sesman/chansrv/pulse/pulse-notes.txt @@ -0,0 +1,26 @@ + +Pulse audio notes. + +to see what version of PA is on your machine +pulseaudio --version + + + +To build xrdp pulse sink, +get the pulse source that most closely matches your version on +your machine. Get the source from +http://freedesktop.org/software/pulseaudio/releases/ +run ./configure after extracting. I don't think you need to build it. +edit Makefile to point to your pulse source directory. + + + +PA always respawning + + To stop its respawning habit, open /etc/pulse/client.conf, change + autospawn = yes to autospawn = no, and set daemon-binary to /bin/true. + Make sure these lines are uncommented, like this: + +autospawn = no +daemon-binary = /bin/true + diff --git a/sesman/chansrv/sound.c b/sesman/chansrv/sound.c index e8b801c6..6bfa45e1 100644 --- a/sesman/chansrv/sound.c +++ b/sesman/chansrv/sound.c @@ -167,7 +167,7 @@ sound_send_wave_data(char *data, int data_bytes) print_got_here(); - if ((data_bytes < 4) || (data_bytes > 32 * 1024)) + if ((data_bytes < 4) || (data_bytes > 128 * 1024)) { LOG(0, ("sound_send_wave_data: bad data_bytes %d", data_bytes)); } @@ -249,7 +249,7 @@ process_pcm_message(int id, int size, struct stream *s) { print_got_here(); - sound_send_wave_data(s->p, size); + //sound_send_wave_data(s->p, size); return 0; } @@ -277,11 +277,12 @@ sound_trans_audio_data_in(struct trans *trans) in_uint32_le(s, id); in_uint32_le(s, size); - if ((id != 0) || (size > 32 * 1024 + 8) || (size < 1)) + if ((id != 0) || (size > 128 * 1024 + 8) || (size < 8)) { LOG(0, ("sound_trans_audio_data_in: bad message id %d size %d", id, size)); return 1; } + LOG(0, ("sound_trans_audio_data_in: good message id %d size %d", id, size)); error = trans_force_read(trans, size - 8); @@ -298,6 +299,7 @@ sound_trans_audio_data_in(struct trans *trans) static int DEFAULT_CC sound_trans_audio_conn_in(struct trans *trans, struct trans *new_trans) { + LOG(0, ("sound_trans_audio_conn_in:")); print_got_here(); if (trans == 0) @@ -339,8 +341,8 @@ sound_init(void) LOG(0, ("sound_init:")); sound_send_server_formats(); - g_audio_l_trans = trans_create(2, 33 * 1024, 8192); - g_snprintf(port, 255, "/tmp/xrdp_chansrv_audio_socket_%d", g_display_num); + g_audio_l_trans = trans_create(2, 128 * 1024, 8192); + g_snprintf(port, 255, "/tmp/.xrdp/xrdp_chansrv_audio_socket_%d", g_display_num); g_audio_l_trans->trans_conn_in = sound_trans_audio_conn_in; error = trans_listen(g_audio_l_trans, port); @@ -374,7 +376,7 @@ sound_deinit(void) if (g_audio_c_trans != 0) { trans_delete(g_audio_c_trans); - g_audio_l_trans = 0; + g_audio_c_trans = 0; } return 0;