Vrec.py: don't print Ids if no frames are captured.
Vrecb.py: use the new interfaces to imageop (fix -M, -m, -g options).
diff --git a/Demo/sgi/video/Vrec.py b/Demo/sgi/video/Vrec.py
index d952566..e90a4bd 100755
--- a/Demo/sgi/video/Vrec.py
+++ b/Demo/sgi/video/Vrec.py
@@ -326,13 +326,14 @@
print count*200.0/lastid, '%,',
print count*rate*200.0/lastid, '% of wanted rate',
print
- print 'Ids:',
- t0 = ids[0]
- del ids[0]
- for t1 in ids:
- print t1-t0,
- t0 = t1
- print
+ if ids:
+ print 'Ids:',
+ t0 = ids[0]
+ del ids[0]
+ for t1 in ids:
+ print t1-t0,
+ t0 = t1
+ print
if filename and audiofilename:
audiostop.append(None)
audiodone.acquire_lock()
diff --git a/Demo/sgi/video/Vrecb.py b/Demo/sgi/video/Vrecb.py
index 84cd5cc..2dcbe8e 100755
--- a/Demo/sgi/video/Vrecb.py
+++ b/Demo/sgi/video/Vrecb.py
@@ -245,7 +245,11 @@
#
# Construct header and write it
#
- vout = VFile.VoutFile().init(filename)
+ try:
+ vout = VFile.VoutFile().init(filename)
+ except IOError, msg:
+ print filename, ':', msg
+ sys.exit(1)
if mono:
vout.format = 'mono'
elif grey and greybits == 8:
@@ -291,13 +295,15 @@
start = frameno*fieldsize
field = data[start:start+fieldsize]
if convertor:
- field = convertor(field, x, y)
+ field = convertor(field, len(field), 1)
elif mono and monotreshold >= 0:
- field = imageop.grey2mono(field, x, y, \
- 1, monotreshold)
+ field = imageop.grey2mono( \
+ field, len(field), 1, monotreshold)
elif mono:
- field = imageop.dither2mono(field, x, y)
+ field = imageop.dither2mono( \
+ field, len(field), 1)
vout.writeframe(int(realframeno*tpf), field, None)
+ realframeno = realframeno + 1
print 'Skipped',nskipped,'duplicate frames'
vout.close()