X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?p=xscreensaver;a=blobdiff_plain;f=driver%2Fxscreensaver-getimage-video;h=15c5a9ef6e3aefe28de4dffebd317cf75ecd61fc;hp=f8474670cca37a567ef68d4f1c8f282449a2de20;hb=2d04c4f22466851aedb6ed0f2919d148f726b889;hpb=bc7b7a8eb122206d239ec0e693676bcce31be1aa

diff --git a/driver/xscreensaver-getimage-video b/driver/xscreensaver-getimage-video
index f8474670..15c5a9ef 100755
--- a/driver/xscreensaver-getimage-video
+++ b/driver/xscreensaver-getimage-video
@@ -1,5 +1,5 @@
 #!/usr/bin/perl -w
-# Copyright © 2001, 2002, 2003 Jamie Zawinski <jwz@jwz.org>.
+# Copyright © 2001, 2002, 2003, 2005 Jamie Zawinski <jwz@jwz.org>.
 #
 # Permission to use, copy, modify, distribute, and sell this software and its
 # documentation for any purpose is hereby granted without fee, provided that
@@ -22,7 +22,7 @@
 # value of the "grabVideoFrames" setting in the ~/.xscreensaver file
 # (or in /usr/lib/X11/app-defaults/XScreenSaver).
 #
-# Created: 13-Apr-01.
+# Created: 13-Apr-2001.
 
 require 5;
 use diagnostics;
@@ -33,23 +33,17 @@ my $version = q{ $Revision: 1.13 $ }; $version =~ s/^[^0-9]+([0-9.]+).*$/$1/;
 
 my $verbose = 0;
 
+my $tmpdir  = $ENV{TMPDIR} || "/tmp";
+my $tmpfile = sprintf ("%s/xssgv.%08x.ppm", $tmpdir, rand(0xFFFFFFFF));
+
+
 # These are programs that can be used to grab a video frame.  The first one
 # of these programs that exists on $PATH will be used, and the image file
-# is assumed to be written to stdout (in some image format acceptable to
+# is assumed to be written to $tmpfile (in some image format acceptable to
 # "xscreensaver-getimage-file", e.g., PPM or JPEG.)
 #
 # If you add other programs to this list, please let me know!
 #
-
-my $tmpdir = $ENV{TMPDIR};
-$tmpdir = "/tmp" unless $tmpdir;
-
-my $tmpfile = sprintf ("%s/xssgv.%08x.ppm", $tmpdir, rand(0xFFFFFFFF));
-
-# this crap is because "vidtomem" can only write to a file, and uses
-# a stupid, non-overridable file name format.
-my $sgi_bogosity = "$tmpfile-00000.rgb";
-
 my @programs = (
 
   "bttvgrab -d q -Q -l 1 -o ppm -f $tmpfile",	# BTTV
@@ -61,13 +55,16 @@ my @programs = (
 
   "atitv snap $tmpfile",			# ATI video capture card
 
-  "grab -type ppm -format ntsc -source 1 " .
-        "-settle 0.75 -output $tmpfile",	# *BSD BT848 module
+  "grab -type ppm -format ntsc -source 1 " .	# *BSD BT848 module
+	"-settle 0.75 -output $tmpfile",
 
-  "motioneye -j $tmpfile",                      # Sony Vaio MotionEye
+  "motioneye -j $tmpfile",			# Sony Vaio MotionEye
 						# (hardware jpeg encoder)
 
-  "vidtomem -f $tmpfile 2>&- && mv $sgi_bogosity $tmpfile",  # Silicon Graphics
+  "vidcat -b -f ppm -s 640x480 > $tmpfile 2>-",	# w3cam/ovcam
+
+  "vidtomem -f $tmpfile 2>&- " .		# Silicon Graphics
+	"&& mv $tmpfile-00000.rgb $tmpfile",
 );