X-Git-Url: http://git.cinelerra-gg.org/git/?p=goodguy%2Fhistory.git;a=blobdiff_plain;f=cinelerra-5.1%2Fguicast%2Fbccmdl.py;h=4c184bd060470dc397228a4dccbc169dcff35d3e;hp=069cbe704c6fc60f80fcc0bfed56370e5352fd1a;hb=efc8fa7dc7ddcdeaa9398e09d81975a6ccf526fc;hpb=49f85559268fc040fe7ba5611cc0520793cf728b

diff --git a/cinelerra-5.1/guicast/bccmdl.py b/cinelerra-5.1/guicast/bccmdl.py
index 069cbe70..4c184bd0 100755
--- a/cinelerra-5.1/guicast/bccmdl.py
+++ b/cinelerra-5.1/guicast/bccmdl.py
@@ -3,12 +3,12 @@
 base = {
   "rgb8": {
     "i8": {
-      "r": " uint32_t in = *inp, r = ((in>>6)&3)*0x55u, g = ((in>>3)&7)*0x24u, b = (in&7)*0x24u;",
+      "r": " uint32_t in = *inp; int r = ((in>>6)&3)*0x55u, g = ((in>>3)&7)*0x24u, b = (in&7)*0x24u;",
       "w": " uint32_t ot = (r&0xc0u) | ((g>>2)&0x38u) | ((b>>5)&0x07u);\n" +
            " *out++ = ot;",
     },
     "i16": {
-      "r": " uint32_t in = *inp, r = ((in>>6)&3)*0x5555u, g = ((in>>3)&7)*0x2492u, b = (in&7)*0x2492u;",
+      "r": " uint32_t in = *inp; int r = ((in>>6)&3)*0x5555u, g = ((in>>3)&7)*0x2492u, b = (in&7)*0x2492u;",
       "w": " uint32_t ot = ((r>>8)&0xc0u) | ((g>>10) & 0x38u) >> 2) | ((b>>13)&0x07u);\n" +
            " *out++ = ot;",
     },
@@ -44,7 +44,8 @@ base = {
       "w": " *out++ = r; *out++ = g; *out++ = b;",
     },
     "i16": {
-      "r": " int r = *inp++*0x101u, g = *inp++*0x101u, b = *inp++*0x101u;",
+      "r": " int r = *inp++, g = *inp++, b = *inp++;\n" +
+           " r = (r<<8) | r;  g = (g<<8) | g;  b = (b<<8) | b;",
       "w": " *out++ = r>>8; *out++ = g>>8; *out++ = b>>8;",
     },
     "fp": {
@@ -55,7 +56,7 @@ base = {
   "rgb161616": {
     "i8": {
       "r": " int r = *inp++>>8, g = *inp++>>8, b = *inp++>>8;",
-      "w": " *out++ = r*0x101u; *out++ = g*0x101u; *out++ = b*0x101u;",
+      "w": " *out++ = (r<<8) | r;  *out++ = (g<<8) | g;  *out++ = (b<<8) | b;"
     },
     "i16": {
       "r": " int r = *inp++, g = *inp++, b = *inp++;",
@@ -107,8 +108,9 @@ base = {
       "w": " *out++ = b; *out++ = g; *out++ = r;",
     },
     "i16": {
-      "r": " int b = *inp++*0x101u, g = *inp++*0x101u, r = *inp++*0x101u;",
-      "w": " *out.16++ = b>>8; *out.16++ = g>>8; *out.16++ = r>>8;",
+      "r": " int b = *inp++, g = *inp++, r = *inp++;\n" +
+           " b = (b<<8) | b;  g = (g<<8) | g;  r = (r<<8) | r;",
+      "w": " *out++ = b>>8; *out++ = g>>8; *out++ = r>>8;",
     },
     "fp": {
       "r": " float b = fclp(*inp++,256), g=fclp(*inp++,256), r = fclp(*inp++,256);",
@@ -121,7 +123,8 @@ base = {
       "w": " *out++ = b; *out++ = g; *out++ = r; ++out;",
     },
     "i16": {
-      "r": " int b = *inp++*0x101u, g = *inp++*0x101u, r = *inp++*0x101u;",
+      "r": " int b = *inp++, g = *inp++, r = *inp++;\n" +
+           " b = (b<<8) | b;  g = (g<<8) | g;  r = (r<<8) | r;",
       "w": " *out++ = b>>8; *out++ = g>>8; *out++ = r>>8; ++out;",
     },
     "fp": {
@@ -132,7 +135,7 @@ base = {
   "bgr161616": {
     "i8": {
       "r": " int b = *inp++>>8, g = *inp++>>8, r = *inp++>>8;",
-      "w": " *out++ = b*0x101u; *out++ = g*0x101u; *out++ = r*0x101u;",
+      "w": " *out++ = (r<<8) | r;  *out++ = (g<<8) | g;  *out++ = (b<<8) | b;"
     },
     "i16": {
       "r": " int b = *inp++, g = *inp++, r = *inp++;",
@@ -160,33 +163,33 @@ base = {
 
   "yuv888": {
     "i8": {
-      "r": " int32_t y = *inp++*0x010101u, u = *inp++, v = *inp++;",
+      "r": " int32_t y = *inp++, u = *inp++, v = *inp++;",
       "w": " *out++ = y; *out++ = u; *out++ = v;",
     },
     "i16": {
-      "r": " int32_t y = *inp++*0x010101u, u = *inp++<<8, v = *inp++<<8;",
+      "r": " int32_t iy = *inp++, y = (iy<<8) | iy, u = *inp++<<8, v = *inp++<<8;",
       "w": " *out++ = y>>8; *out++ = u>>8; *out++ = v>>8;",
     },
   },
   "yuv161616": {
     "i8": {
-      "r": " int32_t iy = *inp++, y = (iy<<8) | (iy>>8), u = *inp++>>8, v = *inp++>>8;",
-      "w": " *out++ = y<<8; *out++ = u<<8; *out++ = v<<8;",
+      "r": " int32_t y = *inp++>>8, u = *inp++>>8, v = *inp++>>8;",
+      "w": " *out++ = (y<<8) | y; *out++ = u<<8; *out++ = v<<8;",
     },
     "i16": {
-      "r": " int32_t iy = *inp++, y = (iy<<8) | (iy>>8), u = *inp++, v = *inp++;",
+      "r": " int32_t y = *inp++, u = *inp++, v = *inp++;",
       "w": " *out++ = y; *out++ = u; *out++ = v;",
     },
   },
 
   "yuyv8888": {
     "i8": {
-      "r": " int32_t iy = inp[(j&1)<<1], y = iy*0x010101u, u = inp[1], v = inp[3];",
+      "r": " int32_t y = inp[(j&1)<<1], u = inp[1], v = inp[3];",
       "w": " if( !(j&1) ) { *out++ = y; *out = u; out[2] = v; }\n" +
            " else { *out++ = u; *out++= y; *out++ = v; }",
     },
     "i16": {
-      "r": " int32_t iy = inp[(j&1)<<1], y = iy*0x010101u, u = inp[1]<<8, v = inp[3]<<8;",
+      "r": " int32_t iy = inp[(j&1)<<1], y = (iy<<8) | iy, u = inp[1]<<8, v = inp[3]<<8;",
       "w": " if( !(j&1) ) { *out++ = y>>8; *out = u>>8; out[2] = v>>8; }\n" +
            " else { *out++ = u>>8; *out++= y>>8; *out++ = v>>8; }",
     },
@@ -194,12 +197,12 @@ base = {
 
   "uyvy8888": {
     "i8": {
-      "r": " int32_t u = inp[0], iy = inp[((j&1)<<1)+1], y = iy*0x010101u, v = inp[2];",
+      "r": " int32_t u = inp[0], y = inp[((j&1)<<1)+1], v = inp[2];",
       "w": " if( !(j&1) ) { *out++ = u; *out++ = y; *out++ = v; *out = y; }\n" +
            " else { *out++= y; }",
     },
     "i16": {
-      "r": " int32_t u = inp[0]<<8, iy = inp[((j&1)<<1)+1], y = iy*0x010101u, v = inp[2]<<8;",
+      "r": " int32_t u = inp[0]<<8, iy = inp[((j&1)<<1)+1], y = (iy<<8) | iy, v = inp[2]<<8;",
       "w": " if( !(j&1) ) { *out++ = u>>8; *out++ = y>>8; *out++ = v>>8; *out = y>>8; }\n" +
            " else { *out++= y>>8; }",
     },
@@ -208,13 +211,13 @@ base = {
   "yuv10101010": {
     "i8": {
       "r": " uint32_t it = *(uint32_t*)inp;\n" +
-           " int32_t y = ((it>>22)&0x3ffu)*0x4010u, u = (it>>14)&0xffu, v = (it>>4)&0xffu;",
+           " int32_t y = (it>>24)&0xffu, u = (it>>14)&0xffu, v = (it>>4)&0xffu;",
       "w": " uint32_t ot = (y<<24) | (u<<14) | (v<<4);\n" +
            " *(uint32_t*)out = ot; out += sizeof(uint32_t)/sizeof(*out);",
     },
     "i16": {
       "r": " uint32_t it = *(uint32_t*)inp;\n" +
-           " int32_t y = ((it>>22)&0x3ffu)*0x4010u, u = (it>>6)&0xffc0u, v = (it<<4)&0xffc0u;",
+           " int32_t y = (it>>16)&0xffc0u, u = (it>>6)&0xffc0u, v = (it<<4)&0xffc0u;",
       "w": " uint32_t ot = ((y&0xffc0u)<<16) | ((u&0xffc0u)<<6) | ((v&0xffc0u)>>4);\n" +
            " *(uint32_t*)out = ot; out += sizeof(uint32_t)/sizeof(*out);",
     },
@@ -222,87 +225,87 @@ base = {
 
   "vyu888": {
     "i8": {
-      "r": " int32_t v = *inp++, y = *inp++*0x010101u, u = *inp++;",
+      "r": " int32_t v = *inp++, y = *inp++, u = *inp++;",
       "w": " *out++ = v; *out++ = y; *out++ = u;",
     },
     "i16": {
-      "r": " int32_t v = *inp++<<8, y = *inp++*0x010101u, u = *inp++<<8;",
+      "r": " int32_t v = *inp++<<8, iy = *inp++, y = (iy<<8) | iy, u = *inp++<<8;",
       "w": " *out++ = v>>8; *out++ = y>>8; *out++ = u>>8;",
     },
   },
 
   "uyv888": {
     "i8": {
-      "r": " int32_t u = *inp++, y = *inp++*0x010101u, v = *inp++;",
+      "r": " int32_t u = *inp++, y = *inp++, v = *inp++;",
       "w": " *out++ = u; *out++ = y; *out++ = v;",
     },
     "i16": {
-      "r": " int32_t u = *inp++<<8, y = *inp++*0x010101u, v = *inp++<<8;",
+      "r": " int32_t u = *inp++<<8, iy = *inp++, y = (iy<<8) | iy, v = *inp++<<8;",
       "w": " *out++ = u>>8; *out++ = y>>8; *out++ = v>>8;",
     },
   },
 
   "yuv420p": {
     "i8": {
-      "r": " int32_t y = *yip*0x010101u, u = *uip, v = *vip;",
+      "r": " int32_t y = *yip, u = *uip, v = *vip;",
       "w": " yop[j] = y;  uop[j/2] = u;  vop[j/2] = v;",
     },
     "i16": {
-      "r": " int32_t y = *yip*0x010101u, u = *uip<<8, v = *vip<<8;",
+      "r": " int32_t iy = *yip, y = (iy<<8) | iy, u = *uip<<8, v = *vip<<8;",
       "w": " yop[j] = y>>8;  uop[j/2] = u>>8;  vop[j/2] = v>>8;",
     },
   },
   "yuv420pi": {
     "i8": {
-      "r": " int32_t y = *yip*0x010101u, u = *uip, v = *vip;",
+      "r": " int32_t y = *yip, u = *uip, v = *vip;",
       "w": " yop[j] = y;  uop[j/2] = u;  vop[j/2] = v;",
     },
     "i16": {
-      "r": " int32_t y = *yip*0x010101u, u = *uip<<8, v = *vip<<8;",
+      "r": " int32_t iy = *yip, y = (iy<<8) | iy, u = *uip<<8, v = *vip<<8;",
       "w": " yop[j] = y>>8;  uop[j/2] = u>>8;  vop[j/2] = v>>8;",
     },
   },
 
   "yuv422p": {
     "i8": {
-      "r": " int32_t y = *yip*0x010101u, u = *uip, v = *vip;",
+      "r": " int32_t y = *yip, u = *uip, v = *vip;",
       "w": " yop[j] = y;  uop[j/2] = u;  vop[j/2] = v;",
     },
     "i16": {
-      "r": " int32_t y = *yip*0x010101u, u = *uip<<8, v = *vip<<8;",
+      "r": " int32_t iy = *yip, y = (iy<<8) | iy, u = *uip<<8, v = *vip<<8;",
       "w": " yop[j] = y>>8;  uop[j/2] = u>>8;  vop[j/2] = v>>8;",
     },
   },
 
   "yuv444p": {
     "i8": {
-      "r": " int32_t y = *yip*0x010101u, u = *uip, v = *vip;",
+      "r": " int32_t y = *yip, u = *uip, v = *vip;",
       "w": " yop[j] = y;  uop[j] = u;  vop[j] = v;",
     },
     "i16": {
-      "r": " int32_t y = *yip*0x010101u, u = *uip<<8, v = *vip<<8;",
+      "r": " int32_t iy = *yip, y = (iy<<8) | iy, u = *uip<<8, v = *vip<<8;",
       "w": " yop[j] = y>>8;  uop[j] = u>>8;  vop[j] = v>>8;",
     },
   },
 
   "yuv411p": {
     "i8": {
-      "r": " int32_t y = *yip*0x010101u, u = *uip, v = *vip;",
+      "r": " int32_t y = *yip, u = *uip, v = *vip;",
       "w": " yop[j] = y;  uop[j/4] = u;  vop[j/4] = v;",
     },
     "i16": {
-      "r": " int32_t y = *yip*0x010101u, u = *uip<<8, v = *vip<<8;",
+      "r": " int32_t iy = *yip, y = (iy<<8) | iy, u = *uip<<8, v = *vip<<8;",
       "w": " yop[j] = y>>8;  uop[j/4] = u>>8;  vop[j/4] = v>>8;",
     },
   },
 
   "yuv410p": {
     "i8": {
-      "r": " int32_t y = *yip*0x010101u, u = *uip, v = *vip;",
+      "r": " int32_t y = *yip, u = *uip, v = *vip;",
       "w": " yop[j] = y;  uop[j/4] = u;  vop[j/4] = v;",
     },
     "i16": {
-      "r": " int32_t y = *yip*0x010101u, u = *uip<<8, v = *vip<<8;",
+      "r": " int32_t iy = *yip, y = (iy<<8) | iy, u = *uip<<8, v = *vip<<8;",
       "w": " yop[j] = y>>8;  uop[j/4] = u>>8;  vop[j/4] = v>>8;",
     },
   },
@@ -322,6 +325,44 @@ base = {
     },
   },
 
+  "gbrp": {
+    "i8": {
+      "r": " int g = *gip++, b = *bip++, r = *rip++;",
+      "w": " *gop++ = g; *bop++ = b; *rop++ = r;",
+    },
+    "i16": {
+      "r": " int ig = *gip++, g = (ig<<8) | ig, ib = *bip++, b = (ib<<8) | ib," +
+           " ir = *rip++, r = (ir<<8) | ir;",
+      "w": " *gop++ = g >> 8; *bop++ = b >> 8; *rop++ = r >> 8;",
+    },
+    "fp": {
+      "r": " float g = *gip++/255.f, b = *bip++/255.f, r = *rip++/255.f;",
+      "w": " *gop++ = clp(256,g); *bop++ = clp(256,b); *rop++ = clp(256,r);",
+    },
+  },
+
+  "grey8": {
+    "i8": {
+      "r": " int32_t y = *inp++, u = 0x80, v = 0x80;",
+      "w": " *out++ = y; (void)u; (void)v;",
+    },
+    "i16": {
+      "r": " int32_t iy = *inp++, y = (iy<<8) | iy, u = 0x8000, v = 0x8000;",
+      "w": " *out++ = y>>8; (void)u; (void)v;",
+    },
+  },
+
+  "grey16": {
+    "i8": {
+      "r": " int32_t y = *inp++>>8, u = 0x80, v = 0x80;",
+      "w": " *out++ = (y<<8) | y; (void)u; (void)v;",
+    },
+    "i16": {
+      "r": " int32_t y = *inp++, u = 0x8000, v = 0x8000;",
+      "w": " *out++ = y; (void)u; (void)v;",
+    },
+  },
+
   # alpha component
   "a8": {
     "i8": {
@@ -329,7 +370,7 @@ base = {
       "w": " *out++ = a;",
     },
     "i16": {
-      "r": " z_int a = *inp++<<8;",
+      "r": " z_int a = *inp++; a = (a<<8) | a;",
       "w": " *out++ = a>>8;",
     },
     "fp": {
@@ -340,7 +381,7 @@ base = {
   "a16": {
     "i8": {
       "r": " z_int a = *inp++>>8;",
-      "w": " *out++ = a<<8;",
+      "w": " *out++ = (a<<8) | a;",
     },
     "i16": {
       "r": " z_int a = *inp++;",
@@ -439,6 +480,7 @@ add_cmodel(13, "bc_yuv888", "i8", "yuv888")
 add_cmodel(14, "bc_yuva8888", "i8", "yuv888", "a8")
 add_cmodel(15, "bc_yuv161616", "i16", "yuv161616")
 add_cmodel(16, "bc_yuva16161616", "i16", "yuv161616", "a16")
+add_cmodel(35, "bc_ayuv16161616", "i16", "a16", "yuv161616")
 
 add_cmodel(18, "bc_uvy422", "i8", "uyvy8888")
 add_cmodel(19, "bc_yuv422", "i8", "yuyv8888")
@@ -460,6 +502,10 @@ add_cmodel(32, "bc_rgb_floatp", "fp", "rgbfltp")
 add_cmodel(33, "bc_rgba_floatp", "fp", "rgbfltp", "afpp")
 add_cmodel(34, "bc_yuv420pi", "i8", "yuv420pi")
 
+add_cmodel(36, "bc_grey8", "i8", "grey8")
+add_cmodel(37, "bc_grey16", "i16", "grey16")
+add_cmodel(38, "bc_gbrp", "i8", "gbrp")
+
 specialize("bc_rgba8888", "bc_transparency", "XFER_rgba8888_to_transparency")
 
 ctype = {
@@ -476,7 +522,7 @@ adata = {
 
 def has_alpha(nm):
   return nm in ["bc_rgba8888", "bc_argb8888", "bc_abgr8888", \
-    "bc_rgba16161616", "bc_yuva8888", "bc_yuva16161616", \
+    "bc_rgba16161616", "bc_yuva8888", "bc_yuva16161616", "bc_ayuv16161616", \
     "bc_uyva8888", "bc_rgba_float", "bc_rgba_floatp",]
 
 def has_bgcolor(fr_cmdl,to_cmdl):
@@ -493,17 +539,17 @@ def is_rgb(nm):
     "bc_bgr888", "bc_bgr8888", "bc_rgb888", "bc_rgba8888", \
     "bc_argb8888", "bc_abgr8888", "bc_rgb", "bc_rgb161616", \
     "bc_rgba16161616", "bc_rgb_float", "bc_rgba_float", \
-    "bc_rgb_floatp", "bc_rgba_floatp", ]
+    "bc_rgb_floatp", "bc_rgba_floatp", "bc_gbrp", ]
 
 def is_yuv(nm):
   return nm in [ "bc_yuv888", "bc_yuva8888", "bc_yuv161616", \
-    "bc_yuva16161616", "bc_yuv422", "bc_uvy422", "bc_yuv101010", \
+    "bc_yuva16161616", "bc_ayuv16161616", "bc_yuv422", "bc_uvy422", "bc_yuv101010", \
     "bc_vyu888", "bc_uyva8888", "bc_yuv420p", "bc_yuv420pi", "bc_yuv422p", \
-    "bc_yuv444p", "bc_yuv411p", "bc_yuv410p", ]
+    "bc_yuv444p", "bc_yuv411p", "bc_yuv410p", "bc_grey8", "bc_grey16", ]
 
 def is_planar(nm):
   return nm in [ "bc_yuv420p", "bc_yuv420pi", "bc_yuv422p", "bc_yuv444p", \
-    "bc_yuv411p", "bc_yuv410p", "bc_rgb_floatp", "bc_rgba_floatp", ]
+    "bc_yuv411p", "bc_yuv410p", "bc_rgb_floatp", "bc_rgba_floatp", "bc_gbrp", ]
 
 def is_float(nm):
   return nm in ["bc_rgb_float", "bc_rgba_float", "bc_rgb_floatp", "bc_rgba_floatp", ]
@@ -524,17 +570,21 @@ def gen_xfer_fn(fr_cmdl, to_cmdl):
   # xfr fn body
   print "{"
   # loops / pointer preload
-  in_cmdl = fr_cmdl[3:] if is_planar(fr_cmdl) else "flat";
-  out_cmdl = to_cmdl[3:] if is_planar(to_cmdl) else "flat";
+  in_xfer = "flat" if not is_planar(fr_cmdl) else \
+    fr_cmdl[3:] if is_yuv(fr_cmdl) else \
+    "rgbp" if not has_alpha(fr_cmdl) else "rgbap"
+  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 " xfer_%s_row_out(%s) xfer_%s_row_in(%s)" % \
-     (out_cmdl, ctype[otyp], in_cmdl, ctype[ityp],)
+     (out_xfer, ctype[otyp], in_xfer, ctype[ityp],)
   # load inp
   if( is_float(to_cmdl) and is_yuv(fr_cmdl) ):
     for ic in layout[fr_cmdl]: print "%s" % (base[ic][ityp]['r']),
     if( ityp == "i8" ):
-      print "\n float fy = y/16777215.f, r, g, b; YUV_TO_FLOAT(fy, u, v, r, g, b);",
+      print "\n float r, g, b; YUV::yuv.yuv_to_rgb_8(r, g, b, y, u, v);",
     elif( ityp == "i16" ):
-      print "\n float fy = y/16777215.f, r, g, b; YUV16_TO_RGB_FLOAT(fy, u, v, r, g, b);",
+      print "\n float r, g, b; YUV::yuv.yuv_to_rgb_16(r, g, b, y, u, v);",
     if( has_alpha(fr_cmdl) or has_alpha(to_cmdl) ):
       if( not has_alpha(fr_cmdl) ):
         print " z_float fa = 1;",
@@ -550,19 +600,14 @@ def gen_xfer_fn(fr_cmdl, to_cmdl):
   # xfer
   if( is_rgb(fr_cmdl) and is_yuv(to_cmdl) ):
     if( otyp == "i8" ):
-      print " int32_t y, u, v;  RGB_TO_YUV(y, u, v, r, g, b);"
+      print " int32_t y, u, v;  YUV::yuv.rgb_to_yuv_8(r, g, b, y, u, v);"
     elif( otyp == "i16" ):
-      print " int32_t y, u, v;  RGB_TO_YUV16(y, u, v, r, g, b);"
+      print " int32_t y, u, v;  YUV::yuv.rgb_to_yuv_16(r, g, b, y, u, v);"
   elif( is_yuv(fr_cmdl) and is_rgb(to_cmdl)):
     if( otyp == "i8" ):
-      print " int32_t r, g, b;  YUV_TO_RGB(y, u, v, r, g, b);"
-    elif( otyp == "i16" ):
-      print " int32_t r, g, b;  YUV_TO_RGB16(y, u, v, r, g, b);"
-  elif( is_yuv(fr_cmdl) and is_yuv(to_cmdl) ):
-    if( otyp == "i8" ):
-      print " y >>= 16;",
+      print " int32_t r, g, b;  YUV::yuv.yuv_to_rgb_8(r, g, b, y, u, v);"
     elif( otyp == "i16" ):
-      print " y >>= 8;",
+      print " int32_t r, g, b;  YUV::yuv.yuv_to_rgb_16(r, g, b, y, u, v);"
   # blend
   if( has_bgcolor(fr_cmdl,to_cmdl) ):
     print "%s" % (base["bbg"][otyp])