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

* deal properly with underruns, overflows and packet losses

Browse source 
* change default mcast address
* detect RTP loops


git-svn-id: file:///home/lennart/svn/public/pulseaudio/trunk@722 fefdeb5f-60dc-0310-8127-8f9354f1896f
This commit is contained in:
Lennart Poettering 2006-04-16 09:15:51 +00:00
parent 67b105bd7a
commit c999fe40b8
1 changed files with 22 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

27
src/modules/rtp/module-rtp-recv.c
View file

@ -41,6 +41,7 @@
#include <polypcore/xmalloc.h> #include <polypcore/xmalloc.h>
#include <polypcore/modargs.h> #include <polypcore/modargs.h>
#include <polypcore/namereg.h> #include <polypcore/namereg.h>
#include <polypcore/sample-util.h>
#include "module-rtp-recv-symdef.h" #include "module-rtp-recv-symdef.h"
@ -57,7 +58,7 @@ PA_MODULE_USAGE(
) )
#define SAP_PORT 9875 #define SAP_PORT 9875
#define DEFAULT_SAP_ADDRESS "224.0.1.2" #define DEFAULT_SAP_ADDRESS "224.0.1.3"
#define MEMBLOCKQ_MAXLENGTH (1024*170) #define MEMBLOCKQ_MAXLENGTH (1024*170)
#define MAX_SESSIONS 16 #define MAX_SESSIONS 16
#define DEATH_TIMEOUT 20000000 #define DEATH_TIMEOUT 20000000
@ -157,6 +158,9 @@ static void rtp_event_cb(pa_mainloop_api *m, pa_io_event *e, int fd, pa_io_event
s->ssrc = s->rtp_context.ssrc; s->ssrc = s->rtp_context.ssrc;
s->offset = s->rtp_context.timestamp; s->offset = s->rtp_context.timestamp;
if (s->ssrc == s->userdata->core->cookie)
pa_log_warn(__FILE__": WARNING! Detected RTP packet loop!");
} else { } else {
if (s->ssrc != s->rtp_context.ssrc) { if (s->ssrc != s->rtp_context.ssrc) {
pa_memblock_unref(chunk.memblock); pa_memblock_unref(chunk.memblock);
@ -174,7 +178,12 @@ static void rtp_event_cb(pa_mainloop_api *m, pa_io_event *e, int fd, pa_io_event
delta = j; delta = j;
pa_memblockq_seek(s->memblockq, delta * s->rtp_context.frame_size, PA_SEEK_RELATIVE); pa_memblockq_seek(s->memblockq, delta * s->rtp_context.frame_size, PA_SEEK_RELATIVE);
pa_memblockq_push(s->memblockq, &chunk);
if (pa_memblockq_push(s->memblockq, &chunk) < 0) {
/* queue overflow, let's flush it and try again */
pa_memblockq_flush(s->memblockq);
pa_memblockq_push(s->memblockq, &chunk);
}
/* The next timestamp we expect */ /* The next timestamp we expect */
s->offset = s->rtp_context.timestamp + (chunk.length / s->rtp_context.frame_size); s->offset = s->rtp_context.timestamp + (chunk.length / s->rtp_context.frame_size);
@ -250,6 +259,7 @@ static struct session *session_new(struct userdata *u, const pa_sdp_info *sdp_in
char *c; char *c;
pa_sink *sink; pa_sink *sink;
int fd = -1; int fd = -1;
pa_memblock *silence;
if (!(sink = pa_namereg_get(u->core, u->sink_name, PA_NAMEREG_SINK, 1))) { if (!(sink = pa_namereg_get(u->core, u->sink_name, PA_NAMEREG_SINK, 1))) {
pa_log(__FILE__": sink does not exist."); pa_log(__FILE__": sink does not exist.");
@ -284,19 +294,26 @@ static struct session *session_new(struct userdata *u, const pa_sdp_info *sdp_in
s->sink_input->drop = sink_input_drop; s->sink_input->drop = sink_input_drop;
s->sink_input->kill = sink_input_kill; s->sink_input->kill = sink_input_kill;
s->sink_input->get_latency = sink_input_get_latency; s->sink_input->get_latency = sink_input_get_latency;
silence = pa_silence_memblock_new(&s->sink_input->sample_spec,
(pa_bytes_per_second(&s->sink_input->sample_spec)/128/pa_frame_size(&s->sink_input->sample_spec))*
pa_frame_size(&s->sink_input->sample_spec),
s->userdata->core->memblock_stat);
s->memblockq = pa_memblockq_new( s->memblockq = pa_memblockq_new(
0, 0,
MEMBLOCKQ_MAXLENGTH, MEMBLOCKQ_MAXLENGTH,
MEMBLOCKQ_MAXLENGTH, MEMBLOCKQ_MAXLENGTH,
pa_frame_size(&s->sink_input->sample_spec), pa_frame_size(&s->sink_input->sample_spec),
1, pa_bytes_per_second(&s->sink_input->sample_spec)/10+1,
0, 0,
NULL, silence,
u->core->memblock_stat); u->core->memblock_stat);
s->rtp_event = u->core->mainloop->io_new(u->core->mainloop, fd, PA_IO_EVENT_INPUT, rtp_event_cb, s); pa_memblock_unref(silence);
s->rtp_event = u->core->mainloop->io_new(u->core->mainloop, fd, PA_IO_EVENT_INPUT, rtp_event_cb, s);
pa_gettimeofday(&tv); pa_gettimeofday(&tv);
pa_timeval_add(&tv, DEATH_TIMEOUT); pa_timeval_add(&tv, DEATH_TIMEOUT);
s->death_event = u->core->mainloop->time_new(u->core->mainloop, &tv, death_event_cb, s); s->death_event = u->core->mainloop->time_new(u->core->mainloop, &tv, death_event_cb, s);