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

raop: Better playback resume handling

Browse source 
When playback stops, a FLUSH command is send to the server and the sink
goes to IDLE. If playback resumes quickly, sink goes back to RUNNING
(without being SUSPENDED) and the sink should just start streaming again.
This patch implements this behaviour.
This commit is contained in:
Martin Blanchard 2016-11-06 12:54:02 -06:00 • committed by Tanu Kaskinen
parent 604bf450dc
commit 31e2bc2fcf
3 changed files with 30 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/modules/raop/module-raop-sink.c
View file

@ -332,10 +332,14 @@ static int udp_sink_process_msg(pa_msgobject *o, int code, void *data, int64_t o
pa_smoother_resume(u->smoother, pa_rtclock_now(), true);
if (!pa_raop_client_udp_can_stream(u->raop)) {
/* Connecting will trigger a RECORD */
if (!pa_raop_client_udp_is_alive(u->raop)) {
/* Connecting will trigger a RECORD and start steaming */
pa_raop_client_connect(u->raop);
} else if (!pa_raop_client_udp_can_stream(u->raop)) {
/* RECORD alredy sent, simply start streaming */
pa_raop_client_udp_stream(u->raop);
}
udp_start_wakeup_clock(u);
break;

26
src/modules/raop/raop_client.c
View file

@ -952,8 +952,6 @@ static void udp_rtsp_cb(pa_rtsp_client *rtsp, pa_rtsp_state state, pa_headerlist
pa_log_debug("RAOP: RECORD");
c->is_recording = true;
alt = pa_xstrdup(pa_headerlist_gets(headers, "Audio-Latency"));
/* Generate a random synchronization source identifier from this session. */
pa_random(&rand, sizeof(rand));
@ -965,6 +963,8 @@ static void udp_rtsp_cb(pa_rtsp_client *rtsp, pa_rtsp_state state, pa_headerlist
c->udp_first_packet = true;
c->udp_sync_count = 0;
c->is_recording = true;
c->udp_record_callback(c->udp_setup_userdata);
pa_xfree(alt);
@ -1168,11 +1168,12 @@ int pa_raop_client_connect(pa_raop_client *c) {
int pa_raop_client_flush(pa_raop_client *c) {
int rv = 0;
pa_assert(c);
if (c->rtsp != NULL) {
rv = pa_rtsp_flush(c->rtsp, c->seq, c->rtptime);
c->udp_sync_count = -1;
c->udp_sync_count = 0;
}
return rv;
@ -1211,6 +1212,25 @@ int pa_raop_client_udp_can_stream(pa_raop_client *c) {
return rv;
}
int pa_raop_client_udp_stream(pa_raop_client *c) {
int rv = 0;
pa_assert(c);
if (c->rtsp != NULL && c->udp_stream_fd > 0) {
if (!c->is_recording) {
c->udp_first_packet = true;
c->udp_sync_count = 0;
c->is_recording = true;
}
rv = 1;
}
return rv;
}
int pa_raop_client_udp_handle_timing_packet(pa_raop_client *c, const uint8_t packet[], ssize_t size) {
const uint32_t * data = NULL;
uint8_t payload = 0;

1
src/modules/raop/raop_client.h
View file

@ -43,6 +43,7 @@ int pa_raop_client_teardown(pa_raop_client *c);
int pa_raop_client_udp_is_alive(pa_raop_client *c);
int pa_raop_client_udp_can_stream(pa_raop_client *c);
int pa_raop_client_udp_stream(pa_raop_client *c);
void pa_raop_client_set_encryption(pa_raop_client *c, int encryption);
pa_volume_t pa_raop_client_adjust_volume(pa_raop_client *c, pa_volume_t volume);