Codebase list farstream-0.2 / 81351b5
Misc win32 portability fixes Based on a patch by Conrad Poelman Olivier CrĂȘte 11 years ago
9 changed file(s) with 18 addition(s) and 16 deletion(s). Raw diff Collapse all Expand all
246246 AC_DEFINE(GLIB_VERSION_MAX_ALLOWED, GLIB_VERSION_2_32, [Prevent post 2.32 APIs])
247247
248248
249 PKG_CHECK_MODULES(GIO_UNIX, gio-unix-2.0 >= 2.32)
249 PKG_CHECK_MODULES(GIO_UNIX, gio-unix-2.0 >= 2.32, [HAVE_GIO_UNIX=true],[HAVE_GIO_UNIX=false])
250250 AC_SUBST(GIO_UNIX_CFLAGS)
251251 AC_SUBST(GIO_UNIX_LIBS)
252 AM_CONDITIONAL(HAVE_GIO_UNIX, test "x$HAVE_GIO_UNIX" = "xyes")
252253
253254 dnl checks for gstreamer
254255 dnl uninstalled is selected preferentially -- see pkg-config(1)
00
1 noinst_PROGRAMS = simple-call simple-call-shm
1 if HAVE_GIO_UNIX
2 SIMPLE_CALL_SHM = simple-call-shm
3 else
4 SIMPLE_CALL_SHM =
5 endif
6
7 noinst_PROGRAMS = simple-call $(SIMPLE_CALL_SHM)
28
39
410 AM_CFLAGS = \
4646
4747 libfarstream_@FS_APIVERSION@_la_CFLAGS = \
4848 $(FS_INTERNAL_CFLAGS) $(FS_CFLAGS) \
49 $(GLIB_FLAGS) \
49 $(GLIB_CFLAGS) \
5050 $(GST_PLUGINS_BASE_CFLAGS) \
5151 $(GST_BASE_CFLAGS) \
5252 $(GST_CFLAGS)
4747 #include "fs-raw-stream.h"
4848 #include "fs-raw-session.h"
4949
50 #include <arpa/inet.h>
51 #include <fcntl.h>
52 #include <netinet/in.h>
53 #include <sys/socket.h>
5450 #include <string.h>
5551 #include <unistd.h>
5652
913913 x_recv = GST_READ_UINT32_BE (buf);
914914 buf += 4;
915915 loss_event_rate = (gdouble) GST_READ_UINT32_BE (buf) / (gdouble) G_MAXUINT;
916 GST_LOG_OBJECT (self, "Got RTCP TFRC packet last_sent_ts: %u"
917 " delay: %u x_recv: %u loss_event_rate: %f", ts, delay, x_recv,
918 loss_event_rate);
916 GST_LOG_OBJECT (self, "Got RTCP TFRC packet last_sent_ts: %"
917 G_GUINT64_FORMAT " delay: %u x_recv: %u loss_event_rate: %f", ts,
918 delay, x_recv, loss_event_rate);
919919
920920 GST_OBJECT_LOCK (self);
921921
967967
968968 if (rtt > 10 * 1000 * 1000)
969969 {
970 GST_WARNING_OBJECT (self, "Impossible RTT %u ms, ignoring", rtt);
970 GST_WARNING_OBJECT (self, "Impossible RTT %" G_GUINT64_FORMAT
971 " ms, ignoring", rtt);
971972 goto done;
972973 }
973974
1111 $(CFLAGS)
1212
1313 LDADD = \
14 $(top_builddir)/gst/fsrtpconference/libfsrtpconference-convenience.la \
1415 $(top_builddir)/farstream/libfarstream-@FS_APIVERSION@.la \
15 $(top_builddir)/gst/fsrtpconference/libfsrtpconference-convenience.la \
1616 $(GST_CHECK_LIBS) \
1717 $(GST_PLUGINS_BASE_LIBS) \
1818 $(GST_LIBS) \
4141 #include <farstream/fs-conference.h>
4242 #include <farstream/fs-plugin.h>
4343
44 #include <agent.h>
45
4644 #include <string.h>
4745 #include <sys/types.h>
4846
2727 #include <farstream/fs-transmitter.h>
2828
2929 #include <gst/gst.h>
30 #include <agent.h>
30 #include <nice/agent.h>
3131
3232 G_BEGIN_DECLS
3333
561561 socket_dir = g_build_filename (g_get_tmp_dir (),
562562 "farstream-shm-XXXXXX", NULL);
563563
564 if (mkdtemp (socket_dir) == NULL)
564 if (g_mkdtemp (socket_dir) == NULL)
565565 return FALSE;
566566
567567 self->priv->socket_dir = socket_dir;