From 5f2a7a234eadc26e8ac9c9f165e29eb9e312bee8 Mon Sep 17 00:00:00 2001 From: Good Guy Date: Tue, 4 Dec 2018 08:07:24 -0700 Subject: [PATCH] upgrade bccmdl.py to python3, patch from FeRD (Frank Dana) --- cinelerra-5.1/guicast/Makefile | 2 +- cinelerra-5.1/guicast/bccmdl.py | 108 ++++++++++++++++---------------- 2 files changed, 56 insertions(+), 54 deletions(-) diff --git a/cinelerra-5.1/guicast/Makefile b/cinelerra-5.1/guicast/Makefile index 1c3822f3..15442cfb 100644 --- a/cinelerra-5.1/guicast/Makefile +++ b/cinelerra-5.1/guicast/Makefile @@ -95,7 +95,7 @@ $(shell echo $(OBJS) > $(OBJDIR)/objs) all: $(OUTPUT) $(UTILS) $(BCXFER): bccmdl.py bcxfer.C bcxfer.h - python2.7 < ./bccmdl.py + python3 < ./bccmdl.py +$(MAKE) -C xfer $(OUTPUT): $(OBJS) $(BCXFER) diff --git a/cinelerra-5.1/guicast/bccmdl.py b/cinelerra-5.1/guicast/bccmdl.py index 6b5b9363..1ebb9ca0 100755 --- a/cinelerra-5.1/guicast/bccmdl.py +++ b/cinelerra-5.1/guicast/bccmdl.py @@ -1,5 +1,8 @@ #!/bin/python +# Retain python2 compatibility +from __future__ import print_function + base = { "rgb8": { "i8": { @@ -608,10 +611,10 @@ def is_float(nm): def gen_xfer_proto(fd, pfx, cls, fr_cmdl, to_cmdl): global dtype, ctype - print >>fd, "%svoid %sxfer_%s_to_%s" % (pfx, cls, fr_cmdl[3:], to_cmdl[3:]), + print("%svoid %sxfer_%s_to_%s" % (pfx, cls, fr_cmdl[3:], to_cmdl[3:]), end=' ', file=fd) ityp = dtype[fr_cmdl]; fr_typ = ctype[ityp]; otyp = dtype[to_cmdl]; to_typ = ctype[otyp]; - print >>fd, "(unsigned y0, unsigned y1)", + print("(unsigned y0, unsigned y1)", end=' ', file=fd) def gen_xfer_fn(fd, fr_cmdl, to_cmdl): global layout, dtype, adata @@ -620,7 +623,7 @@ def gen_xfer_fn(fd, fr_cmdl, to_cmdl): # xfr fn header gen_xfer_proto(fd, "", class_qual, fr_cmdl, to_cmdl); # xfr fn body - print >>fd, "{" + print("{", file=fd) # loops / pointer preload in_xfer = "flat" if not is_planar(fr_cmdl) else \ fr_cmdl[3:] if is_yuv(fr_cmdl) else \ @@ -628,52 +631,52 @@ def gen_xfer_fn(fd, fr_cmdl, to_cmdl): out_xfer = "flat" if not is_planar(to_cmdl) else \ to_cmdl[3:] if is_yuv(to_cmdl) else \ "rgbp" if not has_alpha(to_cmdl) else "rgbap" - print >>fd, " xfer_%s_row_out(%s) xfer_%s_row_in(%s)" % \ - (out_xfer, ctype[otyp], in_xfer, ctype[ityp],) + print(" xfer_%s_row_out(%s) xfer_%s_row_in(%s)" % (out_xfer, ctype[otyp], in_xfer, ctype[ityp]), file=fd) + # load inp if( is_float(to_cmdl) and is_yuv(fr_cmdl) ): - for ic in layout[fr_cmdl]: print >>fd, "%s" % (base[ic][ityp]['r']), + for ic in layout[fr_cmdl]: print("%s" % (base[ic][ityp]['r']), end=' ', file=fd) if( ityp == "i8" ): - print >>fd, "\n float r, g, b; YUV::yuv.yuv_to_rgb_8(r, g, b, y, u, v);", + print("\n float r, g, b; YUV::yuv.yuv_to_rgb_8(r, g, b, y, u, v);", end=' ', file=fd) elif( ityp == "i16" ): - print >>fd, "\n float r, g, b; YUV::yuv.yuv_to_rgb_16(r, g, b, y, u, v);", + print("\n float r, g, b; YUV::yuv.yuv_to_rgb_16(r, g, b, y, u, v);", end=' ', file=fd) if( has_alpha(fr_cmdl) or has_alpha(to_cmdl) ): if( not has_alpha(fr_cmdl) ): - print >>fd, " z_float fa = 1;", + print(" z_float fa = 1;", end=' ', file=fd) elif( ityp == "i8" ): - print >>fd, " float fa = fclp(a,256);", + print(" float fa = fclp(a,256);", end=' ', file=fd) elif( ityp == "i16" ): - print >>fd, " float fa = fclp(a,65536);", + print(" float fa = fclp(a,65536);", end=' ', file=fd) else: - for ic in layout[fr_cmdl]: print >>fd, "%s" % (base[ic][otyp]['r']), + for ic in layout[fr_cmdl]: print("%s" % (base[ic][otyp]['r']), end=' ', file=fd) if( has_alpha(to_cmdl) and not has_alpha(fr_cmdl) ): - print >>fd, "%s" % (adata[otyp]), - print >>fd, "" + print("%s" % (adata[otyp]), end=' ', file=fd) + print("", file=fd) # xfer if( is_rgb(fr_cmdl) and is_yuv(to_cmdl) ): if( otyp == "i8" ): - print >>fd, " int32_t y, u, v; YUV::yuv.rgb_to_yuv_8(r, g, b, y, u, v);" + print(" int32_t y, u, v; YUV::yuv.rgb_to_yuv_8(r, g, b, y, u, v);", file=fd) elif( otyp == "i16" ): - print >>fd, " int32_t y, u, v; YUV::yuv.rgb_to_yuv_16(r, g, b, y, u, v);" + print(" int32_t y, u, v; YUV::yuv.rgb_to_yuv_16(r, g, b, y, u, v);", file=fd) elif( is_yuv(fr_cmdl) and is_rgb(to_cmdl)): if( otyp == "i8" ): - print >>fd, " int32_t r, g, b; YUV::yuv.yuv_to_rgb_8(r, g, b, y, u, v);" + print(" int32_t r, g, b; YUV::yuv.yuv_to_rgb_8(r, g, b, y, u, v);", file=fd) elif( otyp == "i16" ): - print >>fd, " int32_t r, g, b; YUV::yuv.yuv_to_rgb_16(r, g, b, y, u, v);" + print(" int32_t r, g, b; YUV::yuv.yuv_to_rgb_16(r, g, b, y, u, v);", file=fd) # blend if( has_bgcolor(fr_cmdl,to_cmdl) ): - print >>fd, "%s" % (base["bbg"][otyp]) + print("%s" % (base["bbg"][otyp]), file=fd) elif( has_alpha(fr_cmdl) and not has_alpha(to_cmdl) ): if( is_rgb(to_cmdl) ): - print >>fd, "%s" % (base["brgb"][otyp]) + print("%s" % (base["brgb"][otyp]), file=fd) elif( is_yuv(to_cmdl) ): - print >>fd, "%s" % (base["byuv"][otyp]) + print("%s" % (base["byuv"][otyp]), file=fd) # store out for oc in layout[to_cmdl]: - print >>fd, "%s" % (base[oc][otyp]['w']), - print >>fd, "xfer_end" - print >>fd, "}" - print >>fd, "" + print("%s" % (base[oc][otyp]['w']), end=' ', file=fd) + print("xfer_end", file=fd) + print("}", file=fd) + print("", file=fd) # output code file class_qual = "BC_Xfer::" @@ -681,9 +684,9 @@ xfn = "xfer/xfer.h" fd = open(xfn, "w") xid = "".join([chr(x) if chr(x).isalnum() else '_' for x in range(256)]) xid = "__" + xfn.upper()[xfn.rfind("/")+1:].translate(xid) + "__" -print >>fd, "#ifndef %s" % xid -print >>fd, "#define %s" % xid -print >>fd, "" +print("#ifndef %s" % xid, file=fd) +print("#define %s" % xid, file=fd) +print("", file=fd) xfd = open("bcxfer.h") fd.write(xfd.read()) xfd.close() @@ -693,57 +696,56 @@ for fr_cmdl in cmodels: for to_cmdl in cmodels: otyp = dtype[to_cmdl] if( is_specialized(fr_cmdl, to_cmdl) ): - print >>fd, " void %s(unsigned y0, unsigned y1);" % (special[(fr_cmdl, to_cmdl)]) + print(" void %s(unsigned y0, unsigned y1);" % (special[(fr_cmdl, to_cmdl)]), file=fd) continue if( ityp is None or otyp is None ): continue gen_xfer_proto(fd, " ", "", fr_cmdl, to_cmdl); - print >>fd, ";" + print(";", file=fd) # end of class definition -print >>fd, "};" -print >>fd, "" -print >>fd, "#endif" +print("};", file=fd) +print("", file=fd) +print("#endif", file=fd) fd.close() xfn = xfn[:xfn.rfind(".h")] # xfer functions for fr_cmdl in cmodels: fd = open(xfn + "_" + fr_cmdl + ".C", "w") - print >>fd, "#include \"xfer.h\"" - print >>fd, "" + print("#include \"xfer.h\"", file=fd) + print("", file=fd) for to_cmdl in cmodels: gen_xfer_fn(fd, fr_cmdl, to_cmdl) fd.close() fd = open(xfn + ".C", "w") # transfer switch -print >>fd, "#include \"xfer.h\"" -print >>fd, "" -print >>fd, "void %sxfer()" % class_qual -print >>fd, "{" +print("#include \"xfer.h\"", file=fd) +print("", file=fd) +print("void %sxfer()" % class_qual, file=fd) +print("{", file=fd) mx_no = mx_bcmdl + 1 -print >>fd, " static xfer_fn xfns[%d][%d] = {" % (mx_no, mx_no) +print(" static xfer_fn xfns[%d][%d] = {" % (mx_no, mx_no), file=fd) for fr_no in range(mx_no): fr_cmdl = bcmodels.get(fr_no) ityp = dtype[fr_cmdl] - print >>fd, " { // %s" % (fr_cmdl.upper() if ityp else "None") + print(" { // %s" % (fr_cmdl.upper() if ityp else "None"), file=fd) n = 0 for to_no in range(mx_no): to_cmdl = bcmodels.get(to_no) otyp = dtype[to_cmdl] xfn = special[(fr_cmdl, to_cmdl)] if( is_specialized(fr_cmdl, to_cmdl) ) else \ "xfer_%s_to_%s" % (fr_cmdl[3:], to_cmdl[3:]) if ( ityp and otyp ) else None - if( n > 72 ): print >>fd, ""; n = 0 - if( n == 0 ): print >>fd, " ",; n += 4 + if( n > 72 ): print("", file=fd); n = 0 + if( n == 0 ): print(" ", end=' ', file=fd); n += 4 fn = "&%s%s" % (class_qual, xfn) if( xfn ) else "0" - print >>fd, "%s, " % (fn), + print("%s, " % (fn), end=' ', file=fd) n += len(fn) + 3 - print >>fd, "}, " -print >>fd, " }; " -print >>fd, " xfn = xfns[in_colormodel][out_colormodel];" -print >>fd, " xfer_slices(out_w*out_h/0x80000+1);" -print >>fd, "}" -print >>fd, "" -print >>fd, "#include \"bcxfer.C\"" -print >>fd, "" + print("}, ", file=fd) +print(" }; ", file=fd) +print(" xfn = xfns[in_colormodel][out_colormodel];", file=fd) +print(" xfer_slices(out_w*out_h/0x80000+1);", file=fd) +print("}", file=fd) +print("", file=fd) +print("#include \"bcxfer.C\"", file=fd) +print("", file=fd) fd.close() - -- 2.26.2