diff --git a/.gitignore b/.gitignore index 9a8a82a..cbdbad1 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/gst-plugins-bad-free-1.0.7.tar.xz +SOURCES/gst-plugins-bad-free-1.4.5.tar.xz diff --git a/.gstreamer1-plugins-bad-free.metadata b/.gstreamer1-plugins-bad-free.metadata index 5f0e7be..deead9f 100644 --- a/.gstreamer1-plugins-bad-free.metadata +++ b/.gstreamer1-plugins-bad-free.metadata @@ -1 +1 @@ -f0ff29602172dd3766328fe7dbe0133fdad871cf SOURCES/gst-plugins-bad-free-1.0.7.tar.xz +441ac0f0dd8766dd821a38ee4e4d3a7ea562c008 SOURCES/gst-plugins-bad-free-1.4.5.tar.xz diff --git a/SOURCES/0001-bayer-update-ORC-files.patch b/SOURCES/0001-bayer-update-ORC-files.patch new file mode 100644 index 0000000..7babbf8 --- /dev/null +++ b/SOURCES/0001-bayer-update-ORC-files.patch @@ -0,0 +1,2537 @@ +From 0a2f24ede92501089104b77c79026d030a190c6d Mon Sep 17 00:00:00 2001 +From: Wim Taymans +Date: Mon, 22 Jun 2015 13:29:25 +0200 +Subject: [PATCH] bayer: update ORC files + +Update ORC files with newest ORC to fix backup code generation error. +--- + gst/bayer/gstbayerorc-dist.c | 1376 +++++++++++++++++++++++------------------- + 1 file changed, 760 insertions(+), 616 deletions(-) + +diff --git a/gst/bayer/gstbayerorc-dist.c b/gst/bayer/gstbayerorc-dist.c +index c9afb6a..e79862f 100644 +--- a/gst/bayer/gstbayerorc-dist.c ++++ b/gst/bayer/gstbayerorc-dist.c +@@ -667,16 +667,21 @@ bayer_orc_merge_bg_bgra (guint8 * ORC_RESTRICT d1, + orc_union16 var43; + #endif + orc_union16 var44; +- orc_union64 var45; +- orc_union16 var46; ++#if defined(__APPLE__) && __GNUC__ == 4 && __GNUC_MINOR__ == 2 && defined (__i386__) ++ volatile orc_union16 var45; ++#else ++ orc_union16 var45; ++#endif ++ orc_union64 var46; + orc_union16 var47; + orc_union16 var48; + orc_union16 var49; + orc_union16 var50; + orc_union16 var51; + orc_union16 var52; +- orc_union32 var53; ++ orc_union16 var53; + orc_union32 var54; ++ orc_union32 var55; + + ptr0 = (orc_union64 *) d1; + ptr4 = (orc_union16 *) s1; +@@ -690,6 +695,9 @@ 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 */ +@@ -697,71 +705,71 @@ bayer_orc_merge_bg_bgra (guint8 * ORC_RESTRICT d1, + /* 1: loadw */ + var38 = ptr9[i]; + /* 2: avgub */ +- 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; ++ 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; + /* 3: loadw */ + var39 = ptr4[i]; + /* 4: loadw */ + var40 = ptr8[i]; + /* 5: avgub */ +- 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; ++ 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; + /* 6: loadw */ + var41 = ptr7[i]; + /* 7: copyw */ +- var48.i = var41.i; ++ var49.i = var41.i; + /* 8: avgub */ +- 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; ++ 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; + /* 10: andw */ +- var50.i = var49.i & var42.i; ++ var51.i = var50.i & var42.i; + /* 12: andw */ +- var51.i = var48.i & var43.i; ++ var52.i = var49.i & var43.i; + /* 13: orw */ +- var52.i = var51.i | var50.i; ++ var53.i = var52.i | var51.i; + /* 14: loadw */ + var44 = ptr6[i]; + /* 15: mergebw */ + { + orc_union16 _dest; + _dest.x2[0] = var44.x2[0]; +- _dest.x2[1] = var52.x2[0]; +- var53.x2[0] = _dest.i; ++ _dest.x2[1] = var53.x2[0]; ++ var54.x2[0] = _dest.i; + } + { + orc_union16 _dest; + _dest.x2[0] = var44.x2[1]; +- _dest.x2[1] = var52.x2[1]; +- var53.x2[1] = _dest.i; ++ _dest.x2[1] = var53.x2[1]; ++ var54.x2[1] = _dest.i; + } +- /* 16: mergebw */ ++ /* 17: mergebw */ + { + orc_union16 _dest; +- _dest.x2[0] = var46.x2[0]; +- _dest.x2[1] = var42.x2[0]; +- var54.x2[0] = _dest.i; ++ _dest.x2[0] = var47.x2[0]; ++ _dest.x2[1] = var45.x2[0]; ++ var55.x2[0] = _dest.i; + } + { + orc_union16 _dest; +- _dest.x2[0] = var46.x2[1]; +- _dest.x2[1] = var42.x2[1]; +- var54.x2[1] = _dest.i; ++ _dest.x2[0] = var47.x2[1]; ++ _dest.x2[1] = var45.x2[1]; ++ var55.x2[1] = _dest.i; + } +- /* 17: mergewl */ ++ /* 18: mergewl */ + { + orc_union32 _dest; +- _dest.x2[0] = var53.x2[0]; +- _dest.x2[1] = var54.x2[0]; +- var45.x2[0] = _dest.i; ++ _dest.x2[0] = var54.x2[0]; ++ _dest.x2[1] = var55.x2[0]; ++ var46.x2[0] = _dest.i; + } + { + orc_union32 _dest; +- _dest.x2[0] = var53.x2[1]; +- _dest.x2[1] = var54.x2[1]; +- var45.x2[1] = _dest.i; ++ _dest.x2[0] = var54.x2[1]; ++ _dest.x2[1] = var55.x2[1]; ++ var46.x2[1] = _dest.i; + } +- /* 18: storeq */ +- ptr0[i] = var45; ++ /* 19: storeq */ ++ ptr0[i] = var46; + } + + } +@@ -795,16 +803,21 @@ _backup_bayer_orc_merge_bg_bgra (OrcExecutor * ORC_RESTRICT ex) + orc_union16 var43; + #endif + orc_union16 var44; +- orc_union64 var45; +- orc_union16 var46; ++#if defined(__APPLE__) && __GNUC__ == 4 && __GNUC_MINOR__ == 2 && defined (__i386__) ++ volatile orc_union16 var45; ++#else ++ orc_union16 var45; ++#endif ++ orc_union64 var46; + orc_union16 var47; + orc_union16 var48; + orc_union16 var49; + orc_union16 var50; + orc_union16 var51; + orc_union16 var52; +- orc_union32 var53; ++ orc_union16 var53; + orc_union32 var54; ++ orc_union32 var55; + + ptr0 = (orc_union64 *) ex->arrays[0]; + ptr4 = (orc_union16 *) ex->arrays[4]; +@@ -818,6 +831,9 @@ _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 */ +@@ -825,71 +841,71 @@ _backup_bayer_orc_merge_bg_bgra (OrcExecutor * ORC_RESTRICT ex) + /* 1: loadw */ + var38 = ptr9[i]; + /* 2: avgub */ +- 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; ++ 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; + /* 3: loadw */ + var39 = ptr4[i]; + /* 4: loadw */ + var40 = ptr8[i]; + /* 5: avgub */ +- 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; ++ 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; + /* 6: loadw */ + var41 = ptr7[i]; + /* 7: copyw */ +- var48.i = var41.i; ++ var49.i = var41.i; + /* 8: avgub */ +- 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; ++ 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; + /* 10: andw */ +- var50.i = var49.i & var42.i; ++ var51.i = var50.i & var42.i; + /* 12: andw */ +- var51.i = var48.i & var43.i; ++ var52.i = var49.i & var43.i; + /* 13: orw */ +- var52.i = var51.i | var50.i; ++ var53.i = var52.i | var51.i; + /* 14: loadw */ + var44 = ptr6[i]; + /* 15: mergebw */ + { + orc_union16 _dest; + _dest.x2[0] = var44.x2[0]; +- _dest.x2[1] = var52.x2[0]; +- var53.x2[0] = _dest.i; ++ _dest.x2[1] = var53.x2[0]; ++ var54.x2[0] = _dest.i; + } + { + orc_union16 _dest; + _dest.x2[0] = var44.x2[1]; +- _dest.x2[1] = var52.x2[1]; +- var53.x2[1] = _dest.i; ++ _dest.x2[1] = var53.x2[1]; ++ var54.x2[1] = _dest.i; + } +- /* 16: mergebw */ ++ /* 17: mergebw */ + { + orc_union16 _dest; +- _dest.x2[0] = var46.x2[0]; +- _dest.x2[1] = var42.x2[0]; +- var54.x2[0] = _dest.i; ++ _dest.x2[0] = var47.x2[0]; ++ _dest.x2[1] = var45.x2[0]; ++ var55.x2[0] = _dest.i; + } + { + orc_union16 _dest; +- _dest.x2[0] = var46.x2[1]; +- _dest.x2[1] = var42.x2[1]; +- var54.x2[1] = _dest.i; ++ _dest.x2[0] = var47.x2[1]; ++ _dest.x2[1] = var45.x2[1]; ++ var55.x2[1] = _dest.i; + } +- /* 17: mergewl */ ++ /* 18: mergewl */ + { + orc_union32 _dest; +- _dest.x2[0] = var53.x2[0]; +- _dest.x2[1] = var54.x2[0]; +- var45.x2[0] = _dest.i; ++ _dest.x2[0] = var54.x2[0]; ++ _dest.x2[1] = var55.x2[0]; ++ var46.x2[0] = _dest.i; + } + { + orc_union32 _dest; +- _dest.x2[0] = var53.x2[1]; +- _dest.x2[1] = var54.x2[1]; +- var45.x2[1] = _dest.i; ++ _dest.x2[0] = var54.x2[1]; ++ _dest.x2[1] = var55.x2[1]; ++ var46.x2[1] = _dest.i; + } +- /* 18: storeq */ +- ptr0[i] = var45; ++ /* 19: storeq */ ++ ptr0[i] = var46; + } + + } +@@ -915,11 +931,12 @@ 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, +- 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, +- 34, 16, 21, 1, 195, 0, 33, 32, 2, 0, ++ 2, 255, 0, 0, 0, 14, 2, 0, 255, 0, 0, 14, 1, 255, 0, 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, 34, 18, 21, 1, 195, 0, 33, 32, 2, 0, ++ + }; + p = orc_program_new_from_static_bytecode (bc); + orc_program_set_backup_function (p, _backup_bayer_orc_merge_bg_bgra); +@@ -936,6 +953,7 @@ bayer_orc_merge_bg_bgra (guint8 * ORC_RESTRICT d1, + orc_program_add_source (p, 2, "s6"); + orc_program_add_constant (p, 2, 0x000000ff, "c1"); + orc_program_add_constant (p, 2, 0x0000ff00, "c2"); ++ orc_program_add_constant (p, 1, 0x000000ff, "c3"); + orc_program_add_temporary (p, 4, "t1"); + orc_program_add_temporary (p, 4, "t2"); + orc_program_add_temporary (p, 2, "t3"); +@@ -958,7 +976,7 @@ bayer_orc_merge_bg_bgra (guint8 * ORC_RESTRICT d1, + ORC_VAR_D1); + orc_program_append_2 (p, "mergebw", 1, ORC_VAR_T2, ORC_VAR_S3, ORC_VAR_T4, + ORC_VAR_D1); +- orc_program_append_2 (p, "mergebw", 1, ORC_VAR_T1, ORC_VAR_T3, ORC_VAR_C1, ++ orc_program_append_2 (p, "mergebw", 1, ORC_VAR_T1, ORC_VAR_T3, ORC_VAR_C3, + ORC_VAR_D1); + orc_program_append_2 (p, "mergewl", 1, ORC_VAR_D1, ORC_VAR_T2, ORC_VAR_T1, + ORC_VAR_D1); +@@ -1021,16 +1039,21 @@ bayer_orc_merge_gr_bgra (guint8 * ORC_RESTRICT d1, + orc_union16 var43; + #endif + orc_union16 var44; +- orc_union64 var45; +- orc_union16 var46; ++#if defined(__APPLE__) && __GNUC__ == 4 && __GNUC_MINOR__ == 2 && defined (__i386__) ++ volatile orc_union16 var45; ++#else ++ orc_union16 var45; ++#endif ++ orc_union64 var46; + orc_union16 var47; + orc_union16 var48; + orc_union16 var49; + orc_union16 var50; + orc_union16 var51; + orc_union16 var52; +- orc_union32 var53; ++ orc_union16 var53; + orc_union32 var54; ++ orc_union32 var55; + + ptr0 = (orc_union64 *) d1; + ptr4 = (orc_union16 *) s1; +@@ -1044,6 +1067,9 @@ 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 */ +@@ -1051,71 +1077,71 @@ bayer_orc_merge_gr_bgra (guint8 * ORC_RESTRICT d1, + /* 1: loadw */ + var38 = ptr8[i]; + /* 2: avgub */ +- 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; ++ 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; + /* 3: loadw */ + var39 = ptr5[i]; + /* 4: loadw */ + var40 = ptr9[i]; + /* 5: avgub */ +- 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; ++ 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; + /* 6: loadw */ + var41 = ptr6[i]; + /* 7: copyw */ +- var48.i = var41.i; ++ var49.i = var41.i; + /* 8: avgub */ +- 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; ++ 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; + /* 10: andw */ +- var50.i = var49.i & var42.i; ++ var51.i = var50.i & var42.i; + /* 12: andw */ +- var51.i = var48.i & var43.i; ++ var52.i = var49.i & var43.i; + /* 13: orw */ +- var52.i = var51.i | var50.i; ++ var53.i = var52.i | var51.i; + /* 14: mergebw */ + { + orc_union16 _dest; +- _dest.x2[0] = var46.x2[0]; +- _dest.x2[1] = var52.x2[0]; +- var53.x2[0] = _dest.i; ++ _dest.x2[0] = var47.x2[0]; ++ _dest.x2[1] = var53.x2[0]; ++ var54.x2[0] = _dest.i; + } + { + orc_union16 _dest; +- _dest.x2[0] = var46.x2[1]; +- _dest.x2[1] = var52.x2[1]; +- var53.x2[1] = _dest.i; ++ _dest.x2[0] = var47.x2[1]; ++ _dest.x2[1] = var53.x2[1]; ++ var54.x2[1] = _dest.i; + } + /* 15: loadw */ + var44 = ptr7[i]; +- /* 16: mergebw */ ++ /* 17: mergebw */ + { + orc_union16 _dest; + _dest.x2[0] = var44.x2[0]; +- _dest.x2[1] = var43.x2[0]; +- var54.x2[0] = _dest.i; ++ _dest.x2[1] = var45.x2[0]; ++ var55.x2[0] = _dest.i; + } + { + orc_union16 _dest; + _dest.x2[0] = var44.x2[1]; +- _dest.x2[1] = var43.x2[1]; +- var54.x2[1] = _dest.i; ++ _dest.x2[1] = var45.x2[1]; ++ var55.x2[1] = _dest.i; + } +- /* 17: mergewl */ ++ /* 18: mergewl */ + { + orc_union32 _dest; +- _dest.x2[0] = var53.x2[0]; +- _dest.x2[1] = var54.x2[0]; +- var45.x2[0] = _dest.i; ++ _dest.x2[0] = var54.x2[0]; ++ _dest.x2[1] = var55.x2[0]; ++ var46.x2[0] = _dest.i; + } + { + orc_union32 _dest; +- _dest.x2[0] = var53.x2[1]; +- _dest.x2[1] = var54.x2[1]; +- var45.x2[1] = _dest.i; ++ _dest.x2[0] = var54.x2[1]; ++ _dest.x2[1] = var55.x2[1]; ++ var46.x2[1] = _dest.i; + } +- /* 18: storeq */ +- ptr0[i] = var45; ++ /* 19: storeq */ ++ ptr0[i] = var46; + } + + } +@@ -1149,16 +1175,21 @@ _backup_bayer_orc_merge_gr_bgra (OrcExecutor * ORC_RESTRICT ex) + orc_union16 var43; + #endif + orc_union16 var44; +- orc_union64 var45; +- orc_union16 var46; ++#if defined(__APPLE__) && __GNUC__ == 4 && __GNUC_MINOR__ == 2 && defined (__i386__) ++ volatile orc_union16 var45; ++#else ++ orc_union16 var45; ++#endif ++ orc_union64 var46; + orc_union16 var47; + orc_union16 var48; + orc_union16 var49; + orc_union16 var50; + orc_union16 var51; + orc_union16 var52; +- orc_union32 var53; ++ orc_union16 var53; + orc_union32 var54; ++ orc_union32 var55; + + ptr0 = (orc_union64 *) ex->arrays[0]; + ptr4 = (orc_union16 *) ex->arrays[4]; +@@ -1172,6 +1203,9 @@ _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 */ +@@ -1179,71 +1213,71 @@ _backup_bayer_orc_merge_gr_bgra (OrcExecutor * ORC_RESTRICT ex) + /* 1: loadw */ + var38 = ptr8[i]; + /* 2: avgub */ +- 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; ++ 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; + /* 3: loadw */ + var39 = ptr5[i]; + /* 4: loadw */ + var40 = ptr9[i]; + /* 5: avgub */ +- 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; ++ 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; + /* 6: loadw */ + var41 = ptr6[i]; + /* 7: copyw */ +- var48.i = var41.i; ++ var49.i = var41.i; + /* 8: avgub */ +- 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; ++ 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; + /* 10: andw */ +- var50.i = var49.i & var42.i; ++ var51.i = var50.i & var42.i; + /* 12: andw */ +- var51.i = var48.i & var43.i; ++ var52.i = var49.i & var43.i; + /* 13: orw */ +- var52.i = var51.i | var50.i; ++ var53.i = var52.i | var51.i; + /* 14: mergebw */ + { + orc_union16 _dest; +- _dest.x2[0] = var46.x2[0]; +- _dest.x2[1] = var52.x2[0]; +- var53.x2[0] = _dest.i; ++ _dest.x2[0] = var47.x2[0]; ++ _dest.x2[1] = var53.x2[0]; ++ var54.x2[0] = _dest.i; + } + { + orc_union16 _dest; +- _dest.x2[0] = var46.x2[1]; +- _dest.x2[1] = var52.x2[1]; +- var53.x2[1] = _dest.i; ++ _dest.x2[0] = var47.x2[1]; ++ _dest.x2[1] = var53.x2[1]; ++ var54.x2[1] = _dest.i; + } + /* 15: loadw */ + var44 = ptr7[i]; +- /* 16: mergebw */ ++ /* 17: mergebw */ + { + orc_union16 _dest; + _dest.x2[0] = var44.x2[0]; +- _dest.x2[1] = var43.x2[0]; +- var54.x2[0] = _dest.i; ++ _dest.x2[1] = var45.x2[0]; ++ var55.x2[0] = _dest.i; + } + { + orc_union16 _dest; + _dest.x2[0] = var44.x2[1]; +- _dest.x2[1] = var43.x2[1]; +- var54.x2[1] = _dest.i; ++ _dest.x2[1] = var45.x2[1]; ++ var55.x2[1] = _dest.i; + } +- /* 17: mergewl */ ++ /* 18: mergewl */ + { + orc_union32 _dest; +- _dest.x2[0] = var53.x2[0]; +- _dest.x2[1] = var54.x2[0]; +- var45.x2[0] = _dest.i; ++ _dest.x2[0] = var54.x2[0]; ++ _dest.x2[1] = var55.x2[0]; ++ var46.x2[0] = _dest.i; + } + { + orc_union32 _dest; +- _dest.x2[0] = var53.x2[1]; +- _dest.x2[1] = var54.x2[1]; +- var45.x2[1] = _dest.i; ++ _dest.x2[0] = var54.x2[1]; ++ _dest.x2[1] = var55.x2[1]; ++ var46.x2[1] = _dest.i; + } +- /* 18: storeq */ +- ptr0[i] = var45; ++ /* 19: storeq */ ++ ptr0[i] = var46; + } + + } +@@ -1269,11 +1303,12 @@ 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, +- 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, +- 7, 17, 21, 1, 195, 0, 33, 32, 2, 0, ++ 2, 0, 255, 0, 0, 14, 2, 255, 0, 0, 0, 14, 1, 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, 7, 18, 21, 1, 195, 0, 33, 32, 2, 0, ++ + }; + p = orc_program_new_from_static_bytecode (bc); + orc_program_set_backup_function (p, _backup_bayer_orc_merge_gr_bgra); +@@ -1290,6 +1325,7 @@ bayer_orc_merge_gr_bgra (guint8 * ORC_RESTRICT d1, + orc_program_add_source (p, 2, "s6"); + orc_program_add_constant (p, 2, 0x0000ff00, "c1"); + orc_program_add_constant (p, 2, 0x000000ff, "c2"); ++ orc_program_add_constant (p, 1, 0x000000ff, "c3"); + orc_program_add_temporary (p, 4, "t1"); + orc_program_add_temporary (p, 4, "t2"); + orc_program_add_temporary (p, 2, "t3"); +@@ -1312,7 +1348,7 @@ bayer_orc_merge_gr_bgra (guint8 * ORC_RESTRICT d1, + ORC_VAR_D1); + orc_program_append_2 (p, "mergebw", 1, ORC_VAR_T2, ORC_VAR_T3, ORC_VAR_T4, + ORC_VAR_D1); +- orc_program_append_2 (p, "mergebw", 1, ORC_VAR_T1, ORC_VAR_S4, ORC_VAR_C2, ++ orc_program_append_2 (p, "mergebw", 1, ORC_VAR_T1, ORC_VAR_S4, ORC_VAR_C3, + ORC_VAR_D1); + orc_program_append_2 (p, "mergewl", 1, ORC_VAR_D1, ORC_VAR_T2, ORC_VAR_T1, + ORC_VAR_D1); +@@ -1374,17 +1410,22 @@ 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; +- orc_union64 var45; +- orc_union16 var46; ++#endif ++ orc_union16 var45; ++ orc_union64 var46; + orc_union16 var47; + orc_union16 var48; + orc_union16 var49; + orc_union16 var50; + orc_union16 var51; + orc_union16 var52; +- orc_union32 var53; ++ orc_union16 var53; + orc_union32 var54; ++ orc_union32 var55; + + ptr0 = (orc_union64 *) d1; + ptr4 = (orc_union16 *) s1; +@@ -1398,6 +1439,9 @@ 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 */ +@@ -1405,71 +1449,71 @@ bayer_orc_merge_bg_abgr (guint8 * ORC_RESTRICT d1, + /* 1: loadw */ + var38 = ptr9[i]; + /* 2: avgub */ +- 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; ++ 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; + /* 3: loadw */ + var39 = ptr4[i]; + /* 4: loadw */ + var40 = ptr8[i]; + /* 5: avgub */ +- 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; ++ 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; + /* 6: loadw */ + var41 = ptr7[i]; + /* 7: copyw */ +- var48.i = var41.i; ++ var49.i = var41.i; + /* 8: avgub */ +- 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; ++ 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; + /* 10: andw */ +- var50.i = var49.i & var42.i; ++ var51.i = var50.i & var42.i; + /* 12: andw */ +- var51.i = var48.i & var43.i; ++ var52.i = var49.i & var43.i; + /* 13: orw */ +- var52.i = var51.i | var50.i; +- /* 14: loadw */ +- var44 = ptr6[i]; +- /* 15: mergebw */ ++ var53.i = var52.i | var51.i; ++ /* 15: loadw */ ++ var45 = ptr6[i]; ++ /* 16: mergebw */ + { + orc_union16 _dest; +- _dest.x2[0] = var42.x2[0]; +- _dest.x2[1] = var44.x2[0]; +- var53.x2[0] = _dest.i; ++ _dest.x2[0] = var44.x2[0]; ++ _dest.x2[1] = var45.x2[0]; ++ var54.x2[0] = _dest.i; + } + { + orc_union16 _dest; +- _dest.x2[0] = var42.x2[1]; +- _dest.x2[1] = var44.x2[1]; +- var53.x2[1] = _dest.i; ++ _dest.x2[0] = var44.x2[1]; ++ _dest.x2[1] = var45.x2[1]; ++ var54.x2[1] = _dest.i; + } +- /* 16: mergebw */ ++ /* 17: mergebw */ + { + orc_union16 _dest; +- _dest.x2[0] = var52.x2[0]; +- _dest.x2[1] = var46.x2[0]; +- var54.x2[0] = _dest.i; ++ _dest.x2[0] = var53.x2[0]; ++ _dest.x2[1] = var47.x2[0]; ++ var55.x2[0] = _dest.i; + } + { + orc_union16 _dest; +- _dest.x2[0] = var52.x2[1]; +- _dest.x2[1] = var46.x2[1]; +- var54.x2[1] = _dest.i; ++ _dest.x2[0] = var53.x2[1]; ++ _dest.x2[1] = var47.x2[1]; ++ var55.x2[1] = _dest.i; + } +- /* 17: mergewl */ ++ /* 18: mergewl */ + { + orc_union32 _dest; +- _dest.x2[0] = var53.x2[0]; +- _dest.x2[1] = var54.x2[0]; +- var45.x2[0] = _dest.i; ++ _dest.x2[0] = var54.x2[0]; ++ _dest.x2[1] = var55.x2[0]; ++ var46.x2[0] = _dest.i; + } + { + orc_union32 _dest; +- _dest.x2[0] = var53.x2[1]; +- _dest.x2[1] = var54.x2[1]; +- var45.x2[1] = _dest.i; ++ _dest.x2[0] = var54.x2[1]; ++ _dest.x2[1] = var55.x2[1]; ++ var46.x2[1] = _dest.i; + } +- /* 18: storeq */ +- ptr0[i] = var45; ++ /* 19: storeq */ ++ ptr0[i] = var46; + } + + } +@@ -1502,17 +1546,22 @@ _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; +- orc_union64 var45; +- orc_union16 var46; ++#endif ++ orc_union16 var45; ++ orc_union64 var46; + orc_union16 var47; + orc_union16 var48; + orc_union16 var49; + orc_union16 var50; + orc_union16 var51; + orc_union16 var52; +- orc_union32 var53; ++ orc_union16 var53; + orc_union32 var54; ++ orc_union32 var55; + + ptr0 = (orc_union64 *) ex->arrays[0]; + ptr4 = (orc_union16 *) ex->arrays[4]; +@@ -1526,6 +1575,9 @@ _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 */ +@@ -1533,71 +1585,71 @@ _backup_bayer_orc_merge_bg_abgr (OrcExecutor * ORC_RESTRICT ex) + /* 1: loadw */ + var38 = ptr9[i]; + /* 2: avgub */ +- 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; ++ 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; + /* 3: loadw */ + var39 = ptr4[i]; + /* 4: loadw */ + var40 = ptr8[i]; + /* 5: avgub */ +- 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; ++ 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; + /* 6: loadw */ + var41 = ptr7[i]; + /* 7: copyw */ +- var48.i = var41.i; ++ var49.i = var41.i; + /* 8: avgub */ +- 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; ++ 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; + /* 10: andw */ +- var50.i = var49.i & var42.i; ++ var51.i = var50.i & var42.i; + /* 12: andw */ +- var51.i = var48.i & var43.i; ++ var52.i = var49.i & var43.i; + /* 13: orw */ +- var52.i = var51.i | var50.i; +- /* 14: loadw */ +- var44 = ptr6[i]; +- /* 15: mergebw */ ++ var53.i = var52.i | var51.i; ++ /* 15: loadw */ ++ var45 = ptr6[i]; ++ /* 16: mergebw */ + { + orc_union16 _dest; +- _dest.x2[0] = var42.x2[0]; +- _dest.x2[1] = var44.x2[0]; +- var53.x2[0] = _dest.i; ++ _dest.x2[0] = var44.x2[0]; ++ _dest.x2[1] = var45.x2[0]; ++ var54.x2[0] = _dest.i; + } + { + orc_union16 _dest; +- _dest.x2[0] = var42.x2[1]; +- _dest.x2[1] = var44.x2[1]; +- var53.x2[1] = _dest.i; ++ _dest.x2[0] = var44.x2[1]; ++ _dest.x2[1] = var45.x2[1]; ++ var54.x2[1] = _dest.i; + } +- /* 16: mergebw */ ++ /* 17: mergebw */ + { + orc_union16 _dest; +- _dest.x2[0] = var52.x2[0]; +- _dest.x2[1] = var46.x2[0]; +- var54.x2[0] = _dest.i; ++ _dest.x2[0] = var53.x2[0]; ++ _dest.x2[1] = var47.x2[0]; ++ var55.x2[0] = _dest.i; + } + { + orc_union16 _dest; +- _dest.x2[0] = var52.x2[1]; +- _dest.x2[1] = var46.x2[1]; +- var54.x2[1] = _dest.i; ++ _dest.x2[0] = var53.x2[1]; ++ _dest.x2[1] = var47.x2[1]; ++ var55.x2[1] = _dest.i; + } +- /* 17: mergewl */ ++ /* 18: mergewl */ + { + orc_union32 _dest; +- _dest.x2[0] = var53.x2[0]; +- _dest.x2[1] = var54.x2[0]; +- var45.x2[0] = _dest.i; ++ _dest.x2[0] = var54.x2[0]; ++ _dest.x2[1] = var55.x2[0]; ++ var46.x2[0] = _dest.i; + } + { + orc_union32 _dest; +- _dest.x2[0] = var53.x2[1]; +- _dest.x2[1] = var54.x2[1]; +- var45.x2[1] = _dest.i; ++ _dest.x2[0] = var54.x2[1]; ++ _dest.x2[1] = var55.x2[1]; ++ var46.x2[1] = _dest.i; + } +- /* 18: storeq */ +- ptr0[i] = var45; ++ /* 19: storeq */ ++ ptr0[i] = var46; + } + + } +@@ -1623,11 +1675,12 @@ 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, +- 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, +- 35, 34, 21, 1, 195, 0, 32, 33, 2, 0, ++ 2, 255, 0, 0, 0, 14, 2, 0, 255, 0, 0, 14, 1, 255, 0, 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, ++ 18, 6, 21, 1, 196, 33, 35, 34, 21, 1, 195, 0, 32, 33, 2, 0, ++ + }; + p = orc_program_new_from_static_bytecode (bc); + orc_program_set_backup_function (p, _backup_bayer_orc_merge_bg_abgr); +@@ -1644,6 +1697,7 @@ bayer_orc_merge_bg_abgr (guint8 * ORC_RESTRICT d1, + orc_program_add_source (p, 2, "s6"); + orc_program_add_constant (p, 2, 0x000000ff, "c1"); + orc_program_add_constant (p, 2, 0x0000ff00, "c2"); ++ orc_program_add_constant (p, 1, 0x000000ff, "c3"); + orc_program_add_temporary (p, 4, "t1"); + orc_program_add_temporary (p, 4, "t2"); + orc_program_add_temporary (p, 2, "t3"); +@@ -1664,7 +1718,7 @@ bayer_orc_merge_bg_abgr (guint8 * ORC_RESTRICT d1, + ORC_VAR_D1); + orc_program_append_2 (p, "orw", 0, ORC_VAR_T4, ORC_VAR_T5, ORC_VAR_T4, + ORC_VAR_D1); +- orc_program_append_2 (p, "mergebw", 1, ORC_VAR_T1, ORC_VAR_C1, ORC_VAR_S3, ++ orc_program_append_2 (p, "mergebw", 1, ORC_VAR_T1, ORC_VAR_C3, ORC_VAR_S3, + ORC_VAR_D1); + orc_program_append_2 (p, "mergebw", 1, ORC_VAR_T2, ORC_VAR_T4, ORC_VAR_T3, + ORC_VAR_D1); +@@ -1728,17 +1782,22 @@ 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; +- orc_union64 var45; +- orc_union16 var46; ++#endif ++ orc_union16 var45; ++ orc_union64 var46; + orc_union16 var47; + orc_union16 var48; + orc_union16 var49; + orc_union16 var50; + orc_union16 var51; + orc_union16 var52; +- orc_union32 var53; ++ orc_union16 var53; + orc_union32 var54; ++ orc_union32 var55; + + ptr0 = (orc_union64 *) d1; + ptr4 = (orc_union16 *) s1; +@@ -1752,6 +1811,9 @@ 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 */ +@@ -1759,71 +1821,71 @@ bayer_orc_merge_gr_abgr (guint8 * ORC_RESTRICT d1, + /* 1: loadw */ + var38 = ptr8[i]; + /* 2: avgub */ +- 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; ++ 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; + /* 3: loadw */ + var39 = ptr5[i]; + /* 4: loadw */ + var40 = ptr9[i]; + /* 5: avgub */ +- 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; ++ 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; + /* 6: loadw */ + var41 = ptr6[i]; + /* 7: copyw */ +- var48.i = var41.i; ++ var49.i = var41.i; + /* 8: avgub */ +- 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; ++ 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; + /* 10: andw */ +- var50.i = var49.i & var42.i; ++ var51.i = var50.i & var42.i; + /* 12: andw */ +- var51.i = var48.i & var43.i; ++ var52.i = var49.i & var43.i; + /* 13: orw */ +- var52.i = var51.i | var50.i; +- /* 14: mergebw */ ++ var53.i = var52.i | var51.i; ++ /* 15: mergebw */ + { + orc_union16 _dest; +- _dest.x2[0] = var43.x2[0]; +- _dest.x2[1] = var46.x2[0]; +- var53.x2[0] = _dest.i; ++ _dest.x2[0] = var44.x2[0]; ++ _dest.x2[1] = var47.x2[0]; ++ var54.x2[0] = _dest.i; + } + { + orc_union16 _dest; +- _dest.x2[0] = var43.x2[1]; +- _dest.x2[1] = var46.x2[1]; +- var53.x2[1] = _dest.i; ++ _dest.x2[0] = var44.x2[1]; ++ _dest.x2[1] = var47.x2[1]; ++ var54.x2[1] = _dest.i; + } +- /* 15: loadw */ +- var44 = ptr7[i]; +- /* 16: mergebw */ ++ /* 16: loadw */ ++ var45 = ptr7[i]; ++ /* 17: mergebw */ + { + orc_union16 _dest; +- _dest.x2[0] = var52.x2[0]; +- _dest.x2[1] = var44.x2[0]; +- var54.x2[0] = _dest.i; ++ _dest.x2[0] = var53.x2[0]; ++ _dest.x2[1] = var45.x2[0]; ++ var55.x2[0] = _dest.i; + } + { + orc_union16 _dest; +- _dest.x2[0] = var52.x2[1]; +- _dest.x2[1] = var44.x2[1]; +- var54.x2[1] = _dest.i; ++ _dest.x2[0] = var53.x2[1]; ++ _dest.x2[1] = var45.x2[1]; ++ var55.x2[1] = _dest.i; + } +- /* 17: mergewl */ ++ /* 18: mergewl */ + { + orc_union32 _dest; +- _dest.x2[0] = var53.x2[0]; +- _dest.x2[1] = var54.x2[0]; +- var45.x2[0] = _dest.i; ++ _dest.x2[0] = var54.x2[0]; ++ _dest.x2[1] = var55.x2[0]; ++ var46.x2[0] = _dest.i; + } + { + orc_union32 _dest; +- _dest.x2[0] = var53.x2[1]; +- _dest.x2[1] = var54.x2[1]; +- var45.x2[1] = _dest.i; ++ _dest.x2[0] = var54.x2[1]; ++ _dest.x2[1] = var55.x2[1]; ++ var46.x2[1] = _dest.i; + } +- /* 18: storeq */ +- ptr0[i] = var45; ++ /* 19: storeq */ ++ ptr0[i] = var46; + } + + } +@@ -1856,17 +1918,22 @@ _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; +- orc_union64 var45; +- orc_union16 var46; ++#endif ++ orc_union16 var45; ++ orc_union64 var46; + orc_union16 var47; + orc_union16 var48; + orc_union16 var49; + orc_union16 var50; + orc_union16 var51; + orc_union16 var52; +- orc_union32 var53; ++ orc_union16 var53; + orc_union32 var54; ++ orc_union32 var55; + + ptr0 = (orc_union64 *) ex->arrays[0]; + ptr4 = (orc_union16 *) ex->arrays[4]; +@@ -1880,6 +1947,9 @@ _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 */ +@@ -1887,71 +1957,71 @@ _backup_bayer_orc_merge_gr_abgr (OrcExecutor * ORC_RESTRICT ex) + /* 1: loadw */ + var38 = ptr8[i]; + /* 2: avgub */ +- 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; ++ 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; + /* 3: loadw */ + var39 = ptr5[i]; + /* 4: loadw */ + var40 = ptr9[i]; + /* 5: avgub */ +- 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; ++ 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; + /* 6: loadw */ + var41 = ptr6[i]; + /* 7: copyw */ +- var48.i = var41.i; ++ var49.i = var41.i; + /* 8: avgub */ +- 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; ++ 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; + /* 10: andw */ +- var50.i = var49.i & var42.i; ++ var51.i = var50.i & var42.i; + /* 12: andw */ +- var51.i = var48.i & var43.i; ++ var52.i = var49.i & var43.i; + /* 13: orw */ +- var52.i = var51.i | var50.i; +- /* 14: mergebw */ ++ var53.i = var52.i | var51.i; ++ /* 15: mergebw */ + { + orc_union16 _dest; +- _dest.x2[0] = var43.x2[0]; +- _dest.x2[1] = var46.x2[0]; +- var53.x2[0] = _dest.i; ++ _dest.x2[0] = var44.x2[0]; ++ _dest.x2[1] = var47.x2[0]; ++ var54.x2[0] = _dest.i; + } + { + orc_union16 _dest; +- _dest.x2[0] = var43.x2[1]; +- _dest.x2[1] = var46.x2[1]; +- var53.x2[1] = _dest.i; ++ _dest.x2[0] = var44.x2[1]; ++ _dest.x2[1] = var47.x2[1]; ++ var54.x2[1] = _dest.i; + } +- /* 15: loadw */ +- var44 = ptr7[i]; +- /* 16: mergebw */ ++ /* 16: loadw */ ++ var45 = ptr7[i]; ++ /* 17: mergebw */ + { + orc_union16 _dest; +- _dest.x2[0] = var52.x2[0]; +- _dest.x2[1] = var44.x2[0]; +- var54.x2[0] = _dest.i; ++ _dest.x2[0] = var53.x2[0]; ++ _dest.x2[1] = var45.x2[0]; ++ var55.x2[0] = _dest.i; + } + { + orc_union16 _dest; +- _dest.x2[0] = var52.x2[1]; +- _dest.x2[1] = var44.x2[1]; +- var54.x2[1] = _dest.i; ++ _dest.x2[0] = var53.x2[1]; ++ _dest.x2[1] = var45.x2[1]; ++ var55.x2[1] = _dest.i; + } +- /* 17: mergewl */ ++ /* 18: mergewl */ + { + orc_union32 _dest; +- _dest.x2[0] = var53.x2[0]; +- _dest.x2[1] = var54.x2[0]; +- var45.x2[0] = _dest.i; ++ _dest.x2[0] = var54.x2[0]; ++ _dest.x2[1] = var55.x2[0]; ++ var46.x2[0] = _dest.i; + } + { + orc_union32 _dest; +- _dest.x2[0] = var53.x2[1]; +- _dest.x2[1] = var54.x2[1]; +- var45.x2[1] = _dest.i; ++ _dest.x2[0] = var54.x2[1]; ++ _dest.x2[1] = var55.x2[1]; ++ var46.x2[1] = _dest.i; + } +- /* 18: storeq */ +- ptr0[i] = var45; ++ /* 19: storeq */ ++ ptr0[i] = var46; + } + + } +@@ -1977,11 +2047,12 @@ 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, +- 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, +- 35, 7, 21, 1, 195, 0, 32, 33, 2, 0, ++ 2, 0, 255, 0, 0, 14, 2, 255, 0, 0, 0, 14, 1, 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, ++ 18, 34, 21, 1, 196, 33, 35, 7, 21, 1, 195, 0, 32, 33, 2, 0, ++ + }; + p = orc_program_new_from_static_bytecode (bc); + orc_program_set_backup_function (p, _backup_bayer_orc_merge_gr_abgr); +@@ -1998,6 +2069,7 @@ bayer_orc_merge_gr_abgr (guint8 * ORC_RESTRICT d1, + orc_program_add_source (p, 2, "s6"); + orc_program_add_constant (p, 2, 0x0000ff00, "c1"); + orc_program_add_constant (p, 2, 0x000000ff, "c2"); ++ orc_program_add_constant (p, 1, 0x000000ff, "c3"); + orc_program_add_temporary (p, 4, "t1"); + orc_program_add_temporary (p, 4, "t2"); + orc_program_add_temporary (p, 2, "t3"); +@@ -2018,7 +2090,7 @@ bayer_orc_merge_gr_abgr (guint8 * ORC_RESTRICT d1, + ORC_VAR_D1); + orc_program_append_2 (p, "orw", 0, ORC_VAR_T4, ORC_VAR_T5, ORC_VAR_T4, + ORC_VAR_D1); +- orc_program_append_2 (p, "mergebw", 1, ORC_VAR_T1, ORC_VAR_C2, ORC_VAR_T3, ++ orc_program_append_2 (p, "mergebw", 1, ORC_VAR_T1, ORC_VAR_C3, ORC_VAR_T3, + ORC_VAR_D1); + orc_program_append_2 (p, "mergebw", 1, ORC_VAR_T2, ORC_VAR_T4, ORC_VAR_S4, + ORC_VAR_D1); +@@ -2083,16 +2155,21 @@ bayer_orc_merge_bg_rgba (guint8 * ORC_RESTRICT d1, + orc_union16 var43; + #endif + orc_union16 var44; +- orc_union64 var45; +- orc_union16 var46; ++#if defined(__APPLE__) && __GNUC__ == 4 && __GNUC_MINOR__ == 2 && defined (__i386__) ++ volatile orc_union16 var45; ++#else ++ orc_union16 var45; ++#endif ++ orc_union64 var46; + orc_union16 var47; + orc_union16 var48; + orc_union16 var49; + orc_union16 var50; + orc_union16 var51; + orc_union16 var52; +- orc_union32 var53; ++ orc_union16 var53; + orc_union32 var54; ++ orc_union32 var55; + + ptr0 = (orc_union64 *) d1; + ptr4 = (orc_union16 *) s1; +@@ -2106,6 +2183,9 @@ 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 */ +@@ -2113,71 +2193,71 @@ bayer_orc_merge_bg_rgba (guint8 * ORC_RESTRICT d1, + /* 1: loadw */ + var38 = ptr9[i]; + /* 2: avgub */ +- 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; ++ 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; + /* 3: loadw */ + var39 = ptr4[i]; + /* 4: loadw */ + var40 = ptr8[i]; + /* 5: avgub */ +- 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; ++ 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; + /* 6: loadw */ + var41 = ptr7[i]; + /* 7: copyw */ +- var48.i = var41.i; ++ var49.i = var41.i; + /* 8: avgub */ +- 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; ++ 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; + /* 10: andw */ +- var50.i = var49.i & var42.i; ++ var51.i = var50.i & var42.i; + /* 12: andw */ +- var51.i = var48.i & var43.i; ++ var52.i = var49.i & var43.i; + /* 13: orw */ +- var52.i = var51.i | var50.i; ++ var53.i = var52.i | var51.i; + /* 14: mergebw */ + { + orc_union16 _dest; +- _dest.x2[0] = var46.x2[0]; +- _dest.x2[1] = var52.x2[0]; +- var53.x2[0] = _dest.i; ++ _dest.x2[0] = var47.x2[0]; ++ _dest.x2[1] = var53.x2[0]; ++ var54.x2[0] = _dest.i; + } + { + orc_union16 _dest; +- _dest.x2[0] = var46.x2[1]; +- _dest.x2[1] = var52.x2[1]; +- var53.x2[1] = _dest.i; ++ _dest.x2[0] = var47.x2[1]; ++ _dest.x2[1] = var53.x2[1]; ++ var54.x2[1] = _dest.i; + } + /* 15: loadw */ + var44 = ptr6[i]; +- /* 16: mergebw */ ++ /* 17: mergebw */ + { + orc_union16 _dest; + _dest.x2[0] = var44.x2[0]; +- _dest.x2[1] = var42.x2[0]; +- var54.x2[0] = _dest.i; ++ _dest.x2[1] = var45.x2[0]; ++ var55.x2[0] = _dest.i; + } + { + orc_union16 _dest; + _dest.x2[0] = var44.x2[1]; +- _dest.x2[1] = var42.x2[1]; +- var54.x2[1] = _dest.i; ++ _dest.x2[1] = var45.x2[1]; ++ var55.x2[1] = _dest.i; + } +- /* 17: mergewl */ ++ /* 18: mergewl */ + { + orc_union32 _dest; +- _dest.x2[0] = var53.x2[0]; +- _dest.x2[1] = var54.x2[0]; +- var45.x2[0] = _dest.i; ++ _dest.x2[0] = var54.x2[0]; ++ _dest.x2[1] = var55.x2[0]; ++ var46.x2[0] = _dest.i; + } + { + orc_union32 _dest; +- _dest.x2[0] = var53.x2[1]; +- _dest.x2[1] = var54.x2[1]; +- var45.x2[1] = _dest.i; ++ _dest.x2[0] = var54.x2[1]; ++ _dest.x2[1] = var55.x2[1]; ++ var46.x2[1] = _dest.i; + } +- /* 18: storeq */ +- ptr0[i] = var45; ++ /* 19: storeq */ ++ ptr0[i] = var46; + } + + } +@@ -2211,16 +2291,21 @@ _backup_bayer_orc_merge_bg_rgba (OrcExecutor * ORC_RESTRICT ex) + orc_union16 var43; + #endif + orc_union16 var44; +- orc_union64 var45; +- orc_union16 var46; ++#if defined(__APPLE__) && __GNUC__ == 4 && __GNUC_MINOR__ == 2 && defined (__i386__) ++ volatile orc_union16 var45; ++#else ++ orc_union16 var45; ++#endif ++ orc_union64 var46; + orc_union16 var47; + orc_union16 var48; + orc_union16 var49; + orc_union16 var50; + orc_union16 var51; + orc_union16 var52; +- orc_union32 var53; ++ orc_union16 var53; + orc_union32 var54; ++ orc_union32 var55; + + ptr0 = (orc_union64 *) ex->arrays[0]; + ptr4 = (orc_union16 *) ex->arrays[4]; +@@ -2234,6 +2319,9 @@ _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 */ +@@ -2241,71 +2329,71 @@ _backup_bayer_orc_merge_bg_rgba (OrcExecutor * ORC_RESTRICT ex) + /* 1: loadw */ + var38 = ptr9[i]; + /* 2: avgub */ +- 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; ++ 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; + /* 3: loadw */ + var39 = ptr4[i]; + /* 4: loadw */ + var40 = ptr8[i]; + /* 5: avgub */ +- 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; ++ 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; + /* 6: loadw */ + var41 = ptr7[i]; + /* 7: copyw */ +- var48.i = var41.i; ++ var49.i = var41.i; + /* 8: avgub */ +- 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; ++ 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; + /* 10: andw */ +- var50.i = var49.i & var42.i; ++ var51.i = var50.i & var42.i; + /* 12: andw */ +- var51.i = var48.i & var43.i; ++ var52.i = var49.i & var43.i; + /* 13: orw */ +- var52.i = var51.i | var50.i; ++ var53.i = var52.i | var51.i; + /* 14: mergebw */ + { + orc_union16 _dest; +- _dest.x2[0] = var46.x2[0]; +- _dest.x2[1] = var52.x2[0]; +- var53.x2[0] = _dest.i; ++ _dest.x2[0] = var47.x2[0]; ++ _dest.x2[1] = var53.x2[0]; ++ var54.x2[0] = _dest.i; + } + { + orc_union16 _dest; +- _dest.x2[0] = var46.x2[1]; +- _dest.x2[1] = var52.x2[1]; +- var53.x2[1] = _dest.i; ++ _dest.x2[0] = var47.x2[1]; ++ _dest.x2[1] = var53.x2[1]; ++ var54.x2[1] = _dest.i; + } + /* 15: loadw */ + var44 = ptr6[i]; +- /* 16: mergebw */ ++ /* 17: mergebw */ + { + orc_union16 _dest; + _dest.x2[0] = var44.x2[0]; +- _dest.x2[1] = var42.x2[0]; +- var54.x2[0] = _dest.i; ++ _dest.x2[1] = var45.x2[0]; ++ var55.x2[0] = _dest.i; + } + { + orc_union16 _dest; + _dest.x2[0] = var44.x2[1]; +- _dest.x2[1] = var42.x2[1]; +- var54.x2[1] = _dest.i; ++ _dest.x2[1] = var45.x2[1]; ++ var55.x2[1] = _dest.i; + } +- /* 17: mergewl */ ++ /* 18: mergewl */ + { + orc_union32 _dest; +- _dest.x2[0] = var53.x2[0]; +- _dest.x2[1] = var54.x2[0]; +- var45.x2[0] = _dest.i; ++ _dest.x2[0] = var54.x2[0]; ++ _dest.x2[1] = var55.x2[0]; ++ var46.x2[0] = _dest.i; + } + { + orc_union32 _dest; +- _dest.x2[0] = var53.x2[1]; +- _dest.x2[1] = var54.x2[1]; +- var45.x2[1] = _dest.i; ++ _dest.x2[0] = var54.x2[1]; ++ _dest.x2[1] = var55.x2[1]; ++ var46.x2[1] = _dest.i; + } +- /* 18: storeq */ +- ptr0[i] = var45; ++ /* 19: storeq */ ++ ptr0[i] = var46; + } + + } +@@ -2331,11 +2419,12 @@ 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, +- 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, +- 6, 16, 21, 1, 195, 0, 32, 33, 2, 0, ++ 2, 255, 0, 0, 0, 14, 2, 0, 255, 0, 0, 14, 1, 255, 0, 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, 6, 18, 21, 1, 195, 0, 32, 33, 2, 0, ++ + }; + p = orc_program_new_from_static_bytecode (bc); + orc_program_set_backup_function (p, _backup_bayer_orc_merge_bg_rgba); +@@ -2352,6 +2441,7 @@ bayer_orc_merge_bg_rgba (guint8 * ORC_RESTRICT d1, + orc_program_add_source (p, 2, "s6"); + orc_program_add_constant (p, 2, 0x000000ff, "c1"); + orc_program_add_constant (p, 2, 0x0000ff00, "c2"); ++ orc_program_add_constant (p, 1, 0x000000ff, "c3"); + orc_program_add_temporary (p, 4, "t1"); + orc_program_add_temporary (p, 4, "t2"); + orc_program_add_temporary (p, 2, "t3"); +@@ -2374,7 +2464,7 @@ bayer_orc_merge_bg_rgba (guint8 * ORC_RESTRICT d1, + ORC_VAR_D1); + orc_program_append_2 (p, "mergebw", 1, ORC_VAR_T1, ORC_VAR_T3, ORC_VAR_T4, + ORC_VAR_D1); +- orc_program_append_2 (p, "mergebw", 1, ORC_VAR_T2, ORC_VAR_S3, ORC_VAR_C1, ++ orc_program_append_2 (p, "mergebw", 1, ORC_VAR_T2, ORC_VAR_S3, ORC_VAR_C3, + ORC_VAR_D1); + orc_program_append_2 (p, "mergewl", 1, ORC_VAR_D1, ORC_VAR_T1, ORC_VAR_T2, + ORC_VAR_D1); +@@ -2437,16 +2527,21 @@ bayer_orc_merge_gr_rgba (guint8 * ORC_RESTRICT d1, + orc_union16 var43; + #endif + orc_union16 var44; +- orc_union64 var45; +- orc_union16 var46; ++#if defined(__APPLE__) && __GNUC__ == 4 && __GNUC_MINOR__ == 2 && defined (__i386__) ++ volatile orc_union16 var45; ++#else ++ orc_union16 var45; ++#endif ++ orc_union64 var46; + orc_union16 var47; + orc_union16 var48; + orc_union16 var49; + orc_union16 var50; + orc_union16 var51; + orc_union16 var52; +- orc_union32 var53; ++ orc_union16 var53; + orc_union32 var54; ++ orc_union32 var55; + + ptr0 = (orc_union64 *) d1; + ptr4 = (orc_union16 *) s1; +@@ -2460,6 +2555,9 @@ 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 */ +@@ -2467,71 +2565,71 @@ bayer_orc_merge_gr_rgba (guint8 * ORC_RESTRICT d1, + /* 1: loadw */ + var38 = ptr8[i]; + /* 2: avgub */ +- 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; ++ 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; + /* 3: loadw */ + var39 = ptr5[i]; + /* 4: loadw */ + var40 = ptr9[i]; + /* 5: avgub */ +- 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; ++ 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; + /* 6: loadw */ + var41 = ptr6[i]; + /* 7: copyw */ +- var48.i = var41.i; ++ var49.i = var41.i; + /* 8: avgub */ +- 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; ++ 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; + /* 10: andw */ +- var50.i = var49.i & var42.i; ++ var51.i = var50.i & var42.i; + /* 12: andw */ +- var51.i = var48.i & var43.i; ++ var52.i = var49.i & var43.i; + /* 13: orw */ +- var52.i = var51.i | var50.i; ++ var53.i = var52.i | var51.i; + /* 14: loadw */ + var44 = ptr7[i]; + /* 15: mergebw */ + { + orc_union16 _dest; + _dest.x2[0] = var44.x2[0]; +- _dest.x2[1] = var52.x2[0]; +- var53.x2[0] = _dest.i; ++ _dest.x2[1] = var53.x2[0]; ++ var54.x2[0] = _dest.i; + } + { + orc_union16 _dest; + _dest.x2[0] = var44.x2[1]; +- _dest.x2[1] = var52.x2[1]; +- var53.x2[1] = _dest.i; ++ _dest.x2[1] = var53.x2[1]; ++ var54.x2[1] = _dest.i; + } +- /* 16: mergebw */ ++ /* 17: mergebw */ + { + orc_union16 _dest; +- _dest.x2[0] = var46.x2[0]; +- _dest.x2[1] = var43.x2[0]; +- var54.x2[0] = _dest.i; ++ _dest.x2[0] = var47.x2[0]; ++ _dest.x2[1] = var45.x2[0]; ++ var55.x2[0] = _dest.i; + } + { + orc_union16 _dest; +- _dest.x2[0] = var46.x2[1]; +- _dest.x2[1] = var43.x2[1]; +- var54.x2[1] = _dest.i; ++ _dest.x2[0] = var47.x2[1]; ++ _dest.x2[1] = var45.x2[1]; ++ var55.x2[1] = _dest.i; + } +- /* 17: mergewl */ ++ /* 18: mergewl */ + { + orc_union32 _dest; +- _dest.x2[0] = var53.x2[0]; +- _dest.x2[1] = var54.x2[0]; +- var45.x2[0] = _dest.i; ++ _dest.x2[0] = var54.x2[0]; ++ _dest.x2[1] = var55.x2[0]; ++ var46.x2[0] = _dest.i; + } + { + orc_union32 _dest; +- _dest.x2[0] = var53.x2[1]; +- _dest.x2[1] = var54.x2[1]; +- var45.x2[1] = _dest.i; ++ _dest.x2[0] = var54.x2[1]; ++ _dest.x2[1] = var55.x2[1]; ++ var46.x2[1] = _dest.i; + } +- /* 18: storeq */ +- ptr0[i] = var45; ++ /* 19: storeq */ ++ ptr0[i] = var46; + } + + } +@@ -2565,16 +2663,21 @@ _backup_bayer_orc_merge_gr_rgba (OrcExecutor * ORC_RESTRICT ex) + orc_union16 var43; + #endif + orc_union16 var44; +- orc_union64 var45; +- orc_union16 var46; ++#if defined(__APPLE__) && __GNUC__ == 4 && __GNUC_MINOR__ == 2 && defined (__i386__) ++ volatile orc_union16 var45; ++#else ++ orc_union16 var45; ++#endif ++ orc_union64 var46; + orc_union16 var47; + orc_union16 var48; + orc_union16 var49; + orc_union16 var50; + orc_union16 var51; + orc_union16 var52; +- orc_union32 var53; ++ orc_union16 var53; + orc_union32 var54; ++ orc_union32 var55; + + ptr0 = (orc_union64 *) ex->arrays[0]; + ptr4 = (orc_union16 *) ex->arrays[4]; +@@ -2588,6 +2691,9 @@ _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 */ +@@ -2595,71 +2701,71 @@ _backup_bayer_orc_merge_gr_rgba (OrcExecutor * ORC_RESTRICT ex) + /* 1: loadw */ + var38 = ptr8[i]; + /* 2: avgub */ +- 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; ++ 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; + /* 3: loadw */ + var39 = ptr5[i]; + /* 4: loadw */ + var40 = ptr9[i]; + /* 5: avgub */ +- 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; ++ 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; + /* 6: loadw */ + var41 = ptr6[i]; + /* 7: copyw */ +- var48.i = var41.i; ++ var49.i = var41.i; + /* 8: avgub */ +- 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; ++ 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; + /* 10: andw */ +- var50.i = var49.i & var42.i; ++ var51.i = var50.i & var42.i; + /* 12: andw */ +- var51.i = var48.i & var43.i; ++ var52.i = var49.i & var43.i; + /* 13: orw */ +- var52.i = var51.i | var50.i; ++ var53.i = var52.i | var51.i; + /* 14: loadw */ + var44 = ptr7[i]; + /* 15: mergebw */ + { + orc_union16 _dest; + _dest.x2[0] = var44.x2[0]; +- _dest.x2[1] = var52.x2[0]; +- var53.x2[0] = _dest.i; ++ _dest.x2[1] = var53.x2[0]; ++ var54.x2[0] = _dest.i; + } + { + orc_union16 _dest; + _dest.x2[0] = var44.x2[1]; +- _dest.x2[1] = var52.x2[1]; +- var53.x2[1] = _dest.i; ++ _dest.x2[1] = var53.x2[1]; ++ var54.x2[1] = _dest.i; + } +- /* 16: mergebw */ ++ /* 17: mergebw */ + { + orc_union16 _dest; +- _dest.x2[0] = var46.x2[0]; +- _dest.x2[1] = var43.x2[0]; +- var54.x2[0] = _dest.i; ++ _dest.x2[0] = var47.x2[0]; ++ _dest.x2[1] = var45.x2[0]; ++ var55.x2[0] = _dest.i; + } + { + orc_union16 _dest; +- _dest.x2[0] = var46.x2[1]; +- _dest.x2[1] = var43.x2[1]; +- var54.x2[1] = _dest.i; ++ _dest.x2[0] = var47.x2[1]; ++ _dest.x2[1] = var45.x2[1]; ++ var55.x2[1] = _dest.i; + } +- /* 17: mergewl */ ++ /* 18: mergewl */ + { + orc_union32 _dest; +- _dest.x2[0] = var53.x2[0]; +- _dest.x2[1] = var54.x2[0]; +- var45.x2[0] = _dest.i; ++ _dest.x2[0] = var54.x2[0]; ++ _dest.x2[1] = var55.x2[0]; ++ var46.x2[0] = _dest.i; + } + { + orc_union32 _dest; +- _dest.x2[0] = var53.x2[1]; +- _dest.x2[1] = var54.x2[1]; +- var45.x2[1] = _dest.i; ++ _dest.x2[0] = var54.x2[1]; ++ _dest.x2[1] = var55.x2[1]; ++ var46.x2[1] = _dest.i; + } +- /* 18: storeq */ +- ptr0[i] = var45; ++ /* 19: storeq */ ++ ptr0[i] = var46; + } + + } +@@ -2685,11 +2791,12 @@ 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, +- 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, +- 34, 17, 21, 1, 195, 0, 32, 33, 2, 0, ++ 2, 0, 255, 0, 0, 14, 2, 255, 0, 0, 0, 14, 1, 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, 34, 18, 21, 1, 195, 0, 32, 33, 2, 0, ++ + }; + p = orc_program_new_from_static_bytecode (bc); + orc_program_set_backup_function (p, _backup_bayer_orc_merge_gr_rgba); +@@ -2706,6 +2813,7 @@ bayer_orc_merge_gr_rgba (guint8 * ORC_RESTRICT d1, + orc_program_add_source (p, 2, "s6"); + orc_program_add_constant (p, 2, 0x0000ff00, "c1"); + orc_program_add_constant (p, 2, 0x000000ff, "c2"); ++ orc_program_add_constant (p, 1, 0x000000ff, "c3"); + orc_program_add_temporary (p, 4, "t1"); + orc_program_add_temporary (p, 4, "t2"); + orc_program_add_temporary (p, 2, "t3"); +@@ -2728,7 +2836,7 @@ bayer_orc_merge_gr_rgba (guint8 * ORC_RESTRICT d1, + ORC_VAR_D1); + orc_program_append_2 (p, "mergebw", 1, ORC_VAR_T1, ORC_VAR_S4, ORC_VAR_T4, + ORC_VAR_D1); +- orc_program_append_2 (p, "mergebw", 1, ORC_VAR_T2, ORC_VAR_T3, ORC_VAR_C2, ++ orc_program_append_2 (p, "mergebw", 1, ORC_VAR_T2, ORC_VAR_T3, ORC_VAR_C3, + ORC_VAR_D1); + orc_program_append_2 (p, "mergewl", 1, ORC_VAR_D1, ORC_VAR_T1, ORC_VAR_T2, + ORC_VAR_D1); +@@ -2790,17 +2898,22 @@ 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; +- orc_union64 var45; +- orc_union16 var46; ++#endif ++ orc_union16 var45; ++ orc_union64 var46; + orc_union16 var47; + orc_union16 var48; + orc_union16 var49; + orc_union16 var50; + orc_union16 var51; + orc_union16 var52; +- orc_union32 var53; ++ orc_union16 var53; + orc_union32 var54; ++ orc_union32 var55; + + ptr0 = (orc_union64 *) d1; + ptr4 = (orc_union16 *) s1; +@@ -2814,6 +2927,9 @@ 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 */ +@@ -2821,71 +2937,71 @@ bayer_orc_merge_bg_argb (guint8 * ORC_RESTRICT d1, + /* 1: loadw */ + var38 = ptr9[i]; + /* 2: avgub */ +- 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; ++ 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; + /* 3: loadw */ + var39 = ptr4[i]; + /* 4: loadw */ + var40 = ptr8[i]; + /* 5: avgub */ +- 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; ++ 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; + /* 6: loadw */ + var41 = ptr7[i]; + /* 7: copyw */ +- var48.i = var41.i; ++ var49.i = var41.i; + /* 8: avgub */ +- 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; ++ 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; + /* 10: andw */ +- var50.i = var49.i & var42.i; ++ var51.i = var50.i & var42.i; + /* 12: andw */ +- var51.i = var48.i & var43.i; ++ var52.i = var49.i & var43.i; + /* 13: orw */ +- var52.i = var51.i | var50.i; +- /* 14: mergebw */ ++ var53.i = var52.i | var51.i; ++ /* 15: mergebw */ + { + orc_union16 _dest; +- _dest.x2[0] = var42.x2[0]; +- _dest.x2[1] = var46.x2[0]; +- var53.x2[0] = _dest.i; ++ _dest.x2[0] = var44.x2[0]; ++ _dest.x2[1] = var47.x2[0]; ++ var54.x2[0] = _dest.i; + } + { + orc_union16 _dest; +- _dest.x2[0] = var42.x2[1]; +- _dest.x2[1] = var46.x2[1]; +- var53.x2[1] = _dest.i; ++ _dest.x2[0] = var44.x2[1]; ++ _dest.x2[1] = var47.x2[1]; ++ var54.x2[1] = _dest.i; + } +- /* 15: loadw */ +- var44 = ptr6[i]; +- /* 16: mergebw */ ++ /* 16: loadw */ ++ var45 = ptr6[i]; ++ /* 17: mergebw */ + { + orc_union16 _dest; +- _dest.x2[0] = var52.x2[0]; +- _dest.x2[1] = var44.x2[0]; +- var54.x2[0] = _dest.i; ++ _dest.x2[0] = var53.x2[0]; ++ _dest.x2[1] = var45.x2[0]; ++ var55.x2[0] = _dest.i; + } + { + orc_union16 _dest; +- _dest.x2[0] = var52.x2[1]; +- _dest.x2[1] = var44.x2[1]; +- var54.x2[1] = _dest.i; ++ _dest.x2[0] = var53.x2[1]; ++ _dest.x2[1] = var45.x2[1]; ++ var55.x2[1] = _dest.i; + } +- /* 17: mergewl */ ++ /* 18: mergewl */ + { + orc_union32 _dest; +- _dest.x2[0] = var53.x2[0]; +- _dest.x2[1] = var54.x2[0]; +- var45.x2[0] = _dest.i; ++ _dest.x2[0] = var54.x2[0]; ++ _dest.x2[1] = var55.x2[0]; ++ var46.x2[0] = _dest.i; + } + { + orc_union32 _dest; +- _dest.x2[0] = var53.x2[1]; +- _dest.x2[1] = var54.x2[1]; +- var45.x2[1] = _dest.i; ++ _dest.x2[0] = var54.x2[1]; ++ _dest.x2[1] = var55.x2[1]; ++ var46.x2[1] = _dest.i; + } +- /* 18: storeq */ +- ptr0[i] = var45; ++ /* 19: storeq */ ++ ptr0[i] = var46; + } + + } +@@ -2918,17 +3034,22 @@ _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; +- orc_union64 var45; +- orc_union16 var46; ++#endif ++ orc_union16 var45; ++ orc_union64 var46; + orc_union16 var47; + orc_union16 var48; + orc_union16 var49; + orc_union16 var50; + orc_union16 var51; + orc_union16 var52; +- orc_union32 var53; ++ orc_union16 var53; + orc_union32 var54; ++ orc_union32 var55; + + ptr0 = (orc_union64 *) ex->arrays[0]; + ptr4 = (orc_union16 *) ex->arrays[4]; +@@ -2942,6 +3063,9 @@ _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 */ +@@ -2949,71 +3073,71 @@ _backup_bayer_orc_merge_bg_argb (OrcExecutor * ORC_RESTRICT ex) + /* 1: loadw */ + var38 = ptr9[i]; + /* 2: avgub */ +- 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; ++ 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; + /* 3: loadw */ + var39 = ptr4[i]; + /* 4: loadw */ + var40 = ptr8[i]; + /* 5: avgub */ +- 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; ++ 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; + /* 6: loadw */ + var41 = ptr7[i]; + /* 7: copyw */ +- var48.i = var41.i; ++ var49.i = var41.i; + /* 8: avgub */ +- 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; ++ 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; + /* 10: andw */ +- var50.i = var49.i & var42.i; ++ var51.i = var50.i & var42.i; + /* 12: andw */ +- var51.i = var48.i & var43.i; ++ var52.i = var49.i & var43.i; + /* 13: orw */ +- var52.i = var51.i | var50.i; +- /* 14: mergebw */ ++ var53.i = var52.i | var51.i; ++ /* 15: mergebw */ + { + orc_union16 _dest; +- _dest.x2[0] = var42.x2[0]; +- _dest.x2[1] = var46.x2[0]; +- var53.x2[0] = _dest.i; ++ _dest.x2[0] = var44.x2[0]; ++ _dest.x2[1] = var47.x2[0]; ++ var54.x2[0] = _dest.i; + } + { + orc_union16 _dest; +- _dest.x2[0] = var42.x2[1]; +- _dest.x2[1] = var46.x2[1]; +- var53.x2[1] = _dest.i; ++ _dest.x2[0] = var44.x2[1]; ++ _dest.x2[1] = var47.x2[1]; ++ var54.x2[1] = _dest.i; + } +- /* 15: loadw */ +- var44 = ptr6[i]; +- /* 16: mergebw */ ++ /* 16: loadw */ ++ var45 = ptr6[i]; ++ /* 17: mergebw */ + { + orc_union16 _dest; +- _dest.x2[0] = var52.x2[0]; +- _dest.x2[1] = var44.x2[0]; +- var54.x2[0] = _dest.i; ++ _dest.x2[0] = var53.x2[0]; ++ _dest.x2[1] = var45.x2[0]; ++ var55.x2[0] = _dest.i; + } + { + orc_union16 _dest; +- _dest.x2[0] = var52.x2[1]; +- _dest.x2[1] = var44.x2[1]; +- var54.x2[1] = _dest.i; ++ _dest.x2[0] = var53.x2[1]; ++ _dest.x2[1] = var45.x2[1]; ++ var55.x2[1] = _dest.i; + } +- /* 17: mergewl */ ++ /* 18: mergewl */ + { + orc_union32 _dest; +- _dest.x2[0] = var53.x2[0]; +- _dest.x2[1] = var54.x2[0]; +- var45.x2[0] = _dest.i; ++ _dest.x2[0] = var54.x2[0]; ++ _dest.x2[1] = var55.x2[0]; ++ var46.x2[0] = _dest.i; + } + { + orc_union32 _dest; +- _dest.x2[0] = var53.x2[1]; +- _dest.x2[1] = var54.x2[1]; +- var45.x2[1] = _dest.i; ++ _dest.x2[0] = var54.x2[1]; ++ _dest.x2[1] = var55.x2[1]; ++ var46.x2[1] = _dest.i; + } +- /* 18: storeq */ +- ptr0[i] = var45; ++ /* 19: storeq */ ++ ptr0[i] = var46; + } + + } +@@ -3039,11 +3163,12 @@ 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, +- 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, +- 35, 6, 21, 1, 195, 0, 32, 33, 2, 0, ++ 2, 255, 0, 0, 0, 14, 2, 0, 255, 0, 0, 14, 1, 255, 0, 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, ++ 18, 34, 21, 1, 196, 33, 35, 6, 21, 1, 195, 0, 32, 33, 2, 0, ++ + }; + p = orc_program_new_from_static_bytecode (bc); + orc_program_set_backup_function (p, _backup_bayer_orc_merge_bg_argb); +@@ -3060,6 +3185,7 @@ bayer_orc_merge_bg_argb (guint8 * ORC_RESTRICT d1, + orc_program_add_source (p, 2, "s6"); + orc_program_add_constant (p, 2, 0x000000ff, "c1"); + orc_program_add_constant (p, 2, 0x0000ff00, "c2"); ++ orc_program_add_constant (p, 1, 0x000000ff, "c3"); + orc_program_add_temporary (p, 4, "t1"); + orc_program_add_temporary (p, 4, "t2"); + orc_program_add_temporary (p, 2, "t3"); +@@ -3080,7 +3206,7 @@ bayer_orc_merge_bg_argb (guint8 * ORC_RESTRICT d1, + ORC_VAR_D1); + orc_program_append_2 (p, "orw", 0, ORC_VAR_T4, ORC_VAR_T5, ORC_VAR_T4, + ORC_VAR_D1); +- orc_program_append_2 (p, "mergebw", 1, ORC_VAR_T1, ORC_VAR_C1, ORC_VAR_T3, ++ orc_program_append_2 (p, "mergebw", 1, ORC_VAR_T1, ORC_VAR_C3, ORC_VAR_T3, + ORC_VAR_D1); + orc_program_append_2 (p, "mergebw", 1, ORC_VAR_T2, ORC_VAR_T4, ORC_VAR_S3, + ORC_VAR_D1); +@@ -3144,17 +3270,22 @@ 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; +- orc_union64 var45; +- orc_union16 var46; ++#endif ++ orc_union16 var45; ++ orc_union64 var46; + orc_union16 var47; + orc_union16 var48; + orc_union16 var49; + orc_union16 var50; + orc_union16 var51; + orc_union16 var52; +- orc_union32 var53; ++ orc_union16 var53; + orc_union32 var54; ++ orc_union32 var55; + + ptr0 = (orc_union64 *) d1; + ptr4 = (orc_union16 *) s1; +@@ -3168,6 +3299,9 @@ 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 */ +@@ -3175,71 +3309,71 @@ bayer_orc_merge_gr_argb (guint8 * ORC_RESTRICT d1, + /* 1: loadw */ + var38 = ptr8[i]; + /* 2: avgub */ +- 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; ++ 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; + /* 3: loadw */ + var39 = ptr5[i]; + /* 4: loadw */ + var40 = ptr9[i]; + /* 5: avgub */ +- 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; ++ 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; + /* 6: loadw */ + var41 = ptr6[i]; + /* 7: copyw */ +- var48.i = var41.i; ++ var49.i = var41.i; + /* 8: avgub */ +- 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; ++ 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; + /* 10: andw */ +- var50.i = var49.i & var42.i; ++ var51.i = var50.i & var42.i; + /* 12: andw */ +- var51.i = var48.i & var43.i; ++ var52.i = var49.i & var43.i; + /* 13: orw */ +- var52.i = var51.i | var50.i; +- /* 14: loadw */ +- var44 = ptr7[i]; +- /* 15: mergebw */ ++ var53.i = var52.i | var51.i; ++ /* 15: loadw */ ++ var45 = ptr7[i]; ++ /* 16: mergebw */ + { + orc_union16 _dest; +- _dest.x2[0] = var43.x2[0]; +- _dest.x2[1] = var44.x2[0]; +- var53.x2[0] = _dest.i; ++ _dest.x2[0] = var44.x2[0]; ++ _dest.x2[1] = var45.x2[0]; ++ var54.x2[0] = _dest.i; + } + { + orc_union16 _dest; +- _dest.x2[0] = var43.x2[1]; +- _dest.x2[1] = var44.x2[1]; +- var53.x2[1] = _dest.i; ++ _dest.x2[0] = var44.x2[1]; ++ _dest.x2[1] = var45.x2[1]; ++ var54.x2[1] = _dest.i; + } +- /* 16: mergebw */ ++ /* 17: mergebw */ + { + orc_union16 _dest; +- _dest.x2[0] = var52.x2[0]; +- _dest.x2[1] = var46.x2[0]; +- var54.x2[0] = _dest.i; ++ _dest.x2[0] = var53.x2[0]; ++ _dest.x2[1] = var47.x2[0]; ++ var55.x2[0] = _dest.i; + } + { + orc_union16 _dest; +- _dest.x2[0] = var52.x2[1]; +- _dest.x2[1] = var46.x2[1]; +- var54.x2[1] = _dest.i; ++ _dest.x2[0] = var53.x2[1]; ++ _dest.x2[1] = var47.x2[1]; ++ var55.x2[1] = _dest.i; + } +- /* 17: mergewl */ ++ /* 18: mergewl */ + { + orc_union32 _dest; +- _dest.x2[0] = var53.x2[0]; +- _dest.x2[1] = var54.x2[0]; +- var45.x2[0] = _dest.i; ++ _dest.x2[0] = var54.x2[0]; ++ _dest.x2[1] = var55.x2[0]; ++ var46.x2[0] = _dest.i; + } + { + orc_union32 _dest; +- _dest.x2[0] = var53.x2[1]; +- _dest.x2[1] = var54.x2[1]; +- var45.x2[1] = _dest.i; ++ _dest.x2[0] = var54.x2[1]; ++ _dest.x2[1] = var55.x2[1]; ++ var46.x2[1] = _dest.i; + } +- /* 18: storeq */ +- ptr0[i] = var45; ++ /* 19: storeq */ ++ ptr0[i] = var46; + } + + } +@@ -3272,17 +3406,22 @@ _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; +- orc_union64 var45; +- orc_union16 var46; ++#endif ++ orc_union16 var45; ++ orc_union64 var46; + orc_union16 var47; + orc_union16 var48; + orc_union16 var49; + orc_union16 var50; + orc_union16 var51; + orc_union16 var52; +- orc_union32 var53; ++ orc_union16 var53; + orc_union32 var54; ++ orc_union32 var55; + + ptr0 = (orc_union64 *) ex->arrays[0]; + ptr4 = (orc_union16 *) ex->arrays[4]; +@@ -3296,6 +3435,9 @@ _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 */ +@@ -3303,71 +3445,71 @@ _backup_bayer_orc_merge_gr_argb (OrcExecutor * ORC_RESTRICT ex) + /* 1: loadw */ + var38 = ptr8[i]; + /* 2: avgub */ +- 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; ++ 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; + /* 3: loadw */ + var39 = ptr5[i]; + /* 4: loadw */ + var40 = ptr9[i]; + /* 5: avgub */ +- 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; ++ 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; + /* 6: loadw */ + var41 = ptr6[i]; + /* 7: copyw */ +- var48.i = var41.i; ++ var49.i = var41.i; + /* 8: avgub */ +- 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; ++ 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; + /* 10: andw */ +- var50.i = var49.i & var42.i; ++ var51.i = var50.i & var42.i; + /* 12: andw */ +- var51.i = var48.i & var43.i; ++ var52.i = var49.i & var43.i; + /* 13: orw */ +- var52.i = var51.i | var50.i; +- /* 14: loadw */ +- var44 = ptr7[i]; +- /* 15: mergebw */ ++ var53.i = var52.i | var51.i; ++ /* 15: loadw */ ++ var45 = ptr7[i]; ++ /* 16: mergebw */ + { + orc_union16 _dest; +- _dest.x2[0] = var43.x2[0]; +- _dest.x2[1] = var44.x2[0]; +- var53.x2[0] = _dest.i; ++ _dest.x2[0] = var44.x2[0]; ++ _dest.x2[1] = var45.x2[0]; ++ var54.x2[0] = _dest.i; + } + { + orc_union16 _dest; +- _dest.x2[0] = var43.x2[1]; +- _dest.x2[1] = var44.x2[1]; +- var53.x2[1] = _dest.i; ++ _dest.x2[0] = var44.x2[1]; ++ _dest.x2[1] = var45.x2[1]; ++ var54.x2[1] = _dest.i; + } +- /* 16: mergebw */ ++ /* 17: mergebw */ + { + orc_union16 _dest; +- _dest.x2[0] = var52.x2[0]; +- _dest.x2[1] = var46.x2[0]; +- var54.x2[0] = _dest.i; ++ _dest.x2[0] = var53.x2[0]; ++ _dest.x2[1] = var47.x2[0]; ++ var55.x2[0] = _dest.i; + } + { + orc_union16 _dest; +- _dest.x2[0] = var52.x2[1]; +- _dest.x2[1] = var46.x2[1]; +- var54.x2[1] = _dest.i; ++ _dest.x2[0] = var53.x2[1]; ++ _dest.x2[1] = var47.x2[1]; ++ var55.x2[1] = _dest.i; + } +- /* 17: mergewl */ ++ /* 18: mergewl */ + { + orc_union32 _dest; +- _dest.x2[0] = var53.x2[0]; +- _dest.x2[1] = var54.x2[0]; +- var45.x2[0] = _dest.i; ++ _dest.x2[0] = var54.x2[0]; ++ _dest.x2[1] = var55.x2[0]; ++ var46.x2[0] = _dest.i; + } + { + orc_union32 _dest; +- _dest.x2[0] = var53.x2[1]; +- _dest.x2[1] = var54.x2[1]; +- var45.x2[1] = _dest.i; ++ _dest.x2[0] = var54.x2[1]; ++ _dest.x2[1] = var55.x2[1]; ++ var46.x2[1] = _dest.i; + } +- /* 18: storeq */ +- ptr0[i] = var45; ++ /* 19: storeq */ ++ ptr0[i] = var46; + } + + } +@@ -3393,11 +3535,12 @@ 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, +- 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, +- 35, 34, 21, 1, 195, 0, 32, 33, 2, 0, ++ 2, 0, 255, 0, 0, 14, 2, 255, 0, 0, 0, 14, 1, 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, ++ 18, 7, 21, 1, 196, 33, 35, 34, 21, 1, 195, 0, 32, 33, 2, 0, ++ + }; + p = orc_program_new_from_static_bytecode (bc); + orc_program_set_backup_function (p, _backup_bayer_orc_merge_gr_argb); +@@ -3414,6 +3557,7 @@ bayer_orc_merge_gr_argb (guint8 * ORC_RESTRICT d1, + orc_program_add_source (p, 2, "s6"); + orc_program_add_constant (p, 2, 0x0000ff00, "c1"); + orc_program_add_constant (p, 2, 0x000000ff, "c2"); ++ orc_program_add_constant (p, 1, 0x000000ff, "c3"); + orc_program_add_temporary (p, 4, "t1"); + orc_program_add_temporary (p, 4, "t2"); + orc_program_add_temporary (p, 2, "t3"); +@@ -3434,7 +3578,7 @@ bayer_orc_merge_gr_argb (guint8 * ORC_RESTRICT d1, + ORC_VAR_D1); + orc_program_append_2 (p, "orw", 0, ORC_VAR_T4, ORC_VAR_T5, ORC_VAR_T4, + ORC_VAR_D1); +- orc_program_append_2 (p, "mergebw", 1, ORC_VAR_T1, ORC_VAR_C2, ORC_VAR_S4, ++ orc_program_append_2 (p, "mergebw", 1, ORC_VAR_T1, ORC_VAR_C3, ORC_VAR_S4, + ORC_VAR_D1); + orc_program_append_2 (p, "mergebw", 1, ORC_VAR_T2, ORC_VAR_T4, ORC_VAR_T3, + ORC_VAR_D1); +-- +2.4.2 + diff --git a/SOURCES/0001-tests-fix-audiomixer-test-on-big-endian-systems.patch b/SOURCES/0001-tests-fix-audiomixer-test-on-big-endian-systems.patch new file mode 100644 index 0000000..5cd4d8d --- /dev/null +++ b/SOURCES/0001-tests-fix-audiomixer-test-on-big-endian-systems.patch @@ -0,0 +1,28 @@ +From 5e16c24920ed920590941ba7a994fc83d2d1b414 Mon Sep 17 00:00:00 2001 +From: Wim Taymans +Date: Thu, 30 Jul 2015 09:54:48 +0200 +Subject: [PATCH] tests: fix audiomixer test on big endian systems + +--- + tests/check/elements/audiomixer.c | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/tests/check/elements/audiomixer.c b/tests/check/elements/audiomixer.c +index 1d1b091..f30cccd 100644 +--- a/tests/check/elements/audiomixer.c ++++ b/tests/check/elements/audiomixer.c +@@ -86,7 +86,11 @@ GST_START_TEST (test_filter_caps) + GstPad *pad; + + filter_caps = gst_caps_new_simple ("audio/x-raw", ++#if G_BYTE_ORDER == G_BIG_ENDIAN ++ "format", G_TYPE_STRING, "F32BE", ++#else + "format", G_TYPE_STRING, "F32LE", ++#endif + "layout", G_TYPE_STRING, "interleaved", + "rate", G_TYPE_INT, 44100, "channels", G_TYPE_INT, 1, NULL); + +-- +2.4.3 + diff --git a/SOURCES/gst-p-bad-cleanup.sh b/SOURCES/gst-p-bad-cleanup.sh index d9017d9..7e5b98b 100755 --- a/SOURCES/gst-p-bad-cleanup.sh +++ b/SOURCES/gst-p-bad-cleanup.sh @@ -15,12 +15,15 @@ DIRECTORY=`echo $SOURCE | sed 's/\.tar\.xz//'` ALLOWED=" aacparse +accurip adpcmdec adpcmenc aiff aiffparse amrparse asfmux +audiofxbad +audiomixer audioparsers audiovisualizers autoconvert @@ -30,6 +33,7 @@ camerabin2 cdxaparse coloreffects colorspace +compositor dataurisrc dccp debugutils @@ -51,11 +55,13 @@ inter interlace invtelecine ivfparse +ivtc jpegformat jp2kdecimator legacyresample librfb liveadder +midi mve mpegdemux mpeg4videoparse @@ -91,6 +97,7 @@ videomeasure videoparsers videosignal vmnc +yadif y4m " diff --git a/SOURCES/update-test-check-orc-bayer.patch b/SOURCES/update-test-check-orc-bayer.patch new file mode 100644 index 0000000..1b1240a --- /dev/null +++ b/SOURCES/update-test-check-orc-bayer.patch @@ -0,0 +1,1258 @@ +--- gst-plugins-bad-1.4.5/tests/check/orc/bayer.c 2014-12-18 12:13:33.000000000 +0100 ++++ gst-plugins-bad-1.4.5.new/tests/check/orc/bayer.c 2015-06-22 17:13:40.140542998 +0200 +@@ -297,16 +297,21 @@ + orc_union16 var43; + #endif + orc_union16 var44; +- orc_union64 var45; +- orc_union16 var46; ++#if defined(__APPLE__) && __GNUC__ == 4 && __GNUC_MINOR__ == 2 && defined (__i386__) ++ volatile orc_union16 var45; ++#else ++ orc_union16 var45; ++#endif ++ orc_union64 var46; + orc_union16 var47; + orc_union16 var48; + orc_union16 var49; + orc_union16 var50; + orc_union16 var51; + orc_union16 var52; +- orc_union32 var53; ++ orc_union16 var53; + orc_union32 var54; ++ orc_union32 var55; + + ptr0 = (orc_union64 *)ex->arrays[0]; + ptr4 = (orc_union16 *)ex->arrays[4]; +@@ -320,6 +325,9 @@ + 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 */ +@@ -327,71 +335,71 @@ + /* 1: loadw */ + var38 = ptr9[i]; + /* 2: avgub */ +- 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; ++ 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; + /* 3: loadw */ + var39 = ptr4[i]; + /* 4: loadw */ + var40 = ptr8[i]; + /* 5: avgub */ +- 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; ++ 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; + /* 6: loadw */ + var41 = ptr7[i]; + /* 7: copyw */ +- var48.i = var41.i; ++ var49.i = var41.i; + /* 8: avgub */ +- 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; ++ 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; + /* 10: andw */ +- var50.i = var49.i & var42.i; ++ var51.i = var50.i & var42.i; + /* 12: andw */ +- var51.i = var48.i & var43.i; ++ var52.i = var49.i & var43.i; + /* 13: orw */ +- var52.i = var51.i | var50.i; ++ var53.i = var52.i | var51.i; + /* 14: loadw */ + var44 = ptr6[i]; + /* 15: mergebw */ + { + orc_union16 _dest; + _dest.x2[0] = var44.x2[0]; +- _dest.x2[1] = var52.x2[0]; +- var53.x2[0] = _dest.i; ++ _dest.x2[1] = var53.x2[0]; ++ var54.x2[0] = _dest.i; + } + { + orc_union16 _dest; + _dest.x2[0] = var44.x2[1]; +- _dest.x2[1] = var52.x2[1]; +- var53.x2[1] = _dest.i; ++ _dest.x2[1] = var53.x2[1]; ++ var54.x2[1] = _dest.i; + } +- /* 16: mergebw */ ++ /* 17: mergebw */ + { + orc_union16 _dest; +- _dest.x2[0] = var46.x2[0]; +- _dest.x2[1] = var42.x2[0]; +- var54.x2[0] = _dest.i; ++ _dest.x2[0] = var47.x2[0]; ++ _dest.x2[1] = var45.x2[0]; ++ var55.x2[0] = _dest.i; + } + { + orc_union16 _dest; +- _dest.x2[0] = var46.x2[1]; +- _dest.x2[1] = var42.x2[1]; +- var54.x2[1] = _dest.i; ++ _dest.x2[0] = var47.x2[1]; ++ _dest.x2[1] = var45.x2[1]; ++ var55.x2[1] = _dest.i; + } +- /* 17: mergewl */ ++ /* 18: mergewl */ + { + orc_union32 _dest; +- _dest.x2[0] = var53.x2[0]; +- _dest.x2[1] = var54.x2[0]; +- var45.x2[0] = _dest.i; ++ _dest.x2[0] = var54.x2[0]; ++ _dest.x2[1] = var55.x2[0]; ++ var46.x2[0] = _dest.i; + } + { + orc_union32 _dest; +- _dest.x2[0] = var53.x2[1]; +- _dest.x2[1] = var54.x2[1]; +- var45.x2[1] = _dest.i; ++ _dest.x2[0] = var54.x2[1]; ++ _dest.x2[1] = var55.x2[1]; ++ var46.x2[1] = _dest.i; + } +- /* 18: storeq */ +- ptr0[i] = var45; ++ /* 19: storeq */ ++ ptr0[i] = var46; + } + + } +@@ -425,16 +433,21 @@ + orc_union16 var43; + #endif + orc_union16 var44; +- orc_union64 var45; +- orc_union16 var46; ++#if defined(__APPLE__) && __GNUC__ == 4 && __GNUC_MINOR__ == 2 && defined (__i386__) ++ volatile orc_union16 var45; ++#else ++ orc_union16 var45; ++#endif ++ orc_union64 var46; + orc_union16 var47; + orc_union16 var48; + orc_union16 var49; + orc_union16 var50; + orc_union16 var51; + orc_union16 var52; +- orc_union32 var53; ++ orc_union16 var53; + orc_union32 var54; ++ orc_union32 var55; + + ptr0 = (orc_union64 *)ex->arrays[0]; + ptr4 = (orc_union16 *)ex->arrays[4]; +@@ -448,6 +461,9 @@ + 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 */ +@@ -455,71 +471,71 @@ + /* 1: loadw */ + var38 = ptr8[i]; + /* 2: avgub */ +- 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; ++ 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; + /* 3: loadw */ + var39 = ptr5[i]; + /* 4: loadw */ + var40 = ptr9[i]; + /* 5: avgub */ +- 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; ++ 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; + /* 6: loadw */ + var41 = ptr6[i]; + /* 7: copyw */ +- var48.i = var41.i; ++ var49.i = var41.i; + /* 8: avgub */ +- 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; ++ 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; + /* 10: andw */ +- var50.i = var49.i & var42.i; ++ var51.i = var50.i & var42.i; + /* 12: andw */ +- var51.i = var48.i & var43.i; ++ var52.i = var49.i & var43.i; + /* 13: orw */ +- var52.i = var51.i | var50.i; ++ var53.i = var52.i | var51.i; + /* 14: mergebw */ + { + orc_union16 _dest; +- _dest.x2[0] = var46.x2[0]; +- _dest.x2[1] = var52.x2[0]; +- var53.x2[0] = _dest.i; ++ _dest.x2[0] = var47.x2[0]; ++ _dest.x2[1] = var53.x2[0]; ++ var54.x2[0] = _dest.i; + } + { + orc_union16 _dest; +- _dest.x2[0] = var46.x2[1]; +- _dest.x2[1] = var52.x2[1]; +- var53.x2[1] = _dest.i; ++ _dest.x2[0] = var47.x2[1]; ++ _dest.x2[1] = var53.x2[1]; ++ var54.x2[1] = _dest.i; + } + /* 15: loadw */ + var44 = ptr7[i]; +- /* 16: mergebw */ ++ /* 17: mergebw */ + { + orc_union16 _dest; + _dest.x2[0] = var44.x2[0]; +- _dest.x2[1] = var43.x2[0]; +- var54.x2[0] = _dest.i; ++ _dest.x2[1] = var45.x2[0]; ++ var55.x2[0] = _dest.i; + } + { + orc_union16 _dest; + _dest.x2[0] = var44.x2[1]; +- _dest.x2[1] = var43.x2[1]; +- var54.x2[1] = _dest.i; ++ _dest.x2[1] = var45.x2[1]; ++ var55.x2[1] = _dest.i; + } +- /* 17: mergewl */ ++ /* 18: mergewl */ + { + orc_union32 _dest; +- _dest.x2[0] = var53.x2[0]; +- _dest.x2[1] = var54.x2[0]; +- var45.x2[0] = _dest.i; ++ _dest.x2[0] = var54.x2[0]; ++ _dest.x2[1] = var55.x2[0]; ++ var46.x2[0] = _dest.i; + } + { + orc_union32 _dest; +- _dest.x2[0] = var53.x2[1]; +- _dest.x2[1] = var54.x2[1]; +- var45.x2[1] = _dest.i; ++ _dest.x2[0] = var54.x2[1]; ++ _dest.x2[1] = var55.x2[1]; ++ var46.x2[1] = _dest.i; + } +- /* 18: storeq */ +- ptr0[i] = var45; ++ /* 19: storeq */ ++ ptr0[i] = var46; + } + + } +@@ -552,17 +568,22 @@ + #else + orc_union16 var43; + #endif ++#if defined(__APPLE__) && __GNUC__ == 4 && __GNUC_MINOR__ == 2 && defined (__i386__) ++ volatile orc_union16 var44; ++#else + orc_union16 var44; +- orc_union64 var45; +- orc_union16 var46; ++#endif ++ orc_union16 var45; ++ orc_union64 var46; + orc_union16 var47; + orc_union16 var48; + orc_union16 var49; + orc_union16 var50; + orc_union16 var51; + orc_union16 var52; +- orc_union32 var53; ++ orc_union16 var53; + orc_union32 var54; ++ orc_union32 var55; + + ptr0 = (orc_union64 *)ex->arrays[0]; + ptr4 = (orc_union16 *)ex->arrays[4]; +@@ -576,6 +597,9 @@ + 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 */ +@@ -583,71 +607,71 @@ + /* 1: loadw */ + var38 = ptr9[i]; + /* 2: avgub */ +- 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; ++ 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; + /* 3: loadw */ + var39 = ptr4[i]; + /* 4: loadw */ + var40 = ptr8[i]; + /* 5: avgub */ +- 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; ++ 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; + /* 6: loadw */ + var41 = ptr7[i]; + /* 7: copyw */ +- var48.i = var41.i; ++ var49.i = var41.i; + /* 8: avgub */ +- 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; ++ 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; + /* 10: andw */ +- var50.i = var49.i & var42.i; ++ var51.i = var50.i & var42.i; + /* 12: andw */ +- var51.i = var48.i & var43.i; ++ var52.i = var49.i & var43.i; + /* 13: orw */ +- var52.i = var51.i | var50.i; +- /* 14: loadw */ +- var44 = ptr6[i]; +- /* 15: mergebw */ ++ var53.i = var52.i | var51.i; ++ /* 15: loadw */ ++ var45 = ptr6[i]; ++ /* 16: mergebw */ + { + orc_union16 _dest; +- _dest.x2[0] = var42.x2[0]; +- _dest.x2[1] = var44.x2[0]; +- var53.x2[0] = _dest.i; ++ _dest.x2[0] = var44.x2[0]; ++ _dest.x2[1] = var45.x2[0]; ++ var54.x2[0] = _dest.i; + } + { + orc_union16 _dest; +- _dest.x2[0] = var42.x2[1]; +- _dest.x2[1] = var44.x2[1]; +- var53.x2[1] = _dest.i; ++ _dest.x2[0] = var44.x2[1]; ++ _dest.x2[1] = var45.x2[1]; ++ var54.x2[1] = _dest.i; + } +- /* 16: mergebw */ ++ /* 17: mergebw */ + { + orc_union16 _dest; +- _dest.x2[0] = var52.x2[0]; +- _dest.x2[1] = var46.x2[0]; +- var54.x2[0] = _dest.i; ++ _dest.x2[0] = var53.x2[0]; ++ _dest.x2[1] = var47.x2[0]; ++ var55.x2[0] = _dest.i; + } + { + orc_union16 _dest; +- _dest.x2[0] = var52.x2[1]; +- _dest.x2[1] = var46.x2[1]; +- var54.x2[1] = _dest.i; ++ _dest.x2[0] = var53.x2[1]; ++ _dest.x2[1] = var47.x2[1]; ++ var55.x2[1] = _dest.i; + } +- /* 17: mergewl */ ++ /* 18: mergewl */ + { + orc_union32 _dest; +- _dest.x2[0] = var53.x2[0]; +- _dest.x2[1] = var54.x2[0]; +- var45.x2[0] = _dest.i; ++ _dest.x2[0] = var54.x2[0]; ++ _dest.x2[1] = var55.x2[0]; ++ var46.x2[0] = _dest.i; + } + { + orc_union32 _dest; +- _dest.x2[0] = var53.x2[1]; +- _dest.x2[1] = var54.x2[1]; +- var45.x2[1] = _dest.i; ++ _dest.x2[0] = var54.x2[1]; ++ _dest.x2[1] = var55.x2[1]; ++ var46.x2[1] = _dest.i; + } +- /* 18: storeq */ +- ptr0[i] = var45; ++ /* 19: storeq */ ++ ptr0[i] = var46; + } + + } +@@ -680,17 +704,22 @@ + #else + orc_union16 var43; + #endif ++#if defined(__APPLE__) && __GNUC__ == 4 && __GNUC_MINOR__ == 2 && defined (__i386__) ++ volatile orc_union16 var44; ++#else + orc_union16 var44; +- orc_union64 var45; +- orc_union16 var46; ++#endif ++ orc_union16 var45; ++ orc_union64 var46; + orc_union16 var47; + orc_union16 var48; + orc_union16 var49; + orc_union16 var50; + orc_union16 var51; + orc_union16 var52; +- orc_union32 var53; ++ orc_union16 var53; + orc_union32 var54; ++ orc_union32 var55; + + ptr0 = (orc_union64 *)ex->arrays[0]; + ptr4 = (orc_union16 *)ex->arrays[4]; +@@ -704,6 +733,9 @@ + 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 */ +@@ -711,71 +743,71 @@ + /* 1: loadw */ + var38 = ptr8[i]; + /* 2: avgub */ +- 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; ++ 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; + /* 3: loadw */ + var39 = ptr5[i]; + /* 4: loadw */ + var40 = ptr9[i]; + /* 5: avgub */ +- 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; ++ 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; + /* 6: loadw */ + var41 = ptr6[i]; + /* 7: copyw */ +- var48.i = var41.i; ++ var49.i = var41.i; + /* 8: avgub */ +- 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; ++ 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; + /* 10: andw */ +- var50.i = var49.i & var42.i; ++ var51.i = var50.i & var42.i; + /* 12: andw */ +- var51.i = var48.i & var43.i; ++ var52.i = var49.i & var43.i; + /* 13: orw */ +- var52.i = var51.i | var50.i; +- /* 14: mergebw */ ++ var53.i = var52.i | var51.i; ++ /* 15: mergebw */ + { + orc_union16 _dest; +- _dest.x2[0] = var43.x2[0]; +- _dest.x2[1] = var46.x2[0]; +- var53.x2[0] = _dest.i; ++ _dest.x2[0] = var44.x2[0]; ++ _dest.x2[1] = var47.x2[0]; ++ var54.x2[0] = _dest.i; + } + { + orc_union16 _dest; +- _dest.x2[0] = var43.x2[1]; +- _dest.x2[1] = var46.x2[1]; +- var53.x2[1] = _dest.i; ++ _dest.x2[0] = var44.x2[1]; ++ _dest.x2[1] = var47.x2[1]; ++ var54.x2[1] = _dest.i; + } +- /* 15: loadw */ +- var44 = ptr7[i]; +- /* 16: mergebw */ ++ /* 16: loadw */ ++ var45 = ptr7[i]; ++ /* 17: mergebw */ + { + orc_union16 _dest; +- _dest.x2[0] = var52.x2[0]; +- _dest.x2[1] = var44.x2[0]; +- var54.x2[0] = _dest.i; ++ _dest.x2[0] = var53.x2[0]; ++ _dest.x2[1] = var45.x2[0]; ++ var55.x2[0] = _dest.i; + } + { + orc_union16 _dest; +- _dest.x2[0] = var52.x2[1]; +- _dest.x2[1] = var44.x2[1]; +- var54.x2[1] = _dest.i; ++ _dest.x2[0] = var53.x2[1]; ++ _dest.x2[1] = var45.x2[1]; ++ var55.x2[1] = _dest.i; + } +- /* 17: mergewl */ ++ /* 18: mergewl */ + { + orc_union32 _dest; +- _dest.x2[0] = var53.x2[0]; +- _dest.x2[1] = var54.x2[0]; +- var45.x2[0] = _dest.i; ++ _dest.x2[0] = var54.x2[0]; ++ _dest.x2[1] = var55.x2[0]; ++ var46.x2[0] = _dest.i; + } + { + orc_union32 _dest; +- _dest.x2[0] = var53.x2[1]; +- _dest.x2[1] = var54.x2[1]; +- var45.x2[1] = _dest.i; ++ _dest.x2[0] = var54.x2[1]; ++ _dest.x2[1] = var55.x2[1]; ++ var46.x2[1] = _dest.i; + } +- /* 18: storeq */ +- ptr0[i] = var45; ++ /* 19: storeq */ ++ ptr0[i] = var46; + } + + } +@@ -809,16 +841,21 @@ + orc_union16 var43; + #endif + orc_union16 var44; +- orc_union64 var45; +- orc_union16 var46; ++#if defined(__APPLE__) && __GNUC__ == 4 && __GNUC_MINOR__ == 2 && defined (__i386__) ++ volatile orc_union16 var45; ++#else ++ orc_union16 var45; ++#endif ++ orc_union64 var46; + orc_union16 var47; + orc_union16 var48; + orc_union16 var49; + orc_union16 var50; + orc_union16 var51; + orc_union16 var52; +- orc_union32 var53; ++ orc_union16 var53; + orc_union32 var54; ++ orc_union32 var55; + + ptr0 = (orc_union64 *)ex->arrays[0]; + ptr4 = (orc_union16 *)ex->arrays[4]; +@@ -832,6 +869,9 @@ + 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 */ +@@ -839,71 +879,71 @@ + /* 1: loadw */ + var38 = ptr9[i]; + /* 2: avgub */ +- 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; ++ 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; + /* 3: loadw */ + var39 = ptr4[i]; + /* 4: loadw */ + var40 = ptr8[i]; + /* 5: avgub */ +- 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; ++ 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; + /* 6: loadw */ + var41 = ptr7[i]; + /* 7: copyw */ +- var48.i = var41.i; ++ var49.i = var41.i; + /* 8: avgub */ +- 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; ++ 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; + /* 10: andw */ +- var50.i = var49.i & var42.i; ++ var51.i = var50.i & var42.i; + /* 12: andw */ +- var51.i = var48.i & var43.i; ++ var52.i = var49.i & var43.i; + /* 13: orw */ +- var52.i = var51.i | var50.i; ++ var53.i = var52.i | var51.i; + /* 14: mergebw */ + { + orc_union16 _dest; +- _dest.x2[0] = var46.x2[0]; +- _dest.x2[1] = var52.x2[0]; +- var53.x2[0] = _dest.i; ++ _dest.x2[0] = var47.x2[0]; ++ _dest.x2[1] = var53.x2[0]; ++ var54.x2[0] = _dest.i; + } + { + orc_union16 _dest; +- _dest.x2[0] = var46.x2[1]; +- _dest.x2[1] = var52.x2[1]; +- var53.x2[1] = _dest.i; ++ _dest.x2[0] = var47.x2[1]; ++ _dest.x2[1] = var53.x2[1]; ++ var54.x2[1] = _dest.i; + } + /* 15: loadw */ + var44 = ptr6[i]; +- /* 16: mergebw */ ++ /* 17: mergebw */ + { + orc_union16 _dest; + _dest.x2[0] = var44.x2[0]; +- _dest.x2[1] = var42.x2[0]; +- var54.x2[0] = _dest.i; ++ _dest.x2[1] = var45.x2[0]; ++ var55.x2[0] = _dest.i; + } + { + orc_union16 _dest; + _dest.x2[0] = var44.x2[1]; +- _dest.x2[1] = var42.x2[1]; +- var54.x2[1] = _dest.i; ++ _dest.x2[1] = var45.x2[1]; ++ var55.x2[1] = _dest.i; + } +- /* 17: mergewl */ ++ /* 18: mergewl */ + { + orc_union32 _dest; +- _dest.x2[0] = var53.x2[0]; +- _dest.x2[1] = var54.x2[0]; +- var45.x2[0] = _dest.i; ++ _dest.x2[0] = var54.x2[0]; ++ _dest.x2[1] = var55.x2[0]; ++ var46.x2[0] = _dest.i; + } + { + orc_union32 _dest; +- _dest.x2[0] = var53.x2[1]; +- _dest.x2[1] = var54.x2[1]; +- var45.x2[1] = _dest.i; ++ _dest.x2[0] = var54.x2[1]; ++ _dest.x2[1] = var55.x2[1]; ++ var46.x2[1] = _dest.i; + } +- /* 18: storeq */ +- ptr0[i] = var45; ++ /* 19: storeq */ ++ ptr0[i] = var46; + } + + } +@@ -937,16 +977,21 @@ + orc_union16 var43; + #endif + orc_union16 var44; +- orc_union64 var45; +- orc_union16 var46; ++#if defined(__APPLE__) && __GNUC__ == 4 && __GNUC_MINOR__ == 2 && defined (__i386__) ++ volatile orc_union16 var45; ++#else ++ orc_union16 var45; ++#endif ++ orc_union64 var46; + orc_union16 var47; + orc_union16 var48; + orc_union16 var49; + orc_union16 var50; + orc_union16 var51; + orc_union16 var52; +- orc_union32 var53; ++ orc_union16 var53; + orc_union32 var54; ++ orc_union32 var55; + + ptr0 = (orc_union64 *)ex->arrays[0]; + ptr4 = (orc_union16 *)ex->arrays[4]; +@@ -960,6 +1005,9 @@ + 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 */ +@@ -967,71 +1015,71 @@ + /* 1: loadw */ + var38 = ptr8[i]; + /* 2: avgub */ +- 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; ++ 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; + /* 3: loadw */ + var39 = ptr5[i]; + /* 4: loadw */ + var40 = ptr9[i]; + /* 5: avgub */ +- 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; ++ 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; + /* 6: loadw */ + var41 = ptr6[i]; + /* 7: copyw */ +- var48.i = var41.i; ++ var49.i = var41.i; + /* 8: avgub */ +- 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; ++ 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; + /* 10: andw */ +- var50.i = var49.i & var42.i; ++ var51.i = var50.i & var42.i; + /* 12: andw */ +- var51.i = var48.i & var43.i; ++ var52.i = var49.i & var43.i; + /* 13: orw */ +- var52.i = var51.i | var50.i; ++ var53.i = var52.i | var51.i; + /* 14: loadw */ + var44 = ptr7[i]; + /* 15: mergebw */ + { + orc_union16 _dest; + _dest.x2[0] = var44.x2[0]; +- _dest.x2[1] = var52.x2[0]; +- var53.x2[0] = _dest.i; ++ _dest.x2[1] = var53.x2[0]; ++ var54.x2[0] = _dest.i; + } + { + orc_union16 _dest; + _dest.x2[0] = var44.x2[1]; +- _dest.x2[1] = var52.x2[1]; +- var53.x2[1] = _dest.i; ++ _dest.x2[1] = var53.x2[1]; ++ var54.x2[1] = _dest.i; + } +- /* 16: mergebw */ ++ /* 17: mergebw */ + { + orc_union16 _dest; +- _dest.x2[0] = var46.x2[0]; +- _dest.x2[1] = var43.x2[0]; +- var54.x2[0] = _dest.i; ++ _dest.x2[0] = var47.x2[0]; ++ _dest.x2[1] = var45.x2[0]; ++ var55.x2[0] = _dest.i; + } + { + orc_union16 _dest; +- _dest.x2[0] = var46.x2[1]; +- _dest.x2[1] = var43.x2[1]; +- var54.x2[1] = _dest.i; ++ _dest.x2[0] = var47.x2[1]; ++ _dest.x2[1] = var45.x2[1]; ++ var55.x2[1] = _dest.i; + } +- /* 17: mergewl */ ++ /* 18: mergewl */ + { + orc_union32 _dest; +- _dest.x2[0] = var53.x2[0]; +- _dest.x2[1] = var54.x2[0]; +- var45.x2[0] = _dest.i; ++ _dest.x2[0] = var54.x2[0]; ++ _dest.x2[1] = var55.x2[0]; ++ var46.x2[0] = _dest.i; + } + { + orc_union32 _dest; +- _dest.x2[0] = var53.x2[1]; +- _dest.x2[1] = var54.x2[1]; +- var45.x2[1] = _dest.i; ++ _dest.x2[0] = var54.x2[1]; ++ _dest.x2[1] = var55.x2[1]; ++ var46.x2[1] = _dest.i; + } +- /* 18: storeq */ +- ptr0[i] = var45; ++ /* 19: storeq */ ++ ptr0[i] = var46; + } + + } +@@ -1064,17 +1112,22 @@ + #else + orc_union16 var43; + #endif ++#if defined(__APPLE__) && __GNUC__ == 4 && __GNUC_MINOR__ == 2 && defined (__i386__) ++ volatile orc_union16 var44; ++#else + orc_union16 var44; +- orc_union64 var45; +- orc_union16 var46; ++#endif ++ orc_union16 var45; ++ orc_union64 var46; + orc_union16 var47; + orc_union16 var48; + orc_union16 var49; + orc_union16 var50; + orc_union16 var51; + orc_union16 var52; +- orc_union32 var53; ++ orc_union16 var53; + orc_union32 var54; ++ orc_union32 var55; + + ptr0 = (orc_union64 *)ex->arrays[0]; + ptr4 = (orc_union16 *)ex->arrays[4]; +@@ -1088,6 +1141,9 @@ + 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 */ +@@ -1095,71 +1151,71 @@ + /* 1: loadw */ + var38 = ptr9[i]; + /* 2: avgub */ +- 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; ++ 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; + /* 3: loadw */ + var39 = ptr4[i]; + /* 4: loadw */ + var40 = ptr8[i]; + /* 5: avgub */ +- 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; ++ 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; + /* 6: loadw */ + var41 = ptr7[i]; + /* 7: copyw */ +- var48.i = var41.i; ++ var49.i = var41.i; + /* 8: avgub */ +- 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; ++ 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; + /* 10: andw */ +- var50.i = var49.i & var42.i; ++ var51.i = var50.i & var42.i; + /* 12: andw */ +- var51.i = var48.i & var43.i; ++ var52.i = var49.i & var43.i; + /* 13: orw */ +- var52.i = var51.i | var50.i; +- /* 14: mergebw */ ++ var53.i = var52.i | var51.i; ++ /* 15: mergebw */ + { + orc_union16 _dest; +- _dest.x2[0] = var42.x2[0]; +- _dest.x2[1] = var46.x2[0]; +- var53.x2[0] = _dest.i; ++ _dest.x2[0] = var44.x2[0]; ++ _dest.x2[1] = var47.x2[0]; ++ var54.x2[0] = _dest.i; + } + { + orc_union16 _dest; +- _dest.x2[0] = var42.x2[1]; +- _dest.x2[1] = var46.x2[1]; +- var53.x2[1] = _dest.i; ++ _dest.x2[0] = var44.x2[1]; ++ _dest.x2[1] = var47.x2[1]; ++ var54.x2[1] = _dest.i; + } +- /* 15: loadw */ +- var44 = ptr6[i]; +- /* 16: mergebw */ ++ /* 16: loadw */ ++ var45 = ptr6[i]; ++ /* 17: mergebw */ + { + orc_union16 _dest; +- _dest.x2[0] = var52.x2[0]; +- _dest.x2[1] = var44.x2[0]; +- var54.x2[0] = _dest.i; ++ _dest.x2[0] = var53.x2[0]; ++ _dest.x2[1] = var45.x2[0]; ++ var55.x2[0] = _dest.i; + } + { + orc_union16 _dest; +- _dest.x2[0] = var52.x2[1]; +- _dest.x2[1] = var44.x2[1]; +- var54.x2[1] = _dest.i; ++ _dest.x2[0] = var53.x2[1]; ++ _dest.x2[1] = var45.x2[1]; ++ var55.x2[1] = _dest.i; + } +- /* 17: mergewl */ ++ /* 18: mergewl */ + { + orc_union32 _dest; +- _dest.x2[0] = var53.x2[0]; +- _dest.x2[1] = var54.x2[0]; +- var45.x2[0] = _dest.i; ++ _dest.x2[0] = var54.x2[0]; ++ _dest.x2[1] = var55.x2[0]; ++ var46.x2[0] = _dest.i; + } + { + orc_union32 _dest; +- _dest.x2[0] = var53.x2[1]; +- _dest.x2[1] = var54.x2[1]; +- var45.x2[1] = _dest.i; ++ _dest.x2[0] = var54.x2[1]; ++ _dest.x2[1] = var55.x2[1]; ++ var46.x2[1] = _dest.i; + } +- /* 18: storeq */ +- ptr0[i] = var45; ++ /* 19: storeq */ ++ ptr0[i] = var46; + } + + } +@@ -1192,17 +1248,22 @@ + #else + orc_union16 var43; + #endif ++#if defined(__APPLE__) && __GNUC__ == 4 && __GNUC_MINOR__ == 2 && defined (__i386__) ++ volatile orc_union16 var44; ++#else + orc_union16 var44; +- orc_union64 var45; +- orc_union16 var46; ++#endif ++ orc_union16 var45; ++ orc_union64 var46; + orc_union16 var47; + orc_union16 var48; + orc_union16 var49; + orc_union16 var50; + orc_union16 var51; + orc_union16 var52; +- orc_union32 var53; ++ orc_union16 var53; + orc_union32 var54; ++ orc_union32 var55; + + ptr0 = (orc_union64 *)ex->arrays[0]; + ptr4 = (orc_union16 *)ex->arrays[4]; +@@ -1216,6 +1277,9 @@ + 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 */ +@@ -1223,71 +1287,71 @@ + /* 1: loadw */ + var38 = ptr8[i]; + /* 2: avgub */ +- 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; ++ 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; + /* 3: loadw */ + var39 = ptr5[i]; + /* 4: loadw */ + var40 = ptr9[i]; + /* 5: avgub */ +- 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; ++ 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; + /* 6: loadw */ + var41 = ptr6[i]; + /* 7: copyw */ +- var48.i = var41.i; ++ var49.i = var41.i; + /* 8: avgub */ +- 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; ++ 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; + /* 10: andw */ +- var50.i = var49.i & var42.i; ++ var51.i = var50.i & var42.i; + /* 12: andw */ +- var51.i = var48.i & var43.i; ++ var52.i = var49.i & var43.i; + /* 13: orw */ +- var52.i = var51.i | var50.i; +- /* 14: loadw */ +- var44 = ptr7[i]; +- /* 15: mergebw */ ++ var53.i = var52.i | var51.i; ++ /* 15: loadw */ ++ var45 = ptr7[i]; ++ /* 16: mergebw */ + { + orc_union16 _dest; +- _dest.x2[0] = var43.x2[0]; +- _dest.x2[1] = var44.x2[0]; +- var53.x2[0] = _dest.i; ++ _dest.x2[0] = var44.x2[0]; ++ _dest.x2[1] = var45.x2[0]; ++ var54.x2[0] = _dest.i; + } + { + orc_union16 _dest; +- _dest.x2[0] = var43.x2[1]; +- _dest.x2[1] = var44.x2[1]; +- var53.x2[1] = _dest.i; ++ _dest.x2[0] = var44.x2[1]; ++ _dest.x2[1] = var45.x2[1]; ++ var54.x2[1] = _dest.i; + } +- /* 16: mergebw */ ++ /* 17: mergebw */ + { + orc_union16 _dest; +- _dest.x2[0] = var52.x2[0]; +- _dest.x2[1] = var46.x2[0]; +- var54.x2[0] = _dest.i; ++ _dest.x2[0] = var53.x2[0]; ++ _dest.x2[1] = var47.x2[0]; ++ var55.x2[0] = _dest.i; + } + { + orc_union16 _dest; +- _dest.x2[0] = var52.x2[1]; +- _dest.x2[1] = var46.x2[1]; +- var54.x2[1] = _dest.i; ++ _dest.x2[0] = var53.x2[1]; ++ _dest.x2[1] = var47.x2[1]; ++ var55.x2[1] = _dest.i; + } +- /* 17: mergewl */ ++ /* 18: mergewl */ + { + orc_union32 _dest; +- _dest.x2[0] = var53.x2[0]; +- _dest.x2[1] = var54.x2[0]; +- var45.x2[0] = _dest.i; ++ _dest.x2[0] = var54.x2[0]; ++ _dest.x2[1] = var55.x2[0]; ++ var46.x2[0] = _dest.i; + } + { + orc_union32 _dest; +- _dest.x2[0] = var53.x2[1]; +- _dest.x2[1] = var54.x2[1]; +- var45.x2[1] = _dest.i; ++ _dest.x2[0] = var54.x2[1]; ++ _dest.x2[1] = var55.x2[1]; ++ var46.x2[1] = _dest.i; + } +- /* 18: storeq */ +- ptr0[i] = var45; ++ /* 19: storeq */ ++ ptr0[i] = var46; + } + + } +@@ -1475,6 +1539,7 @@ + orc_program_add_source (p, 2, "s6"); + orc_program_add_constant (p, 2, 0x000000ff, "c1"); + orc_program_add_constant (p, 2, 0x0000ff00, "c2"); ++ orc_program_add_constant (p, 1, 0x000000ff, "c3"); + orc_program_add_temporary (p, 4, "t1"); + orc_program_add_temporary (p, 4, "t2"); + orc_program_add_temporary (p, 2, "t3"); +@@ -1489,7 +1554,7 @@ + orc_program_append_2 (p, "andw", 0, ORC_VAR_T5, ORC_VAR_T5, ORC_VAR_C2, ORC_VAR_D1); + orc_program_append_2 (p, "orw", 0, ORC_VAR_T4, ORC_VAR_T5, ORC_VAR_T4, ORC_VAR_D1); + orc_program_append_2 (p, "mergebw", 1, ORC_VAR_T2, ORC_VAR_S3, ORC_VAR_T4, ORC_VAR_D1); +- orc_program_append_2 (p, "mergebw", 1, ORC_VAR_T1, ORC_VAR_T3, ORC_VAR_C1, ORC_VAR_D1); ++ orc_program_append_2 (p, "mergebw", 1, ORC_VAR_T1, ORC_VAR_T3, ORC_VAR_C3, ORC_VAR_D1); + orc_program_append_2 (p, "mergewl", 1, ORC_VAR_D1, ORC_VAR_T2, ORC_VAR_T1, ORC_VAR_D1); + + if (benchmark) { +@@ -1544,6 +1609,7 @@ + orc_program_add_source (p, 2, "s6"); + orc_program_add_constant (p, 2, 0x0000ff00, "c1"); + orc_program_add_constant (p, 2, 0x000000ff, "c2"); ++ orc_program_add_constant (p, 1, 0x000000ff, "c3"); + orc_program_add_temporary (p, 4, "t1"); + orc_program_add_temporary (p, 4, "t2"); + orc_program_add_temporary (p, 2, "t3"); +@@ -1558,7 +1624,7 @@ + orc_program_append_2 (p, "andw", 0, ORC_VAR_T5, ORC_VAR_T5, ORC_VAR_C2, ORC_VAR_D1); + orc_program_append_2 (p, "orw", 0, ORC_VAR_T4, ORC_VAR_T5, ORC_VAR_T4, ORC_VAR_D1); + orc_program_append_2 (p, "mergebw", 1, ORC_VAR_T2, ORC_VAR_T3, ORC_VAR_T4, ORC_VAR_D1); +- orc_program_append_2 (p, "mergebw", 1, ORC_VAR_T1, ORC_VAR_S4, ORC_VAR_C2, ORC_VAR_D1); ++ orc_program_append_2 (p, "mergebw", 1, ORC_VAR_T1, ORC_VAR_S4, ORC_VAR_C3, ORC_VAR_D1); + orc_program_append_2 (p, "mergewl", 1, ORC_VAR_D1, ORC_VAR_T2, ORC_VAR_T1, ORC_VAR_D1); + + if (benchmark) { +@@ -1613,6 +1679,7 @@ + orc_program_add_source (p, 2, "s6"); + orc_program_add_constant (p, 2, 0x000000ff, "c1"); + orc_program_add_constant (p, 2, 0x0000ff00, "c2"); ++ orc_program_add_constant (p, 1, 0x000000ff, "c3"); + orc_program_add_temporary (p, 4, "t1"); + orc_program_add_temporary (p, 4, "t2"); + orc_program_add_temporary (p, 2, "t3"); +@@ -1626,7 +1693,7 @@ + orc_program_append_2 (p, "andw", 0, ORC_VAR_T4, ORC_VAR_T4, ORC_VAR_C1, ORC_VAR_D1); + orc_program_append_2 (p, "andw", 0, ORC_VAR_T5, ORC_VAR_T5, ORC_VAR_C2, ORC_VAR_D1); + orc_program_append_2 (p, "orw", 0, ORC_VAR_T4, ORC_VAR_T5, ORC_VAR_T4, ORC_VAR_D1); +- orc_program_append_2 (p, "mergebw", 1, ORC_VAR_T1, ORC_VAR_C1, ORC_VAR_S3, ORC_VAR_D1); ++ orc_program_append_2 (p, "mergebw", 1, ORC_VAR_T1, ORC_VAR_C3, ORC_VAR_S3, ORC_VAR_D1); + orc_program_append_2 (p, "mergebw", 1, ORC_VAR_T2, ORC_VAR_T4, ORC_VAR_T3, ORC_VAR_D1); + orc_program_append_2 (p, "mergewl", 1, ORC_VAR_D1, ORC_VAR_T1, ORC_VAR_T2, ORC_VAR_D1); + +@@ -1682,6 +1749,7 @@ + orc_program_add_source (p, 2, "s6"); + orc_program_add_constant (p, 2, 0x0000ff00, "c1"); + orc_program_add_constant (p, 2, 0x000000ff, "c2"); ++ orc_program_add_constant (p, 1, 0x000000ff, "c3"); + orc_program_add_temporary (p, 4, "t1"); + orc_program_add_temporary (p, 4, "t2"); + orc_program_add_temporary (p, 2, "t3"); +@@ -1695,7 +1763,7 @@ + orc_program_append_2 (p, "andw", 0, ORC_VAR_T4, ORC_VAR_T4, ORC_VAR_C1, ORC_VAR_D1); + orc_program_append_2 (p, "andw", 0, ORC_VAR_T5, ORC_VAR_T5, ORC_VAR_C2, ORC_VAR_D1); + orc_program_append_2 (p, "orw", 0, ORC_VAR_T4, ORC_VAR_T5, ORC_VAR_T4, ORC_VAR_D1); +- orc_program_append_2 (p, "mergebw", 1, ORC_VAR_T1, ORC_VAR_C2, ORC_VAR_T3, ORC_VAR_D1); ++ orc_program_append_2 (p, "mergebw", 1, ORC_VAR_T1, ORC_VAR_C3, ORC_VAR_T3, ORC_VAR_D1); + orc_program_append_2 (p, "mergebw", 1, ORC_VAR_T2, ORC_VAR_T4, ORC_VAR_S4, ORC_VAR_D1); + orc_program_append_2 (p, "mergewl", 1, ORC_VAR_D1, ORC_VAR_T1, ORC_VAR_T2, ORC_VAR_D1); + +@@ -1751,6 +1819,7 @@ + orc_program_add_source (p, 2, "s6"); + orc_program_add_constant (p, 2, 0x000000ff, "c1"); + orc_program_add_constant (p, 2, 0x0000ff00, "c2"); ++ orc_program_add_constant (p, 1, 0x000000ff, "c3"); + orc_program_add_temporary (p, 4, "t1"); + orc_program_add_temporary (p, 4, "t2"); + orc_program_add_temporary (p, 2, "t3"); +@@ -1765,7 +1834,7 @@ + orc_program_append_2 (p, "andw", 0, ORC_VAR_T5, ORC_VAR_T5, ORC_VAR_C2, ORC_VAR_D1); + orc_program_append_2 (p, "orw", 0, ORC_VAR_T4, ORC_VAR_T5, ORC_VAR_T4, ORC_VAR_D1); + orc_program_append_2 (p, "mergebw", 1, ORC_VAR_T1, ORC_VAR_T3, ORC_VAR_T4, ORC_VAR_D1); +- orc_program_append_2 (p, "mergebw", 1, ORC_VAR_T2, ORC_VAR_S3, ORC_VAR_C1, ORC_VAR_D1); ++ orc_program_append_2 (p, "mergebw", 1, ORC_VAR_T2, ORC_VAR_S3, ORC_VAR_C3, ORC_VAR_D1); + orc_program_append_2 (p, "mergewl", 1, ORC_VAR_D1, ORC_VAR_T1, ORC_VAR_T2, ORC_VAR_D1); + + if (benchmark) { +@@ -1820,6 +1889,7 @@ + orc_program_add_source (p, 2, "s6"); + orc_program_add_constant (p, 2, 0x0000ff00, "c1"); + orc_program_add_constant (p, 2, 0x000000ff, "c2"); ++ orc_program_add_constant (p, 1, 0x000000ff, "c3"); + orc_program_add_temporary (p, 4, "t1"); + orc_program_add_temporary (p, 4, "t2"); + orc_program_add_temporary (p, 2, "t3"); +@@ -1834,7 +1904,7 @@ + orc_program_append_2 (p, "andw", 0, ORC_VAR_T5, ORC_VAR_T5, ORC_VAR_C2, ORC_VAR_D1); + orc_program_append_2 (p, "orw", 0, ORC_VAR_T4, ORC_VAR_T5, ORC_VAR_T4, ORC_VAR_D1); + orc_program_append_2 (p, "mergebw", 1, ORC_VAR_T1, ORC_VAR_S4, ORC_VAR_T4, ORC_VAR_D1); +- orc_program_append_2 (p, "mergebw", 1, ORC_VAR_T2, ORC_VAR_T3, ORC_VAR_C2, ORC_VAR_D1); ++ orc_program_append_2 (p, "mergebw", 1, ORC_VAR_T2, ORC_VAR_T3, ORC_VAR_C3, ORC_VAR_D1); + orc_program_append_2 (p, "mergewl", 1, ORC_VAR_D1, ORC_VAR_T1, ORC_VAR_T2, ORC_VAR_D1); + + if (benchmark) { +@@ -1889,6 +1959,7 @@ + orc_program_add_source (p, 2, "s6"); + orc_program_add_constant (p, 2, 0x000000ff, "c1"); + orc_program_add_constant (p, 2, 0x0000ff00, "c2"); ++ orc_program_add_constant (p, 1, 0x000000ff, "c3"); + orc_program_add_temporary (p, 4, "t1"); + orc_program_add_temporary (p, 4, "t2"); + orc_program_add_temporary (p, 2, "t3"); +@@ -1902,7 +1973,7 @@ + orc_program_append_2 (p, "andw", 0, ORC_VAR_T4, ORC_VAR_T4, ORC_VAR_C1, ORC_VAR_D1); + orc_program_append_2 (p, "andw", 0, ORC_VAR_T5, ORC_VAR_T5, ORC_VAR_C2, ORC_VAR_D1); + orc_program_append_2 (p, "orw", 0, ORC_VAR_T4, ORC_VAR_T5, ORC_VAR_T4, ORC_VAR_D1); +- orc_program_append_2 (p, "mergebw", 1, ORC_VAR_T1, ORC_VAR_C1, ORC_VAR_T3, ORC_VAR_D1); ++ orc_program_append_2 (p, "mergebw", 1, ORC_VAR_T1, ORC_VAR_C3, ORC_VAR_T3, ORC_VAR_D1); + orc_program_append_2 (p, "mergebw", 1, ORC_VAR_T2, ORC_VAR_T4, ORC_VAR_S3, ORC_VAR_D1); + orc_program_append_2 (p, "mergewl", 1, ORC_VAR_D1, ORC_VAR_T1, ORC_VAR_T2, ORC_VAR_D1); + +@@ -1958,6 +2029,7 @@ + orc_program_add_source (p, 2, "s6"); + orc_program_add_constant (p, 2, 0x0000ff00, "c1"); + orc_program_add_constant (p, 2, 0x000000ff, "c2"); ++ orc_program_add_constant (p, 1, 0x000000ff, "c3"); + orc_program_add_temporary (p, 4, "t1"); + orc_program_add_temporary (p, 4, "t2"); + orc_program_add_temporary (p, 2, "t3"); +@@ -1971,7 +2043,7 @@ + orc_program_append_2 (p, "andw", 0, ORC_VAR_T4, ORC_VAR_T4, ORC_VAR_C1, ORC_VAR_D1); + orc_program_append_2 (p, "andw", 0, ORC_VAR_T5, ORC_VAR_T5, ORC_VAR_C2, ORC_VAR_D1); + orc_program_append_2 (p, "orw", 0, ORC_VAR_T4, ORC_VAR_T5, ORC_VAR_T4, ORC_VAR_D1); +- orc_program_append_2 (p, "mergebw", 1, ORC_VAR_T1, ORC_VAR_C2, ORC_VAR_S4, ORC_VAR_D1); ++ orc_program_append_2 (p, "mergebw", 1, ORC_VAR_T1, ORC_VAR_C3, ORC_VAR_S4, ORC_VAR_D1); + orc_program_append_2 (p, "mergebw", 1, ORC_VAR_T2, ORC_VAR_T4, ORC_VAR_T3, ORC_VAR_D1); + orc_program_append_2 (p, "mergewl", 1, ORC_VAR_D1, ORC_VAR_T1, ORC_VAR_T2, ORC_VAR_D1); + diff --git a/SPECS/gstreamer1-plugins-bad-free.spec b/SPECS/gstreamer1-plugins-bad-free.spec index 0eeaeda..e49aeca 100644 --- a/SPECS/gstreamer1-plugins-bad-free.spec +++ b/SPECS/gstreamer1-plugins-bad-free.spec @@ -1,4 +1,5 @@ -%global majorminor 1.0 +%global majorminor 1.0 +%global _gobject_introspection 1.31.1 # Turn of extras package on RHEL. %if ! 0%{?rhel} @@ -8,8 +9,8 @@ %endif Name: gstreamer1-plugins-bad-free -Version: 1.0.7 -Release: 4%{?dist} +Version: 1.4.5 +Release: 3%{?dist} Summary: GStreamer streaming media framework "bad" plugins License: LGPLv2+ and LGPLv2 @@ -19,6 +20,9 @@ URL: http://gstreamer.freedesktop.org/ # modified with gst-p-bad-cleanup.sh from SOURCE1 Source0: gst-plugins-bad-free-%{version}.tar.xz Source1: gst-p-bad-cleanup.sh +Patch0: 0001-bayer-update-ORC-files.patch +Patch1: update-test-check-orc-bayer.patch +Patch2: 0001-tests-fix-audiomixer-test-on-big-endian-systems.patch BuildRequires: gstreamer1-devel >= %{version} BuildRequires: gstreamer1-plugins-base-devel >= %{version} @@ -27,13 +31,13 @@ BuildRequires: check BuildRequires: gettext-devel BuildRequires: libXt-devel BuildRequires: gtk-doc +BuildRequires: gobject-introspection-devel >= %{_gobject_introspection} BuildRequires: bzip2-devel BuildRequires: exempi-devel BuildRequires: gsm-devel BuildRequires: jasper-devel -## Plugin not ported -#BuildRequires: ladspa-devel +BuildRequires: ladspa-devel BuildRequires: libdvdnav-devel BuildRequires: libexif-devel BuildRequires: libiptcdata-devel @@ -41,26 +45,33 @@ BuildRequires: libmpcdec-devel BuildRequires: liboil-devel BuildRequires: librsvg2-devel BuildRequires: libsndfile-devel +BuildRequires: mesa-libGL-devel BuildRequires: mesa-libGLU-devel BuildRequires: openssl-devel BuildRequires: orc-devel BuildRequires: soundtouch-devel BuildRequires: wavpack-devel BuildRequires: opus-devel +BuildRequires: nettle-devel +BuildRequires: libgcrypt-devel +%if 0%{?fedora} +BuildRequires: libwayland-client-devel +%endif +BuildRequires: gnutls-devel +BuildRequires: libsrtp-devel BuildRequires: chrpath %if %{with extras} -BuildRequires: celt-devel ## Plugins not ported #BuildRequires: dirac-devel #BuildRequires: gmyth-devel >= 0.4 +BuildRequires: fluidsynth-devel BuildRequires: libass-devel ## Plugin not ported #BuildRequires: libcdaudio-devel BuildRequires: libcurl-devel -## Plugin not ported -#BuildRequires: libkate-devel +BuildRequires: libkate-devel BuildRequires: libmodplug-devel ## Plugins not ported #BuildRequires: libmusicbrainz-devel @@ -72,9 +83,10 @@ BuildRequires: schroedinger-devel ## Plugins not ported #BuildRequires: SDL-devel #BuildRequires: slv2-devel -#BuildRequires: wildmidi-devel +BuildRequires: wildmidi-devel BuildRequires: zbar-devel BuildRequires: zvbi-devel +BuildRequires: OpenEXR-devel %endif @@ -103,6 +115,22 @@ This package (%{name}-extras) contains extra "bad" plugins for sources (mythtv), sinks (fbdev) and effects (pitch) which are not used very much and require additional libraries to be installed. + + +%package fluidsynth +Summary: GStreamer "bad" plugins fluidsynth plugin +Requires: %{name} = %{version}-%{release} +Requires: soundfont2-default + +%description fluidsynth +GStreamer is a streaming media framework, based on graphs of elements which +operate on media data. + +gstreamer-plugins-bad contains plug-ins that aren't tested well enough, +or the code is not of good enough quality. + +This package (%{name}-fluidsynth) contains the fluidsynth plugin which allows +playback of midi files. %endif @@ -122,6 +150,9 @@ aren't tested well enough, or the code is not of good enough quality. %prep %setup -q -n gst-plugins-bad-%{version} +%patch0 -p1 +%patch1 -p1 +%patch2 -p1 %build @@ -129,10 +160,14 @@ aren't tested well enough, or the code is not of good enough quality. --with-package-name="Fedora GStreamer-plugins-bad package" \ --with-package-origin="http://download.fedoraproject.org" \ %{!?with_extras:--disable-fbdev --disable-decklink --disable-linsys} \ - --enable-debug --disable-static --enable-experimental \ + --enable-debug --disable-static --enable-gtk-doc --enable-experimental \ --disable-dts --disable-faac --disable-faad --disable-nas \ --disable-mimic --disable-libmms --disable-mpeg2enc --disable-mplex \ - --disable-neon --disable-openal --disable-rtmp --disable-xvid + --disable-neon --disable-openal --disable-rtmp --disable-xvid \ + --disable-chromaprint --disable-eglgles --disable-flite \ + --disable-mpg123 --disable-ofa --disable-opencv --disable-sbc \ + --disable-spandsp --disable-uvch264 --disable-voamrwbenc \ + --disable-webp --disable-openjpeg make %{?_smp_mflags} @@ -157,24 +192,43 @@ chrpath --delete $RPM_BUILD_ROOT%{_libdir}/gstreamer-%{majorminor}/libgstcamerab %doc AUTHORS COPYING COPYING.LIB README REQUIREMENTS %{_libdir}/libgstbasecamerabinsrc-%{majorminor}.so.* -%{_libdir}/libgstbasevideo-%{majorminor}.so.* +%{_libdir}/libgstbadbase-%{majorminor}.so.* +%{_libdir}/libgstbadvideo-%{majorminor}.so.* %{_libdir}/libgstcodecparsers-%{majorminor}.so.* +%{_libdir}/libgstgl-%{majorminor}.so.* +%{_libdir}/libgstinsertbin-%{majorminor}.so.* +%{_libdir}/libgstmpegts-%{majorminor}.so.* %{_libdir}/libgstphotography-%{majorminor}.so.* -%{_libdir}/libgstsignalprocessor-%{majorminor}.so.* +%{_libdir}/libgsturidownloader-%{majorminor}.so.* +%if 0%{?fedora} +%{_libdir}/libgstwayland-%{majorminor}.so.* +%endif + +%{_libdir}/girepository-1.0/GstInsertBin-1.0.typelib +%{_libdir}/girepository-1.0/GstMpegts-1.0.typelib + # Plugins without external dependencies +%{_libdir}/gstreamer-%{majorminor}/libgstaccurip.so %{_libdir}/gstreamer-%{majorminor}/libgstadpcmdec.so %{_libdir}/gstreamer-%{majorminor}/libgstadpcmenc.so +%{_libdir}/gstreamer-%{majorminor}/libgstaiff.so %{_libdir}/gstreamer-%{majorminor}/libgstasfmux.so +%{_libdir}/gstreamer-%{majorminor}/libgstaudiofxbad.so +%{_libdir}/gstreamer-%{majorminor}/libgstaudiomixer.so %{_libdir}/gstreamer-%{majorminor}/libgstaudiovisualizers.so %{_libdir}/gstreamer-%{majorminor}/libgstautoconvert.so %{_libdir}/gstreamer-%{majorminor}/libgstbayer.so %{_libdir}/gstreamer-%{majorminor}/libgstcamerabin2.so %{_libdir}/gstreamer-%{majorminor}/libgstcoloreffects.so +%{_libdir}/gstreamer-%{majorminor}/libgstcompositor.so +%{_libdir}/gstreamer-%{majorminor}/libgstdashdemux.so %{_libdir}/gstreamer-%{majorminor}/libgstdataurisrc.so -%{_libdir}/gstreamer-%{majorminor}/libgstdtmf.so +%if %{with extras} +%{_libdir}/gstreamer-%{majorminor}/libgstfbdevsink.so +%endif %{_libdir}/gstreamer-%{majorminor}/libgstfestival.so %{_libdir}/gstreamer-%{majorminor}/libgstfieldanalysis.so -%{_libdir}/gstreamer-%{majorminor}/libgstfragmented.so +%{_libdir}/gstreamer-%{majorminor}/libgstfreeverb.so %{_libdir}/gstreamer-%{majorminor}/libgstfrei0r.so %{_libdir}/gstreamer-%{majorminor}/libgstgaudieffects.so %{_libdir}/gstreamer-%{majorminor}/libgstgdp.so @@ -182,27 +236,40 @@ chrpath --delete $RPM_BUILD_ROOT%{_libdir}/gstreamer-%{majorminor}/libgstcamerab %{_libdir}/gstreamer-%{majorminor}/libgstid3tag.so %{_libdir}/gstreamer-%{majorminor}/libgstinter.so %{_libdir}/gstreamer-%{majorminor}/libgstinterlace.so +%{_libdir}/gstreamer-%{majorminor}/libgstivfparse.so +%{_libdir}/gstreamer-%{majorminor}/libgstivtc.so +%{_libdir}/gstreamer-%{majorminor}/libgstjp2kdecimator.so %{_libdir}/gstreamer-%{majorminor}/libgstjpegformat.so %{_libdir}/gstreamer-%{majorminor}/libgstliveadder.so +%{_libdir}/gstreamer-%{majorminor}/libgstmidi.so %{_libdir}/gstreamer-%{majorminor}/libgstmpegpsdemux.so %{_libdir}/gstreamer-%{majorminor}/libgstmpegtsdemux.so %{_libdir}/gstreamer-%{majorminor}/libgstmpegpsmux.so %{_libdir}/gstreamer-%{majorminor}/libgstmpegtsmux.so +%{_libdir}/gstreamer-%{majorminor}/libgstmxf.so %{_libdir}/gstreamer-%{majorminor}/libgstpcapparse.so %{_libdir}/gstreamer-%{majorminor}/libgstpnm.so %{_libdir}/gstreamer-%{majorminor}/libgstrawparse.so %{_libdir}/gstreamer-%{majorminor}/libgstremovesilence.so %{_libdir}/gstreamer-%{majorminor}/libgstresindvd.so -%{_libdir}/gstreamer-%{majorminor}/libgstrtpmux.so -%{_libdir}/gstreamer-%{majorminor}/libgstrtpvp8.so -%{_libdir}/gstreamer-%{majorminor}/libgstscaletempoplugin.so +%{_libdir}/gstreamer-%{majorminor}/libgstrfbsrc.so +%{_libdir}/gstreamer-%{majorminor}/libgstrsvg.so %{_libdir}/gstreamer-%{majorminor}/libgstsdpelem.so %{_libdir}/gstreamer-%{majorminor}/libgstsegmentclip.so %{_libdir}/gstreamer-%{majorminor}/libgstshm.so %{_libdir}/gstreamer-%{majorminor}/libgstsmooth.so +%{_libdir}/gstreamer-%{majorminor}/libgstsmoothstreaming.so %{_libdir}/gstreamer-%{majorminor}/libgstspeed.so +%{_libdir}/gstreamer-%{majorminor}/libgststereo.so %{_libdir}/gstreamer-%{majorminor}/libgstsubenc.so +%if %{with extras} +%{_libdir}/gstreamer-%{majorminor}/libgstvdpau.so +%endif +%{_libdir}/gstreamer-%{majorminor}/libgstvideofiltersbad.so %{_libdir}/gstreamer-%{majorminor}/libgstvideoparsersbad.so +%{_libdir}/gstreamer-%{majorminor}/libgstvideosignal.so +%{_libdir}/gstreamer-%{majorminor}/libgstvmnc.so +%{_libdir}/gstreamer-%{majorminor}/libgstyadif.so %{_libdir}/gstreamer-%{majorminor}/libgsty4mdec.so # System (Linux) specific plugins @@ -210,9 +277,17 @@ chrpath --delete $RPM_BUILD_ROOT%{_libdir}/gstreamer-%{majorminor}/libgstcamerab # Plugins with external dependencies %{_libdir}/gstreamer-%{majorminor}/libgstbz2.so +%{_libdir}/gstreamer-%{majorminor}/libgstfragmented.so %{_libdir}/gstreamer-%{majorminor}/libgstgsm.so +%{_libdir}/gstreamer-%{majorminor}/libgstladspa.so +%{_libdir}/gstreamer-%{majorminor}/libgstopengl.so %{_libdir}/gstreamer-%{majorminor}/libgstopus.so +%{_libdir}/gstreamer-%{majorminor}/libgstsndfile.so %{_libdir}/gstreamer-%{majorminor}/libgstsoundtouch.so +%{_libdir}/gstreamer-%{majorminor}/libgstsrtp.so +%if 0%{?fedora} +%{_libdir}/gstreamer-%{majorminor}/libgstwaylandsink.so +%endif #debugging plugin %{_libdir}/gstreamer-%{majorminor}/libgstdebugutilsbad.so @@ -222,41 +297,153 @@ chrpath --delete $RPM_BUILD_ROOT%{_libdir}/gstreamer-%{majorminor}/libgstcamerab %files extras # Plugins with external dependencies %{_libdir}/gstreamer-%{majorminor}/libgstassrender.so -%{_libdir}/gstreamer-%{majorminor}/libgstcelt.so %{_libdir}/gstreamer-%{majorminor}/libgstcurl.so +%{_libdir}/gstreamer-%{majorminor}/libgstdecklink.so +%{_libdir}/gstreamer-%{majorminor}/libgstkate.so %{_libdir}/gstreamer-%{majorminor}/libgstmodplug.so +%{_libdir}/gstreamer-%{majorminor}/libgstopenexr.so %{_libdir}/gstreamer-%{majorminor}/libgstschro.so %{_libdir}/gstreamer-%{majorminor}/libgstzbar.so -%{_libdir}/gstreamer-%{majorminor}/libgstdecklink.so +%{_libdir}/gstreamer-%{majorminor}/libgstwildmidi.so + + +%files fluidsynth +# Plugins with external dependencies +%{_libdir}/gstreamer-%{majorminor}/libgstfluidsynthmidi.so %endif %files devel -#%doc %{_datadir}/gtk-doc/html/gst-plugins-bad-plugins-%{majorminor} +%doc %{_datadir}/gtk-doc/html/gst-plugins-bad-plugins-%{majorminor} %doc %{_datadir}/gtk-doc/html/gst-plugins-bad-libs-%{majorminor} + +%{_datadir}/gir-1.0/GstInsertBin-%{majorminor}.gir +%{_datadir}/gir-1.0/GstMpegts-%{majorminor}.gir + %{_libdir}/libgstbasecamerabinsrc-%{majorminor}.so -%{_libdir}/libgstbasevideo-%{majorminor}.so +%{_libdir}/libgstbadbase-%{majorminor}.so +%{_libdir}/libgstbadvideo-%{majorminor}.so %{_libdir}/libgstcodecparsers-%{majorminor}.so +%{_libdir}/libgstgl-%{majorminor}.so +%{_libdir}/libgstinsertbin-%{majorminor}.so +%{_libdir}/libgstmpegts-%{majorminor}.so %{_libdir}/libgstphotography-%{majorminor}.so -%{_libdir}/libgstsignalprocessor-%{majorminor}.so +%{_libdir}/libgsturidownloader-%{majorminor}.so +%if 0%{?fedora} +%{_libdir}/libgstwayland-%{majorminor}.so +%endif %{_includedir}/gstreamer-%{majorminor}/gst/basecamerabinsrc %{_includedir}/gstreamer-%{majorminor}/gst/codecparsers +%{_includedir}/gstreamer-%{majorminor}/gst/insertbin %{_includedir}/gstreamer-%{majorminor}/gst/interfaces/photography* -%{_includedir}/gstreamer-%{majorminor}/gst/signalprocessor -%{_includedir}/gstreamer-%{majorminor}/gst/video +%{_includedir}/gstreamer-%{majorminor}/gst/mpegts +%{_includedir}/gstreamer-%{majorminor}/gst/uridownloader +%{_includedir}/gstreamer-%{majorminor}/gst/gl # pkg-config files -%{_libdir}/pkgconfig/gstreamer-basevideo-%{majorminor}.pc %{_libdir}/pkgconfig/gstreamer-codecparsers-%{majorminor}.pc +%{_libdir}/pkgconfig/gstreamer-gl-%{majorminor}.pc +%{_libdir}/pkgconfig/gstreamer-insertbin-%{majorminor}.pc +%{_libdir}/pkgconfig/gstreamer-mpegts-%{majorminor}.pc %{_libdir}/pkgconfig/gstreamer-plugins-bad-%{majorminor}.pc %changelog -* Fri Jan 24 2014 Daniel Mach - 1.0.7-4 -- Mass rebuild 2014-01-24 +* Thu Jul 30 2015 Wim Taymans - 1.4.5-3 +- Update audiomixer unit test for big endian +- add missing patch +- Resolves: #1226909 + +* Mon Jun 22 2015 Wim Taymans - 1.4.5-2 +- Update ORC backup file +- Resolves: #1174403 + +* Tue May 12 2015 Wim Taymans - 1.4.5-1 +- Update to 1.4.5 +- Resolves: #1174403 + +* Tue Nov 25 2014 Rex Dieter 1.4.4-2 +- rebuild (openexr) + +* Fri Nov 14 2014 Kalev Lember - 1.4.4-1 +- Update to 1.4.4 + +* Fri Nov 14 2014 Tom Callaway - 1.4.2-3 +- Rebuild for new libsrtp + +* Mon Sep 22 2014 Wim Taymans - 1.4.2-2 +- Remove celt buildreq, the plugin was removed and so is celt-devel + +* Mon Sep 22 2014 Wim Taymans - 1.4.2-1 +- Update to 1.4.2. + +* Fri Aug 29 2014 Wim Taymans - 1.4.1-1 +- Update to 1.4.1. + +* Sat Aug 16 2014 Fedora Release Engineering - 1.4.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild + +* Tue Jul 22 2014 Wim Taymans - 1.4.0-1 +- Update to 1.4.0. + +* Fri Jul 11 2014 Wim Taymans - 1.3.91-1 +- Update to 1.3.91. +- Remove old libraries + +* Tue Jun 17 2014 Wim Taymans - 1.2.4-1 +- Update to 1.2.4. + +* Sat Jun 07 2014 Fedora Release Engineering - 1.2.3-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + +* Thu Mar 20 2014 Hans de Goede - 1.2.3-3 +- Put the fluidsynth plugin in its own subpackage and make it require + soundfont2-default (rhbz#1078925) + +* Wed Mar 19 2014 Peter Robinson 1.2.3-2 +- Bump (libass) + +* Mon Feb 10 2014 Brian Pepple - 1.2.3-1 +- Update to 1.2.3. + +* Thu Feb 6 2014 Brian Pepple - 1.2.2-2 +- Build the srtp plugin. (#1055669) + +* Fri Dec 27 2013 Brian Pepple - 1.2.2-1 +- Update to 1.2.2. + +* Fri Nov 15 2013 Brian Pepple - 1.2.1-4 +- Build fluidsynth plugin. (#1024906) + +* Thu Nov 14 2013 Brian Pepple - 1.2.1-3 +- Add BR on gnutls-devel for HLS support. (#1030491) + +* Mon Nov 11 2013 Brian Pepple - 1.2.1-2 +- Build ladspa, libkate, and wildmidi plugins. + +* Mon Nov 11 2013 Brian Pepple - 1.2.1-1 +- Update to 1.2.1. + +* Fri Nov 8 2013 Brian Pepple - 1.2.0-3 +- Build gobject-introspection support. (#1028156) + +* Fri Oct 04 2013 Bastien Nocera 1.2.0-2 +- Build the wayland video output plugin + +* Tue Sep 24 2013 Brian Pepple - 1.2.0-1 +- Update to 1.2.0. + +* Thu Sep 19 2013 Brian Pepple - 1.1.90-1 +- Update to 1.1.90. + +* Wed Aug 28 2013 Brian Pepple - 1.1.4-1 +- Update to 1.1.4. + +* Mon Jul 29 2013 Brian Pepple - 1.1.3-1 +- Update to 1.1.3. -* Fri Dec 27 2013 Daniel Mach - 1.0.7-3 -- Mass rebuild 2013-12-27 +* Fri Jul 12 2013 Brian Pepple - 1.1.2-1 +- Update to 1.1.2. * Tue May 07 2013 Colin Walters - 1.0.7-2 - Move libgstdecklink to its correct place in extras; needed for RHEL