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

merge 'lennart' branch back into trunk.

Browse source 
git-svn-id: file:///home/lennart/svn/public/pulseaudio/trunk@1971 fefdeb5f-60dc-0310-8127-8f9354f1896f
This commit is contained in:
Lennart Poettering 2007-10-28 19:13:50 +00:00
parent 6687dd0131
commit a67c21f093
294 changed files with 79057 additions and 11614 deletions
Download patch file Download diff file Expand all files Collapse all files

36
src/modules/rtp/sdp.c
View file

@ -25,7 +25,6 @@
#include <config.h>
#endif
#include <assert.h>
#include <time.h>
#include <stdlib.h>
#include <sys/types.h>
@ -35,36 +34,33 @@
#include <string.h>
#include <pulse/xmalloc.h>
#include <pulse/util.h>
#include <pulsecore/core-util.h>
#include <pulsecore/log.h>
#include <pulsecore/macro.h>
#include "sdp.h"
#include "rtp.h"
char *pa_sdp_build(int af, const void *src, const void *dst, const char *name, uint16_t port, uint8_t payload, const pa_sample_spec *ss) {
uint32_t ntp;
char buf_src[64], buf_dst[64];
char buf_src[64], buf_dst[64], un[64];
const char *u, *f, *a;
assert(src);
assert(dst);
assert(af == AF_INET || af == AF_INET6);
pa_assert(src);
pa_assert(dst);
pa_assert(af == AF_INET || af == AF_INET6);
f = pa_rtp_format_to_string(ss->format);
assert(f);
pa_assert_se(f = pa_rtp_format_to_string(ss->format));
if (!(u = getenv("USER")))
if (!(u = getenv("USERNAME")))
u = "-";
if (!(u = pa_get_user_name(un, sizeof(un))))
u = "-";
ntp = time(NULL) + 2208988800U;
a = inet_ntop(af, src, buf_src, sizeof(buf_src));
assert(a);
a = inet_ntop(af, dst, buf_dst, sizeof(buf_dst));
assert(a);
pa_assert_se(a = inet_ntop(af, src, buf_src, sizeof(buf_src)));
pa_assert_se(a = inet_ntop(af, dst, buf_dst, sizeof(buf_dst)));
return pa_sprintf_malloc(
PA_SDP_HEADER
@ -86,8 +82,8 @@ char *pa_sdp_build(int af, const void *src, const void *dst, const char *name, u
static pa_sample_spec *parse_sdp_sample_spec(pa_sample_spec *ss, char *c) {
unsigned rate, channels;
assert(ss);
assert(c);
pa_assert(ss);
pa_assert(c);
if (pa_startswith(c, "L16/")) {
ss->format = PA_SAMPLE_S16BE;
@ -123,8 +119,8 @@ pa_sdp_info *pa_sdp_parse(const char *t, pa_sdp_info *i, int is_goodbye) {
uint16_t port = 0;
int ss_valid = 0;
assert(t);
assert(i);
pa_assert(t);
pa_assert(i);
i->origin = i->session_name = NULL;
i->salen = 0;
@ -258,7 +254,7 @@ fail:
}
void pa_sdp_info_destroy(pa_sdp_info *i) {
assert(i);
pa_assert(i);
pa_xfree(i->origin);
pa_xfree(i->session_name);