summaryrefslogtreecommitdiffstats
path: root/src/modules/rtp/rtp.c
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2006-04-15 15:26:42 +0000
committerLennart Poettering <lennart@poettering.net>2006-04-15 15:26:42 +0000
commit1fec416db7db4ba8d2d2dd250187939f0b06dbd7 (patch)
tree24d579381ac8c0096faeb93002d3976e2cea7e11 /src/modules/rtp/rtp.c
parent71227de8b233fd12568609a2ac393e432a7c4299 (diff)
* change default multicast address
* fix timestamp calculation git-svn-id: file:///home/lennart/svn/public/pulseaudio/trunk@715 fefdeb5f-60dc-0310-8127-8f9354f1896f
Diffstat (limited to 'src/modules/rtp/rtp.c')
-rw-r--r--src/modules/rtp/rtp.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/src/modules/rtp/rtp.c b/src/modules/rtp/rtp.c
index a3e78d84..a3bce38b 100644
--- a/src/modules/rtp/rtp.c
+++ b/src/modules/rtp/rtp.c
@@ -35,7 +35,7 @@
#include "rtp.h"
-pa_rtp_context* pa_rtp_context_init_send(pa_rtp_context *c, int fd, uint32_t ssrc, uint8_t payload) {
+pa_rtp_context* pa_rtp_context_init_send(pa_rtp_context *c, int fd, uint32_t ssrc, uint8_t payload, size_t frame_size) {
assert(c);
assert(fd >= 0);
@@ -44,7 +44,8 @@ pa_rtp_context* pa_rtp_context_init_send(pa_rtp_context *c, int fd, uint32_t ssr
c->timestamp = 0;
c->ssrc = ssrc ? ssrc : (uint32_t) (rand()*rand());
c->payload = payload & 127;
-
+ c->frame_size = frame_size;
+
return c;
}
@@ -114,7 +115,7 @@ int pa_rtp_send(pa_rtp_context *c, size_t size, pa_memblockq *q) {
} else
k = 0;
- c->timestamp += skip;
+ c->timestamp += skip/c->frame_size;
if (k < 0) {
if (errno != EAGAIN) /* If the queue is full, just ignore it */