Changeset acf4606c17f89631b8a3568d0824a4dcab6ebbb6

Timestamp:

10/03/05 18:23:43 (4 years ago)

Author:

Christophe Massiot <massiot@videolan.org>

git-committer:

Christophe Massiot <massiot@videolan.org> 1110475423 +0000

git-parent:

[9cb4d58cce49e1a1687bd51dfb9a12cb4a5b6a1f]

git-author:

Christophe Massiot <massiot@videolan.org> 1110475423 +0000

Message:

* modules/stream_out/switcher.c: New module allowing to replace an MPEG2

video by a fixed panel (format .uyvy). Specify panel files with
--sout-switcher-files=toto.uyvy,tata.uyvy,titi.uyvy and the size of
pictures with --sout-switcher-sizes=720x576,720x576,480x576.
--sout-switcher-port=4242 opens up a UDP port. echo 1 | nc -u localhost 4242
switches to panel #1 (0 is the live video, -1 disables all output).
The audio is blanked out when a panel is active. --sout-switcher-command
specifies the first command to run on start-up.

* modules/access/fake.c: Fake video input simulating a video at x fps.

Use it to switch between fixed panels with the switcher when you have
no video.

Files:

• configure.ac (modified) (5 diffs)
• modules/access/Modules.am (modified) (1 diff)
• modules/access/fake.c (added)
• modules/stream_out/Modules.am (modified) (1 diff)
• modules/stream_out/switcher.c (added)

configure.ac

@@ -985 +985 @@
-VLC_ADD_PLUGINS([i420_rgb rawvideo blend scale image logo])
-VLC_ADD_PLUGINS([wav araw subtitle vobsub adpcm a52sys dtssys au voc xa])
-
+ access_fake
-VLC_ADD_PLUGINS([access_http access_mms access_ftp ipv4])
-VLC_ADD_PLUGINS([packetizer_mpegvideo packetizer_h264])
@@ -1996 +1996 @@
-    AC_CHECK_HEADERS(ffmpeg/avcodec.h)
-    AC_CHECK_HEADERS(postproc/postprocess.h)
-
-
+ stream_out_switcher
+ stream_out_switcher
-    VLC_ADD_LDFLAGS([ffmpeg],[`${FFMPEG_CONFIG} --plugin-libs avcodec avformat postproc`])
-  else
@@ -2032 +2032 @@
-      AC_CHECK_HEADERS(postproc/postprocess.h, [], [AC_MSG_ERROR([Missing header file postproc/postprocess.h.])] )
-      AC_CHECK_LIB(avcodec, avcodec_init, [
-
+ stream_out_switcher
-        VLC_ADD_LDFLAGS([ffmpeg],[-lavcodec])],
-         [ AC_MSG_ERROR([Could not find ffmpeg on your system: you may get it from http://ffmpeg.sf.net/ (cvs version is recommended). Alternatively you can use --disable-ffmpeg to disable the ffmpeg plugins.]) ])
@@ -2097 +2097 @@
-      fi
-
-
+ stream_out_switcher
-      VLC_ADD_LDFLAGS([ffmpeg],[-L${real_ffmpeg_tree}/libavcodec ${real_ffmpeg_tree}/libavcodec/libavcodec.a])
-
+ stream_out_switcher
-
-      if test -f "${real_ffmpeg_tree}/libavformat/libavformat.a"; then
-        AC_DEFINE(HAVE_LIBAVFORMAT, 1, [Define if you have ffmpeg's libavformat.])
-        VLC_ADD_LDFLAGS([ffmpeg],[-L${real_ffmpeg_tree}/libavformat ${real_ffmpeg_tree}/libavformat/libavformat.a])
-
+ stream_out_switcher
-      fi
-    fi
@@ -2147 +2147 @@
-      VLC_ADD_CPPFLAGS([ffmpegaltivec],[-I${real_ffmpeg_tree}/libavformat])
-    fi
+    VLC_ADD_LDFLAGS([stream_out_switcher],[-L${real_ffmpeg_tree}/libavcodec])
+    VLC_ADD_CPPFLAGS([stream_out_switcher],[-I${real_ffmpeg_tree}/libavcodec -I${real_ffmpeg_tree}/libavformat])
-  fi
-fi

modules/access/Modules.am

@@ -9 +9 @@
-SOURCES_dvdread = dvdread.c
-SOURCES_slp = slp.c
+SOURCES_access_fake = fake.c
-SOURCES_cdda = \
-        cdda.c \

modules/stream_out/Modules.am

@@ -10 +10 @@
-SOURCES_stream_out_gather = gather.c
-SOURCES_stream_out_rtp = rtp.c
+SOURCES_stream_out_switcher = switcher.c