Mercurial > mplayer.hg
view stream/stream_udp.c @ 26146:20a126aaa756
ve_vfw.c: #include aviheader.h instead of wine avifmt.h
Compilation was broken after libmpdemux/muxer.h started including
libmpdemux/aviheader.h. ve_vfw.c included both muxer.h and
loader/wine/avifmt.h, and the latter has definitions that conflict with
aviheader.h ones. Fix by removing the avifmt.h include.
I did not carefully check that changing the includes doesn't break
any ve_vfw.c code. However it at least fixes compilation, and if the
avifmt.h versions differ in some significant way then the code is
fundamentally broken anyway: ve_vfw cannot use different versions of
the avi struct definitions when it also uses shared muxer.h types
(those must use the standard definitions to keep the type compatible
with what's used in other files).
author | uau |
---|---|
date | Thu, 06 Mar 2008 01:57:26 +0000 |
parents | c1d17bd6683c |
children | a26e50cae389 |
line wrap: on
line source
/* * Copyright (C) 2006 Benjamin Zores * Stream layer for MPEG over UDP, based on previous work from Dave Chapman * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ #include "config.h" #include <stdlib.h> #include <string.h> #include "stream.h" #include "url.h" #include "udp.h" static int udp_streaming_start (stream_t *stream) { streaming_ctrl_t *streaming_ctrl; int fd; if (!stream) return -1; streaming_ctrl = stream->streaming_ctrl; fd = stream->fd; if (fd < 0) { fd = udp_open_socket (streaming_ctrl->url); if (fd < 0) return -1; stream->fd = fd; } streaming_ctrl->streaming_read = nop_streaming_read; streaming_ctrl->streaming_seek = nop_streaming_seek; streaming_ctrl->prebuffer_size = 64 * 1024; /* 64 KBytes */ streaming_ctrl->buffering = 0; streaming_ctrl->status = streaming_playing_e; return 0; } static int udp_stream_open (stream_t *stream, int mode, void *opts, int *file_format) { URL_t *url; extern int network_bandwidth; mp_msg (MSGT_OPEN, MSGL_INFO, "STREAM_UDP, URL: %s\n", stream->url); stream->streaming_ctrl = streaming_ctrl_new (); if (!stream->streaming_ctrl) return STREAM_ERROR; stream->streaming_ctrl->bandwidth = network_bandwidth; url = url_new (stream->url); stream->streaming_ctrl->url = check4proxies (url); if (url->port == 0) { mp_msg (MSGT_NETWORK, MSGL_ERR, "You must enter a port number for UDP streams!\n"); streaming_ctrl_free (stream->streaming_ctrl); stream->streaming_ctrl = NULL; return STREAM_UNSUPPORTED; } if (udp_streaming_start (stream) < 0) { mp_msg (MSGT_NETWORK, MSGL_ERR, "udp_streaming_start failed\n"); streaming_ctrl_free (stream->streaming_ctrl); stream->streaming_ctrl = NULL; return STREAM_UNSUPPORTED; } stream->type = STREAMTYPE_STREAM; fixup_network_stream_cache (stream); return STREAM_OK; } const stream_info_t stream_info_udp = { "MPEG over UDP streaming", "udp", "Dave Chapman, Benjamin Zores", "native udp support", udp_stream_open, { "udp", NULL}, NULL, 0 // Urls are an option string };