mirrors/pulseaudio
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git synced 2025-11-05 13:29:57 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

tunnel-new: add un/corking to the state change callback

Browse source 
The stream is now corked when the sink or source becomes suspended and
uncorked when it's back idle/ready.

Signed-off-by: Alexander Couzens <lynxis@fe80.eu>
This commit is contained in:
Alexander Couzens 2013-11-25 19:42:51 +01:00 • committed by Tanu Kaskinen
parent 4ac62d4690
commit 5170df86b3
2 changed files with 68 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

37
src/modules/module-tunnel-sink-new.c
View file

@ -102,6 +102,16 @@ static const char* const valid_modargs[] = {
NULL, NULL,
}; };
static void cork_stream(struct userdata *u, bool cork) {
pa_operation *operation;
pa_assert(u);
pa_assert(u->stream);
if ((operation = pa_stream_cork(u->stream, cork, NULL, NULL)))
pa_operation_unref(operation);
}
static void reset_bufferattr(pa_buffer_attr *bufferattr) { static void reset_bufferattr(pa_buffer_attr *bufferattr) {
pa_assert(bufferattr); pa_assert(bufferattr);
bufferattr->fragsize = (uint32_t) -1; bufferattr->fragsize = (uint32_t) -1;
@ -174,9 +184,7 @@ static void thread_func(void *userdata) {
/* TODO: Cork the stream when the sink is suspended. */ /* TODO: Cork the stream when the sink is suspended. */
if (pa_stream_is_corked(u->stream)) { if (pa_stream_is_corked(u->stream)) {
pa_operation *operation; cork_stream(u, false);
if ((operation = pa_stream_cork(u->stream, 0, NULL, NULL)))
pa_operation_unref(operation);
} else { } else {
size_t writable; size_t writable;
@ -244,6 +252,9 @@ static void stream_state_cb(pa_stream *stream, void *userdata) {
pa_log_debug("Stream terminated."); pa_log_debug("Stream terminated.");
break; break;
case PA_STREAM_READY: case PA_STREAM_READY:
if (PA_SINK_IS_OPENED(u->sink->thread_info.state))
cork_stream(u, false);
/* Only call our requested_latency_cb when requested_latency /* Only call our requested_latency_cb when requested_latency
* changed between PA_STREAM_CREATING -> PA_STREAM_READY, because * changed between PA_STREAM_CREATING -> PA_STREAM_READY, because
* we don't want to override the initial tlength set by the server * we don't want to override the initial tlength set by the server
@ -415,6 +426,26 @@ static int sink_process_msg_cb(pa_msgobject *o, int code, void *data, int64_t of
*((pa_usec_t*) data) = remote_latency; *((pa_usec_t*) data) = remote_latency;
return 0; return 0;
} }
case PA_SINK_MESSAGE_SET_STATE:
if (!u->stream || pa_stream_get_state(u->stream) != PA_STREAM_READY)
break;
switch ((pa_sink_state_t) PA_PTR_TO_UINT(data)) {
case PA_SINK_SUSPENDED: {
cork_stream(u, true);
break;
}
case PA_SINK_IDLE:
case PA_SINK_RUNNING: {
cork_stream(u, false);
break;
}
case PA_SINK_INVALID_STATE:
case PA_SINK_INIT:
case PA_SINK_UNLINKED:
break;
}
break;
} }
return pa_sink_process_msg(o, code, data, offset, chunk); return pa_sink_process_msg(o, code, data, offset, chunk);
} }

35
src/modules/module-tunnel-source-new.c
View file

@ -101,6 +101,16 @@ static const char* const valid_modargs[] = {
NULL, NULL,
}; };
static void cork_stream(struct userdata *u, bool cork) {
pa_operation *operation;
pa_assert(u);
pa_assert(u->stream);
if ((operation = pa_stream_cork(u->stream, cork, NULL, NULL)))
pa_operation_unref(operation);
}
static void reset_bufferattr(pa_buffer_attr *bufferattr) { static void reset_bufferattr(pa_buffer_attr *bufferattr) {
pa_assert(bufferattr); pa_assert(bufferattr);
bufferattr->fragsize = (uint32_t) -1; bufferattr->fragsize = (uint32_t) -1;
@ -262,6 +272,9 @@ static void stream_state_cb(pa_stream *stream, void *userdata) {
pa_log_debug("Stream terminated."); pa_log_debug("Stream terminated.");
break; break;
case PA_STREAM_READY: case PA_STREAM_READY:
if (PA_SOURCE_IS_OPENED(u->source->thread_info.state))
cork_stream(u, false);
/* Only call our requested_latency_cb when requested_latency /* Only call our requested_latency_cb when requested_latency
* changed between PA_STREAM_CREATING -> PA_STREAM_READY, because * changed between PA_STREAM_CREATING -> PA_STREAM_READY, because
* we don't want to override the initial fragsize set by the server * we don't want to override the initial fragsize set by the server
@ -325,7 +338,7 @@ static void context_state_cb(pa_context *c, void *userdata) {
if (pa_stream_connect_record(u->stream, if (pa_stream_connect_record(u->stream,
u->remote_source_name, u->remote_source_name,
&bufferattr, &bufferattr,
PA_STREAM_INTERPOLATE_TIMING|PA_STREAM_DONT_MOVE|PA_STREAM_AUTO_TIMING_UPDATE) < 0) { PA_STREAM_INTERPOLATE_TIMING|PA_STREAM_DONT_MOVE|PA_STREAM_AUTO_TIMING_UPDATE|PA_STREAM_START_CORKED) < 0) {
pa_log_debug("Could not create stream: %s", pa_strerror(pa_context_errno(u->context))); pa_log_debug("Could not create stream: %s", pa_strerror(pa_context_errno(u->context)));
u->thread_mainloop_api->quit(u->thread_mainloop_api, TUNNEL_THREAD_FAILED_MAINLOOP); u->thread_mainloop_api->quit(u->thread_mainloop_api, TUNNEL_THREAD_FAILED_MAINLOOP);
} }
@ -417,6 +430,26 @@ static int source_process_msg_cb(pa_msgobject *o, int code, void *data, int64_t
return 0; return 0;
} }
case PA_SOURCE_MESSAGE_SET_STATE:
if (!u->stream || pa_stream_get_state(u->stream) != PA_STREAM_READY)
break;
switch ((pa_source_state_t) PA_PTR_TO_UINT(data)) {
case PA_SOURCE_SUSPENDED: {
cork_stream(u, true);
break;
}
case PA_SOURCE_IDLE:
case PA_SOURCE_RUNNING: {
cork_stream(u, false);
break;
}
case PA_SOURCE_INVALID_STATE:
case PA_SOURCE_INIT:
case PA_SOURCE_UNLINKED:
break;
}
break;
} }
return pa_source_process_msg(o, code, data, offset, chunk); return pa_source_process_msg(o, code, data, offset, chunk);
} }