Microscopic changes, comments/messages changed.

Real important: turn off FIELDDROP in Vrec.

diff --git a/Demo/sgi/video/README b/Demo/sgi/video/README
index 071ca9b4c96c14e6c6ca4f6cd2e5fbfcf8e67c92..3f54cf5d32215713ea42d3d5e3706f235eff9290 100644 (file)
--- 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 6443fb66efa98bb3673f5b4d1c418702ddd1dc86..a5d1d92aa3a2aacbdde981edb94e9a90a284265b 100755 (executable)
--- 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 4fe13c5995ae232d41fc5486a58b7ff3b90a84fb..4a51c6e394a19fb847590f052d8fe97b9ff12a80 100755 (executable)
--- 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 867c404047ff469669586836e34cc7a619e5b657..69b0102f4ce1b04b9f94d9ca61e1d638726bee85 100755 (executable)
--- 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 54554c2fc20fbd7951d64f8295453efa2ec051d0..888a3665f99bf0bf3e1b991362698621d371c2d2 100755 (executable)
--- 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()