Request 928 (accepted)

Overview

Request 928 (accepted)

I'd like to maintain this directly in Multimedia, so that it hits the Mirrors.

Created by jnweiger over 10 years ago
In state accepted
Package maintainer: jnweiger

Submit dvswitch-git

Submit package home:jnweiger / dvswitch-git to package Multimedia / dvswitch-git

dvswitch-git.changes Added

@@ -0,0 +1,254 @@
+-------------------------------------------------------------------
+Fri Nov 15 00:41:14 UTC 2013 - jw@suse.de
+
+- oops, should not have pulled upstream, wouters last commit was half done.
+  it does not compile for me. 
+  revert_wouter.diff added.
+
+-------------------------------------------------------------------
+Thu Nov 14 14:03:30 UTC 2013 - jw@suse.de
+
+- install target dvsource-alien added.
+- dvswitch-0.9-susedevel-8b96437 is Version: 20131114git_jw01
+
+-------------------------------------------------------------------
+Fri Aug  9 13:27:57 UTC 2013 - jw@suse.de
+
+- explicit linking with -lboost_system is needed for Factory.
+- commit 9716bbd is Version: 20130809git_jw07
+
+-------------------------------------------------------------------
+Thu Aug  8 18:09:56 UTC 2013 - jw@suse.de
+
+- added dvsource-alien
+  * New dependency: v4l2 and friends.
+- ported to ffmpeg-2.0
+- tossed all patches, rebasing on susedevel from
+    https://github.com/jnweiger/dvswitch.git 
+  * adapted gitfetch.sh to pull from the susedevel branch from there.
+- commit 1457797 is Version:        20130808git_jw07
+
+-------------------------------------------------------------------
+Wed Apr 17 13:10:45 UTC 2013 - jw@suse.de
+
+- added dvsource-firewire2switch from Martin Caj.
+
+-------------------------------------------------------------------
+Mon Apr  8 12:11:46 UTC 2013 - jw@suse.de
+
+- Require openssh, not ssh.
+
+-------------------------------------------------------------------
+Tue Feb 12 10:44:27 UTC 2013 - jw@suse.de
+
+- typo fixed in dv-upload.sh 
+
+-------------------------------------------------------------------
+Mon Feb 11 15:35:56 UTC 2013 - nwalter@suse.de
+
+- added dv-upload.sh
+
+-------------------------------------------------------------------
+Fri Oct 26 17:13:19 UTC 2012 - jw@suse.de
+
+- version 20120930git_jw06: added dvrecord
+- fixed config file support in dvsink-bambuser.pl
+- added -threads auto to dv2webm.sh
+
+-------------------------------------------------------------------
+Tue Oct 16 20:32:55 UTC 2012 - jw@suse.de
+
+- fixed dvsource-firewire-next.pl to skip missing units per default
+- improved dvsource-title.pl to support screenshot directories.
+
+-------------------------------------------------------------------
+Sun Oct 14 23:46:06 UTC 2012 - jw@suse.de
+
+- added dvsource-firewire-next.pl
+  A wrapper replacement for dvsource-firewire, which is based on guid's.
+  This allows opening two devices on the same card, while 
+  asserting that no device is opened twice.
+
+-------------------------------------------------------------------
+Sun Oct 14 22:38:52 UTC 2012 - jw@suse.de
+
+- minimum test suite for my perl scripts added.
+
+-------------------------------------------------------------------
+Sun Oct 14 20:11:40 UTC 2012 - jw@suse.de
+
+- version 20120930git_jw03
+- added mfade_area.diff new feature while doing manual fade: 
+  A combobox allows to chose how much of the screen space is affected. 
+  Default 'Full'. The values '1/4b' or '1/6b' are good for subtitles.
+
+-------------------------------------------------------------------
+Sat Oct 13 13:11:42 UTC 2012 - jw@suse.de
+
+- added dvsink-fullscreen.pl 
+  using mplayer to monitor the mixer output.
+  This is not in the dvswitch-client subpackage, because of its 
+  fat dependencies.
+
+-------------------------------------------------------------------
+Thu Oct 11 17:51:45 UTC 2012 - jw@suse.de
+
+- version 20120930git_jw02
+- added config file support to dvsink-*.pl
+- tested and improved video quality settings 
+  with dvsink-icecast.pl
+
+-------------------------------------------------------------------
+Thu Oct 11 00:25:54 UTC 2012 - jw@suse.de
+
+- fixed dvsink-bambuser.pl, added dvsink-icecast.pl
+  both untested drafts.
+
+-------------------------------------------------------------------
+Wed Oct 10 23:30:03 UTC 2012 - jw@suse.de
+
+- added title_hup.diff to prepare dvsource-file as a poor man's title 
+  generator.
+- added dvsource-title.pl -- a script that takes jpg's or png's 
+  as title slides and allows updates while streaming.
+
+-------------------------------------------------------------------
+Wed Oct  3 15:58:39 UTC 2012 - jw@suse.de
+
+- updated to dvswitch-0.9-1-da15ba4.tar.gz
+  which includes OSC remote control and other new features.
+- rediffed movable_selection.diff, listen_wildcard.diff
+- happy_gcc.diff added
+
+-------------------------------------------------------------------
+Mon Oct  1 18:25:34 UTC 2012 - jw@suse.de
+
+- added dvsink-bambuser.pl and dv2webm.sh scripts
+- added repeating_frame_dots.diff
+  to make it easier to see if we are still scrolling error messages.
+
+-------------------------------------------------------------------
+Fri Sep 21 18:12:28 UTC 2012 - jw@suse.de
+
+- added movable_selection.diff
+  to allow dragging the pip selection
+
+-------------------------------------------------------------------
+Fri Sep 21 09:55:30 UTC 2012 - jw@suse.de
+
+- added dvswitch-test package:
+  Install all packages under /opt/test/{bin,share,lib,man}/*
+  so that they do not conflict with an older installation.
+  This is meant for testing an update, before actually updating the system.
+
+-------------------------------------------------------------------
+Tue Sep 11 00:44:07 UTC 2012 - jw@suse.de
+
+- rebased to dvswitch-0.9-1-c150b38.tar.gz
+- rediffed some patches; removed upstreamed patches: 
+  deprecated_thread_init.diff
+  jack_pthread.diff
+
+-------------------------------------------------------------------
+Mon Jul 23 17:36:58 UTC 2012 - jw@suse.de
+
+- split off %{name}-client subpackage, so that
+  we don't get GTK dependencies for the twinpact machine.
+
+-------------------------------------------------------------------
+Thu Jul 12 20:21:24 UTC 2012 - jw@suse.de
+
+- added dvsmon tar ball from 
+  https://github.com/CarlFK/dvsmon/tarball/master
+
+-------------------------------------------------------------------
+Thu Jul  5 23:35:23 UTC 2012 - jw@suse.de
+
+- jack_pthread.diff added, as
+  dvsource-jack needs libpthread.
+
+- added deprecated_thread_init.diff
+  for compatibility with libavcodec54-0.11.1
+
+-------------------------------------------------------------------
+Wed Jun  6 02:35:45 UTC 2012 - jw@suse.de
+
+- rebased to dvswitch-0.9-245619a.tar.bz2
+  added gitfetch.sh
+
+-------------------------------------------------------------------
+Wed Jun  6 01:25:41 UTC 2012 - jw@suse.de
+
+- re-added thin_title_safe_area.diff
+
+-------------------------------------------------------------------
+Fri May 25 14:19:23 UTC 2012 - jw@suse.de
+
+- added listen_wildcard.diff
+
+-------------------------------------------------------------------
+Fri Apr 27 14:24:07 UTC 2012 - jw@suse.de
+
+- added stopped_status.diff
+- improved retry_connect_option.diff to actually reconnect 
+  dvsink-files and dvsource-files -- others: TODO
+
+-------------------------------------------------------------------
+Wed Mar 21 23:25:09 UTC 2012 - jw@suse.de
+
+- V1.2 
+- dvsource-webcam.pl defaults to highest existing /dev/videoN
+- dvtrim.pl added, wrapper using ffmpeg -ss hh:mm:ss[.xxx] -t ...
+
+-------------------------------------------------------------------
+Fri Mar  9 16:30:29 UTC 2012 - jw@suse.de
+
+- fixed dvsource-command.diff to NULL-terminate execlp()
+
+-------------------------------------------------------------------
+Thu Mar  8 00:42:55 UTC 2012 - jw@suse.de
+
+- added dvsource-webcam, a wrapper for dvsource-command
+- dropped find_matching_audio_source.pl
+
+-------------------------------------------------------------------
+Wed Mar  7 00:06:58 UTC 2012 - jw@suse.de
+
+- added --retry option, retry_connect_option.diff
+
+-------------------------------------------------------------------
+Mon Mar  5 23:51:29 UTC 2012 - jw@suse.de
+
+- added dvsource-command.diff, implementing a very flexible
+  dvsource, usable for e.g. webcams with e.g. ffmpeg converting to 
+  pal-dv.
+
+-------------------------------------------------------------------
+Sun Mar  4 22:27:10 UTC 2012 - jw@suse.de
+
+- added find_matching_audio_source.pl, a helper script to derive
+  the audio device name from a given video device name.
+
+-------------------------------------------------------------------
+Sun Mar  4 10:53:25 UTC 2012 - jw@suse.de
+
+- pulled dvswitch-8a44d5b.tar.gz from 
+  http://git.grep.be/gitweb?p=dvswitch.git;a=tree;f=src;hb=HEAD
+  snapshot link
+
+  2011-11-13 Ben HutchingsTry to enable slice-per-thread encoding in newer libavcodec  master
+  2011-10-20 Ben HutchingsAdd libraw1394-dev as build-dependency (for dvsource... 
+  2011-02-06 Ben HutchingsOverload swap() for ring_buffer
+  2011-02-06 Ben HutchingsAdd reset() member function to class template ring_buffer
+  2011-02-06 Ben HutchingsChange ring_buffer capacity from template parameter... 
+  2011-02-06 Ben HutchingsFix leak on exception in ring_buffer copy constructor
+  2011-02-06 Ben HutchingsDefine type for PCM audio sample packets, and a pool... 
+  2011-02-06 Ben HutchingsAdd header file for audio type definitions, and change... 
+  2010-11-29 Ben HutchingsRemove redundant #includes
+  2010-11-26 Ben HutchingsAdd example filter script for tally light implementation
+  2010-11-26 Ben HutchingsFix polling logic and handling of buffer size mismatches
+  2010-11-26 Ben HutchingsGeneralise realignment code to cope with packet loss... 
+  2010-11-26 Ben HutchingsFix liveMedia library ordering, as CMake doesn't always... 
+  2010-11-26 Ben HutchingsDon't break DEB_BUILD_OPTIONS on commas; it is required... 
+  2010-11-26 Ben HutchingsAdd separate statistics for packets not passed up
+  2010-11-26 Ben HutchingsRemove now-unused members of firewire_source

dvswitch-git.spec Added

@@ -0,0 +1,252 @@
+#
+# spec file for package dvswitch
+#
+# Copyright (c) 2012 Juergen Weigert jw@opensuse.org
+#
+# All modifications and additions to the file contributed by third parties
+# remain the property of their copyright owners, unless otherwise agreed
+# upon. The license for this file, and modifications and additions to the
+# file, is the same license as for the pristine package itself (unless the
+# license for the pristine package is not an Open Source License, in which
+# case the license is the MIT License). An "Open Source License" is a
+# license that conforms to the Open Source Definition (Version 1.9)
+# published by the Open Source Initiative.
+
+# Please submit bugfixes or comments via http://bugs.opensuse.org/
+#
+
+### output file from gitfetch.sh here:
+%define tarname dvswitch-0.9-susedevel-8b96437
+
+### this one is vanilla, it needs the patches:
+# % define tarname dvswitch-0.9-1-da15ba4.tar.gz 
+
+Name:           dvswitch-git
+Version:        20131114git_jw01
+Release:        0
+License:        GPL-2.0+
+Summary:        Video mixer for firewire devices
+### currently both gits appear to be in sync.
+#               GIT http://alioth.debian.org/scm/browser.php?group_id=31092
+#               GIT http://git.grep.be/gitweb?p=dvswitch.git
+Url:            http://alioth.debian.org/projects/dvswitch/
+Group:          Productivity/Graphics/Other
+Source0:        %{tarname}.tar.gz
+Source4:	gitfetch.sh
+Source5:	CarlFK-dvsmon-e00779c.tar.gz
+Source101:	etc_dvswitchrc
+Source102:	dvsource-webcam.pl
+Source103:	dvtrim.pl
+Source104:	dv2webm.sh
+Source105:	dvsink-bambuser.pl
+Source106:	dvsource-title.pl
+Source107:	dvsink-icecast.pl
+Source108:	dvsink-fullscreen.pl
+Source109:	dvsource-firewire-next.pl
+Source110:	dvrecord.sh
+Source111:	dv-upload.sh
+Source112:	dvsource-firewire2switch
+Patch1:		dvsource-command.diff
+Patch2:		retry_connect_option.diff
+Patch3:		stopped_status.diff
+Patch4:		listen_wildcard.diff
+Patch6:		thin_title_safe_area.diff
+Patch7:		movable_selection.diff
+Patch8:		repeating_frame_dots.diff
+Patch9:		happy_gcc.diff
+Patch10:	title_hup.diff
+Patch11:	mfade_area.diff
+Patch100:	revert_wouter.diff
+BuildRequires:  cmake pkg-config gcc-c++
+BuildRequires:  fdupes
+BuildRequires:  glibc alsa-devel gtkmm2-devel ffmpeg-devel
+BuildRequires:  boost-devel
+BuildRequires:  libliveMedia-devel liblo-devel
+# used on testsuite
+BuildRequires:  perl(Pod::Usage)
+BuildRequires:  perl(Pod::Text)
+BuildRequires:  perl(Encode)
+# dummy buildrequires to catch dependency issues earlier.
+BuildRequires:  oggfwd ffmpeg2theora
+# Factory fails without this (missing X11/extensions/XShm.h, X11/extensions/Xvlib.h)
+BuildRequires:  xorg-x11-libXext-devel xorg-x11-libXv-devel
+%if 0%{?suse_version} == 1220
+BuildRequires: -makeinfo
+%endif
+## needed for dvsource-alien
+BuildRequires: libv4l-devel
+BuildRequires: libffmpeg-devel
+#
+BuildRoot:      %{_tmppath}/%{name}-%{version}-build
+#
+Requires:       %{name}-client = %{version}
+Provides:	dvswitch
+# needed by dvsink-fullscreen, which is not in -client, because of this:
+Requires:       MPlayer
+
+%description
+dvswitch is a basic video mixer designed for the needs of DebConf.  It
+may suit the needs of other conferences that require live mixing for
+streams and/or recording.
+
+Currently dvswitch can combine audio from one source with video from
+another and can combine two video streams with a picture-in-picture
+effect.  Further mixing effects are planned. It works solely with the
+DV format which allows for low latency display and cutting. 
+It is best used with Canon HV20/30/40 camcorders and Canopus Twinpact 100 
+Framegrabbers.
+
+%package client
+License:        GPL-2.0+
+Summary:        Source, sink, and other components for %{name}
+# needed by dvsource-firewire:
+Requires:	dvgrab >= 3.5
+# needed by dvsource-webcam, dvtrim, dvsink-bambuser:
+Requires:	ffmpeg 
+# needed by dvsmon and friends
+Requires:	python
+# needed by dvsink-icecast
+Requires:       oggfwd ffmpeg2theora
+# needed by all the perl scripts (should all be in perl core)
+Requires: perl(Pod::Usage)
+Requires: perl(Pod::Text)
+Requires: perl(Encode)
+# needed by dv-upload.sh 
+Requires: rsync openssh curl
+
+%description client
+dvswitch is a basic video mixer designed for the needs of DebConf.  
+
+This package contains only sink and source utilities.
+You also need %{name}-%{version} (installed on some machine) 
+to use this package.
+
+%package test
+License:        GPL-2.0+
+Summary:        All of %{name} under /opt/test
+# needed by dvsource-firewire:
+Requires:	dvgrab >= 3.5
+# needed by dvsource-webcam, dvtrim, dvsink-bambuser:
+Requires:	ffmpeg 
+# needed by dvsmon and friends
+Requires:	python
+# needed by dvsink-icecast
+Requires:       oggfwd ffmpeg2theora
+
+%description test
+dvswitch is a basic video mixer designed for the needs of DebConf.  It
+may suit the needs of other conferences that require live mixing for
+streams and/or recording.
+
+Currently dvswitch can combine audio from one source with video from
+another and can combine two video streams with a picture-in-picture
+effect.  Further mixing effects are planned.  It works solely with the
+DV format which allows for low latency display and cutting. 
+It is best used with Canon HV20/30/40 camcorders and Canopus Twinpact 100 
+Framegrabbers.
+
+This package contains all components installed under /opt/test, so that you can
+have two versions of dvswitch installed simultaneously.
+
+%prep
+%setup  -q -n %{tarname} -a 5
+# # dvsource-command.diff
+# % patch1 -p1
+# # retry_connect_option.diff
+# % patch2 -p1
+# # stopped_status.diff
+# % patch3 -p1
+# # listen_wildcard.diff
+# % patch4 -p1
+# # thin_title_safe_area.diff
+# % patch6 -p1
+# # movable_selection.diff
+# % patch7 -p1
+# # repeating_frame_dots.diff
+# % patch8 -p1
+# # happy_gcc.diff
+# % patch9 -p1
+# # title_hup.diff
+# % patch10 -p1
+# # mfade_area.diff
+# % patch11 -p1
+# revert_wouter.diff
+%patch100 -p1
+
+grep Manual src/*.c
+
+rm -rf *-dvsmon-*/app_data
+rm -rf *-dvsmon-*/debian
+
+
+%build
+cmake -Dprefix=/usr
+make
+
+%check
+perl -c %{SOURCE102}
+perl -c %{SOURCE103}
+perl -c %{SOURCE105}
+perl -c %{SOURCE106}
+perl -c %{SOURCE107}
+perl -c %{SOURCE108}
+perl -c %{SOURCE109}
+
+%install
+%makeinstall
+install  -m 0644 %{SOURCE101} ./etc_dvswitchrc
+install -Dm 0755 %{SOURCE102} %{buildroot}%{_bindir}/dvsource-webcam
+install -Dm 0755 %{SOURCE103} %{buildroot}%{_bindir}/dvtrim
+install -Dm 0755 %{SOURCE104} %{buildroot}%{_bindir}/dv2webm
+install -Dm 0755 %{SOURCE105} %{buildroot}%{_bindir}/dvsink-bambuser
+install -Dm 0755 %{SOURCE106} %{buildroot}%{_bindir}/dvsource-title
+install -Dm 0755 %{SOURCE107} %{buildroot}%{_bindir}/dvsink-icecast
+install -Dm 0755 %{SOURCE108} %{buildroot}%{_bindir}/dvsink-fullscreen
+install -Dm 0755 %{SOURCE109} %{buildroot}%{_bindir}/dvsource-firewire-next
+install -Dm 0755 %{SOURCE110} %{buildroot}%{_bindir}/dvrecord
+install -Dm 0755 %{SOURCE111} %{buildroot}%{_bindir}/dv-upload
+install -Dm 0755 %{SOURCE112} %{buildroot}%{_bindir}/dvsource-firewire2switch
+
+false && install -Dm 0644 %{SOURCE1} %{buildroot}%{_mandir}/man1/dvswitch.1
+false && %fdupes %{buildroot}%{_datadir}
+
+install -d -m 0755            %{buildroot}/opt/test
+cp -a %{buildroot}%{_bindir}  %{buildroot}/opt/test
+cp -a %{buildroot}%{_datadir} %{buildroot}/opt/test
+cp -a %{buildroot}%{_mandir}  %{buildroot}/opt/test
+
+%post
+test -f /etc/dvswitchrc || cp %{_docdir}/%{name}/etc_dvswitchrc /etc/dvswitchrc
+%post client
+test -f /etc/dvswitchrc || cp %{_docdir}/%{name}/etc_dvswitchrc /etc/dvswitchrc
+
+%files
+%defattr(-,root,root,-)
+%doc COPYING doc/design-notes doc/examples/* doc/README etc_dvswitchrc
+%{_datadir}/locale/*
+%{_datadir}/dvswitch
+%{_datadir}/doc/dvswitch
+%{_bindir}/dvswitch
+%{_bindir}/dvsink-fullscreen
+%doc %{_mandir}/man1/dvswitch.1*
+
+%files client
+%defattr(-,root,root,-)
+%doc COPYING doc/examples/* doc/README etc_dvswitchrc
+%exclude %{_bindir}/dvswitch
+%exclude %{_bindir}/dvsink-fullscreen
+%{_bindir}/*
+%exclude %{_mandir}/man1/dvswitch.1*
+%doc %{_mandir}/man?/*
+%doc etc_dvswitchrc *-dvsmon-*/*.py
+# ERROR: /usr/share/dvswitch/sec-video-source.png is packaged in both dvswitch-git and dvswitch-git-client, and the packages do not conflict
+%exclude %{_datadir}/dvswitch/*.png
+%{_datadir}/dvswitch/*
+
+%files test
+%defattr(-,root,root,-)
+%dir /opt/test
+/opt/test/*
+
+%changelog
+

dvsource-command.diff Added

@@ -0,0 +1,252 @@
+---
+ doc/CMakeLists.txt    |    1 
+ doc/README            |    1 
+ doc/dvsource-dvgrab.1 |   12 +++++++++++
+ src/CMakeLists.txt    |    1 
+ src/dvsource-dvgrab.c |   54 +++++++++++++++++++++++++++++++++++++++++++++-----
+ 5 files changed, 64 insertions(+), 5 deletions(-)
+
+Index: dvswitch-0.9-1-da15ba4/doc/dvsource-dvgrab.1
+===================================================================
+--- dvswitch-0.9-1-da15ba4.orig/doc/dvsource-dvgrab.1
++++ dvswitch-0.9-1-da15ba4/doc/dvsource-dvgrab.1
+@@ -9,18 +9,30 @@ dvsource-dvgrab \- Firewire and Video4Li
+ .RB [ \-c
+ .IR CARD-NUMBER " | " DEVICE ]
+ .HP
+ .B dvsource-v4l2-dv
+ .RI [ OPTIONS "] [" DEVICE ]
++.HP
++.B dvsource-command
++.RI "[ '" FFMPEG_COMMAND "' ]"
+ .SH DESCRIPTION
+ .LP
+ \fBdvsource-firewire\fR uses \fBdvgrab\fR(1) to stream from a DV
+ device (camera or VCR) connected by Firewire.
+ .LP
+ \fBdvsource-v4l2-dv\fR uses \fBdvgrab\fR(1) to stream from a DV device
+ that has a Video4Linux2 driver.  This includes most USB DV cameras if
+ you have the uvcvideo driver installed.
++.LP
++\fBdvsource-command\fR uses a user provided command to create a virtual DV stream
++from any device. The command may consist of multiple arguments, if so it must be quoted 
++as a single shell argument. The default command takes audio from the first 
++soundcard (builtin microphone) and video from the first video device.
++If your webcam is \fB/dev/video0\fR and has its own mono microphone, this
++command might work:
++.br
++\fB'ffmpeg -v quiet -f alsa -ac 1 -i hw:1 -f v4l2 -i /dev/video0 -target pal-dv pipe:1'\fR
+ .SH OPTIONS
+ \fB\-t\fR, \fB\-\-tally\fR
+ .RS
+ Print notices of activation and deactivation in the mixer, for use
+ with a tally light.  These will take the form "TALLY: on" or "TALLY:
+Index: dvswitch-0.9-1-da15ba4/doc/README
+===================================================================
+--- dvswitch-0.9-1-da15ba4.orig/doc/README
++++ dvswitch-0.9-1-da15ba4/doc/README
+@@ -20,10 +20,11 @@ limited length, DVswitch is divided into
+ that can run on different computers on a TCP/IP network:
+ 
+ - dvswitch: the mixer GUI and network server
+ - dvsource-firewire: source that connects to a DV camera via Firewire
+ - dvsource-v4l2-dv: source that connect to a DV camera via V4L2, useful for USB
++- dvsource-command: source from any V4L2 device, via e.g. ffmpeg -target pal-dv.
+ - dvsource-file: source that reads a raw DV (DIF) file
+ - dvsource-alsa: source that captures audio through ALSA
+ - dvsink-files: sink that writes the mixed stream to raw DV files
+ - dvsink-command: sink that runs a command with the mixed stream as
+   its standard input
+Index: dvswitch-0.9-1-da15ba4/doc/CMakeLists.txt
+===================================================================
+--- dvswitch-0.9-1-da15ba4.orig/doc/CMakeLists.txt
++++ dvswitch-0.9-1-da15ba4/doc/CMakeLists.txt
+@@ -6,5 +6,6 @@ install(FILES README
+         DESTINATION ${docdir}/dvswitch)
+ install(FILES ${manpages}
+         DESTINATION ${mandir}/man1)
+ install_symlink(dvsource-dvgrab.1 "${mandir}/man1/dvsource-firewire.1")
+ install_symlink(dvsource-dvgrab.1 "${mandir}/man1/dvsource-v4l2-dv.1")
++install_symlink(dvsource-dvgrab.1 "${mandir}/man1/dvsource-command.1")
+Index: dvswitch-0.9-1-da15ba4/src/dvsource-dvgrab.c
+===================================================================
+--- dvswitch-0.9-1-da15ba4.orig/src/dvsource-dvgrab.c
++++ dvswitch-0.9-1-da15ba4/src/dvsource-dvgrab.c
+@@ -21,10 +21,11 @@
+ static struct option options[] = {
+     {"card",     1, NULL, 'c'},
+     {"guid",	  1, NULL, 'g'},
+     {"firewire", 0, NULL, 'F'},
+     {"v4l2",     0, NULL, 'V'},
++    {"command",  0, NULL, 'C'},
+     {"host",     1, NULL, 'h'},
+     {"port",     1, NULL, 'p'},
+     {"tally",    0, NULL, 't'},
+     {"verbose",  0, NULL, 'v'},
+     {"help",     0, NULL, 'H'},
+@@ -33,10 +34,11 @@ static struct option options[] = {
+ 
+ enum mode {
+     mode_unknown,
+     mode_firewire,
+     mode_v4l2,
++    mode_command,
+ };
+ 
+ static enum mode mode = mode_unknown;
+ static char * device_name = NULL;
+ static char * firewire_card = NULL;
+@@ -55,10 +57,12 @@ static enum mode program_mode(const char
+ 
+     if (strcmp(progname, "dvsource-firewire") == 0)
+ 	return mode_firewire;
+     if (strcmp(progname, "dvsource-v4l2-dv") == 0)
+ 	return mode_v4l2;
++    if (strcmp(progname, "dvsource-command") == 0)
++	return mode_command;
+     return mode_unknown;
+ }
+ 
+ static void handle_config(const char * name, const char * value)
+ {
+@@ -92,23 +96,27 @@ static void handle_config(const char * n
+ static void usage(const char * progname)
+ {
+     static const char firewire_args[] =
+ 	"[-c CARD-NUMBER | DEVICE] [-g GUID]";
+     static const char v4l2_args[] = "[DEVICE]";
++    static const char cmd_args[] = "['ffmpeg -v quiet -f alsa -ac 1 -i hw:1 -f v4l2 -i /dev/video0 -target pal-dv pipe:1']";
+     static const char other_args[] =
+ 	"[-t] [-v] [-h HOST] [-p PORT]";
+ 
+     switch (program_mode(progname))
+     {
+     case mode_unknown:
+ 	fprintf(stderr,
+ 		"Usage: %s %s \\\n"
+ 		"           --firewire %s\n"
+ 		"       %s %s \\\n"
+-		"           --v4l2 %s\n",
++		"           --v4l2 %s\n"
++		"       %s %s \\\n"
++		"           --command %s\n",
+ 		progname, other_args, firewire_args,
+-		progname, other_args, v4l2_args);
++		progname, other_args, v4l2_args,
++		progname, other_args, cmd_args);
+ 	break;
+     case mode_firewire:
+ 	fprintf(stderr,
+ 		"Usage: %s %s \\\n"
+ 		"           %s\n",
+@@ -118,10 +126,16 @@ static void usage(const char * progname)
+ 	fprintf(stderr,
+ 		"Usage: %s %s \\\n"
+ 		"           %s\n",
+ 		progname, other_args, v4l2_args);
+ 	break;
++    case mode_command:
++	fprintf(stderr,
++		"Usage: %s %s \\\n"
++		"           %s\n",
++		progname, other_args, cmd_args);
++	break;
+     }
+ }
+ 
+ static ssize_t read_retry(int fd, void * buf, size_t count)
+ {
+@@ -177,11 +191,11 @@ int main(int argc, char ** argv)
+     dvswitch_read_config(handle_config);
+ 
+     /* Parse arguments. */
+ 
+     int opt;
+-    while ((opt = getopt_long(argc, argv, "c:g:h:p:tv", options, NULL)) != -1)
++    while ((opt = getopt_long(argc, argv, "c:g:h:p:tvFVC", options, NULL)) != -1)
+     {
+ 	switch (opt)
+ 	{
+ 	case 'c':
+ 	    free(firewire_card);
+@@ -195,10 +209,13 @@ int main(int argc, char ** argv)
+ 	    mode = mode_firewire;
+ 	    break;
+ 	case 'V':
+ 	    mode = mode_v4l2;
+ 	    break;
++	case 'C':
++	    mode = mode_command;
++	    break;
+ 	case 'h':
+ 	    free(mixer_host);
+ 	    mixer_host = strdup(optarg);
+ 	    break;
+ 	case 'p':
+@@ -252,15 +269,22 @@ int main(int argc, char ** argv)
+     }
+     else if (mode == mode_v4l2)
+     {
+ 	if (!device_name)
+ 	    device_name = "/dev/video";
+-	printf("INFO: Reading from V4L2 device %s\n", device_name);
++	printf("INFO: Reading from V4L2 device %s (DV mode)\n", device_name);
++    }
++    else if (mode == mode_command)
++    {
++        // FIXME: would it work without audio?
++	if (!device_name)
++	    device_name = "ffmpeg -v quiet -f alsa -ac 2 -i hw:0 -f v4l2 -i /dev/video0 -target pal-dv pipe:1";
++	printf("INFO: Running command: %s\n", device_name);
+     }
+     else
+     {
+-	fprintf(stderr, "%s: mode not defined (Firewire or V4L2)\n", argv[0]);
++	fprintf(stderr, "%s: mode not defined (Firewire, V4L2, or Command)\n", argv[0]);
+ 	return 2;
+     }
+ 
+     /* Connect to the mixer. */
+ 
+@@ -290,10 +314,30 @@ int main(int argc, char ** argv)
+ 	    tally(sock);
+ 	    _exit(0);
+ 	}
+     }
+ 
++    if (mode == mode_command)
++      {
++        // run a command, e.g. ffmpeg
++	if (verbose)
++	{
++	    printf("INFO: Running %s\n", device_name);
++	}
++
++	if (dup2(sock, STDOUT_FILENO) < 0)
++	{
++	    perror("ERROR: dup2");
++	    return 1;
++	}
++	close(sock);
++
++	execlp("/bin/sh", "/bin/sh", "-c", device_name, NULL);
++	perror("ERROR: execlp");
++	return 1;
++      }
++      
+     /* Run dvgrab with the socket as stdout. */
+ 
+     char * dvgrab_argv[9];
+     char ** argp = dvgrab_argv;
+     *argp++ = "dvgrab";
+Index: dvswitch-0.9-1-da15ba4/src/CMakeLists.txt
+===================================================================
+--- dvswitch-0.9-1-da15ba4.orig/src/CMakeLists.txt
++++ dvswitch-0.9-1-da15ba4/src/CMakeLists.txt
+@@ -50,5 +50,6 @@ install(TARGETS dvsink-command dvsink-fi
+ if(${CMAKE_SYSTEM_NAME} STREQUAL "Linux")
+ install(TARGETS dvsource-alsa DESTINATION ${bindir})
+ endif(${CMAKE_SYSTEM_NAME} STREQUAL "Linux")
+ install_symlink(dvsource-dvgrab "${bindir}/dvsource-firewire")
+ install_symlink(dvsource-dvgrab "${bindir}/dvsource-v4l2-dv")
++install_symlink(dvsource-dvgrab "${bindir}/dvsource-command")

happy_gcc.diff Added

@@ -0,0 +1,129 @@
+---
+ src/connector.cpp         |    2 ++
+ src/dvsource-firewire.cpp |    2 +-
+ src/mixer.cpp             |   33 +++++++++++++++++----------------
+ 3 files changed, 20 insertions(+), 17 deletions(-)
+
+Index: dvswitch-0.9-1-da15ba4/src/mixer.cpp
+===================================================================
+--- dvswitch-0.9-1-da15ba4.orig/src/mixer.cpp
++++ dvswitch-0.9-1-da15ba4/src/mixer.cpp
+@@ -468,14 +468,14 @@ namespace
+ 	// 4: LTC bits 48-51, 56-59
+ 	//    bits 0-5: hour part (BCD)
+ 	// the remaining bits are meaningless in DV and we use zeroes
+ 	uint8_t timecode[DIF_PACK_SIZE] = {
+ 	    0x13,
+-	    bcd(frame_num % frame_rate) | (1 << 6),
+-	    bcd(frame_num / frame_rate % 60),
+-	    bcd(frame_num / (60 * frame_rate) % 60),
+-	    bcd(frame_num / (60 * 60 * frame_rate) % 24)
++	    (uint8_t)bcd(frame_num % frame_rate) | (1 << 6),
++	    (uint8_t)bcd(frame_num / frame_rate % 60),
++	    (uint8_t)bcd(frame_num / (60 * frame_rate) % 60),
++	    (uint8_t)bcd(frame_num / (60 * 60 * frame_rate) % 24)
+ 	};
+ 
+ 	// Record date format:
+ 	// 0: pack id = 0x62 (video) or 0x52 (audio)
+ 	// 1: some kind of time zone indicator or 0xff for unknown
+@@ -485,20 +485,20 @@ namespace
+ 	//    bits 0-4: month part (BCD)
+ 	// 4: year part (BCD)
+ 	uint8_t video_record_date[DIF_PACK_SIZE] = {
+ 	    0x62,
+ 	    0xff,
+-	    bcd(now_tm.tm_mday),
+-	    bcd(1 + now_tm.tm_mon),
+-	    bcd(now_tm.tm_year % 100)
++	    (uint8_t)bcd(now_tm.tm_mday),
++	    (uint8_t)bcd(1 + now_tm.tm_mon),
++	    (uint8_t)bcd(now_tm.tm_year % 100)
+ 	};
+ 	uint8_t audio_record_date[DIF_PACK_SIZE] = {
+ 	    0x52,
+ 	    0xff,
+-	    bcd(now_tm.tm_mday),
+-	    bcd(1 + now_tm.tm_mon),
+-	    bcd(now_tm.tm_year % 100)
++	    (uint8_t)bcd(now_tm.tm_mday),
++	    (uint8_t)bcd(1 + now_tm.tm_mon),
++	    (uint8_t)bcd(now_tm.tm_year % 100)
+ 	};
+ 
+ 	// Record time format (similar to timecode format):
+ 	// 0: pack id = 0x63 (video) or 0x53 (audio)
+ 	// 1: bits 6-7: reserved, set to 1
+@@ -510,20 +510,20 @@ namespace
+ 	// 4: bits 6-7: unused? reserved?
+ 	//    bits 0-5: hour part (BCD)
+ 	uint8_t video_record_time[DIF_PACK_SIZE] = {
+ 	    0x63,
+ 	    0xff,
+-	    bcd(now_tm.tm_sec),
+-	    bcd(now_tm.tm_min),
+-	    bcd(now_tm.tm_hour)
++	    (uint8_t)bcd(now_tm.tm_sec),
++	    (uint8_t)bcd(now_tm.tm_min),
++	    (uint8_t)bcd(now_tm.tm_hour)
+ 	};
+ 	uint8_t audio_record_time[DIF_PACK_SIZE] = {
+ 	    0x53,
+ 	    0xff,
+-	    bcd(now_tm.tm_sec),
+-	    bcd(now_tm.tm_min),
+-	    bcd(now_tm.tm_hour)
++	    (uint8_t)bcd(now_tm.tm_sec),
++	    (uint8_t)bcd(now_tm.tm_min),
++	    (uint8_t)bcd(now_tm.tm_hour)
+ 	};
+ 
+         // In DIFs 1 and 2 (subcode) of sequence 6 onward:
+ 	// - Write timecode at offset 6 and 30
+ 	// - Write video record date at offset 14 and 38
+@@ -901,10 +901,11 @@ void mixer::run_mixer()
+ 	    enc->sample_aspect_ratio.den *= 41;
+ 	    enc->time_base.num = system->frame_rate_denom;
+ 	    enc->time_base.den = system->frame_rate_numer;
+ 	    mixed_raw->header.pts = serial_num;
+   	    mixed_dv = allocate_dv_frame();
++	    // FIXME: deprecated. use avcodec_encode_video2 instead:
+ 	    int out_size = avcodec_encode_video(enc,
+ 						mixed_dv->buffer, system->size,
+ 						&mixed_raw->header);
+ 	    assert(size_t(out_size) == system->size);
+ 	    mixed_dv->serial_num = serial_num;
+Index: dvswitch-0.9-1-da15ba4/src/dvsource-firewire.cpp
+===================================================================
+--- dvswitch-0.9-1-da15ba4.orig/src/dvsource-firewire.cpp
++++ dvswitch-0.9-1-da15ba4/src/dvsource-firewire.cpp
+@@ -84,11 +84,11 @@ static int setup_tally_pipe()
+ 	    if (dup2(pipefd[0], 0) < 0)
+ 	    {
+ 	        perror("dup2");
+ 		exit(EXIT_FAILURE);
+ 	    }
+-	    execl(tally_script.c_str(), (char*)NULL);
++	    execl(tally_script.c_str(), tally_script.c_str(), (char*)NULL);
+ 	    // only returns in case of error
+ 	    perror("ERROR: exec");
+ 	    return -1;
+ 	default:
+ 	    close(pipefd[0]);
+Index: dvswitch-0.9-1-da15ba4/src/connector.cpp
+===================================================================
+--- dvswitch-0.9-1-da15ba4.orig/src/connector.cpp
++++ dvswitch-0.9-1-da15ba4/src/connector.cpp
+@@ -134,10 +134,12 @@ void connector::source_connection::handl
+ 	handle_frame, &conn, handle_close, &conn);
+ }
+ 
+ void connector::source_connection::handle_close(void * opaque)
+ {
++    // FIXME: gcc-4.7.1 says: 
++    // deleting object of polymorphic class type ‘connector::source_connection’ which has non-virtual destructor might cause undefined behaviour 
+     delete static_cast<source_connection *>(opaque);
+ }
+ 
+ connector::connector(mixer & mixer)
+     : mixer_(mixer),

