diff options
Diffstat (limited to 'gst')
| -rw-r--r-- | gst/audiomixer/gstaudiomixerorc-dist.c | 306 | ||||
| -rw-r--r-- | gst/bayer/gstbayerorc-dist.c | 1312 | ||||
| -rw-r--r-- | gst/compositor/compositororc-dist.c | 296 | ||||
| -rw-r--r-- | gst/fieldanalysis/gstfieldanalysisorc-dist.c | 172 | ||||
| -rw-r--r-- | gst/gaudieffects/gstgaudieffectsorc-dist.c | 16 |
5 files changed, 988 insertions, 1114 deletions
diff --git a/gst/audiomixer/gstaudiomixerorc-dist.c b/gst/audiomixer/gstaudiomixerorc-dist.c index 092a464beb..be377f7054 100644 --- a/gst/audiomixer/gstaudiomixerorc-dist.c +++ b/gst/audiomixer/gstaudiomixerorc-dist.c @@ -1120,16 +1120,11 @@ audiomixer_orc_volume_u8 (guint8 * ORC_RESTRICT d1, int p1, int n) orc_int8 var35; #endif orc_int8 var36; -#if defined(__APPLE__) && __GNUC__ == 4 && __GNUC_MINOR__ == 2 && defined (__i386__) - volatile orc_int8 var37; -#else orc_int8 var37; -#endif orc_int8 var38; - orc_int8 var39; + orc_union16 var39; orc_union16 var40; - orc_union16 var41; - orc_int8 var42; + orc_int8 var41; ptr0 = (orc_int8 *) d1; @@ -1137,24 +1132,22 @@ audiomixer_orc_volume_u8 (guint8 * ORC_RESTRICT d1, int p1, int n) var35 = (int) 0x00000080; /* 128 or 6.32404e-322f */ /* 3: loadpb */ var36 = p1; - /* 7: loadpb */ - var37 = (int) 0x00000080; /* 128 or 6.32404e-322f */ for (i = 0; i < n; i++) { /* 0: loadb */ var34 = ptr0[i]; /* 2: xorb */ - var39 = var34 ^ var35; + var38 = var34 ^ var35; /* 4: mulsbw */ - var40.i = var39 * var36; + var39.i = var38 * var36; /* 5: shrsw */ - var41.i = var40.i >> 3; + var40.i = var39.i >> 3; /* 6: convssswb */ - var42 = ORC_CLAMP_SB (var41.i); - /* 8: xorb */ - var38 = var42 ^ var37; - /* 9: storeb */ - ptr0[i] = var38; + var41 = ORC_CLAMP_SB (var40.i); + /* 7: xorb */ + var37 = var41 ^ var35; + /* 8: storeb */ + ptr0[i] = var37; } } @@ -1173,16 +1166,11 @@ _backup_audiomixer_orc_volume_u8 (OrcExecutor * ORC_RESTRICT ex) orc_int8 var35; #endif orc_int8 var36; -#if defined(__APPLE__) && __GNUC__ == 4 && __GNUC_MINOR__ == 2 && defined (__i386__) - volatile orc_int8 var37; -#else orc_int8 var37; -#endif orc_int8 var38; - orc_int8 var39; + orc_union16 var39; orc_union16 var40; - orc_union16 var41; - orc_int8 var42; + orc_int8 var41; ptr0 = (orc_int8 *) ex->arrays[0]; @@ -1190,24 +1178,22 @@ _backup_audiomixer_orc_volume_u8 (OrcExecutor * ORC_RESTRICT ex) var35 = (int) 0x00000080; /* 128 or 6.32404e-322f */ /* 3: loadpb */ var36 = ex->params[24]; - /* 7: loadpb */ - var37 = (int) 0x00000080; /* 128 or 6.32404e-322f */ for (i = 0; i < n; i++) { /* 0: loadb */ var34 = ptr0[i]; /* 2: xorb */ - var39 = var34 ^ var35; + var38 = var34 ^ var35; /* 4: mulsbw */ - var40.i = var39 * var36; + var39.i = var38 * var36; /* 5: shrsw */ - var41.i = var40.i >> 3; + var40.i = var39.i >> 3; /* 6: convssswb */ - var42 = ORC_CLAMP_SB (var41.i); - /* 8: xorb */ - var38 = var42 ^ var37; - /* 9: storeb */ - ptr0[i] = var38; + var41 = ORC_CLAMP_SB (var40.i); + /* 7: xorb */ + var37 = var41 ^ var35; + /* 8: storeb */ + ptr0[i] = var37; } } @@ -1229,7 +1215,7 @@ audiomixer_orc_volume_u8 (guint8 * ORC_RESTRICT d1, int p1, int n) static const orc_uint8 bc[] = { 1, 9, 24, 97, 117, 100, 105, 111, 109, 105, 120, 101, 114, 95, 111, 114, 99, 95, 118, 111, 108, 117, 109, 101, 95, 117, 56, 11, 1, 1, 14, 1, - 128, 0, 0, 0, 14, 4, 3, 0, 0, 0, 16, 1, 20, 2, 20, 1, + 128, 0, 0, 0, 14, 2, 3, 0, 0, 0, 16, 1, 20, 2, 20, 1, 68, 33, 0, 16, 174, 32, 33, 24, 94, 32, 32, 17, 159, 33, 32, 68, 0, 33, 16, 2, 0, }; @@ -1241,7 +1227,7 @@ audiomixer_orc_volume_u8 (guint8 * ORC_RESTRICT d1, int p1, int n) orc_program_set_backup_function (p, _backup_audiomixer_orc_volume_u8); orc_program_add_destination (p, 1, "d1"); orc_program_add_constant (p, 1, 0x00000080, "c1"); - orc_program_add_constant (p, 4, 0x00000003, "c2"); + orc_program_add_constant (p, 2, 0x00000003, "c2"); orc_program_add_parameter (p, 1, "p1"); orc_program_add_temporary (p, 2, "t1"); orc_program_add_temporary (p, 1, "t2"); @@ -1294,18 +1280,13 @@ audiomixer_orc_add_volume_u8 (guint8 * ORC_RESTRICT d1, orc_int8 var35; #endif orc_int8 var36; -#if defined(__APPLE__) && __GNUC__ == 4 && __GNUC_MINOR__ == 2 && defined (__i386__) - volatile orc_int8 var37; -#else orc_int8 var37; -#endif orc_int8 var38; orc_int8 var39; - orc_int8 var40; + orc_union16 var40; orc_union16 var41; - orc_union16 var42; + orc_int8 var42; orc_int8 var43; - orc_int8 var44; ptr0 = (orc_int8 *) d1; ptr4 = (orc_int8 *) s1; @@ -1314,28 +1295,26 @@ audiomixer_orc_add_volume_u8 (guint8 * ORC_RESTRICT d1, var35 = (int) 0x00000080; /* 128 or 6.32404e-322f */ /* 3: loadpb */ var36 = p1; - /* 7: loadpb */ - var37 = (int) 0x00000080; /* 128 or 6.32404e-322f */ for (i = 0; i < n; i++) { /* 0: loadb */ var34 = ptr4[i]; /* 2: xorb */ - var40 = var34 ^ var35; + var39 = var34 ^ var35; /* 4: mulsbw */ - var41.i = var40 * var36; + var40.i = var39 * var36; /* 5: shrsw */ - var42.i = var41.i >> 3; + var41.i = var40.i >> 3; /* 6: convssswb */ - var43 = ORC_CLAMP_SB (var42.i); - /* 8: xorb */ - var44 = var43 ^ var37; - /* 9: loadb */ - var38 = ptr0[i]; - /* 10: addusb */ - var39 = ORC_CLAMP_UB ((orc_uint8) var38 + (orc_uint8) var44); - /* 11: storeb */ - ptr0[i] = var39; + var42 = ORC_CLAMP_SB (var41.i); + /* 7: xorb */ + var43 = var42 ^ var35; + /* 8: loadb */ + var37 = ptr0[i]; + /* 9: addusb */ + var38 = ORC_CLAMP_UB ((orc_uint8) var37 + (orc_uint8) var43); + /* 10: storeb */ + ptr0[i] = var38; } } @@ -1355,18 +1334,13 @@ _backup_audiomixer_orc_add_volume_u8 (OrcExecutor * ORC_RESTRICT ex) orc_int8 var35; #endif orc_int8 var36; -#if defined(__APPLE__) && __GNUC__ == 4 && __GNUC_MINOR__ == 2 && defined (__i386__) - volatile orc_int8 var37; -#else orc_int8 var37; -#endif orc_int8 var38; orc_int8 var39; - orc_int8 var40; + orc_union16 var40; orc_union16 var41; - orc_union16 var42; + orc_int8 var42; orc_int8 var43; - orc_int8 var44; ptr0 = (orc_int8 *) ex->arrays[0]; ptr4 = (orc_int8 *) ex->arrays[4]; @@ -1375,28 +1349,26 @@ _backup_audiomixer_orc_add_volume_u8 (OrcExecutor * ORC_RESTRICT ex) var35 = (int) 0x00000080; /* 128 or 6.32404e-322f */ /* 3: loadpb */ var36 = ex->params[24]; - /* 7: loadpb */ - var37 = (int) 0x00000080; /* 128 or 6.32404e-322f */ for (i = 0; i < n; i++) { /* 0: loadb */ var34 = ptr4[i]; /* 2: xorb */ - var40 = var34 ^ var35; + var39 = var34 ^ var35; /* 4: mulsbw */ - var41.i = var40 * var36; + var40.i = var39 * var36; /* 5: shrsw */ - var42.i = var41.i >> 3; + var41.i = var40.i >> 3; /* 6: convssswb */ - var43 = ORC_CLAMP_SB (var42.i); - /* 8: xorb */ - var44 = var43 ^ var37; - /* 9: loadb */ - var38 = ptr0[i]; - /* 10: addusb */ - var39 = ORC_CLAMP_UB ((orc_uint8) var38 + (orc_uint8) var44); - /* 11: storeb */ - ptr0[i] = var39; + var42 = ORC_CLAMP_SB (var41.i); + /* 7: xorb */ + var43 = var42 ^ var35; + /* 8: loadb */ + var37 = ptr0[i]; + /* 9: addusb */ + var38 = ORC_CLAMP_UB ((orc_uint8) var37 + (orc_uint8) var43); + /* 10: storeb */ + ptr0[i] = var38; } } @@ -1419,7 +1391,7 @@ audiomixer_orc_add_volume_u8 (guint8 * ORC_RESTRICT d1, static const orc_uint8 bc[] = { 1, 9, 28, 97, 117, 100, 105, 111, 109, 105, 120, 101, 114, 95, 111, 114, 99, 95, 97, 100, 100, 95, 118, 111, 108, 117, 109, 101, 95, 117, 56, 11, - 1, 1, 12, 1, 1, 14, 1, 128, 0, 0, 0, 14, 4, 3, 0, 0, + 1, 1, 12, 1, 1, 14, 1, 128, 0, 0, 0, 14, 2, 3, 0, 0, 0, 16, 1, 20, 2, 20, 1, 68, 33, 4, 16, 174, 32, 33, 24, 94, 32, 32, 17, 159, 33, 32, 68, 33, 33, 16, 35, 0, 0, 33, 2, 0, @@ -1433,7 +1405,7 @@ audiomixer_orc_add_volume_u8 (guint8 * ORC_RESTRICT d1, orc_program_add_destination (p, 1, "d1"); orc_program_add_source (p, 1, "s1"); orc_program_add_constant (p, 1, 0x00000080, "c1"); - orc_program_add_constant (p, 4, 0x00000003, "c2"); + orc_program_add_constant (p, 2, 0x00000003, "c2"); orc_program_add_parameter (p, 1, "p1"); orc_program_add_temporary (p, 2, "t1"); orc_program_add_temporary (p, 1, "t2"); @@ -1574,7 +1546,7 @@ audiomixer_orc_add_volume_s8 (gint8 * ORC_RESTRICT d1, static const orc_uint8 bc[] = { 1, 9, 28, 97, 117, 100, 105, 111, 109, 105, 120, 101, 114, 95, 111, 114, 99, 95, 97, 100, 100, 95, 118, 111, 108, 117, 109, 101, 95, 115, 56, 11, - 1, 1, 12, 1, 1, 14, 4, 3, 0, 0, 0, 16, 1, 20, 2, 20, + 1, 1, 12, 1, 1, 14, 2, 3, 0, 0, 0, 16, 1, 20, 2, 20, 1, 174, 32, 4, 24, 94, 32, 32, 16, 159, 33, 32, 34, 0, 0, 33, 2, 0, }; @@ -1586,7 +1558,7 @@ audiomixer_orc_add_volume_s8 (gint8 * ORC_RESTRICT d1, orc_program_set_backup_function (p, _backup_audiomixer_orc_add_volume_s8); orc_program_add_destination (p, 1, "d1"); orc_program_add_source (p, 1, "s1"); - orc_program_add_constant (p, 4, 0x00000003, "c1"); + orc_program_add_constant (p, 2, 0x00000003, "c1"); orc_program_add_parameter (p, 1, "p1"); orc_program_add_temporary (p, 2, "t1"); orc_program_add_temporary (p, 1, "t2"); @@ -1638,18 +1610,13 @@ audiomixer_orc_add_volume_u16 (guint16 * ORC_RESTRICT d1, orc_union16 var35; #endif orc_union16 var36; -#if defined(__APPLE__) && __GNUC__ == 4 && __GNUC_MINOR__ == 2 && defined (__i386__) - volatile orc_union16 var37; -#else orc_union16 var37; -#endif orc_union16 var38; orc_union16 var39; - orc_union16 var40; + orc_union32 var40; orc_union32 var41; - orc_union32 var42; + orc_union16 var42; orc_union16 var43; - orc_union16 var44; ptr0 = (orc_union16 *) d1; ptr4 = (orc_union16 *) s1; @@ -1658,28 +1625,26 @@ audiomixer_orc_add_volume_u16 (guint16 * ORC_RESTRICT d1, var35.i = (int) 0x00008000; /* 32768 or 1.61895e-319f */ /* 3: loadpw */ var36.i = p1; - /* 7: loadpw */ - var37.i = (int) 0x00008000; /* 32768 or 1.61895e-319f */ for (i = 0; i < n; i++) { /* 0: loadw */ var34 = ptr4[i]; /* 2: xorw */ - var40.i = var34.i ^ var35.i; + var39.i = var34.i ^ var35.i; /* 4: mulswl */ - var41.i = var40.i * var36.i; + var40.i = var39.i * var36.i; /* 5: shrsl */ - var42.i = var41.i >> 11; + var41.i = var40.i >> 11; /* 6: convssslw */ - var43.i = ORC_CLAMP_SW (var42.i); - /* 8: xorw */ - var44.i = var43.i ^ var37.i; - /* 9: loadw */ - var38 = ptr0[i]; - /* 10: addusw */ - var39.i = ORC_CLAMP_UW ((orc_uint16) var38.i + (orc_uint16) var44.i); - /* 11: storew */ - ptr0[i] = var39; + var42.i = ORC_CLAMP_SW (var41.i); + /* 7: xorw */ + var43.i = var42.i ^ var35.i; + /* 8: loadw */ + var37 = ptr0[i]; + /* 9: addusw */ + var38.i = ORC_CLAMP_UW ((orc_uint16) var37.i + (orc_uint16) var43.i); + /* 10: storew */ + ptr0[i] = var38; } } @@ -1699,18 +1664,13 @@ _backup_audiomixer_orc_add_volume_u16 (OrcExecutor * ORC_RESTRICT ex) orc_union16 var35; #endif orc_union16 var36; -#if defined(__APPLE__) && __GNUC__ == 4 && __GNUC_MINOR__ == 2 && defined (__i386__) - volatile orc_union16 var37; -#else orc_union16 var37; -#endif orc_union16 var38; orc_union16 var39; - orc_union16 var40; + orc_union32 var40; orc_union32 var41; - orc_union32 var42; + orc_union16 var42; orc_union16 var43; - orc_union16 var44; ptr0 = (orc_union16 *) ex->arrays[0]; ptr4 = (orc_union16 *) ex->arrays[4]; @@ -1719,28 +1679,26 @@ _backup_audiomixer_orc_add_volume_u16 (OrcExecutor * ORC_RESTRICT ex) var35.i = (int) 0x00008000; /* 32768 or 1.61895e-319f */ /* 3: loadpw */ var36.i = ex->params[24]; - /* 7: loadpw */ - var37.i = (int) 0x00008000; /* 32768 or 1.61895e-319f */ for (i = 0; i < n; i++) { /* 0: loadw */ var34 = ptr4[i]; /* 2: xorw */ - var40.i = var34.i ^ var35.i; + var39.i = var34.i ^ var35.i; /* 4: mulswl */ - var41.i = var40.i * var36.i; + var40.i = var39.i * var36.i; /* 5: shrsl */ - var42.i = var41.i >> 11; + var41.i = var40.i >> 11; /* 6: convssslw */ - var43.i = ORC_CLAMP_SW (var42.i); - /* 8: xorw */ - var44.i = var43.i ^ var37.i; - /* 9: loadw */ - var38 = ptr0[i]; - /* 10: addusw */ - var39.i = ORC_CLAMP_UW ((orc_uint16) var38.i + (orc_uint16) var44.i); - /* 11: storew */ - ptr0[i] = var39; + var42.i = ORC_CLAMP_SW (var41.i); + /* 7: xorw */ + var43.i = var42.i ^ var35.i; + /* 8: loadw */ + var37 = ptr0[i]; + /* 9: addusw */ + var38.i = ORC_CLAMP_UW ((orc_uint16) var37.i + (orc_uint16) var43.i); + /* 10: storew */ + ptr0[i] = var38; } } @@ -1986,18 +1944,13 @@ audiomixer_orc_add_volume_u32 (guint32 * ORC_RESTRICT d1, orc_union32 var35; #endif orc_union32 var36; -#if defined(__APPLE__) && __GNUC__ == 4 && __GNUC_MINOR__ == 2 && defined (__i386__) - volatile orc_union32 var37; -#else orc_union32 var37; -#endif orc_union32 var38; orc_union32 var39; - orc_union32 var40; + orc_union64 var40; orc_union64 var41; - orc_union64 var42; + orc_union32 var42; orc_union32 var43; - orc_union32 var44; ptr0 = (orc_union32 *) d1; ptr4 = (orc_union32 *) s1; @@ -2006,30 +1959,28 @@ audiomixer_orc_add_volume_u32 (guint32 * ORC_RESTRICT d1, var35.i = (int) 0x80000000; /* -2147483648 or 1.061e-314f */ /* 3: loadpl */ var36.i = p1; - /* 7: loadpl */ - var37.i = (int) 0x80000000; /* -2147483648 or 1.061e-314f */ for (i = 0; i < n; i++) { /* 0: loadl */ var34 = ptr4[i]; /* 2: xorl */ - var40.i = var34.i ^ var35.i; + var39.i = var34.i ^ var35.i; /* 4: mulslq */ - var41.i = ((orc_int64) var40.i) * ((orc_int64) var36.i); + var40.i = ((orc_int64) var39.i) * ((orc_int64) var36.i); /* 5: shrsq */ - var42.i = var41.i >> 27; + var41.i = var40.i >> 27; /* 6: convsssql */ - var43.i = ORC_CLAMP_SL (var42.i); - /* 8: xorl */ - var44.i = var43.i ^ var37.i; - /* 9: loadl */ - var38 = ptr0[i]; - /* 10: addusl */ - var39.i = - ORC_CLAMP_UL ((orc_int64) (orc_uint32) var38.i + - (orc_int64) (orc_uint32) var44.i); - /* 11: storel */ - ptr0[i] = var39; + var42.i = ORC_CLAMP_SL (var41.i); + /* 7: xorl */ + var43.i = var42.i ^ var35.i; + /* 8: loadl */ + var37 = ptr0[i]; + /* 9: addusl */ + var38.i = + ORC_CLAMP_UL ((orc_int64) (orc_uint32) var37.i + + (orc_int64) (orc_uint32) var43.i); + /* 10: storel */ + ptr0[i] = var38; } } @@ -2049,18 +2000,13 @@ _backup_audiomixer_orc_add_volume_u32 (OrcExecutor * ORC_RESTRICT ex) orc_union32 var35; #endif orc_union32 var36; -#if defined(__APPLE__) && __GNUC__ == 4 && __GNUC_MINOR__ == 2 && defined (__i386__) - volatile orc_union32 var37; -#else orc_union32 var37; -#endif orc_union32 var38; orc_union32 var39; - orc_union32 var40; + orc_union64 var40; orc_union64 var41; - orc_union64 var42; + orc_union32 var42; orc_union32 var43; - orc_union32 var44; ptr0 = (orc_union32 *) ex->arrays[0]; ptr4 = (orc_union32 *) ex->arrays[4]; @@ -2069,30 +2015,28 @@ _backup_audiomixer_orc_add_volume_u32 (OrcExecutor * ORC_RESTRICT ex) var35.i = (int) 0x80000000; /* -2147483648 or 1.061e-314f */ /* 3: loadpl */ var36.i = ex->params[24]; - /* 7: loadpl */ - var37.i = (int) 0x80000000; /* -2147483648 or 1.061e-314f */ for (i = 0; i < n; i++) { /* 0: loadl */ var34 = ptr4[i]; /* 2: xorl */ - var40.i = var34.i ^ var35.i; + var39.i = var34.i ^ var35.i; /* 4: mulslq */ - var41.i = ((orc_int64) var40.i) * ((orc_int64) var36.i); + var40.i = ((orc_int64) var39.i) * ((orc_int64) var36.i); /* 5: shrsq */ - var42.i = var41.i >> 27; + var41.i = var40.i >> 27; /* 6: convsssql */ - var43.i = ORC_CLAMP_SL (var42.i); - /* 8: xorl */ - var44.i = var43.i ^ var37.i; - /* 9: loadl */ - var38 = ptr0[i]; - /* 10: addusl */ - var39.i = - ORC_CLAMP_UL ((orc_int64) (orc_uint32) var38.i + - (orc_int64) (orc_uint32) var44.i); - /* 11: storel */ - ptr0[i] = var39; + var42.i = ORC_CLAMP_SL (var41.i); + /* 7: xorl */ + var43.i = var42.i ^ var35.i; + /* 8: loadl */ + var37 = ptr0[i]; + /* 9: addusl */ + var38.i = + ORC_CLAMP_UL ((orc_int64) (orc_uint32) var37.i + + (orc_int64) (orc_uint32) var43.i); + /* 10: storel */ + ptr0[i] = var38; } } @@ -2115,10 +2059,10 @@ audiomixer_orc_add_volume_u32 (guint32 * ORC_RESTRICT d1, static const orc_uint8 bc[] = { 1, 9, 29, 97, 117, 100, 105, 111, 109, 105, 120, 101, 114, 95, 111, 114, 99, 95, 97, 100, 100, 95, 118, 111, 108, 117, 109, 101, 95, 117, 51, 50, - 11, 4, 4, 12, 4, 4, 14, 4, 0, 0, 0, 128, 14, 4, 27, 0, - 0, 0, 16, 4, 20, 8, 20, 4, 132, 33, 4, 16, 178, 32, 33, 24, - 147, 32, 32, 17, 170, 33, 32, 132, 33, 33, 16, 105, 0, 0, 33, 2, - 0, + 11, 4, 4, 12, 4, 4, 14, 4, 0, 0, 0, 128, 15, 8, 27, 0, + 0, 0, 0, 0, 0, 0, 16, 4, 20, 8, 20, 4, 132, 33, 4, 16, + 178, 32, 33, 24, 147, 32, 32, 17, 170, 33, 32, 132, 33, 33, 16, 105, + 0, 0, 33, 2, 0, }; p = orc_program_new_from_static_bytecode (bc); orc_program_set_backup_function (p, @@ -2131,7 +2075,7 @@ audiomixer_orc_add_volume_u32 (guint32 * ORC_RESTRICT d1, orc_program_add_destination (p, 4, "d1"); orc_program_add_source (p, 4, "s1"); orc_program_add_constant (p, 4, 0x80000000, "c1"); - orc_program_add_constant (p, 4, 0x0000001b, "c2"); + orc_program_add_constant_int64 (p, 8, 0x000000000000001bULL, "c2"); orc_program_add_parameter (p, 4, "p1"); orc_program_add_temporary (p, 8, "t1"); orc_program_add_temporary (p, 4, "t2"); @@ -2272,9 +2216,9 @@ audiomixer_orc_add_volume_s32 (gint32 * ORC_RESTRICT d1, static const orc_uint8 bc[] = { 1, 9, 29, 97, 117, 100, 105, 111, 109, 105, 120, 101, 114, 95, 111, 114, 99, 95, 97, 100, 100, 95, 118, 111, 108, 117, 109, 101, 95, 115, 51, 50, - 11, 4, 4, 12, 4, 4, 14, 4, 27, 0, 0, 0, 16, 4, 20, 8, - 20, 4, 178, 32, 4, 24, 147, 32, 32, 16, 170, 33, 32, 104, 0, 0, - 33, 2, 0, + 11, 4, 4, 12, 4, 4, 15, 8, 27, 0, 0, 0, 0, 0, 0, 0, + 16, 4, 20, 8, 20, 4, 178, 32, 4, 24, 147, 32, 32, 16, 170, 33, + 32, 104, 0, 0, 33, 2, 0, }; p = orc_program_new_from_static_bytecode (bc); orc_program_set_backup_function (p, @@ -2286,7 +2230,7 @@ audiomixer_orc_add_volume_s32 (gint32 * ORC_RESTRICT d1, _backup_audiomixer_orc_add_volume_s32); orc_program_add_destination (p, 4, "d1"); orc_program_add_source (p, 4, "s1"); - orc_program_add_constant (p, 4, 0x0000001b, "c1"); + orc_program_add_constant_int64 (p, 8, 0x000000000000001bULL, "c1"); orc_program_add_parameter (p, 4, "p1"); orc_program_add_temporary (p, 8, "t1"); orc_program_add_temporary (p, 4, "t2"); @@ -2651,8 +2595,8 @@ audiomixer_orc_add_volume_f64 (double *ORC_RESTRICT d1, { orc_union64 tmp; tmp.f = p1; - ex->params[ORC_VAR_P1] = tmp.x2[0]; - ex->params[ORC_VAR_T1] = tmp.x2[1]; + ex->params[ORC_VAR_P1] = ((orc_uint64) tmp.i) & 0xffffffff; + ex->params[ORC_VAR_T1] = ((orc_uint64) tmp.i) >> 32; } func = c->exec; diff --git a/gst/bayer/gstbayerorc-dist.c b/gst/bayer/gstbayerorc-dist.c index 1dc708de18..c9afb6a83f 100644 --- a/gst/bayer/gstbayerorc-dist.c +++ b/gst/bayer/gstbayerorc-dist.c @@ -667,21 +667,16 @@ bayer_orc_merge_bg_bgra (guint8 * ORC_RESTRICT d1, orc_union16 var43; #endif orc_union16 var44; -#if defined(__APPLE__) && __GNUC__ == 4 && __GNUC_MINOR__ == 2 && defined (__i386__) - volatile orc_union16 var45; -#else - orc_union16 var45; -#endif - orc_union64 var46; + orc_union64 var45; + orc_union16 var46; orc_union16 var47; orc_union16 var48; orc_union16 var49; orc_union16 var50; orc_union16 var51; orc_union16 var52; - orc_union16 var53; + orc_union32 var53; orc_union32 var54; - orc_union32 var55; ptr0 = (orc_union64 *) d1; ptr4 = (orc_union16 *) s1; @@ -695,9 +690,6 @@ bayer_orc_merge_bg_bgra (guint8 * ORC_RESTRICT d1, var42.i = (int) 0x000000ff; /* 255 or 1.25987e-321f */ /* 11: loadpw */ var43.i = (int) 0x0000ff00; /* 65280 or 3.22526e-319f */ - /* 16: loadpb */ - var45.x2[0] = (int) 0x000000ff; /* 255 or 1.25987e-321f */ - var45.x2[1] = (int) 0x000000ff; /* 255 or 1.25987e-321f */ for (i = 0; i < n; i++) { /* 0: loadw */ @@ -705,71 +697,71 @@ bayer_orc_merge_bg_bgra (guint8 * ORC_RESTRICT d1, /* 1: loadw */ var38 = ptr9[i]; /* 2: avgub */ - var47.x2[0] = ((orc_uint8) var37.x2[0] + (orc_uint8) var38.x2[0] + 1) >> 1; - var47.x2[1] = ((orc_uint8) var37.x2[1] + (orc_uint8) var38.x2[1] + 1) >> 1; + var46.x2[0] = ((orc_uint8) var37.x2[0] + (orc_uint8) var38.x2[0] + 1) >> 1; + var46.x2[1] = ((orc_uint8) var37.x2[1] + (orc_uint8) var38.x2[1] + 1) >> 1; /* 3: loadw */ var39 = ptr4[i]; /* 4: loadw */ var40 = ptr8[i]; /* 5: avgub */ - var48.x2[0] = ((orc_uint8) var39.x2[0] + (orc_uint8) var40.x2[0] + 1) >> 1; - var48.x2[1] = ((orc_uint8) var39.x2[1] + (orc_uint8) var40.x2[1] + 1) >> 1; + var47.x2[0] = ((orc_uint8) var39.x2[0] + (orc_uint8) var40.x2[0] + 1) >> 1; + var47.x2[1] = ((orc_uint8) var39.x2[1] + (orc_uint8) var40.x2[1] + 1) >> 1; /* 6: loadw */ var41 = ptr7[i]; /* 7: copyw */ - var49.i = var41.i; + var48.i = var41.i; /* 8: avgub */ - var50.x2[0] = ((orc_uint8) var48.x2[0] + (orc_uint8) var49.x2[0] + 1) >> 1; - var50.x2[1] = ((orc_uint8) var48.x2[1] + (orc_uint8) var49.x2[1] + 1) >> 1; + var49.x2[0] = ((orc_uint8) var47.x2[0] + (orc_uint8) var48.x2[0] + 1) >> 1; + var49.x2[1] = ((orc_uint8) var47.x2[1] + (orc_uint8) var48.x2[1] + 1) >> 1; /* 10: andw */ - var51.i = var50.i & var42.i; + var50.i = var49.i & var42.i; /* 12: andw */ - var52.i = var49.i & var43.i; + var51.i = var48.i & var43.i; /* 13: orw */ - var53.i = var52.i | var51.i; + var52.i = var51.i | var50.i; /* 14: loadw */ var44 = ptr6[i]; /* 15: mergebw */ { orc_union16 _dest; _dest.x2[0] = var44.x2[0]; - _dest.x2[1] = var53.x2[0]; - var54.x2[0] = _dest.i; + _dest.x2[1] = var52.x2[0]; + var53.x2[0] = _dest.i; } { orc_union16 _dest; _dest.x2[0] = var44.x2[1]; - _dest.x2[1] = var53.x2[1]; - var54.x2[1] = _dest.i; + _dest.x2[1] = var52.x2[1]; + var53.x2[1] = _dest.i; } - /* 17: mergebw */ + /* 16: mergebw */ { orc_union16 _dest; - _dest.x2[0] = var47.x2[0]; - _dest.x2[1] = var45.x2[0]; - var55.x2[0] = _dest.i; + _dest.x2[0] = var46.x2[0]; + _dest.x2[1] = var42.x2[0]; + var54.x2[0] = _dest.i; } { orc_union16 _dest; - _dest.x2[0] = var47.x2[1]; - _dest.x2[1] = var45.x2[1]; - var55.x2[1] = _dest.i; + _dest.x2[0] = var46.x2[1]; + _dest.x2[1] = var42.x2[1]; + var54.x2[1] = _dest.i; } - /* 18: mergewl */ + /* 17: mergewl */ { orc_union32 _dest; - _dest.x2[0] = var54.x2[0]; - _dest.x2[1] = var55.x2[0]; - var46.x2[0] = _dest.i; + _dest.x2[0] = var53.x2[0]; + _dest.x2[1] = var54.x2[0]; + var45.x2[0] = _dest.i; } { orc_union32 _dest; - _dest.x2[0] = var54.x2[1]; - _dest.x2[1] = var55.x2[1]; - var46.x2[1] = _dest.i; + _dest.x2[0] = var53.x2[1]; + _dest.x2[1] = var54.x2[1]; + var45.x2[1] = _dest.i; } - /* 19: storeq */ - ptr0[i] = var46; + /* 18: storeq */ + ptr0[i] = var45; } } @@ -803,21 +795,16 @@ _backup_bayer_orc_merge_bg_bgra (OrcExecutor * ORC_RESTRICT ex) orc_union16 var43; #endif orc_union16 var44; -#if defined(__APPLE__) && __GNUC__ == 4 && __GNUC_MINOR__ == 2 && defined (__i386__) - volatile orc_union16 var45; -#else - orc_union16 var45; -#endif - orc_union64 var46; + orc_union64 var45; + orc_union16 var46; orc_union16 var47; orc_union16 var48; orc_union16 var49; orc_union16 var50; orc_union16 var51; orc_union16 var52; - orc_union16 var53; + orc_union32 var53; orc_union32 var54; - orc_union32 var55; ptr0 = (orc_union64 *) ex->arrays[0]; ptr4 = (orc_union16 *) ex->arrays[4]; @@ -831,9 +818,6 @@ _backup_bayer_orc_merge_bg_bgra (OrcExecutor * ORC_RESTRICT ex) var42.i = (int) 0x000000ff; /* 255 or 1.25987e-321f */ /* 11: loadpw */ var43.i = (int) 0x0000ff00; /* 65280 or 3.22526e-319f */ - /* 16: loadpb */ - var45.x2[0] = (int) 0x000000ff; /* 255 or 1.25987e-321f */ - var45.x2[1] = (int) 0x000000ff; /* 255 or 1.25987e-321f */ for (i = 0; i < n; i++) { /* 0: loadw */ @@ -841,71 +825,71 @@ _backup_bayer_orc_merge_bg_bgra (OrcExecutor * ORC_RESTRICT ex) /* 1: loadw */ var38 = ptr9[i]; /* 2: avgub */ - var47.x2[0] = ((orc_uint8) var37.x2[0] + (orc_uint8) var38.x2[0] + 1) >> 1; - var47.x2[1] = ((orc_uint8) var37.x2[1] + (orc_uint8) var38.x2[1] + 1) >> 1; + var46.x2[0] = ((orc_uint8) var37.x2[0] + (orc_uint8) var38.x2[0] + 1) >> 1; + var46.x2[1] = ((orc_uint8) var37.x2[1] + (orc_uint8) var38.x2[1] + 1) >> 1; /* 3: loadw */ var39 = ptr4[i]; /* 4: loadw */ var40 = ptr8[i]; /* 5: avgub */ - var48.x2[0] = ((orc_uint8) var39.x2[0] + (orc_uint8) var40.x2[0] + 1) >> 1; - var48.x2[1] = ((orc_uint8) var39.x2[1] + (orc_uint8) var40.x2[1] + 1) >> 1; + var47.x2[0] = ((orc_uint8) var39.x2[0] + (orc_uint8) var40.x2[0] + 1) >> 1; + var47.x2[1] = ((orc_uint8) var39.x2[1] + (orc_uint8) var40.x2[1] + 1) >> 1; /* 6: loadw */ var41 = ptr7[i]; /* 7: copyw */ - var49.i = var41.i; + var48.i = var41.i; /* 8: avgub */ - var50.x2[0] = ((orc_uint8) var48.x2[0] + (orc_uint8) var49.x2[0] + 1) >> 1; - var50.x2[1] = ((orc_uint8) var48.x2[1] + (orc_uint8) var49.x2[1] + 1) >> 1; + var49.x2[0] = ((orc_uint8) var47.x2[0] + (orc_uint8) var48.x2[0] + 1) >> 1; + var49.x2[1] = ((orc_uint8) var47.x2[1] + (orc_uint8) var48.x2[1] + 1) >> 1; /* 10: andw */ - var51.i = var50.i & var42.i; + var50.i = var49.i & var42.i; /* 12: andw */ - var52.i = var49.i & var43.i; + var51.i = var48.i & var43.i; /* 13: orw */ - var53.i = var52.i | var51.i; + var52.i = var51.i | var50.i; /* 14: loadw */ var44 = ptr6[i]; /* 15: mergebw */ { orc_union16 _dest; _dest.x2[0] = var44.x2[0]; - _dest.x2[1] = var53.x2[0]; - var54.x2[0] = _dest.i; + _dest.x2[1] = var52.x2[0]; + var53.x2[0] = _dest.i; } { orc_union16 _dest; _dest.x2[0] = var44.x2[1]; - _dest.x2[1] = var53.x2[1]; - var54.x2[1] = _dest.i; + _dest.x2[1] = var52.x2[1]; + var53.x2[1] = _dest.i; } - /* 17: mergebw */ + /* 16: mergebw */ { orc_union16 _dest; - _dest.x2[0] = var47.x2[0]; - _dest.x2[1] = var45.x2[0]; - var55.x2[0] = _dest.i; + _dest.x2[0] = var46.x2[0]; + _dest.x2[1] = var42.x2[0]; + var54.x2[0] = _dest.i; } { orc_union16 _dest; - _dest.x2[0] = var47.x2[1]; - _dest.x2[1] = var45.x2[1]; - var55.x2[1] = _dest.i; + _dest.x2[0] = var46.x2[1]; + _dest.x2[1] = var42.x2[1]; + var54.x2[1] = _dest.i; } - /* 18: mergewl */ + /* 17: mergewl */ { orc_union32 _dest; - _dest.x2[0] = var54.x2[0]; - _dest.x2[1] = var55.x2[0]; - var46.x2[0] = _dest.i; + _dest.x2[0] = var53.x2[0]; + _dest.x2[1] = var54.x2[0]; + var45.x2[0] = _dest.i; } { orc_union32 _dest; - _dest.x2[0] = var54.x2[1]; - _dest.x2[1] = var55.x2[1]; - var46.x2[1] = _dest.i; + _dest.x2[0] = var53.x2[1]; + _dest.x2[1] = var54.x2[1]; + var45.x2[1] = _dest.i; } - /* 19: storeq */ - ptr0[i] = var46; + /* 18: storeq */ + ptr0[i] = var45; } } @@ -931,7 +915,7 @@ bayer_orc_merge_bg_bgra (guint8 * ORC_RESTRICT d1, 1, 9, 23, 98, 97, 121, 101, 114, 95, 111, 114, 99, 95, 109, 101, 114, 103, 101, 95, 98, 103, 95, 98, 103, 114, 97, 11, 8, 8, 12, 2, 2, 12, 2, 2, 12, 2, 2, 12, 2, 2, 12, 2, 2, 12, 2, 2, 14, - 4, 255, 0, 0, 0, 14, 4, 0, 255, 0, 0, 20, 4, 20, 4, 20, + 2, 255, 0, 0, 0, 14, 2, 0, 255, 0, 0, 20, 4, 20, 4, 20, 2, 20, 2, 20, 2, 21, 1, 39, 34, 5, 9, 21, 1, 39, 35, 4, 8, 79, 36, 7, 21, 1, 39, 35, 35, 36, 73, 35, 35, 16, 73, 36, 36, 17, 92, 35, 36, 35, 21, 1, 196, 33, 6, 35, 21, 1, 196, 32, @@ -950,8 +934,8 @@ bayer_orc_merge_bg_bgra (guint8 * ORC_RESTRICT d1, orc_program_add_source (p, 2, "s4"); orc_program_add_source (p, 2, "s5"); orc_program_add_source (p, 2, "s6"); - orc_program_add_constant (p, 4, 0x000000ff, "c1"); - orc_program_add_constant (p, 4, 0x0000ff00, "c2"); + orc_program_add_constant (p, 2, 0x000000ff, "c1"); + orc_program_add_constant (p, 2, 0x0000ff00, "c2"); orc_program_add_temporary (p, 4, "t1"); orc_program_add_temporary (p, 4, "t2"); orc_program_add_temporary (p, 2, "t3"); @@ -1037,21 +1021,16 @@ bayer_orc_merge_gr_bgra (guint8 * ORC_RESTRICT d1, orc_union16 var43; #endif orc_union16 var44; -#if defined(__APPLE__) && __GNUC__ == 4 && __GNUC_MINOR__ == 2 && defined (__i386__) - volatile orc_union16 var45; -#else - orc_union16 var45; -#endif - orc_union64 var46; + orc_union64 var45; + orc_union16 var46; orc_union16 var47; orc_union16 var48; orc_union16 var49; orc_union16 var50; orc_union16 var51; orc_union16 var52; - orc_union16 var53; + orc_union32 var53; orc_union32 var54; - orc_union32 var55; ptr0 = (orc_union64 *) d1; ptr4 = (orc_union16 *) s1; @@ -1065,9 +1044,6 @@ bayer_orc_merge_gr_bgra (guint8 * ORC_RESTRICT d1, var42.i = (int) 0x0000ff00; /* 65280 or 3.22526e-319f */ /* 11: loadpw */ var43.i = (int) 0x000000ff; /* 255 or 1.25987e-321f */ - /* 16: loadpb */ - var45.x2[0] = (int) 0x000000ff; /* 255 or 1.25987e-321f */ - var45.x2[1] = (int) 0x000000ff; /* 255 or 1.25987e-321f */ for (i = 0; i < n; i++) { /* 0: loadw */ @@ -1075,71 +1051,71 @@ bayer_orc_merge_gr_bgra (guint8 * ORC_RESTRICT d1, /* 1: loadw */ var38 = ptr8[i]; /* 2: avgub */ - var47.x2[0] = ((orc_uint8) var37.x2[0] + (orc_uint8) var38.x2[0] + 1) >> 1; - var47.x2[1] = ((orc_uint8) var37.x2[1] + (orc_uint8) var38.x2[1] + 1) >> 1; + var46.x2[0] = ((orc_uint8) var37.x2[0] + (orc_uint8) var38.x2[0] + 1) >> 1; + var46.x2[1] = ((orc_uint8) var37.x2[1] + (orc_uint8) var38.x2[1] + 1) >> 1; /* 3: loadw */ var39 = ptr5[i]; /* 4: loadw */ var40 = ptr9[i]; /* 5: avgub */ - var48.x2[0] = ((orc_uint8) var39.x2[0] + (orc_uint8) var40.x2[0] + 1) >> 1; - var48.x2[1] = ((orc_uint8) var39.x2[1] + (orc_uint8) var40.x2[1] + 1) >> 1; + var47.x2[0] = ((orc_uint8) var39.x2[0] + (orc_uint8) var40.x2[0] + 1) >> 1; + var47.x2[1] = ((orc_uint8) var39.x2[1] + (orc_uint8) var40.x2[1] + 1) >> 1; /* 6: loadw */ var41 = ptr6[i]; /* 7: copyw */ - var49.i = var41.i; + var48.i = var41.i; /* 8: avgub */ - var50.x2[0] = ((orc_uint8) var48.x2[0] + (orc_uint8) var49.x2[0] + 1) >> 1; - var50.x2[1] = ((orc_uint8) var48.x2[1] + (orc_uint8) var49.x2[1] + 1) >> 1; + var49.x2[0] = ((orc_uint8) var47.x2[0] + (orc_uint8) var48.x2[0] + 1) >> 1; + var49.x2[1] = ((orc_uint8) var47.x2[1] + (orc_uint8) var48.x2[1] + 1) >> 1; /* 10: andw */ - var51.i = var50.i & var42.i; + var50.i = var49.i & var42.i; /* 12: andw */ - var52.i = var49.i & var43.i; + var51.i = var48.i & var43.i; /* 13: orw */ - var53.i = var52.i | var51.i; + var52.i = var51.i | var50.i; /* 14: mergebw */ { orc_union16 _dest; - _dest.x2[0] = var47.x2[0]; - _dest.x2[1] = var53.x2[0]; - var54.x2[0] = _dest.i; + _dest.x2[0] = var46.x2[0]; + _dest.x2[1] = var52.x2[0]; + var53.x2[0] = _dest.i; } { orc_union16 _dest; - _dest.x2[0] = var47.x2[1]; - _dest.x2[1] = var53.x2[1]; - var54.x2[1] = _dest.i; + _dest.x2[0] = var46.x2[1]; + _dest.x2[1] = var52.x2[1]; + var53.x2[1] = _dest.i; } /* 15: loadw */ var44 = ptr7[i]; - /* 17: mergebw */ + /* 16: mergebw */ { orc_union16 _dest; _dest.x2[0] = var44.x2[0]; - _dest.x2[1] = var45.x2[0]; - var55.x2[0] = _dest.i; + _dest.x2[1] = var43.x2[0]; + var54.x2[0] = _dest.i; } { orc_union16 _dest; _dest.x2[0] = var44.x2[1]; - _dest.x2[1] = var45.x2[1]; - var55.x2[1] = _dest.i; + _dest.x2[1] = var43.x2[1]; + var54.x2[1] = _dest.i; } - /* 18: mergewl */ + /* 17: mergewl */ { orc_union32 _dest; - _dest.x2[0] = var54.x2[0]; - _dest.x2[1] = var55.x2[0]; - var46.x2[0] = _dest.i; + _dest.x2[0] = var53.x2[0]; + _dest.x2[1] = var54.x2[0]; + var45.x2[0] = _dest.i; } { orc_union32 _dest; - _dest.x2[0] = var54.x2[1]; - _dest.x2[1] = var55.x2[1]; - var46.x2[1] = _dest.i; + _dest.x2[0] = var53.x2[1]; + _dest.x2[1] = var54.x2[1]; + var45.x2[1] = _dest.i; } - /* 19: storeq */ - ptr0[i] = var46; + /* 18: storeq */ + ptr0[i] = var45; } } @@ -1173,21 +1149,16 @@ _backup_bayer_orc_merge_gr_bgra (OrcExecutor * ORC_RESTRICT ex) orc_union16 var43; #endif orc_union16 var44; -#if defined(__APPLE__) && __GNUC__ == 4 && __GNUC_MINOR__ == 2 && defined (__i386__) - volatile orc_union16 var45; -#else - orc_union16 var45; -#endif - orc_union64 var46; + orc_union64 var45; + orc_union16 var46; orc_union16 var47; orc_union16 var48; orc_union16 var49; orc_union16 var50; orc_union16 var51; orc_union16 var52; - orc_union16 var53; + orc_union32 var53; orc_union32 var54; - orc_union32 var55; ptr0 = (orc_union64 *) ex->arrays[0]; ptr4 = (orc_union16 *) ex->arrays[4]; @@ -1201,9 +1172,6 @@ _backup_bayer_orc_merge_gr_bgra (OrcExecutor * ORC_RESTRICT ex) var42.i = (int) 0x0000ff00; /* 65280 or 3.22526e-319f */ /* 11: loadpw */ var43.i = (int) 0x000000ff; /* 255 or 1.25987e-321f */ - /* 16: loadpb */ - var45.x2[0] = (int) 0x000000ff; /* 255 or 1.25987e-321f */ - var45.x2[1] = (int) 0x000000ff; /* 255 or 1.25987e-321f */ for (i = 0; i < n; i++) { /* 0: loadw */ @@ -1211,71 +1179,71 @@ _backup_bayer_orc_merge_gr_bgra (OrcExecutor * ORC_RESTRICT ex) /* 1: loadw */ var38 = ptr8[i]; /* 2: avgub */ - var47.x2[0] = ((orc_uint8) var37.x2[0] + (orc_uint8) var38.x2[0] + 1) >> 1; - var47.x2[1] = ((orc_uint8) var37.x2[1] + (orc_uint8) var38.x2[1] + 1) >> 1; + var46.x2[0] = ((orc_uint8) var37.x2[0] + (orc_uint8) var38.x2[0] + 1) >> 1; + var46.x2[1] = ((orc_uint8) var37.x2[1] + (orc_uint8) var38.x2[1] + 1) >> 1; /* 3: loadw */ var39 = ptr5[i]; /* 4: loadw */ var40 = ptr9[i]; /* 5: avgub */ - var48.x2[0] = ((orc_uint8) var39.x2[0] + (orc_uint8) var40.x2[0] + 1) >> 1; - var48.x2[1] = ((orc_uint8) var39.x2[1] + (orc_uint8) var40.x2[1] + 1) >> 1; + var47.x2[0] = ((orc_uint8) var39.x2[0] + (orc_uint8) var40.x2[0] + 1) >> 1; + var47.x2[1] = ((orc_uint8) var39.x2[1] + (orc_uint8) var40.x2[1] + 1) >> 1; /* 6: loadw */ var41 = ptr6[i]; /* 7: copyw */ - var49.i = var41.i; + var48.i = var41.i; /* 8: avgub */ - var50.x2[0] = ((orc_uint8) var48.x2[0] + (orc_uint8) var49.x2[0] + 1) >> 1; - var50.x2[1] = ((orc_uint8) var48.x2[1] + (orc_uint8) var49.x2[1] + 1) >> 1; + var49.x2[0] = ((orc_uint8) var47.x2[0] + (orc_uint8) var48.x2[0] + 1) >> 1; + var49.x2[1] = ((orc_uint8) var47.x2[1] + (orc_uint8) var48.x2[1] + 1) >> 1; /* 10: andw */ - var51.i = var50.i & var42.i; + var50.i = var49.i & var42.i; /* 12: andw */ - var52.i = var49.i & var43.i; + var51.i = var48.i & var43.i; /* 13: orw */ - var53.i = var52.i | var51.i; + var52.i = var51.i | var50.i; /* 14: mergebw */ { orc_union16 _dest; - _dest.x2[0] = var47.x2[0]; - _dest.x2[1] = var53.x2[0]; - var54.x2[0] = _dest.i; + _dest.x2[0] = var46.x2[0]; + _dest.x2[1] = var52.x2[0]; + var53.x2[0] = _dest.i; } { orc_union16 _dest; - _dest.x2[0] = var47.x2[1]; - _dest.x2[1] = var53.x2[1]; - var54.x2[1] = _dest.i; + _dest.x2[0] = var46.x2[1]; + _dest.x2[1] = var52.x2[1]; + var53.x2[1] = _dest.i; } /* 15: loadw */ var44 = ptr7[i]; - /* 17: mergebw */ + /* 16: mergebw */ { orc_union16 _dest; _dest.x2[0] = var44.x2[0]; - _dest.x2[1] = var45.x2[0]; - var55.x2[0] = _dest.i; + _dest.x2[1] = var43.x2[0]; + var54.x2[0] = _dest.i; } { orc_union16 _dest; _dest.x2[0] = var44.x2[1]; - _dest.x2[1] = var45.x2[1]; - var55.x2[1] = _dest.i; + _dest.x2[1] = var43.x2[1]; + var54.x2[1] = _dest.i; } - /* 18: mergewl */ + /* 17: mergewl */ { orc_union32 _dest; - _dest.x2[0] = var54.x2[0]; - _dest.x2[1] = var55.x2[0]; - var46.x2[0] = _dest.i; + _dest.x2[0] = var53.x2[0]; + _dest.x2[1] = var54.x2[0]; + var45.x2[0] = _dest.i; } { orc_union32 _dest; - _dest.x2[0] = var54.x2[1]; - _dest.x2[1] = var55.x2[1]; - var46.x2[1] = _dest.i; + _dest.x2[0] = var53.x2[1]; + _dest.x2[1] = var54.x2[1]; + var45.x2[1] = _dest.i; } - /* 19: storeq */ - ptr0[i] = var46; + /* 18: storeq */ + ptr0[i] = var45; } } @@ -1301,7 +1269,7 @@ bayer_orc_merge_gr_bgra (guint8 * ORC_RESTRICT d1, 1, 9, 23, 98, 97, 121, 101, 114, 95, 111, 114, 99, 95, 109, 101, 114, 103, 101, 95, 103, 114, 95, 98, 103, 114, 97, 11, 8, 8, 12, 2, 2, 12, 2, 2, 12, 2, 2, 12, 2, 2, 12, 2, 2, 12, 2, 2, 14, - 4, 0, 255, 0, 0, 14, 4, 255, 0, 0, 0, 20, 4, 20, 4, 20, + 2, 0, 255, 0, 0, 14, 2, 255, 0, 0, 0, 20, 4, 20, 4, 20, 2, 20, 2, 20, 2, 21, 1, 39, 34, 4, 8, 21, 1, 39, 35, 5, 9, 79, 36, 6, 21, 1, 39, 35, 35, 36, 73, 35, 35, 16, 73, 36, 36, 17, 92, 35, 36, 35, 21, 1, 196, 33, 34, 35, 21, 1, 196, 32, @@ -1320,8 +1288,8 @@ bayer_orc_merge_gr_bgra (guint8 * ORC_RESTRICT d1, orc_program_add_source (p, 2, "s4"); orc_program_add_source (p, 2, "s5"); orc_program_add_source (p, 2, "s6"); - orc_program_add_constant (p, 4, 0x0000ff00, "c1"); - orc_program_add_constant (p, 4, 0x000000ff, "c2"); + orc_program_add_constant (p, 2, 0x0000ff00, "c1"); + orc_program_add_constant (p, 2, 0x000000ff, "c2"); orc_program_add_temporary (p, 4, "t1"); orc_program_add_temporary (p, 4, "t2"); orc_program_add_temporary (p, 2, "t3"); @@ -1406,22 +1374,17 @@ bayer_orc_merge_bg_abgr (guint8 * ORC_RESTRICT d1, #else orc_union16 var43; #endif -#if defined(__APPLE__) && __GNUC__ == 4 && __GNUC_MINOR__ == 2 && defined (__i386__) - volatile orc_union16 var44; -#else orc_union16 var44; -#endif - orc_union16 var45; - orc_union64 var46; + orc_union64 var45; + orc_union16 var46; orc_union16 var47; orc_union16 var48; orc_union16 var49; orc_union16 var50; orc_union16 var51; orc_union16 var52; - orc_union16 var53; + orc_union32 var53; orc_union32 var54; - orc_union32 var55; ptr0 = (orc_union64 *) d1; ptr4 = (orc_union16 *) s1; @@ -1435,9 +1398,6 @@ bayer_orc_merge_bg_abgr (guint8 * ORC_RESTRICT d1, var42.i = (int) 0x000000ff; /* 255 or 1.25987e-321f */ /* 11: loadpw */ var43.i = (int) 0x0000ff00; /* 65280 or 3.22526e-319f */ - /* 14: loadpb */ - var44.x2[0] = (int) 0x000000ff; /* 255 or 1.25987e-321f */ - var44.x2[1] = (int) 0x000000ff; /* 255 or 1.25987e-321f */ for (i = 0; i < n; i++) { /* 0: loadw */ @@ -1445,71 +1405,71 @@ bayer_orc_merge_bg_abgr (guint8 * ORC_RESTRICT d1, /* 1: loadw */ var38 = ptr9[i]; /* 2: avgub */ - var47.x2[0] = ((orc_uint8) var37.x2[0] + (orc_uint8) var38.x2[0] + 1) >> 1; - var47.x2[1] = ((orc_uint8) var37.x2[1] + (orc_uint8) var38.x2[1] + 1) >> 1; + var46.x2[0] = ((orc_uint8) var37.x2[0] + (orc_uint8) var38.x2[0] + 1) >> 1; + var46.x2[1] = ((orc_uint8) var37.x2[1] + (orc_uint8) var38.x2[1] + 1) >> 1; /* 3: loadw */ var39 = ptr4[i]; /* 4: loadw */ var40 = ptr8[i]; /* 5: avgub */ - var48.x2[0] = ((orc_uint8) var39.x2[0] + (orc_uint8) var40.x2[0] + 1) >> 1; - var48.x2[1] = ((orc_uint8) var39.x2[1] + (orc_uint8) var40.x2[1] + 1) >> 1; + var47.x2[0] = ((orc_uint8) var39.x2[0] + (orc_uint8) var40.x2[0] + 1) >> 1; + var47.x2[1] = ((orc_uint8) var39.x2[1] + (orc_uint8) var40.x2[1] + 1) >> 1; /* 6: loadw */ var41 = ptr7[i]; /* 7: copyw */ - var49.i = var41.i; + var48.i = var41.i; /* 8: avgub */ - var50.x2[0] = ((orc_uint8) var48.x2[0] + (orc_uint8) var49.x2[0] + 1) >> 1; - var50.x2[1] = ((orc_uint8) var48.x2[1] + (orc_uint8) var49.x2[1] + 1) >> 1; + var49.x2[0] = ((orc_uint8) var47.x2[0] + (orc_uint8) var48.x2[0] + 1) >> 1; + var49.x2[1] = ((orc_uint8) var47.x2[1] + (orc_uint8) var48.x2[1] + 1) >> 1; /* 10: andw */ - var51.i = var50.i & var42.i; + var50.i = var49.i & var42.i; /* 12: andw */ - var52.i = var49.i & var43.i; + var51.i = var48.i & var43.i; /* 13: orw */ - var53.i = var52.i | var51.i; - /* 15: loadw */ - var45 = ptr6[i]; - /* 16: mergebw */ + var52.i = var51.i | var50.i; + /* 14: loadw */ + var44 = ptr6[i]; + /* 15: mergebw */ { orc_union16 _dest; - _dest.x2[0] = var44.x2[0]; - _dest.x2[1] = var45.x2[0]; - var54.x2[0] = _dest.i; + _dest.x2[0] = var42.x2[0]; + _dest.x2[1] = var44.x2[0]; + var53.x2[0] = _dest.i; } { orc_union16 _dest; - _dest.x2[0] = var44.x2[1]; - _dest.x2[1] = var45.x2[1]; - var54.x2[1] = _dest.i; + _dest.x2[0] = var42.x2[1]; + _dest.x2[1] = var44.x2[1]; + var53.x2[1] = _dest.i; } - /* 17: mergebw */ + /* 16: mergebw */ { orc_union16 _dest; - _dest.x2[0] = var53.x2[0]; - _dest.x2[1] = var47.x2[0]; - var55.x2[0] = _dest.i; + _dest.x2[0] = var52.x2[0]; + _dest.x2[1] = var46.x2[0]; + var54.x2[0] = _dest.i; } { orc_union16 _dest; - _dest.x2[0] = var53.x2[1]; - _dest.x2[1] = var47.x2[1]; - var55.x2[1] = _dest.i; + _dest.x2[0] = var52.x2[1]; + _dest.x2[1] = var46.x2[1]; + var54.x2[1] = _dest.i; } - /* 18: mergewl */ + /* 17: mergewl */ { orc_union32 _dest; - _dest.x2[0] = var54.x2[0]; - _dest.x2[1] = var55.x2[0]; - var46.x2[0] = _dest.i; + _dest.x2[0] = var53.x2[0]; + _dest.x2[1] = var54.x2[0]; + var45.x2[0] = _dest.i; } { orc_union32 _dest; - _dest.x2[0] = var54.x2[1]; - _dest.x2[1] = var55.x2[1]; - var46.x2[1] = _dest.i; + _dest.x2[0] = var53.x2[1]; + _dest.x2[1] = var54.x2[1]; + var45.x2[1] = _dest.i; } - /* 19: storeq */ - ptr0[i] = var46; + /* 18: storeq */ + ptr0[i] = var45; } } @@ -1542,22 +1502,17 @@ _backup_bayer_orc_merge_bg_abgr (OrcExecutor * ORC_RESTRICT ex) #else orc_union16 var43; #endif -#if defined(__APPLE__) && __GNUC__ == 4 && __GNUC_MINOR__ == 2 && defined (__i386__) - volatile orc_union16 var44; -#else orc_union16 var44; -#endif - orc_union16 var45; - orc_union64 var46; + orc_union64 var45; + orc_union16 var46; orc_union16 var47; orc_union16 var48; orc_union16 var49; orc_union16 var50; orc_union16 var51; orc_union16 var52; - orc_union16 var53; + orc_union32 var53; orc_union32 var54; - orc_union32 var55; ptr0 = (orc_union64 *) ex->arrays[0]; ptr4 = (orc_union16 *) ex->arrays[4]; @@ -1571,9 +1526,6 @@ _backup_bayer_orc_merge_bg_abgr (OrcExecutor * ORC_RESTRICT ex) var42.i = (int) 0x000000ff; /* 255 or 1.25987e-321f */ /* 11: loadpw */ var43.i = (int) 0x0000ff00; /* 65280 or 3.22526e-319f */ - /* 14: loadpb */ - var44.x2[0] = (int) 0x000000ff; /* 255 or 1.25987e-321f */ - var44.x2[1] = (int) 0x000000ff; /* 255 or 1.25987e-321f */ for (i = 0; i < n; i++) { /* 0: loadw */ @@ -1581,71 +1533,71 @@ _backup_bayer_orc_merge_bg_abgr (OrcExecutor * ORC_RESTRICT ex) /* 1: loadw */ var38 = ptr9[i]; /* 2: avgub */ - var47.x2[0] = ((orc_uint8) var37.x2[0] + (orc_uint8) var38.x2[0] + 1) >> 1; - var47.x2[1] = ((orc_uint8) var37.x2[1] + (orc_uint8) var38.x2[1] + 1) >> 1; + var46.x2[0] = ((orc_uint8) var37.x2[0] + (orc_uint8) var38.x2[0] + 1) >> 1; + var46.x2[1] = ((orc_uint8) var37.x2[1] + (orc_uint8) var38.x2[1] + 1) >> 1; /* 3: loadw */ var39 = ptr4[i]; /* 4: loadw */ var40 = ptr8[i]; /* 5: avgub */ - var48.x2[0] = ((orc_uint8) var39.x2[0] + (orc_uint8) var40.x2[0] + 1) >> 1; - var48.x2[1] = ((orc_uint8) var39.x2[1] + (orc_uint8) var40.x2[1] + 1) >> 1; + var47.x2[0] = ((orc_uint8) var39.x2[0] + (orc_uint8) var40.x2[0] + 1) >> 1; + var47.x2[1] = ((orc_uint8) var39.x2[1] + (orc_uint8) var40.x2[1] + 1) >> 1; /* 6: loadw */ var41 = ptr7[i]; /* 7: copyw */ - var49.i = var41.i; + var48.i = var41.i; /* 8: avgub */ - var50.x2[0] = ((orc_uint8) var48.x2[0] + (orc_uint8) var49.x2[0] + 1) >> 1; - var50.x2[1] = ((orc_uint8) var48.x2[1] + (orc_uint8) var49.x2[1] + 1) >> 1; + var49.x2[0] = ((orc_uint8) var47.x2[0] + (orc_uint8) var48.x2[0] + 1) >> 1; + var49.x2[1] = ((orc_uint8) var47.x2[1] + (orc_uint8) var48.x2[1] + 1) >> 1; /* 10: andw */ - var51.i = var50.i & var42.i; + var50.i = var49.i & var42.i; /* 12: andw */ - var52.i = var49.i & var43.i; + var51.i = var48.i & var43.i; /* 13: orw */ - var53.i = var52.i | var51.i; - /* 15: loadw */ - var45 = ptr6[i]; - /* 16: mergebw */ + var52.i = var51.i | var50.i; + /* 14: loadw */ + var44 = ptr6[i]; + /* 15: mergebw */ { orc_union16 _dest; - _dest.x2[0] = var44.x2[0]; - _dest.x2[1] = var45.x2[0]; - var54.x2[0] = _dest.i; + _dest.x2[0] = var42.x2[0]; + _dest.x2[1] = var44.x2[0]; + var53.x2[0] = _dest.i; } { orc_union16 _dest; - _dest.x2[0] = var44.x2[1]; - _dest.x2[1] = var45.x2[1]; - var54.x2[1] = _dest.i; + _dest.x2[0] = var42.x2[1]; + _dest.x2[1] = var44.x2[1]; + var53.x2[1] = _dest.i; } - /* 17: mergebw */ + /* 16: mergebw */ { orc_union16 _dest; - _dest.x2[0] = var53.x2[0]; - _dest.x2[1] = var47.x2[0]; - var55.x2[0] = _dest.i; + _dest.x2[0] = var52.x2[0]; + _dest.x2[1] = var46.x2[0]; + var54.x2[0] = _dest.i; } { orc_union16 _dest; - _dest.x2[0] = var53.x2[1]; - _dest.x2[1] = var47.x2[1]; - var55.x2[1] = _dest.i; + _dest.x2[0] = var52.x2[1]; + _dest.x2[1] = var46.x2[1]; + var54.x2[1] = _dest.i; } - /* 18: mergewl */ + /* 17: mergewl */ { orc_union32 _dest; - _dest.x2[0] = var54.x2[0]; - _dest.x2[1] = var55.x2[0]; - var46.x2[0] = _dest.i; + _dest.x2[0] = var53.x2[0]; + _dest.x2[1] = var54.x2[0]; + var45.x2[0] = _dest.i; } { orc_union32 _dest; - _dest.x2[0] = var54.x2[1]; - _dest.x2[1] = var55.x2[1]; - var46.x2[1] = _dest.i; + _dest.x2[0] = var53.x2[1]; + _dest.x2[1] = var54.x2[1]; + var45.x2[1] = _dest.i; } - /* 19: storeq */ - ptr0[i] = var46; + /* 18: storeq */ + ptr0[i] = var45; } } @@ -1671,7 +1623,7 @@ bayer_orc_merge_bg_abgr (guint8 * ORC_RESTRICT d1, 1, 9, 23, 98, 97, 121, 101, 114, 95, 111, 114, 99, 95, 109, 101, 114, 103, 101, 95, 98, 103, 95, 97, 98, 103, 114, 11, 8, 8, 12, 2, 2, 12, 2, 2, 12, 2, 2, 12, 2, 2, 12, 2, 2, 12, 2, 2, 14, - 4, 255, 0, 0, 0, 14, 4, 0, 255, 0, 0, 20, 4, 20, 4, 20, + 2, 255, 0, 0, 0, 14, 2, 0, 255, 0, 0, 20, 4, 20, 4, 20, 2, 20, 2, 20, 2, 21, 1, 39, 34, 5, 9, 21, 1, 39, 35, 4, 8, 79, 36, 7, 21, 1, 39, 35, 35, 36, 73, 35, 35, 16, 73, 36, 36, 17, 92, 35, 36, 35, 21, 1, 196, 32, 16, 6, 21, 1, 196, 33, @@ -1690,8 +1642,8 @@ bayer_orc_merge_bg_abgr (guint8 * ORC_RESTRICT d1, orc_program_add_source (p, 2, "s4"); orc_program_add_source (p, 2, "s5"); orc_program_add_source (p, 2, "s6"); - orc_program_add_constant (p, 4, 0x000000ff, "c1"); - orc_program_add_constant (p, 4, 0x0000ff00, "c2"); + orc_program_add_constant (p, 2, 0x000000ff, "c1"); + orc_program_add_constant (p, 2, 0x0000ff00, "c2"); orc_program_add_temporary (p, 4, "t1"); orc_program_add_temporary (p, 4, "t2"); orc_program_add_temporary (p, 2, "t3"); @@ -1776,22 +1728,17 @@ bayer_orc_merge_gr_abgr (guint8 * ORC_RESTRICT d1, #else orc_union16 var43; #endif -#if defined(__APPLE__) && __GNUC__ == 4 && __GNUC_MINOR__ == 2 && defined (__i386__) - volatile orc_union16 var44; -#else orc_union16 var44; -#endif - orc_union16 var45; - orc_union64 var46; + orc_union64 var45; + orc_union16 var46; orc_union16 var47; orc_union16 var48; orc_union16 var49; orc_union16 var50; orc_union16 var51; orc_union16 var52; - orc_union16 var53; + orc_union32 var53; orc_union32 var54; - orc_union32 var55; ptr0 = (orc_union64 *) d1; ptr4 = (orc_union16 *) s1; @@ -1805,9 +1752,6 @@ bayer_orc_merge_gr_abgr (guint8 * ORC_RESTRICT d1, var42.i = (int) 0x0000ff00; /* 65280 or 3.22526e-319f */ /* 11: loadpw */ var43.i = (int) 0x000000ff; /* 255 or 1.25987e-321f */ - /* 14: loadpb */ - var44.x2[0] = (int) 0x000000ff; /* 255 or 1.25987e-321f */ - var44.x2[1] = (int) 0x000000ff; /* 255 or 1.25987e-321f */ for (i = 0; i < n; i++) { /* 0: loadw */ @@ -1815,71 +1759,71 @@ bayer_orc_merge_gr_abgr (guint8 * ORC_RESTRICT d1, /* 1: loadw */ var38 = ptr8[i]; /* 2: avgub */ - var47.x2[0] = ((orc_uint8) var37.x2[0] + (orc_uint8) var38.x2[0] + 1) >> 1; - var47.x2[1] = ((orc_uint8) var37.x2[1] + (orc_uint8) var38.x2[1] + 1) >> 1; + var46.x2[0] = ((orc_uint8) var37.x2[0] + (orc_uint8) var38.x2[0] + 1) >> 1; + var46.x2[1] = ((orc_uint8) var37.x2[1] + (orc_uint8) var38.x2[1] + 1) >> 1; /* 3: loadw */ var39 = ptr5[i]; /* 4: loadw */ var40 = ptr9[i]; /* 5: avgub */ - var48.x2[0] = ((orc_uint8) var39.x2[0] + (orc_uint8) var40.x2[0] + 1) >> 1; - var48.x2[1] = ((orc_uint8) var39.x2[1] + (orc_uint8) var40.x2[1] + 1) >> 1; + var47.x2[0] = ((orc_uint8) var39.x2[0] + (orc_uint8) var40.x2[0] + 1) >> 1; + var47.x2[1] = ((orc_uint8) var39.x2[1] + (orc_uint8) var40.x2[1] + 1) >> 1; /* 6: loadw */ var41 = ptr6[i]; /* 7: copyw */ - var49.i = var41.i; + var48.i = var41.i; /* 8: avgub */ - var50.x2[0] = ((orc_uint8) var48.x2[0] + (orc_uint8) var49.x2[0] + 1) >> 1; - var50.x2[1] = ((orc_uint8) var48.x2[1] + (orc_uint8) var49.x2[1] + 1) >> 1; + var49.x2[0] = ((orc_uint8) var47.x2[0] + (orc_uint8) var48.x2[0] + 1) >> 1; + var49.x2[1] = ((orc_uint8) var47.x2[1] + (orc_uint8) var48.x2[1] + 1) >> 1; /* 10: andw */ - var51.i = var50.i & var42.i; + var50.i = var49.i & var42.i; /* 12: andw */ - var52.i = var49.i & var43.i; + var51.i = var48.i & var43.i; /* 13: orw */ - var53.i = var52.i | var51.i; - /* 15: mergebw */ + var52.i = var51.i | var50.i; + /* 14: mergebw */ { orc_union16 _dest; - _dest.x2[0] = var44.x2[0]; - _dest.x2[1] = var47.x2[0]; - var54.x2[0] = _dest.i; + _dest.x2[0] = var43.x2[0]; + _dest.x2[1] = var46.x2[0]; + var53.x2[0] = _dest.i; } { orc_union16 _dest; - _dest.x2[0] = var44.x2[1]; - _dest.x2[1] = var47.x2[1]; - var54.x2[1] = _dest.i; + _dest.x2[0] = var43.x2[1]; + _dest.x2[1] = var46.x2[1]; + var53.x2[1] = _dest.i; } - /* 16: loadw */ - var45 = ptr7[i]; - /* 17: mergebw */ + /* 15: loadw */ + var44 = ptr7[i]; + /* 16: mergebw */ { orc_union16 _dest; - _dest.x2[0] = var53.x2[0]; - _dest.x2[1] = var45.x2[0]; - var55.x2[0] = _dest.i; + _dest.x2[0] = var52.x2[0]; + _dest.x2[1] = var44.x2[0]; + var54.x2[0] = _dest.i; } { orc_union16 _dest; - _dest.x2[0] = var53.x2[1]; - _dest.x2[1] = var45.x2[1]; - var55.x2[1] = _dest.i; + _dest.x2[0] = var52.x2[1]; + _dest.x2[1] = var44.x2[1]; + var54.x2[1] = _dest.i; } - /* 18: mergewl */ + /* 17: mergewl */ { orc_union32 _dest; - _dest.x2[0] = var54.x2[0]; - _dest.x2[1] = var55.x2[0]; - var46.x2[0] = _dest.i; + _dest.x2[0] = var53.x2[0]; + _dest.x2[1] = var54.x2[0]; + var45.x2[0] = _dest.i; } { orc_union32 _dest; - _dest.x2[0] = var54.x2[1]; - _dest.x2[1] = var55.x2[1]; - var46.x2[1] = _dest.i; + _dest.x2[0] = var53.x2[1]; + _dest.x2[1] = var54.x2[1]; + var45.x2[1] = _dest.i; } - /* 19: storeq */ - ptr0[i] = var46; + /* 18: storeq */ + ptr0[i] = var45; } } @@ -1912,22 +1856,17 @@ _backup_bayer_orc_merge_gr_abgr (OrcExecutor * ORC_RESTRICT ex) #else orc_union16 var43; #endif -#if defined(__APPLE__) && __GNUC__ == 4 && __GNUC_MINOR__ == 2 && defined (__i386__) - volatile orc_union16 var44; -#else orc_union16 var44; -#endif - orc_union16 var45; - orc_union64 var46; + orc_union64 var45; + orc_union16 var46; orc_union16 var47; orc_union16 var48; orc_union16 var49; orc_union16 var50; orc_union16 var51; orc_union16 var52; - orc_union16 var53; + orc_union32 var53; orc_union32 var54; - orc_union32 var55; ptr0 = (orc_union64 *) ex->arrays[0]; ptr4 = (orc_union16 *) ex->arrays[4]; @@ -1941,9 +1880,6 @@ _backup_bayer_orc_merge_gr_abgr (OrcExecutor * ORC_RESTRICT ex) var42.i = (int) 0x0000ff00; /* 65280 or 3.22526e-319f */ /* 11: loadpw */ var43.i = (int) 0x000000ff; /* 255 or 1.25987e-321f */ - /* 14: loadpb */ - var44.x2[0] = (int) 0x000000ff; /* 255 or 1.25987e-321f */ - var44.x2[1] = (int) 0x000000ff; /* 255 or 1.25987e-321f */ for (i = 0; i < n; i++) { /* 0: loadw */ @@ -1951,71 +1887,71 @@ _backup_bayer_orc_merge_gr_abgr (OrcExecutor * ORC_RESTRICT ex) /* 1: loadw */ var38 = ptr8[i]; /* 2: avgub */ - var47.x2[0] = ((orc_uint8) var37.x2[0] + (orc_uint8) var38.x2[0] + 1) >> 1; - var47.x2[1] = ((orc_uint8) var37.x2[1] + (orc_uint8) var38.x2[1] + 1) >> 1; + var46.x2[0] = ((orc_uint8) var37.x2[0] + (orc_uint8) var38.x2[0] + 1) >> 1; + var46.x2[1] = ((orc_uint8) var37.x2[1] + (orc_uint8) var38.x2[1] + 1) >> 1; /* 3: loadw */ var39 = ptr5[i]; /* 4: loadw */ var40 = ptr9[i]; /* 5: avgub */ - var48.x2[0] = ((orc_uint8) var39.x2[0] + (orc_uint8) var40.x2[0] + 1) >> 1; - var48.x2[1] = ((orc_uint8) var39.x2[1] + (orc_uint8) var40.x2[1] + 1) >> 1; + var47.x2[0] = ((orc_uint8) var39.x2[0] + (orc_uint8) var40.x2[0] + 1) >> 1; + var47.x2[1] = ((orc_uint8) var39.x2[1] + (orc_uint8) var40.x2[1] + 1) >> 1; /* 6: loadw */ var41 = ptr6[i]; /* 7: copyw */ - var49.i = var41.i; + var48.i = var41.i; /* 8: avgub */ - var50.x2[0] = ((orc_uint8) var48.x2[0] + (orc_uint8) var49.x2[0] + 1) >> 1; - var50.x2[1] = ((orc_uint8) var48.x2[1] + (orc_uint8) var49.x2[1] + 1) >> 1; + var49.x2[0] = ((orc_uint8) var47.x2[0] + (orc_uint8) var48.x2[0] + 1) >> 1; + var49.x2[1] = ((orc_uint8) var47.x2[1] + (orc_uint8) var48.x2[1] + 1) >> 1; /* 10: andw */ - var51.i = var50.i & var42.i; + var50.i = var49.i & var42.i; /* 12: andw */ - var52.i = var49.i & var43.i; + var51.i = var48.i & var43.i; /* 13: orw */ - var53.i = var52.i | var51.i; - /* 15: mergebw */ + var52.i = var51.i | var50.i; + /* 14: mergebw */ { orc_union16 _dest; - _dest.x2[0] = var44.x2[0]; - _dest.x2[1] = var47.x2[0]; - var54.x2[0] = _dest.i; + _dest.x2[0] = var43.x2[0]; + _dest.x2[1] = var46.x2[0]; + var53.x2[0] = _dest.i; } { orc_union16 _dest; - _dest.x2[0] = var44.x2[1]; - _dest.x2[1] = var47.x2[1]; - var54.x2[1] = _dest.i; + _dest.x2[0] = var43.x2[1]; + _dest.x2[1] = var46.x2[1]; + var53.x2[1] = _dest.i; } - /* 16: loadw */ - var45 = ptr7[i]; - /* 17: mergebw */ + /* 15: loadw */ + var44 = ptr7[i]; + /* 16: mergebw */ { orc_union16 _dest; - _dest.x2[0] = var53.x2[0]; - _dest.x2[1] = var45.x2[0]; - var55.x2[0] = _dest.i; + _dest.x2[0] = var52.x2[0]; + _dest.x2[1] = var44.x2[0]; + var54.x2[0] = _dest.i; } { orc_union16 _dest; - _dest.x2[0] = var53.x2[1]; - _dest.x2[1] = var45.x2[1]; - var55.x2[1] = _dest.i; + _dest.x2[0] = var52.x2[1]; + _dest.x2[1] = var44.x2[1]; + var54.x2[1] = _dest.i; } - /* 18: mergewl */ + /* 17: mergewl */ { orc_union32 _dest; - _dest.x2[0] = var54.x2[0]; - _dest.x2[1] = var55.x2[0]; - var46.x2[0] = _dest.i; + _dest.x2[0] = var53.x2[0]; + _dest.x2[1] = var54.x2[0]; + var45.x2[0] = _dest.i; } { orc_union32 _dest; - _dest.x2[0] = var54.x2[1]; - _dest.x2[1] = var55.x2[1]; - var46.x2[1] = _dest.i; + _dest.x2[0] = var53.x2[1]; + _dest.x2[1] = var54.x2[1]; + var45.x2[1] = _dest.i; } - /* 19: storeq */ - ptr0[i] = var46; + /* 18: storeq */ + ptr0[i] = var45; } } @@ -2041,7 +1977,7 @@ bayer_orc_merge_gr_abgr (guint8 * ORC_RESTRICT d1, 1, 9, 23, 98, 97, 121, 101, 114, 95, 111, 114, 99, 95, 109, 101, 114, 103, 101, 95, 103, 114, 95, 97, 98, 103, 114, 11, 8, 8, 12, 2, 2, 12, 2, 2, 12, 2, 2, 12, 2, 2, 12, 2, 2, 12, 2, 2, 14, - 4, 0, 255, 0, 0, 14, 4, 255, 0, 0, 0, 20, 4, 20, 4, 20, + 2, 0, 255, 0, 0, 14, 2, 255, 0, 0, 0, 20, 4, 20, 4, 20, 2, 20, 2, 20, 2, 21, 1, 39, 34, 4, 8, 21, 1, 39, 35, 5, 9, 79, 36, 6, 21, 1, 39, 35, 35, 36, 73, 35, 35, 16, 73, 36, 36, 17, 92, 35, 36, 35, 21, 1, 196, 32, 17, 34, 21, 1, 196, 33, @@ -2060,8 +1996,8 @@ bayer_orc_merge_gr_abgr (guint8 * ORC_RESTRICT d1, orc_program_add_source (p, 2, "s4"); orc_program_add_source (p, 2, "s5"); orc_program_add_source (p, 2, "s6"); - orc_program_add_constant (p, 4, 0x0000ff00, "c1"); - orc_program_add_constant (p, 4, 0x000000ff, "c2"); + orc_program_add_constant (p, 2, 0x0000ff00, "c1"); + orc_program_add_constant (p, 2, 0x000000ff, "c2"); orc_program_add_temporary (p, 4, "t1"); orc_program_add_temporary (p, 4, "t2"); orc_program_add_temporary (p, 2, "t3"); @@ -2147,21 +2083,16 @@ bayer_orc_merge_bg_rgba (guint8 * ORC_RESTRICT d1, orc_union16 var43; #endif orc_union16 var44; -#if defined(__APPLE__) && __GNUC__ == 4 && __GNUC_MINOR__ == 2 && defined (__i386__) - volatile orc_union16 var45; -#else - orc_union16 var45; -#endif - orc_union64 var46; + orc_union64 var45; + orc_union16 var46; orc_union16 var47; orc_union16 var48; orc_union16 var49; orc_union16 var50; orc_union16 var51; orc_union16 var52; - orc_union16 var53; + orc_union32 var53; orc_union32 var54; - orc_union32 var55; ptr0 = (orc_union64 *) d1; ptr4 = (orc_union16 *) s1; @@ -2175,9 +2106,6 @@ bayer_orc_merge_bg_rgba (guint8 * ORC_RESTRICT d1, var42.i = (int) 0x000000ff; /* 255 or 1.25987e-321f */ /* 11: loadpw */ var43.i = (int) 0x0000ff00; /* 65280 or 3.22526e-319f */ - /* 16: loadpb */ - var45.x2[0] = (int) 0x000000ff; /* 255 or 1.25987e-321f */ - var45.x2[1] = (int) 0x000000ff; /* 255 or 1.25987e-321f */ for (i = 0; i < n; i++) { /* 0: loadw */ @@ -2185,71 +2113,71 @@ bayer_orc_merge_bg_rgba (guint8 * ORC_RESTRICT d1, /* 1: loadw */ var38 = ptr9[i]; /* 2: avgub */ - var47.x2[0] = ((orc_uint8) var37.x2[0] + (orc_uint8) var38.x2[0] + 1) >> 1; - var47.x2[1] = ((orc_uint8) var37.x2[1] + (orc_uint8) var38.x2[1] + 1) >> 1; + var46.x2[0] = ((orc_uint8) var37.x2[0] + (orc_uint8) var38.x2[0] + 1) >> 1; + var46.x2[1] = ((orc_uint8) var37.x2[1] + (orc_uint8) var38.x2[1] + 1) >> 1; /* 3: loadw */ var39 = ptr4[i]; /* 4: loadw */ var40 = ptr8[i]; /* 5: avgub */ - var48.x2[0] = ((orc_uint8) var39.x2[0] + (orc_uint8) var40.x2[0] + 1) >> 1; - var48.x2[1] = ((orc_uint8) var39.x2[1] + (orc_uint8) var40.x2[1] + 1) >> 1; + var47.x2[0] = ((orc_uint8) var39.x2[0] + (orc_uint8) var40.x2[0] + 1) >> 1; + var47.x2[1] = ((orc_uint8) var39.x2[1] + (orc_uint8) var40.x2[1] + 1) >> 1; /* 6: loadw */ var41 = ptr7[i]; /* 7: copyw */ - var49.i = var41.i; + var48.i = var41.i; /* 8: avgub */ - var50.x2[0] = ((orc_uint8) var48.x2[0] + (orc_uint8) var49.x2[0] + 1) >> 1; - var50.x2[1] = ((orc_uint8) var48.x2[1] + (orc_uint8) var49.x2[1] + 1) >> 1; + var49.x2[0] = ((orc_uint8) var47.x2[0] + (orc_uint8) var48.x2[0] + 1) >> 1; + var49.x2[1] = ((orc_uint8) var47.x2[1] + (orc_uint8) var48.x2[1] + 1) >> 1; /* 10: andw */ - var51.i = var50.i & var42.i; + var50.i = var49.i & var42.i; /* 12: andw */ - var52.i = var49.i & var43.i; + var51.i = var48.i & var43.i; /* 13: orw */ - var53.i = var52.i | var51.i; + var52.i = var51.i | var50.i; /* 14: mergebw */ { orc_union16 _dest; - _dest.x2[0] = var47.x2[0]; - _dest.x2[1] = var53.x2[0]; - var54.x2[0] = _dest.i; + _dest.x2[0] = var46.x2[0]; + _dest.x2[1] = var52.x2[0]; + var53.x2[0] = _dest.i; } { orc_union16 _dest; - _dest.x2[0] = var47.x2[1]; - _dest.x2[1] = var53.x2[1]; - var54.x2[1] = _dest.i; + _dest.x2[0] = var46.x2[1]; + _dest.x2[1] = var52.x2[1]; + var53.x2[1] = _dest.i; } /* 15: loadw */ var44 = ptr6[i]; - /* 17: mergebw */ + /* 16: mergebw */ { orc_union16 _dest; _dest.x2[0] = var44.x2[0]; - _dest.x2[1] = var45.x2[0]; - var55.x2[0] = _dest.i; + _dest.x2[1] = var42.x2[0]; + var54.x2[0] = _dest.i; } { orc_union16 _dest; _dest.x2[0] = var44.x2[1]; - _dest.x2[1] = var45.x2[1]; - var55.x2[1] = _dest.i; + _dest.x2[1] = var42.x2[1]; + var54.x2[1] = _dest.i; } - /* 18: mergewl */ + /* 17: mergewl */ { orc_union32 _dest; - _dest.x2[0] = var54.x2[0]; - _dest.x2[1] = var55.x2[0]; - var46.x2[0] = _dest.i; + _dest.x2[0] = var53.x2[0]; + _dest.x2[1] = var54.x2[0]; + var45.x2[0] = _dest.i; } { orc_union32 _dest; - _dest.x2[0] = var54.x2[1]; - _dest.x2[1] = var55.x2[1]; - var46.x2[1] = _dest.i; + _dest.x2[0] = var53.x2[1]; + _dest.x2[1] = var54.x2[1]; + var45.x2[1] = _dest.i; } - /* 19: storeq */ - ptr0[i] = var46; + /* 18: storeq */ + ptr0[i] = var45; } } @@ -2283,21 +2211,16 @@ _backup_bayer_orc_merge_bg_rgba (OrcExecutor * ORC_RESTRICT ex) orc_union16 var43; #endif orc_union16 var44; -#if defined(__APPLE__) && __GNUC__ == 4 && __GNUC_MINOR__ == 2 && defined (__i386__) - volatile orc_union16 var45; -#else - orc_union16 var45; -#endif - orc_union64 var46; + orc_union64 var45; + orc_union16 var46; orc_union16 var47; orc_union16 var48; orc_union16 var49; orc_union16 var50; orc_union16 var51; orc_union16 var52; - orc_union16 var53; + orc_union32 var53; orc_union32 var54; - orc_union32 var55; ptr0 = (orc_union64 *) ex->arrays[0]; ptr4 = (orc_union16 *) ex->arrays[4]; @@ -2311,9 +2234,6 @@ _backup_bayer_orc_merge_bg_rgba (OrcExecutor * ORC_RESTRICT ex) var42.i = (int) 0x000000ff; /* 255 or 1.25987e-321f */ /* 11: loadpw */ var43.i = (int) 0x0000ff00; /* 65280 or 3.22526e-319f */ - /* 16: loadpb */ - var45.x2[0] = (int) 0x000000ff; /* 255 or 1.25987e-321f */ - var45.x2[1] = (int) 0x000000ff; /* 255 or 1.25987e-321f */ for (i = 0; i < n; i++) { /* 0: loadw */ @@ -2321,71 +2241,71 @@ _backup_bayer_orc_merge_bg_rgba (OrcExecutor * ORC_RESTRICT ex) /* 1: loadw */ var38 = ptr9[i]; /* 2: avgub */ - var47.x2[0] = ((orc_uint8) var37.x2[0] + (orc_uint8) var38.x2[0] + 1) >> 1; - var47.x2[1] = ((orc_uint8) var37.x2[1] + (orc_uint8) var38.x2[1] + 1) >> 1; + var46.x2[0] = ((orc_uint8) var37.x2[0] + (orc_uint8) var38.x2[0] + 1) >> 1; + var46.x2[1] = ((orc_uint8) var37.x2[1] + (orc_uint8) var38.x2[1] + 1) >> 1; /* 3: loadw */ var39 = ptr4[i]; /* 4: loadw */ var40 = ptr8[i]; /* 5: avgub */ - var48.x2[0] = ((orc_uint8) var39.x2[0] + (orc_uint8) var40.x2[0] + 1) >> 1; - var48.x2[1] = ((orc_uint8) var39.x2[1] + (orc_uint8) var40.x2[1] + 1) >> 1; + var47.x2[0] = ((orc_uint8) var39.x2[0] + (orc_uint8) var40.x2[0] + 1) >> 1; + var47.x2[1] = ((orc_uint8) var39.x2[1] + (orc_uint8) var40.x2[1] + 1) >> 1; /* 6: loadw */ var41 = ptr7[i]; /* 7: copyw */ - var49.i = var41.i; + var48.i = var41.i; /* 8: avgub */ - var50.x2[0] = ((orc_uint8) var48.x2[0] + (orc_uint8) var49.x2[0] + 1) >> 1; - var50.x2[1] = ((orc_uint8) var48.x2[1] + (orc_uint8) var49.x2[1] + 1) >> 1; + var49.x2[0] = ((orc_uint8) var47.x2[0] + (orc_uint8) var48.x2[0] + 1) >> 1; + var49.x2[1] = ((orc_uint8) var47.x2[1] + (orc_uint8) var48.x2[1] + 1) >> 1; /* 10: andw */ - var51.i = var50.i & var42.i; + var50.i = var49.i & var42.i; /* 12: andw */ - var52.i = var49.i & var43.i; + var51.i = var48.i & var43.i; /* 13: orw */ - var53.i = var52.i | var51.i; + var52.i = var51.i | var50.i; /* 14: mergebw */ { orc_union16 _dest; - _dest.x2[0] = var47.x2[0]; - _dest.x2[1] = var53.x2[0]; - var54.x2[0] = _dest.i; + _dest.x2[0] = var46.x2[0]; + _dest.x2[1] = var52.x2[0]; + var53.x2[0] = _dest.i; } { orc_union16 _dest; - _dest.x2[0] = var47.x2[1]; - _dest.x2[1] = var53.x2[1]; - var54.x2[1] = _dest.i; + _dest.x2[0] = var46.x2[1]; + _dest.x2[1] = var52.x2[1]; + var53.x2[1] = _dest.i; } /* 15: loadw */ var44 = ptr6[i]; - /* 17: mergebw */ + /* 16: mergebw */ { orc_union16 _dest; _dest.x2[0] = var44.x2[0]; - _dest.x2[1] = var45.x2[0]; - var55.x2[0] = _dest.i; + _dest.x2[1] = var42.x2[0]; + var54.x2[0] = _dest.i; } { orc_union16 _dest; _dest.x2[0] = var44.x2[1]; - _dest.x2[1] = var45.x2[1]; - var55.x2[1] = _dest.i; + _dest.x2[1] = var42.x2[1]; + var54.x2[1] = _dest.i; } - /* 18: mergewl */ + /* 17: mergewl */ { orc_union32 _dest; - _dest.x2[0] = var54.x2[0]; - _dest.x2[1] = var55.x2[0]; - var46.x2[0] = _dest.i; + _dest.x2[0] = var53.x2[0]; + _dest.x2[1] = var54.x2[0]; + var45.x2[0] = _dest.i; } { orc_union32 _dest; - _dest.x2[0] = var54.x2[1]; - _dest.x2[1] = var55.x2[1]; - var46.x2[1] = _dest.i; + _dest.x2[0] = var53.x2[1]; + _dest.x2[1] = var54.x2[1]; + var45.x2[1] = _dest.i; } - /* 19: storeq */ - ptr0[i] = var46; + /* 18: storeq */ + ptr0[i] = var45; } } @@ -2411,7 +2331,7 @@ bayer_orc_merge_bg_rgba (guint8 * ORC_RESTRICT d1, 1, 9, 23, 98, 97, 121, 101, 114, 95, 111, 114, 99, 95, 109, 101, 114, 103, 101, 95, 98, 103, 95, 114, 103, 98, 97, 11, 8, 8, 12, 2, 2, 12, 2, 2, 12, 2, 2, 12, 2, 2, 12, 2, 2, 12, 2, 2, 14, - 4, 255, 0, 0, 0, 14, 4, 0, 255, 0, 0, 20, 4, 20, 4, 20, + 2, 255, 0, 0, 0, 14, 2, 0, 255, 0, 0, 20, 4, 20, 4, 20, 2, 20, 2, 20, 2, 21, 1, 39, 34, 5, 9, 21, 1, 39, 35, 4, 8, 79, 36, 7, 21, 1, 39, 35, 35, 36, 73, 35, 35, 16, 73, 36, 36, 17, 92, 35, 36, 35, 21, 1, 196, 32, 34, 35, 21, 1, 196, 33, @@ -2430,8 +2350,8 @@ bayer_orc_merge_bg_rgba (guint8 * ORC_RESTRICT d1, orc_program_add_source (p, 2, "s4"); orc_program_add_source (p, 2, "s5"); orc_program_add_source (p, 2, "s6"); - orc_program_add_constant (p, 4, 0x000000ff, "c1"); - orc_program_add_constant (p, 4, 0x0000ff00, "c2"); + orc_program_add_constant (p, 2, 0x000000ff, "c1"); + orc_program_add_constant (p, 2, 0x0000ff00, "c2"); orc_program_add_temporary (p, 4, "t1"); orc_program_add_temporary (p, 4, "t2"); orc_program_add_temporary (p, 2, "t3"); @@ -2517,21 +2437,16 @@ bayer_orc_merge_gr_rgba (guint8 * ORC_RESTRICT d1, orc_union16 var43; #endif orc_union16 var44; -#if defined(__APPLE__) && __GNUC__ == 4 && __GNUC_MINOR__ == 2 && defined (__i386__) - volatile orc_union16 var45; -#else - orc_union16 var45; -#endif - orc_union64 var46; + orc_union64 var45; + orc_union16 var46; orc_union16 var47; orc_union16 var48; orc_union16 var49; orc_union16 var50; orc_union16 var51; orc_union16 var52; - orc_union16 var53; + orc_union32 var53; orc_union32 var54; - orc_union32 var55; ptr0 = (orc_union64 *) d1; ptr4 = (orc_union16 *) s1; @@ -2545,9 +2460,6 @@ bayer_orc_merge_gr_rgba (guint8 * ORC_RESTRICT d1, var42.i = (int) 0x0000ff00; /* 65280 or 3.22526e-319f */ /* 11: loadpw */ var43.i = (int) 0x000000ff; /* 255 or 1.25987e-321f */ - /* 16: loadpb */ - var45.x2[0] = (int) 0x000000ff; /* 255 or 1.25987e-321f */ - var45.x2[1] = (int) 0x000000ff; /* 255 or 1.25987e-321f */ for (i = 0; i < n; i++) { /* 0: loadw */ @@ -2555,71 +2467,71 @@ bayer_orc_merge_gr_rgba (guint8 * ORC_RESTRICT d1, /* 1: loadw */ var38 = ptr8[i]; /* 2: avgub */ - var47.x2[0] = ((orc_uint8) var37.x2[0] + (orc_uint8) var38.x2[0] + 1) >> 1; - var47.x2[1] = ((orc_uint8) var37.x2[1] + (orc_uint8) var38.x2[1] + 1) >> 1; + var46.x2[0] = ((orc_uint8) var37.x2[0] + (orc_uint8) var38.x2[0] + 1) >> 1; + var46.x2[1] = ((orc_uint8) var37.x2[1] + (orc_uint8) var38.x2[1] + 1) >> 1; /* 3: loadw */ var39 = ptr5[i]; /* 4: loadw */ var40 = ptr9[i]; /* 5: avgub */ - var48.x2[0] = ((orc_uint8) var39.x2[0] + (orc_uint8) var40.x2[0] + 1) >> 1; - var48.x2[1] = ((orc_uint8) var39.x2[1] + (orc_uint8) var40.x2[1] + 1) >> 1; + var47.x2[0] = ((orc_uint8) var39.x2[0] + (orc_uint8) var40.x2[0] + 1) >> 1; + var47.x2[1] = ((orc_uint8) var39.x2[1] + (orc_uint8) var40.x2[1] + 1) >> 1; /* 6: loadw */ var41 = ptr6[i]; /* 7: copyw */ - var49.i = var41.i; + var48.i = var41.i; /* 8: avgub */ - var50.x2[0] = ((orc_uint8) var48.x2[0] + (orc_uint8) var49.x2[0] + 1) >> 1; - var50.x2[1] = ((orc_uint8) var48.x2[1] + (orc_uint8) var49.x2[1] + 1) >> 1; + var49.x2[0] = ((orc_uint8) var47.x2[0] + (orc_uint8) var48.x2[0] + 1) >> 1; + var49.x2[1] = ((orc_uint8) var47.x2[1] + (orc_uint8) var48.x2[1] + 1) >> 1; /* 10: andw */ - var51.i = var50.i & var42.i; + var50.i = var49.i & var42.i; /* 12: andw */ - var52.i = var49.i & var43.i; + var51.i = var48.i & var43.i; /* 13: orw */ - var53.i = var52.i | var51.i; + var52.i = var51.i | var50.i; /* 14: loadw */ var44 = ptr7[i]; /* 15: mergebw */ { orc_union16 _dest; _dest.x2[0] = var44.x2[0]; - _dest.x2[1] = var53.x2[0]; - var54.x2[0] = _dest.i; + _dest.x2[1] = var52.x2[0]; + var53.x2[0] = _dest.i; } { orc_union16 _dest; _dest.x2[0] = var44.x2[1]; - _dest.x2[1] = var53.x2[1]; - var54.x2[1] = _dest.i; + _dest.x2[1] = var52.x2[1]; + var53.x2[1] = _dest.i; } - /* 17: mergebw */ + /* 16: mergebw */ { orc_union16 _dest; - _dest.x2[0] = var47.x2[0]; - _dest.x2[1] = var45.x2[0]; - var55.x2[0] = _dest.i; + _dest.x2[0] = var46.x2[0]; + _dest.x2[1] = var43.x2[0]; + var54.x2[0] = _dest.i; } { orc_union16 _dest; - _dest.x2[0] = var47.x2[1]; - _dest.x2[1] = var45.x2[1]; - var55.x2[1] = _dest.i; + _dest.x2[0] = var46.x2[1]; + _dest.x2[1] = var43.x2[1]; + var54.x2[1] = _dest.i; } - /* 18: mergewl */ + /* 17: mergewl */ { orc_union32 _dest; - _dest.x2[0] = var54.x2[0]; - _dest.x2[1] = var55.x2[0]; - var46.x2[0] = _dest.i; + _dest.x2[0] = var53.x2[0]; + _dest.x2[1] = var54.x2[0]; + var45.x2[0] = _dest.i; } { orc_union32 _dest; - _dest.x2[0] = var54.x2[1]; - _dest.x2[1] = var55.x2[1]; - var46.x2[1] = _dest.i; + _dest.x2[0] = var53.x2[1]; + _dest.x2[1] = var54.x2[1]; + var45.x2[1] = _dest.i; } - /* 19: storeq */ - ptr0[i] = var46; + /* 18: storeq */ + ptr0[i] = var45; } } @@ -2653,21 +2565,16 @@ _backup_bayer_orc_merge_gr_rgba (OrcExecutor * ORC_RESTRICT ex) orc_union16 var43; #endif orc_union16 var44; -#if defined(__APPLE__) && __GNUC__ == 4 && __GNUC_MINOR__ == 2 && defined (__i386__) - volatile orc_union16 var45; -#else - orc_union16 var45; -#endif - orc_union64 var46; + orc_union64 var45; + orc_union16 var46; orc_union16 var47; orc_union16 var48; orc_union16 var49; orc_union16 var50; orc_union16 var51; orc_union16 var52; - orc_union16 var53; + orc_union32 var53; orc_union32 var54; - orc_union32 var55; ptr0 = (orc_union64 *) ex->arrays[0]; ptr4 = (orc_union16 *) ex->arrays[4]; @@ -2681,9 +2588,6 @@ _backup_bayer_orc_merge_gr_rgba (OrcExecutor * ORC_RESTRICT ex) var42.i = (int) 0x0000ff00; /* 65280 or 3.22526e-319f */ /* 11: loadpw */ var43.i = (int) 0x000000ff; /* 255 or 1.25987e-321f */ - /* 16: loadpb */ - var45.x2[0] = (int) 0x000000ff; /* 255 or 1.25987e-321f */ - var45.x2[1] = (int) 0x000000ff; /* 255 or 1.25987e-321f */ for (i = 0; i < n; i++) { /* 0: loadw */ @@ -2691,71 +2595,71 @@ _backup_bayer_orc_merge_gr_rgba (OrcExecutor * ORC_RESTRICT ex) /* 1: loadw */ var38 = ptr8[i]; /* 2: avgub */ - var47.x2[0] = ((orc_uint8) var37.x2[0] + (orc_uint8) var38.x2[0] + 1) >> 1; - var47.x2[1] = ((orc_uint8) var37.x2[1] + (orc_uint8) var38.x2[1] + 1) >> 1; + var46.x2[0] = ((orc_uint8) var37.x2[0] + (orc_uint8) var38.x2[0] + 1) >> 1; + var46.x2[1] = ((orc_uint8) var37.x2[1] + (orc_uint8) var38.x2[1] + 1) >> 1; /* 3: loadw */ var39 = ptr5[i]; /* 4: loadw */ var40 = ptr9[i]; /* 5: avgub */ - var48.x2[0] = ((orc_uint8) var39.x2[0] + (orc_uint8) var40.x2[0] + 1) >> 1; - var48.x2[1] = ((orc_uint8) var39.x2[1] + (orc_uint8) var40.x2[1] + 1) >> 1; + var47.x2[0] = ((orc_uint8) var39.x2[0] + (orc_uint8) var40.x2[0] + 1) >> 1; + var47.x2[1] = ((orc_uint8) var39.x2[1] + (orc_uint8) var40.x2[1] + 1) >> 1; /* 6: loadw */ var41 = ptr6[i]; /* 7: copyw */ - var49.i = var41.i; + var48.i = var41.i; /* 8: avgub */ - var50.x2[0] = ((orc_uint8) var48.x2[0] + (orc_uint8) var49.x2[0] + 1) >> 1; - var50.x2[1] = ((orc_uint8) var48.x2[1] + (orc_uint8) var49.x2[1] + 1) >> 1; + var49.x2[0] = ((orc_uint8) var47.x2[0] + (orc_uint8) var48.x2[0] + 1) >> 1; + var49.x2[1] = ((orc_uint8) var47.x2[1] + (orc_uint8) var48.x2[1] + 1) >> 1; /* 10: andw */ - var51.i = var50.i & var42.i; + var50.i = var49.i & var42.i; /* 12: andw */ - var52.i = var49.i & var43.i; + var51.i = var48.i & var43.i; /* 13: orw */ - var53.i = var52.i | var51.i; + var52.i = var51.i | var50.i; /* 14: loadw */ var44 = ptr7[i]; /* 15: mergebw */ { orc_union16 _dest; _dest.x2[0] = var44.x2[0]; - _dest.x2[1] = var53.x2[0]; - var54.x2[0] = _dest.i; + _dest.x2[1] = var52.x2[0]; + var53.x2[0] = _dest.i; } { orc_union16 _dest; _dest.x2[0] = var44.x2[1]; - _dest.x2[1] = var53.x2[1]; - var54.x2[1] = _dest.i; + _dest.x2[1] = var52.x2[1]; + var53.x2[1] = _dest.i; } - /* 17: mergebw */ + /* 16: mergebw */ { orc_union16 _dest; - _dest.x2[0] = var47.x2[0]; - _dest.x2[1] = var45.x2[0]; - var55.x2[0] = _dest.i; + _dest.x2[0] = var46.x2[0]; + _dest.x2[1] = var43.x2[0]; + var54.x2[0] = _dest.i; } { orc_union16 _dest; - _dest.x2[0] = var47.x2[1]; - _dest.x2[1] = var45.x2[1]; - var55.x2[1] = _dest.i; + _dest.x2[0] = var46.x2[1]; + _dest.x2[1] = var43.x2[1]; + var54.x2[1] = _dest.i; } - /* 18: mergewl */ + /* 17: mergewl */ { orc_union32 _dest; - _dest.x2[0] = var54.x2[0]; - _dest.x2[1] = var55.x2[0]; - var46.x2[0] = _dest.i; + _dest.x2[0] = var53.x2[0]; + _dest.x2[1] = var54.x2[0]; + var45.x2[0] = _dest.i; } { orc_union32 _dest; - _dest.x2[0] = var54.x2[1]; - _dest.x2[1] = var55.x2[1]; - var46.x2[1] = _dest.i; + _dest.x2[0] = var53.x2[1]; + _dest.x2[1] = var54.x2[1]; + var45.x2[1] = _dest.i; } - /* 19: storeq */ - ptr0[i] = var46; + /* 18: storeq */ + ptr0[i] = var45; } } @@ -2781,7 +2685,7 @@ bayer_orc_merge_gr_rgba (guint8 * ORC_RESTRICT d1, 1, 9, 23, 98, 97, 121, 101, 114, 95, 111, 114, 99, 95, 109, 101, 114, 103, 101, 95, 103, 114, 95, 114, 103, 98, 97, 11, 8, 8, 12, 2, 2, 12, 2, 2, 12, 2, 2, 12, 2, 2, 12, 2, 2, 12, 2, 2, 14, - 4, 0, 255, 0, 0, 14, 4, 255, 0, 0, 0, 20, 4, 20, 4, 20, + 2, 0, 255, 0, 0, 14, 2, 255, 0, 0, 0, 20, 4, 20, 4, 20, 2, 20, 2, 20, 2, 21, 1, 39, 34, 4, 8, 21, 1, 39, 35, 5, 9, 79, 36, 6, 21, 1, 39, 35, 35, 36, 73, 35, 35, 16, 73, 36, 36, 17, 92, 35, 36, 35, 21, 1, 196, 32, 7, 35, 21, 1, 196, 33, @@ -2800,8 +2704,8 @@ bayer_orc_merge_gr_rgba (guint8 * ORC_RESTRICT d1, orc_program_add_source (p, 2, "s4"); orc_program_add_source (p, 2, "s5"); orc_program_add_source (p, 2, "s6"); - orc_program_add_constant (p, 4, 0x0000ff00, "c1"); - orc_program_add_constant (p, 4, 0x000000ff, "c2"); + orc_program_add_constant (p, 2, 0x0000ff00, "c1"); + orc_program_add_constant (p, 2, 0x000000ff, "c2"); orc_program_add_temporary (p, 4, "t1"); orc_program_add_temporary (p, 4, "t2"); orc_program_add_temporary (p, 2, "t3"); @@ -2886,22 +2790,17 @@ bayer_orc_merge_bg_argb (guint8 * ORC_RESTRICT d1, #else orc_union16 var43; #endif -#if defined(__APPLE__) && __GNUC__ == 4 && __GNUC_MINOR__ == 2 && defined (__i386__) - volatile orc_union16 var44; -#else orc_union16 var44; -#endif - orc_union16 var45; - orc_union64 var46; + orc_union64 var45; + orc_union16 var46; orc_union16 var47; orc_union16 var48; orc_union16 var49; orc_union16 var50; orc_union16 var51; orc_union16 var52; - orc_union16 var53; + orc_union32 var53; orc_union32 var54; - orc_union32 var55; ptr0 = (orc_union64 *) d1; ptr4 = (orc_union16 *) s1; @@ -2915,9 +2814,6 @@ bayer_orc_merge_bg_argb (guint8 * ORC_RESTRICT d1, var42.i = (int) 0x000000ff; /* 255 or 1.25987e-321f */ /* 11: loadpw */ var43.i = (int) 0x0000ff00; /* 65280 or 3.22526e-319f */ - /* 14: loadpb */ - var44.x2[0] = (int) 0x000000ff; /* 255 or 1.25987e-321f */ - var44.x2[1] = (int) 0x000000ff; /* 255 or 1.25987e-321f */ for (i = 0; i < n; i++) { /* 0: loadw */ @@ -2925,71 +2821,71 @@ bayer_orc_merge_bg_argb (guint8 * ORC_RESTRICT d1, /* 1: loadw */ var38 = ptr9[i]; /* 2: avgub */ - var47.x2[0] = ((orc_uint8) var37.x2[0] + (orc_uint8) var38.x2[0] + 1) >> 1; - var47.x2[1] = ((orc_uint8) var37.x2[1] + (orc_uint8) var38.x2[1] + 1) >> 1; + var46.x2[0] = ((orc_uint8) var37.x2[0] + (orc_uint8) var38.x2[0] + 1) >> 1; + var46.x2[1] = ((orc_uint8) var37.x2[1] + (orc_uint8) var38.x2[1] + 1) >> 1; /* 3: loadw */ var39 = ptr4[i]; /* 4: loadw */ var40 = ptr8[i]; /* 5: avgub */ - var48.x2[0] = ((orc_uint8) var39.x2[0] + (orc_uint8) var40.x2[0] + 1) >> 1; - var48.x2[1] = ((orc_uint8) var39.x2[1] + (orc_uint8) var40.x2[1] + 1) >> 1; + var47.x2[0] = ((orc_uint8) var39.x2[0] + (orc_uint8) var40.x2[0] + 1) >> 1; + var47.x2[1] = ((orc_uint8) var39.x2[1] + (orc_uint8) var40.x2[1] + 1) >> 1; /* 6: loadw */ var41 = ptr7[i]; /* 7: copyw */ - var49.i = var41.i; + var48.i = var41.i; /* 8: avgub */ - var50.x2[0] = ((orc_uint8) var48.x2[0] + (orc_uint8) var49.x2[0] + 1) >> 1; - var50.x2[1] = ((orc_uint8) var48.x2[1] + (orc_uint8) var49.x2[1] + 1) >> 1; + var49.x2[0] = ((orc_uint8) var47.x2[0] + (orc_uint8) var48.x2[0] + 1) >> 1; + var49.x2[1] = ((orc_uint8) var47.x2[1] + (orc_uint8) var48.x2[1] + 1) >> 1; /* 10: andw */ - var51.i = var50.i & var42.i; + var50.i = var49.i & var42.i; /* 12: andw */ - var52.i = var49.i & var43.i; + var51.i = var48.i & var43.i; /* 13: orw */ - var53.i = var52.i | var51.i; - /* 15: mergebw */ + var52.i = var51.i | var50.i; + /* 14: mergebw */ { orc_union16 _dest; - _dest.x2[0] = var44.x2[0]; - _dest.x2[1] = var47.x2[0]; - var54.x2[0] = _dest.i; + _dest.x2[0] = var42.x2[0]; + _dest.x2[1] = var46.x2[0]; + var53.x2[0] = _dest.i; } { orc_union16 _dest; - _dest.x2[0] = var44.x2[1]; - _dest.x2[1] = var47.x2[1]; - var54.x2[1] = _dest.i; + _dest.x2[0] = var42.x2[1]; + _dest.x2[1] = var46.x2[1]; + var53.x2[1] = _dest.i; } - /* 16: loadw */ - var45 = ptr6[i]; - /* 17: mergebw */ + /* 15: loadw */ + var44 = ptr6[i]; + /* 16: mergebw */ { orc_union16 _dest; - _dest.x2[0] = var53.x2[0]; - _dest.x2[1] = var45.x2[0]; - var55.x2[0] = _dest.i; + _dest.x2[0] = var52.x2[0]; + _dest.x2[1] = var44.x2[0]; + var54.x2[0] = _dest.i; } { orc_union16 _dest; - _dest.x2[0] = var53.x2[1]; - _dest.x2[1] = var45.x2[1]; - var55.x2[1] = _dest.i; + _dest.x2[0] = var52.x2[1]; + _dest.x2[1] = var44.x2[1]; + var54.x2[1] = _dest.i; } - /* 18: mergewl */ + /* 17: mergewl */ { orc_union32 _dest; - _dest.x2[0] = var54.x2[0]; - _dest.x2[1] = var55.x2[0]; - var46.x2[0] = _dest.i; + _dest.x2[0] = var53.x2[0]; + _dest.x2[1] = var54.x2[0]; + var45.x2[0] = _dest.i; } { orc_union32 _dest; - _dest.x2[0] = var54.x2[1]; - _dest.x2[1] = var55.x2[1]; - var46.x2[1] = _dest.i; + _dest.x2[0] = var53.x2[1]; + _dest.x2[1] = var54.x2[1]; + var45.x2[1] = _dest.i; } - /* 19: storeq */ - ptr0[i] = var46; + /* 18: storeq */ + ptr0[i] = var45; } } @@ -3022,22 +2918,17 @@ _backup_bayer_orc_merge_bg_argb (OrcExecutor * ORC_RESTRICT ex) #else orc_union16 var43; #endif -#if defined(__APPLE__) && __GNUC__ == 4 && __GNUC_MINOR__ == 2 && defined (__i386__) - volatile orc_union16 var44; -#else orc_union16 var44; -#endif - orc_union16 var45; - orc_union64 var46; + orc_union64 var45; + orc_union16 var46; orc_union16 var47; orc_union16 var48; orc_union16 var49; orc_union16 var50; orc_union16 var51; orc_union16 var52; - orc_union16 var53; + orc_union32 var53; orc_union32 var54; - orc_union32 var55; ptr0 = (orc_union64 *) ex->arrays[0]; ptr4 = (orc_union16 *) ex->arrays[4]; @@ -3051,9 +2942,6 @@ _backup_bayer_orc_merge_bg_argb (OrcExecutor * ORC_RESTRICT ex) var42.i = (int) 0x000000ff; /* 255 or 1.25987e-321f */ /* 11: loadpw */ var43.i = (int) 0x0000ff00; /* 65280 or 3.22526e-319f */ - /* 14: loadpb */ - var44.x2[0] = (int) 0x000000ff; /* 255 or 1.25987e-321f */ - var44.x2[1] = (int) 0x000000ff; /* 255 or 1.25987e-321f */ for (i = 0; i < n; i++) { /* 0: loadw */ @@ -3061,71 +2949,71 @@ _backup_bayer_orc_merge_bg_argb (OrcExecutor * ORC_RESTRICT ex) /* 1: loadw */ var38 = ptr9[i]; /* 2: avgub */ - var47.x2[0] = ((orc_uint8) var37.x2[0] + (orc_uint8) var38.x2[0] + 1) >> 1; - var47.x2[1] = ((orc_uint8) var37.x2[1] + (orc_uint8) var38.x2[1] + 1) >> 1; + var46.x2[0] = ((orc_uint8) var37.x2[0] + (orc_uint8) var38.x2[0] + 1) >> 1; + var46.x2[1] = ((orc_uint8) var37.x2[1] + (orc_uint8) var38.x2[1] + 1) >> 1; /* 3: loadw */ var39 = ptr4[i]; /* 4: loadw */ var40 = ptr8[i]; /* 5: avgub */ - var48.x2[0] = ((orc_uint8) var39.x2[0] + (orc_uint8) var40.x2[0] + 1) >> 1; - var48.x2[1] = ((orc_uint8) var39.x2[1] + (orc_uint8) var40.x2[1] + 1) >> 1; + var47.x2[0] = ((orc_uint8) var39.x2[0] + (orc_uint8) var40.x2[0] + 1) >> 1; + var47.x2[1] = ((orc_uint8) var39.x2[1] + (orc_uint8) var40.x2[1] + 1) >> 1; /* 6: loadw */ var41 = ptr7[i]; /* 7: copyw */ - var49.i = var41.i; + var48.i = var41.i; /* 8: avgub */ - var50.x2[0] = ((orc_uint8) var48.x2[0] + (orc_uint8) var49.x2[0] + 1) >> 1; - var50.x2[1] = ((orc_uint8) var48.x2[1] + (orc_uint8) var49.x2[1] + 1) >> 1; + var49.x2[0] = ((orc_uint8) var47.x2[0] + (orc_uint8) var48.x2[0] + 1) >> 1; + var49.x2[1] = ((orc_uint8) var47.x2[1] + (orc_uint8) var48.x2[1] + 1) >> 1; /* 10: andw */ - var51.i = var50.i & var42.i; + var50.i = var49.i & var42.i; /* 12: andw */ - var52.i = var49.i & var43.i; + var51.i = var48.i & var43.i; /* 13: orw */ - var53.i = var52.i | var51.i; - /* 15: mergebw */ + var52.i = var51.i | var50.i; + /* 14: mergebw */ { orc_union16 _dest; - _dest.x2[0] = var44.x2[0]; - _dest.x2[1] = var47.x2[0]; - var54.x2[0] = _dest.i; + _dest.x2[0] = var42.x2[0]; + _dest.x2[1] = var46.x2[0]; + var53.x2[0] = _dest.i; } { orc_union16 _dest; - _dest.x2[0] = var44.x2[1]; - _dest.x2[1] = var47.x2[1]; - var54.x2[1] = _dest.i; + _dest.x2[0] = var42.x2[1]; + _dest.x2[1] = var46.x2[1]; + var53.x2[1] = _dest.i; } - /* 16: loadw */ - var45 = ptr6[i]; - /* 17: mergebw */ + /* 15: loadw */ + var44 = ptr6[i]; + /* 16: mergebw */ { orc_union16 _dest; - _dest.x2[0] = var53.x2[0]; - _dest.x2[1] = var45.x2[0]; - var55.x2[0] = _dest.i; + _dest.x2[0] = var52.x2[0]; + _dest.x2[1] = var44.x2[0]; + var54.x2[0] = _dest.i; } { orc_union16 _dest; - _dest.x2[0] = var53.x2[1]; - _dest.x2[1] = var45.x2[1]; - var55.x2[1] = _dest.i; + _dest.x2[0] = var52.x2[1]; + _dest.x2[1] = var44.x2[1]; + var54.x2[1] = _dest.i; } - /* 18: mergewl */ + /* 17: mergewl */ { orc_union32 _dest; - _dest.x2[0] = var54.x2[0]; - _dest.x2[1] = var55.x2[0]; - var46.x2[0] = _dest.i; + _dest.x2[0] = var53.x2[0]; + _dest.x2[1] = var54.x2[0]; + var45.x2[0] = _dest.i; } { orc_union32 _dest; - _dest.x2[0] = var54.x2[1]; - _dest.x2[1] = var55.x2[1]; - var46.x2[1] = _dest.i; + _dest.x2[0] = var53.x2[1]; + _dest.x2[1] = var54.x2[1]; + var45.x2[1] = _dest.i; } - /* 19: storeq */ - ptr0[i] = var46; + /* 18: storeq */ + ptr0[i] = var45; } } @@ -3151,7 +3039,7 @@ bayer_orc_merge_bg_argb (guint8 * ORC_RESTRICT d1, 1, 9, 23, 98, 97, 121, 101, 114, 95, 111, 114, 99, 95, 109, 101, 114, 103, 101, 95, 98, 103, 95, 97, 114, 103, 98, 11, 8, 8, 12, 2, 2, 12, 2, 2, 12, 2, 2, 12, 2, 2, 12, 2, 2, 12, 2, 2, 14, - 4, 255, 0, 0, 0, 14, 4, 0, 255, 0, 0, 20, 4, 20, 4, 20, + 2, 255, 0, 0, 0, 14, 2, 0, 255, 0, 0, 20, 4, 20, 4, 20, 2, 20, 2, 20, 2, 21, 1, 39, 34, 5, 9, 21, 1, 39, 35, 4, 8, 79, 36, 7, 21, 1, 39, 35, 35, 36, 73, 35, 35, 16, 73, 36, 36, 17, 92, 35, 36, 35, 21, 1, 196, 32, 16, 34, 21, 1, 196, 33, @@ -3170,8 +3058,8 @@ bayer_orc_merge_bg_argb (guint8 * ORC_RESTRICT d1, orc_program_add_source (p, 2, "s4"); orc_program_add_source (p, 2, "s5"); orc_program_add_source (p, 2, "s6"); - orc_program_add_constant (p, 4, 0x000000ff, "c1"); - orc_program_add_constant (p, 4, 0x0000ff00, "c2"); + orc_program_add_constant (p, 2, 0x000000ff, "c1"); + orc_program_add_constant (p, 2, 0x0000ff00, "c2"); orc_program_add_temporary (p, 4, "t1"); orc_program_add_temporary (p, 4, "t2"); orc_program_add_temporary (p, 2, "t3"); @@ -3256,22 +3144,17 @@ bayer_orc_merge_gr_argb (guint8 * ORC_RESTRICT d1, #else orc_union16 var43; #endif -#if defined(__APPLE__) && __GNUC__ == 4 && __GNUC_MINOR__ == 2 && defined (__i386__) - volatile orc_union16 var44; -#else orc_union16 var44; -#endif - orc_union16 var45; - orc_union64 var46; + orc_union64 var45; + orc_union16 var46; orc_union16 var47; orc_union16 var48; orc_union16 var49; orc_union16 var50; orc_union16 var51; orc_union16 var52; - orc_union16 var53; + orc_union32 var53; orc_union32 var54; - orc_union32 var55; ptr0 = (orc_union64 *) d1; ptr4 = (orc_union16 *) s1; @@ -3285,9 +3168,6 @@ bayer_orc_merge_gr_argb (guint8 * ORC_RESTRICT d1, var42.i = (int) 0x0000ff00; /* 65280 or 3.22526e-319f */ /* 11: loadpw */ var43.i = (int) 0x000000ff; /* 255 or 1.25987e-321f */ - /* 14: loadpb */ - var44.x2[0] = (int) 0x000000ff; /* 255 or 1.25987e-321f */ - var44.x2[1] = (int) 0x000000ff; /* 255 or 1.25987e-321f */ for (i = 0; i < n; i++) { /* 0: loadw */ @@ -3295,71 +3175,71 @@ bayer_orc_merge_gr_argb (guint8 * ORC_RESTRICT d1, /* 1: loadw */ var38 = ptr8[i]; /* 2: avgub */ - var47.x2[0] = ((orc_uint8) var37.x2[0] + (orc_uint8) var38.x2[0] + 1) >> 1; - var47.x2[1] = ((orc_uint8) var37.x2[1] + (orc_uint8) var38.x2[1] + 1) >> 1; + var46.x2[0] = ((orc_uint8) var37.x2[0] + (orc_uint8) var38.x2[0] + 1) >> 1; + var46.x2[1] = ((orc_uint8) var37.x2[1] + (orc_uint8) var38.x2[1] + 1) >> 1; /* 3: loadw */ var39 = ptr5[i]; /* 4: loadw */ var40 = ptr9[i]; /* 5: avgub */ - var48.x2[0] = ((orc_uint8) var39.x2[0] + (orc_uint8) var40.x2[0] + 1) >> 1; - var48.x2[1] = ((orc_uint8) var39.x2[1] + (orc_uint8) var40.x2[1] + 1) >> 1; + var47.x2[0] = ((orc_uint8) var39.x2[0] + (orc_uint8) var40.x2[0] + 1) >> 1; + var47.x2[1] = ((orc_uint8) var39.x2[1] + (orc_uint8) var40.x2[1] + 1) >> 1; /* 6: loadw */ var41 = ptr6[i]; /* 7: copyw */ - var49.i = var41.i; + var48.i = var41.i; /* 8: avgub */ - var50.x2[0] = ((orc_uint8) var48.x2[0] + (orc_uint8) var49.x2[0] + 1) >> 1; - var50.x2[1] = ((orc_uint8) var48.x2[1] + (orc_uint8) var49.x2[1] + 1) >> 1; + var49.x2[0] = ((orc_uint8) var47.x2[0] + (orc_uint8) var48.x2[0] + 1) >> 1; + var49.x2[1] = ((orc_uint8) var47.x2[1] + (orc_uint8) var48.x2[1] + 1) >> 1; /* 10: andw */ - var51.i = var50.i & var42.i; + var50.i = var49.i & var42.i; /* 12: andw */ - var52.i = var49.i & var43.i; + var51.i = var48.i & var43.i; /* 13: orw */ - var53.i = var52.i | var51.i; - /* 15: loadw */ - var45 = ptr7[i]; - /* 16: mergebw */ + var52.i = var51.i | var50.i; + /* 14: loadw */ + var44 = ptr7[i]; + /* 15: mergebw */ { orc_union16 _dest; - _dest.x2[0] = var44.x2[0]; - _dest.x2[1] = var45.x2[0]; - var54.x2[0] = _dest.i; + _dest.x2[0] = var43.x2[0]; + _dest.x2[1] = var44.x2[0]; + var53.x2[0] = _dest.i; } { orc_union16 _dest; - _dest.x2[0] = var44.x2[1]; - _dest.x2[1] = var45.x2[1]; - var54.x2[1] = _dest.i; + _dest.x2[0] = var43.x2[1]; + _dest.x2[1] = var44.x2[1]; + var53.x2[1] = _dest.i; } - /* 17: mergebw */ + /* 16: mergebw */ { orc_union16 _dest; - _dest.x2[0] = var53.x2[0]; - _dest.x2[1] = var47.x2[0]; - var55.x2[0] = _dest.i; + _dest.x2[0] = var52.x2[0]; + _dest.x2[1] = var46.x2[0]; + var54.x2[0] = _dest.i; } { orc_union16 _dest; - _dest.x2[0] = var53.x2[1]; - _dest.x2[1] = var47.x2[1]; - var55.x2[1] = _dest.i; + _dest.x2[0] = var52.x2[1]; + _dest.x2[1] = var46.x2[1]; + var54.x2[1] = _dest.i; } - /* 18: mergewl */ + /* 17: mergewl */ { orc_union32 _dest; - _dest.x2[0] = var54.x2[0]; - _dest.x2[1] = var55.x2[0]; - var46.x2[0] = _dest.i; + _dest.x2[0] = var53.x2[0]; + _dest.x2[1] = var54.x2[0]; + var45.x2[0] = _dest.i; } { orc_union32 _dest; - _dest.x2[0] = var54.x2[1]; - _dest.x2[1] = var55.x2[1]; - var46.x2[1] = _dest.i; + _dest.x2[0] = var53.x2[1]; + _dest.x2[1] = var54.x2[1]; + var45.x2[1] = _dest.i; } - /* 19: storeq */ - ptr0[i] = var46; + /* 18: storeq */ + ptr0[i] = var45; } } @@ -3392,22 +3272,17 @@ _backup_bayer_orc_merge_gr_argb (OrcExecutor * ORC_RESTRICT ex) #else orc_union16 var43; #endif -#if defined(__APPLE__) && __GNUC__ == 4 && __GNUC_MINOR__ == 2 && defined (__i386__) - volatile orc_union16 var44; -#else orc_union16 var44; -#endif - orc_union16 var45; - orc_union64 var46; + orc_union64 var45; + orc_union16 var46; orc_union16 var47; orc_union16 var48; orc_union16 var49; orc_union16 var50; orc_union16 var51; orc_union16 var52; - orc_union16 var53; + orc_union32 var53; orc_union32 var54; - orc_union32 var55; ptr0 = (orc_union64 *) ex->arrays[0]; ptr4 = (orc_union16 *) ex->arrays[4]; @@ -3421,9 +3296,6 @@ _backup_bayer_orc_merge_gr_argb (OrcExecutor * ORC_RESTRICT ex) var42.i = (int) 0x0000ff00; /* 65280 or 3.22526e-319f */ /* 11: loadpw */ var43.i = (int) 0x000000ff; /* 255 or 1.25987e-321f */ - /* 14: loadpb */ - var44.x2[0] = (int) 0x000000ff; /* 255 or 1.25987e-321f */ - var44.x2[1] = (int) 0x000000ff; /* 255 or 1.25987e-321f */ for (i = 0; i < n; i++) { /* 0: loadw */ @@ -3431,71 +3303,71 @@ _backup_bayer_orc_merge_gr_argb (OrcExecutor * ORC_RESTRICT ex) /* 1: loadw */ var38 = ptr8[i]; /* 2: avgub */ - var47.x2[0] = ((orc_uint8) var37.x2[0] + (orc_uint8) var38.x2[0] + 1) >> 1; - var47.x2[1] = ((orc_uint8) var37.x2[1] + (orc_uint8) var38.x2[1] + 1) >> 1; + var46.x2[0] = ((orc_uint8) var37.x2[0] + (orc_uint8) var38.x2[0] + 1) >> 1; + var46.x2[1] = ((orc_uint8) var37.x2[1] + (orc_uint8) var38.x2[1] + 1) >> 1; /* 3: loadw */ var39 = ptr5[i]; /* 4: loadw */ var40 = ptr9[i]; /* 5: avgub */ - var48.x2[0] = ((orc_uint8) var39.x2[0] + (orc_uint8) var40.x2[0] + 1) >> 1; - var48.x2[1] = ((orc_uint8) var39.x2[1] + (orc_uint8) var40.x2[1] + 1) >> 1; + var47.x2[0] = ((orc_uint8) var39.x2[0] + (orc_uint8) var40.x2[0] + 1) >> 1; + var47.x2[1] = ((orc_uint8) var39.x2[1] + (orc_uint8) var40.x2[1] + 1) >> 1; /* 6: loadw */ var41 = ptr6[i]; /* 7: copyw */ - var49.i = var41.i; + var48.i = var41.i; /* 8: avgub */ - var50.x2[0] = ((orc_uint8) var48.x2[0] + (orc_uint8) var49.x2[0] + 1) >> 1; - var50.x2[1] = ((orc_uint8) var48.x2[1] + (orc_uint8) var49.x2[1] + 1) >> 1; + var49.x2[0] = ((orc_uint8) var47.x2[0] + (orc_uint8) var48.x2[0] + 1) >> 1; + var49.x2[1] = ((orc_uint8) var47.x2[1] + (orc_uint8) var48.x2[1] + 1) >> 1; /* 10: andw */ - var51.i = var50.i & var42.i; + var50.i = var49.i & var42.i; /* 12: andw */ - var52.i = var49.i & var43.i; + var51.i = var48.i & var43.i; /* 13: orw */ - var53.i = var52.i | var51.i; - /* 15: loadw */ - var45 = ptr7[i]; - /* 16: mergebw */ + var52.i = var51.i | var50.i; + /* 14: loadw */ + var44 = ptr7[i]; + /* 15: mergebw */ { orc_union16 _dest; - _dest.x2[0] = var44.x2[0]; - _dest.x2[1] = var45.x2[0]; - var54.x2[0] = _dest.i; + _dest.x2[0] = var43.x2[0]; + _dest.x2[1] = var44.x2[0]; + var53.x2[0] = _dest.i; } { orc_union16 _dest; - _dest.x2[0] = var44.x2[1]; - _dest.x2[1] = var45.x2[1]; - var54.x2[1] = _dest.i; + _dest.x2[0] = var43.x2[1]; + _dest.x2[1] = var44.x2[1]; + var53.x2[1] = _dest.i; } - /* 17: mergebw */ + /* 16: mergebw */ { orc_union16 _dest; - _dest.x2[0] = var53.x2[0]; - _dest.x2[1] = var47.x2[0]; - var55.x2[0] = _dest.i; + _dest.x2[0] = var52.x2[0]; + _dest.x2[1] = var46.x2[0]; + var54.x2[0] = _dest.i; } { orc_union16 _dest; - _dest.x2[0] = var53.x2[1]; - _dest.x2[1] = var47.x2[1]; - var55.x2[1] = _dest.i; + _dest.x2[0] = var52.x2[1]; + _dest.x2[1] = var46.x2[1]; + var54.x2[1] = _dest.i; } - /* 18: mergewl */ + /* 17: mergewl */ { orc_union32 _dest; - _dest.x2[0] = var54.x2[0]; - _dest.x2[1] = var55.x2[0]; - var46.x2[0] = _dest.i; + _dest.x2[0] = var53.x2[0]; + _dest.x2[1] = var54.x2[0]; + var45.x2[0] = _dest.i; } { orc_union32 _dest; - _dest.x2[0] = var54.x2[1]; - _dest.x2[1] = var55.x2[1]; - var46.x2[1] = _dest.i; + _dest.x2[0] = var53.x2[1]; + _dest.x2[1] = var54.x2[1]; + var45.x2[1] = _dest.i; } - /* 19: storeq */ - ptr0[i] = var46; + /* 18: storeq */ + ptr0[i] = var45; } } @@ -3521,7 +3393,7 @@ bayer_orc_merge_gr_argb (guint8 * ORC_RESTRICT d1, 1, 9, 23, 98, 97, 121, 101, 114, 95, 111, 114, 99, 95, 109, 101, 114, 103, 101, 95, 103, 114, 95, 97, 114, 103, 98, 11, 8, 8, 12, 2, 2, 12, 2, 2, 12, 2, 2, 12, 2, 2, 12, 2, 2, 12, 2, 2, 14, - 4, 0, 255, 0, 0, 14, 4, 255, 0, 0, 0, 20, 4, 20, 4, 20, + 2, 0, 255, 0, 0, 14, 2, 255, 0, 0, 0, 20, 4, 20, 4, 20, 2, 20, 2, 20, 2, 21, 1, 39, 34, 4, 8, 21, 1, 39, 35, 5, 9, 79, 36, 6, 21, 1, 39, 35, 35, 36, 73, 35, 35, 16, 73, 36, 36, 17, 92, 35, 36, 35, 21, 1, 196, 32, 17, 7, 21, 1, 196, 33, @@ -3540,8 +3412,8 @@ bayer_orc_merge_gr_argb (guint8 * ORC_RESTRICT d1, orc_program_add_source (p, 2, "s4"); orc_program_add_source (p, 2, "s5"); orc_program_add_source (p, 2, "s6"); - orc_program_add_constant (p, 4, 0x0000ff00, "c1"); - orc_program_add_constant (p, 4, 0x000000ff, "c2"); + orc_program_add_constant (p, 2, 0x0000ff00, "c1"); + orc_program_add_constant (p, 2, 0x000000ff, "c2"); orc_program_add_temporary (p, 4, "t1"); orc_program_add_temporary (p, 4, "t2"); orc_program_add_temporary (p, 2, "t3"); diff --git a/gst/compositor/compositororc-dist.c b/gst/compositor/compositororc-dist.c index db71b932e9..41744820b6 100644 --- a/gst/compositor/compositororc-dist.c +++ b/gst/compositor/compositororc-dist.c @@ -403,7 +403,7 @@ compositor_orc_blend_u8 (guint8 * ORC_RESTRICT d1, int d1_stride, /* 6: mullw */ var41.i = (var40.i * var36.i) & 0xffff; /* 7: shlw */ - var42.i = var38.i << 8; + var42.i = ((orc_uint16) var38.i) << 8; /* 8: addw */ var43.i = var42.i + var41.i; /* 9: shruw */ @@ -460,7 +460,7 @@ _backup_compositor_orc_blend_u8 (OrcExecutor * ORC_RESTRICT ex) /* 6: mullw */ var41.i = (var40.i * var36.i) & 0xffff; /* 7: shlw */ - var42.i = var38.i << 8; + var42.i = ((orc_uint16) var38.i) << 8; /* 8: addw */ var43.i = var42.i + var41.i; /* 9: shruw */ @@ -606,8 +606,9 @@ compositor_orc_blend_argb (guint8 * ORC_RESTRICT d1, int d1_stride, var43 = var42.i; /* 3: splatbl */ var44.i = - ((var43 & 0xff) << 24) | ((var43 & 0xff) << 16) | ((var43 & 0xff) << - 8) | (var43 & 0xff); + ((((orc_uint32) var43) & 0xff) << 24) | ((((orc_uint32) var43) & 0xff) + << 16) | ((((orc_uint32) var43) & 0xff) << 8) | (((orc_uint32) var43) + & 0xff); /* 4: convubw */ var45.x4[0] = (orc_uint8) var44.x4[0]; var45.x4[1] = (orc_uint8) var44.x4[1]; @@ -618,11 +619,19 @@ compositor_orc_blend_argb (guint8 * ORC_RESTRICT d1, int d1_stride, var46.x4[1] = (var45.x4[1] * var39.x4[1]) & 0xffff; var46.x4[2] = (var45.x4[2] * var39.x4[2]) & 0xffff; var46.x4[3] = (var45.x4[3] * var39.x4[3]) & 0xffff; - /* 7: shruw */ - var47.x4[0] = ((orc_uint16) var46.x4[0]) >> 8; - var47.x4[1] = ((orc_uint16) var46.x4[1]) >> 8; - var47.x4[2] = ((orc_uint16) var46.x4[2]) >> 8; - var47.x4[3] = ((orc_uint16) var46.x4[3]) >> 8; + /* 7: div255w */ + var47.x4[0] = + ((orc_uint16) (((orc_uint16) (var46.x4[0] + 128)) + + (((orc_uint16) (var46.x4[0] + 128)) >> 8))) >> 8; + var47.x4[1] = + ((orc_uint16) (((orc_uint16) (var46.x4[1] + 128)) + + (((orc_uint16) (var46.x4[1] + 128)) >> 8))) >> 8; + var47.x4[2] = + ((orc_uint16) (((orc_uint16) (var46.x4[2] + 128)) + + (((orc_uint16) (var46.x4[2] + 128)) >> 8))) >> 8; + var47.x4[3] = + ((orc_uint16) (((orc_uint16) (var46.x4[3] + 128)) + + (((orc_uint16) (var46.x4[3] + 128)) >> 8))) >> 8; /* 8: convubw */ var48.x4[0] = (orc_uint8) var41.x4[0]; var48.x4[1] = (orc_uint8) var41.x4[1]; @@ -731,8 +740,9 @@ _backup_compositor_orc_blend_argb (OrcExecutor * ORC_RESTRICT ex) var43 = var42.i; /* 3: splatbl */ var44.i = - ((var43 & 0xff) << 24) | ((var43 & 0xff) << 16) | ((var43 & 0xff) << - 8) | (var43 & 0xff); + ((((orc_uint32) var43) & 0xff) << 24) | ((((orc_uint32) var43) & 0xff) + << 16) | ((((orc_uint32) var43) & 0xff) << 8) | (((orc_uint32) var43) + & 0xff); /* 4: convubw */ var45.x4[0] = (orc_uint8) var44.x4[0]; var45.x4[1] = (orc_uint8) var44.x4[1]; @@ -743,11 +753,19 @@ _backup_compositor_orc_blend_argb (OrcExecutor * ORC_RESTRICT ex) var46.x4[1] = (var45.x4[1] * var39.x4[1]) & 0xffff; var46.x4[2] = (var45.x4[2] * var39.x4[2]) & 0xffff; var46.x4[3] = (var45.x4[3] * var39.x4[3]) & 0xffff; - /* 7: shruw */ - var47.x4[0] = ((orc_uint16) var46.x4[0]) >> 8; - var47.x4[1] = ((orc_uint16) var46.x4[1]) >> 8; - var47.x4[2] = ((orc_uint16) var46.x4[2]) >> 8; - var47.x4[3] = ((orc_uint16) var46.x4[3]) >> 8; + /* 7: div255w */ + var47.x4[0] = + ((orc_uint16) (((orc_uint16) (var46.x4[0] + 128)) + + (((orc_uint16) (var46.x4[0] + 128)) >> 8))) >> 8; + var47.x4[1] = + ((orc_uint16) (((orc_uint16) (var46.x4[1] + 128)) + + (((orc_uint16) (var46.x4[1] + 128)) >> 8))) >> 8; + var47.x4[2] = + ((orc_uint16) (((orc_uint16) (var46.x4[2] + 128)) + + (((orc_uint16) (var46.x4[2] + 128)) >> 8))) >> 8; + var47.x4[3] = + ((orc_uint16) (((orc_uint16) (var46.x4[3] + 128)) + + (((orc_uint16) (var46.x4[3] + 128)) >> 8))) >> 8; /* 8: convubw */ var48.x4[0] = (orc_uint8) var41.x4[0]; var48.x4[1] = (orc_uint8) var41.x4[1]; @@ -820,13 +838,13 @@ compositor_orc_blend_argb (guint8 * ORC_RESTRICT d1, int d1_stride, static const orc_uint8 bc[] = { 1, 7, 9, 25, 99, 111, 109, 112, 111, 115, 105, 116, 111, 114, 95, 111, 114, 99, 95, 98, 108, 101, 110, 100, 95, 97, 114, 103, 98, 11, 4, 4, - 12, 4, 4, 14, 4, 255, 0, 0, 0, 14, 4, 8, 0, 0, 0, 16, - 2, 20, 4, 20, 2, 20, 1, 20, 4, 20, 8, 20, 8, 20, 8, 113, - 32, 4, 163, 33, 32, 157, 34, 33, 152, 35, 34, 21, 2, 150, 38, 35, - 21, 2, 89, 38, 38, 24, 21, 2, 95, 38, 38, 17, 21, 2, 150, 37, - 32, 113, 32, 0, 21, 2, 150, 36, 32, 21, 2, 98, 37, 37, 36, 21, - 2, 89, 37, 37, 38, 21, 2, 80, 37, 37, 21, 2, 70, 36, 36, 37, - 21, 2, 157, 32, 36, 123, 32, 32, 16, 128, 0, 32, 2, 0, + 12, 4, 4, 14, 4, 255, 0, 0, 0, 16, 2, 20, 4, 20, 2, 20, + 1, 20, 4, 20, 8, 20, 8, 20, 8, 113, 32, 4, 163, 33, 32, 157, + 34, 33, 152, 35, 34, 21, 2, 150, 38, 35, 21, 2, 89, 38, 38, 24, + 21, 2, 80, 38, 38, 21, 2, 150, 37, 32, 113, 32, 0, 21, 2, 150, + 36, 32, 21, 2, 98, 37, 37, 36, 21, 2, 89, 37, 37, 38, 21, 2, + 80, 37, 37, 21, 2, 70, 36, 36, 37, 21, 2, 157, 32, 36, 123, 32, + 32, 16, 128, 0, 32, 2, 0, }; p = orc_program_new_from_static_bytecode (bc); orc_program_set_backup_function (p, _backup_compositor_orc_blend_argb); @@ -838,7 +856,6 @@ compositor_orc_blend_argb (guint8 * ORC_RESTRICT d1, int d1_stride, orc_program_add_destination (p, 4, "d1"); orc_program_add_source (p, 4, "s1"); orc_program_add_constant (p, 4, 0x000000ff, "c1"); - orc_program_add_constant (p, 4, 0x00000008, "c2"); orc_program_add_parameter (p, 2, "p1"); orc_program_add_temporary (p, 4, "t1"); orc_program_add_temporary (p, 2, "t2"); @@ -860,7 +877,7 @@ compositor_orc_blend_argb (guint8 * ORC_RESTRICT d1, int d1_stride, ORC_VAR_D1); orc_program_append_2 (p, "mullw", 2, ORC_VAR_T7, ORC_VAR_T7, ORC_VAR_P1, ORC_VAR_D1); - orc_program_append_2 (p, "shruw", 2, ORC_VAR_T7, ORC_VAR_T7, ORC_VAR_C2, + orc_program_append_2 (p, "div255w", 2, ORC_VAR_T7, ORC_VAR_T7, ORC_VAR_D1, ORC_VAR_D1); orc_program_append_2 (p, "convubw", 2, ORC_VAR_T6, ORC_VAR_T1, ORC_VAR_D1, ORC_VAR_D1); @@ -965,8 +982,9 @@ compositor_orc_blend_bgra (guint8 * ORC_RESTRICT d1, int d1_stride, var45 = var44.i; /* 4: splatbl */ var46.i = - ((var45 & 0xff) << 24) | ((var45 & 0xff) << 16) | ((var45 & 0xff) << - 8) | (var45 & 0xff); + ((((orc_uint32) var45) & 0xff) << 24) | ((((orc_uint32) var45) & 0xff) + << 16) | ((((orc_uint32) var45) & 0xff) << 8) | (((orc_uint32) var45) + & 0xff); /* 5: convubw */ var47.x4[0] = (orc_uint8) var46.x4[0]; var47.x4[1] = (orc_uint8) var46.x4[1]; @@ -977,11 +995,19 @@ compositor_orc_blend_bgra (guint8 * ORC_RESTRICT d1, int d1_stride, var48.x4[1] = (var47.x4[1] * var40.x4[1]) & 0xffff; var48.x4[2] = (var47.x4[2] * var40.x4[2]) & 0xffff; var48.x4[3] = (var47.x4[3] * var40.x4[3]) & 0xffff; - /* 8: shruw */ - var49.x4[0] = ((orc_uint16) var48.x4[0]) >> 8; - var49.x4[1] = ((orc_uint16) var48.x4[1]) >> 8; - var49.x4[2] = ((orc_uint16) var48.x4[2]) >> 8; - var49.x4[3] = ((orc_uint16) var48.x4[3]) >> 8; + /* 8: div255w */ + var49.x4[0] = + ((orc_uint16) (((orc_uint16) (var48.x4[0] + 128)) + + (((orc_uint16) (var48.x4[0] + 128)) >> 8))) >> 8; + var49.x4[1] = + ((orc_uint16) (((orc_uint16) (var48.x4[1] + 128)) + + (((orc_uint16) (var48.x4[1] + 128)) >> 8))) >> 8; + var49.x4[2] = + ((orc_uint16) (((orc_uint16) (var48.x4[2] + 128)) + + (((orc_uint16) (var48.x4[2] + 128)) >> 8))) >> 8; + var49.x4[3] = + ((orc_uint16) (((orc_uint16) (var48.x4[3] + 128)) + + (((orc_uint16) (var48.x4[3] + 128)) >> 8))) >> 8; /* 9: convubw */ var50.x4[0] = (orc_uint8) var42.x4[0]; var50.x4[1] = (orc_uint8) var42.x4[1]; @@ -1093,8 +1119,9 @@ _backup_compositor_orc_blend_bgra (OrcExecutor * ORC_RESTRICT ex) var45 = var44.i; /* 4: splatbl */ var46.i = - ((var45 & 0xff) << 24) | ((var45 & 0xff) << 16) | ((var45 & 0xff) << - 8) | (var45 & 0xff); + ((((orc_uint32) var45) & 0xff) << 24) | ((((orc_uint32) var45) & 0xff) + << 16) | ((((orc_uint32) var45) & 0xff) << 8) | (((orc_uint32) var45) + & 0xff); /* 5: convubw */ var47.x4[0] = (orc_uint8) var46.x4[0]; var47.x4[1] = (orc_uint8) var46.x4[1]; @@ -1105,11 +1132,19 @@ _backup_compositor_orc_blend_bgra (OrcExecutor * ORC_RESTRICT ex) var48.x4[1] = (var47.x4[1] * var40.x4[1]) & 0xffff; var48.x4[2] = (var47.x4[2] * var40.x4[2]) & 0xffff; var48.x4[3] = (var47.x4[3] * var40.x4[3]) & 0xffff; - /* 8: shruw */ - var49.x4[0] = ((orc_uint16) var48.x4[0]) >> 8; - var49.x4[1] = ((orc_uint16) var48.x4[1]) >> 8; - var49.x4[2] = ((orc_uint16) var48.x4[2]) >> 8; - var49.x4[3] = ((orc_uint16) var48.x4[3]) >> 8; + /* 8: div255w */ + var49.x4[0] = + ((orc_uint16) (((orc_uint16) (var48.x4[0] + 128)) + + (((orc_uint16) (var48.x4[0] + 128)) >> 8))) >> 8; + var49.x4[1] = + ((orc_uint16) (((orc_uint16) (var48.x4[1] + 128)) + + (((orc_uint16) (var48.x4[1] + 128)) >> 8))) >> 8; + var49.x4[2] = + ((orc_uint16) (((orc_uint16) (var48.x4[2] + 128)) + + (((orc_uint16) (var48.x4[2] + 128)) >> 8))) >> 8; + var49.x4[3] = + ((orc_uint16) (((orc_uint16) (var48.x4[3] + 128)) + + (((orc_uint16) (var48.x4[3] + 128)) >> 8))) >> 8; /* 9: convubw */ var50.x4[0] = (orc_uint8) var42.x4[0]; var50.x4[1] = (orc_uint8) var42.x4[1]; @@ -1182,14 +1217,14 @@ compositor_orc_blend_bgra (guint8 * ORC_RESTRICT d1, int d1_stride, static const orc_uint8 bc[] = { 1, 7, 9, 25, 99, 111, 109, 112, 111, 115, 105, 116, 111, 114, 95, 111, 114, 99, 95, 98, 108, 101, 110, 100, 95, 98, 103, 114, 97, 11, 4, 4, - 12, 4, 4, 14, 4, 0, 0, 0, 255, 14, 4, 24, 0, 0, 0, 14, - 4, 8, 0, 0, 0, 16, 2, 20, 4, 20, 4, 20, 2, 20, 1, 20, - 4, 20, 8, 20, 8, 20, 8, 113, 32, 4, 126, 33, 32, 17, 163, 34, - 33, 157, 35, 34, 152, 36, 35, 21, 2, 150, 39, 36, 21, 2, 89, 39, - 39, 24, 21, 2, 95, 39, 39, 18, 21, 2, 150, 38, 32, 113, 32, 0, - 21, 2, 150, 37, 32, 21, 2, 98, 38, 38, 37, 21, 2, 89, 38, 38, - 39, 21, 2, 80, 38, 38, 21, 2, 70, 37, 37, 38, 21, 2, 157, 32, - 37, 123, 32, 32, 16, 128, 0, 32, 2, 0, + 12, 4, 4, 14, 4, 0, 0, 0, 255, 14, 4, 24, 0, 0, 0, 16, + 2, 20, 4, 20, 4, 20, 2, 20, 1, 20, 4, 20, 8, 20, 8, 20, + 8, 113, 32, 4, 126, 33, 32, 17, 163, 34, 33, 157, 35, 34, 152, 36, + 35, 21, 2, 150, 39, 36, 21, 2, 89, 39, 39, 24, 21, 2, 80, 39, + 39, 21, 2, 150, 38, 32, 113, 32, 0, 21, 2, 150, 37, 32, 21, 2, + 98, 38, 38, 37, 21, 2, 89, 38, 38, 39, 21, 2, 80, 38, 38, 21, + 2, 70, 37, 37, 38, 21, 2, 157, 32, 37, 123, 32, 32, 16, 128, 0, + 32, 2, 0, }; p = orc_program_new_from_static_bytecode (bc); orc_program_set_backup_function (p, _backup_compositor_orc_blend_bgra); @@ -1202,7 +1237,6 @@ compositor_orc_blend_bgra (guint8 * ORC_RESTRICT d1, int d1_stride, orc_program_add_source (p, 4, "s1"); orc_program_add_constant (p, 4, 0xff000000, "c1"); orc_program_add_constant (p, 4, 0x00000018, "c2"); - orc_program_add_constant (p, 4, 0x00000008, "c3"); orc_program_add_parameter (p, 2, "p1"); orc_program_add_temporary (p, 4, "t1"); orc_program_add_temporary (p, 4, "t2"); @@ -1227,7 +1261,7 @@ compositor_orc_blend_bgra (guint8 * ORC_RESTRICT d1, int d1_stride, ORC_VAR_D1); orc_program_append_2 (p, "mullw", 2, ORC_VAR_T8, ORC_VAR_T8, ORC_VAR_P1, ORC_VAR_D1); - orc_program_append_2 (p, "shruw", 2, ORC_VAR_T8, ORC_VAR_T8, ORC_VAR_C3, + orc_program_append_2 (p, "div255w", 2, ORC_VAR_T8, ORC_VAR_T8, ORC_VAR_D1, ORC_VAR_D1); orc_program_append_2 (p, "convubw", 2, ORC_VAR_T7, ORC_VAR_T1, ORC_VAR_D1, ORC_VAR_D1); @@ -1351,8 +1385,9 @@ compositor_orc_overlay_argb (guint8 * ORC_RESTRICT d1, int d1_stride, var46 = var45.i; /* 3: splatbl */ var47.i = - ((var46 & 0xff) << 24) | ((var46 & 0xff) << 16) | ((var46 & 0xff) << - 8) | (var46 & 0xff); + ((((orc_uint32) var46) & 0xff) << 24) | ((((orc_uint32) var46) & 0xff) + << 16) | ((((orc_uint32) var46) & 0xff) << 8) | (((orc_uint32) var46) + & 0xff); /* 4: convubw */ var48.x4[0] = (orc_uint8) var47.x4[0]; var48.x4[1] = (orc_uint8) var47.x4[1]; @@ -1363,11 +1398,19 @@ compositor_orc_overlay_argb (guint8 * ORC_RESTRICT d1, int d1_stride, var49.x4[1] = (var48.x4[1] * var41.x4[1]) & 0xffff; var49.x4[2] = (var48.x4[2] * var41.x4[2]) & 0xffff; var49.x4[3] = (var48.x4[3] * var41.x4[3]) & 0xffff; - /* 7: shruw */ - var50.x4[0] = ((orc_uint16) var49.x4[0]) >> 8; - var50.x4[1] = ((orc_uint16) var49.x4[1]) >> 8; - var50.x4[2] = ((orc_uint16) var49.x4[2]) >> 8; - var50.x4[3] = ((orc_uint16) var49.x4[3]) >> 8; + /* 7: div255w */ + var50.x4[0] = + ((orc_uint16) (((orc_uint16) (var49.x4[0] + 128)) + + (((orc_uint16) (var49.x4[0] + 128)) >> 8))) >> 8; + var50.x4[1] = + ((orc_uint16) (((orc_uint16) (var49.x4[1] + 128)) + + (((orc_uint16) (var49.x4[1] + 128)) >> 8))) >> 8; + var50.x4[2] = + ((orc_uint16) (((orc_uint16) (var49.x4[2] + 128)) + + (((orc_uint16) (var49.x4[2] + 128)) >> 8))) >> 8; + var50.x4[3] = + ((orc_uint16) (((orc_uint16) (var49.x4[3] + 128)) + + (((orc_uint16) (var49.x4[3] + 128)) >> 8))) >> 8; /* 8: convubw */ var51.x4[0] = (orc_uint8) var44.x4[0]; var51.x4[1] = (orc_uint8) var44.x4[1]; @@ -1396,8 +1439,9 @@ compositor_orc_overlay_argb (guint8 * ORC_RESTRICT d1, int d1_stride, var58 = var57.i; /* 16: splatbl */ var59.i = - ((var58 & 0xff) << 24) | ((var58 & 0xff) << 16) | ((var58 & 0xff) << - 8) | (var58 & 0xff); + ((((orc_uint32) var58) & 0xff) << 24) | ((((orc_uint32) var58) & 0xff) + << 16) | ((((orc_uint32) var58) & 0xff) << 8) | (((orc_uint32) var58) + & 0xff); /* 17: convubw */ var60.x4[0] = (orc_uint8) var59.x4[0]; var60.x4[1] = (orc_uint8) var59.x4[1]; @@ -1557,8 +1601,9 @@ _backup_compositor_orc_overlay_argb (OrcExecutor * ORC_RESTRICT ex) var46 = var45.i; /* 3: splatbl */ var47.i = - ((var46 & 0xff) << 24) | ((var46 & 0xff) << 16) | ((var46 & 0xff) << - 8) | (var46 & 0xff); + ((((orc_uint32) var46) & 0xff) << 24) | ((((orc_uint32) var46) & 0xff) + << 16) | ((((orc_uint32) var46) & 0xff) << 8) | (((orc_uint32) var46) + & 0xff); /* 4: convubw */ var48.x4[0] = (orc_uint8) var47.x4[0]; var48.x4[1] = (orc_uint8) var47.x4[1]; @@ -1569,11 +1614,19 @@ _backup_compositor_orc_overlay_argb (OrcExecutor * ORC_RESTRICT ex) var49.x4[1] = (var48.x4[1] * var41.x4[1]) & 0xffff; var49.x4[2] = (var48.x4[2] * var41.x4[2]) & 0xffff; var49.x4[3] = (var48.x4[3] * var41.x4[3]) & 0xffff; - /* 7: shruw */ - var50.x4[0] = ((orc_uint16) var49.x4[0]) >> 8; - var50.x4[1] = ((orc_uint16) var49.x4[1]) >> 8; - var50.x4[2] = ((orc_uint16) var49.x4[2]) >> 8; - var50.x4[3] = ((orc_uint16) var49.x4[3]) >> 8; + /* 7: div255w */ + var50.x4[0] = + ((orc_uint16) (((orc_uint16) (var49.x4[0] + 128)) + + (((orc_uint16) (var49.x4[0] + 128)) >> 8))) >> 8; + var50.x4[1] = + ((orc_uint16) (((orc_uint16) (var49.x4[1] + 128)) + + (((orc_uint16) (var49.x4[1] + 128)) >> 8))) >> 8; + var50.x4[2] = + ((orc_uint16) (((orc_uint16) (var49.x4[2] + 128)) + + (((orc_uint16) (var49.x4[2] + 128)) >> 8))) >> 8; + var50.x4[3] = + ((orc_uint16) (((orc_uint16) (var49.x4[3] + 128)) + + (((orc_uint16) (var49.x4[3] + 128)) >> 8))) >> 8; /* 8: convubw */ var51.x4[0] = (orc_uint8) var44.x4[0]; var51.x4[1] = (orc_uint8) var44.x4[1]; @@ -1602,8 +1655,9 @@ _backup_compositor_orc_overlay_argb (OrcExecutor * ORC_RESTRICT ex) var58 = var57.i; /* 16: splatbl */ var59.i = - ((var58 & 0xff) << 24) | ((var58 & 0xff) << 16) | ((var58 & 0xff) << - 8) | (var58 & 0xff); + ((((orc_uint32) var58) & 0xff) << 24) | ((((orc_uint32) var58) & 0xff) + << 16) | ((((orc_uint32) var58) & 0xff) << 8) | (((orc_uint32) var58) + & 0xff); /* 17: convubw */ var60.x4[0] = (orc_uint8) var59.x4[0]; var60.x4[1] = (orc_uint8) var59.x4[1]; @@ -1706,17 +1760,17 @@ compositor_orc_overlay_argb (guint8 * ORC_RESTRICT d1, int d1_stride, 1, 7, 9, 27, 99, 111, 109, 112, 111, 115, 105, 116, 111, 114, 95, 111, 114, 99, 95, 111, 118, 101, 114, 108, 97, 121, 95, 97, 114, 103, 98, 11, 4, 4, 12, 4, 4, 14, 4, 255, 255, 255, 255, 14, 4, 255, 0, 0, - 0, 14, 4, 0, 255, 255, 255, 14, 4, 8, 0, 0, 0, 16, 2, 20, - 4, 20, 2, 20, 1, 20, 8, 20, 8, 20, 8, 20, 4, 20, 8, 20, - 8, 113, 32, 4, 163, 33, 32, 157, 34, 33, 152, 38, 34, 21, 2, 150, - 35, 38, 21, 2, 89, 35, 35, 24, 21, 2, 95, 35, 35, 19, 21, 2, - 150, 40, 32, 21, 2, 89, 40, 40, 35, 115, 38, 16, 21, 2, 150, 36, - 38, 21, 2, 98, 36, 36, 35, 113, 32, 0, 163, 33, 32, 157, 34, 33, - 152, 38, 34, 21, 2, 150, 37, 38, 21, 2, 89, 37, 37, 36, 21, 2, - 80, 37, 37, 21, 2, 150, 39, 32, 21, 2, 89, 39, 39, 37, 21, 2, - 70, 39, 39, 40, 21, 2, 70, 37, 37, 35, 21, 2, 81, 39, 39, 37, - 21, 2, 157, 32, 39, 106, 32, 32, 18, 21, 2, 157, 38, 37, 106, 38, - 38, 17, 123, 32, 32, 38, 128, 0, 32, 2, 0, + 0, 14, 4, 0, 255, 255, 255, 16, 2, 20, 4, 20, 2, 20, 1, 20, + 8, 20, 8, 20, 8, 20, 4, 20, 8, 20, 8, 113, 32, 4, 163, 33, + 32, 157, 34, 33, 152, 38, 34, 21, 2, 150, 35, 38, 21, 2, 89, 35, + 35, 24, 21, 2, 80, 35, 35, 21, 2, 150, 40, 32, 21, 2, 89, 40, + 40, 35, 115, 38, 16, 21, 2, 150, 36, 38, 21, 2, 98, 36, 36, 35, + 113, 32, 0, 163, 33, 32, 157, 34, 33, 152, 38, 34, 21, 2, 150, 37, + 38, 21, 2, 89, 37, 37, 36, 21, 2, 80, 37, 37, 21, 2, 150, 39, + 32, 21, 2, 89, 39, 39, 37, 21, 2, 70, 39, 39, 40, 21, 2, 70, + 37, 37, 35, 21, 2, 81, 39, 39, 37, 21, 2, 157, 32, 39, 106, 32, + 32, 18, 21, 2, 157, 38, 37, 106, 38, 38, 17, 123, 32, 32, 38, 128, + 0, 32, 2, 0, }; p = orc_program_new_from_static_bytecode (bc); orc_program_set_backup_function (p, _backup_compositor_orc_overlay_argb); @@ -1730,7 +1784,6 @@ compositor_orc_overlay_argb (guint8 * ORC_RESTRICT d1, int d1_stride, orc_program_add_constant (p, 4, 0xffffffff, "c1"); orc_program_add_constant (p, 4, 0x000000ff, "c2"); orc_program_add_constant (p, 4, 0xffffff00, "c3"); - orc_program_add_constant (p, 4, 0x00000008, "c4"); orc_program_add_parameter (p, 2, "p1"); orc_program_add_temporary (p, 4, "t1"); orc_program_add_temporary (p, 2, "t2"); @@ -1754,7 +1807,7 @@ compositor_orc_overlay_argb (guint8 * ORC_RESTRICT d1, int d1_stride, ORC_VAR_D1); orc_program_append_2 (p, "mullw", 2, ORC_VAR_T4, ORC_VAR_T4, ORC_VAR_P1, ORC_VAR_D1); - orc_program_append_2 (p, "shruw", 2, ORC_VAR_T4, ORC_VAR_T4, ORC_VAR_C4, + orc_program_append_2 (p, "div255w", 2, ORC_VAR_T4, ORC_VAR_T4, ORC_VAR_D1, ORC_VAR_D1); orc_program_append_2 (p, "convubw", 2, ORC_VAR_T9, ORC_VAR_T1, ORC_VAR_D1, ORC_VAR_D1); @@ -1908,8 +1961,9 @@ compositor_orc_overlay_bgra (guint8 * ORC_RESTRICT d1, int d1_stride, var48 = var47.i; /* 4: splatbl */ var49.i = - ((var48 & 0xff) << 24) | ((var48 & 0xff) << 16) | ((var48 & 0xff) << - 8) | (var48 & 0xff); + ((((orc_uint32) var48) & 0xff) << 24) | ((((orc_uint32) var48) & 0xff) + << 16) | ((((orc_uint32) var48) & 0xff) << 8) | (((orc_uint32) var48) + & 0xff); /* 5: convubw */ var50.x4[0] = (orc_uint8) var49.x4[0]; var50.x4[1] = (orc_uint8) var49.x4[1]; @@ -1920,11 +1974,19 @@ compositor_orc_overlay_bgra (guint8 * ORC_RESTRICT d1, int d1_stride, var51.x4[1] = (var50.x4[1] * var42.x4[1]) & 0xffff; var51.x4[2] = (var50.x4[2] * var42.x4[2]) & 0xffff; var51.x4[3] = (var50.x4[3] * var42.x4[3]) & 0xffff; - /* 8: shruw */ - var52.x4[0] = ((orc_uint16) var51.x4[0]) >> 8; - var52.x4[1] = ((orc_uint16) var51.x4[1]) >> 8; - var52.x4[2] = ((orc_uint16) var51.x4[2]) >> 8; - var52.x4[3] = ((orc_uint16) var51.x4[3]) >> 8; + /* 8: div255w */ + var52.x4[0] = + ((orc_uint16) (((orc_uint16) (var51.x4[0] + 128)) + + (((orc_uint16) (var51.x4[0] + 128)) >> 8))) >> 8; + var52.x4[1] = + ((orc_uint16) (((orc_uint16) (var51.x4[1] + 128)) + + (((orc_uint16) (var51.x4[1] + 128)) >> 8))) >> 8; + var52.x4[2] = + ((orc_uint16) (((orc_uint16) (var51.x4[2] + 128)) + + (((orc_uint16) (var51.x4[2] + 128)) >> 8))) >> 8; + var52.x4[3] = + ((orc_uint16) (((orc_uint16) (var51.x4[3] + 128)) + + (((orc_uint16) (var51.x4[3] + 128)) >> 8))) >> 8; /* 9: convubw */ var53.x4[0] = (orc_uint8) var45.x4[0]; var53.x4[1] = (orc_uint8) var45.x4[1]; @@ -1955,8 +2017,9 @@ compositor_orc_overlay_bgra (guint8 * ORC_RESTRICT d1, int d1_stride, var61 = var60.i; /* 18: splatbl */ var62.i = - ((var61 & 0xff) << 24) | ((var61 & 0xff) << 16) | ((var61 & 0xff) << - 8) | (var61 & 0xff); + ((((orc_uint32) var61) & 0xff) << 24) | ((((orc_uint32) var61) & 0xff) + << 16) | ((((orc_uint32) var61) & 0xff) << 8) | (((orc_uint32) var61) + & 0xff); /* 19: convubw */ var63.x4[0] = (orc_uint8) var62.x4[0]; var63.x4[1] = (orc_uint8) var62.x4[1]; @@ -2120,8 +2183,9 @@ _backup_compositor_orc_overlay_bgra (OrcExecutor * ORC_RESTRICT ex) var48 = var47.i; /* 4: splatbl */ var49.i = - ((var48 & 0xff) << 24) | ((var48 & 0xff) << 16) | ((var48 & 0xff) << - 8) | (var48 & 0xff); + ((((orc_uint32) var48) & 0xff) << 24) | ((((orc_uint32) var48) & 0xff) + << 16) | ((((orc_uint32) var48) & 0xff) << 8) | (((orc_uint32) var48) + & 0xff); /* 5: convubw */ var50.x4[0] = (orc_uint8) var49.x4[0]; var50.x4[1] = (orc_uint8) var49.x4[1]; @@ -2132,11 +2196,19 @@ _backup_compositor_orc_overlay_bgra (OrcExecutor * ORC_RESTRICT ex) var51.x4[1] = (var50.x4[1] * var42.x4[1]) & 0xffff; var51.x4[2] = (var50.x4[2] * var42.x4[2]) & 0xffff; var51.x4[3] = (var50.x4[3] * var42.x4[3]) & 0xffff; - /* 8: shruw */ - var52.x4[0] = ((orc_uint16) var51.x4[0]) >> 8; - var52.x4[1] = ((orc_uint16) var51.x4[1]) >> 8; - var52.x4[2] = ((orc_uint16) var51.x4[2]) >> 8; - var52.x4[3] = ((orc_uint16) var51.x4[3]) >> 8; + /* 8: div255w */ + var52.x4[0] = + ((orc_uint16) (((orc_uint16) (var51.x4[0] + 128)) + + (((orc_uint16) (var51.x4[0] + 128)) >> 8))) >> 8; + var52.x4[1] = + ((orc_uint16) (((orc_uint16) (var51.x4[1] + 128)) + + (((orc_uint16) (var51.x4[1] + 128)) >> 8))) >> 8; + var52.x4[2] = + ((orc_uint16) (((orc_uint16) (var51.x4[2] + 128)) + + (((orc_uint16) (var51.x4[2] + 128)) >> 8))) >> 8; + var52.x4[3] = + ((orc_uint16) (((orc_uint16) (var51.x4[3] + 128)) + + (((orc_uint16) (var51.x4[3] + 128)) >> 8))) >> 8; /* 9: convubw */ var53.x4[0] = (orc_uint8) var45.x4[0]; var53.x4[1] = (orc_uint8) var45.x4[1]; @@ -2167,8 +2239,9 @@ _backup_compositor_orc_overlay_bgra (OrcExecutor * ORC_RESTRICT ex) var61 = var60.i; /* 18: splatbl */ var62.i = - ((var61 & 0xff) << 24) | ((var61 & 0xff) << 16) | ((var61 & 0xff) << - 8) | (var61 & 0xff); + ((((orc_uint32) var61) & 0xff) << 24) | ((((orc_uint32) var61) & 0xff) + << 16) | ((((orc_uint32) var61) & 0xff) << 8) | (((orc_uint32) var61) + & 0xff); /* 19: convubw */ var63.x4[0] = (orc_uint8) var62.x4[0]; var63.x4[1] = (orc_uint8) var62.x4[1]; @@ -2271,18 +2344,18 @@ compositor_orc_overlay_bgra (guint8 * ORC_RESTRICT d1, int d1_stride, 1, 7, 9, 27, 99, 111, 109, 112, 111, 115, 105, 116, 111, 114, 95, 111, 114, 99, 95, 111, 118, 101, 114, 108, 97, 121, 95, 98, 103, 114, 97, 11, 4, 4, 12, 4, 4, 14, 4, 255, 255, 255, 255, 14, 4, 0, 0, 0, - 255, 14, 4, 255, 255, 255, 0, 14, 4, 24, 0, 0, 0, 14, 4, 8, - 0, 0, 0, 16, 2, 20, 4, 20, 4, 20, 2, 20, 1, 20, 8, 20, - 8, 20, 8, 20, 4, 20, 8, 20, 8, 113, 32, 4, 126, 33, 32, 19, - 163, 34, 33, 157, 35, 34, 152, 39, 35, 21, 2, 150, 36, 39, 21, 2, - 89, 36, 36, 24, 21, 2, 95, 36, 36, 20, 21, 2, 150, 41, 32, 21, - 2, 89, 41, 41, 36, 115, 39, 16, 21, 2, 150, 37, 39, 21, 2, 98, - 37, 37, 36, 113, 32, 0, 126, 33, 32, 19, 163, 34, 33, 157, 35, 34, - 152, 39, 35, 21, 2, 150, 38, 39, 21, 2, 89, 38, 38, 37, 21, 2, - 80, 38, 38, 21, 2, 150, 40, 32, 21, 2, 89, 40, 40, 38, 21, 2, - 70, 40, 40, 41, 21, 2, 70, 38, 38, 36, 21, 2, 81, 40, 40, 38, - 21, 2, 157, 32, 40, 106, 32, 32, 18, 21, 2, 157, 39, 38, 106, 39, - 39, 17, 123, 32, 32, 39, 128, 0, 32, 2, 0, + 255, 14, 4, 255, 255, 255, 0, 14, 4, 24, 0, 0, 0, 16, 2, 20, + 4, 20, 4, 20, 2, 20, 1, 20, 8, 20, 8, 20, 8, 20, 4, 20, + 8, 20, 8, 113, 32, 4, 126, 33, 32, 19, 163, 34, 33, 157, 35, 34, + 152, 39, 35, 21, 2, 150, 36, 39, 21, 2, 89, 36, 36, 24, 21, 2, + 80, 36, 36, 21, 2, 150, 41, 32, 21, 2, 89, 41, 41, 36, 115, 39, + 16, 21, 2, 150, 37, 39, 21, 2, 98, 37, 37, 36, 113, 32, 0, 126, + 33, 32, 19, 163, 34, 33, 157, 35, 34, 152, 39, 35, 21, 2, 150, 38, + 39, 21, 2, 89, 38, 38, 37, 21, 2, 80, 38, 38, 21, 2, 150, 40, + 32, 21, 2, 89, 40, 40, 38, 21, 2, 70, 40, 40, 41, 21, 2, 70, + 38, 38, 36, 21, 2, 81, 40, 40, 38, 21, 2, 157, 32, 40, 106, 32, + 32, 18, 21, 2, 157, 39, 38, 106, 39, 39, 17, 123, 32, 32, 39, 128, + 0, 32, 2, 0, }; p = orc_program_new_from_static_bytecode (bc); orc_program_set_backup_function (p, _backup_compositor_orc_overlay_bgra); @@ -2297,7 +2370,6 @@ compositor_orc_overlay_bgra (guint8 * ORC_RESTRICT d1, int d1_stride, orc_program_add_constant (p, 4, 0xff000000, "c2"); orc_program_add_constant (p, 4, 0x00ffffff, "c3"); orc_program_add_constant (p, 4, 0x00000018, "c4"); - orc_program_add_constant (p, 4, 0x00000008, "c5"); orc_program_add_parameter (p, 2, "p1"); orc_program_add_temporary (p, 4, "t1"); orc_program_add_temporary (p, 4, "t2"); @@ -2324,7 +2396,7 @@ compositor_orc_overlay_bgra (guint8 * ORC_RESTRICT d1, int d1_stride, ORC_VAR_D1); orc_program_append_2 (p, "mullw", 2, ORC_VAR_T5, ORC_VAR_T5, ORC_VAR_P1, ORC_VAR_D1); - orc_program_append_2 (p, "shruw", 2, ORC_VAR_T5, ORC_VAR_T5, ORC_VAR_C5, + orc_program_append_2 (p, "div255w", 2, ORC_VAR_T5, ORC_VAR_T5, ORC_VAR_D1, ORC_VAR_D1); orc_program_append_2 (p, "convubw", 2, ORC_VAR_T10, ORC_VAR_T1, ORC_VAR_D1, ORC_VAR_D1); diff --git a/gst/fieldanalysis/gstfieldanalysisorc-dist.c b/gst/fieldanalysis/gstfieldanalysisorc-dist.c index 06951b777d..1ae0143392 100644 --- a/gst/fieldanalysis/gstfieldanalysisorc-dist.c +++ b/gst/fieldanalysis/gstfieldanalysisorc-dist.c @@ -205,7 +205,7 @@ fieldanalysis_orc_same_parity_sad_planar_yuv (guint32 * ORC_RESTRICT a1, /* 9: andl */ var45.i = var43.i & var44.i; /* 10: accl */ - var12.i = var12.i + var45.i; + var12.i = ((orc_uint32) var12.i) + ((orc_uint32) var45.i); } *a1 = var12.i; @@ -258,7 +258,7 @@ _backup_fieldanalysis_orc_same_parity_sad_planar_yuv (OrcExecutor * /* 9: andl */ var45.i = var43.i & var44.i; /* 10: accl */ - var12.i = var12.i + var45.i; + var12.i = ((orc_uint32) var12.i) + ((orc_uint32) var45.i); } ex->accumulators[0] = var12.i; @@ -391,7 +391,7 @@ fieldanalysis_orc_same_parity_ssd_planar_yuv (guint32 * ORC_RESTRICT a1, /* 8: andl */ var44.i = var42.i & var43.i; /* 9: accl */ - var12.i = var12.i + var44.i; + var12.i = ((orc_uint32) var12.i) + ((orc_uint32) var44.i); } *a1 = var12.i; @@ -441,7 +441,7 @@ _backup_fieldanalysis_orc_same_parity_ssd_planar_yuv (OrcExecutor * /* 8: andl */ var44.i = var42.i & var43.i; /* 9: accl */ - var12.i = var12.i + var44.i; + var12.i = ((orc_uint32) var12.i) + ((orc_uint32) var44.i); } ex->accumulators[0] = var12.i; @@ -606,9 +606,9 @@ fieldanalysis_orc_same_parity_3_tap_planar_yuv (guint32 * ORC_RESTRICT a1, /* 11: convubw */ var52.i = (orc_uint8) var45; /* 12: shlw */ - var53.i = var48.i << 2; + var53.i = ((orc_uint16) var48.i) << 2; /* 13: shlw */ - var54.i = var51.i << 2; + var54.i = ((orc_uint16) var51.i) << 2; /* 14: addw */ var55.i = var47.i + var53.i; /* 15: addw */ @@ -628,7 +628,7 @@ fieldanalysis_orc_same_parity_3_tap_planar_yuv (guint32 * ORC_RESTRICT a1, /* 23: andl */ var63.i = var61.i & var62.i; /* 24: accl */ - var12.i = var12.i + var63.i; + var12.i = ((orc_uint32) var12.i) + ((orc_uint32) var63.i); } *a1 = var12.i; @@ -709,9 +709,9 @@ _backup_fieldanalysis_orc_same_parity_3_tap_planar_yuv (OrcExecutor * /* 11: convubw */ var52.i = (orc_uint8) var45; /* 12: shlw */ - var53.i = var48.i << 2; + var53.i = ((orc_uint16) var48.i) << 2; /* 13: shlw */ - var54.i = var51.i << 2; + var54.i = ((orc_uint16) var51.i) << 2; /* 14: addw */ var55.i = var47.i + var53.i; /* 15: addw */ @@ -731,7 +731,7 @@ _backup_fieldanalysis_orc_same_parity_3_tap_planar_yuv (OrcExecutor * /* 23: andl */ var63.i = var61.i & var62.i; /* 24: accl */ - var12.i = var12.i + var63.i; + var12.i = ((orc_uint32) var12.i) + ((orc_uint32) var63.i); } ex->accumulators[0] = var12.i; @@ -761,7 +761,7 @@ fieldanalysis_orc_same_parity_3_tap_planar_yuv (guint32 * ORC_RESTRICT a1, 121, 95, 51, 95, 116, 97, 112, 95, 112, 108, 97, 110, 97, 114, 95, 121, 117, 118, 12, 1, 1, 12, 1, 1, 12, 1, 1, 12, 1, 1, 12, 1, 1, - 12, 1, 1, 13, 4, 14, 4, 2, 0, 0, 0, 16, 4, 20, 2, 20, + 12, 1, 1, 13, 4, 14, 2, 2, 0, 0, 0, 16, 4, 20, 2, 20, 2, 20, 2, 20, 2, 20, 2, 20, 2, 20, 4, 20, 4, 150, 32, 4, 150, 33, 5, 150, 34, 6, 150, 35, 7, 150, 36, 8, 150, 37, 9, 93, 33, 33, 16, 93, 36, 36, 16, 70, 32, 32, 33, 70, 32, 32, 34, 70, @@ -784,7 +784,7 @@ fieldanalysis_orc_same_parity_3_tap_planar_yuv (guint32 * ORC_RESTRICT a1, orc_program_add_source (p, 1, "s5"); orc_program_add_source (p, 1, "s6"); orc_program_add_accumulator (p, 4, "a1"); - orc_program_add_constant (p, 4, 0x00000002, "c1"); + orc_program_add_constant (p, 2, 0x00000002, "c1"); orc_program_add_parameter (p, 4, "p1"); orc_program_add_temporary (p, 2, "t1"); orc_program_add_temporary (p, 2, "t2"); @@ -884,12 +884,8 @@ fieldanalysis_orc_opposite_parity_5_tap_planar_yuv (guint32 * ORC_RESTRICT a1, #else orc_union16 var44; #endif -#if defined(__APPLE__) && __GNUC__ == 4 && __GNUC_MINOR__ == 2 && defined (__i386__) - volatile orc_union16 var45; -#else - orc_union16 var45; -#endif - orc_union32 var46; + orc_union32 var45; + orc_union16 var46; orc_union16 var47; orc_union16 var48; orc_union16 var49; @@ -902,10 +898,9 @@ fieldanalysis_orc_opposite_parity_5_tap_planar_yuv (guint32 * ORC_RESTRICT a1, orc_union16 var56; orc_union16 var57; orc_union16 var58; - orc_union16 var59; + orc_union32 var59; orc_union32 var60; orc_union32 var61; - orc_union32 var62; ptr4 = (orc_int8 *) s1; ptr5 = (orc_int8 *) s2; @@ -915,56 +910,54 @@ fieldanalysis_orc_opposite_parity_5_tap_planar_yuv (guint32 * ORC_RESTRICT a1, /* 11: loadpw */ var44.i = (int) 0x00000003; /* 3 or 1.4822e-323f */ - /* 13: loadpw */ - var45.i = (int) 0x00000003; /* 3 or 1.4822e-323f */ - /* 21: loadpl */ - var46.i = p1; + /* 20: loadpl */ + var45.i = p1; for (i = 0; i < n; i++) { /* 0: loadb */ var39 = ptr4[i]; /* 1: convubw */ - var47.i = (orc_uint8) var39; + var46.i = (orc_uint8) var39; /* 2: loadb */ var40 = ptr5[i]; /* 3: convubw */ - var48.i = (orc_uint8) var40; + var47.i = (orc_uint8) var40; /* 4: loadb */ var41 = ptr6[i]; /* 5: convubw */ - var49.i = (orc_uint8) var41; + var48.i = (orc_uint8) var41; /* 6: loadb */ var42 = ptr7[i]; /* 7: convubw */ - var50.i = (orc_uint8) var42; + var49.i = (orc_uint8) var42; /* 8: loadb */ var43 = ptr8[i]; /* 9: convubw */ - var51.i = (orc_uint8) var43; + var50.i = (orc_uint8) var43; /* 10: shlw */ - var52.i = var49.i << 2; + var51.i = ((orc_uint16) var48.i) << 2; /* 12: mullw */ - var53.i = (var48.i * var44.i) & 0xffff; - /* 14: mullw */ - var54.i = (var50.i * var45.i) & 0xffff; - /* 15: subw */ - var55.i = var47.i - var53.i; - /* 16: addw */ - var56.i = var55.i + var52.i; - /* 17: subw */ - var57.i = var56.i - var54.i; - /* 18: addw */ - var58.i = var57.i + var51.i; - /* 19: absw */ - var59.i = ORC_ABS (var58.i); - /* 20: convuwl */ - var60.i = (orc_uint16) var59.i; - /* 22: cmpgtsl */ - var61.i = (var60.i > var46.i) ? (~0) : 0; - /* 23: andl */ - var62.i = var60.i & var61.i; - /* 24: accl */ - var12.i = var12.i + var62.i; + var52.i = (var47.i * var44.i) & 0xffff; + /* 13: mullw */ + var53.i = (var49.i * var44.i) & 0xffff; + /* 14: subw */ + var54.i = var46.i - var52.i; + /* 15: addw */ + var55.i = var54.i + var51.i; + /* 16: subw */ + var56.i = var55.i - var53.i; + /* 17: addw */ + var57.i = var56.i + var50.i; + /* 18: absw */ + var58.i = ORC_ABS (var57.i); + /* 19: convuwl */ + var59.i = (orc_uint16) var58.i; + /* 21: cmpgtsl */ + var60.i = (var59.i > var45.i) ? (~0) : 0; + /* 22: andl */ + var61.i = var59.i & var60.i; + /* 23: accl */ + var12.i = ((orc_uint32) var12.i) + ((orc_uint32) var61.i); } *a1 = var12.i; @@ -993,12 +986,8 @@ _backup_fieldanalysis_orc_opposite_parity_5_tap_planar_yuv (OrcExecutor * #else orc_union16 var44; #endif -#if defined(__APPLE__) && __GNUC__ == 4 && __GNUC_MINOR__ == 2 && defined (__i386__) - volatile orc_union16 var45; -#else - orc_union16 var45; -#endif - orc_union32 var46; + orc_union32 var45; + orc_union16 var46; orc_union16 var47; orc_union16 var48; orc_union16 var49; @@ -1011,10 +1000,9 @@ _backup_fieldanalysis_orc_opposite_parity_5_tap_planar_yuv (OrcExecutor * orc_union16 var56; orc_union16 var57; orc_union16 var58; - orc_union16 var59; + orc_union32 var59; orc_union32 var60; orc_union32 var61; - orc_union32 var62; ptr4 = (orc_int8 *) ex->arrays[4]; ptr5 = (orc_int8 *) ex->arrays[5]; @@ -1024,56 +1012,54 @@ _backup_fieldanalysis_orc_opposite_parity_5_tap_planar_yuv (OrcExecutor * /* 11: loadpw */ var44.i = (int) 0x00000003; /* 3 or 1.4822e-323f */ - /* 13: loadpw */ - var45.i = (int) 0x00000003; /* 3 or 1.4822e-323f */ - /* 21: loadpl */ - var46.i = ex->params[24]; + /* 20: loadpl */ + var45.i = ex->params[24]; for (i = 0; i < n; i++) { /* 0: loadb */ var39 = ptr4[i]; /* 1: convubw */ - var47.i = (orc_uint8) var39; + var46.i = (orc_uint8) var39; /* 2: loadb */ var40 = ptr5[i]; /* 3: convubw */ - var48.i = (orc_uint8) var40; + var47.i = (orc_uint8) var40; /* 4: loadb */ var41 = ptr6[i]; /* 5: convubw */ - var49.i = (orc_uint8) var41; + var48.i = (orc_uint8) var41; /* 6: loadb */ var42 = ptr7[i]; /* 7: convubw */ - var50.i = (orc_uint8) var42; + var49.i = (orc_uint8) var42; /* 8: loadb */ var43 = ptr8[i]; /* 9: convubw */ - var51.i = (orc_uint8) var43; + var50.i = (orc_uint8) var43; /* 10: shlw */ - var52.i = var49.i << 2; + var51.i = ((orc_uint16) var48.i) << 2; /* 12: mullw */ - var53.i = (var48.i * var44.i) & 0xffff; - /* 14: mullw */ - var54.i = (var50.i * var45.i) & 0xffff; - /* 15: subw */ - var55.i = var47.i - var53.i; - /* 16: addw */ - var56.i = var55.i + var52.i; - /* 17: subw */ - var57.i = var56.i - var54.i; - /* 18: addw */ - var58.i = var57.i + var51.i; - /* 19: absw */ - var59.i = ORC_ABS (var58.i); - /* 20: convuwl */ - var60.i = (orc_uint16) var59.i; - /* 22: cmpgtsl */ - var61.i = (var60.i > var46.i) ? (~0) : 0; - /* 23: andl */ - var62.i = var60.i & var61.i; - /* 24: accl */ - var12.i = var12.i + var62.i; + var52.i = (var47.i * var44.i) & 0xffff; + /* 13: mullw */ + var53.i = (var49.i * var44.i) & 0xffff; + /* 14: subw */ + var54.i = var46.i - var52.i; + /* 15: addw */ + var55.i = var54.i + var51.i; + /* 16: subw */ + var56.i = var55.i - var53.i; + /* 17: addw */ + var57.i = var56.i + var50.i; + /* 18: absw */ + var58.i = ORC_ABS (var57.i); + /* 19: convuwl */ + var59.i = (orc_uint16) var58.i; + /* 21: cmpgtsl */ + var60.i = (var59.i > var45.i) ? (~0) : 0; + /* 22: andl */ + var61.i = var59.i & var60.i; + /* 23: accl */ + var12.i = ((orc_uint32) var12.i) + ((orc_uint32) var61.i); } ex->accumulators[0] = var12.i; @@ -1102,7 +1088,7 @@ fieldanalysis_orc_opposite_parity_5_tap_planar_yuv (guint32 * ORC_RESTRICT a1, 97, 114, 105, 116, 121, 95, 53, 95, 116, 97, 112, 95, 112, 108, 97, 110, 97, 114, 95, 121, 117, 118, 12, 1, 1, 12, 1, 1, 12, 1, 1, 12, 1, - 1, 12, 1, 1, 13, 4, 14, 4, 2, 0, 0, 0, 14, 4, 3, 0, + 1, 12, 1, 1, 13, 4, 14, 2, 2, 0, 0, 0, 14, 2, 3, 0, 0, 0, 16, 4, 20, 2, 20, 2, 20, 2, 20, 2, 20, 2, 20, 4, 20, 4, 150, 32, 4, 150, 33, 5, 150, 34, 6, 150, 35, 7, 150, 36, 8, 93, 34, 34, 16, 89, 33, 33, 17, 89, 35, 35, 17, 98, 32, 32, @@ -1125,8 +1111,8 @@ fieldanalysis_orc_opposite_parity_5_tap_planar_yuv (guint32 * ORC_RESTRICT a1, orc_program_add_source (p, 1, "s4"); orc_program_add_source (p, 1, "s5"); orc_program_add_accumulator (p, 4, "a1"); - orc_program_add_constant (p, 4, 0x00000002, "c1"); - orc_program_add_constant (p, 4, 0x00000003, "c2"); + orc_program_add_constant (p, 2, 0x00000002, "c1"); + orc_program_add_constant (p, 2, 0x00000003, "c2"); orc_program_add_parameter (p, 4, "p1"); orc_program_add_temporary (p, 2, "t1"); orc_program_add_temporary (p, 2, "t2"); diff --git a/gst/gaudieffects/gstgaudieffectsorc-dist.c b/gst/gaudieffects/gstgaudieffectsorc-dist.c index b09cc47c25..0ca7fc1975 100644 --- a/gst/gaudieffects/gstgaudieffectsorc-dist.c +++ b/gst/gaudieffects/gstgaudieffectsorc-dist.c @@ -228,10 +228,10 @@ gaudi_orc_burn (guint32 * ORC_RESTRICT d1, const guint32 * ORC_RESTRICT s1, var44.x4[2] = (orc_uint8) var43.x4[2]; var44.x4[3] = (orc_uint8) var43.x4[3]; /* 9: shlw */ - var45.x4[0] = var44.x4[0] << 7; - var45.x4[1] = var44.x4[1] << 7; - var45.x4[2] = var44.x4[2] << 7; - var45.x4[3] = var44.x4[3] << 7; + var45.x4[0] = ((orc_uint16) var44.x4[0]) << 7; + var45.x4[1] = ((orc_uint16) var44.x4[1]) << 7; + var45.x4[2] = ((orc_uint16) var44.x4[2]) << 7; + var45.x4[3] = ((orc_uint16) var44.x4[3]) << 7; /* 10: divluw */ var46.x4[0] = ((var42.x4[0] & 0xff) == @@ -349,10 +349,10 @@ _backup_gaudi_orc_burn (OrcExecutor * ORC_RESTRICT ex) var44.x4[2] = (orc_uint8) var43.x4[2]; var44.x4[3] = (orc_uint8) var43.x4[3]; /* 9: shlw */ - var45.x4[0] = var44.x4[0] << 7; - var45.x4[1] = var44.x4[1] << 7; - var45.x4[2] = var44.x4[2] << 7; - var45.x4[3] = var44.x4[3] << 7; + var45.x4[0] = ((orc_uint16) var44.x4[0]) << 7; + var45.x4[1] = ((orc_uint16) var44.x4[1]) << 7; + var45.x4[2] = ((orc_uint16) var44.x4[2]) << 7; + var45.x4[3] = ((orc_uint16) var44.x4[3]) << 7; /* 10: divluw */ var46.x4[0] = ((var42.x4[0] & 0xff) == |