summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Demo/sgi/video/README15
-rwxr-xr-xDemo/sgi/video/VFile.py2
-rwxr-xr-xDemo/sgi/video/Vplay.py2
-rwxr-xr-xDemo/sgi/video/Vrec.py5
-rwxr-xr-xDemo/sgi/video/Vsend.py2
5 files changed, 17 insertions, 9 deletions
diff --git a/Demo/sgi/video/README b/Demo/sgi/video/README
index 071ca9b4c9..3f54cf5d32 100644
--- a/Demo/sgi/video/README
+++ b/Demo/sgi/video/README
@@ -61,6 +61,9 @@ Vmkjpeg.py compress an rgb or grey video file to jpeg[grey] format
Vunjpeg.py expand a jpeg[grey] video file to rgb or grey format
+Vfix.py truncate the scan line width of a video file to
+ a multiple of 4 ('grey' images only)
+
Vedit.py interactive video editing program
Vsend.py unicast or multicast live video as UDP packets
@@ -80,7 +83,10 @@ LiveVideoOut.py live video output class, used by Vsend and Vreceive
The following are C programs, either for efficiency or because they
-need to link with a C library:
+need to link with a C library. (These probably don't work any more
+since the video file format has changed several times since they were
+written. Also, they can now be recoded in Python using the 'imageop'
+and 'imgfile' modules.)
squash.c make a movie smaller by averaging pixels
usage: squash factor [bits] <moviefile >newmoviefile
@@ -104,9 +110,8 @@ These programs are obsolete, but kept around for sentimental reasons.
Most either don't work any more because they don't use VFile and hence
haven't followed the frequent changes in the CMIF video file format;
or they are dependent upon hardware we don't have (SGI's previous
-generation framegrabber). Except for cam.py / tv.py, their
-functionality is present in the suite of programs whose name begins
-with 'V' listed above.
+generation framegrabber). Anyway, their functionality is present in
+the suite of programs whose name begins with 'V' listed above.
cam.py network real-time tv broadcast; see tv.py
usage: cam [packfactor [host]]
@@ -158,5 +163,3 @@ vinfo.py print summary of movie file(s)
vpregs.py definition of VP registers
vtime.py virtual time module imported by syncaudio.py and camcorder.py
-
-colorsys.py color system conversions (now part of std python lib)
diff --git a/Demo/sgi/video/VFile.py b/Demo/sgi/video/VFile.py
index 6443fb66ef..a5d1d92aa3 100755
--- a/Demo/sgi/video/VFile.py
+++ b/Demo/sgi/video/VFile.py
@@ -538,6 +538,8 @@ def readfileheader(fp, filename):
format, rest = eval(line[:-1])
except:
raise Error, filename + ': Bad 3.0 color info'
+ if format == 'xrgb8':
+ format = 'rgb8' # rgb8 upside-down, for X
if format in ('rgb', 'jpeg'):
c0bits = c1bits = c2bits = 0
chrompack = 0
diff --git a/Demo/sgi/video/Vplay.py b/Demo/sgi/video/Vplay.py
index 4fe13c5995..4a51c6e394 100755
--- a/Demo/sgi/video/Vplay.py
+++ b/Demo/sgi/video/Vplay.py
@@ -1,6 +1,4 @@
-#! /ufs/guido/bin/sgi/python-405
#! /ufs/guido/bin/sgi/python
-#! /usr/local/python
# Play CMIF movie files
diff --git a/Demo/sgi/video/Vrec.py b/Demo/sgi/video/Vrec.py
index 867c404047..69b0102f4c 100755
--- a/Demo/sgi/video/Vrec.py
+++ b/Demo/sgi/video/Vrec.py
@@ -123,6 +123,11 @@ def main():
print x, 'x', y
v.SetSize(x, y)
+
+ # VERY IMPORTANT (for PAL at least): don't drop fields!
+ param = [SV.FIELDDROP, 0]
+ v.SetParam(param)
+
v.BindGLWindow(win, SV.IN_REPLACE)
gl.qdevice(DEVICE.LEFTMOUSE)
diff --git a/Demo/sgi/video/Vsend.py b/Demo/sgi/video/Vsend.py
index 54554c2fc2..888a3665f9 100755
--- a/Demo/sgi/video/Vsend.py
+++ b/Demo/sgi/video/Vsend.py
@@ -74,7 +74,7 @@ def main():
hosts.append(gethostbyname(DEFMCAST))
if not LiveVideoIn.have_video:
- print 'Sorry, no video available (use python-405 on roos)'
+ print 'Sorry, no video available (use python-405)'
sys.exit(1)
gl.foreground()