listen_wildcard.diff Added

@@ -0,0 +1,99 @@
+---
+ src/dvswitch.cpp |   11 +++++++++--
+ src/socket.c     |   15 +++++++++++++++
+ 2 files changed, 24 insertions(+), 2 deletions(-)
+
+Index: dvswitch-0.9-1-da15ba4/src/socket.c
+===================================================================
+--- dvswitch-0.9-1-da15ba4.orig/src/socket.c
++++ dvswitch-0.9-1-da15ba4/src/socket.c
+@@ -64,10 +64,25 @@ int create_listening_socket(const char *
+ 	.ai_socktype = SOCK_STREAM,
+ 	.ai_flags =    AI_ADDRCONFIG
+     };
+     struct addrinfo * addr;
+     int error;
++
++    if (!strcmp(host, "*"))
++      {
++        /*
++	  * Manual page getaddrinfo(3) says:
++	  * If  the  AI_PASSIVE  flag  is  specified in hints.ai_flags, and node
++	  * is NULL,  then  the  returned  socket  addresses  will  be  suitable
++	  * for bind(2)ing  a  socket  that  will  accept(2) connections.  The
++	  * returned socket address will contain the "wildcard address" 
++	  */
++        host = NULL;
++	addr_hints.ai_flags |= AI_PASSIVE;
++      }
++    // fprintf(stderr, "getaddrinfo %s %s\n", host, port);
++
+     if ((error = getaddrinfo(host, port, &addr_hints, &addr)))
+     {
+ 	fprintf(stderr, "ERROR: getaddrinfo: %s\n", gai_strerror(error));
+ 	exit(1);
+     }
+Index: dvswitch-0.9-1-da15ba4/src/dvswitch.cpp
+===================================================================
+--- dvswitch-0.9-1-da15ba4.orig/src/dvswitch.cpp
++++ dvswitch-0.9-1-da15ba4/src/dvswitch.cpp
+@@ -37,27 +37,31 @@ namespace
+ 	{NULL,               0, NULL, 0}
+     };
+ 
+     std::string mixer_host;
+     std::string mixer_port;
++    std::string listen_addr;
+ 
+     extern "C"
+     {
+ 	void handle_config(const char * name, const char * value)
+ 	{
+ 	    if (std::strcmp(name, "MIXER_HOST") == 0)
+ 		mixer_host = value;
+ 	    else if (strcmp(name, "MIXER_PORT") == 0)
+ 		mixer_port = value;
++	    else if (strcmp(name, "LISTEN") == 0)
++		listen_addr = value;
+ 	}
+     }
+ 
+     void usage(const char * progname)
+     {
+ 	std::cerr << "\
+ Usage: " << progname << " [gtk-options] \\\n\
+-           [{-h|--host} LISTEN-HOST] [{-p|--port} LISTEN-PORT] [{-o|--osc} OSC-PORT]\n";
++           [{-h|--host} LISTEN-HOST] [{-p|--port} LISTEN-PORT] [{-o|--osc} OSC-PORT]\\\n\
++	   (use --host '*'  for INADDR_ANY)\n";
+     }
+ }
+ 
+ int main(int argc, char **argv)
+ {
+@@ -78,11 +82,11 @@ int main(int argc, char **argv)
+ 	while ((opt = getopt_long(argc, argv, "h:p:o:", options, NULL)) != -1)
+ 	{
+ 	    switch (opt)
+ 	    {
+ 	    case 'h':
+-		mixer_host = optarg;
++		listen_addr = mixer_host = optarg;
+ 		break;
+ 	    case 'p':
+ 		mixer_port = optarg;
+ 		break;
+ 	    case 'o': /* --osc */
+@@ -101,10 +105,13 @@ int main(int argc, char **argv)
+ 	{
+ 	    std::cerr << argv[0] << ": mixer hostname and port not defined\n";
+ 	    return 2;
+ 	}
+ 
++	if (!listen_addr.empty()) 
++	  mixer_host = listen_addr;
++
+ 	// The mixer must be created before the window, since we pass
+ 	// a reference to the mixer into the window's constructor to
+ 	// allow it to adjust the mixer's controls.
+ 	// However, the mixer must also be destroyed before the
+ 	// window, since as long as it exists it may call into the

mfade_area.diff Added

@@ -0,0 +1,337 @@
+---
+ src/mixer.cpp        |   15 +++++++++++----
+ src/mixer.hpp        |    3 ++-
+ src/mixer_window.cpp |   33 +++++++++++++++++++++++++++++----
+ src/mixer_window.hpp |    4 ++++
+ src/video_effect.c   |   20 ++++++++++++++++++--
+ src/video_effect.h   |    3 ++-
+ 6 files changed, 66 insertions(+), 12 deletions(-)
+
+Index: dvswitch-0.9-1-da15ba4/src/video_effect.c
+===================================================================
+--- dvswitch-0.9-1-da15ba4.orig/src/video_effect.c
++++ dvswitch-0.9-1-da15ba4/src/video_effect.c
+@@ -289,11 +289,12 @@ void video_effect_pic_in_pic(struct raw_
+     }
+ }
+ 
+ void video_effect_fade(struct raw_frame_ref dest,
+ 		       struct raw_frame_ref sec,
+-		       uint8_t scale)
++		       uint8_t scale,
++		       uint8_t area)
+ {
+     int x, y, plane;
+     uint8_t *ptr_d, *ptr_s;
+     uint16_t tmp;
+     int width, height;
+@@ -313,13 +314,28 @@ void video_effect_fade(struct raw_frame_
+ 	    width >>= chroma_shift_horiz;
+ 	    height >>= chroma_shift_vert;
+ 	}
+         for (y = 0; y < height; y++)
+         {
++            uint8_t sscale = scale;
++	    // CAUTION: keep in sync with mixer_window.cpp:217ff: mfade_area_choice_.append_text()
++	    switch (area)
++	    {
++	      case 8: if (y > 0.5   * height) sscale = 0; break;
++	      case 7: if (y > 0.333 * height) sscale = 0; break;
++	      case 6: if (y > 0.24  * height) sscale = 0; break;
++	      case 5: if (y > 0.166 * height) sscale = 0; break;
++	      case 4: if (y < 0.833 * height) sscale = 0; break;
++	      case 3: if (y < 0.75  * height) sscale = 0; break;
++	      case 2: if (y < 0.666 * height) sscale = 0; break;
++	      case 1: if (y < 0.5   * height) sscale = 0; break;
++	      default: break; // no exceptions.
++	    }
++	     
+ 	    for (x = 0; x < width; x++)
+ 	    {
+-		tmp = scale * (*ptr_s - *ptr_d);
++		tmp = sscale * (*ptr_s - *ptr_d);
+ 		*ptr_d += (uint8_t)(tmp >> 8);
+ 		ptr_d++; ptr_s++;
+ 	    }
+ 	    ptr_d += dest.planes.linesize[plane] - width;
+ 	    ptr_s += dest.planes.linesize[plane] - width;
+Index: dvswitch-0.9-1-da15ba4/src/mixer_window.hpp
+===================================================================
+--- dvswitch-0.9-1-da15ba4.orig/src/mixer_window.hpp
++++ dvswitch-0.9-1-da15ba4/src/mixer_window.hpp
+@@ -10,10 +10,11 @@
+ 
+ #include <boost/thread/mutex.hpp>
+ 
+ #include <glibmm/refptr.h>
+ #include <gtkmm/box.h>
++#include <gtkmm/comboboxtext.h>
+ #include <gtkmm/menu.h>
+ #include <gtkmm/menubar.h>
+ #include <gtkmm/imagemenuitem.h>
+ #include <gtkmm/separator.h>
+ #include <gtkmm/togglebutton.h>
+@@ -105,14 +106,16 @@ private:
+     Gtk::Button cut_button_;
+     Gtk::Image cut_icon_;
+     Gtk::HSeparator command_sep_;
+     Gtk::Frame effects_frame_;
+     Gtk::VBox effects_box_;
++    Gtk::HBox effects_mf_box_;
+     Gtk::RadioButtonGroup effect_group_;
+     Gtk::RadioButton none_button_;
+     Gtk::RadioButton pip_button_;
+     Gtk::RadioButton mfade_button_;
++    Gtk::ComboBoxText mfade_area_choice_;
+     Gtk::HSeparator transition_sep_;
+     Gtk::RadioButton tfade_button_;
+     Gtk::Label tfade_label_;
+     Gtk::HScale tfade_value_;
+     Gtk::Label mfade_label_;
+@@ -130,10 +133,11 @@ private:
+     mixer::source_id pri_video_source_id_, sec_video_source_id_;
+     bool pip_active_;
+     bool pip_pending_;
+     bool tfade_pending_;
+     bool mfade_active_;
++    int mfade_area_;
+     bool allow_mfade_;
+     bool progress_active_;
+     bool fullscreen_state_;
+     double progress_val_;
+     mixer::source_id tfade_target_;
+Index: dvswitch-0.9-1-da15ba4/src/video_effect.h
+===================================================================
+--- dvswitch-0.9-1-da15ba4.orig/src/video_effect.h
++++ dvswitch-0.9-1-da15ba4/src/video_effect.h
+@@ -20,11 +20,12 @@ void video_effect_pic_in_pic(struct raw_
+ 			     struct rectangle dest_rect,
+                              struct raw_frame_ref source,
+ 			     struct rectangle source_rect);
+ void video_effect_fade(struct raw_frame_ref dest,
+ 		       struct raw_frame_ref sec,
+-		       uint8_t scale);
++		       uint8_t scale,
++		       uint8_t area);
+ 
+ #ifdef __cplusplus
+ }
+ #endif
+ 
+Index: dvswitch-0.9-1-da15ba4/src/mixer.hpp
+===================================================================
+--- dvswitch-0.9-1-da15ba4.orig/src/mixer.hpp
++++ dvswitch-0.9-1-da15ba4/src/mixer.hpp
+@@ -151,11 +151,12 @@ public:
+     static std::tr1::shared_ptr<video_mix>
+     create_video_mix_fade(source_id pri_source_id,
+ 			  source_id sec_source_id,
+ 			  bool timed,
+ 			  unsigned int ms,
+-			  uint8_t scale=0);
++			  uint8_t scale=0,
++			  uint8_t area=0);
+ 
+     bool can_record() const;
+ 
+     // Mixer interface
+     format_settings get_format() const;
+Index: dvswitch-0.9-1-da15ba4/src/mixer.cpp
+===================================================================
+--- dvswitch-0.9-1-da15ba4.orig/src/mixer.cpp
++++ dvswitch-0.9-1-da15ba4/src/mixer.cpp
+@@ -704,22 +704,28 @@ bool mixer::video_mix_pic_in_pic::apply(
+     return false;
+ }
+ 
+ // Fade video mix - performs a linear interpolation of the values of both
+ // sources on an 8-bit scale. Useful for fading.
++// area: 0: normal=all 	
++//       1,2,3,4: bottom 1/2, 1/3, 1/4, 1/6; 
++//       5,6,7,8: top 1/6, 1/4, 1/3, 1/2;
++// area=3 is useful for superimposed subtitles.
+ 
+ class mixer::video_mix_fade : public video_mix
+ {
+ public:
+     video_mix_fade(source_id pri_source_id,
+ 		   source_id sec_source_id,
+ 		   bool timed, unsigned int ms,
+-		   uint8_t scale=0)
++		   uint8_t scale=0,
++		   uint8_t area=0)
+ 	: pri_source_id_(pri_source_id),
+ 	  sec_source_id_(sec_source_id),
+ 	  timed_(timed),
+ 	  scale_(scale),
++	  area_(area),
+ 	  bucketsize_(ms * 1000 / 255),
+ 	  modulo_(0),
+ 	  us_per_frame_(0)
+     {}
+     uint8_t get_scale() { return scale_; };
+@@ -731,10 +737,11 @@ private:
+     virtual void status(mixer::monitor * monitor);
+ 
+     source_id pri_source_id_, sec_source_id_;
+     bool timed_;
+     uint8_t scale_;
++    uint8_t area_;
+     int bucketsize_;
+     int modulo_;
+     int us_per_frame_;
+ };
+ 
+@@ -803,11 +810,11 @@ bool mixer::video_mix_fade::apply(const
+ 	raw_frame_ptr sec_source_raw =
+ 	    decode_video_frame(decoder, sec_source_dv);
+ 
+ 	// Mix raw video
+ 	video_effect_fade(make_raw_frame_ref(mixed_raw),
+-			  make_raw_frame_ref(sec_source_raw), scale_);
++			  make_raw_frame_ref(sec_source_raw), scale_, area_);
+     }
+     return retval;
+ }
+ 
+ std::tr1::shared_ptr<mixer::video_mix> mixer::create_video_mix_simple(source_id id)
+@@ -824,14 +831,14 @@ mixer::create_video_mix_pic_in_pic(sourc
+ }
+ 
+ std::tr1::shared_ptr<mixer::video_mix>
+ mixer::create_video_mix_fade(source_id pri_source_id,
+ 			     source_id sec_source_id, bool timed,
+-			     unsigned int ms, uint8_t scale)
++			     unsigned int ms, uint8_t scale, uint8_t area)
+ {
+     return std::tr1::shared_ptr<mixer::video_mix>(
+-        new video_mix_fade(pri_source_id, sec_source_id, timed, ms, scale));
++        new video_mix_fade(pri_source_id, sec_source_id, timed, ms, scale, area));
+ }
+ 
+ void mixer::run_mixer()
+ {
+     dv_frame_ptr last_mixed_dv;
+Index: dvswitch-0.9-1-da15ba4/src/mixer_window.cpp
+===================================================================
+--- dvswitch-0.9-1-da15ba4.orig/src/mixer_window.cpp
++++ dvswitch-0.9-1-da15ba4/src/mixer_window.cpp
+@@ -81,10 +81,11 @@ mixer_window::mixer_window(mixer & mixer
+       cut_icon_(Gtk::Stock::CUT, Gtk::ICON_SIZE_BUTTON),
+       effects_frame_(gettext("Effects")),
+       none_button_(effect_group_, gettext("No effect/transition")),
+       pip_button_(effect_group_, gettext("_Pic-in-pic"), true),
+       mfade_button_(effect_group_, gettext("_Manual fade"), true),
++      mfade_area_choice_(),
+       tfade_button_(effect_group_, gettext("Timed fa_de"), true),
+       tfade_label_(gettext("Transition speed [ms]:")),
+       tfade_value_(40, 15040, 40),
+       mfade_label_(gettext("Manual fade A/B:")),
+       mfade_ab_(0, 256, 1),
+@@ -95,10 +96,11 @@ mixer_window::mixer_window(mixer & mixer
+       pri_video_source_id_(0),
+       sec_video_source_id_(0),
+       pip_active_(false),
+       pip_pending_(false),
+       mfade_active_(false),
++      mfade_area_(0),
+       progress_active_(false),
+       fullscreen_state_(false),
+       wakeup_pipe_(O_NONBLOCK, O_NONBLOCK),
+       next_source_id_(0),
+       osc_(NULL),
+@@ -210,10 +212,26 @@ mixer_window::mixer_window(mixer & mixer
+     mfade_button_.set_sensitive(false);
+     mfade_button_.signal_clicked().connect(
+     	sigc::mem_fun(this, &mixer_window::begin_mfade));
+     mfade_button_.show();
+ 
++    // CAUTION: keep in sync with video_effect.c:video_effect_fade():320ff
++    mfade_area_choice_.append_text(gettext("Full"));
++    mfade_area_choice_.append_text(gettext("1/2b"));
++    mfade_area_choice_.append_text(gettext("1/3b"));
++    mfade_area_choice_.append_text(gettext("1/4b"));
++    mfade_area_choice_.append_text(gettext("1/6b"));
++    mfade_area_choice_.append_text(gettext("1/6t"));
++    mfade_area_choice_.append_text(gettext("1/4t"));
++    mfade_area_choice_.append_text(gettext("1/3t"));
++    mfade_area_choice_.append_text(gettext("1/2t"));
++    mfade_area_choice_.set_sensitive(true);
++    mfade_area_choice_.set_active(0);	// activate first entry
++    mfade_area_choice_.signal_changed().connect(
++    	sigc::mem_fun(this, &mixer_window::mfade_update));
++    mfade_area_choice_.show();
++
+     tfade_button_.set_mode(/*draw_indicator=*/false);
+     tfade_button_.set_sensitive(false);
+     tfade_button_.signal_clicked().connect(
+         sigc::mem_fun(this, &mixer_window::begin_tfade));
+     tfade_button_.show();
+@@ -273,15 +291,21 @@ mixer_window::mixer_window(mixer & mixer
+ 	sigc::mem_fun(*this, &mixer_window::set_sec_video_source));
+     selector_.signal_audio_selected().connect(
+ 	sigc::mem_fun(mixer_, &mixer::set_audio_source));
+     selector_.show();
+ 
++    effects_mf_box_.set_border_width(0);
++    effects_mf_box_.set_spacing(gui_standard_spacing);
++    effects_mf_box_.pack_start(mfade_button_, Gtk::PACK_EXPAND_WIDGET);
++    effects_mf_box_.pack_start(mfade_area_choice_, Gtk::PACK_SHRINK);
++    effects_mf_box_.show();
++
+     effects_box_.set_border_width(gui_standard_spacing);
+     effects_box_.set_spacing(gui_standard_spacing);
+     effects_box_.pack_start(apply_button_, Gtk::PACK_SHRINK);
+     effects_box_.pack_start(pip_button_, Gtk::PACK_SHRINK);
+-    effects_box_.pack_start(mfade_button_, Gtk::PACK_SHRINK);
++    effects_box_.pack_start(effects_mf_box_, Gtk::PACK_SHRINK);
+     effects_box_.pack_start(mfade_label_, Gtk::PACK_SHRINK);
+     effects_box_.pack_start(mfade_ab_, Gtk::PACK_SHRINK);
+     effects_box_.show();
+     effects_frame_.add(effects_box_);
+     effects_frame_.show();
+@@ -568,11 +592,11 @@ void mixer_window::set_pri_video_source(
+     if (tfade_pending_)
+     {
+ 	tfade_target_ = id;
+ 	mixer_.set_video_mix(
+ 	    mixer_.create_video_mix_fade(pri_video_source_id_, tfade_target_,
+-					 true, int(tfade_value_.get_value())));
++					 true, int(tfade_value_.get_value()), 0));
+         pip_active_ = false;
+ 	mfade_active_ = false;
+ 	return;
+     }
+ 
+@@ -632,17 +656,17 @@ void mixer_window::mfade_mix()
+ 	int fade = mfade_ab_.get_value();
+ 	if (fade < 1)
+ 	{
+ 	    mixer_.set_video_mix(mixer_.create_video_mix_simple(pri_video_source_id_));
+ 	}
+-	else if (fade > 254)
++	else if (fade > 254 && mfade_area_ == 0)
+ 	{
+ 	    mixer_.set_video_mix(mixer_.create_video_mix_simple(sec_video_source_id_));
+ 	}
+ 	else
+ 	{
+-	    mixer_.set_video_mix(mixer_.create_video_mix_fade(pri_video_source_id_, sec_video_source_id_, false, 0, fade));
++	    mixer_.set_video_mix(mixer_.create_video_mix_fade(pri_video_source_id_, sec_video_source_id_, false, 0, fade, mfade_area_));
+ 	}
+     }
+     else
+     {
+ 	mixer_.set_video_mix(mixer_.create_video_mix_simple(pri_video_source_id_));
+@@ -651,10 +675,11 @@ void mixer_window::mfade_mix()
+     mfade_button_.set_sensitive(allow_mfade_);
+ }
+ 
+ void mixer_window::mfade_update()
+ {
++    mfade_area_ = mfade_area_choice_.get_active_row_number();
+     if (mfade_active_)
+     {
+ 	mfade_mix();
+     }
+ }

movable_selection.diff Added

@@ -0,0 +1,143 @@
+---
+ src/dv_display_widget.cpp |   57 +++++++++++++++++++++++++++++++++++++++++++---
+ src/dv_display_widget.hpp |    7 ++++-
+ 2 files changed, 60 insertions(+), 4 deletions(-)
+
+Index: dvswitch-0.9-1-da15ba4/src/dv_display_widget.cpp
+===================================================================
+--- dvswitch-0.9-1-da15ba4.orig/src/dv_display_widget.cpp
++++ dvswitch-0.9-1-da15ba4/src/dv_display_widget.cpp
+@@ -590,11 +590,41 @@ void dv_full_display_widget::window_to_f
+ 	       div_round_nearest<int>(window_y
+ 				      * (source_region_.bottom - source_region_.top),
+ 				      dest_height_));
+ }
+ 
+-void dv_full_display_widget::update_selection(int x2, int y2)
++bool dv_full_display_widget::is_inside_selection(int x, int y)
++{
++  if (x < selection_.left || x > selection_.right)  return false;
++  if (y < selection_.top  || y > selection_.bottom) return false;
++  return true;
++}
++
++void dv_full_display_widget::update_selection_move(int x2, int y2)
++{
++    if (source_region_.empty())
++	return;
++
++    int dx, dy;
++    dx = x2 - sel_start_x_; sel_start_x_ = x2;
++    dy = y2 - sel_start_y_; sel_start_y_ = y2;
++
++    // constrain movement within source_region
++    if (selection_.left   + dx < source_region_.left)   dx = source_region_.left  - selection_.left;
++    if (selection_.top    + dy < source_region_.top)    dy = source_region_.top   - selection_.top;
++    if (selection_.right  + dx > source_region_.right)  dx = source_region_.right - selection_.right;
++    if (selection_.bottom + dy > source_region_.bottom) dy = source_region_.bottom- selection_.bottom;
++
++    selection_.left   += dx;
++    selection_.right  += dx;
++    selection_.top    += dy;
++    selection_.bottom += dy;
++    queue_draw();	// jw@suse.de: this eats CPU. FIXME: do it only if no more drag events follow
++}
++
++
++void dv_full_display_widget::update_selection_redraw(int x2, int y2)
+ {
+     if (source_region_.empty())
+ 	return;
+ 
+     int frame_width = source_region_.right - source_region_.left;
+@@ -658,11 +688,27 @@ bool dv_full_display_widget::on_button_p
+ 	if (event->button == 1)
+ 	{
+ 	    sel_start_x_ = x;
+ 	    sel_start_y_ = y;
+ 	}
+-	update_selection(x, y);
++	// jw@suse.de: we now decide redraw or move mode.
++	// If we click inside the existing selection, change to a closed-hand cursor,
++	// and go into move mode, until we get a button_release_event
++	if (is_inside_selection(x, y))
++	  {
++	     sel_in_progress_mode_ = SEL_IN_PROGRESS_MODE_MOVE;
++             Glib::RefPtr<Gdk::Window> window(get_window());
++	     window->set_cursor(Gdk::Cursor(Gdk::FLEUR));
++	     sel_start_x_ = x;
++	     sel_start_y_ = y;
++	     update_selection_move(x, y);
++          }
++	else
++	  {
++	    sel_in_progress_mode_ = SEL_IN_PROGRESS_MODE_REDRAW;
++	    update_selection_redraw(x, y);
++	  }
+ 	return true;
+     }
+ 
+     return false;
+ }
+@@ -670,10 +716,12 @@ bool dv_full_display_widget::on_button_p
+ bool dv_full_display_widget::on_button_release_event(GdkEventButton * event)
+     throw()
+ {
+     if (sel_in_progress_ && (event->button == 1 || event->button == 2))
+     {
++	Glib::RefPtr<Gdk::Window> window(get_window());
++	window->set_cursor(Gdk::Cursor(Gdk::CROSSHAIR));
+ 	sel_in_progress_ = false;
+ 	remove_modal_grab();
+ 	return true;
+     }
+ 
+@@ -683,11 +731,14 @@ bool dv_full_display_widget::on_button_r
+ bool dv_full_display_widget::on_motion_notify_event(GdkEventMotion * event)
+     throw()
+ {
+     int x, y;
+     window_to_frame_coords(x, y, int(event->x), int(event->y));
+-    update_selection(x, y);
++    if (sel_in_progress_mode_ == SEL_IN_PROGRESS_MODE_REDRAW)
++      update_selection_redraw(x, y);
++    else // if (sel_in_progress_mode_ == SEL_IN_PROGRESS_MODE_MOVE)
++      update_selection_move(x, y);
+     return true;
+ }
+ 
+ bool dv_full_display_widget::on_expose_event(GdkEventExpose *) throw()
+ {
+Index: dvswitch-0.9-1-da15ba4/src/dv_display_widget.hpp
+===================================================================
+--- dvswitch-0.9-1-da15ba4.orig/src/dv_display_widget.hpp
++++ dvswitch-0.9-1-da15ba4/src/dv_display_widget.hpp
+@@ -73,11 +73,13 @@ private:
+     bool try_init_xvideo(PixelFormat pix_fmt, unsigned height) throw();
+     void fini_xvideo() throw();
+ 
+     void window_to_frame_coords(int & frame_x, int & frame_y,
+ 				int window_x, int window_y) throw();
+-    void update_selection(int x, int y);
++    void update_selection_redraw(int x, int y);	// jw@suse.de: renamed from update_selection()
++    void update_selection_move(int x, int y);	// jw@suse.de: variant of update_selection().
++    bool is_inside_selection(int x, int y);
+ 
+     virtual AVFrame * get_frame_header();
+     virtual AVFrame * get_frame_buffer(AVFrame * header,
+ 				       PixelFormat pix_fmt, unsigned height);
+     virtual void put_frame_buffer(const display_region &);
+@@ -96,10 +98,13 @@ private:
+     AVFrame frame_header_;
+     display_region source_region_;
+     unsigned dest_width_, dest_height_;
+     bool sel_enabled_;
+     bool sel_in_progress_;
++    bool sel_in_progress_mode_;
++#define SEL_IN_PROGRESS_MODE_REDRAW	0	// traditional redraw from scratch
++#define SEL_IN_PROGRESS_MODE_MOVE	1	// drag the selection around, size unchanged
+     bool highlight_title_safe_area_;
+     int sel_start_x_, sel_start_y_;
+     rectangle selection_;
+ };
+

repeating_frame_dots.diff Added

@@ -0,0 +1,58 @@
+---
+ src/mixer.cpp |   17 ++++++++++++++++-
+ 1 file changed, 16 insertions(+), 1 deletion(-)
+
+Index: dvswitch-0.9-1-da15ba4/src/mixer.cpp
+===================================================================
+--- dvswitch-0.9-1-da15ba4.orig/src/mixer.cpp
++++ dvswitch-0.9-1-da15ba4/src/mixer.cpp
+@@ -835,10 +835,11 @@ mixer::create_video_mix_fade(source_id p
+ void mixer::run_mixer()
+ {
+     dv_frame_ptr last_mixed_dv;
+     unsigned serial_num = 0;
+     const mix_data * m = 0;
++    unsigned repeating_mixed_frame = 0;
+ 
+     auto_codec decoder(auto_codec_open_decoder(CODEC_ID_DVVIDEO));
+     AVCodecContext * dec = decoder.get();
+     dec->get_buffer = raw_frame_get_buffer;
+     dec->release_buffer = raw_frame_release_buffer;
+@@ -919,11 +920,19 @@ void mixer::run_mixer()
+ 	    }
+ 	}
+ 
+ 	if (!mixed_dv)
+ 	{
+-	    std::cerr << "WARN: Repeating mixed frame\n"; // XXX not very informative
++	    if (!(repeating_mixed_frame & 0x3ff))
++	      {
++	        if (repeating_mixed_frame)
++	          std::cerr << "\n";
++	        std::cerr << "WARN: Repeating mixed frame " << serial_num << "\n"; // XXX not very informative
++		repeating_mixed_frame++;
++	      }
++	    else 
++	      std::cerr << ".";
+ 
+ 	    // Make a copy of the last mixed frame so we can
+ 	    // replace the audio.  (We can't modify the last frame
+ 	    // because sinks may still be reading from it.)
+ 	    mixed_dv = allocate_dv_frame();
+@@ -931,10 +940,16 @@ void mixer::run_mixer()
+ 			last_mixed_dv.get(),
+ 			offsetof(dv_frame, buffer)
+ 			+ dv_frame_system(last_mixed_dv.get())->size);
+ 	    mixed_dv->serial_num = serial_num;
+ 	}
++	else
++	{
++	  if (repeating_mixed_frame)
++	    std::cerr << "WARN: End repeating " << serial_num << "\n";
++	  repeating_mixed_frame = 0;
++	}
+ 
+ 	const dv_frame_ptr & audio_source_dv =
+ 	    m->source_frames[m->settings.audio_source_id];
+ 
+ 	if (!audio_source_dv ||

retry_connect_option.diff Added

@@ -0,0 +1,880 @@
+---
+ doc/dvsink-command.1  |    5 ++++
+ doc/dvsink-files.1    |    5 ++++
+ doc/dvsource-alsa.1   |    5 ++++
+ doc/dvsource-dvgrab.1 |    5 ++++
+ doc/dvsource-file.1   |    5 ++++
+ doc/dvswitch.1        |    5 ++++
+ src/dvsink-command.c  |   20 ++++++++++++++++---
+ src/dvsink-files.c    |   46 ++++++++++++++++++++++++++++++--------------
+ src/dvsource-alsa.c   |   19 +++++++++++++++---
+ src/dvsource-dvgrab.c |   22 +++++++++++++++++----
+ src/dvsource-file.c   |   52 ++++++++++++++++++++++++++++++++++++--------------
+ src/dvsource-jack.c   |    2 -
+ src/socket.c          |   18 +++++++++++++++--
+ src/socket.h          |    2 -
+ 14 files changed, 169 insertions(+), 42 deletions(-)
+
+Index: dvswitch-0.9-1-da15ba4/doc/dvsink-command.1
+===================================================================
+--- dvswitch-0.9-1-da15ba4.orig/doc/dvsink-command.1
++++ dvswitch-0.9-1-da15ba4/doc/dvsink-command.1
+@@ -16,9 +16,14 @@ appear as its standard input.
+ \fB\-p\fR, \fB\-\-port=\fIPORT\fR
+ .RS
+ Specify the network address on which DVswitch is listening.  The host
+ address may be specified by name or as an IPv4 or IPv6 literal.
+ .RE
++.TP
++\fB\-R\fR, \fB\-\-retry\fR
++.RS
++Keep retrying to connect, in case DVswitch is not yet listening.
++.RE
+ .SH AUTHOR
+ Ben Hutchings <ben@decadent.org.uk>.
+ .SH SEE ALSO
+ /usr/share/doc/dvswitch/README
+Index: dvswitch-0.9-1-da15ba4/doc/dvsink-files.1
+===================================================================
+--- dvswitch-0.9-1-da15ba4.orig/doc/dvsink-files.1
++++ dvswitch-0.9-1-da15ba4/doc/dvsink-files.1
+@@ -21,9 +21,14 @@ added before the ".dv" if necessary to a
+ \fB\-p\fR, \fB\-\-port=\fIPORT\fR
+ .RS
+ Specify the network address on which DVswitch is listening.  The host
+ address may be specified by name or as an IPv4 or IPv6 literal.
+ .RE
++.TP
++\fB\-R\fR, \fB\-\-retry\fR
++.RS
++Keep retrying to connect, in case DVswitch is not yet listening.
++.RE
+ .SH AUTHOR
+ Ben Hutchings <ben@decadent.org.uk>.
+ .SH SEE ALSO
+ strftime(3), /usr/share/doc/dvswitch/README
+Index: dvswitch-0.9-1-da15ba4/doc/dvsource-alsa.1
+===================================================================
+--- dvswitch-0.9-1-da15ba4.orig/doc/dvsource-alsa.1
++++ dvswitch-0.9-1-da15ba4/doc/dvsource-alsa.1
+@@ -25,10 +25,15 @@ for an explanation of these names.
+ .RS
+ Specify the network address on which DVswitch is listening.  The host
+ address may be specified by name or as an IPv4 or IPv6 literal.
+ .RE
+ .TP
++\fB\-R\fR, \fB\-\-retry\fR
++.RS
++Keep retrying to connect, in case DVswitch is not yet listening.
++.RE
++.TP
+ \fB\-s\fR, \fB\-\-system=\fRntsc|pal
+ .RS
+ Specify the video system to use.  This must match the system used by
+ DVswitch.  The default is "pal".
+ .RE
+Index: dvswitch-0.9-1-da15ba4/doc/dvsource-dvgrab.1
+===================================================================
+--- dvswitch-0.9-1-da15ba4.orig/doc/dvsource-dvgrab.1
++++ dvswitch-0.9-1-da15ba4/doc/dvsource-dvgrab.1
+@@ -50,10 +50,15 @@ Print more information at startup.
+ .RS
+ Specify the network address on which DVswitch is listening.  The host
+ address may be specified by name or as an IPv4 or IPv6 literal.
+ .RE
+ .TP
++\fB\-R\fR, \fB\-\-retry\fR
++.RS
++Keep retrying to connect, in case DVswitch is not yet listening.
++.RE
++.TP
+ \fB\-c\fR, \fB\-\-card=\fICARD-NUMBER\fR
+ .RS
+ Specify the index of the Firewire card the DV device is connected to.
+ .RE
+ .TP
+Index: dvswitch-0.9-1-da15ba4/doc/dvsource-file.1
+===================================================================
+--- dvswitch-0.9-1-da15ba4.orig/doc/dvsource-file.1
++++ dvswitch-0.9-1-da15ba4/doc/dvsource-file.1
+@@ -20,10 +20,15 @@ purposes.
+ .RS
+ Specify the network address on which DVswitch is listening.  The host
+ address may be specified by name or as an IPv4 or IPv6 literal.
+ .RE
+ .TP
++\fB\-R\fR, \fB\-\-retry\fR
++.RS
++Keep retrying to connect, in case DVswitch is not yet listening.
++.RE
++.TP
+ .BR \-l , " \-\-loop"
+ .RS
+ Play the file repeatedly in a loop.
+ .RE
+ .TP
+Index: dvswitch-0.9-1-da15ba4/doc/dvswitch.1
+===================================================================
+--- dvswitch-0.9-1-da15ba4.orig/doc/dvswitch.1
++++ dvswitch-0.9-1-da15ba4/doc/dvswitch.1
+@@ -29,9 +29,14 @@ or as an IPv4 or IPv6 literal.
+ This option activates the remote-control mode.
+ If set, dvswitch will listen for OSC messages on the given port.
+ OSC messages understood by dvcontrol are documented in the
+ \fBREADME\fR file.
+ .RE
++.TP
++\fB\-R\fR, \fB\-\-retry\fR
++.RS
++Keep retrying to connect, in case DVswitch is not yet listening.
++.RE
+ .SH AUTHOR
+ Ben Hutchings <ben@decadent.org.uk>.
+ .SH SEE ALSO
+ gtk-options(7), /usr/share/doc/dvswitch/README
+Index: dvswitch-0.9-1-da15ba4/src/dvsink-command.c
+===================================================================
+--- dvswitch-0.9-1-da15ba4.orig/src/dvsink-command.c
++++ dvswitch-0.9-1-da15ba4/src/dvsink-command.c
+@@ -2,10 +2,11 @@
+ // See the file "COPYING" for licence details.
+ 
+ // Sink that runs an arbitrary command
+ 
+ #include <assert.h>
++#include <stdbool.h>
+ #include <stddef.h>
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
+ 
+@@ -18,15 +19,17 @@
+ 
+ static struct option options[] = {
+     {"host",   1, NULL, 'h'},
+     {"port",   1, NULL, 'p'},
+     {"help",   0, NULL, 'H'},
++    {"retry",  0, NULL, 'R'},
+     {NULL,     0, NULL, 0}
+ };
+ 
+ static char * mixer_host = NULL;
+ static char * mixer_port = NULL;
++static bool retry_connect = false;
+ 
+ static void handle_config(const char * name, const char * value)
+ {
+     if (strcmp(name, "MIXER_HOST") == 0)
+     {
+@@ -36,17 +39,25 @@ static void handle_config(const char * n
+     else if (strcmp(name, "MIXER_PORT") == 0)
+     {
+ 	free(mixer_port);
+ 	mixer_port = strdup(value);
+     }
++    else if (strcmp(name, "RETRY_CONNECT") == 0)
++    {
++        if (!strcasecmp(value, "yes")  || !strcmp(value, "1") || 
++	    !strcasecmp(value, "true") || !strcasecmp(value, "on"))
++	  retry_connect = true;
++	else
++	  retry_connect = false;
++    }
+ }
+ 
+ static void usage(const char * progname)
+ {
+     fprintf(stderr,
+ 	    "\
+-Usage: %s [-h HOST] [-p PORT] COMMAND...\n",
++Usage: %s [-r] [-h HOST] [-p PORT] COMMAND...\n",
+ 	    progname);
+ }
+ 
+ int main(int argc, char ** argv)
+ {
+@@ -54,11 +65,11 @@ int main(int argc, char ** argv)
+     dvswitch_read_config(handle_config);
+ 
+     // Parse arguments.
+ 
+     int opt;
+-    while ((opt = getopt_long(argc, argv, "h:p:", options, NULL)) != -1)
++    while ((opt = getopt_long(argc, argv, "h:p:R", options, NULL)) != -1)
+     {
+ 	switch (opt)
+ 	{
+ 	case 'h':
+ 	    free(mixer_host);
+@@ -69,10 +80,13 @@ int main(int argc, char ** argv)
+ 	    mixer_port = strdup(optarg);
+ 	    break;
+ 	case 'H': // --help
+ 	    usage(argv[0]);
+ 	    return 0;
++	case 'R':
++	    retry_connect = true;
++	    break;
+ 	default:
+ 	    usage(argv[0]);
+ 	    return 2;
+ 	}
+     }
+@@ -92,11 +106,11 @@ int main(int argc, char ** argv)
+     }
+ 
+     // Connect to the mixer, set that as stdin, and run given command.
+ 
+     printf("INFO: Connecting to %s:%s\n", mixer_host, mixer_port);
+-    int sock = create_connected_socket(mixer_host, mixer_port);
++    int sock = create_connected_socket(mixer_host, mixer_port, retry_connect);
+     assert(sock >= 0); // create_connected_socket() should handle errors
+     if (write(sock, GREETING_RAW_SINK, GREETING_SIZE) != GREETING_SIZE)
+     {
+ 	perror("ERROR: write");
+ 	exit(1);
+Index: dvswitch-0.9-1-da15ba4/src/dvsink-files.c
+===================================================================
+--- dvswitch-0.9-1-da15ba4.orig/src/dvsink-files.c
++++ dvswitch-0.9-1-da15ba4/src/dvsink-files.c
+@@ -3,10 +3,11 @@
+ // See the file "COPYING" for licence details.
+ 
+ // Sink that creates DIF ("raw DV") files
+ 
+ #include <assert.h>
++#include <stdbool.h>
+ #include <errno.h>
+ #include <stddef.h>
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
+@@ -25,16 +26,18 @@
+ 
+ static struct option options[] = {
+     {"host",   1, NULL, 'h'},
+     {"port",   1, NULL, 'p'},
+     {"help",   0, NULL, 'H'},
++    {"retry",  0, NULL, 'R'},
+     {NULL,     0, NULL, 0}
+ };
+ 
+ static char * mixer_host = NULL;
+ static char * mixer_port = NULL;
+ static char * output_name_format = NULL;
++static bool retry_connect = false;
+ 
+ static void handle_config(const char * name, const char * value)
+ {
+     if (strcmp(name, "MIXER_HOST") == 0)
+     {
+@@ -49,17 +52,25 @@ static void handle_config(const char * n
+     else if (strcmp(name, "OUTPUT_NAME_FORMAT") == 0)
+     {
+ 	free(output_name_format);
+ 	output_name_format = strdup(value);
+     }
++    else if (strcmp(name, "RETRY_CONNECT") == 0)
++    {
++        if (!strcasecmp(value, "yes")  || !strcmp(value, "1") || 
++	    !strcasecmp(value, "true") || !strcasecmp(value, "on"))
++	  retry_connect = true;
++	else
++	  retry_connect = false;
++    }
+ }
+ 
+ static void usage(const char * progname)
+ {
+     fprintf(stderr,
+ 	    "\
+-Usage: %s [-h HOST] [-p PORT] [NAME-FORMAT]\n",
++Usage: %s [-R] [-h HOST] [-p PORT] [NAME-FORMAT]\n",
+ 	    progname);
+ }
+ 
+ struct transfer_params {
+     int            sock;
+@@ -160,11 +171,11 @@ static ssize_t write_retry(int fd, const
+     while (count);
+ 
+     return total;
+ }
+ 
+-static void transfer_frames(struct transfer_params * params)
++static void transfer_frames(struct transfer_params * params, int retry_connect)
+ {
+     static uint8_t buf[SINK_FRAME_HEADER_SIZE + DIF_MAX_FRAME_SIZE];
+     const struct dv_system * system;
+ 
+     int file = -1;
+@@ -236,19 +247,19 @@ static void transfer_frames(struct trans
+ 
+ 	if (write_retry(file, buf + SINK_FRAME_HEADER_SIZE, system->size)
+ 	    != (ssize_t)system->size)
+ 	{
+ 	    perror("ERROR: write");
+-	    exit(1);
++	    if (!retry_connect) exit(1);
+ 	}
+     }
+ 
+ read_failed:
+     if (read_size != 0)
+     {
+ 	perror("ERROR: read");
+-	exit(1);
++	if (!retry_connect) exit(1);
+     }
+ 
+     if (file >= 0)
+ 	close(file);
+ }
+@@ -259,11 +270,11 @@ int main(int argc, char ** argv)
+     dvswitch_read_config(handle_config);
+ 
+     // Parse arguments.
+ 
+     int opt;
+-    while ((opt = getopt_long(argc, argv, "h:p:", options, NULL)) != -1)
++    while ((opt = getopt_long(argc, argv, "h:p:R", options, NULL)) != -1)
+     {
+ 	switch (opt)
+ 	{
+ 	case 'h':
+ 	    free(mixer_host);
+@@ -274,10 +285,13 @@ int main(int argc, char ** argv)
+ 	    mixer_port = strdup(optarg);
+ 	    break;
+ 	case 'H': // --help
+ 	    usage(argv[0]);
+ 	    return 0;
++	case 'R':
++	    retry_connect = true;
++	    break;
+ 	default:
+ 	    usage(argv[0]);
+ 	    return 2;
+ 	}
+     }
+@@ -308,20 +322,24 @@ int main(int argc, char ** argv)
+     }
+ 
+     struct transfer_params params;
+     printf("INFO: Connecting to %s:%s\n", mixer_host, mixer_port);
+     fflush(stdout);
+-    params.sock = create_connected_socket(mixer_host, mixer_port);
+-    assert(params.sock >= 0); // create_connected_socket() should handle errors
+-    if (write(params.sock, GREETING_REC_SINK, GREETING_SIZE) != GREETING_SIZE)
++    do
+     {
+-	perror("ERROR: write");
+-	exit(1);
+-    }
+-    printf("INFO: Connected.\n");
++	params.sock = create_connected_socket(mixer_host, mixer_port, retry_connect);
++	assert(params.sock >= 0); // create_connected_socket() should handle errors
++	if (write(params.sock, GREETING_REC_SINK, GREETING_SIZE) != GREETING_SIZE)
++	{
++	    perror("ERROR: write GREETING_REC_SINK");
++	    exit(1);
++	}
++	printf("INFO: Connected.\n");
+ 
+-    transfer_frames(&params);
++	transfer_frames(&params, retry_connect);
+ 
+-    close(params.sock);
++	close(params.sock);
++	printf("INFO: Disconnected.\n");
++    } while (retry_connect);
+ 
+     return 0;
+ }
+Index: dvswitch-0.9-1-da15ba4/src/dvsource-alsa.c
+===================================================================
+--- dvswitch-0.9-1-da15ba4.orig/src/dvsource-alsa.c
++++ dvswitch-0.9-1-da15ba4/src/dvsource-alsa.c
+@@ -29,15 +29,17 @@ static struct option options[] = {
+     {"port",   1, NULL, 'p'},
+     {"system", 1, NULL, 's'},
+     {"rate",   1, NULL, 'r'},
+     {"delay",  1, NULL, 'd'},
+     {"help",   0, NULL, 'H'},
++    {"retry",  0, NULL, 'R'},
+     {NULL,     0, NULL, 0}
+ };
+ 
+ static char * mixer_host = NULL;
+ static char * mixer_port = NULL;
++static bool retry_connect = false;
+ 
+ static void handle_config(const char * name, const char * value)
+ {
+     if (strcmp(name, "MIXER_HOST") == 0)
+     {
+@@ -47,17 +49,25 @@ static void handle_config(const char * n
+     else if (strcmp(name, "MIXER_PORT") == 0)
+     {
+ 	free(mixer_port);
+ 	mixer_port = strdup(value);
+     }
++    else if (strcmp(name, "RETRY_CONNECT") == 0)
++    {
++        if (!strcasecmp(value, "yes")  || !strcmp(value, "1") || 
++	    !strcasecmp(value, "true") || !strcasecmp(value, "on"))
++	  retry_connect = true;
++	else
++	  retry_connect = false;
++    }
+ }
+ 
+ static void usage(const char * progname)
+ {
+     fprintf(stderr,
+ 	    "\
+-Usage: %s [-h HOST] [-p PORT] [-s ntsc|pal] \\\n\
++Usage: %s [-R] [-h HOST] [-p PORT] [-s ntsc|pal] \\\n\
+            [-r 48000|32000|44100] [-d DELAY] [DEVICE]\n",
+ 	    progname);
+ }
+ 
+ struct transfer_params {
+@@ -140,11 +150,11 @@ int main(int argc, char ** argv)
+     double delay = 0.2;
+ 
+     /* Parse arguments. */
+ 
+     int opt;
+-    while ((opt = getopt_long(argc, argv, "h:p:s:r:d:", options, NULL)) != -1)
++    while ((opt = getopt_long(argc, argv, "h:p:s:r:d:R", options, NULL)) != -1)
+     {
+ 	switch (opt)
+ 	{
+ 	case 'h':
+ 	    free(mixer_host);
+@@ -165,10 +175,13 @@ int main(int argc, char ** argv)
+ 	    delay = strtod(optarg, NULL);
+ 	    break;
+ 	case 'H': /* --help */
+ 	    usage(argv[0]);
+ 	    return 0;
++	case 'R':
++	    retry_connect = true;
++	    break;
+ 	default:
+ 	    usage(argv[0]);
+ 	    return 2;
+ 	}
+     }
+@@ -277,11 +290,11 @@ int main(int argc, char ** argv)
+ 	fprintf(stderr, "ERROR: snd_pcm_hw_params: %s\n", snd_strerror(rc));
+ 	return 1;
+     }
+ 
+     printf("INFO: Connecting to %s:%s\n", mixer_host, mixer_port);
+-    params.sock = create_connected_socket(mixer_host, mixer_port);
++    params.sock = create_connected_socket(mixer_host, mixer_port, retry_connect);
+     assert(params.sock >= 0); /* create_connected_socket() should handle errors */
+     if (write(params.sock, GREETING_SOURCE, GREETING_SIZE) != GREETING_SIZE)
+     {
+ 	perror("ERROR: write");
+ 	exit(1);
+Index: dvswitch-0.9-1-da15ba4/src/dvsource-dvgrab.c
+===================================================================
+--- dvswitch-0.9-1-da15ba4.orig/src/dvsource-dvgrab.c
++++ dvswitch-0.9-1-da15ba4/src/dvsource-dvgrab.c
+@@ -4,10 +4,11 @@
+  * See the file "COPYING" for licence details.
+  */
+ /* Source that reads DIF over USB or Firewire using dvgrab */
+ 
+ #include <assert.h>
++#include <stdbool.h>
+ #include <stddef.h>
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
+ 
+@@ -18,14 +19,15 @@
+ #include "protocol.h"
+ #include "socket.h"
+ 
+ static struct option options[] = {
+     {"card",     1, NULL, 'c'},
+-    {"guid",	  1, NULL, 'g'},
++    {"guid",	 1, NULL, 'g'},
+     {"firewire", 0, NULL, 'F'},
+     {"v4l2",     0, NULL, 'V'},
+     {"command",  0, NULL, 'C'},
++    {"retry",    0, NULL, 'R'},
+     {"host",     1, NULL, 'h'},
+     {"port",     1, NULL, 'p'},
+     {"tally",    0, NULL, 't'},
+     {"verbose",  0, NULL, 'v'},
+     {"help",     0, NULL, 'H'},
+@@ -44,10 +46,11 @@ static char * device_name = NULL;
+ static char * firewire_card = NULL;
+ static char * firewire_guid = NULL;
+ static char * mixer_host = NULL;
+ static char * mixer_port = NULL;
+ static int do_tally = 0;
++static bool retry_connect = false;
+ static int verbose = 0;
+ 
+ static enum mode program_mode(const char * progname)
+ {
+     const char * slash = strrchr(progname, '/');
+@@ -89,20 +92,28 @@ static void handle_config(const char * n
+     else if (strcmp(name, "MIXER_PORT") == 0)
+     {
+ 	free(mixer_port);
+ 	mixer_port = strdup(value);
+     }
++    else if (strcmp(name, "RETRY_CONNECT") == 0)
++    {
++        if (!strcasecmp(value, "yes")  || !strcmp(value, "1") || 
++	    !strcasecmp(value, "true") || !strcasecmp(value, "on"))
++	  retry_connect = true;
++	else
++	  retry_connect = false;
++    }
+ }
+ 
+ static void usage(const char * progname)
+ {
+     static const char firewire_args[] =
+ 	"[-c CARD-NUMBER | DEVICE] [-g GUID]";
+     static const char v4l2_args[] = "[DEVICE]";
+     static const char cmd_args[] = "['ffmpeg -v quiet -f alsa -ac 1 -i hw:1 -f v4l2 -i /dev/video0 -target pal-dv pipe:1']";
+     static const char other_args[] =
+-	"[-t] [-v] [-h HOST] [-p PORT]";
++	"[--tally|-t] [-v] [--retry|-R] [-h HOST] [-p PORT]";
+ 
+     switch (program_mode(progname))
+     {
+     case mode_unknown:
+ 	fprintf(stderr,
+@@ -191,11 +202,11 @@ int main(int argc, char ** argv)
+     dvswitch_read_config(handle_config);
+ 
+     /* Parse arguments. */
+ 
+     int opt;
+-    while ((opt = getopt_long(argc, argv, "c:g:h:p:tvFVC", options, NULL)) != -1)
++    while ((opt = getopt_long(argc, argv, "c:g:h:p:tvFVCR", options, NULL)) != -1)
+     {
+ 	switch (opt)
+ 	{
+ 	case 'c':
+ 	    free(firewire_card);
+@@ -212,10 +223,13 @@ int main(int argc, char ** argv)
+ 	    mode = mode_v4l2;
+ 	    break;
+ 	case 'C':
+ 	    mode = mode_command;
+ 	    break;
++	case 'R':
++	    retry_connect = true;
++	    break;
+ 	case 'h':
+ 	    free(mixer_host);
+ 	    mixer_host = strdup(optarg);
+ 	    break;
+ 	case 'p':
+@@ -287,11 +301,11 @@ int main(int argc, char ** argv)
+     }
+ 
+     /* Connect to the mixer. */
+ 
+     printf("INFO: Connecting to %s:%s\n", mixer_host, mixer_port);
+-    int sock = create_connected_socket(mixer_host, mixer_port);
++    int sock = create_connected_socket(mixer_host, mixer_port, retry_connect);
+     assert(sock >= 0); /* create_connected_socket() should handle errors */
+     if (write(sock, do_tally ? GREETING_ACT_SOURCE : GREETING_SOURCE,
+               GREETING_SIZE) != GREETING_SIZE)
+     {
+ 	perror("ERROR: write");
+Index: dvswitch-0.9-1-da15ba4/src/socket.c
+===================================================================
+--- dvswitch-0.9-1-da15ba4.orig/src/socket.c
++++ dvswitch-0.9-1-da15ba4/src/socket.c
+@@ -4,16 +4,19 @@
+ /* Socket utility functions */
+ 
+ #include <errno.h>
+ #include <stdio.h>
+ #include <stdlib.h>
++#include <unistd.h>	// sleep()
+ 
+ #include <netdb.h>
+ #include <sys/socket.h>
+ #include <sys/types.h>
+ 
+-int create_connected_socket(const char * host, const char * port)
++#include "socket.h"
++
++int create_connected_socket(const char * host, const char * port, int do_retry)
+ {
+     struct addrinfo addr_hints = {
+ 	.ai_family =   AF_UNSPEC,
+ 	.ai_socktype = SOCK_STREAM,
+ 	.ai_flags =    AI_ADDRCONFIG
+@@ -31,15 +34,26 @@ int create_connected_socket(const char *
+     if (sock < 0)
+     {
+ 	perror("ERROR: socket");
+ 	exit(1);
+     }
+-    if (connect(sock, addr->ai_addr, addr->ai_addrlen) != 0)
++
++    int dots = 0;
++    while (connect(sock, addr->ai_addr, addr->ai_addrlen) != 0)
+     {
++        if (do_retry)
++	  {
++	    dots = 1;
++	    fprintf(stderr, ".");
++	    sleep(2);
++	    continue;
++	  }
+ 	perror("ERROR: connect");
+ 	exit(1);
+     }
++    if (dots)
++        fprintf(stderr, "\n");
+ 
+     freeaddrinfo(addr);
+     return sock;
+ }
+ 
+Index: dvswitch-0.9-1-da15ba4/src/socket.h
+===================================================================
+--- dvswitch-0.9-1-da15ba4.orig/src/socket.h
++++ dvswitch-0.9-1-da15ba4/src/socket.h
+@@ -8,11 +8,11 @@
+ 
+ #ifdef __cplusplus
+ extern "C" {
+ #endif
+ 
+-int create_connected_socket(const char * host, const char * port);
++int create_connected_socket(const char * host, const char * port, int do_retry);
+ int create_listening_socket(const char * host, const char * port);
+ 
+ #ifdef __cplusplus
+ }
+ #endif
+Index: dvswitch-0.9-1-da15ba4/src/dvsource-jack.c
+===================================================================
+--- dvswitch-0.9-1-da15ba4.orig/src/dvsource-jack.c
++++ dvswitch-0.9-1-da15ba4/src/dvsource-jack.c
+@@ -431,11 +431,11 @@ int main(int argc, char ** argv)
+     params.rb = jack_ringbuffer_create(rbsize);
+     memset(params.rb->buf, 0, rbsize);
+ 
+ 
+     printf("INFO: Connecting to %s:%s\n", mixer_host, mixer_port);
+-    params.sock = create_connected_socket(mixer_host, mixer_port);
++    params.sock = create_connected_socket(mixer_host, mixer_port, 0);
+     assert(params.sock >= 0); /* create_connected_socket() should handle errors */
+     if (write(params.sock, GREETING_SOURCE, GREETING_SIZE) != GREETING_SIZE)
+     {
+ 	close_jack(&params);
+ 	perror("ERROR: write");
+Index: dvswitch-0.9-1-da15ba4/src/dvsource-file.c
+===================================================================
+--- dvswitch-0.9-1-da15ba4.orig/src/dvsource-file.c
++++ dvswitch-0.9-1-da15ba4/src/dvsource-file.c
+@@ -15,10 +15,11 @@
+ #include <getopt.h>
+ #include <sys/types.h>
+ #include <sys/stat.h>
+ #include <unistd.h>
+ #include <netinet/in.h>
++#include <signal.h>
+ 
+ #include "config.h"
+ #include "dif.h"
+ #include "frame_timer.h"
+ #include "protocol.h"
+@@ -28,15 +29,17 @@ static struct option options[] = {
+     {"host",   1, NULL, 'h'},
+     {"port",   1, NULL, 'p'},
+     {"loop",   0, NULL, 'l'},
+     {"help",   0, NULL, 'H'},
+     {"timings",0, NULL, 't'},
++    {"retry",  0, NULL, 'R'},
+     {NULL,     0, NULL, 0}
+ };
+ 
+ static char * mixer_host = NULL;
+ static char * mixer_port = NULL;
++static bool retry_connect = false;
+ 
+ static void handle_config(const char * name, const char * value)
+ {
+     if (strcmp(name, "MIXER_HOST") == 0)
+     {
+@@ -46,10 +49,18 @@ static void handle_config(const char * n
+     else if (strcmp(name, "MIXER_PORT") == 0)
+     {
+ 	free(mixer_port);
+ 	mixer_port = strdup(value);
+     }
++    else if (strcmp(name, "RETRY_CONNECT") == 0)
++    {
++        if (!strcasecmp(value, "yes")  || !strcmp(value, "1") || 
++	    !strcasecmp(value, "true") || !strcasecmp(value, "on"))
++	  retry_connect = true;
++	else
++	  retry_connect = false;
++    }
+ }
+ 
+ static unsigned int get_file_size_bytes(int fd) 
+ {
+     struct stat filestat;
+@@ -63,11 +74,11 @@ static unsigned int get_file_size_bytes(
+ 
+ static void usage(const char * progname)
+ {
+     fprintf(stderr,
+ 	    "\
+-Usage: %s [-h HOST] [-p PORT] [-l] [-t] FILE\n",
++Usage: %s [-R] [-h HOST] [-p PORT] [--loop] [-t] FILE\n",
+ 	    progname);
+ }
+ 
+ struct transfer_params {
+     int            file;
+@@ -96,11 +107,11 @@ static ssize_t read_retry(int fd, void *
+     while (count);
+ 
+     return total;
+ }
+ 
+-static void transfer_frames(struct transfer_params * params)
++static void transfer_frames(struct transfer_params * params, int retry_connect)
+ {
+     const struct dv_system * last_system = 0, * system;
+     static uint8_t buf[DIF_MAX_FRAME_SIZE];
+     uint64_t frame_timestamp = 0;
+     unsigned int frame_interval = 0;
+@@ -137,18 +148,20 @@ static void transfer_frames(struct trans
+                 num_frames = 0;
+                 video_length_sec = 0;
+                 continue;
+             }
+             perror("ERROR: lseek");
++	    if (retry_connect) return;
+             exit(1);
+ 	}
+ 	if (size != (ssize_t)DIF_SEQUENCE_SIZE)
+ 	{
+ 	    if (size < 0)
+ 		perror("ERROR: read");
+ 	    else
+ 		fputs("ERROR: Failed to read complete frame\n", stderr);
++	    if (retry_connect) return;
+ 	    exit(1);
+ 	}
+ 
+ 	system = dv_buffer_system(buf);
+ 
+@@ -167,16 +180,18 @@ static void transfer_frames(struct trans
+ 	{
+ 	    if (size < 0)
+ 		perror("ERROR: read");
+ 	    else
+ 		fputs("ERROR: Failed to read complete frame\n", stderr);
++	    if (retry_connect) return;
+ 	    exit(1);
+ 	}
+ 	frame_number++;
+ 	if (write(params->sock, buf, system->size) != (ssize_t)system->size)
+ 	{
+ 	    perror("ERROR: write");
++	    if (retry_connect) return;
+ 	    exit(1);
+ 	}
+ 
+ 	frame_timestamp += frame_interval;
+ 
+@@ -235,11 +250,11 @@ int main(int argc, char ** argv)
+     params.timings = false;
+ 
+     /* Parse arguments. */
+ 
+     int opt;
+-    while ((opt = getopt_long(argc, argv, "h:p:lt", options, NULL)) != -1)
++    while ((opt = getopt_long(argc, argv, "h:p:ltR", options, NULL)) != -1)
+     {
+ 	switch (opt)
+ 	{
+ 	case 'h':
+ 	    free(mixer_host);
+@@ -256,10 +271,13 @@ int main(int argc, char ** argv)
+ 	    usage(argv[0]);
+ 	    return 0;
+ 	case 't':
+ 	    params.timings = true;
+ 	    break;
++	case 'R':
++	    retry_connect = true;
++	    break;
+ 	default:
+ 	    usage(argv[0]);
+ 	    return 2;
+ 	}
+     }
+@@ -285,10 +303,12 @@ int main(int argc, char ** argv)
+ 	}
+ 	usage(argv[0]);
+ 	return 2;
+     }
+ 
++    signal(SIGPIPE, SIG_IGN);	// make Broken pipe visible in perror write.
++
+     const char * filename = argv[optind];
+ 
+     /* Prepare to read the file and connect a socket to the mixer. */
+     if (strcmp(filename, "-"))
+     {
+@@ -308,21 +328,25 @@ int main(int argc, char ** argv)
+     if (!is_dv_file(params.file)) {
+         fprintf(stderr, "ERROR: %s is not a DV file\n", filename);
+ 	return 1;
+     }
+     printf("INFO: Connecting to %s:%s\n", mixer_host, mixer_port);
+-    params.sock = create_connected_socket(mixer_host, mixer_port);
+-    assert(params.sock >= 0); /* create_connected_socket() should handle errors */
+-    if (write(params.sock, GREETING_SOURCE, GREETING_SIZE) != GREETING_SIZE)
++    do
+     {
+-	perror("ERROR: write");
+-	exit(1);
+-    }
+-    printf("INFO: Connected.\n");
+-
+-    transfer_frames(&params);
++	params.sock = create_connected_socket(mixer_host, mixer_port, retry_connect);
++	assert(params.sock >= 0); /* create_connected_socket() should handle errors */
++	if (write(params.sock, GREETING_SOURCE, GREETING_SIZE) != GREETING_SIZE)
++	{
++	    perror("ERROR: write");
++	    exit(1);
++	}
++	printf("INFO: Connected.\n");
+ 
+-    close(params.sock);
+-    close(params.file);
++	transfer_frames(&params, retry_connect);
+ 
++	close(params.sock);
++	close(params.file);
++	printf("INFO: Disonnected.\n");
++    } while (retry_connect);
++ 
+     return 0;
+ }

revert_wouter.diff Added

@@ -0,0 +1,91 @@
+diff --git a/src/tally_rtsp_server.cpp b/src/tally_rtsp_server.cpp
+index 382f6cd..b8ad598 100644
+--- a/src/tally_rtsp_server.cpp
++++ b/src/tally_rtsp_server.cpp
+@@ -50,30 +50,30 @@ tally_rtsp_server* tally_rtsp_server::createNew(int pipefd, bool verbose, UsageE
+     return NULL;
+ }
+ 
+-RTSPServer::RTSPClientConnection*
+-tally_rtsp_server::createNewClientConnection(int clientSocket, struct sockaddr_in clientAddr)
++RTSPServer::RTSPClientSession*
++tally_rtsp_server::createNewClientSession(unsigned sessionId, int clientSocket, struct sockaddr_in clientAddr)
+ {
+-    return new RTSPClientConnection(*this, clientSocket, clientAddr);
++    return new RTSPClientSession(*this, sessionId, clientSocket, clientAddr);
+ }
+ 
+-tally_rtsp_server::RTSPClientConnection::RTSPClientConnection(tally_rtsp_server& ourServer, int clientSocket, struct sockaddr_in clientAddr)
+-    : RTSPServer::RTSPClientConnection(ourServer, clientSocket, clientAddr), server_(ourServer)
++tally_rtsp_server::RTSPClientSession::RTSPClientSession(tally_rtsp_server& ourServer, unsigned sessionId, int clientSocket, struct sockaddr_in clientAddr)
++    : RTSPServer::RTSPClientSession(ourServer, sessionId, clientSocket, clientAddr), server_(ourServer)
+ {
+ }
+ 
+-tally_rtsp_server::RTSPClientConnection::~RTSPClientConnection()
++tally_rtsp_server::RTSPClientSession::~RTSPClientSession()
+ {
+ }
+ 
+ void
+-tally_rtsp_server::RTSPClientConnection::handleCmd_SET_PARAMETER(ServerMediaSubsession* subsession __attribute__((unused)), char const* cseq, char const* fullRequestStr)
++tally_rtsp_server::RTSPClientSession::handleCmd_SET_PARAMETER(ServerMediaSubsession* subsession __attribute__((unused)), char const* cseq, char const* fullRequestStr)
+ {
+     enum tally newstate;
+     const char* tallyloc;
+ 
+     tallyloc = strstr(fullRequestStr, "TALLY:");
+     if (!tallyloc) {
+-    	setRTSPResponse("RTSP/1.0 200 OK");
++    	snprintf((char*)fResponseBuffer, sizeof(fResponseBuffer), "RTSP/1.0 200 OK\r\nCSeq: %s\r\n%sSession: %08X\r\n\r\n", cseq, dateHeader(), fOurSessionId);
+     }
+     char* ptr;
+     if ((ptr = (char*)strchr(tallyloc, '\r')))
+@@ -101,7 +101,9 @@ tally_rtsp_server::RTSPClientConnection::handleCmd_SET_PARAMETER(ServerMediaSubs
+     else
+     {
+ 	// invalid
+-	setRTSPResponse("RTSP/1.0 400 Bad Request");
++	snprintf((char*)fResponseBuffer, sizeof(fResponseBuffer),
++	    "RTSP/1.0 400 Bad Request\r\nCSeq: %s\r\n%sSession: %08X\r\n\r\n",
++	    cseq, dateHeader(), fOurSessionId);
+ 	return;
+     }
+     if (newstate != server_.tally_state_)
+@@ -114,5 +116,7 @@ tally_rtsp_server::RTSPClientConnection::handleCmd_SET_PARAMETER(ServerMediaSubs
+ 	    perror("write to pipe");
+ 	}
+     }
+-    setRTSPResponse("RTSP/1.0 200 OK");
++    snprintf((char*)fResponseBuffer, sizeof(fResponseBuffer),
++        "RTSP/1.0 200 OK\r\nCSeq: %s\r\n%sSession: %08X\r\n\r\n",
++        cseq, dateHeader(), fOurSessionId);
+ }
+diff --git a/src/tally_rtsp_server.hpp b/src/tally_rtsp_server.hpp
+index 7522511..fd120a4 100644
+--- a/src/tally_rtsp_server.hpp
++++ b/src/tally_rtsp_server.hpp
+@@ -16,7 +16,7 @@ public:
+ protected:
+     tally_rtsp_server(int pipefd, bool verbose, UsageEnvironment& env, int ourSocket, Port ourPort, UserAuthenticationDatabase* authDatabase, unsigned reclamationTestSeconds);
+     virtual ~tally_rtsp_server();
+-    virtual RTSPServer::RTSPClientConnection* createNewClientConnection(int clientSocket, struct sockaddr_in clientAddr);
++    virtual RTSPServer::RTSPClientSession* createNewClientSession(unsigned sessionId, int clientSocket, struct sockaddr_in clientAddr);
+ private:
+     int pipefd_;
+     enum tally {
+@@ -25,11 +25,11 @@ private:
+         TALLY_CUE
+     } tally_state_;
+     bool verbose_;
+-    class RTSPClientConnection: public RTSPServer::RTSPClientConnection
++    class RTSPClientSession: public RTSPServer::RTSPClientSession
+     {
+     public:
+-        RTSPClientConnection(tally_rtsp_server& ourServer, int clientSocket, struct sockaddr_in clientAddr);
+-	virtual ~RTSPClientConnection();
++        RTSPClientSession(tally_rtsp_server& ourServer, unsigned sessionId, int clientSocket, struct sockaddr_in clientAddr);
++	virtual ~RTSPClientSession();
+     protected:
+ 	virtual void handleCmd_SET_PARAMETER(ServerMediaSubsession* subsession, char const* cseq, char const* fullRequestStr);
+     private:

stopped_status.diff Added

@@ -0,0 +1,37 @@
+---
+ src/mixer_window.cpp |    6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+Index: dvswitch-0.9-1-da15ba4/src/mixer_window.cpp
+===================================================================
+--- dvswitch-0.9-1-da15ba4.orig/src/mixer_window.cpp
++++ dvswitch-0.9-1-da15ba4/src/mixer_window.cpp
+@@ -260,11 +260,11 @@ mixer_window::mixer_window(mixer & mixer
+     vu_meter_.show();
+ 
+     display_.show();
+ 
+     osd_.add(display_);
+-    osd_.set_status(gettext("STOP"), "gtk-media-stop");
++    osd_.set_status(gettext("STOPPED"), "gtk-media-stop");
+     osd_.show();
+ 
+     selector_.set_border_width(gui_standard_spacing);
+     selector_.set_accel_group(get_accel_group());
+     selector_.signal_pri_video_selected().connect(
+@@ -518,13 +518,13 @@ void mixer_window::toggle_record() throw
+ {
+     bool flag = record_button_.get_active();
+     mixer_.enable_record(flag);
+     cut_button_.set_sensitive(flag);
+     if (flag)
+-	osd_.set_status(gettext("RECORD"), "gtk-media-record", 2);
++	osd_.set_status(gettext("RECORDING"), "gtk-media-record", 2);
+     else
+-	osd_.set_status(gettext("STOP"), "gtk-media-stop");
++	osd_.set_status(gettext("STOPPED"), "gtk-media-stop");
+ }
+ void mixer_window::toggle_safe_area_display()
+ {
+     display_.set_safe_area_highlight(safe_area_menu_item_.get_active());
+ }

thin_title_safe_area.diff Added

@@ -0,0 +1,51 @@
+---
+ src/video_effect.c |   21 +++++++++++++++++++++
+ 1 file changed, 21 insertions(+)
+
+Index: dvswitch-0.9-1-da15ba4/src/video_effect.c
+===================================================================
+--- dvswitch-0.9-1-da15ba4.orig/src/video_effect.c
++++ dvswitch-0.9-1-da15ba4/src/video_effect.c
+@@ -36,10 +36,11 @@ void video_effect_show_title_safe(struct
+ 	    height >>= chroma_shift_vert;
+ 	    border_vert >>= chroma_shift_vert;
+ 	    bias = chroma_bias;
+ 	}
+ 
++#ifdef THICK_TITLE_SAFE_AREA
+ 	for (unsigned y = 0; y != height; ++y)
+ 	{
+ 	    uint8_t * p, * end;
+ 
+ 	    // Do left border
+@@ -54,10 +55,30 @@ void video_effect_show_title_safe(struct
+ 		p += width - 2 * border_horiz;
+ 	    // else continue across top border or bottom border
+ 	    while (p != end)
+ 		*p = (*p + bias) / 2, ++p;
+ 	}
++#else
++	for (unsigned y = border_vert-2 ; y <= height-border_vert+1; ++y)
++	{
++	    uint8_t * p, * end;
++
++	    // Do left border
++	    p = dest.planes.data[plane] + dest.planes.linesize[plane] * y;
++	    end = p + border_horiz;
++	    p += border_horiz-2;
++	    while (p != end)
++		*p = (*p + bias) / 2, ++p;
++	    end = p + width - border_horiz - border_horiz + 2;
++	    if (y >= border_vert && y < height - border_vert)
++		// Skip to right border
++		p += width - 2 * border_horiz;
++	    // else continue across top border or bottom border
++	    while (p != end)
++		*p = (*p + bias) / 2, ++p;
++	}
++#endif
+     }
+ }
+ 
+ void video_effect_brighten(struct raw_frame_ref dest,
+ 			   struct rectangle d_rect)

title_hup.diff Added

@@ -0,0 +1,138 @@
+---
+ src/dvsource-file.c |   46 +++++++++++++++++++++++++++++++++++++++++-----
+ 1 file changed, 41 insertions(+), 5 deletions(-)
+
+Index: dvswitch-0.9-1-da15ba4/src/dvsource-file.c
+===================================================================
+--- dvswitch-0.9-1-da15ba4.orig/src/dvsource-file.c
++++ dvswitch-0.9-1-da15ba4/src/dvsource-file.c
+@@ -74,21 +74,33 @@ static unsigned int get_file_size_bytes(
+ 
+ static void usage(const char * progname)
+ {
+     fprintf(stderr,
+ 	    "\
+-Usage: %s [-R] [-h HOST] [-p PORT] [--loop] [-t] FILE\n",
++Usage: %s [-R] [-h HOST] [-p PORT] [--loop] [-t] DVFILE\n",
+ 	    progname);
++
++    fprintf(stderr, "\n\
++To replace the DVFILE while --loop is running:\n\
++ rm DVFILE; NEWSOURCE ... > DVFILE; kill -hup MYPID\n");
++
+ }
+ 
+ struct transfer_params {
+     int            file;
++    const char *   filename;
+     int            sock;
+     bool           opt_loop;
+     bool           timings;
+ };
+ 
++static int sighup_seen = 0;
++static void sighup()
++{
++  sighup_seen = 1;
++}
++
+ static ssize_t read_retry(int fd, void * buf, size_t count)
+ {
+     ssize_t chunk, total = 0;
+ 
+     do
+@@ -139,10 +151,18 @@ static void transfer_frames(struct trans
+                     fflush(stdout);
+                 }
+                 return;
+             }
+ 
++	    if (sighup_seen && params->filename)
++	    {
++	      sighup_seen = 0;
++	      close(params->file);
++	      params->file = open(params->filename, O_RDONLY, 0);
++	      printf("INFO: Reloading %s\n", params->filename);
++	    }
++
+ 	    if (lseek(params->file, 0, 0) == 0)
+             {
+                 file_size = get_file_size_bytes(params->file);
+                 frame_number = 0;
+                 num_frames = 0;
+@@ -156,12 +176,18 @@ static void transfer_frames(struct trans
+ 	if (size != (ssize_t)DIF_SEQUENCE_SIZE)
+ 	{
+ 	    if (size < 0)
+ 		perror("ERROR: read");
+ 	    else
+-		fputs("ERROR: Failed to read complete frame\n", stderr);
+-	    if (retry_connect) return;
++		fputs("ERROR: Failed to read complete frame...\n", stderr);
++	    if (retry_connect) 
++	    {
++	      close(params->file);
++	      params->file = open(params->filename, O_RDONLY, 0);
++	      printf("INFO: Retrying %s\n", params->filename);
++	      continue;
++	    }
+ 	    exit(1);
+ 	}
+ 
+ 	system = dv_buffer_system(buf);
+ 
+@@ -180,11 +206,17 @@ static void transfer_frames(struct trans
+ 	{
+ 	    if (size < 0)
+ 		perror("ERROR: read");
+ 	    else
+ 		fputs("ERROR: Failed to read complete frame\n", stderr);
+-	    if (retry_connect) return;
++	    if (retry_connect)
++	    {
++	      close(params->file);
++	      params->file = open(params->filename, O_RDONLY, 0);
++	      printf("INFO: Retrying %s\n", params->filename);
++	      continue;
++	    }
+ 	    exit(1);
+ 	}
+ 	frame_number++;
+ 	if (write(params->sock, buf, system->size) != (ssize_t)system->size)
+ 	{
+@@ -243,13 +275,16 @@ static int is_dv_file(int fd)
+ int main(int argc, char ** argv)
+ {
+     /* Initialise settings from configuration files. */
+     dvswitch_read_config(handle_config);
+ 
++    (void)signal(SIGHUP, &sighup);
++
+     struct transfer_params params;
+     params.opt_loop = false;
+     params.timings = false;
++    params.filename = NULL;
+ 
+     /* Parse arguments. */
+ 
+     int opt;
+     while ((opt = getopt_long(argc, argv, "h:p:ltR", options, NULL)) != -1)
+@@ -311,16 +346,17 @@ int main(int argc, char ** argv)
+ 
+     /* Prepare to read the file and connect a socket to the mixer. */
+     if (strcmp(filename, "-"))
+     {
+ 	printf("INFO: Reading from %s\n", filename);
++	params.filename = filename;
+ 	params.file = open(filename, O_RDONLY, 0);
+     }
+     else
+     {
+ 	printf("INFO: Reading from STDIN\n");
+-	params.file = feof(stdin);
++	params.file = fileno(stdin);
+     }
+     if (params.file < 0)
+     {
+ 	perror("ERROR: open");
+ 	return 1;

CarlFK-dvsmon-e00779c.tar.gz Added

dv-upload.sh Added

@@ -0,0 +1,175 @@
+#!/bin/sh
+
+# Script to easily upload videos to nue suse streaming server
+# Kilian Petsch <kpetsch@suse.de>
+#
+# 
+# 2013-01-31, V0.2  jw -- made it work also without metafile.txt
+
+version=0.2
+
+FILENAME=''
+DIRECTORY=''
+SERVER='ftp@streaming.nue.suse.com'
+URL='http://streaming.nue.suse.com'
+METAFILENAME=''
+ALLFILE=''
+LIST=''
+OVERWRITE=''
+
+usage () 
+{
+# Usage section
+# Explain commands etc.
+echo "      
+      This script allows for easy uploading of videos to the SUSE streaming server.
+      It automatically checks if the filename has the correct format, if it's
+      already uploaded and if the upload was successful.
+
+      Usage:
+      dv-upload [OPTIONS] [FILE]
+      
+      Options:
+        -d,--directory: Specify the directory you want to upload to.
+                        Default upload directory is upload/.
+        -l,--list: List directories on the server. Use '-d' to specify which one.
+        -k,--key: Uses ssh-copy-id to authorize your key with the server.
+                  This only works if you already have a rsa-key:
+                  Use 'ssh-keygen -t rsa' to generate one.
+        -o,--overwrite: Allow overwrite of existing files. Default: abort.
+        -h,--help: Display this help.
+
+      [FILE]
+        Specifiy the file you want to upload. Filename needs to contain a date.
+        If you want to add a metadata file, make sure it is in the same directory,
+        has the same name and the file extension '.txt'
+
+
+"
+}
+
+file_on_server () 
+{
+
+# Head request via curl to check if the file is already on the server
+filecheck=$(mktemp /tmp/filecheck_XXXXXX.txt)
+curl -sI "$URL/$DIRECTORY/$FILENAME" > $filecheck
+
+if [[ $? = '0' ]]; then
+   # Check the file for 404 Error
+   grep -q '404 Not Found' $filecheck
+   if [[ $? != '0' ]]; then
+       rm $filecheck
+       echo "File is on server"
+       echo "$URL/$DIRECTORY/$FILENAME"
+       if [[ -n $1 ]]; then
+         if [[ -z $OVERWRITE ]]; then
+           echo
+           echo "Use -o to overwrite"
+           exit
+         else
+           echo "overwriting ..."
+           echo
+         fi
+       fi
+   else
+       rm $filecheck
+       echo "File is not on server"
+   fi
+else
+    echo "Error server not found"
+    rm $filecheck
+    exit 2
+fi
+}
+
+servername ()
+{
+echo $SERVER
+}
+
+ARGS=`getopt -o "d:hlko" -l "directory:,help,list,key,overwrite" -n "$ME" -- "$@"`
+
+eval set -- "$ARGS"
+while true;
+do
+    case "$1" in
+	-h|--help)
+	    usage
+	    exit 0;;
+	-d|--directory)
+	    DIRECTORY="$2"
+	    shift 2;;
+	-l|--list)
+	    LIST=1
+	    shift
+	    ;;
+	-o|--overwrite)
+	    OVERWRITE=1
+	    shift
+	    ;;
+	-k|--key)
+            # check if there is a key available 
+	    if [[ -e ~/.ssh/id_rsa ]]; then
+		servername
+		ssh-copy-id -i ~/.ssh/id_rsa "$SERVER"
+	    else
+		echo "Error no key found, please run 'ssh-keygen -t rsa' to generate one first."
+		exit 4
+	    fi
+	    exit 0;;
+	--)
+	    shift
+	    break;;
+    esac
+done
+
+if [[ "$LIST" == "1" ]]; then
+    servername
+    ssh $SERVER "ls -la $DIRECTORY"
+    exit
+fi
+  
+FILENAME="$1"
+
+# Using '20' as fixed numbers to ensure the 4 numbers are a date
+if [[ "$FILENAME" =~ 20[0-9]{2} ]]; then
+    echo "Filename ok!"
+elif [[ -z "$FILENAME" ]]; then
+    usage
+    exit
+else
+    echo "Filename not valid! Did you include a date (Year-Month-Day)?"
+    exit 1
+fi
+
+# Default upload directory is upload/ to ensure files are always atleast somewhat sorted
+if [[ -z "$DIRECTORY" ]]; then
+    DIRECTORY="upload/"
+fi
+
+file_on_server check_overwrite
+
+
+# test if metadata file exists and add to files to upload
+METAFILENAME="$FILENAME"
+METAFILENAME=${METAFILENAME%.*}
+METAFILENAME="$METAFILENAME.txt"
+
+ALLFILE=$FILENAME
+for i in $(ls); do
+    if [[ "$i" == "$METAFILENAME" ]]; then
+	ALLFILE="$ALLFILE $METAFILENAME"
+    fi
+done
+
+# upload files with the same name
+servername
+rsync -vz --progress $ALLFILE "$SERVER":"$DIRECTORY"
+
+#check if upload was successful
+
+file_on_server
+
+exit 0;
+

dv2webm.sh Added

dvrecord.sh Added

dvsink-bambuser.pl Added

@@ -0,0 +1,146 @@
+#! /usr/bin/perl -w
+# dvsink-bambuser.pl is a userfriendly wrapper for dvsink-command.
+# It creates a live stream suitable for bambuser.com
+#
+# (C) 2012, jw@suse.de, distribute under GPL-2.0+ or ask.
+# 2012-09-30 -- V0.1 initial draft.
+# 2012-10-21 -- V0.2 broken config file support added
+# 2012-10-25 -- V0.3 fixed config file support
+#
+## Requires: ffmpeg
+
+use strict;
+use Data::Dumper;
+use File::stat;
+use File::Glob;
+use Getopt::Long qw(:config no_ignore_case);
+use Pod::Usage;
+
+my $version = '0.3';
+my $a_chan = undef;
+my $a_name = undef;
+my $retry_connect = 0;
+my $host = undef;
+my $port = undef;
+my $verbose = 1;
+my $help = undef;
+my $ffmpeg_fmt  = 'ffmpeg -v %s -y -i - -re -af aresample=22050 %s -vcodec flv -g 150 -cmp 2 -subcmp 2 -mbd 2 -f flv "%s"';
+my $ffmpeg_opt_def  = '-s 480x360 -b:v 300k';
+my $ffmpeg_opt = undef;
+my $ffmpeg_rtmp_def = 'rtmp://68NNNN.fme.bambuser.com/b-fme/ad6XXXXXXXXXXXXXXXXXXX';
+my $ffmpeg_rtmp = undef;
+my $channel_url     = 'http://bambuser.com/channel/opensusetv';
+my $channel_admin   = 'Juergen Weigert <jw@suse.de> #opensuse-video@irc.freenode.org';
+my $config_file = undef;
+
+GetOptions(
+	"retry|R" 	=> \$retry_connect,
+	"verbose|v"	=> \$verbose,
+	"port|p=s"	=> \$port,
+	"host|h=s"	=> \$host,
+	"config|c=s"	=> sub { $ENV{ICECAST_CONF_FILE} = $_[1]; },
+	"320"		=> sub { $ffmpeg_opt = '-s 320x240 -b:v 150k'; },
+	"480"		=> sub { $ffmpeg_opt = '-s 480x360 -b:v 300k'; },
+	"640"   	=> sub { $ffmpeg_opt = '-s 640x480 -b:v 400k'; },
+	"720"   	=> sub { $ffmpeg_opt = '-s 720x768 -b:v 500k'; },
+	"opt|o=s"       => \$ffmpeg_opt,
+	"help|?"	=> \$help,
+) or $help++;
+
+pod2usage(-verbose => 1, -msg => qq{
+dvsink-bambuser.pl V$version
+
+
+$0 [OPTIONS] RTMP_STREAM_URL
+$0 [OPTIONS] [-c bambuser.conf]
+
+
+The RTMP_STREAM_URL can be obtained from bambuser.com,
+-> dashboard -> Standalone Desktop app -> Flash Media Live Encoder 
+-> Download your Authentication Profile
+http://api.bambuser.com/user/fmle_profile.xml 
+search for <output><stream>RTMP_STREAM_URL</stream><output>
+where RTMP_STREAM_URL should look like this: $ffmpeg_rtmp
+
+Valid options are:
+ -v	Print more information at startup.
+
+ -R, --retry	
+ 	Keep retrying to connect, in case DVswitch is not yet listening.
+
+ -h, --host=HOST
+ -p, --port=PORT
+ 	Specify the network address on which DVswitch is listening.  The
+	host address may be specified by name or as an IPv4 or IPv6 literal.
+
+ --320 --480 --640 --720
+ 	Select a specific output size and bandwidth. 
+	Default: '$ffmpeg_opt'
+
+ --opt='FFMPEG_OPTIONS'
+ 	Default: --opt='$ffmpeg_opt'
+
+ -c, --config=BAMBUSER_CONF_FILE
+        Specify a config file that overwrites the environment variable
+	BAMBUSER_CONF_FILE, if any. See below.
+
+The RTMP_STREAM_URL command line parameters are optional, if a config file 
+'.bambuser.cfg', '~/.bambuser.cfg', '/etc/bambuser.cfg' exists 
+or was specified with -c, containing the following lines:
+ 
+ bambuser_rtmp_url=rtmp://68NNNN.fme.bambuser.com/b-fme/ad6XXXXXXXXXXXXXXXXXXX
+ ffmpeg_opt=...
+
+The channel at $channel_url 
+is run by $channel_admin
+
+}) if $help;
+	
+$ffmpeg_opt = getconfig('ffmpeg_opt') || $ffmpeg_opt_def;
+my $url = shift || getconfig('bambuser_rtmp_url') || die "please provide a URL like $ffmpeg_rtmp\n";
+$ffmpeg_rtmp = $url;
+
+my $ff_verbose = ($verbose > 1) ? 'verbose' : 'quiet';
+
+my $ffmpeg = sprintf $ffmpeg_fmt, $ff_verbose, $ffmpeg_opt, $ffmpeg_rtmp;
+
+my $cmd = 'dvsink-command';
+$cmd .= ' --retry' if $retry_connect;
+$cmd .= " --port=$port" if defined $port;
+$cmd .= " --host=$host" if defined $host;
+
+print "+ $cmd -- $ffmpeg\n" if $verbose;
+system "$cmd -- $ffmpeg" and die "failed to run '$cmd'\n";
+exit 0;
+
+sub getconfig
+{
+  my ($token) = @_;
+
+  if (defined $ENV{ICECAST_CONF_FILE})
+    {
+      open IN, "$ENV{ICECAST_CONF_FILE}" or die "cannot read ENV{ICECAST_CONF_FILE}=$ENV{ICECAST_CONF_FILE}: $!\n";
+    }
+  else
+    {
+      open IN, ".bambuser.cfg" 
+      or open IN, "$ENV{HOME}/.bambuser.cfg"
+      or open IN, "/etc/bambuser.cfg" 
+      or return undef;
+    }
+
+  while (defined (my $line = <IN>))
+    {
+      chomp $line;
+      if ($line =~ m{^\s*$token=})
+        {
+	  print "$line\n";
+	}
+      if ($line =~ m{^\s*$token=(.*?)\s*$})
+        {
+	  close IN;
+	  return $1;
+	}
+    }
+  return undef;
+}

dvsink-fullscreen.pl Added

@@ -0,0 +1,76 @@
+#! /usr/bin/perl -w
+# dvsink-fullscreen.pl is a userfriendly wrapper for dvsink-command.
+# It creates a fullscreen monitor app with mplayer
+#
+# (C) 2012, jw@suse.de, distribute under GPL-2.0+ or ask.
+# 2012-10-12 -- V0.1 initial draft.
+#
+## Requires: mplayer
+
+use strict;
+use Data::Dumper;
+use File::stat;
+use File::Glob;
+use Getopt::Long qw(:config no_ignore_case);
+use Pod::Usage;
+
+my $version = '0.1';
+my $a_chan = undef;
+my $a_name = undef;
+my $retry_connect = 0;
+my $host = undef;
+my $port = undef;
+my $verbose = 1;
+my $fullscreen = 1;
+my $help = undef;
+my $mplayer_cmd  = 'mplayer %s -';
+my $mplayer_opts = '-fs';
+
+GetOptions(
+	"retry|R" 	=> \$retry_connect,
+	"verbose|v"	=> \$verbose,
+	"port|p=s"	=> \$port,
+	"host|h=s"	=> \$host,
+	"normal-size|n"	=> sub { $mplayer_opts = ''; },
+	"opt|o=s"       => \$mplayer_opts,
+	"help|?"	=> \$help,
+) or $help++;
+
+pod2usage(-verbose => 1, -msg => qq{
+dvsink-fullscreen.pl V$version
+
+
+$0 [OPTIONS]
+
+Valid options are:
+ -v	Print more information at startup.
+
+ -R, --retry	
+ 	Keep retrying to connect, in case DVswitch is not yet listening.
+
+ -h, --host=HOST
+ -p, --port=PORT
+ 	Specify the network address on which DVswitch is listening.  The
+	host address may be specified by name or as an IPv4 or IPv6 literal.
+
+ --normal-size -n
+ 	Disable the default fullscreen option.
+	Default: '$mplayer_opts'
+
+ --opt='MPLAYER_OPTIONS'
+ 	Default: --opt='$mplayer_opts'
+
+}) if $help;
+	
+$mplayer_opts .= ' -msglevel all=6' if $verbose > 1;
+
+my $mplayer = sprintf $mplayer_cmd, $mplayer_opts;
+
+my $cmd = 'dvsink-command';
+$cmd .= ' --retry' if $retry_connect;
+$cmd .= " --port=$port" if defined $port;
+$cmd .= " --host=$host" if defined $host;
+
+print "+ $cmd -- $mplayer\n" if $verbose;
+system "$cmd -- $mplayer" and die "failed to run '$cmd'\n";
+exit 0;

dvsink-icecast.pl Added

@@ -0,0 +1,154 @@
+#! /usr/bin/perl -w
+# dvsink-icecast.pl is a userfriendly wrapper for dvsink-command.
+# It creates a live stream suitable for icecast servers
+#
+# (C) 2012, jw@suse.de, distribute under GPL-2.0+ or ask.
+# 2012-10-10 -- V0.1 initial draft.
+#
+## Requires: ffmpeg2theora, oggfwd
+
+use strict;
+use Data::Dumper;
+use File::stat;
+use File::Glob;
+use Getopt::Long qw(:config no_ignore_case);
+use Pod::Usage;
+
+my $version = '0.2';
+my $retry_connect = 0;
+my $host = undef;
+my $port = undef;
+my $verbose = 1;
+my $help = undef;
+my $ffmpeg_fmt  = 'ffmpeg2theora - -f dv %s -F 25:5 -k 8 --speedlevel 0 -v 6 -a 0 -c 1 -H 9600 -o - | oggfwd -g "%s" -n "%s" "%s" "%s" "%s" "%s"';
+my $ffmpeg_opt_def  = '-x 480 -y 360 -V 300';
+my $ffmpeg_opt = undef;
+my $ogg_group_def = 'opensusetv';
+my $ogg_group = undef;
+my $ogg_name = undef;
+my $config_file = undef;
+
+GetOptions(
+	"retry|R" 	=> \$retry_connect,
+	"verbose|v"	=> \$verbose,
+	"port|p=s"	=> \$port,
+	"host|h=s"	=> \$host,
+	"group|g=s"	=> \$ogg_group,
+	"name|n=s"	=> \$ogg_name,
+	"config|c=s"	=> sub { $ENV{ICECAST_CONF_FILE} = $_[1]; },
+	"320"		=> sub { $ffmpeg_opt = '-x 320 -y 240 -V 150'; },
+	"480"		=> sub { $ffmpeg_opt = '-x 480 -y 360 -V 300'; },
+	"640"   	=> sub { $ffmpeg_opt = '-x 640 -y 480 -V 400'; },
+	"720"   	=> sub { $ffmpeg_opt = '-x 720 -y 768 -V 500'; },
+	"opt|o=s"       => \$ffmpeg_opt,
+	"help|?"	=> \$help,
+) or $help++;
+
+pod2usage(-verbose => 1, -msg => qq{
+dvsink-icecast.pl V$version
+
+
+$0 [OPTIONS] ICECAST_SERVER PORT PASSPHRASE /MOUNTPOINT.ogv
+$0 [OPTIONS] [-c icecast.conf]
+
+
+Valid options are:
+ -v	Print more information at startup.
+
+ -R, --retry	
+ 	Keep retrying to connect, in case DVswitch is not yet listening.
+
+ -h, --host=HOST
+ -p, --port=PORT
+ 	Specify the network address on which DVswitch is listening.  The
+	host address may be specified by name or as an IPv4 or IPv6 literal.
+
+ -g, --group=CHANNEL_NAME
+ 	Specify channel/group name for the ogv stream. Default '$ogg_group_def'.
+ -n, --name=STREAM_NAME
+        Specify logical names for the ogv stream. Default from mountpoint.
+
+ --320 --480 --640 --720
+ 	Select a specific output size and bandwidth. 
+	Default: '$ffmpeg_opt_def'
+
+ --opt='FFMPEG2THEORA_OPTIONS'
+ 	Default: --opt='$ffmpeg_opt_def'
+
+ -c, --config=ICECAST_CONF_FILE
+        Specify a config file that overwrites the environment variable
+	ICECAST_CONF_FILE, if any. See below.
+
+The 4 command line parameters are optional, if a config file 
+'.icecast.cfg', '~/.icecast.cfg', '/etc/icecast.cfg' exists 
+or was specified with -c, containing the following lines:
+ icecast_server=ICECAST_SERVER
+ icecast_port=PORT
+ icecast_pass=PASSPHRASE
+ icecast_path=/MOUNTPOINT.ogv
+
+}) if $help;
+	
+my $icecast_server=shift || getconfig('icecast_server') || die "please provide: *>SERVER_NAME<* PORT PASSPHRASE /MOUNTPOINT.OGV\n";
+my $icecast_port=shift   || getconfig('icecast_port')   || die "please provide: SERVER_NAME *>PORT<* PASSPHRASE /MOUNTPOINT.OGV\n";
+my $icecast_pass=shift   || getconfig('icecast_pass')   || die "please provide: SERVER_NAME PORT *>PASSPHRASE<* /MOUNTPOINT.OGV\n";
+my $icecast_path=shift   || getconfig('icecast_path')   || die "please provide: SERVER_NAME PORT PASSPHRASE *>/MOUNTPOINT.OGV<*\n";
+$ffmpeg_opt = getconfig('ffmpeg_opt') || $ffmpeg_opt_def unless defined $ffmpeg_opt;
+$ogg_group =  getconfig('ogg_group')  || $ogg_group_def  unless defined $ogg_group;
+$ogg_name  =  getconfig('ogg_name')                      unless defined $ogg_name;
+
+$icecast_path = '/'.$icecast_path if $icecast_path !~ m{^/};
+$icecast_path .= ".ogv" if $icecast_path !~ m{\.w+$};
+
+unless (defined $ogg_name)
+  {
+    $ogg_name = $icecast_path;
+    $ogg_name =~ s@^.*/@@;
+    $ogg_name =~ s@\.\w+$@@;
+  }
+
+my $ff_verbose = ($verbose > 2) ? 'verbose' : 'quiet';
+
+my $ffmpeg = sprintf $ffmpeg_fmt, $ffmpeg_opt, $ogg_group, $ogg_name, 
+	$icecast_server, $icecast_port, $icecast_pass, $icecast_path;
+
+my $cmd = 'dvsink-command';
+$cmd .= ' --retry' if $retry_connect;
+$cmd .= " --port=$port" if defined $port;
+$cmd .= " --host=$host" if defined $host;
+
+print "+ $cmd -- $ffmpeg\n" if $verbose;
+system "$cmd -- $ffmpeg" and die "failed to run '$cmd'\n";
+exit 0;
+
+sub getconfig
+{
+  my ($token) = @_;
+
+  if (defined $ENV{ICECAST_CONF_FILE})
+    {
+      open IN, "$ENV{ICECAST_CONF_FILE}" or die "cannot read ENV{ICECAST_CONF_FILE}=$ENV{ICECAST_CONF_FILE}: $!\n";
+    }
+  else
+    {
+      open IN, ".icecast.cfg" 
+      or open IN, "$ENV{HOME}/.icecast.cfg"
+      or open IN, "/etc/icecast.cfg" 
+      or return undef;
+    }
+
+  while (defined (my $line = <IN>))
+    {
+      chomp $line;
+      if ($line =~ m{^\s*$token=})
+        {
+	  print "$line\n";
+	}
+      if ($line =~ m{^\s*$token=(.*?)\s*$})
+        {
+	  close IN;
+	  return $1;
+	}
+    }
+  return undef;
+}

dvsource-firewire-next.pl Added

@@ -0,0 +1,151 @@
+#! /usr/bin/perl -w
+# dvsource-firewire_jw.pl -- a rewrite of the firewire grabber.
+# The original dvsource-firewire suffers from the following issues:
+# if we have both /dev/fw0 and /dev/fw1, it takes the first one, even if the 
+#  other one is only functional.
+#
+# (C) 2012, jw@suse.de, distribute under GPL-2.0+ or ask.
+# 2012-10-14 -- V0.1 initial draft.
+# 2012-10-16 -- V0.2 skip empty units
+#
+#############
+## Requires: dvgrab
+#
+# Improvement: 
+# check all cat /sys/bus/firewire/devices/*/guid
+# and ignore those with 0x0000000000000000
+# and ignore those with empty /sys/bus/firewire/devices/*/units
+
+use strict;
+use Data::Dumper;
+use File::stat;
+use File::Glob;
+use Getopt::Long qw(:config no_ignore_case);
+use Pod::Usage;
+
+my $version = '0.2';
+my $a_chan = undef;
+my $a_name = undef;
+my $retry_connect = 0;
+my $host = undef;
+my $port = undef;
+my $tally = undef;
+my $verbose = 0;
+my $help = undef;
+my $dvgrab = 'dvgrab';
+my $dvgrab_opts = '-noavc';
+my $ignore_missing_units = 0;
+
+sub get_ps();
+
+GetOptions(
+	"retry|R" 	=> \$retry_connect,
+	"verbose|v+"	=> \$verbose,
+	"port|p=s"	=> \$port,
+	"host|h=s"	=> \$host,
+	"tally|t"	=> \$tally,
+	"ignore-units|u" => \$ignore_missing_units,
+	"help|?"	=> \$help,
+) or $help++;
+
+pod2usage(-verbose => 1, -msg => qq{
+dvsource-firewire_jw.pl V$version
+
+
+$0 [OPTIONS]
+
+Start a dvsource on the next available firewire device. Dead devices (without guid) are skipped,
+devices that are in use (guid appears in /proc/*/cmdline) are also skipped.
+Returns nonzero if no usable devices were found.
+
+Valid options are:
+ -v	Print more information at startup.
+
+ -R, --retry	
+ 	Keep retrying to connect, in case DVswitch is not yet listening.
+
+ -h, --host=HOST
+ -p, --port=PORT
+ 	Specify the network address on which DVswitch is listening.  The
+	host address may be specified by name or as an IPv4 or IPv6 literal.
+
+ -t, --tally
+ 	Print notices of activation and deactivation in the  mixer,  for
+	use with a tally light.  These will take the form "TALLY: on" or
+	"TALLY: off".
+
+}) if $help;
+
+opendir DIR, "/sys/bus/firewire/devices/" or die "no /sys/bus/firewire/devices/: $!";
+my @fw = grep { !/^\./ } readdir DIR;
+closedir DIR;
+my %fw = map { $_ => { guid => undef } } @fw;
+my @good;
+for my $fw (sort @fw)
+  {
+    if (open IN, '<', "/sys/bus/firewire/devices/$fw/guid")
+      {
+        my $guid = <IN> || '';
+        chomp $guid;
+        $fw{$fw}{guid} = $guid;
+        close IN;
+
+        if (open IN, '<', "/sys/bus/firewire/devices/$fw/units")
+          {
+	    # expect 0x00a02d:0x010001
+            my $units = <IN> || '';
+            chomp $units;
+            $fw{$fw}{units} = $units;
+            close IN;
+	    $units = '0x0:0x0' if $ignore_missing_units;
+
+            if (($guid =~ m{^0x[\da-f]*[1-9a-f][\da-f]*$}) and
+	        ($units =~ m{^0x[\da-f]+:0x[\da-f]+$}))
+	      {
+		push @good, [$fw, $guid];
+		print STDERR "Usable devices: /dev/$fw guid=$guid\n" if $verbose > 1;
+	      }
+	  }
+      }
+  }
+
+my $all_commands = join("\n", get_ps());
+while (@good && $all_commands =~ m{\b$good[0][1]\b})
+  {
+    print STDERR "already in use: /dev/$good[0][0] guid=$good[0][1]\n" if $verbose > 1;
+    $fw{$good[0][0]}{in_use} = 1;
+    shift @good;
+  }
+die "No usable devices: " . Dumper \%fw unless scalar @good;
+$dvgrab_opts .= " -g '$good[0][1]'";
+	
+my $cmd = 'dvsource-command';
+$cmd .= " --tally" if $tally;
+$cmd .= " --verbose" if $verbose;
+$cmd .= ' --retry' if $retry_connect;
+$cmd .= " --port=$port" if defined $port;
+$cmd .= " --host=$host" if defined $host;
+
+print STDERR "+ $cmd '$dvgrab $dvgrab_opts -'\n" if $verbose;
+system "$cmd '$dvgrab $dvgrab_opts -'" and die "failed to run '$cmd \"$dvgrab -noavc $dvgrab_opts -\"'\n";
+exit 0;
+
+#####################################################
+sub get_ps()
+{
+  my @r = ();
+  opendir DIR, "/proc/" or return @r;
+  my @pids = grep { /^\d+$/ } readdir DIR;
+  closedir DIR;
+
+  for my $pid (@pids)
+    {
+      if (open IN, "<", "/proc/$pid/cmdline")
+        {
+          my $cmdline = <IN> || '';
+          chomp $cmdline;
+          push @r, $cmdline;
+        }
+    }
+  return @r;
+}

dvsource-firewire2switch Added

@@ -0,0 +1,421 @@
+#! /usr/bin/perl -w
+#
+# Copyright:
+# 
+# Copyright (C) 2011-2013, SUSE Linux Products GmbH
+# Author: Martin Caj <mcaj@suse.cz>
+#
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are met:
+#
+# * Redistributions of source code must retain the above copyright notice, this
+#   list of conditions and the following disclaimer.
+#
+# * Redistributions in binary form must reproduce the above copyright notice,
+#   this list of conditions and the following disclaimer in the documentation
+#   and/or other materials provided with the distribution.
+#
+# * Neither the name of the Novell nor the names of its contributors may be
+#   used to endorse or promote products derived from this software without
+#   specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+# POSSIBILITY OF SUCH DAMAGE.
+#
+# About the script:
+#
+# The idea was from the script dvsource-firewire_jw.pl by jw@suse.de.
+# dvsource-firewire_jw.pl -- a rewrite of the firewire grabber.
+# The original dvsource-firewire suffers from the following issues:
+# (C) 2012, jw@suse.de, distribute under GPL-2.0+ or ask.
+#
+#############
+## Requires: dvgrab and perl modules bellow
+#
+# How it is working ?
+# 1. It check your FW device and valid devices save into array @good.
+# 2. Run dv-switch GUI app.
+# 3. for each FW device it run dvsource-firewire with uniqe GUID
+#
+# TODO:
+# Add -c option - sometime childern are not properrly exited so
+# we need function to kill all dv* apps, or maybe reload FW kernel
+# modules.
+#
+# -s :save file to the created dir does`n work at the moment. We
+#     need to spilt var $opts{s} .
+# -r :option currently is we use it it does`nt kill chldern process
+#     when GUI is gone. 
+
+
+# (C) SUSE 2013, mcaj@suse.cz, distribute under GPL-2.0+ 
+
+use strict;
+use warnings;
+
+#use Data::Dumper;
+use File::stat;
+use File::Glob;
+#use Getopt::Long qw(:config no_ignore_case);
+use Getopt::Std;
+use POSIX ":sys_wait_h";
+
+my $version = '0.3';
+
+# Parameter  
+my %opts;
+getopts('s:vrhH:P:tl:', \%opts) or usage();
+
+if ($opts{h} || !$opts{s})
+{
+    usage();
+}
+
+# Do we need them ?
+my $a_chan = undef;
+my $a_name = undef;
+# for the stream are need it:
+my $retry_connect = 0;
+my $host = undef;
+my $port = undef;
+my $tally = undef;
+
+my $dvswitch='/usr/bin/dvswitch'; #path to dvswitch
+my $dvsink='/usr/bin/dvsink-files'; #path to dvsink-files
+#my $cmd = '/usr/bin/dvsource-dvgrab';
+my $cmd = '/usr/bin/dvsource-firewire'; #path to dvsource-firewire
+
+$cmd .= " --tally" if ($opts{t});
+$cmd .= " -v" if ($opts{v});
+$cmd .= ' --retry' if ($opts{r});
+$cmd .= " --port=$opts{P}" if ($opts{P});
+$cmd .= " --host=$opts{H}" if ($opts{H});
+
+my $dvgrab = 'dvgrab';
+my $dvgrab_opts = '-noavc';
+my $ignore_missing_units = 0;
+
+my $devices = 0; # devices start on Zero 
+
+my @good; # array for founded FW dev.
+my $good;
+
+my @children;            # Store connections to them
+my $children;
+my %children;
+my $fwpid;
+
+
+
+my $help = undef;
+
+sub get_ps();
+sub run_grab;
+sub search_dev;
+
+sub usage
+{
+        print "Usage: dvsource-firewire2switch [OPTION] -s [SAVE TO FILE] -l [LOG FILE] \n";
+	print "************************************************************************ \n";	
+	print "The script check all avaible FW devices on the machine and start dvsource.\n";
+	print "It using fork to run them separetly.Dead devices (without guid) are skipped.\n"; 
+	print "Devices that are in use (guid appears in /proc/*/cmdline) are also skipped.";
+	print "the options -s is mandatory !\n\n";
+	
+	print "Valid options are:\n";
+	print "\t -s : path there video data are store. this options is mandatory \n";
+	print "\t -v : verbose mode print more information at startup.\n";
+	print "\t -r : keep retrying to connect, in case DVswitch is not yet listening. -not Working yet!\n"; 
+	print "\t -H : send dvsource to remote HOST -not Working yet!\n";
+	print "\t -P : the port to remote HOST -not Working yet!\n";
+# Not working yet:
+# 	Specify the network address on which DVswitch is listening.  The
+#	host address may be specified by name or as an IPv4 or IPv6 literal.
+
+	print "\t -t :tally mode Print notices of activation and deactivation in the mixer \n";
+#	,  for	use with a tally light.  These will take the form "TALLY: on" or "TALLY: off".
+	print "\t -l :path to log file, if it not present all messages go to STDOUT \n\n";
+	print "version: $version \n";
+	print "In case of trouble please send me bug report to mcaj\@suse.cz \n";
+	exit 1;
+}
+
+
+#Run part:
+
+# search FW device and store them in @good:
+search_dev;
+
+my $max_procs=$#good ; # How many children we'll create -1
+$max_procs++; #add one becasue is start at 0
+
+
+# run save video:
+# This need to be add if dir exist. 
+# and file name needs date stemps too.
+
+# check if dir does not exist yet:
+if (-d $opts{s}) 
+{
+	print STDERR "Info: directory $opts{s} alredy exist \n" if ($opts{v});
+} 
+else
+{
+	print STDERR "Info: creating directory $opts{s} \n" if ($opts{v});
+	unless(mkdir $opts{s}) 
+	{
+		die "Error: Unable to create $opts{s}\n";
+	}
+}
+
+$opts{s} .="-%F-%T"; #add timestemp 
+
+$dvsink .=" $opts{s}"; 
+# $dvsink .= ' --retry' if ($opts{r}); do not use it at the moment,
+# otherwise process can not be killed 
+
+record ($dvsink);
+
+
+
+# run dvswitch app
+
+$dvswitch .=">/dev/null 2>&1 &"; #run it in beckground with no output
+
+run_command ($dvswitch);
+print "Slow down the script. \n" ;
+sleep 5;
+
+# In this cycle parent will make as many childern as
+# FW devices system has. There is also 2 sec. slees time after
+# FW stream start.
+
+print STDERR  " Info: $max_procs FW devices found on the machine \n" if ($opts{v});
+print "********************************************************* \n";
+
+foreach $good (@good )
+{
+    $fwpid = fork();
+    die "cannot fork" unless defined $fwpid;
+
+    if ($fwpid == 0) 
+        {
+            $children{$fwpid}=1;
+
+            print STDERR "Working on the device:$devices:   \n" if ($opts{v});
+            print "Starting dev/$good[$devices][0] guid=$good[$devices][1]\n \n";
+            run_grab ( $devices );
+	    sleep 2;
+	    print STDERR "Info: this child is going to exit now \n" if ($opts{v});
+            exit 0;
+        } 
+    else 
+        {
+
+            print STDERR "The parent $fwpid match, and will live \n" if ($opts{v});
+            $devices++;
+	    print "Devices count was increase up to : $devices " if ($opts{v});
+       }
+
+# check is FW is still streaming  ?:
+
+
+}
+
+
+exit 0;
+
+
+#####################################################
+
+
+###################################
+# wait for end children functions:
+###################################
+$SIG{CHLD} = sub 
+{
+print "Runnig $SIG{CHLD} \n";
+ 
+        # don't change $! and $? outside handler
+        local ($!, $?);
+        $fwpid = waitpid(-1, WNOHANG);
+        return if $fwpid == -1;
+        return unless defined $children{$fwpid};
+        print "children pid:  $children{$fwpid} \n";
+        delete $children{$fwpid};
+        print "cleanup_child($fwpid, $?)";
+        cleanup_child($fwpid, $?);
+};
+
+sub record
+#############################################################################
+#On the storage machine (usually the mixer itself) via bash it was loop:
+# sh -c 'while true; do dvsink-files /tmp/dvswitch/test-%F-%T; sleep 2; done'
+##############################################################################
+{
+
+    ($dvsink) = @_;
+    my $savepid = fork();
+    die "cannot fork" unless defined $savepid;
+
+    if ($savepid == 0) 
+        {
+            $children{$savepid}=1;
+	    sleep 4;
+	    print "Starting the infinite save-loop for video now \n";
+	    while(1) { # The infinite loop
+            		my $k = (`ps fax|grep /usr/bin/dvswitch | grep -v "ps fax" |grep -v grep|cut -d " " -f1`);
+	    		last if !$k;  # exit from the infinite loop after GUI is gone
+			print "Info: GUI $dvswitch is still running with PID:$k \n" if ($opts{v});
+	    		run_command ($dvsink);
+			sleep 2 ;
+		     }
+	    print STDERR "Info: the infinite save-loop is going to exit now \n" if ($opts{v});
+            exit 0;
+        } 
+    else 
+        {
+
+            print STDERR "The parent $savepid match, and will live \n" if ($opts{v});
+        }
+
+return 0;
+}
+
+sub run_command
+######################################
+# send STDOUT & STDERR from system to 
+# : log file
+# : STDOUT 
+# : dev/null
+######################################
+{
+	my ($run_system ) = @_;
+
+	if ($opts{l}) 
+	{
+		system ("$run_system &>>$opts{l}  ") and die "Error start $run_system";
+	}elsif ($opts{v})
+	{
+		system ("$run_system ") and die "Error start $run_system";
+	} else 
+	{
+		system ("$run_system >/dev/null 2>&1 ") and die "Error start $run_system";
+	}
+return 0;
+}
+sub search_dev 
+#####################################################
+# searching for "good" device with valid units ID:
+#####################################################
+
+{
+
+	opendir DIR, "/sys/bus/firewire/devices/" or die "no /sys/bus/firewire/devices/: $!";
+	my @fw = grep { !/^\./ } readdir DIR;
+	closedir DIR;
+	my %fw = map { $_ => { guid => undef } } @fw;
+	print STDERR "Founded FW devices @fw \n" if ($opts{v});
+
+	for my $fw (sort @fw)
+	  {
+	    if (open IN, '<', "/sys/bus/firewire/devices/$fw/guid")
+      	{
+		
+		print STDERR "Working on /sys/bus/firewire/devices/$fw/guid \n" if ($opts{v});
+		my $guid = <IN> || '';
+       	 chomp $guid;
+       	 $fw{$fw}{guid} = $guid;
+		close IN;
+
+       	 if (open IN, '<', "/sys/bus/firewire/devices/$fw/units")
+       	   {
+	    # expect 0x00a02d:0x010001
+       	     my $units = <IN> || '';
+       	     chomp $units;
+       	     $fw{$fw}{units} = $units;
+       	     close IN;
+		    $units = '0x0:0x0' if $ignore_missing_units;
+
+       	     if (($guid =~ m{^0x[\da-f]*[1-9a-f][\da-f]*$}) and
+		        ($units =~ m{^0x[\da-f]+:0x[\da-f]+$}))
+		      {
+			push @good, [$fw, $guid];
+		
+			#print STDERR "variable good-0-1 is $good[0][1] \n" if ($opts{v});
+			#print STDERR "variable good-* is @good  scalar: "if ($opts{v});
+			#print scalar @good  if ($opts{v});
+			#print " \n device is: $good[0][0] \n";
+			print STDERR "Usable devices: /dev/$fw guid=$guid with units: $units\n" if ($opts{v});
+		      }
+		    else
+		     {
+		     	print  STDERR "Device : $fw has guid=$guid with empty units: $units\n" if ($opts{v}); 
+		     } 
+		  }
+      	}
+  
+  	}
+return @good;
+}
+
+#####################################################
+# This function run grab command for fw device
+#####################################################
+
+sub run_grab
+{
+	my $all_commands = join("\n", get_ps());
+	my ($devices ) = @_;
+
+# This part need to be check :
+
+	while (@good && $all_commands =~ m{\b$good[$devices][1]\b})
+	  {
+	    print STDERR "Already in use: /dev/$good([$devices][0]) guid=$good([$devices][1])\n" if ($opts{v});
+#    $fw{$good[$devices][0]}{in_use} = 1;
+#    shift @good;
+	  }
+#die "No usable devices: " . Dumper \%fw unless scalar @good;
+
+	$cmd .= " -g '$good[$devices][1]'";	
+
+	# Run bin go background:
+	print STDERR "Running command  $cmd to background now: \n" if ($opts{v}) ;
+	run_command ($cmd);
+
+	return 0;
+}
+
+#####################################################
+# This  function run ps only
+#####################################################
+sub get_ps()
+{
+	my @r = ();
+	opendir DIR, "/proc/" or return @r;
+	my @pids = grep { /^\d+$/ } readdir DIR;
+	closedir DIR;
+
+	for my $pid (@pids)
+    	{
+      		if (open IN, "<", "/proc/$pid/cmdline")
+        		{
+		          my $cmdline = <IN> || '';
+		          chomp $cmdline;
+		          push @r, $cmdline;
+		        }
+    	}
+	return @r;
+}

dvsource-title.pl Added

@@ -0,0 +1,250 @@
+#! /usr/bin/perl -w
+# dvsource-title.pl is a wrapper for dvsource-file.
+# It allows to use jpeg or png still images as title slide, by forwarding
+# these stills through ffmpeg to create the needed DV format for
+# dvsource-file.
+#
+# It also supports overwriting the image files while running. The new image
+# will be reconverted to DV and the stream will switch seamlessly.
+#
+# (C) 2012, jw@suse.de, distribute under GPL-2.0+ or ask.
+# 2012-10-10 -- V0.1 initial draft.
+# 2012-10-16 -- V0.2 added support for directories
+#############
+
+## Requires: perl, ffmpeg
+## dvsource-file with title SIGHUP patch.
+
+use strict;
+use Data::Dumper;
+use File::stat;
+use File::Glob;
+use Getopt::Long qw(:config no_ignore_case);
+use Pod::Usage;
+use POSIX ":sys_wait_h";
+
+my $version = '0.2';
+my $retry_connect = 0;
+my $host = undef;
+my $port = undef;
+my $tally = undef;
+my $verbose = undef;
+my $help = undef;
+my $dv_mode = 'pal-dv';
+my $audio_bits = 16;
+my $loop_sec = '0.5';	# 0.2 is 200msec
+my $poll_sec = '0.3';	# 0.2 is 200msec
+
+sub ffmpeg_newest_img;
+
+GetOptions(
+	"retry|R" 	=> \$retry_connect,
+	"verbose|v"	=> \$verbose,
+	"port|p=s"	=> \$port,
+	"host|h=s"	=> \$host,
+	"tally|t"	=> \$tally,
+	"12"		=> sub { $audio_bits = 12; },
+	"16"		=> sub { $audio_bits = 16; },
+	"help|?"	=> \$help,
+	"pal-dv"	=> sub { $dv_mode = 'pal-dv'; },
+	"ntsc-dv"	=> sub { $dv_mode = 'ntsc-dv'; },
+) or $help++;
+
+pod2usage(-verbose => 1, -msg => qq{
+dvsource-title.pl V$version
+
+
+$0 [OPTIONS] IMAGE_FILE
+$0 [OPTIONS] IMAGE_DIRECTORY/
+
+IMAGE_FILES (jpeg, png, or anything that ffmpeg can parse) are converted to
+DV streams.  If you replace the image file, while dvsource-title is running,
+the stream will switch to the new image seamlessly.
+
+If you specify an IMAGE_DIRECTORY instead, the newest jpeg or png file from
+that directory will be used. The directory will be monitored for timestamp
+changes, then again the newest file will be selected. This is great for
+streaming a series of screendumps.
+
+Valid options are:
+ -v	Print more information at startup.
+
+ -R, --retry	
+ 	Keep retrying to connect, in case DVswitch is not yet listening.
+
+ -h, --host=HOST
+ -p, --port=PORT
+ 	Specify the network address on which DVswitch is listening.  The
+	host address may be specified by name or as an IPv4 or IPv6 literal.
+
+ -t, --tally
+ 	Print notices of activation and deactivation in the  mixer,  for
+	use with a tally light.  These will take the form "TALLY: on" or
+	"TALLY: off".
+
+ --12
+ --16
+ 	Specify the audio format of the generated DV stream.
+	Either 12bit with 44.1khz, or 16bit with 48khz.
+	FIXME: ffmpeg always runs with 16bit/48khz. No switch to 12bit could 
+	be found.
+
+ --pal
+ --ntsc
+ 	Specify video mode for the generated DV stream. Default: $dv_mode
+}) if $help;
+	
+my $img = shift or die "Missing image name.\n";
+die "Image $img not found\n" unless -e $img;
+my $stat = stat $img;
+my $last_touch = $stat->mtime;
+my $last_size = $stat->size;
+
+my $ff_ver = $verbose ? 'info' : 'error';
+my $ffmpeg_fmt = "ffmpeg -v $ff_ver -f s16le -ar 8000 -i /dev/zero -loop 1 -t $loop_sec -i '%s' -target pal-dv '$img.dv'";
+
+my @cmd = ( $ENV{DVSOURCE_FILE} || 'dvsource-file' );
+
+my $dvsource_file_help = `$cmd[0] --help 2>&1`;
+unless ($dvsource_file_help =~ m{kill\s.*hup}i)
+  {
+    warn "$cmd[0]:\n  Support for title_hup.diff not found.\n  Updating the image file may not work as expected.\n";
+  }
+
+push @cmd, "--tally"      if $tally;
+# push @cmd, "--verbose"    if $verbose; # not supported with dvsource-file
+push @cmd, "--retry"      if $retry_connect;
+push @cmd, "--port=$port" if defined $port;
+push @cmd, "--host=$host" if defined $host;
+push @cmd, "--loop", "$img.dv";
+
+
+unlink "$img.dv";
+my ($ffmpeg,$img2) = ffmpeg_newest_img($ffmpeg_fmt, $img);
+warn "\n+ $ffmpeg\n";
+system "$ffmpeg";
+
+my $dvsource_pid = fork();
+if (!$dvsource_pid)
+  {
+    # child process
+    exec @cmd or die "failed to exec @cmd: $!\n";
+    die "?continued after exec?";
+  }
+
+print "dvsource pid=$dvsource_pid\n";
+
+for(;;)
+  {
+    my $stat = stat $img;
+    if (!$stat)
+      {
+        warn "missing '$img'\n";
+      }
+    else
+      {
+	if ($stat->mtime != $last_touch)
+	  {
+	    if ($stat->size <= 0)
+	      {
+		warn "empty '$img'\n";
+	      }
+	    else
+	      {
+		if ($last_size != $stat->size)
+		  {
+		    $last_size = $stat->size;
+		    warn "$img: changeing ...(now $last_size bytes)\n";
+		  }
+		else
+		  {
+		    # its timestamp changed, but its size stabilized.
+		    printf STDERR "new $img: size=%d\n", $stat->size;
+		    unlink "$img.dv";
+		    my ($ffmpeg,$img2) = ffmpeg_newest_img($ffmpeg_fmt, $img);
+		    warn "\n+ $ffmpeg\n";
+		    system "$ffmpeg";
+		    if (-s "$img.dv" < 10000)
+		      {
+			warn "$ffmpeg: short output file '$img.dv' (min. 10000 bytes).\n";
+			warn "Conversion failed. Retrying in 3 sec. Please replace $img ...\n";
+			sleep 3;
+		      }
+		    else
+		      {
+			# we successfully created a new dv file.
+			warn "new $img2:\n" if $verbose;
+			warn "+ kill -hup $dvsource_pid\n";
+			die "$dvsource_pid: @cmd is gone" unless kill "HUP", $dvsource_pid;
+			$last_touch = $stat->mtime;
+		      }
+		  }
+	      }
+	  }
+      }
+    select(undef, undef, undef, $poll_sec);
+    die "@cmd pid=0\n" unless $dvsource_pid;
+    waitpid($dvsource_pid, WNOHANG);
+    die "pid=$dvsource_pid: @cmd is gone.\n" unless kill 0 => $dvsource_pid;
+    print STDERR "." if $verbose;
+  }
+
+exit 0;
+#############################################################
+
+## implements directory lookup for the newest file.
+## this might get slow, if you have thousands of files in the directory.
+sub ffmpeg_newest_img
+{
+  my ($ffmpeg_fmt, $img) = @_;
+  if (-f $img)
+    {
+       die "filename with ' in it are not supported" if $img =~ m{'};
+       return (sprintf($ffmpeg_fmt, $img), $img);
+    }
+  die "ffmpeg_newest_img: img must be file or directory\n" unless -d $img;
+
+  opendir DIR, $img;
+  my @files = grep { /\.(jpg|jpeg|png)$/i } readdir DIR;
+  closedir DIR;
+
+  my $newest_age = 99999999;
+  my $newest_file = undef;
+  my @nsupp;
+  for my $file (@files)
+    {
+      my $age = -M "$img/$file";
+      if ($age < $newest_age)
+        {
+	  if ("$img/$file" =~ m{'})
+	    {
+	      push @nsupp, "$img/$file";
+	    }
+	  else
+	    {
+	      $newest_age = $age;
+	      $newest_file = "$img/$file";
+	    }
+	}
+    }
+
+  unless (defined $newest_file)
+    {
+      $newest_file = '/dev/null';
+      warn "filenames with ' in them are not supported: '$nsupp[-1]'\n" 
+        if scalar @nsupp;
+    }
+
+  # wait until the file stabilizes
+  my $last_size = -s $newest_file;
+  for(;;)
+    {
+      select(undef, undef, undef, $poll_sec);
+      my $size = -s $newest_file;
+      last if $size == $last_size;
+      $last_size = $size;
+      warn "$newest_file: changeing ... ($size bytes)\n";
+    }
+
+  return (sprintf($ffmpeg_fmt, $newest_file), $newest_file);
+}

dvsource-webcam.pl Added

@@ -0,0 +1,320 @@
+#! /usr/bin/perl -w
+# dvsource-webcam.pl is a more userfriendly wrapper for dvsource-command.
+# It assists in constructing and ffmpeg commandline (audio and video) and
+# then passes all relevant parameters to dvsource-command.
+#
+# It is designed to work with a simple v4l2 webcam, but may be helpful for other
+# sources too.
+#
+# (C) 2012, jw@suse.de, distribute under GPL-2.0+ or ask.
+# 2012-03-04 -- V0.1 initial draft.
+# 2012-03-06 -- V1.0 works.
+# 2012-03-09 -- V1.1 run arecord with LANG=C, to get predictable output.
+# 2012-03-21 -- V1.2 changed default, to last /dev/videoN, not /dev/video0
+#############
+# FIXME: this goes extremly async, quite soon.
+# http://dvswitch.alioth.debian.org/wiki/inputs/ suggests this command line:
+# ffmpeg -f video4linux2 -s vga -r 25 -i /dev/video0 -f s16le -ar 48000 -ac 2 -i /dev/zero -target pal-dv - | dvsource-file /dev/stdin
+## FIXME: add -re, to read the input file in realtime, instead of prebuffering.
+
+## Requires: alsa-utils, ffmpeg
+
+use strict;
+use Data::Dumper;
+use File::stat;
+use File::Glob;
+use Getopt::Long qw(:config no_ignore_case);
+use Pod::Usage;
+
+my $version = '1.2';
+my $a_chan = undef;
+my $a_name = undef;
+my $retry_connect = 0;
+my $host = undef;
+my $port = undef;
+my $tally = undef;
+my $verbose = undef;
+my $help = undef;
+my $dv_mode = 'pal-dv';
+
+GetOptions(
+	"retry|R" 	=> \$retry_connect,
+	"verbose|v"	=> \$verbose,
+	"port|p=s"	=> \$port,
+	"host|h=s"	=> \$host,
+	"tally|t"	=> \$tally,
+	"adev=s"	=> \$a_name,
+	"achan=s"	=> \$a_chan,
+	"help|?"	=> \$help,
+	"pal-dv"	=> sub { $dv_mode = 'pal-dv'; },
+	"ntsc-dv"	=> sub { $dv_mode = 'ntsc-dv'; },
+) or $help++;
+
+pod2usage(-verbose => 1, -msg => qq{
+dvsource-webcam.pl V$version
+
+
+$0 [OPTIONS] [VIDEO_DEV]
+
+The default VIDEO_DEV is /dev/videoN, where N is the highest available number, 
+aka the device that was connected last.
+$0 converts video from any v4l2 device (e.g. a webcam) together with an audio 
+source into a DV stream that is usable by DVswitch. This conversion requires
+ffmpeg.
+
+Valid options are:
+ -v	Print more information at startup.
+
+ -R, --retry	
+ 	Keep retrying to connect, in case DVswitch is not yet listening.
+
+ -h, --host=HOST
+ -p, --port=PORT
+ 	Specify the network address on which DVswitch is listening.  The
+	host address may be specified by name or as an IPv4 or IPv6 literal.
+
+ -t, --tally
+ 	Print notices of activation and deactivation in the  mixer,  for
+	use with a tally light.  These will take the form "TALLY: on" or
+	"TALLY: off".
+
+ --adev=ALSA_DEVICE
+ 	Specify which alsa audio capture device to use. Run 'arecord -l' for
+	a listing. Default: search for same USB-id as VIDEO_DEV.
+ --achan=N
+ 	Specify how many channels the alsa audio device captures. Default: 
+	query USB subsystem, or '2'.
+
+ --pal
+ --ntsc
+ 	Specify video mode for the generated DV stream. Default: $dv_mode
+}) if $help;
+	
+my $vdev = shift || first_existing_file('/dev/video%d', [reverse (0..20)]);
+die "Missing video device $vdev. Check your webcam cable or driver?\n" unless -e $vdev;
+
+my $a_dev = { id => 0 };
+if (defined $a_name)
+  {
+    $a_dev = { id => $1 } if $a_name =~ m{(\d+)};
+  }
+else
+  {
+    ($a_name,$a_dev) = find_matching_audio_source($vdev);
+  }
+
+my $warn;
+($a_chan, $warn) = find_n_channels($a_dev) unless defined $a_chan;
+print "WARNING: find_n_channels(): $warn\n" if defined $warn;
+
+die "no audio found for $vdev -- please retry using --adev=hw:N\n" unless $a_name;
+die "unclear number audio channels in $a_name -- please retry using --achan=N\n" unless $a_chan;
+
+my $ff_verbose = $verbose ? 'verbose' : 'quiet';
+
+my $ffmpeg = "ffmpeg -v $ff_verbose -f alsa -ac $a_chan -i $a_name -f v4l2 -i $vdev -target $dv_mode pipe:1";
+
+my $cmd = 'dvsource-command';
+$cmd .= " --tally" if $tally;
+$cmd .= " --verbose" if $verbose;
+$cmd .= ' --retry' if $retry_connect;
+$cmd .= " --port=$port" if defined $port;
+$cmd .= " --host=$host" if defined $host;
+
+system "$cmd '$ffmpeg'" and die "failed to run '$cmd'\n";
+exit 0;
+
+
+## FIXME: can we run with a dummy audio stream, or even without?
+###
+## how to compute LONG_ENOUGH, how to loop a short audio, 
+# print "ffmpeg -f s8 -ar 8000 -t LONG_ENOUGH -i /dev/zero /tmp/silence.wav;\n";
+# print "ffmpeg -f s8 /tmp/silence.wav -f v4l2 -i $vdev -target pal-dv pipe:1\n";
+
+## slurps in 300 MB audio per minute, this is too much!
+# print "ffmpeg -f s16le -ar 48000 -i /dev/zero -f v4l2 -i $vdev -target pal-dv pipe:1\n";
+
+sub find_matching_audio_source
+{
+  my ($video_dev) = (@_);
+
+  my $arecord = $ENV{DVSWITCH_ARECORD} || '/usr/bin/arecord';
+  die "$arecord not found. Try env DVSWITCH_ARECORD=...\n" unless -x $arecord;
+  ## FALLBACK: browse through /proc/asound/cards
+
+  my @adev_list;
+  # card 0, not Karte 0, please.
+  open IN, "-|", "env LANG=C $arecord -l" or die "failed to run '$arecord -l': $!\n";
+  while (defined( my $line = <IN>))
+    {
+      chomp $line;
+      # card 0: Intel [HDA Intel], device 0: AD198x Analog [AD198x Analog]
+      # card 1: U0x46d0x805 [USB Device 0x46d:0x805], device 0: USB Audio [USB Audio]
+      if ($line =~ m{^\s*card\s+(\d+):\s+(.*)$})
+	{
+	  push @adev_list, { id => $1, arecord_line => $2 };
+	}
+    }
+  close IN;
+
+  warn "Failed to list audio devices: $arecord -l: returned no 'card \\d: ...' lines.\n" unless @adev_list;
+
+  my $st = File::stat::stat($video_dev);
+  die "cannot stat '$video_dev', need an existing video device name as parameter\n" unless defined $st and $st->rdev;
+
+  my $dev = { rdev => $st->rdev, name => $video_dev };
+
+  $dev->{dev}  = $dev->{rdev} >> 8;
+  $dev->{node} = $dev->{rdev} - ($dev->{dev} << 8);
+
+  # /sys/dev/char/81:0/name
+  my $syspath = "/sys/dev/char/$dev->{dev}:$dev->{node}/name";
+
+  if (open IN, "<", $syspath)
+    { 
+      chomp($dev->{fluffy_name} = <IN>);
+      close IN;
+    }
+  else
+    {
+      warn "cannot open $syspath for " . Dumper $dev;
+    }
+
+  # /sys/bus/usb/devices/1-5/1-5:1.0/video4linux/video0/dev
+  my @all = File::Glob::bsd_glob("/sys/bus/usb/devices/*/*/video4linux/video0/dev");
+  for my $usb (@all)
+    {
+      next unless open IN, "<", $usb;
+      my $line = <IN>;
+      close IN;
+      chomp $line;
+      next if $line ne "$dev->{dev}:$dev->{node}";
+      next unless $usb =~ m{^/sys/bus/usb/devices/([^/]+)/};
+      my $usb_dev = $1;
+      $dev->{sys_bus_usb} = $usb;
+      $dev->{usb_dev} = $usb_dev;
+      if (open IN, "<", "/sys/bus/usb/devices/$usb_dev/idVendor")
+	{
+	  chomp($dev->{idVendor} = <IN>);
+	  close IN;
+	}
+      if (open IN, "<", "/sys/bus/usb/devices/$usb_dev/idProduct")
+	{
+	  chomp($dev->{idProduct} = <IN>);
+	  close IN;
+	}
+    }
+
+  delete $dev->{usb_dev};
+
+  unless ($dev->{usb_dev})
+    {
+      ## hmm, /sys/bus/usb path lookup did not work, maybe the name 
+      ## contains a usb idVendor idProduct pair?
+      if ($dev->{fluffy_name} =~ m{\b(0x)?([0-9a-f]{4}):(0x)?([0-9a-f]{4})\b})
+	{
+	  $dev->{idVendor} = $2;
+	  $dev->{idProduct} = $4;
+	  $dev->{usb_dev} = "not in /sys/bus/usb, but matching '$dev->{fluffy_name}'";
+	}
+    }
+
+  if ($dev->{usb_dev})
+    {
+      # $video_dev is an usb device. Try to match by Vendor:Product
+      my $p1 = $dev->{idProduct};
+      my $p2 = $p1; $p2 =~ s{^0*}{};	# strip leading zeros
+      my $v1 = $dev->{idVendor};
+      my $v2 = $v1; $v2 =~ s{^0*}{};	# strip leading zeros
+
+      for my $adev (@adev_list)
+	{
+	  $adev->{score} = 0;
+	  $adev->{score} +=    1 if $adev->{arecord_line} =~ m{\busb\b}i;
+
+	  $adev->{score} +=   10 if $adev->{arecord_line} =~ m{\b$v1\b} and
+				    $adev->{arecord_line} =~ m{\b$p1\b}i;
+	  $adev->{score} +=   10 if $adev->{arecord_line} =~ m{\b$v2\b} and
+				    $adev->{arecord_line} =~ m{\b$p2\b}i;
+	  $adev->{score} +=   10 if $adev->{arecord_line} =~ m{\b0x$v1\b} and
+				    $adev->{arecord_line} =~ m{\b0x$p1\b}i;
+	  $adev->{score} +=   10 if $adev->{arecord_line} =~ m{\b0x$v2\b} and
+				    $adev->{arecord_line} =~ m{\b0x$p2\b}i;
+
+	  $adev->{score} +=  100 if $adev->{arecord_line} =~ m{\b$v1:$p1\b}i;
+	  $adev->{score} +=  100 if $adev->{arecord_line} =~ m{\b$v2:$p2\b}i;
+	  $adev->{score} +=  100 if $adev->{arecord_line} =~ m{\b0x$v1:0x$p1\b}i;
+	  $adev->{score} +=  100 if $adev->{arecord_line} =~ m{\b0x$v2:0x$p2\b}i;
+	}
+    }
+  else
+    {
+      warn "Not a USB video device, audio matching not impl." . Dumper $dev;
+      return undef;
+    }
+
+  # die Dumper \@adev_list, $dev, \@all;
+
+  my @adev_scored = sort { $b->{score} <=> $a->{score} } @adev_list;
+  if (scalar @adev_scored and $adev_scored[0]{score})
+    {
+      $adev_scored[0]{v_dev} = $dev;
+      return ("hw:$adev_scored[0]{id}", $adev_scored[0]);
+    }
+}
+
+
+sub find_n_channels
+{
+  my ($dev) = @_;
+  # /proc/asound/card1/usbmixer
+  # if exists, contains this:
+  # USB Mixer: usb_id=0x046d0805, ctrlif=2, ctlerr=0
+  # Card: USB Device 0x46d:0x805 at usb-0000:00:1d.7-5, high speed
+  #   Unit: 5
+  #     Control: name="Mic Capture Volume", index=0
+  #     Info: id=5, control=2, cmask=0x0, channels=1, type="S16"
+  #     Volume: min=0, max=1, dBmin=0, dBmax=0
+  #   Unit: 5
+  #     Control: name="Mic Capture Switch", index=0
+  #     Info: id=5, control=1, cmask=0x0, channels=1, type="INV_BOOLEAN"
+  #     Volume: min=0, max=1, dBmin=0, dBmax=0
+  ###
+  # my /proc/asound/card0/ contains no mixer, and no other
+  # reliable way to read a channel count. 
+  # So we default to 2 channels, unless we see the above.
+  ###
+  #
+
+  return (2, "default=2. audio device undefined") unless defined $dev;
+
+  my $usbmixer = "/proc/asound/card$dev->{id}/usbmixer";
+  unless (open IN, "<", $usbmixer)
+    {
+      # well, we have no clue, actually, lets default to stereo
+      return (2, "default=2. no $usbmixer, no clue");
+    }
+  while (defined (my $line = <IN>))
+    {
+      chomp $line;
+      if ($line =~ m{^\s+Info:.*\bchannels=(\d+)\b})
+        {
+	  close IN;
+	  return $1;
+	}
+    }
+  return (2, "default=2. $usbmixer had no 'Info:' with 'channels='");
+  close IN;
+}
+
+sub first_existing_file
+{
+  my ($fmt_str, $range) = @_;
+  for my $n (@$range)
+    {
+      my $name = sprintf $fmt_str, $n;
+      return $name if -e $name;
+    }
+  return $fmt_str;
+}
+

dvswitch-0.9-1-da15ba4.tar.gz Added

dvswitch-0.9-susedevel-26c32ce.tar.gz Added

dvswitch-0.9-susedevel-8b96437.tar.gz Added

dvswitch-scm-latest.tar.gz Added

dvtrim.pl Added

@@ -0,0 +1,112 @@
+#! /usr/bin/perl -w
+# dvtrim.pl is a userfriendly wrapper for ffmpeg -ss -t
+#
+# (C) 2012, jw@suse.de, distribute under GPL-2.0+ or ask.
+# 2012-03-21 -- V0.1 initial draft.
+# 2012-03-22 -- V0.2 enabled experimental --fastcopy option.
+#
+## Requires: ffmpeg
+
+use strict;
+use Data::Dumper;
+use Getopt::Long qw(:config no_ignore_case);
+use Pod::Usage;
+
+my $version = '1.1';
+
+my $verbose = 1;
+my $help = undef;
+my $outfile = undef;
+my $start_time = undef;
+my $end_time = undef;
+my $duration_time = undef;
+my $fastcopy = 0;
+
+GetOptions(
+	"verbose|v+"	=> \$verbose,
+	"quiet|q"	=> sub { $verbose = 0; },
+	"fastcopy|f"	=> \$fastcopy,
+	"start|ss|s=s"	=> \$start_time,
+	"end|stop|e=s"	=> \$end_time,
+	"duration|t=s"	=> \$duration_time,
+	"help|?"	=> \$help,
+	"output|o=s"	=> \$outfile
+) or $help++;
+
+pod2usage(-verbose => 1, -msg => qq{
+dvtrim.pl V$version
+
+$0 [OPTIONS] INFILE.dv [-o OUTFILE.dv]
+
+Valid options are:
+ -v --verbose    Print more information at startup.
+ -q --quiet      Print less information.
+ -f --fastcopy	 Experimental copy codec. It may be faster or may fail to start.
+
+ --start [hh:mm:]ss[.xxx]
+		 The timecode can be specified in hours, minutes, seconds (with
+		 fractions) or all seconds. Default: --start 0
+ --duration [hh:mm:]ss[.xxx]
+ 		 'duration' and 'end' are exclusive.
+ 		 Default: until the end of the video.
+ --end [-][hh:mm:]ss[.xxx]
+ 		 'duration' and 'end' are exclusive.
+		 'end' can be specified as a negative value, which trims
+		 relative to the end of the video. 
+		 Default: until the end of the video: --end -0
+}) if $help;
+
+my $infile = shift || die "No input file name given.\n";
+die "Missing input file $infile\n" unless -e $infile;
+
+die "--end and --duration are mutually exclusive.\n" 
+  if defined $duration_time and defined $end_time;
+
+my $start    = linear_time($start_time, '--start')       if defined $start_time;
+               linear_time($duration_time, '--duration') if defined $duration_time;
+my $duration = linear_time($end_time, '--end') - $start  if defined $end_time;
+$duration_time = $duration if defined $duration;
+die "end must be greater than start.\n" if defined $duration and $duration <= 0;
+
+unless (defined $outfile)
+  {
+    $outfile = $infile;
+    $outfile =~ s{.*/}{};	# no path, save it in cwd.
+    my $suf = $1 if $outfile =~ s{(\.\w+)$}{};
+    $outfile .= "_dvtrim";
+    $outfile .= $suf if defined $suf;
+  }
+
+my $ff_verbose = ($verbose > 1) ? 'verbose' : 'quiet';
+
+my $ffmpeg = "ffmpeg -v $ff_verbose -i '$infile' -sameq";
+if ($fastcopy)
+  {
+    # ffmpeg fails to initialize the copy codecs. We use -sameq for now. It is bit-identical.
+    $ffmpeg = "ffmpeg -v $ff_verbose -i '$infile' -vcodec copy -acodec copy";
+  }
+
+$ffmpeg .= " -ss $start_time" if defined $start_time;
+$ffmpeg .= " -t $duration_time" if defined $duration_time;
+## we go for accuracy, not for speed. Thus -- according to the man page --
+## -ss -t should come after -i.
+$ffmpeg .= " '$outfile'";
+
+warn "$ffmpeg\n" if $verbose;
+system $ffmpeg and die "failed to run ($ffmpeg)\n";
+exit 0;
+##################################################
+
+
+sub linear_time
+{
+  my ($hhmmss_ttt, $msg) = @_;
+  return 0 unless defined $hhmmss_ttt;
+  return $hhmmss_ttt+.0 if $hhmmss_ttt =~ m{^\d+(\.\d*)?$};
+  if ($hhmmss_ttt =~ m{^(\d\d+):(\d\d):(\s\s(\.\d*))?$})
+    {
+      my ($hh, $mm, $ss) = ($1, $2, $3);
+      return ($hh * 60 + $mm) * 60 + $ss;
+    }
+  die "$msg: supported formats: HH:MM:SS.TTT, HH:MM:SS, SSS.TTT, or SSS; got '$hhmmss_ttt'\n";
+}

etc_dvswitchrc Added

gitfetch.sh Added

@@ -0,0 +1,64 @@
+#! /bin/sh
+##
+## This is where upstream development is going on:
+##
+## FIXME: We should be using git archive from the remote repo
+## But it does not work for me at all.
+set -x
+
+## this works only from within the checkout
+# git archive susedevel --prefix dvswitch-0.9-susedevel-1457797/ -o bs/dvswitch-0.9-susedevel-1457797.tar.gz -9
+
+name=dvswitch
+version=0.9
+branch=susedevel
+fmt=tar.gz
+git clone https://github.com/jnweiger/$name.git --depth 1 -b $branch
+cd $name
+# the branch name ($2) below, can have whitespace. chop it away by 
+# comparing with the non-verbose output.
+# E.g.:
+# * (no branch) c150b38 Upload
+# 
+git branch $branch
+branch__=$(git branch)
+branch_v=$(git branch -vv)
+commit=$(echo ${branch_v:${#branch__}} | awk '{print $1}')
+archive=$name-$version-$branch-$commit
+
+## the / is important here!
+git archive $branch -v --format $fmt --prefix $archive/ -o ../$archive.$fmt
+git log --reverse -n 1 | cat
+git branch -vv
+cd ..
+rm -rf $name
+ls -l $archive.$fmt
+
+
+exit 0
+###########################################################################################
+### old code below, we pulled from upstream and applied many patches. this is too tedious.
+
+name=dvswitch
+tag=0.9-1
+fmt=tar.gz
+git clone git://anonscm.debian.org/dvswitch/$name.git # -b $tag
+cd $name
+# the branch name ($2) below, can have whitespace. chop it away by 
+# comparing with the non-verbose output.
+# E.g.:
+# * (no branch) c150b38 Upload
+# 
+branch__=$(git branch)
+branch_v=$(git branch -vv)
+commit=$(echo ${branch_v:${#branch__}} | awk '{print $1}')
+archive=$name-$tag-$commit
+
+## the / is important here!
+git archive master -v --format $fmt --prefix $archive/ -o ../$archive.$fmt
+git log --reverse -n 1 | cat
+git branch -vv
+cd ..
+rm -rf $name
+ls -l $archive.$fmt
+

Build Results
RPM Lint

Refresh

Comments for request 928 0

Request History

jnweiger created request over 10 years ago

I'd like to maintain this directly in Multimedia, so that it hits the Mirrors.

jsjhb accepted request over 10 years ago