first part of rev3 code, which replaces the Frame-r with a more gener…

…al class.

comb-ntsc.cxx

@@ -833,7 +833,7 @@ class Comb
 		// buffer: in_xxin_y uint16_t array
 		void Process(uint16_t *buffer, int dim = 2)
 		{
-			int firstline = (linesout == in_y) ? 20 : 40;
+			int firstline = (linesout == in_y) ? 20 : 42;
 			int f = (dim == 3) ? 1 : 0;
 
 			cerr << "P " << f << ' ' << dim << endl;

lddecode.py

@@ -17,14 +17,14 @@
 parser.add_argument('infile', metavar='infile', type=str, help='source file')
 parser.add_argument('outfile', metavar='outfile', type=str, help='base name for destination files')
 parser.add_argument('-s', '--start', metavar='start', type=int, default=0, help='rough jump to frame n of capture (default is 0)')
-parser.add_argument('-S', '--seek', metavar='seek', type=int, default=-1, help='seek to frame n of capture')
-parser.add_argument('-E', '--end', metavar='end', type=int, default=-1, help='cutting: last frame')
+#parser.add_argument('-S', '--seek', metavar='seek', type=int, default=-1, help='seek to frame n of capture')
+#parser.add_argument('-E', '--end', metavar='end', type=int, default=-1, help='cutting: last frame')
 parser.add_argument('-l', '--length', metavar='length', type=int, help='limit length to n frames')
 parser.add_argument('-p', '--pal', dest='pal', action='store_true', help='source is in PAL format')
 parser.add_argument('-n', '--ntsc', dest='ntsc', action='store_true', help='source is in NTSC format')
-parser.add_argument('-c', '--cut', dest='cut', action='store_true', help='cut (to r16) instead of decode')
-parser.add_argument('-m', '--MTF', metavar='mtf', type=float, default=1.0, help='mtf compensation multiplier')
-parser.add_argument('--MTF_offset', metavar='mtf_offset', type=float, default=0.0, help='mtf compensation offset')
+#parser.add_argument('-c', '--cut', dest='cut', action='store_true', help='cut (to r16) instead of decode')
+#parser.add_argument('-m', '--MTF', metavar='mtf', type=float, default=1.0, help='mtf compensation multiplier')
+#parser.add_argument('--MTF_offset', metavar='mtf_offset', type=float, default=0.0, help='mtf compensation offset')
 parser.add_argument('-f', '--field', dest='field', action='store_true', help='output fields')
 
 args = parser.parse_args()
@@ -39,102 +39,28 @@
     print("ERROR: Can only be PAL or NTSC")
     exit(1)
 
-rf = RFDecode(system=vid_standard, mtf_mult = args.MTF, mtf_offset = args.MTF_offset)
-
-samples_per_frame = int(rf.freq_hz / rf.SysParams['FPS']) + 1
-samples_per_field = int(rf.freq_hz / (rf.SysParams['FPS'] * 2)) + 1
-bytes_per_frame = samples_per_frame * 5 // 4  # for 10-bit packed files
-
 # make sure we have at least two frames' worth of data (so we can be sure we will get at least one full frame)
-infile_size = os.path.getsize(filename)
-if (infile_size // bytes_per_frame - firstframe) < 2: 
-	print('Error: start frame is past end of file')
-	exit(1)
-num_frames = req_frames if req_frames is not None else infile_size // bytes_per_frame - firstframe
+#infile_size = os.path.getsize(filename)
+#if (infile_size // bytes_per_frame - firstframe) < 2: 
+	#print('Error: start frame is past end of file')
+	#exit(1)
+#num_frames = req_frames if req_frames is not None else infile_size // bytes_per_frame - firstframe
 
-fd = open(filename, 'rb')
+#fd = open(filename, 'rb')
 
 if filename[-3:] == 'lds':
-    lddecode_core.loader = load_packed_data_4_40
+    loader = load_packed_data_4_40
 elif filename[-3:] == 'r30':
-    lddecode_core.loader = load_packed_data_3_32
+    loader = load_packed_data_3_32
 elif filename[-3:] == 'r16':
-    lddecode_core.loader = load_unpacked_data_s16
-
-if args.seek >= 0:
-    nextsample = findframe(fd, rf, args.seek, firstframe * samples_per_frame)
-else:
-    nextsample = firstframe * samples_per_frame
-
-if args.cut:
-    print(args.seek, args.end)
-    outfile = open(outname + '.r16', 'wb')
+    loader = load_unpacked_data_s16
 
-    lastsample = findframe(fd, rf, args.end, nextsample)
-    lastsample += int(samples_per_frame * .25)
-
-    for i in range(nextsample, lastsample, 16384):
-        l = lastsample - i
-        if l > 16384:
-            l = 16384
-
-        data = lddecode_core.loader(fd, i, l)
-        dataout = np.array(data, dtype=np.int16)
-        outfile.write(dataout)
-
-    exit(0)
-
-outfile = open(outname + '.tbc', 'wb')
-outfile_audio = open(outname + '.pcm', 'wb')
-
-if not args.field:
-    framer = Framer(rf)
-    ca = []
-    for f in range(0, num_frames):
-        if fd.tell() + bytes_per_frame * 1.05 <= infile_size:  # 1.05 gives us a little slack in case the frame is long
-            combined, audio, nextsample, fields = framer.readframe(fd, nextsample, f == 0)
-
-            print('frame ', framer.vbi['framenr'])
-
-            ca.append(audio)
-
-            outfile.write(combined)
-            #print(len(audio)//2)
-            outfile_audio.write(audio)
-        else:
-            if req_frames is not None:
-                print('Warning: end of file reached before requested number of frames were decoded')
-            break
-else:
-    FieldClass = FieldPAL if args.pal else FieldNTSC
-    lineoffset = 2 if args.pal else 0
-    linesout = (rf.SysParams['frame_lines'] // 2) + 1
-    fieldsread = 0
-
-    while fieldsread < (num_frames * 2):
-        readlen = (samples_per_field * 1.1) if fieldsread else (samples_per_field * 2)
-        rawdecode = rf.demod(fd, nextsample, readlen)
-
-        field = FieldClass(rf, rawdecode, 0)
-
-        if field is not None:    
-            lo = lineoffset
-            if args.pal and field.istop:
-                lo += 1
-            picture, audio = field.downscale(linesout = linesout, lineoffset = lo, final=True)
-
-            outfile.write(picture)
-            outfile_audio.write(audio)
-
-            nextsample += field.nextfieldoffset
-            fieldsread += 1
-            print(fieldsread, nextsample, field.istop)
-        else:
-            print('skipping two fields')
-            nextsample += (bytes_per_field * 2)    
+system = 'PAL' if args.pal else 'NTSC'
+foutput = True if not args.field else False
 
+ldd = LDdecode(filename, outname, loader, frameoutput=foutput, system=system)
+ldd.roughseek(firstframe * 2)
 
-#draw_raw_bwimage(combined, outwidth, 610, hscale=2, vscale=2)
+for i in range(0, req_frames * 2):
+    ldd.readfield()
 
-outfile.close()
-outfile_audio.close()