Skip to content

Commit a16530e

Browse files
wm4Uoti Urpala
wm4
authored and
Uoti Urpala
committed
stream_netstream: Remove netstream support
This allowed to move the input stream layer across the network, allowing the user to play anything that mplayer could play remotely. For example, playing a DVD related on a remote server (say, with the host name "remotehost1") could be done by starting the netstream server (from TOOLS/netstream.c) on that remote server, and then running: mplayer mpst://remotehost1/dvd:// This would open the DVD on the remote host, and transfer the raw DVD sector reads over network. It works the same for other protocols, and all accesses to the stream layer are marshaled over network. It's comparable to the way the cache layer (--cache) works. It has questionable use and most likely was barely used at all. There's lots of potential for breakage, because it doesn't translate the stream CTRLs to network packets. Just get rid of it.
1 parent d2e5a69 commit a16530e

File tree

8 files changed

+3
-886
lines changed

8 files changed

+3
-886
lines changed

Makefile

+3-5
Original file line numberDiff line numberDiff line change
@@ -109,8 +109,7 @@ SRCS_COMMON-$(NEED_SHMEM) += osdep/shmem.c
109109
SRCS_COMMON-$(NEED_STRSEP) += osdep/strsep.c
110110
SRCS_COMMON-$(NEED_SWAB) += osdep/swab.c
111111
SRCS_COMMON-$(NEED_VSSCANF) += osdep/vsscanf.c
112-
SRCS_COMMON-$(NETWORKING) += stream/stream_netstream.c \
113-
stream/asf_mmst_streaming.c \
112+
SRCS_COMMON-$(NETWORKING) += stream/asf_mmst_streaming.c \
114113
stream/asf_streaming.c \
115114
stream/cookies.c \
116115
stream/http.c \
@@ -718,7 +717,7 @@ tests: $(addsuffix $(EXESUF),$(TESTS))
718717
testsclean:
719718
-$(RM) $(call ADD_ALL_EXESUFS,$(TESTS))
720719

721-
TOOLS = $(addprefix TOOLS/,alaw-gen asfinfo avi-fix avisubdump compare dump_mp4 movinfo netstream subrip vivodump)
720+
TOOLS = $(addprefix TOOLS/,alaw-gen asfinfo avi-fix avisubdump compare dump_mp4 movinfo subrip vivodump)
722721

723722
ifdef ARCH_X86
724723
TOOLS += TOOLS/fastmemcpybench TOOLS/modify_reg
@@ -743,9 +742,8 @@ TOOLS/vfw2menc$(EXESUF): -lwinmm -lole32
743742
mplayer-nomain.o: mplayer.c
744743
$(CC) $(CFLAGS) -DDISABLE_MAIN -c -o $@ $<
745744

746-
TOOLS/netstream$(EXESUF): TOOLS/netstream.c
747745
TOOLS/vivodump$(EXESUF): TOOLS/vivodump.c
748-
TOOLS/netstream$(EXESUF) TOOLS/vivodump$(EXESUF): $(subst mplayer.o,mplayer-nomain.o,$(OBJS_MPLAYER)) $(OBJS_COMMON) $(COMMON_LIBS)
746+
TOOLS/vivodump$(EXESUF): $(subst mplayer.o,mplayer-nomain.o,$(OBJS_MPLAYER)) $(OBJS_COMMON) $(COMMON_LIBS)
749747
$(CC) $(CFLAGS) -o $@ $^ $(EXTRALIBS_MPLAYER) $(EXTRALIBS)
750748

751749
REAL_SRCS = $(wildcard TOOLS/realcodecs/*.c)

TOOLS/README

-35
Original file line numberDiff line numberDiff line change
@@ -440,38 +440,3 @@ Usage: - Set the path to the RealPlayer codecs directory in the C files.
440440
- Put the wrappers in the RealPlayer codecs directory.
441441

442442
Notes: Known to work at least on Linux x86 with RealPlayer8.
443-
444-
445-
446-
netstream - access remote streams
447-
---------------------------------
448-
449-
netstream allows you to access most MPlayer stream types from a remote host.
450-
The main purpose of this feature is to make it possible to directly use the
451-
CD or DVD drive of another computer on the network (provided you have the
452-
required bandwidth). On the downside some stream types (currently TV and MF)
453-
are not usable remotely because they are implemented at the demuxer level.
454-
455-
Be aware that currently the server is not secure at all.
456-
457-
Compile the server by running 'make TOOLS/netstream' ('make TOOLS/netstream.exe'
458-
on windows) from the root of mplayer source and then copy the netstream binary
459-
to the right place on your system (usually /usr/local/bin on Unix). Start the
460-
netstream server on the computer you intend to access remotely. There are no
461-
command line arguments.
462-
463-
Play the second track of a VCD on the server with:
464-
465-
mplayer -cache 5000 mpst://servername/vcd://2
466-
467-
Access files on this server with:
468-
469-
mplayer -cache 5000 mpst://servername//usr/local/movies/lol.avi
470-
471-
Note that paths which do not start with a / will be interpreted as relative to
472-
the directory where the server is running. The '-cache' option is not needed
473-
but highly recommended.
474-
475-
netstream will not take -dvd-device, so you must either symlink
476-
your drive to /dev/dvd/ or use the dvd:///path/to/dvd.
477-
for example: mpst://audioserver/dvd:////dev/optical/lg_black_dvd

0 commit comments

Comments
 (0)