mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-10-02 08:42:32 +00:00
Code Issues 1 Projects Releases Wiki Activity

multiudpsink: Fix broken SO_SNDBUF get/set on Windows

Browse source 
SO_SNDBUF has been undefined on Windows because of missing WinSock2.h
include. And don't use native socket functions (e.g., setsockopt())
if code is expected to be built on Windows. We don't link ws2_32.lib
for this plugin.

Part-of: <https://gitlab.freedesktop.org/gstreamer/gst-plugins-good/-/merge_requests/1016>
This commit is contained in:
Seungha Yang 2021-06-26 20:00:03 +09:00 committed by GStreamer Marge Bot
parent 38e906de5d
commit e76218c1cb
1 changed files with 22 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

47
gst/udp/gstmultiudpsink.c
View file

@ -42,6 +42,8 @@
#include <sys/socket.h>
#endif
#include <gio/gnetworking.h>
#include "gst/net/net.h"
#include "gst/glib-compat-private.h"
@ -1341,10 +1343,9 @@ gst_multiudpsink_start (GstBaseSink * bsink)
}
#ifdef SO_SNDBUF
{
socklen_t len;
gint sndsize, ret;
gint sndsize;
GError *opt_err = NULL;
len = sizeof (sndsize);
if (sink->buffer_size != 0) {
sndsize = sink->buffer_size;
@ -1354,24 +1355,22 @@ gst_multiudpsink_start (GstBaseSink * bsink)
* Linux. */
if (sink->used_socket) {
ret =
setsockopt (g_socket_get_fd (sink->used_socket), SOL_SOCKET,
SO_SNDBUF, (void *) &sndsize, len);
if (ret != 0) {
if (!g_socket_set_option (sink->used_socket, SOL_SOCKET, SO_SNDBUF,
sndsize, &opt_err)) {
GST_ELEMENT_WARNING (sink, RESOURCE, SETTINGS, (NULL),
("Could not create a buffer of requested %d bytes, %d: %s",
sndsize, ret, g_strerror (errno)));
("Could not create a buffer of requested %d bytes (%s)",
sndsize, opt_err->message));
g_clear_error (&opt_err);
}
}
if (sink->used_socket_v6) {
ret =
setsockopt (g_socket_get_fd (sink->used_socket_v6), SOL_SOCKET,
SO_SNDBUF, (void *) &sndsize, len);
if (ret != 0) {
if (!g_socket_set_option (sink->used_socket_v6, SOL_SOCKET, SO_SNDBUF,
sndsize, &opt_err)) {
GST_ELEMENT_WARNING (sink, RESOURCE, SETTINGS, (NULL),
("Could not create a buffer of requested %d bytes, %d: %s",
sndsize, ret, g_strerror (errno)));
("Could not create a buffer of requested %d bytes (%s)",
sndsize, opt_err->message));
g_clear_error (&opt_err);
}
}
}
@ -1380,25 +1379,23 @@ gst_multiudpsink_start (GstBaseSink * bsink)
* value we set because the kernel allocates extra memory for metadata.
* The default on Linux is about 100K (which is about 50K without metadata) */
if (sink->used_socket) {
ret =
getsockopt (g_socket_get_fd (sink->used_socket), SOL_SOCKET,
SO_SNDBUF, (void *) &sndsize, &len);
if (ret == 0)
if (g_socket_get_option (sink->used_socket, SOL_SOCKET, SO_SNDBUF,
&sndsize, NULL)) {
GST_DEBUG_OBJECT (sink, "have UDP buffer of %d bytes", sndsize);
else
} else {
GST_DEBUG_OBJECT (sink, "could not get UDP buffer size");
}
}
if (sink->used_socket_v6) {
ret =
getsockopt (g_socket_get_fd (sink->used_socket_v6), SOL_SOCKET,
SO_SNDBUF, (void *) &sndsize, &len);
if (ret == 0)
if (g_socket_get_option (sink->used_socket_v6, SOL_SOCKET, SO_SNDBUF,
&sndsize, NULL)) {
GST_DEBUG_OBJECT (sink, "have UDPv6 buffer of %d bytes", sndsize);
else
} else {
GST_DEBUG_OBJECT (sink, "could not get UDPv6 buffer size");
}
}
}
#endif
#ifdef SO_BINDTODEVICE