diff options
| author | Sebastian Dröge <sebastian@centricular.com> | 2014-12-18 12:39:40 +0100 |
|---|---|---|
| committer | Sebastian Dröge <sebastian@centricular.com> | 2014-12-18 12:39:40 +0100 |
| commit | faed71d328a29cff799a4e57e4775e5815038b4b (patch) | |
| tree | f5375c92a67aefe0288197fd2c97b972bacc60bf | |
| parent | c5b5be98aa46ac8458f3aa1c12ff31b8f9cee710 (diff) | |
Release 1.4.5gst-plugins-bad-1.4.5
83 files changed, 1947 insertions, 1911 deletions
@@ -1,9 +1,364 @@ +=== release 1.4.5 === + +2014-12-18 Sebastian Dröge <slomo@coaxion.net> + + * configure.ac: + releasing 1.4.5 + +2014-11-09 10:25:25 +0100 Sebastian Dröge <sebastian@centricular.com> + + * sys/applemedia/avfvideosrc.m: + avfvideosrc: Don't pretend to support reconfiguration + We will run into an assertion in set_caps() if we try to change + caps while the source is already running. Don't try to find new + caps in GstBaseSrc::negotiate() to prevent caps changes. + +2014-12-17 12:20:54 +1100 Alessandro Decina <alessandro.d@gmail.com> + + * sys/applemedia/avfvideosrc.m: + avfvideosrc: improve timestamping and latency reporting + Use AVF provided timings to timestamp output buffers. Use the running time at + the time the first buffer is produced to base timestamps on. Report 1-frame + latency based on the negotiated framerate instead of hardcoding 4ms latency. + +2014-12-10 22:36:53 +1100 Alessandro Decina <alessandro.d@gmail.com> + + * sys/applemedia/vtenc.c: + * sys/applemedia/vtenc.h: + vtenc: negotiate profile and level with downstream + +2014-12-10 19:44:01 +1100 Alessandro Decina <alessandro.d@gmail.com> + + * sys/applemedia/vtenc.c: + * sys/applemedia/vtenc.h: + vtenc: report latency + +2014-12-05 16:33:20 +0100 Sebastian Dröge <sebastian@centricular.com> + + * sys/applemedia/vtenc.c: + * sys/applemedia/vtenc.h: + vtenc: Add properties to specify the maximum keyframe interval in frames and seconds + +2014-11-27 13:40:56 +0100 Alessandro Decina <alessandro.d@gmail.com> + + * sys/applemedia/vtenc.c: + * sys/applemedia/vtenc.h: + vtenc: add quality property + +2014-11-27 13:33:07 +0100 Alessandro Decina <alessandro.d@gmail.com> + + * sys/applemedia/Makefile.am: + * sys/applemedia/vtenc.c: + vtenc: set profile and level in caps + +2014-12-05 16:15:23 +0100 Sebastian Dröge <sebastian@centricular.com> + + * sys/applemedia/vtenc.c: + vtenc: Fix conversion of the bitrate property and our internal bitrate storage + The property is in kbit/s and we store it in bit/s, so just multiply and + divide by 1000. No need to put a factor of 8 in there. + kVTCompressionPropertyKey_AverageBitRate is also in bit/s according to + its documentation. + +2014-12-16 13:35:14 +0100 Wim Taymans <wtaymans@redhat.com> + + * ext/directfb/dfbvideosink.c: + * ext/sdl/sdlvideosink.c: + * ext/wayland/wlwindow.c: + * sys/directdraw/gstdirectdrawsink.c: + * sys/pvr2d/gstpvrvideosink.c: + * sys/vdpau/gstvdpvideopostprocess.c: + rectangle: clear rectangle struct before use + +2014-12-15 15:21:50 +0000 Vincent Penquerc'h <vincent.penquerch@collabora.co.uk> + + * ext/opus/gstopusparse.c: + opusparse: fix frame size determination + https://bugzilla.gnome.org/show_bug.cgi?id=741321 + +2014-05-08 10:41:03 +0530 Sudip Jain <sudip.jain@linaro.org> + + * gst/mpegtsdemux/mpegtsbase.c: + mpegtsbase: scan more bytes to find initial PCRs + Fixes playback of Samsung-Colorful-Variety-1080i.ts. + https://bugzilla.gnome.org/show_bug.cgi?id=729768 + +2014-12-09 05:03:11 +0100 Mathieu Duponchelle <mathieu.duponchelle@opencreed.com> + + * gst/geometrictransform/gstmirror.c: + mirror: Needs remap when the mode changes. + This caused the user to think the mode wasn't taken into account. + +2014-12-01 09:48:41 +0100 Thomas Klausner <wiz@danbala.tuwien.ac.at> + + * configure.ac: + configure: Do comparisons in a portable way with = instead of == + https://bugzilla.gnome.org/show_bug.cgi?id=740953 + +2014-11-27 16:43:39 +0100 Thibault Saunier <tsaunier@gnome.org> + + * gst/audiomixer/gstaudiomixer.c: + audiomixer: Do not try to resize a buffer to a negative size on EOS + +2014-11-24 13:56:56 +0100 Sebastian Dröge <sebastian@centricular.com> + + * sys/decklink/gstdecklink.cpp: + decklink: HD1080i50 is 50 frames per second + +2014-11-14 10:55:14 +0900 Wonchul Lee <wonchul86.lee@lge.com> + + * gst/rawparse/gstrawparse.c: + rawparse: send SEEKING query upstream first + Sometimes rawparse does not handle the seeking query + properly, the rawparse should send the query upstream + first. For example, upstream could support seeking in + TIME format (but not in BYTE format), so the BYTE format + seeking query that rawparse sends in push mode would + fail. + https://bugzilla.gnome.org/show_bug.cgi?id=722764 + +2014-11-21 15:46:49 +0100 Alessandro Decina <alessandro.d@gmail.com> + + * sys/applemedia/vtenc.c: + vtenc: let VT pick the bitrate by default + +2014-11-06 13:22:17 +0100 Alessandro Decina <alessandro.d@gmail.com> + + * sys/applemedia/vtenc.c: + * sys/applemedia/vtenc.h: + vtenc: add realtime and allow-frame-reordering properties + +2014-11-20 10:23:30 -0800 Aleix Conchillo Flaqué <aleix@oblong.com> + + * ext/srtp/gstsrtpdec.c: + srtpdec: fix rtp/rtcp sink event memory leak + https://bugzilla.gnome.org/show_bug.cgi?id=740451 + +2014-11-20 16:04:34 +0100 Alessandro Decina <alessandro.d@gmail.com> + + * sys/applemedia/vtenc.c: + vtenc: set H264_Baseline_AutoLevel on OSX as well + +2014-11-20 15:50:18 +0100 Alessandro Decina <alessandro.d@gmail.com> + + * sys/applemedia/vtdec.c: + vtdec: disable the reorder queue for baseline streams + +2014-11-20 09:41:43 +0100 Sebastian Dröge <sebastian@centricular.com> + + * sys/applemedia/vtdec.c: + vtdec: Fix divide by zero in the picture buffer length calculation + +2014-11-16 10:57:55 +0100 Sebastian Dröge <sebastian@centricular.com> + + * configure.ac: + * gst-libs/gst/gl/gstglapi.h: + gl: Use numeric OSX version instead of the macro + The macro is not defined on older OSX versions and evaluates to 0. + https://bugzilla.gnome.org/show_bug.cgi?id=740201 + +2014-11-13 12:01:25 +0100 Sebastian Dröge <sebastian@centricular.com> + + * gst-libs/gst/gl/cocoa/gstglwindow_cocoa.m: + gl/cocoa: Don't override the application delegate + Otherwise interesting things will happen in Cocoa applications, like + infinite event loops that block the NSApplication loop forever. + This was only needed for GNUStep and thus can safely be removed now. + +2014-11-16 11:00:14 +0100 Sebastian Dröge <sebastian@centricular.com> + + * gst-libs/gst/gl/cocoa/gstglwindow_cocoa.m: + gl/cocoa: Only use convertRectToBacking on OSX >= 10.7 + It does not exist before and older versions also don't have + support for HiDPI displays anyway. + https://bugzilla.gnome.org/show_bug.cgi?id=740201 + +2014-11-13 11:58:07 +0100 Sebastian Dröge <sebastian@centricular.com> + + * configure.ac: + * gst-libs/gst/gl/cocoa/gstglcontext_cocoa.m: + * gst-libs/gst/gl/cocoa/gstglwindow_cocoa.m: + * tests/examples/gl/cocoa/cocoa-videooverlay.m: + gl/cocoa: Remove GNUStep support + Until gcc and GNUStep properly support Objective-C blocks and other + "new" features of Objective-C we can't properly support them without + making the code much more ugly. + https://bugzilla.gnome.org/show_bug.cgi?id=739152 + +2014-11-12 16:45:12 +0100 Alessandro Decina <alessandro.d@gmail.com> + + * sys/applemedia/vtenc.c: + vtenc: fix build on iOS + +2014-11-12 15:35:36 +0100 Alessandro Decina <alessandro.d@gmail.com> + + * sys/applemedia/coremediabuffer.c: + coremediabuffer: set ->pixel_buf for CVPixelBuffer buffers + Fix a bug for which we never actually set ->pixel_buf to non-NULL for + CVPixelBuffer buffers. + +2014-11-12 09:59:53 +0100 Alessandro Decina <alessandro.d@gmail.com> + + * sys/applemedia/vtenc.c: + vtenc: fix compilation on < 10.9 + +2014-11-11 18:01:54 +0100 Alessandro Decina <alessandro.d@gmail.com> + + * sys/applemedia/vtenc.c: + vtenc: enable the hw encoder on OSX + +2014-11-15 21:59:48 +0000 Tim-Philipp Müller <tim@centricular.com> + + * sys/dvb/dvbbasebin.c: + dvbbasebin: fix possible crash by passing 64 bits for 64-bit queue property + https://bugzilla.gnome.org/show_bug.cgi?id=740191 + +2014-11-10 10:01:24 +0100 Gwenole Beauchesne <gb.devel@gmail.com> + + * gst-libs/gst/codecparsers/gsth264parser.c: + codecparsers: h264: fix derivation of MaxPicNum variable. + The logic to compute the MaxPicNum variable was reversed. In paricular, + MaxPicNum is double MaxFrameNum only if field_pic_flag is set to 1. + https://bugzilla.gnome.org/show_bug.cgi?id=739291 + +2014-11-11 12:00:30 +0100 Sebastian Dröge <sebastian@centricular.com> + + * sys/decklink/gstdecklinksink.cpp: + decklinksink: Check the correct variable for failure + If we can't get an output, we would otherwise just use it later and crash. + +2014-11-07 10:01:59 +1100 Matthew Waters <matthew@centricular.com> + + * ext/gl/gstglimagesink.c: + glimagesink: clamp the resize width/height to >= 1 to avoid a GL error + === release 1.4.4 === -2014-11-06 Sebastian Dröge <slomo@coaxion.net> +2014-11-06 13:14:09 +0100 Sebastian Dröge <sebastian@centricular.com> + * ChangeLog: + * NEWS: + * RELEASE: * configure.ac: - releasing 1.4.4 + * docs/plugins/gst-plugins-bad-plugins.hierarchy: + * docs/plugins/inspect/plugin-accurip.xml: + * docs/plugins/inspect/plugin-adpcmdec.xml: + * docs/plugins/inspect/plugin-adpcmenc.xml: + * docs/plugins/inspect/plugin-asfmux.xml: + * docs/plugins/inspect/plugin-assrender.xml: + * docs/plugins/inspect/plugin-audiovisualizers.xml: + * docs/plugins/inspect/plugin-autoconvert.xml: + * docs/plugins/inspect/plugin-bayer.xml: + * docs/plugins/inspect/plugin-bz2.xml: + * docs/plugins/inspect/plugin-camerabin.xml: + * docs/plugins/inspect/plugin-chromaprint.xml: + * docs/plugins/inspect/plugin-coloreffects.xml: + * docs/plugins/inspect/plugin-curl.xml: + * docs/plugins/inspect/plugin-dataurisrc.xml: + * docs/plugins/inspect/plugin-debugutilsbad.xml: + * docs/plugins/inspect/plugin-dtsdec.xml: + * docs/plugins/inspect/plugin-dvb.xml: + * docs/plugins/inspect/plugin-dvbsuboverlay.xml: + * docs/plugins/inspect/plugin-dvdspu.xml: + * docs/plugins/inspect/plugin-faad.xml: + * docs/plugins/inspect/plugin-festival.xml: + * docs/plugins/inspect/plugin-fieldanalysis.xml: + * docs/plugins/inspect/plugin-flite.xml: + * docs/plugins/inspect/plugin-fragmented.xml: + * docs/plugins/inspect/plugin-frei0r.xml: + * docs/plugins/inspect/plugin-gaudieffects.xml: + * docs/plugins/inspect/plugin-gdp.xml: + * docs/plugins/inspect/plugin-geometrictransform.xml: + * docs/plugins/inspect/plugin-gmedec.xml: + * docs/plugins/inspect/plugin-gsm.xml: + * docs/plugins/inspect/plugin-gstsiren.xml: + * docs/plugins/inspect/plugin-id3tag.xml: + * docs/plugins/inspect/plugin-inter.xml: + * docs/plugins/inspect/plugin-interlace.xml: + * docs/plugins/inspect/plugin-jpegformat.xml: + * docs/plugins/inspect/plugin-liveadder.xml: + * docs/plugins/inspect/plugin-mimic.xml: + * docs/plugins/inspect/plugin-mms.xml: + * docs/plugins/inspect/plugin-modplug.xml: + * docs/plugins/inspect/plugin-mpeg2enc.xml: + * docs/plugins/inspect/plugin-mpegpsdemux.xml: + * docs/plugins/inspect/plugin-mpegtsdemux.xml: + * docs/plugins/inspect/plugin-mpegtsmux.xml: + * docs/plugins/inspect/plugin-mpg123.xml: + * docs/plugins/inspect/plugin-mplex.xml: + * docs/plugins/inspect/plugin-ofa.xml: + * docs/plugins/inspect/plugin-openal.xml: + * docs/plugins/inspect/plugin-opencv.xml: + * docs/plugins/inspect/plugin-opus.xml: + * docs/plugins/inspect/plugin-pcapparse.xml: + * docs/plugins/inspect/plugin-pnm.xml: + * docs/plugins/inspect/plugin-rawparse.xml: + * docs/plugins/inspect/plugin-removesilence.xml: + * docs/plugins/inspect/plugin-resindvd.xml: + * docs/plugins/inspect/plugin-rfbsrc.xml: + * docs/plugins/inspect/plugin-rtmp.xml: + * docs/plugins/inspect/plugin-schro.xml: + * docs/plugins/inspect/plugin-sdp.xml: + * docs/plugins/inspect/plugin-segmentclip.xml: + * docs/plugins/inspect/plugin-shm.xml: + * docs/plugins/inspect/plugin-smooth.xml: + * docs/plugins/inspect/plugin-soundtouch.xml: + * docs/plugins/inspect/plugin-spandsp.xml: + * docs/plugins/inspect/plugin-speed.xml: + * docs/plugins/inspect/plugin-subenc.xml: + * docs/plugins/inspect/plugin-videoparsersbad.xml: + * docs/plugins/inspect/plugin-voaacenc.xml: + * docs/plugins/inspect/plugin-voamrwbenc.xml: + * docs/plugins/inspect/plugin-waylandsink.xml: + * docs/plugins/inspect/plugin-y4mdec.xml: + * docs/plugins/inspect/plugin-zbar.xml: + * gst-plugins-bad.doap: + * win32/common/config.h: + Release 1.4.4 + +2014-11-06 12:55:42 +0100 Sebastian Dröge <sebastian@centricular.com> + + * po/af.po: + * po/az.po: + * po/bg.po: + * po/ca.po: + * po/cs.po: + * po/da.po: + * po/de.po: + * po/el.po: + * po/en_GB.po: + * po/eo.po: + * po/es.po: + * po/eu.po: + * po/fi.po: + * po/fr.po: + * po/gl.po: + * po/hr.po: + * po/hu.po: + * po/id.po: + * po/it.po: + * po/ja.po: + * po/ky.po: + * po/lt.po: + * po/lv.po: + * po/mt.po: + * po/nb.po: + * po/nl.po: + * po/or.po: + * po/pl.po: + * po/pt_BR.po: + * po/ro.po: + * po/ru.po: + * po/sk.po: + * po/sl.po: + * po/sq.po: + * po/sr.po: + * po/sv.po: + * po/tr.po: + * po/uk.po: + * po/vi.po: + * po/zh_CN.po: + Update .po files 2014-11-06 11:53:04 +0100 Sebastian Dröge <sebastian@centricular.com> @@ -1,2 +1,2 @@ -This is GStreamer Bad Plugins 1.4.4 +This is GStreamer Bad Plugins 1.4.5 @@ -1,5 +1,5 @@ -Release notes for GStreamer Bad Plugins 1.4.4 +Release notes for GStreamer Bad Plugins 1.4.5 The GStreamer team is pleased to announce a bugfix release of the stable 1.4 release series. The 1.4 release series is adding new features on top @@ -73,29 +73,14 @@ contains a set of codecs plugins based on libav (formerly gst-ffmpeg) Bugs fixed in this release - * 732239 : h264parse: expose parsed profiles to downstream - * 733510 : gltransformation produced black screen - * 734156 : androidmedia: doesn't calculate framesize for COLOR_FormatYUV420Planar correctly - * 736319 : dashdemux: mark first buffer as discont after restarting a download task - * 737186 : h264parse: Return flushing if we get chained while being set to READY - * 737569 : tsdemux: valid data is discarded if PES start packet is the first packet after discontinuity - * 737658 : fluiddec: segmentation fault when used with fakesrc - * 737724 : vc1parse: unref caps when it is empty in renegotiate() - * 738067 : gl: Downloading YUY2 is broken and creates blocky artefacts - * 738223 : fluiddec: leaks memory in gst_fluid_dec_change_state() - * 738230 : vc1parser: fix level value for simple/main profile - * 738243 : vc1parse: fix framesize when input is frame-layer - * 738291 : fluiddec: leaks incoming caps event - * 738449 : vc1parse: just assume none header-format when no codec_data is present - * 738519 : vc1parse: parse frame header when stream format is ASF/raw for simple/main profile - * 738532 : vc1parse: select caps according to wmv format at negotiation - * 738674 : rtmpsink: leaking URI string - * 738695 : mpegtsbase: do not remove programs on EOS - * 738696 : hlsdemux: send missing stream start - * 739277 : GstGLFilter propose allocation pass uninitialized size to gst_query_add_allocation_pool - * 739348 : configure.ac: auto decision to include GL library fails - * 739368 : gl: small memory leak in gl shader - * 739374 : h264parse: sets srccaps too often + * 722764 : rawparse: fix SEEKING query handling + * 729768 : mpegtsbase: Raise limit to read more bytes initially to find PCR + * 739152 : gl/cocoa: build with GNUStep fails + * 740191 : dvbbasesink: segfaults on 32-bit (rpi) + * 740201 : gl/cocoa: Does not compile on OSX < 10.7 anymore + * 740451 : srtpdec: leaks rtp/rtcp sink events + * 740953 : configure.ac: unportable test(1) comparison operator + * 741321 : opusparse: fix header parsing esp. of encoded output of libopus ==== Download ==== @@ -132,23 +117,17 @@ subscribe to the gstreamer-devel list. Contributors to this release - * Antonio Ospite - * Aurélien Zanelli - * Edward Hervey - * Havard Graff - * Jesper Larsen - * Julien Isorce - * Lubosz Sarnecki - * Luis de Bethencourt - * Matej Knopp + * Aleix Conchillo Flaqué + * Alessandro Decina + * Gwenole Beauchesne + * Mathieu Duponchelle * Matthew Waters - * Matthieu Bouron * Sebastian Dröge - * Sreerenj Balachandran - * Thiago Santos + * Sudip Jain * Thibault Saunier + * Thomas Klausner * Tim-Philipp Müller - * Vincent Abriou - * Vivia Nikolaidou - * Vootele Vesterblom + * Vincent Penquerc'h + * Wim Taymans + * Wonchul Lee
\ No newline at end of file diff --git a/configure.ac b/configure.ac index 8b1c02cbad..4e2823ecdc 100644 --- a/configure.ac +++ b/configure.ac @@ -3,7 +3,7 @@ AC_PREREQ([2.68]) dnl initialize autoconf dnl when going to/from release please set the nano (fourth number) right ! dnl releases only do Wall, cvs and prerelease does Werror too -AC_INIT([GStreamer Bad Plug-ins],[1.4.4],[http://bugzilla.gnome.org/enter_bug.cgi?product=GStreamer],[gst-plugins-bad]) +AC_INIT([GStreamer Bad Plug-ins],[1.4.5],[http://bugzilla.gnome.org/enter_bug.cgi?product=GStreamer],[gst-plugins-bad]) AG_GST_INIT @@ -48,7 +48,7 @@ dnl - interfaces added/removed/changed -> increment CURRENT, REVISION = 0 dnl - interfaces added -> increment AGE dnl - interfaces removed -> AGE = 0 dnl sets GST_LT_LDFLAGS -AS_LIBTOOL(GST, 404, 0, 404) +AS_LIBTOOL(GST, 405, 0, 405) dnl *** required versions of GStreamer stuff *** GST_REQ=1.4.0 diff --git a/docs/plugins/inspect/plugin-accurip.xml b/docs/plugins/inspect/plugin-accurip.xml index 79edfbbae8..2b981e72cb 100644 --- a/docs/plugins/inspect/plugin-accurip.xml +++ b/docs/plugins/inspect/plugin-accurip.xml @@ -3,7 +3,7 @@ <description>Computes an AccurateRip CRC</description> <filename>../../gst/accurip/.libs/libgstaccurip.so</filename> <basename>libgstaccurip.so</basename> - <version>1.4.4</version> + <version>1.4.5</version> <license>LGPL</license> <source>gst-plugins-bad</source> <package>GStreamer Bad Plug-ins source release</package> diff --git a/docs/plugins/inspect/plugin-adpcmdec.xml b/docs/plugins/inspect/plugin-adpcmdec.xml index ae261b62a9..be0cc23215 100644 --- a/docs/plugins/inspect/plugin-adpcmdec.xml +++ b/docs/plugins/inspect/plugin-adpcmdec.xml @@ -3,7 +3,7 @@ <description>ADPCM decoder</description> <filename>../../gst/adpcmdec/.libs/libgstadpcmdec.so</filename> <basename>libgstadpcmdec.so</basename> - <version>1.4.4</version> + <version>1.4.5</version> <license>LGPL</license> <source>gst-plugins-bad</source> <package>GStreamer Bad Plug-ins source release</package> diff --git a/docs/plugins/inspect/plugin-adpcmenc.xml b/docs/plugins/inspect/plugin-adpcmenc.xml index bcb236fda4..0a08b307a2 100644 --- a/docs/plugins/inspect/plugin-adpcmenc.xml +++ b/docs/plugins/inspect/plugin-adpcmenc.xml @@ -3,7 +3,7 @@ <description>ADPCM encoder</description> <filename>../../gst/adpcmenc/.libs/libgstadpcmenc.so</filename> <basename>libgstadpcmenc.so</basename> - <version>1.4.4</version> + <version>1.4.5</version> <license>LGPL</license> <source>gst-plugins-bad</source> <package>GStreamer Bad Plug-ins source release</package> diff --git a/docs/plugins/inspect/plugin-asfmux.xml b/docs/plugins/inspect/plugin-asfmux.xml index 382ed63824..d6074086fb 100644 --- a/docs/plugins/inspect/plugin-asfmux.xml +++ b/docs/plugins/inspect/plugin-asfmux.xml @@ -3,7 +3,7 @@ <description>ASF Muxer Plugin</description> <filename>../../gst/asfmux/.libs/libgstasfmux.so</filename> <basename>libgstasfmux.so</basename> - <version>1.4.4</version> + <version>1.4.5</version> <license>LGPL</license> <source>gst-plugins-bad</source> <package>GStreamer Bad Plug-ins source release</package> diff --git a/docs/plugins/inspect/plugin-assrender.xml b/docs/plugins/inspect/plugin-assrender.xml index c08edd7ecd..3b3b6bad5d 100644 --- a/docs/plugins/inspect/plugin-assrender.xml +++ b/docs/plugins/inspect/plugin-assrender.xml @@ -3,7 +3,7 @@ <description>ASS/SSA subtitle renderer</description> <filename>../../ext/assrender/.libs/libgstassrender.so</filename> <basename>libgstassrender.so</basename> - <version>1.4.4</version> + <version>1.4.5</version> <license>LGPL</license> <source>gst-plugins-bad</source> <package>GStreamer Bad Plug-ins source release</package> diff --git a/docs/plugins/inspect/plugin-audiovisualizers.xml b/docs/plugins/inspect/plugin-audiovisualizers.xml index 7cf47efb87..04c619a140 100644 --- a/docs/plugins/inspect/plugin-audiovisualizers.xml +++ b/docs/plugins/inspect/plugin-audiovisualizers.xml @@ -3,7 +3,7 @@ <description>Creates video visualizations of audio input</description> <filename>../../gst/audiovisualizers/.libs/libgstaudiovisualizers.so</filename> <basename>libgstaudiovisualizers.so</basename> - <version>1.4.4</version> + <version>1.4.5</version> <license>GPL</license> <source>gst-plugins-bad</source> <package>GStreamer Bad Plug-ins source release</package> diff --git a/docs/plugins/inspect/plugin-autoconvert.xml b/docs/plugins/inspect/plugin-autoconvert.xml index 91a61a03a3..b74056c418 100644 --- a/docs/plugins/inspect/plugin-autoconvert.xml +++ b/docs/plugins/inspect/plugin-autoconvert.xml @@ -3,7 +3,7 @@ <description>Selects convertor element based on caps</description> <filename>../../gst/autoconvert/.libs/libgstautoconvert.so</filename> <basename>libgstautoconvert.so</basename> - <version>1.4.4</version> + <version>1.4.5</version> <license>LGPL</license> <source>gst-plugins-bad</source> <package>GStreamer Bad Plug-ins source release</package> diff --git a/docs/plugins/inspect/plugin-bayer.xml b/docs/plugins/inspect/plugin-bayer.xml index fb2539d5b0..56fafed789 100644 --- a/docs/plugins/inspect/plugin-bayer.xml +++ b/docs/plugins/inspect/plugin-bayer.xml @@ -3,7 +3,7 @@ <description>Elements to convert Bayer images</description> <filename>../../gst/bayer/.libs/libgstbayer.so</filename> <basename>libgstbayer.so</basename> - <version>1.4.4</version> + <version>1.4.5</version> <license>LGPL</license> <source>gst-plugins-bad</source> <package>GStreamer Bad Plug-ins source release</package> diff --git a/docs/plugins/inspect/plugin-bz2.xml b/docs/plugins/inspect/plugin-bz2.xml index ed123fdb94..32abfdfc4a 100644 --- a/docs/plugins/inspect/plugin-bz2.xml +++ b/docs/plugins/inspect/plugin-bz2.xml @@ -3,7 +3,7 @@ <description>Compress or decompress streams</description> <filename>../../ext/bz2/.libs/libgstbz2.so</filename> <basename>libgstbz2.so</basename> - <version>1.4.4</version> + <version>1.4.5</version> <license>LGPL</license> <source>gst-plugins-bad</source> <package>GStreamer Bad Plug-ins source release</package> diff --git a/docs/plugins/inspect/plugin-camerabin.xml b/docs/plugins/inspect/plugin-camerabin.xml index 86c1452e96..58fc10a07f 100644 --- a/docs/plugins/inspect/plugin-camerabin.xml +++ b/docs/plugins/inspect/plugin-camerabin.xml @@ -3,7 +3,7 @@ <description>Take image snapshots and record movies from camera</description> <filename>../../gst/camerabin2/.libs/libgstcamerabin2.so</filename> <basename>libgstcamerabin2.so</basename> - <version>1.4.4</version> + <version>1.4.5</version> <license>LGPL</license> <source>gst-plugins-bad</source> <package>GStreamer Bad Plug-ins source release</package> diff --git a/docs/plugins/inspect/plugin-chromaprint.xml b/docs/plugins/inspect/plugin-chromaprint.xml index 4dd2268ec1..c454e68ea4 100644 --- a/docs/plugins/inspect/plugin-chromaprint.xml +++ b/docs/plugins/inspect/plugin-chromaprint.xml @@ -3,7 +3,7 @@ <description>Calculate Chromaprint fingerprint from audio files</description> <filename>../../ext/chromaprint/.libs/libgstchromaprint.so</filename> <basename>libgstchromaprint.so</basename> - <version>1.4.4</version> + <version>1.4.5</version> <license>LGPL</license> <source>gst-plugins-bad</source> <package>GStreamer Bad Plug-ins source release</package> diff --git a/docs/plugins/inspect/plugin-coloreffects.xml b/docs/plugins/inspect/plugin-coloreffects.xml index 6ca39af439..49ce112cfd 100644 --- a/docs/plugins/inspect/plugin-coloreffects.xml +++ b/docs/plugins/inspect/plugin-coloreffects.xml @@ -3,7 +3,7 @@ <description>Color Look-up Table filters</description> <filename>../../gst/coloreffects/.libs/libgstcoloreffects.so</filename> <basename>libgstcoloreffects.so</basename> - <version>1.4.4</version> + <version>1.4.5</version> <license>LGPL</license> <source>gst-plugins-bad</source> <package>GStreamer Bad Plug-ins source release</package> diff --git a/docs/plugins/inspect/plugin-curl.xml b/docs/plugins/inspect/plugin-curl.xml index ca5bde4ef1..c54d313cab 100644 --- a/docs/plugins/inspect/plugin-curl.xml +++ b/docs/plugins/inspect/plugin-curl.xml @@ -3,7 +3,7 @@ <description>libcurl-based elements</description> <filename>../../ext/curl/.libs/libgstcurl.so</filename> <basename>libgstcurl.so</basename> - <version>1.4.4</version> + <version>1.4.5</version> <license>LGPL</license> <source>gst-plugins-bad</source> <package>GStreamer Bad Plug-ins source release</package> diff --git a/docs/plugins/inspect/plugin-dataurisrc.xml b/docs/plugins/inspect/plugin-dataurisrc.xml index 4087190be3..11c1058bf9 100644 --- a/docs/plugins/inspect/plugin-dataurisrc.xml +++ b/docs/plugins/inspect/plugin-dataurisrc.xml @@ -3,7 +3,7 @@ <description>data: URI source</description> <filename>../../gst/dataurisrc/.libs/libgstdataurisrc.so</filename> <basename>libgstdataurisrc.so</basename> - <version>1.4.4</version> + <version>1.4.5</version> <license>LGPL</license> <source>gst-plugins-bad</source> <package>GStreamer Bad Plug-ins source release</package> diff --git a/docs/plugins/inspect/plugin-debugutilsbad.xml b/docs/plugins/inspect/plugin-debugutilsbad.xml index ead33c2987..b47938b3f5 100644 --- a/docs/plugins/inspect/plugin-debugutilsbad.xml +++ b/docs/plugins/inspect/plugin-debugutilsbad.xml @@ -3,7 +3,7 @@ <description>Collection of elements that may or may not be useful for debugging</description> <filename>../../gst/debugutils/.libs/libgstdebugutilsbad.so</filename> <basename>libgstdebugutilsbad.so</basename> - <version>1.4.4</version> + <version>1.4.5</version> <license>LGPL</license> <source>gst-plugins-bad</source> <package>GStreamer Bad Plug-ins source release</package> diff --git a/docs/plugins/inspect/plugin-dtsdec.xml b/docs/plugins/inspect/plugin-dtsdec.xml index 4896e05a73..40c6d058ce 100644 --- a/docs/plugins/inspect/plugin-dtsdec.xml +++ b/docs/plugins/inspect/plugin-dtsdec.xml @@ -3,7 +3,7 @@ <description>Decodes DTS audio streams</description> <filename>../../ext/dts/.libs/libgstdtsdec.so</filename> <basename>libgstdtsdec.so</basename> - <version>1.4.4</version> + <version>1.4.5</version> <license>GPL</license> <source>gst-plugins-bad</source> <package>GStreamer Bad Plug-ins source release</package> diff --git a/docs/plugins/inspect/plugin-dvb.xml b/docs/plugins/inspect/plugin-dvb.xml index ce2433bc61..6b13e03547 100644 --- a/docs/plugins/inspect/plugin-dvb.xml +++ b/docs/plugins/inspect/plugin-dvb.xml @@ -3,7 +3,7 @@ <description>DVB elements</description> <filename>../../sys/dvb/.libs/libgstdvb.so</filename> <basename>libgstdvb.so</basename> - <version>1.4.4</version> + <version>1.4.5</version> <license>LGPL</license> <source>gst-plugins-bad</source> <package>GStreamer Bad Plug-ins source release</package> diff --git a/docs/plugins/inspect/plugin-dvbsuboverlay.xml b/docs/plugins/inspect/plugin-dvbsuboverlay.xml index fb8c5ddfb6..3314a201d4 100644 --- a/docs/plugins/inspect/plugin-dvbsuboverlay.xml +++ b/docs/plugins/inspect/plugin-dvbsuboverlay.xml @@ -3,7 +3,7 @@ <description>DVB subtitle renderer</description> <filename>../../gst/dvbsuboverlay/.libs/libgstdvbsuboverlay.so</filename> <basename>libgstdvbsuboverlay.so</basename> - <version>1.4.4</version> + <version>1.4.5</version> <license>LGPL</license> <source>gst-plugins-bad</source> <package>GStreamer Bad Plug-ins source release</package> diff --git a/docs/plugins/inspect/plugin-dvdspu.xml b/docs/plugins/inspect/plugin-dvdspu.xml index e2a32de246..ac7aaec6eb 100644 --- a/docs/plugins/inspect/plugin-dvdspu.xml +++ b/docs/plugins/inspect/plugin-dvdspu.xml @@ -3,7 +3,7 @@ <description>DVD Sub-picture Overlay element</description> <filename>../../gst/dvdspu/.libs/libgstdvdspu.so</filename> <basename>libgstdvdspu.so</basename> - <version>1.4.4</version> + <version>1.4.5</version> <license>LGPL</license> <source>gst-plugins-bad</source> <package>GStreamer Bad Plug-ins source release</package> diff --git a/docs/plugins/inspect/plugin-faad.xml b/docs/plugins/inspect/plugin-faad.xml index 5886ea41a4..eb243c670f 100644 --- a/docs/plugins/inspect/plugin-faad.xml +++ b/docs/plugins/inspect/plugin-faad.xml @@ -3,7 +3,7 @@ <description>Free AAC Decoder (FAAD)</description> <filename>../../ext/faad/.libs/libgstfaad.so</filename> <basename>libgstfaad.so</basename> - <version>1.4.4</version> + <version>1.4.5</version> <license>GPL</license> <source>gst-plugins-bad</source> <package>GStreamer Bad Plug-ins source release</package> diff --git a/docs/plugins/inspect/plugin-festival.xml b/docs/plugins/inspect/plugin-festival.xml index 511bec5bf9..a2c7cd73f4 100644 --- a/docs/plugins/inspect/plugin-festival.xml +++ b/docs/plugins/inspect/plugin-festival.xml @@ -3,7 +3,7 @@ <description>Synthesizes plain text into audio</description> <filename>../../gst/festival/.libs/libgstfestival.so</filename> <basename>libgstfestival.so</basename> - <version>1.4.4</version> + <version>1.4.5</version> <license>LGPL</license> <source>gst-plugins-bad</source> <package>GStreamer Bad Plug-ins source release</package> diff --git a/docs/plugins/inspect/plugin-fieldanalysis.xml b/docs/plugins/inspect/plugin-fieldanalysis.xml index 5b3574c2d0..a39ee17090 100644 --- a/docs/plugins/inspect/plugin-fieldanalysis.xml +++ b/docs/plugins/inspect/plugin-fieldanalysis.xml @@ -3,7 +3,7 @@ <description>Video field analysis</description> <filename>../../gst/fieldanalysis/.libs/libgstfieldanalysis.so</filename> <basename>libgstfieldanalysis.so</basename> - <version>1.4.4</version> + <version>1.4.5</version> <license>LGPL</license> <source>gst-plugins-bad</source> <package>GStreamer</package> diff --git a/docs/plugins/inspect/plugin-flite.xml b/docs/plugins/inspect/plugin-flite.xml index 4acb079a6d..0e302aa6b1 100644 --- a/docs/plugins/inspect/plugin-flite.xml +++ b/docs/plugins/inspect/plugin-flite.xml @@ -3,7 +3,7 @@ <description>Flite speech synthesizer plugin</description> <filename>../../ext/flite/.libs/libgstflite.so</filename> <basename>libgstflite.so</basename> - <version>1.4.4</version> + <version>1.4.5</version> <license>LGPL</license> <source>gst-plugins-bad</source> <package>GStreamer Bad Plug-ins source release</package> diff --git a/docs/plugins/inspect/plugin-fragmented.xml b/docs/plugins/inspect/plugin-fragmented.xml index a312ae1b14..067c080a6f 100644 --- a/docs/plugins/inspect/plugin-fragmented.xml +++ b/docs/plugins/inspect/plugin-fragmented.xml @@ -3,7 +3,7 @@ <description>Fragmented streaming plugins</description> <filename>../../ext/hls/.libs/libgstfragmented.so</filename> <basename>libgstfragmented.so</basename> - <version>1.4.4</version> + <version>1.4.5</version> <license>LGPL</license> <source>gst-plugins-bad</source> <package>GStreamer Bad Plug-ins</package> diff --git a/docs/plugins/inspect/plugin-frei0r.xml b/docs/plugins/inspect/plugin-frei0r.xml index b512d90a93..4d0f72b9ce 100644 --- a/docs/plugins/inspect/plugin-frei0r.xml +++ b/docs/plugins/inspect/plugin-frei0r.xml @@ -3,7 +3,7 @@ <description>frei0r plugin library</description> <filename>../../gst/frei0r/.libs/libgstfrei0r.so</filename> <basename>libgstfrei0r.so</basename> - <version>1.4.4</version> + <version>1.4.5</version> <license>LGPL</license> <source>gst-plugins-bad</source> <package>GStreamer Bad Plug-ins source release</package> diff --git a/docs/plugins/inspect/plugin-gaudieffects.xml b/docs/plugins/inspect/plugin-gaudieffects.xml index f908189393..6d697ed25b 100644 --- a/docs/plugins/inspect/plugin-gaudieffects.xml +++ b/docs/plugins/inspect/plugin-gaudieffects.xml @@ -3,7 +3,7 @@ <description>Gaudi video effects.</description> <filename>../../gst/gaudieffects/.libs/libgstgaudieffects.so</filename> <basename>libgstgaudieffects.so</basename> - <version>1.4.4</version> + <version>1.4.5</version> <license>LGPL</license> <source>gst-plugins-bad</source> <package>GStreamer</package> diff --git a/docs/plugins/inspect/plugin-gdp.xml b/docs/plugins/inspect/plugin-gdp.xml index e044522dad..6e45f750b7 100644 --- a/docs/plugins/inspect/plugin-gdp.xml +++ b/docs/plugins/inspect/plugin-gdp.xml @@ -3,7 +3,7 @@ <description>Payload/depayload GDP packets</description> <filename>../../gst/gdp/.libs/libgstgdp.so</filename> <basename>libgstgdp.so</basename> - <version>1.4.4</version> + <version>1.4.5</version> <license>LGPL</license> <source>gst-plugins-bad</source> <package>GStreamer Bad Plug-ins source release</package> diff --git a/docs/plugins/inspect/plugin-geometrictransform.xml b/docs/plugins/inspect/plugin-geometrictransform.xml index 843c8f468a..c46ec3bb87 100644 --- a/docs/plugins/inspect/plugin-geometrictransform.xml +++ b/docs/plugins/inspect/plugin-geometrictransform.xml @@ -3,7 +3,7 @@ <description>Various geometric image transform elements</description> <filename>../../gst/geometrictransform/.libs/libgstgeometrictransform.so</filename> <basename>libgstgeometrictransform.so</basename> - <version>1.4.4</version> + <version>1.4.5</version> <license>LGPL</license> <source>gst-plugins-bad</source> <package>GStreamer Bad Plug-ins source release</package> diff --git a/docs/plugins/inspect/plugin-gmedec.xml b/docs/plugins/inspect/plugin-gmedec.xml index de694732f6..2e4283ed1a 100644 --- a/docs/plugins/inspect/plugin-gmedec.xml +++ b/docs/plugins/inspect/plugin-gmedec.xml @@ -3,7 +3,7 @@ <description>GME Audio Decoder</description> <filename>../../ext/gme/.libs/libgstgme.so</filename> <basename>libgstgme.so</basename> - <version>1.4.4</version> + <version>1.4.5</version> <license>LGPL</license> <source>gst-plugins-bad</source> <package>GStreamer Bad Plug-ins source release</package> diff --git a/docs/plugins/inspect/plugin-gsm.xml b/docs/plugins/inspect/plugin-gsm.xml index e84b041bbf..2b285578c5 100644 --- a/docs/plugins/inspect/plugin-gsm.xml +++ b/docs/plugins/inspect/plugin-gsm.xml @@ -3,7 +3,7 @@ <description>GSM encoder/decoder</description> <filename>../../ext/gsm/.libs/libgstgsm.so</filename> <basename>libgstgsm.so</basename> - <version>1.4.4</version> + <version>1.4.5</version> <license>LGPL</license> <source>gst-plugins-bad</source> <package>GStreamer Bad Plug-ins source release</package> diff --git a/docs/plugins/inspect/plugin-gstsiren.xml b/docs/plugins/inspect/plugin-gstsiren.xml index 46d31275ba..ae40d2fc11 100644 --- a/docs/plugins/inspect/plugin-gstsiren.xml +++ b/docs/plugins/inspect/plugin-gstsiren.xml @@ -3,7 +3,7 @@ <description>Siren encoder/decoder/payloader/depayloader plugins</description> <filename>../../gst/siren/.libs/libgstsiren.so</filename> <basename>libgstsiren.so</basename> - <version>1.4.4</version> + <version>1.4.5</version> <license>LGPL</license> <source>gst-plugins-bad</source> <package>GStreamer Bad Plug-ins source release</package> diff --git a/docs/plugins/inspect/plugin-id3tag.xml b/docs/plugins/inspect/plugin-id3tag.xml index 58df0e7961..598fe25d0d 100644 --- a/docs/plugins/inspect/plugin-id3tag.xml +++ b/docs/plugins/inspect/plugin-id3tag.xml @@ -3,7 +3,7 @@ <description>ID3 v1 and v2 muxing plugin</description> <filename>../../gst/id3tag/.libs/libgstid3tag.so</filename> <basename>libgstid3tag.so</basename> - <version>1.4.4</version> + <version>1.4.5</version> <license>LGPL</license> <source>gst-plugins-bad</source> <package>GStreamer Bad Plug-ins source release</package> diff --git a/docs/plugins/inspect/plugin-inter.xml b/docs/plugins/inspect/plugin-inter.xml index 2ac96a61ad..239234d832 100644 --- a/docs/plugins/inspect/plugin-inter.xml +++ b/docs/plugins/inspect/plugin-inter.xml @@ -3,7 +3,7 @@ <description>plugin for inter-pipeline communication</description> <filename>../../gst/inter/.libs/libgstinter.so</filename> <basename>libgstinter.so</basename> - <version>1.4.4</version> + <version>1.4.5</version> <license>LGPL</license> <source>gst-plugins-bad</source> <package>GStreamer Bad Plug-ins</package> diff --git a/docs/plugins/inspect/plugin-interlace.xml b/docs/plugins/inspect/plugin-interlace.xml index 215e559977..1da7d4e0bd 100644 --- a/docs/plugins/inspect/plugin-interlace.xml +++ b/docs/plugins/inspect/plugin-interlace.xml @@ -3,7 +3,7 @@ <description>Create an interlaced video stream</description> <filename>../../gst/interlace/.libs/libgstinterlace.so</filename> <basename>libgstinterlace.so</basename> - <version>1.4.4</version> + <version>1.4.5</version> <license>LGPL</license> <source>gst-plugins-bad</source> <package>GStreamer Bad Plug-ins source release</package> diff --git a/docs/plugins/inspect/plugin-jpegformat.xml b/docs/plugins/inspect/plugin-jpegformat.xml index 5b61a47c9b..b39863d450 100644 --- a/docs/plugins/inspect/plugin-jpegformat.xml +++ b/docs/plugins/inspect/plugin-jpegformat.xml @@ -3,7 +3,7 @@ <description>JPEG interchange format plugin</description> <filename>../../gst/jpegformat/.libs/libgstjpegformat.so</filename> <basename>libgstjpegformat.so</basename> - <version>1.4.4</version> + <version>1.4.5</version> <license>LGPL</license> <source>gst-plugins-bad</source> <package>GStreamer Bad Plug-ins source release</package> diff --git a/docs/plugins/inspect/plugin-liveadder.xml b/docs/plugins/inspect/plugin-liveadder.xml index 64a5da99b3..91a3f74923 100644 --- a/docs/plugins/inspect/plugin-liveadder.xml +++ b/docs/plugins/inspect/plugin-liveadder.xml @@ -3,7 +3,7 @@ <description>Adds multiple live discontinuous streams</description> <filename>../../gst/liveadder/.libs/libgstliveadder.so</filename> <basename>libgstliveadder.so</basename> - <version>1.4.4</version> + <version>1.4.5</version> <license>LGPL</license> <source>gst-plugins-bad</source> <package>GStreamer Bad Plug-ins source release</package> diff --git a/docs/plugins/inspect/plugin-mimic.xml b/docs/plugins/inspect/plugin-mimic.xml index 6cb03bbf3e..49faa78942 100644 --- a/docs/plugins/inspect/plugin-mimic.xml +++ b/docs/plugins/inspect/plugin-mimic.xml @@ -3,7 +3,7 @@ <description>Mimic codec</description> <filename>../../ext/mimic/.libs/libgstmimic.so</filename> <basename>libgstmimic.so</basename> - <version>1.4.4</version> + <version>1.4.5</version> <license>LGPL</license> <source>gst-plugins-bad</source> <package>GStreamer Bad Plug-ins source release</package> diff --git a/docs/plugins/inspect/plugin-mms.xml b/docs/plugins/inspect/plugin-mms.xml index dafdd10d8c..5041fcb91c 100644 --- a/docs/plugins/inspect/plugin-mms.xml +++ b/docs/plugins/inspect/plugin-mms.xml @@ -3,7 +3,7 @@ <description>Microsoft Multi Media Server streaming protocol support</description> <filename>../../ext/libmms/.libs/libgstmms.so</filename> <basename>libgstmms.so</basename> - <version>1.4.4</version> + <version>1.4.5</version> <license>LGPL</license> <source>gst-plugins-bad</source> <package>GStreamer Bad Plug-ins source release</package> diff --git a/docs/plugins/inspect/plugin-modplug.xml b/docs/plugins/inspect/plugin-modplug.xml index 0b84bfadd4..66553ea77d 100644 --- a/docs/plugins/inspect/plugin-modplug.xml +++ b/docs/plugins/inspect/plugin-modplug.xml @@ -3,7 +3,7 @@ <description>.MOD audio decoding</description> <filename>../../ext/modplug/.libs/libgstmodplug.so</filename> <basename>libgstmodplug.so</basename> - <version>1.4.4</version> + <version>1.4.5</version> <license>LGPL</license> <source>gst-plugins-bad</source> <package>GStreamer Bad Plug-ins source release</package> diff --git a/docs/plugins/inspect/plugin-mpeg2enc.xml b/docs/plugins/inspect/plugin-mpeg2enc.xml index 51fd071bca..b7f385c482 100644 --- a/docs/plugins/inspect/plugin-mpeg2enc.xml +++ b/docs/plugins/inspect/plugin-mpeg2enc.xml @@ -3,7 +3,7 @@ <description>High-quality MPEG-1/2 video encoder</description> <filename>../../ext/mpeg2enc/.libs/libgstmpeg2enc.so</filename> <basename>libgstmpeg2enc.so</basename> - <version>1.4.4</version> + <version>1.4.5</version> <license>GPL</license> <source>gst-plugins-bad</source> <package>GStreamer Bad Plug-ins source release</package> diff --git a/docs/plugins/inspect/plugin-mpegpsdemux.xml b/docs/plugins/inspect/plugin-mpegpsdemux.xml index e88c13a4a7..e3b4c0f1f9 100644 --- a/docs/plugins/inspect/plugin-mpegpsdemux.xml +++ b/docs/plugins/inspect/plugin-mpegpsdemux.xml @@ -3,7 +3,7 @@ <description>MPEG-PS demuxer</description> <filename>../../gst/mpegdemux/.libs/libgstmpegpsdemux.so</filename> <basename>libgstmpegpsdemux.so</basename> - <version>1.4.4</version> + <version>1.4.5</version> <license>unknown</license> <source>gst-plugins-bad</source> <package>GStreamer Bad Plug-ins source release</package> diff --git a/docs/plugins/inspect/plugin-mpegtsdemux.xml b/docs/plugins/inspect/plugin-mpegtsdemux.xml index 82d3f893c3..745cb81989 100644 --- a/docs/plugins/inspect/plugin-mpegtsdemux.xml +++ b/docs/plugins/inspect/plugin-mpegtsdemux.xml @@ -3,7 +3,7 @@ <description>MPEG TS demuxer</description> <filename>../../gst/mpegtsdemux/.libs/libgstmpegtsdemux.so</filename> <basename>libgstmpegtsdemux.so</basename> - <version>1.4.4</version> + <version>1.4.5</version> <license>LGPL</license> <source>gst-plugins-bad</source> <package>GStreamer Bad Plug-ins source release</package> diff --git a/docs/plugins/inspect/plugin-mpegtsmux.xml b/docs/plugins/inspect/plugin-mpegtsmux.xml index 990444458a..a9999a3f35 100644 --- a/docs/plugins/inspect/plugin-mpegtsmux.xml +++ b/docs/plugins/inspect/plugin-mpegtsmux.xml @@ -3,7 +3,7 @@ <description>MPEG-TS muxer</description> <filename>../../gst/mpegtsmux/.libs/libgstmpegtsmux.so</filename> <basename>libgstmpegtsmux.so</basename> - <version>1.4.4</version> + <version>1.4.5</version> <license>LGPL</license> <source>gst-plugins-bad</source> <package>GStreamer Bad Plug-ins source release</package> diff --git a/docs/plugins/inspect/plugin-mpg123.xml b/docs/plugins/inspect/plugin-mpg123.xml index 04515ce1fa..117573802c 100644 --- a/docs/plugins/inspect/plugin-mpg123.xml +++ b/docs/plugins/inspect/plugin-mpg123.xml @@ -3,7 +3,7 @@ <description>mp3 decoding based on the mpg123 library</description> <filename>../../ext/mpg123/.libs/libgstmpg123.so</filename> <basename>libgstmpg123.so</basename> - <version>1.4.4</version> + <version>1.4.5</version> <license>LGPL</license> <source>gst-plugins-bad</source> <package>GStreamer Bad Plug-ins source release</package> diff --git a/docs/plugins/inspect/plugin-mplex.xml b/docs/plugins/inspect/plugin-mplex.xml index 9634309ac6..2a86a28722 100644 --- a/docs/plugins/inspect/plugin-mplex.xml +++ b/docs/plugins/inspect/plugin-mplex.xml @@ -3,7 +3,7 @@ <description>High-quality MPEG/DVD/SVCD/VCD video/audio multiplexer</description> <filename>../../ext/mplex/.libs/libgstmplex.so</filename> <basename>libgstmplex.so</basename> - <version>1.4.4</version> + <version>1.4.5</version> <license>GPL</license> <source>gst-plugins-bad</source> <package>GStreamer Bad Plug-ins source release</package> diff --git a/docs/plugins/inspect/plugin-ofa.xml b/docs/plugins/inspect/plugin-ofa.xml index ff985d662e..3de74cb111 100644 --- a/docs/plugins/inspect/plugin-ofa.xml +++ b/docs/plugins/inspect/plugin-ofa.xml @@ -3,7 +3,7 @@ <description>Calculate MusicIP fingerprint from audio files</description> <filename>../../ext/ofa/.libs/libgstofa.so</filename> <basename>libgstofa.so</basename> - <version>1.4.4</version> + <version>1.4.5</version> <license>GPL</license> <source>gst-plugins-bad</source> <package>GStreamer Bad Plug-ins source release</package> diff --git a/docs/plugins/inspect/plugin-openal.xml b/docs/plugins/inspect/plugin-openal.xml index 233a22a57e..dc657ea6f1 100644 --- a/docs/plugins/inspect/plugin-openal.xml +++ b/docs/plugins/inspect/plugin-openal.xml @@ -3,7 +3,7 @@ <description>OpenAL plugin library</description> <filename>../../ext/openal/.libs/libgstopenal.so</filename> <basename>libgstopenal.so</basename> - <version>1.4.4</version> + <version>1.4.5</version> <license>LGPL</license> <source>gst-plugins-bad</source> <package>GStreamer Bad Plug-ins source release</package> diff --git a/docs/plugins/inspect/plugin-opencv.xml b/docs/plugins/inspect/plugin-opencv.xml index 927fe9a51f..c8e5e889b4 100644 --- a/docs/plugins/inspect/plugin-opencv.xml +++ b/docs/plugins/inspect/plugin-opencv.xml @@ -3,7 +3,7 @@ <description>GStreamer OpenCV Plugins</description> <filename>../../ext/opencv/.libs/libgstopencv.so</filename> <basename>libgstopencv.so</basename> - <version>1.4.4</version> + <version>1.4.5</version> <license>LGPL</license> <source>gst-plugins-bad</source> <package>GStreamer Bad Plug-ins source release</package> diff --git a/docs/plugins/inspect/plugin-opus.xml b/docs/plugins/inspect/plugin-opus.xml index 3902399cca..de54f9d6a4 100644 --- a/docs/plugins/inspect/plugin-opus.xml +++ b/docs/plugins/inspect/plugin-opus.xml @@ -3,7 +3,7 @@ <description>OPUS plugin library</description> <filename>../../ext/opus/.libs/libgstopus.so</filename> <basename>libgstopus.so</basename> - <version>1.4.4</version> + <version>1.4.5</version> <license>LGPL</license> <source>gst-plugins-bad</source> <package>GStreamer Bad Plug-ins source release</package> diff --git a/docs/plugins/inspect/plugin-pcapparse.xml b/docs/plugins/inspect/plugin-pcapparse.xml index 3dda8d0267..d8cd1a21ae 100644 --- a/docs/plugins/inspect/plugin-pcapparse.xml +++ b/docs/plugins/inspect/plugin-pcapparse.xml @@ -3,7 +3,7 @@ <description>Element parsing raw pcap streams</description> <filename>../../gst/pcapparse/.libs/libgstpcapparse.so</filename> <basename>libgstpcapparse.so</basename> - <version>1.4.4</version> + <version>1.4.5</version> <license>LGPL</license> <source>gst-plugins-bad</source> <package>GStreamer</package> diff --git a/docs/plugins/inspect/plugin-pnm.xml b/docs/plugins/inspect/plugin-pnm.xml index 8205c0109e..80081d3f6c 100644 --- a/docs/plugins/inspect/plugin-pnm.xml +++ b/docs/plugins/inspect/plugin-pnm.xml @@ -3,7 +3,7 @@ <description>PNM plugin</description> <filename>../../gst/pnm/.libs/libgstpnm.so</filename> <basename>libgstpnm.so</basename> - <version>1.4.4</version> + <version>1.4.5</version> <license>LGPL</license> <source>gst-plugins-bad</source> <package>GStreamer Bad Plug-ins source release</package> diff --git a/docs/plugins/inspect/plugin-rawparse.xml b/docs/plugins/inspect/plugin-rawparse.xml index 79a7d4594b..9bf4682bdb 100644 --- a/docs/plugins/inspect/plugin-rawparse.xml +++ b/docs/plugins/inspect/plugin-rawparse.xml @@ -3,7 +3,7 @@ <description>Parses byte streams into raw frames</description> <filename>../../gst/rawparse/.libs/libgstrawparse.so</filename> <basename>libgstrawparse.so</basename> - <version>1.4.4</version> + <version>1.4.5</version> <license>LGPL</license> <source>gst-plugins-bad</source> <package>GStreamer Bad Plug-ins source release</package> diff --git a/docs/plugins/inspect/plugin-removesilence.xml b/docs/plugins/inspect/plugin-removesilence.xml index 6407308239..eb7ec23fec 100644 --- a/docs/plugins/inspect/plugin-removesilence.xml +++ b/docs/plugins/inspect/plugin-removesilence.xml @@ -3,7 +3,7 @@ <description>Removes silence from an audio stream</description> <filename>../../gst/removesilence/.libs/libgstremovesilence.so</filename> <basename>libgstremovesilence.so</basename> - <version>1.4.4</version> + <version>1.4.5</version> <license>LGPL</license> <source>gst-plugins-bad</source> <package>GStreamer Bad Plug-ins source release</package> diff --git a/docs/plugins/inspect/plugin-resindvd.xml b/docs/plugins/inspect/plugin-resindvd.xml index 1f5be4274d..b7615109fd 100644 --- a/docs/plugins/inspect/plugin-resindvd.xml +++ b/docs/plugins/inspect/plugin-resindvd.xml @@ -3,7 +3,7 @@ <description>Resin DVD playback elements</description> <filename>../../ext/resindvd/.libs/libgstresindvd.so</filename> <basename>libgstresindvd.so</basename> - <version>1.4.4</version> + <version>1.4.5</version> <license>GPL</license> <source>gst-plugins-bad</source> <package>GStreamer</package> diff --git a/docs/plugins/inspect/plugin-rfbsrc.xml b/docs/plugins/inspect/plugin-rfbsrc.xml index 03df258516..340855fece 100644 --- a/docs/plugins/inspect/plugin-rfbsrc.xml +++ b/docs/plugins/inspect/plugin-rfbsrc.xml @@ -3,7 +3,7 @@ <description>Connects to a VNC server and decodes RFB stream</description> <filename>../../gst/librfb/.libs/libgstrfbsrc.so</filename> <basename>libgstrfbsrc.so</basename> - <version>1.4.4</version> + <version>1.4.5</version> <license>LGPL</license> <source>gst-plugins-bad</source> <package>GStreamer Bad Plug-ins source release</package> diff --git a/docs/plugins/inspect/plugin-rtmp.xml b/docs/plugins/inspect/plugin-rtmp.xml index e4b15b8016..590ac610e5 100644 --- a/docs/plugins/inspect/plugin-rtmp.xml +++ b/docs/plugins/inspect/plugin-rtmp.xml @@ -3,7 +3,7 @@ <description>RTMP source and sink</description> <filename>../../ext/rtmp/.libs/libgstrtmp.so</filename> <basename>libgstrtmp.so</basename> - <version>1.4.4</version> + <version>1.4.5</version> <license>LGPL</license> <source>gst-plugins-bad</source> <package>GStreamer Bad Plug-ins source release</package> diff --git a/docs/plugins/inspect/plugin-schro.xml b/docs/plugins/inspect/plugin-schro.xml index 090bc8d253..58bfd9181a 100644 --- a/docs/plugins/inspect/plugin-schro.xml +++ b/docs/plugins/inspect/plugin-schro.xml @@ -3,7 +3,7 @@ <description>Schroedinger plugin</description> <filename>../../ext/schroedinger/.libs/libgstschro.so</filename> <basename>libgstschro.so</basename> - <version>1.4.4</version> + <version>1.4.5</version> <license>LGPL</license> <source>gst-plugins-bad</source> <package>GStreamer Bad Plug-ins source release</package> diff --git a/docs/plugins/inspect/plugin-sdp.xml b/docs/plugins/inspect/plugin-sdp.xml index 93f0a46a6e..523bc2f7e3 100644 --- a/docs/plugins/inspect/plugin-sdp.xml +++ b/docs/plugins/inspect/plugin-sdp.xml @@ -3,7 +3,7 @@ <description>configure streaming sessions using SDP</description> <filename>../../gst/sdp/.libs/libgstsdpelem.so</filename> <basename>libgstsdpelem.so</basename> - <version>1.4.4</version> + <version>1.4.5</version> <license>LGPL</license> <source>gst-plugins-bad</source> <package>GStreamer Bad Plug-ins source release</package> diff --git a/docs/plugins/inspect/plugin-segmentclip.xml b/docs/plugins/inspect/plugin-segmentclip.xml index 122464c54a..ed349d7d08 100644 --- a/docs/plugins/inspect/plugin-segmentclip.xml +++ b/docs/plugins/inspect/plugin-segmentclip.xml @@ -3,7 +3,7 @@ <description>Segment clip elements</description> <filename>../../gst/segmentclip/.libs/libgstsegmentclip.so</filename> <basename>libgstsegmentclip.so</basename> - <version>1.4.4</version> + <version>1.4.5</version> <license>LGPL</license> <source>gst-plugins-bad</source> <package>GStreamer Bad Plug-ins source release</package> diff --git a/docs/plugins/inspect/plugin-shm.xml b/docs/plugins/inspect/plugin-shm.xml index db4cd791ca..b17849bd39 100644 --- a/docs/plugins/inspect/plugin-shm.xml +++ b/docs/plugins/inspect/plugin-shm.xml @@ -3,7 +3,7 @@ <description>shared memory sink source</description> <filename>../../sys/shm/.libs/libgstshm.so</filename> <basename>libgstshm.so</basename> - <version>1.4.4</version> + <version>1.4.5</version> <license>LGPL</license> <source>gst-plugins-bad</source> <package>GStreamer Bad Plug-ins source release</package> diff --git a/docs/plugins/inspect/plugin-smooth.xml b/docs/plugins/inspect/plugin-smooth.xml index 847ac2a7ef..bdf26604c0 100644 --- a/docs/plugins/inspect/plugin-smooth.xml +++ b/docs/plugins/inspect/plugin-smooth.xml @@ -3,7 +3,7 @@ <description>Apply a smooth filter to an image</description> <filename>../../gst/smooth/.libs/libgstsmooth.so</filename> <basename>libgstsmooth.so</basename> - <version>1.4.4</version> + <version>1.4.5</version> <license>LGPL</license> <source>gst-plugins-bad</source> <package>GStreamer Bad Plug-ins source release</package> diff --git a/docs/plugins/inspect/plugin-soundtouch.xml b/docs/plugins/inspect/plugin-soundtouch.xml index 65bff8d839..014231868f 100644 --- a/docs/plugins/inspect/plugin-soundtouch.xml +++ b/docs/plugins/inspect/plugin-soundtouch.xml @@ -3,7 +3,7 @@ <description>Audio Pitch Controller & BPM Detection</description> <filename>../../ext/soundtouch/.libs/libgstsoundtouch.so</filename> <basename>libgstsoundtouch.so</basename> - <version>1.4.4</version> + <version>1.4.5</version> <license>LGPL</license> <source>gst-plugins-bad</source> <package>GStreamer Bad Plug-ins source release</package> diff --git a/docs/plugins/inspect/plugin-spandsp.xml b/docs/plugins/inspect/plugin-spandsp.xml index adf1292a21..c1d4c71766 100644 --- a/docs/plugins/inspect/plugin-spandsp.xml +++ b/docs/plugins/inspect/plugin-spandsp.xml @@ -3,7 +3,7 @@ <description>libspandsp plugin</description> <filename>../../ext/spandsp/.libs/libgstspandsp.so</filename> <basename>libgstspandsp.so</basename> - <version>1.4.4</version> + <version>1.4.5</version> <license>LGPL</license> <source>gst-plugins-bad</source> <package>GStreamer Bad Plug-ins source release</package> diff --git a/docs/plugins/inspect/plugin-speed.xml b/docs/plugins/inspect/plugin-speed.xml index 9e5a482fe1..6e41064bdf 100644 --- a/docs/plugins/inspect/plugin-speed.xml +++ b/docs/plugins/inspect/plugin-speed.xml @@ -3,7 +3,7 @@ <description>Set speed/pitch on audio/raw streams (resampler)</description> <filename>../../gst/speed/.libs/libgstspeed.so</filename> <basename>libgstspeed.so</basename> - <version>1.4.4</version> + <version>1.4.5</version> <license>LGPL</license> <source>gst-plugins-bad</source> <package>GStreamer Bad Plug-ins source release</package> diff --git a/docs/plugins/inspect/plugin-subenc.xml b/docs/plugins/inspect/plugin-subenc.xml index b2511bdae7..39ddd846ea 100644 --- a/docs/plugins/inspect/plugin-subenc.xml +++ b/docs/plugins/inspect/plugin-subenc.xml @@ -3,7 +3,7 @@ <description>subtitle encoders</description> <filename>../../gst/subenc/.libs/libgstsubenc.so</filename> <basename>libgstsubenc.so</basename> - <version>1.4.4</version> + <version>1.4.5</version> <license>LGPL</license> <source>gst-plugins-bad</source> <package>GStreamer Bad Plug-ins source release</package> diff --git a/docs/plugins/inspect/plugin-videoparsersbad.xml b/docs/plugins/inspect/plugin-videoparsersbad.xml index 4fa94d09f5..23965be622 100644 --- a/docs/plugins/inspect/plugin-videoparsersbad.xml +++ b/docs/plugins/inspect/plugin-videoparsersbad.xml @@ -3,7 +3,7 @@ <description>videoparsers</description> <filename>../../gst/videoparsers/.libs/libgstvideoparsersbad.so</filename> <basename>libgstvideoparsersbad.so</basename> - <version>1.4.4</version> + <version>1.4.5</version> <license>LGPL</license> <source>gst-plugins-bad</source> <package>GStreamer Bad Plug-ins source release</package> diff --git a/docs/plugins/inspect/plugin-voaacenc.xml b/docs/plugins/inspect/plugin-voaacenc.xml index db0f33e9c3..d08683c90c 100644 --- a/docs/plugins/inspect/plugin-voaacenc.xml +++ b/docs/plugins/inspect/plugin-voaacenc.xml @@ -3,7 +3,7 @@ <description>AAC audio encoder</description> <filename>../../ext/voaacenc/.libs/libgstvoaacenc.so</filename> <basename>libgstvoaacenc.so</basename> - <version>1.4.4</version> + <version>1.4.5</version> <license>LGPL</license> <source>gst-plugins-bad</source> <package>GStreamer Bad Plug-ins source release</package> diff --git a/docs/plugins/inspect/plugin-voamrwbenc.xml b/docs/plugins/inspect/plugin-voamrwbenc.xml index 24953e372d..5bd740df54 100644 --- a/docs/plugins/inspect/plugin-voamrwbenc.xml +++ b/docs/plugins/inspect/plugin-voamrwbenc.xml @@ -3,7 +3,7 @@ <description>Adaptive Multi-Rate Wide-Band Encoder</description> <filename>../../ext/voamrwbenc/.libs/libgstvoamrwbenc.so</filename> <basename>libgstvoamrwbenc.so</basename> - <version>1.4.4</version> + <version>1.4.5</version> <license>unknown</license> <source>gst-plugins-bad</source> <package>GStreamer Bad Plug-ins source release</package> diff --git a/docs/plugins/inspect/plugin-waylandsink.xml b/docs/plugins/inspect/plugin-waylandsink.xml index 96ed4f74fb..8e398c16de 100644 --- a/docs/plugins/inspect/plugin-waylandsink.xml +++ b/docs/plugins/inspect/plugin-waylandsink.xml @@ -3,7 +3,7 @@ <description>Wayland Video Sink</description> <filename>../../ext/wayland/.libs/libgstwaylandsink.so</filename> <basename>libgstwaylandsink.so</basename> - <version>1.4.4</version> + <version>1.4.5</version> <license>LGPL</license> <source>gst-plugins-bad</source> <package>GStreamer Bad Plug-ins source release</package> diff --git a/docs/plugins/inspect/plugin-y4mdec.xml b/docs/plugins/inspect/plugin-y4mdec.xml index f5a9f0c50d..9ecdaf0c9a 100644 --- a/docs/plugins/inspect/plugin-y4mdec.xml +++ b/docs/plugins/inspect/plugin-y4mdec.xml @@ -3,7 +3,7 @@ <description>Demuxes/decodes YUV4MPEG streams</description> <filename>../../gst/y4m/.libs/libgsty4mdec.so</filename> <basename>libgsty4mdec.so</basename> - <version>1.4.4</version> + <version>1.4.5</version> <license>LGPL</license> <source>gst-plugins-bad</source> <package>GStreamer Bad Plug-ins</package> diff --git a/docs/plugins/inspect/plugin-zbar.xml b/docs/plugins/inspect/plugin-zbar.xml index d376d7c46f..6f7854b40f 100644 --- a/docs/plugins/inspect/plugin-zbar.xml +++ b/docs/plugins/inspect/plugin-zbar.xml @@ -3,7 +3,7 @@ <description>zbar barcode scanner</description> <filename>../../ext/zbar/.libs/libgstzbar.so</filename> <basename>libgstzbar.so</basename> - <version>1.4.4</version> + <version>1.4.5</version> <license>LGPL</license> <source>gst-plugins-bad</source> <package>GStreamer Bad Plug-ins source release</package> diff --git a/gst-libs/gst/video/bad-video-orc-dist.c b/gst-libs/gst/video/bad-video-orc-dist.c index d60b72e9b3..8f6dff4463 100644 --- a/gst-libs/gst/video/bad-video-orc-dist.c +++ b/gst-libs/gst/video/bad-video-orc-dist.c @@ -866,18 +866,13 @@ bad_video_convert_orc_convert_I420_AYUV (guint8 * ORC_RESTRICT d1, #endif orc_int8 var37; orc_union32 var38; -#if defined(__APPLE__) && __GNUC__ == 4 && __GNUC_MINOR__ == 2 && defined (__i386__) - volatile orc_int8 var39; -#else orc_int8 var39; -#endif - orc_int8 var40; - orc_union32 var41; + orc_union32 var40; + orc_int8 var41; orc_int8 var42; - orc_int8 var43; + orc_union16 var43; orc_union16 var44; orc_union16 var45; - orc_union16 var46; ptr0 = (orc_union32 *) d1; ptr1 = (orc_union32 *) d2; @@ -888,20 +883,18 @@ bad_video_convert_orc_convert_I420_AYUV (guint8 * ORC_RESTRICT d1, /* 3: loadpb */ var36 = (int) 0x000000ff; /* 255 or 1.25987e-321f */ - /* 8: loadpb */ - var39 = (int) 0x000000ff; /* 255 or 1.25987e-321f */ for (i = 0; i < n; i++) { /* 0: loadupdb */ - var42 = ptr6[i >> 1]; + var41 = ptr6[i >> 1]; /* 1: loadupdb */ - var43 = ptr7[i >> 1]; + var42 = ptr7[i >> 1]; /* 2: mergebw */ { orc_union16 _dest; - _dest.x2[0] = var42; - _dest.x2[1] = var43; - var44.i = _dest.i; + _dest.x2[0] = var41; + _dest.x2[1] = var42; + var43.i = _dest.i; } /* 4: loadb */ var37 = ptr4[i]; @@ -910,35 +903,35 @@ bad_video_convert_orc_convert_I420_AYUV (guint8 * ORC_RESTRICT d1, orc_union16 _dest; _dest.x2[0] = var36; _dest.x2[1] = var37; - var45.i = _dest.i; + var44.i = _dest.i; } /* 6: mergewl */ { orc_union32 _dest; - _dest.x2[0] = var45.i; - _dest.x2[1] = var44.i; + _dest.x2[0] = var44.i; + _dest.x2[1] = var43.i; var38.i = _dest.i; } /* 7: storel */ ptr0[i] = var38; - /* 9: loadb */ - var40 = ptr5[i]; - /* 10: mergebw */ + /* 8: loadb */ + var39 = ptr5[i]; + /* 9: mergebw */ { orc_union16 _dest; - _dest.x2[0] = var39; - _dest.x2[1] = var40; - var46.i = _dest.i; + _dest.x2[0] = var36; + _dest.x2[1] = var39; + var45.i = _dest.i; } - /* 11: mergewl */ + /* 10: mergewl */ { orc_union32 _dest; - _dest.x2[0] = var46.i; - _dest.x2[1] = var44.i; - var41.i = _dest.i; + _dest.x2[0] = var45.i; + _dest.x2[1] = var43.i; + var40.i = _dest.i; } - /* 12: storel */ - ptr1[i] = var41; + /* 11: storel */ + ptr1[i] = var40; } } @@ -962,18 +955,13 @@ _backup_bad_video_convert_orc_convert_I420_AYUV (OrcExecutor * ORC_RESTRICT ex) #endif orc_int8 var37; orc_union32 var38; -#if defined(__APPLE__) && __GNUC__ == 4 && __GNUC_MINOR__ == 2 && defined (__i386__) - volatile orc_int8 var39; -#else orc_int8 var39; -#endif - orc_int8 var40; - orc_union32 var41; + orc_union32 var40; + orc_int8 var41; orc_int8 var42; - orc_int8 var43; + orc_union16 var43; orc_union16 var44; orc_union16 var45; - orc_union16 var46; ptr0 = (orc_union32 *) ex->arrays[0]; ptr1 = (orc_union32 *) ex->arrays[1]; @@ -984,20 +972,18 @@ _backup_bad_video_convert_orc_convert_I420_AYUV (OrcExecutor * ORC_RESTRICT ex) /* 3: loadpb */ var36 = (int) 0x000000ff; /* 255 or 1.25987e-321f */ - /* 8: loadpb */ - var39 = (int) 0x000000ff; /* 255 or 1.25987e-321f */ for (i = 0; i < n; i++) { /* 0: loadupdb */ - var42 = ptr6[i >> 1]; + var41 = ptr6[i >> 1]; /* 1: loadupdb */ - var43 = ptr7[i >> 1]; + var42 = ptr7[i >> 1]; /* 2: mergebw */ { orc_union16 _dest; - _dest.x2[0] = var42; - _dest.x2[1] = var43; - var44.i = _dest.i; + _dest.x2[0] = var41; + _dest.x2[1] = var42; + var43.i = _dest.i; } /* 4: loadb */ var37 = ptr4[i]; @@ -1006,35 +992,35 @@ _backup_bad_video_convert_orc_convert_I420_AYUV (OrcExecutor * ORC_RESTRICT ex) orc_union16 _dest; _dest.x2[0] = var36; _dest.x2[1] = var37; - var45.i = _dest.i; + var44.i = _dest.i; } /* 6: mergewl */ { orc_union32 _dest; - _dest.x2[0] = var45.i; - _dest.x2[1] = var44.i; + _dest.x2[0] = var44.i; + _dest.x2[1] = var43.i; var38.i = _dest.i; } /* 7: storel */ ptr0[i] = var38; - /* 9: loadb */ - var40 = ptr5[i]; - /* 10: mergebw */ + /* 8: loadb */ + var39 = ptr5[i]; + /* 9: mergebw */ { orc_union16 _dest; - _dest.x2[0] = var39; - _dest.x2[1] = var40; - var46.i = _dest.i; + _dest.x2[0] = var36; + _dest.x2[1] = var39; + var45.i = _dest.i; } - /* 11: mergewl */ + /* 10: mergewl */ { orc_union32 _dest; - _dest.x2[0] = var46.i; - _dest.x2[1] = var44.i; - var41.i = _dest.i; + _dest.x2[0] = var45.i; + _dest.x2[1] = var43.i; + var40.i = _dest.i; } - /* 12: storel */ - ptr1[i] = var41; + /* 11: storel */ + ptr1[i] = var40; } } @@ -6640,19 +6626,15 @@ bad_video_convert_orc_convert_AYUV_ARGB (guint8 * ORC_RESTRICT d1, orc_union16 var50; orc_union16 var51; orc_union16 var52; -#if defined(__APPLE__) && __GNUC__ == 4 && __GNUC_MINOR__ == 2 && defined (__i386__) - volatile orc_union32 var53; -#else orc_union32 var53; -#endif orc_union32 var54; - orc_union32 var55; + orc_union16 var55; orc_union16 var56; - orc_union16 var57; + orc_int8 var57; orc_int8 var58; orc_int8 var59; orc_int8 var60; - orc_int8 var61; + orc_union16 var61; orc_union16 var62; orc_union16 var63; orc_union16 var64; @@ -6664,13 +6646,12 @@ bad_video_convert_orc_convert_AYUV_ARGB (guint8 * ORC_RESTRICT d1, orc_union16 var70; orc_union16 var71; orc_union16 var72; - orc_union16 var73; + orc_int8 var73; orc_int8 var74; orc_int8 var75; - orc_int8 var76; + orc_union16 var76; orc_union16 var77; - orc_union16 var78; - orc_union32 var79; + orc_union32 var78; for (j = 0; j < m; j++) { ptr0 = ORC_PTR_OFFSET (d1, d1_stride * j); @@ -6691,99 +6672,94 @@ bad_video_convert_orc_convert_AYUV_ARGB (guint8 * ORC_RESTRICT d1, var51.i = p4; /* 20: loadpw */ var52.i = p5; - /* 29: loadpb */ - var53.x4[0] = (int) 0x00000080; /* 128 or 6.32404e-322f */ - var53.x4[1] = (int) 0x00000080; /* 128 or 6.32404e-322f */ - var53.x4[2] = (int) 0x00000080; /* 128 or 6.32404e-322f */ - var53.x4[3] = (int) 0x00000080; /* 128 or 6.32404e-322f */ for (i = 0; i < n; i++) { /* 0: loadl */ var46 = ptr4[i]; /* 2: subb */ - var55.x4[0] = var46.x4[0] - var47.x4[0]; - var55.x4[1] = var46.x4[1] - var47.x4[1]; - var55.x4[2] = var46.x4[2] - var47.x4[2]; - var55.x4[3] = var46.x4[3] - var47.x4[3]; + var54.x4[0] = var46.x4[0] - var47.x4[0]; + var54.x4[1] = var46.x4[1] - var47.x4[1]; + var54.x4[2] = var46.x4[2] - var47.x4[2]; + var54.x4[3] = var46.x4[3] - var47.x4[3]; /* 3: splitlw */ { orc_union32 _src; - _src.i = var55.i; - var56.i = _src.x2[1]; - var57.i = _src.x2[0]; + _src.i = var54.i; + var55.i = _src.x2[1]; + var56.i = _src.x2[0]; } /* 4: splitwb */ { orc_union16 _src; - _src.i = var57.i; - var58 = _src.x2[1]; - var59 = _src.x2[0]; + _src.i = var56.i; + var57 = _src.x2[1]; + var58 = _src.x2[0]; } /* 5: splitwb */ { orc_union16 _src; - _src.i = var56.i; - var60 = _src.x2[1]; - var61 = _src.x2[0]; + _src.i = var55.i; + var59 = _src.x2[1]; + var60 = _src.x2[0]; } /* 6: splatbw */ - var62.i = ((var58 & 0xff) << 8) | (var58 & 0xff); + var61.i = ((var57 & 0xff) << 8) | (var57 & 0xff); /* 7: splatbw */ - var63.i = ((var61 & 0xff) << 8) | (var61 & 0xff); + var62.i = ((var60 & 0xff) << 8) | (var60 & 0xff); /* 8: splatbw */ - var64.i = ((var60 & 0xff) << 8) | (var60 & 0xff); + var63.i = ((var59 & 0xff) << 8) | (var59 & 0xff); /* 10: mulhsw */ - var65.i = (var62.i * var48.i) >> 16; + var64.i = (var61.i * var48.i) >> 16; /* 12: mulhsw */ - var66.i = (var64.i * var49.i) >> 16; + var65.i = (var63.i * var49.i) >> 16; /* 13: addssw */ - var67.i = ORC_CLAMP_SW (var65.i + var66.i); + var66.i = ORC_CLAMP_SW (var64.i + var65.i); /* 15: mulhsw */ - var68.i = (var63.i * var50.i) >> 16; + var67.i = (var62.i * var50.i) >> 16; /* 16: addssw */ - var69.i = ORC_CLAMP_SW (var65.i + var68.i); + var68.i = ORC_CLAMP_SW (var64.i + var67.i); /* 18: mulhsw */ - var70.i = (var63.i * var51.i) >> 16; + var69.i = (var62.i * var51.i) >> 16; /* 19: addssw */ - var71.i = ORC_CLAMP_SW (var65.i + var70.i); + var70.i = ORC_CLAMP_SW (var64.i + var69.i); /* 21: mulhsw */ - var72.i = (var64.i * var52.i) >> 16; + var71.i = (var63.i * var52.i) >> 16; /* 22: addssw */ - var73.i = ORC_CLAMP_SW (var71.i + var72.i); + var72.i = ORC_CLAMP_SW (var70.i + var71.i); /* 23: convssswb */ - var74 = ORC_CLAMP_SB (var67.i); + var73 = ORC_CLAMP_SB (var66.i); /* 24: convssswb */ - var75 = ORC_CLAMP_SB (var73.i); + var74 = ORC_CLAMP_SB (var72.i); /* 25: convssswb */ - var76 = ORC_CLAMP_SB (var69.i); + var75 = ORC_CLAMP_SB (var68.i); /* 26: mergebw */ { orc_union16 _dest; - _dest.x2[0] = var59; - _dest.x2[1] = var74; - var77.i = _dest.i; + _dest.x2[0] = var58; + _dest.x2[1] = var73; + var76.i = _dest.i; } /* 27: mergebw */ { orc_union16 _dest; - _dest.x2[0] = var75; - _dest.x2[1] = var76; - var78.i = _dest.i; + _dest.x2[0] = var74; + _dest.x2[1] = var75; + var77.i = _dest.i; } /* 28: mergewl */ { orc_union32 _dest; - _dest.x2[0] = var77.i; - _dest.x2[1] = var78.i; - var79.i = _dest.i; - } - /* 30: addb */ - var54.x4[0] = var79.x4[0] + var53.x4[0]; - var54.x4[1] = var79.x4[1] + var53.x4[1]; - var54.x4[2] = var79.x4[2] + var53.x4[2]; - var54.x4[3] = var79.x4[3] + var53.x4[3]; - /* 31: storel */ - ptr0[i] = var54; + _dest.x2[0] = var76.i; + _dest.x2[1] = var77.i; + var78.i = _dest.i; + } + /* 29: addb */ + var53.x4[0] = var78.x4[0] + var47.x4[0]; + var53.x4[1] = var78.x4[1] + var47.x4[1]; + var53.x4[2] = var78.x4[2] + var47.x4[2]; + var53.x4[3] = var78.x4[3] + var47.x4[3]; + /* 30: storel */ + ptr0[i] = var53; } } @@ -6810,19 +6786,15 @@ _backup_bad_video_convert_orc_convert_AYUV_ARGB (OrcExecutor * ORC_RESTRICT ex) orc_union16 var50; orc_union16 var51; orc_union16 var52; -#if defined(__APPLE__) && __GNUC__ == 4 && __GNUC_MINOR__ == 2 && defined (__i386__) - volatile orc_union32 var53; -#else orc_union32 var53; -#endif orc_union32 var54; - orc_union32 var55; + orc_union16 var55; orc_union16 var56; - orc_union16 var57; + orc_int8 var57; orc_int8 var58; orc_int8 var59; orc_int8 var60; - orc_int8 var61; + orc_union16 var61; orc_union16 var62; orc_union16 var63; orc_union16 var64; @@ -6834,13 +6806,12 @@ _backup_bad_video_convert_orc_convert_AYUV_ARGB (OrcExecutor * ORC_RESTRICT ex) orc_union16 var70; orc_union16 var71; orc_union16 var72; - orc_union16 var73; + orc_int8 var73; orc_int8 var74; orc_int8 var75; - orc_int8 var76; + orc_union16 var76; orc_union16 var77; - orc_union16 var78; - orc_union32 var79; + orc_union32 var78; for (j = 0; j < m; j++) { ptr0 = ORC_PTR_OFFSET (ex->arrays[0], ex->params[0] * j); @@ -6861,99 +6832,94 @@ _backup_bad_video_convert_orc_convert_AYUV_ARGB (OrcExecutor * ORC_RESTRICT ex) var51.i = ex->params[27]; /* 20: loadpw */ var52.i = ex->params[28]; - /* 29: loadpb */ - var53.x4[0] = (int) 0x00000080; /* 128 or 6.32404e-322f */ - var53.x4[1] = (int) 0x00000080; /* 128 or 6.32404e-322f */ - var53.x4[2] = (int) 0x00000080; /* 128 or 6.32404e-322f */ - var53.x4[3] = (int) 0x00000080; /* 128 or 6.32404e-322f */ for (i = 0; i < n; i++) { /* 0: loadl */ var46 = ptr4[i]; /* 2: subb */ - var55.x4[0] = var46.x4[0] - var47.x4[0]; - var55.x4[1] = var46.x4[1] - var47.x4[1]; - var55.x4[2] = var46.x4[2] - var47.x4[2]; - var55.x4[3] = var46.x4[3] - var47.x4[3]; + var54.x4[0] = var46.x4[0] - var47.x4[0]; + var54.x4[1] = var46.x4[1] - var47.x4[1]; + var54.x4[2] = var46.x4[2] - var47.x4[2]; + var54.x4[3] = var46.x4[3] - var47.x4[3]; /* 3: splitlw */ { orc_union32 _src; - _src.i = var55.i; - var56.i = _src.x2[1]; - var57.i = _src.x2[0]; + _src.i = var54.i; + var55.i = _src.x2[1]; + var56.i = _src.x2[0]; } /* 4: splitwb */ { orc_union16 _src; - _src.i = var57.i; - var58 = _src.x2[1]; - var59 = _src.x2[0]; + _src.i = var56.i; + var57 = _src.x2[1]; + var58 = _src.x2[0]; } /* 5: splitwb */ { orc_union16 _src; - _src.i = var56.i; - var60 = _src.x2[1]; - var61 = _src.x2[0]; + _src.i = var55.i; + var59 = _src.x2[1]; + var60 = _src.x2[0]; } /* 6: splatbw */ - var62.i = ((var58 & 0xff) << 8) | (var58 & 0xff); + var61.i = ((var57 & 0xff) << 8) | (var57 & 0xff); /* 7: splatbw */ - var63.i = ((var61 & 0xff) << 8) | (var61 & 0xff); + var62.i = ((var60 & 0xff) << 8) | (var60 & 0xff); /* 8: splatbw */ - var64.i = ((var60 & 0xff) << 8) | (var60 & 0xff); + var63.i = ((var59 & 0xff) << 8) | (var59 & 0xff); /* 10: mulhsw */ - var65.i = (var62.i * var48.i) >> 16; + var64.i = (var61.i * var48.i) >> 16; /* 12: mulhsw */ - var66.i = (var64.i * var49.i) >> 16; + var65.i = (var63.i * var49.i) >> 16; /* 13: addssw */ - var67.i = ORC_CLAMP_SW (var65.i + var66.i); + var66.i = ORC_CLAMP_SW (var64.i + var65.i); /* 15: mulhsw */ - var68.i = (var63.i * var50.i) >> 16; + var67.i = (var62.i * var50.i) >> 16; /* 16: addssw */ - var69.i = ORC_CLAMP_SW (var65.i + var68.i); + var68.i = ORC_CLAMP_SW (var64.i + var67.i); /* 18: mulhsw */ - var70.i = (var63.i * var51.i) >> 16; + var69.i = (var62.i * var51.i) >> 16; /* 19: addssw */ - var71.i = ORC_CLAMP_SW (var65.i + var70.i); + var70.i = ORC_CLAMP_SW (var64.i + var69.i); /* 21: mulhsw */ - var72.i = (var64.i * var52.i) >> 16; + var71.i = (var63.i * var52.i) >> 16; /* 22: addssw */ - var73.i = ORC_CLAMP_SW (var71.i + var72.i); + var72.i = ORC_CLAMP_SW (var70.i + var71.i); /* 23: convssswb */ - var74 = ORC_CLAMP_SB (var67.i); + var73 = ORC_CLAMP_SB (var66.i); /* 24: convssswb */ - var75 = ORC_CLAMP_SB (var73.i); + var74 = ORC_CLAMP_SB (var72.i); /* 25: convssswb */ - var76 = ORC_CLAMP_SB (var69.i); + var75 = ORC_CLAMP_SB (var68.i); /* 26: mergebw */ { orc_union16 _dest; - _dest.x2[0] = var59; - _dest.x2[1] = var74; - var77.i = _dest.i; + _dest.x2[0] = var58; + _dest.x2[1] = var73; + var76.i = _dest.i; } /* 27: mergebw */ { orc_union16 _dest; - _dest.x2[0] = var75; - _dest.x2[1] = var76; - var78.i = _dest.i; + _dest.x2[0] = var74; + _dest.x2[1] = var75; + var77.i = _dest.i; } /* 28: mergewl */ { orc_union32 _dest; - _dest.x2[0] = var77.i; - _dest.x2[1] = var78.i; - var79.i = _dest.i; - } - /* 30: addb */ - var54.x4[0] = var79.x4[0] + var53.x4[0]; - var54.x4[1] = var79.x4[1] + var53.x4[1]; - var54.x4[2] = var79.x4[2] + var53.x4[2]; - var54.x4[3] = var79.x4[3] + var53.x4[3]; - /* 31: storel */ - ptr0[i] = var54; + _dest.x2[0] = var76.i; + _dest.x2[1] = var77.i; + var78.i = _dest.i; + } + /* 29: addb */ + var53.x4[0] = var78.x4[0] + var47.x4[0]; + var53.x4[1] = var78.x4[1] + var47.x4[1]; + var53.x4[2] = var78.x4[2] + var47.x4[2]; + var53.x4[3] = var78.x4[3] + var47.x4[3]; + /* 30: storel */ + ptr0[i] = var53; } } @@ -7120,19 +7086,15 @@ bad_video_convert_orc_convert_AYUV_BGRA (guint8 * ORC_RESTRICT d1, orc_union16 var50; orc_union16 var51; orc_union16 var52; -#if defined(__APPLE__) && __GNUC__ == 4 && __GNUC_MINOR__ == 2 && defined (__i386__) - volatile orc_union32 var53; -#else orc_union32 var53; -#endif orc_union32 var54; - orc_union32 var55; + orc_union16 var55; orc_union16 var56; - orc_union16 var57; + orc_int8 var57; orc_int8 var58; orc_int8 var59; orc_int8 var60; - orc_int8 var61; + orc_union16 var61; orc_union16 var62; orc_union16 var63; orc_union16 var64; @@ -7144,13 +7106,12 @@ bad_video_convert_orc_convert_AYUV_BGRA (guint8 * ORC_RESTRICT d1, orc_union16 var70; orc_union16 var71; orc_union16 var72; - orc_union16 var73; + orc_int8 var73; orc_int8 var74; orc_int8 var75; - orc_int8 var76; + orc_union16 var76; orc_union16 var77; - orc_union16 var78; - orc_union32 var79; + orc_union32 var78; for (j = 0; j < m; j++) { ptr0 = ORC_PTR_OFFSET (d1, d1_stride * j); @@ -7171,99 +7132,94 @@ bad_video_convert_orc_convert_AYUV_BGRA (guint8 * ORC_RESTRICT d1, var51.i = p4; /* 20: loadpw */ var52.i = p5; - /* 29: loadpb */ - var53.x4[0] = (int) 0x00000080; /* 128 or 6.32404e-322f */ - var53.x4[1] = (int) 0x00000080; /* 128 or 6.32404e-322f */ - var53.x4[2] = (int) 0x00000080; /* 128 or 6.32404e-322f */ - var53.x4[3] = (int) 0x00000080; /* 128 or 6.32404e-322f */ for (i = 0; i < n; i++) { /* 0: loadl */ var46 = ptr4[i]; /* 2: subb */ - var55.x4[0] = var46.x4[0] - var47.x4[0]; - var55.x4[1] = var46.x4[1] - var47.x4[1]; - var55.x4[2] = var46.x4[2] - var47.x4[2]; - var55.x4[3] = var46.x4[3] - var47.x4[3]; + var54.x4[0] = var46.x4[0] - var47.x4[0]; + var54.x4[1] = var46.x4[1] - var47.x4[1]; + var54.x4[2] = var46.x4[2] - var47.x4[2]; + var54.x4[3] = var46.x4[3] - var47.x4[3]; /* 3: splitlw */ { orc_union32 _src; - _src.i = var55.i; - var56.i = _src.x2[1]; - var57.i = _src.x2[0]; + _src.i = var54.i; + var55.i = _src.x2[1]; + var56.i = _src.x2[0]; } /* 4: splitwb */ { orc_union16 _src; - _src.i = var57.i; - var58 = _src.x2[1]; - var59 = _src.x2[0]; + _src.i = var56.i; + var57 = _src.x2[1]; + var58 = _src.x2[0]; } /* 5: splitwb */ { orc_union16 _src; - _src.i = var56.i; - var60 = _src.x2[1]; - var61 = _src.x2[0]; + _src.i = var55.i; + var59 = _src.x2[1]; + var60 = _src.x2[0]; } /* 6: splatbw */ - var62.i = ((var58 & 0xff) << 8) | (var58 & 0xff); + var61.i = ((var57 & 0xff) << 8) | (var57 & 0xff); /* 7: splatbw */ - var63.i = ((var61 & 0xff) << 8) | (var61 & 0xff); + var62.i = ((var60 & 0xff) << 8) | (var60 & 0xff); /* 8: splatbw */ - var64.i = ((var60 & 0xff) << 8) | (var60 & 0xff); + var63.i = ((var59 & 0xff) << 8) | (var59 & 0xff); /* 10: mulhsw */ - var65.i = (var62.i * var48.i) >> 16; + var64.i = (var61.i * var48.i) >> 16; /* 12: mulhsw */ - var66.i = (var64.i * var49.i) >> 16; + var65.i = (var63.i * var49.i) >> 16; /* 13: addssw */ - var67.i = ORC_CLAMP_SW (var65.i + var66.i); + var66.i = ORC_CLAMP_SW (var64.i + var65.i); /* 15: mulhsw */ - var68.i = (var63.i * var50.i) >> 16; + var67.i = (var62.i * var50.i) >> 16; /* 16: addssw */ - var69.i = ORC_CLAMP_SW (var65.i + var68.i); + var68.i = ORC_CLAMP_SW (var64.i + var67.i); /* 18: mulhsw */ - var70.i = (var63.i * var51.i) >> 16; + var69.i = (var62.i * var51.i) >> 16; /* 19: addssw */ - var71.i = ORC_CLAMP_SW (var65.i + var70.i); + var70.i = ORC_CLAMP_SW (var64.i + var69.i); /* 21: mulhsw */ - var72.i = (var64.i * var52.i) >> 16; + var71.i = (var63.i * var52.i) >> 16; /* 22: addssw */ - var73.i = ORC_CLAMP_SW (var71.i + var72.i); + var72.i = ORC_CLAMP_SW (var70.i + var71.i); /* 23: convssswb */ - var74 = ORC_CLAMP_SB (var67.i); + var73 = ORC_CLAMP_SB (var66.i); /* 24: convssswb */ - var75 = ORC_CLAMP_SB (var73.i); + var74 = ORC_CLAMP_SB (var72.i); /* 25: convssswb */ - var76 = ORC_CLAMP_SB (var69.i); + var75 = ORC_CLAMP_SB (var68.i); /* 26: mergebw */ { orc_union16 _dest; - _dest.x2[0] = var76; - _dest.x2[1] = var75; - var77.i = _dest.i; + _dest.x2[0] = var75; + _dest.x2[1] = var74; + var76.i = _dest.i; } /* 27: mergebw */ { orc_union16 _dest; - _dest.x2[0] = var74; - _dest.x2[1] = var59; - var78.i = _dest.i; + _dest.x2[0] = var73; + _dest.x2[1] = var58; + var77.i = _dest.i; } /* 28: mergewl */ { orc_union32 _dest; - _dest.x2[0] = var77.i; - _dest.x2[1] = var78.i; - var79.i = _dest.i; - } - /* 30: addb */ - var54.x4[0] = var79.x4[0] + var53.x4[0]; - var54.x4[1] = var79.x4[1] + var53.x4[1]; - var54.x4[2] = var79.x4[2] + var53.x4[2]; - var54.x4[3] = var79.x4[3] + var53.x4[3]; - /* 31: storel */ - ptr0[i] = var54; + _dest.x2[0] = var76.i; + _dest.x2[1] = var77.i; + var78.i = _dest.i; + } + /* 29: addb */ + var53.x4[0] = var78.x4[0] + var47.x4[0]; + var53.x4[1] = var78.x4[1] + var47.x4[1]; + var53.x4[2] = var78.x4[2] + var47.x4[2]; + var53.x4[3] = var78.x4[3] + var47.x4[3]; + /* 30: storel */ + ptr0[i] = var53; } } @@ -7290,19 +7246,15 @@ _backup_bad_video_convert_orc_convert_AYUV_BGRA (OrcExecutor * ORC_RESTRICT ex) orc_union16 var50; orc_union16 var51; orc_union16 var52; -#if defined(__APPLE__) && __GNUC__ == 4 && __GNUC_MINOR__ == 2 && defined (__i386__) - volatile orc_union32 var53; -#else orc_union32 var53; -#endif orc_union32 var54; - orc_union32 var55; + orc_union16 var55; orc_union16 var56; - orc_union16 var57; + orc_int8 var57; orc_int8 var58; orc_int8 var59; orc_int8 var60; - orc_int8 var61; + orc_union16 var61; orc_union16 var62; orc_union16 var63; orc_union16 var64; @@ -7314,13 +7266,12 @@ _backup_bad_video_convert_orc_convert_AYUV_BGRA (OrcExecutor * ORC_RESTRICT ex) orc_union16 var70; orc_union16 var71; orc_union16 var72; - orc_union16 var73; + orc_int8 var73; orc_int8 var74; orc_int8 var75; - orc_int8 var76; + orc_union16 var76; orc_union16 var77; - orc_union16 var78; - orc_union32 var79; + orc_union32 var78; for (j = 0; j < m; j++) { ptr0 = ORC_PTR_OFFSET (ex->arrays[0], ex->params[0] * j); @@ -7341,99 +7292,94 @@ _backup_bad_video_convert_orc_convert_AYUV_BGRA (OrcExecutor * ORC_RESTRICT ex) var51.i = ex->params[27]; /* 20: loadpw */ var52.i = ex->params[28]; - /* 29: loadpb */ - var53.x4[0] = (int) 0x00000080; /* 128 or 6.32404e-322f */ - var53.x4[1] = (int) 0x00000080; /* 128 or 6.32404e-322f */ - var53.x4[2] = (int) 0x00000080; /* 128 or 6.32404e-322f */ - var53.x4[3] = (int) 0x00000080; /* 128 or 6.32404e-322f */ for (i = 0; i < n; i++) { /* 0: loadl */ var46 = ptr4[i]; /* 2: subb */ - var55.x4[0] = var46.x4[0] - var47.x4[0]; - var55.x4[1] = var46.x4[1] - var47.x4[1]; - var55.x4[2] = var46.x4[2] - var47.x4[2]; - var55.x4[3] = var46.x4[3] - var47.x4[3]; + var54.x4[0] = var46.x4[0] - var47.x4[0]; + var54.x4[1] = var46.x4[1] - var47.x4[1]; + var54.x4[2] = var46.x4[2] - var47.x4[2]; + var54.x4[3] = var46.x4[3] - var47.x4[3]; /* 3: splitlw */ { orc_union32 _src; - _src.i = var55.i; - var56.i = _src.x2[1]; - var57.i = _src.x2[0]; + _src.i = var54.i; + var55.i = _src.x2[1]; + var56.i = _src.x2[0]; } /* 4: splitwb */ { orc_union16 _src; - _src.i = var57.i; - var58 = _src.x2[1]; - var59 = _src.x2[0]; + _src.i = var56.i; + var57 = _src.x2[1]; + var58 = _src.x2[0]; } /* 5: splitwb */ { orc_union16 _src; - _src.i = var56.i; - var60 = _src.x2[1]; - var61 = _src.x2[0]; + _src.i = var55.i; + var59 = _src.x2[1]; + var60 = _src.x2[0]; } /* 6: splatbw */ - var62.i = ((var58 & 0xff) << 8) | (var58 & 0xff); + var61.i = ((var57 & 0xff) << 8) | (var57 & 0xff); /* 7: splatbw */ - var63.i = ((var61 & 0xff) << 8) | (var61 & 0xff); + var62.i = ((var60 & 0xff) << 8) | (var60 & 0xff); /* 8: splatbw */ - var64.i = ((var60 & 0xff) << 8) | (var60 & 0xff); + var63.i = ((var59 & 0xff) << 8) | (var59 & 0xff); /* 10: mulhsw */ - var65.i = (var62.i * var48.i) >> 16; + var64.i = (var61.i * var48.i) >> 16; /* 12: mulhsw */ - var66.i = (var64.i * var49.i) >> 16; + var65.i = (var63.i * var49.i) >> 16; /* 13: addssw */ - var67.i = ORC_CLAMP_SW (var65.i + var66.i); + var66.i = ORC_CLAMP_SW (var64.i + var65.i); /* 15: mulhsw */ - var68.i = (var63.i * var50.i) >> 16; + var67.i = (var62.i * var50.i) >> 16; /* 16: addssw */ - var69.i = ORC_CLAMP_SW (var65.i + var68.i); + var68.i = ORC_CLAMP_SW (var64.i + var67.i); /* 18: mulhsw */ - var70.i = (var63.i * var51.i) >> 16; + var69.i = (var62.i * var51.i) >> 16; /* 19: addssw */ - var71.i = ORC_CLAMP_SW (var65.i + var70.i); + var70.i = ORC_CLAMP_SW (var64.i + var69.i); /* 21: mulhsw */ - var72.i = (var64.i * var52.i) >> 16; + var71.i = (var63.i * var52.i) >> 16; /* 22: addssw */ - var73.i = ORC_CLAMP_SW (var71.i + var72.i); + var72.i = ORC_CLAMP_SW (var70.i + var71.i); /* 23: convssswb */ - var74 = ORC_CLAMP_SB (var67.i); + var73 = ORC_CLAMP_SB (var66.i); /* 24: convssswb */ - var75 = ORC_CLAMP_SB (var73.i); + var74 = ORC_CLAMP_SB (var72.i); /* 25: convssswb */ - var76 = ORC_CLAMP_SB (var69.i); + var75 = ORC_CLAMP_SB (var68.i); /* 26: mergebw */ { orc_union16 _dest; - _dest.x2[0] = var76; - _dest.x2[1] = var75; - var77.i = _dest.i; + _dest.x2[0] = var75; + _dest.x2[1] = var74; + var76.i = _dest.i; } /* 27: mergebw */ { orc_union16 _dest; - _dest.x2[0] = var74; - _dest.x2[1] = var59; - var78.i = _dest.i; + _dest.x2[0] = var73; + _dest.x2[1] = var58; + var77.i = _dest.i; } /* 28: mergewl */ { orc_union32 _dest; - _dest.x2[0] = var77.i; - _dest.x2[1] = var78.i; - var79.i = _dest.i; - } - /* 30: addb */ - var54.x4[0] = var79.x4[0] + var53.x4[0]; - var54.x4[1] = var79.x4[1] + var53.x4[1]; - var54.x4[2] = var79.x4[2] + var53.x4[2]; - var54.x4[3] = var79.x4[3] + var53.x4[3]; - /* 31: storel */ - ptr0[i] = var54; + _dest.x2[0] = var76.i; + _dest.x2[1] = var77.i; + var78.i = _dest.i; + } + /* 29: addb */ + var53.x4[0] = var78.x4[0] + var47.x4[0]; + var53.x4[1] = var78.x4[1] + var47.x4[1]; + var53.x4[2] = var78.x4[2] + var47.x4[2]; + var53.x4[3] = var78.x4[3] + var47.x4[3]; + /* 30: storel */ + ptr0[i] = var53; } } @@ -7600,19 +7546,15 @@ bad_video_convert_orc_convert_AYUV_ABGR (guint8 * ORC_RESTRICT d1, orc_union16 var50; orc_union16 var51; orc_union16 var52; -#if defined(__APPLE__) && __GNUC__ == 4 && __GNUC_MINOR__ == 2 && defined (__i386__) - volatile orc_union32 var53; -#else orc_union32 var53; -#endif orc_union32 var54; - orc_union32 var55; + orc_union16 var55; orc_union16 var56; - orc_union16 var57; + orc_int8 var57; orc_int8 var58; orc_int8 var59; orc_int8 var60; - orc_int8 var61; + orc_union16 var61; orc_union16 var62; orc_union16 var63; orc_union16 var64; @@ -7624,13 +7566,12 @@ bad_video_convert_orc_convert_AYUV_ABGR (guint8 * ORC_RESTRICT d1, orc_union16 var70; orc_union16 var71; orc_union16 var72; - orc_union16 var73; + orc_int8 var73; orc_int8 var74; orc_int8 var75; - orc_int8 var76; + orc_union16 var76; orc_union16 var77; - orc_union16 var78; - orc_union32 var79; + orc_union32 var78; for (j = 0; j < m; j++) { ptr0 = ORC_PTR_OFFSET (d1, d1_stride * j); @@ -7651,99 +7592,94 @@ bad_video_convert_orc_convert_AYUV_ABGR (guint8 * ORC_RESTRICT d1, var51.i = p4; /* 20: loadpw */ var52.i = p5; - /* 29: loadpb */ - var53.x4[0] = (int) 0x00000080; /* 128 or 6.32404e-322f */ - var53.x4[1] = (int) 0x00000080; /* 128 or 6.32404e-322f */ - var53.x4[2] = (int) 0x00000080; /* 128 or 6.32404e-322f */ - var53.x4[3] = (int) 0x00000080; /* 128 or 6.32404e-322f */ for (i = 0; i < n; i++) { /* 0: loadl */ var46 = ptr4[i]; /* 2: subb */ - var55.x4[0] = var46.x4[0] - var47.x4[0]; - var55.x4[1] = var46.x4[1] - var47.x4[1]; - var55.x4[2] = var46.x4[2] - var47.x4[2]; - var55.x4[3] = var46.x4[3] - var47.x4[3]; + var54.x4[0] = var46.x4[0] - var47.x4[0]; + var54.x4[1] = var46.x4[1] - var47.x4[1]; + var54.x4[2] = var46.x4[2] - var47.x4[2]; + var54.x4[3] = var46.x4[3] - var47.x4[3]; /* 3: splitlw */ { orc_union32 _src; - _src.i = var55.i; - var56.i = _src.x2[1]; - var57.i = _src.x2[0]; + _src.i = var54.i; + var55.i = _src.x2[1]; + var56.i = _src.x2[0]; } /* 4: splitwb */ { orc_union16 _src; - _src.i = var57.i; - var58 = _src.x2[1]; - var59 = _src.x2[0]; + _src.i = var56.i; + var57 = _src.x2[1]; + var58 = _src.x2[0]; } /* 5: splitwb */ { orc_union16 _src; - _src.i = var56.i; - var60 = _src.x2[1]; - var61 = _src.x2[0]; + _src.i = var55.i; + var59 = _src.x2[1]; + var60 = _src.x2[0]; } /* 6: splatbw */ - var62.i = ((var58 & 0xff) << 8) | (var58 & 0xff); + var61.i = ((var57 & 0xff) << 8) | (var57 & 0xff); /* 7: splatbw */ - var63.i = ((var61 & 0xff) << 8) | (var61 & 0xff); + var62.i = ((var60 & 0xff) << 8) | (var60 & 0xff); /* 8: splatbw */ - var64.i = ((var60 & 0xff) << 8) | (var60 & 0xff); + var63.i = ((var59 & 0xff) << 8) | (var59 & 0xff); /* 10: mulhsw */ - var65.i = (var62.i * var48.i) >> 16; + var64.i = (var61.i * var48.i) >> 16; /* 12: mulhsw */ - var66.i = (var64.i * var49.i) >> 16; + var65.i = (var63.i * var49.i) >> 16; /* 13: addssw */ - var67.i = ORC_CLAMP_SW (var65.i + var66.i); + var66.i = ORC_CLAMP_SW (var64.i + var65.i); /* 15: mulhsw */ - var68.i = (var63.i * var50.i) >> 16; + var67.i = (var62.i * var50.i) >> 16; /* 16: addssw */ - var69.i = ORC_CLAMP_SW (var65.i + var68.i); + var68.i = ORC_CLAMP_SW (var64.i + var67.i); /* 18: mulhsw */ - var70.i = (var63.i * var51.i) >> 16; + var69.i = (var62.i * var51.i) >> 16; /* 19: addssw */ - var71.i = ORC_CLAMP_SW (var65.i + var70.i); + var70.i = ORC_CLAMP_SW (var64.i + var69.i); /* 21: mulhsw */ - var72.i = (var64.i * var52.i) >> 16; + var71.i = (var63.i * var52.i) >> 16; /* 22: addssw */ - var73.i = ORC_CLAMP_SW (var71.i + var72.i); + var72.i = ORC_CLAMP_SW (var70.i + var71.i); /* 23: convssswb */ - var74 = ORC_CLAMP_SB (var67.i); + var73 = ORC_CLAMP_SB (var66.i); /* 24: convssswb */ - var75 = ORC_CLAMP_SB (var73.i); + var74 = ORC_CLAMP_SB (var72.i); /* 25: convssswb */ - var76 = ORC_CLAMP_SB (var69.i); + var75 = ORC_CLAMP_SB (var68.i); /* 26: mergebw */ { orc_union16 _dest; - _dest.x2[0] = var59; - _dest.x2[1] = var76; - var77.i = _dest.i; + _dest.x2[0] = var58; + _dest.x2[1] = var75; + var76.i = _dest.i; } /* 27: mergebw */ { orc_union16 _dest; - _dest.x2[0] = var75; - _dest.x2[1] = var74; - var78.i = _dest.i; + _dest.x2[0] = var74; + _dest.x2[1] = var73; + var77.i = _dest.i; } /* 28: mergewl */ { orc_union32 _dest; - _dest.x2[0] = var77.i; - _dest.x2[1] = var78.i; - var79.i = _dest.i; - } - /* 30: addb */ - var54.x4[0] = var79.x4[0] + var53.x4[0]; - var54.x4[1] = var79.x4[1] + var53.x4[1]; - var54.x4[2] = var79.x4[2] + var53.x4[2]; - var54.x4[3] = var79.x4[3] + var53.x4[3]; - /* 31: storel */ - ptr0[i] = var54; + _dest.x2[0] = var76.i; + _dest.x2[1] = var77.i; + var78.i = _dest.i; + } + /* 29: addb */ + var53.x4[0] = var78.x4[0] + var47.x4[0]; + var53.x4[1] = var78.x4[1] + var47.x4[1]; + var53.x4[2] = var78.x4[2] + var47.x4[2]; + var53.x4[3] = var78.x4[3] + var47.x4[3]; + /* 30: storel */ + ptr0[i] = var53; } } @@ -7770,19 +7706,15 @@ _backup_bad_video_convert_orc_convert_AYUV_ABGR (OrcExecutor * ORC_RESTRICT ex) orc_union16 var50; orc_union16 var51; orc_union16 var52; -#if defined(__APPLE__) && __GNUC__ == 4 && __GNUC_MINOR__ == 2 && defined (__i386__) - volatile orc_union32 var53; -#else orc_union32 var53; -#endif orc_union32 var54; - orc_union32 var55; + orc_union16 var55; orc_union16 var56; - orc_union16 var57; + orc_int8 var57; orc_int8 var58; orc_int8 var59; orc_int8 var60; - orc_int8 var61; + orc_union16 var61; orc_union16 var62; orc_union16 var63; orc_union16 var64; @@ -7794,13 +7726,12 @@ _backup_bad_video_convert_orc_convert_AYUV_ABGR (OrcExecutor * ORC_RESTRICT ex) orc_union16 var70; orc_union16 var71; orc_union16 var72; - orc_union16 var73; + orc_int8 var73; orc_int8 var74; orc_int8 var75; - orc_int8 var76; + orc_union16 var76; orc_union16 var77; - orc_union16 var78; - orc_union32 var79; + orc_union32 var78; for (j = 0; j < m; j++) { ptr0 = ORC_PTR_OFFSET (ex->arrays[0], ex->params[0] * j); @@ -7821,99 +7752,94 @@ _backup_bad_video_convert_orc_convert_AYUV_ABGR (OrcExecutor * ORC_RESTRICT ex) var51.i = ex->params[27]; /* 20: loadpw */ var52.i = ex->params[28]; - /* 29: loadpb */ - var53.x4[0] = (int) 0x00000080; /* 128 or 6.32404e-322f */ - var53.x4[1] = (int) 0x00000080; /* 128 or 6.32404e-322f */ - var53.x4[2] = (int) 0x00000080; /* 128 or 6.32404e-322f */ - var53.x4[3] = (int) 0x00000080; /* 128 or 6.32404e-322f */ for (i = 0; i < n; i++) { /* 0: loadl */ var46 = ptr4[i]; /* 2: subb */ - var55.x4[0] = var46.x4[0] - var47.x4[0]; - var55.x4[1] = var46.x4[1] - var47.x4[1]; - var55.x4[2] = var46.x4[2] - var47.x4[2]; - var55.x4[3] = var46.x4[3] - var47.x4[3]; + var54.x4[0] = var46.x4[0] - var47.x4[0]; + var54.x4[1] = var46.x4[1] - var47.x4[1]; + var54.x4[2] = var46.x4[2] - var47.x4[2]; + var54.x4[3] = var46.x4[3] - var47.x4[3]; /* 3: splitlw */ { orc_union32 _src; - _src.i = var55.i; - var56.i = _src.x2[1]; - var57.i = _src.x2[0]; + _src.i = var54.i; + var55.i = _src.x2[1]; + var56.i = _src.x2[0]; } /* 4: splitwb */ { orc_union16 _src; - _src.i = var57.i; - var58 = _src.x2[1]; - var59 = _src.x2[0]; + _src.i = var56.i; + var57 = _src.x2[1]; + var58 = _src.x2[0]; } /* 5: splitwb */ { orc_union16 _src; - _src.i = var56.i; - var60 = _src.x2[1]; - var61 = _src.x2[0]; + _src.i = var55.i; + var59 = _src.x2[1]; + var60 = _src.x2[0]; } /* 6: splatbw */ - var62.i = ((var58 & 0xff) << 8) | (var58 & 0xff); + var61.i = ((var57 & 0xff) << 8) | (var57 & 0xff); /* 7: splatbw */ - var63.i = ((var61 & 0xff) << 8) | (var61 & 0xff); + var62.i = ((var60 & 0xff) << 8) | (var60 & 0xff); /* 8: splatbw */ - var64.i = ((var60 & 0xff) << 8) | (var60 & 0xff); + var63.i = ((var59 & 0xff) << 8) | (var59 & 0xff); /* 10: mulhsw */ - var65.i = (var62.i * var48.i) >> 16; + var64.i = (var61.i * var48.i) >> 16; /* 12: mulhsw */ - var66.i = (var64.i * var49.i) >> 16; + var65.i = (var63.i * var49.i) >> 16; /* 13: addssw */ - var67.i = ORC_CLAMP_SW (var65.i + var66.i); + var66.i = ORC_CLAMP_SW (var64.i + var65.i); /* 15: mulhsw */ - var68.i = (var63.i * var50.i) >> 16; + var67.i = (var62.i * var50.i) >> 16; /* 16: addssw */ - var69.i = ORC_CLAMP_SW (var65.i + var68.i); + var68.i = ORC_CLAMP_SW (var64.i + var67.i); /* 18: mulhsw */ - var70.i = (var63.i * var51.i) >> 16; + var69.i = (var62.i * var51.i) >> 16; /* 19: addssw */ - var71.i = ORC_CLAMP_SW (var65.i + var70.i); + var70.i = ORC_CLAMP_SW (var64.i + var69.i); /* 21: mulhsw */ - var72.i = (var64.i * var52.i) >> 16; + var71.i = (var63.i * var52.i) >> 16; /* 22: addssw */ - var73.i = ORC_CLAMP_SW (var71.i + var72.i); + var72.i = ORC_CLAMP_SW (var70.i + var71.i); /* 23: convssswb */ - var74 = ORC_CLAMP_SB (var67.i); + var73 = ORC_CLAMP_SB (var66.i); /* 24: convssswb */ - var75 = ORC_CLAMP_SB (var73.i); + var74 = ORC_CLAMP_SB (var72.i); /* 25: convssswb */ - var76 = ORC_CLAMP_SB (var69.i); + var75 = ORC_CLAMP_SB (var68.i); /* 26: mergebw */ { orc_union16 _dest; - _dest.x2[0] = var59; - _dest.x2[1] = var76; - var77.i = _dest.i; + _dest.x2[0] = var58; + _dest.x2[1] = var75; + var76.i = _dest.i; } /* 27: mergebw */ { orc_union16 _dest; - _dest.x2[0] = var75; - _dest.x2[1] = var74; - var78.i = _dest.i; + _dest.x2[0] = var74; + _dest.x2[1] = var73; + var77.i = _dest.i; } /* 28: mergewl */ { orc_union32 _dest; - _dest.x2[0] = var77.i; - _dest.x2[1] = var78.i; - var79.i = _dest.i; - } - /* 30: addb */ - var54.x4[0] = var79.x4[0] + var53.x4[0]; - var54.x4[1] = var79.x4[1] + var53.x4[1]; - var54.x4[2] = var79.x4[2] + var53.x4[2]; - var54.x4[3] = var79.x4[3] + var53.x4[3]; - /* 31: storel */ - ptr0[i] = var54; + _dest.x2[0] = var76.i; + _dest.x2[1] = var77.i; + var78.i = _dest.i; + } + /* 29: addb */ + var53.x4[0] = var78.x4[0] + var47.x4[0]; + var53.x4[1] = var78.x4[1] + var47.x4[1]; + var53.x4[2] = var78.x4[2] + var47.x4[2]; + var53.x4[3] = var78.x4[3] + var47.x4[3]; + /* 30: storel */ + ptr0[i] = var53; } } @@ -8080,19 +8006,15 @@ bad_video_convert_orc_convert_AYUV_RGBA (guint8 * ORC_RESTRICT d1, orc_union16 var50; orc_union16 var51; orc_union16 var52; -#if defined(__APPLE__) && __GNUC__ == 4 && __GNUC_MINOR__ == 2 && defined (__i386__) - volatile orc_union32 var53; -#else orc_union32 var53; -#endif orc_union32 var54; - orc_union32 var55; + orc_union16 var55; orc_union16 var56; - orc_union16 var57; + orc_int8 var57; orc_int8 var58; orc_int8 var59; orc_int8 var60; - orc_int8 var61; + orc_union16 var61; orc_union16 var62; orc_union16 var63; orc_union16 var64; @@ -8104,13 +8026,12 @@ bad_video_convert_orc_convert_AYUV_RGBA (guint8 * ORC_RESTRICT d1, orc_union16 var70; orc_union16 var71; orc_union16 var72; - orc_union16 var73; + orc_int8 var73; orc_int8 var74; orc_int8 var75; - orc_int8 var76; + orc_union16 var76; orc_union16 var77; - orc_union16 var78; - orc_union32 var79; + orc_union32 var78; for (j = 0; j < m; j++) { ptr0 = ORC_PTR_OFFSET (d1, d1_stride * j); @@ -8131,99 +8052,94 @@ bad_video_convert_orc_convert_AYUV_RGBA (guint8 * ORC_RESTRICT d1, var51.i = p4; /* 20: loadpw */ var52.i = p5; - /* 29: loadpb */ - var53.x4[0] = (int) 0x00000080; /* 128 or 6.32404e-322f */ - var53.x4[1] = (int) 0x00000080; /* 128 or 6.32404e-322f */ - var53.x4[2] = (int) 0x00000080; /* 128 or 6.32404e-322f */ - var53.x4[3] = (int) 0x00000080; /* 128 or 6.32404e-322f */ for (i = 0; i < n; i++) { /* 0: loadl */ var46 = ptr4[i]; /* 2: subb */ - var55.x4[0] = var46.x4[0] - var47.x4[0]; - var55.x4[1] = var46.x4[1] - var47.x4[1]; - var55.x4[2] = var46.x4[2] - var47.x4[2]; - var55.x4[3] = var46.x4[3] - var47.x4[3]; + var54.x4[0] = var46.x4[0] - var47.x4[0]; + var54.x4[1] = var46.x4[1] - var47.x4[1]; + var54.x4[2] = var46.x4[2] - var47.x4[2]; + var54.x4[3] = var46.x4[3] - var47.x4[3]; /* 3: splitlw */ { orc_union32 _src; - _src.i = var55.i; - var56.i = _src.x2[1]; - var57.i = _src.x2[0]; + _src.i = var54.i; + var55.i = _src.x2[1]; + var56.i = _src.x2[0]; } /* 4: splitwb */ { orc_union16 _src; - _src.i = var57.i; - var58 = _src.x2[1]; - var59 = _src.x2[0]; + _src.i = var56.i; + var57 = _src.x2[1]; + var58 = _src.x2[0]; } /* 5: splitwb */ { orc_union16 _src; - _src.i = var56.i; - var60 = _src.x2[1]; - var61 = _src.x2[0]; + _src.i = var55.i; + var59 = _src.x2[1]; + var60 = _src.x2[0]; } /* 6: splatbw */ - var62.i = ((var58 & 0xff) << 8) | (var58 & 0xff); + var61.i = ((var57 & 0xff) << 8) | (var57 & 0xff); /* 7: splatbw */ - var63.i = ((var61 & 0xff) << 8) | (var61 & 0xff); + var62.i = ((var60 & 0xff) << 8) | (var60 & 0xff); /* 8: splatbw */ - var64.i = ((var60 & 0xff) << 8) | (var60 & 0xff); + var63.i = ((var59 & 0xff) << 8) | (var59 & 0xff); /* 10: mulhsw */ - var65.i = (var62.i * var48.i) >> 16; + var64.i = (var61.i * var48.i) >> 16; /* 12: mulhsw */ - var66.i = (var64.i * var49.i) >> 16; + var65.i = (var63.i * var49.i) >> 16; /* 13: addssw */ - var67.i = ORC_CLAMP_SW (var65.i + var66.i); + var66.i = ORC_CLAMP_SW (var64.i + var65.i); /* 15: mulhsw */ - var68.i = (var63.i * var50.i) >> 16; + var67.i = (var62.i * var50.i) >> 16; /* 16: addssw */ - var69.i = ORC_CLAMP_SW (var65.i + var68.i); + var68.i = ORC_CLAMP_SW (var64.i + var67.i); /* 18: mulhsw */ - var70.i = (var63.i * var51.i) >> 16; + var69.i = (var62.i * var51.i) >> 16; /* 19: addssw */ - var71.i = ORC_CLAMP_SW (var65.i + var70.i); + var70.i = ORC_CLAMP_SW (var64.i + var69.i); /* 21: mulhsw */ - var72.i = (var64.i * var52.i) >> 16; + var71.i = (var63.i * var52.i) >> 16; /* 22: addssw */ - var73.i = ORC_CLAMP_SW (var71.i + var72.i); + var72.i = ORC_CLAMP_SW (var70.i + var71.i); /* 23: convssswb */ - var74 = ORC_CLAMP_SB (var67.i); + var73 = ORC_CLAMP_SB (var66.i); /* 24: convssswb */ - var75 = ORC_CLAMP_SB (var73.i); + var74 = ORC_CLAMP_SB (var72.i); /* 25: convssswb */ - var76 = ORC_CLAMP_SB (var69.i); + var75 = ORC_CLAMP_SB (var68.i); /* 26: mergebw */ { orc_union16 _dest; - _dest.x2[0] = var74; - _dest.x2[1] = var75; - var77.i = _dest.i; + _dest.x2[0] = var73; + _dest.x2[1] = var74; + var76.i = _dest.i; } /* 27: mergebw */ { orc_union16 _dest; - _dest.x2[0] = var76; - _dest.x2[1] = var59; - var78.i = _dest.i; + _dest.x2[0] = var75; + _dest.x2[1] = var58; + var77.i = _dest.i; } /* 28: mergewl */ { orc_union32 _dest; - _dest.x2[0] = var77.i; - _dest.x2[1] = var78.i; - var79.i = _dest.i; - } - /* 30: addb */ - var54.x4[0] = var79.x4[0] + var53.x4[0]; - var54.x4[1] = var79.x4[1] + var53.x4[1]; - var54.x4[2] = var79.x4[2] + var53.x4[2]; - var54.x4[3] = var79.x4[3] + var53.x4[3]; - /* 31: storel */ - ptr0[i] = var54; + _dest.x2[0] = var76.i; + _dest.x2[1] = var77.i; + var78.i = _dest.i; + } + /* 29: addb */ + var53.x4[0] = var78.x4[0] + var47.x4[0]; + var53.x4[1] = var78.x4[1] + var47.x4[1]; + var53.x4[2] = var78.x4[2] + var47.x4[2]; + var53.x4[3] = var78.x4[3] + var47.x4[3]; + /* 30: storel */ + ptr0[i] = var53; } } @@ -8250,19 +8166,15 @@ _backup_bad_video_convert_orc_convert_AYUV_RGBA (OrcExecutor * ORC_RESTRICT ex) orc_union16 var50; orc_union16 var51; orc_union16 var52; -#if defined(__APPLE__) && __GNUC__ == 4 && __GNUC_MINOR__ == 2 && defined (__i386__) - volatile orc_union32 var53; -#else orc_union32 var53; -#endif orc_union32 var54; - orc_union32 var55; + orc_union16 var55; orc_union16 var56; - orc_union16 var57; + orc_int8 var57; orc_int8 var58; orc_int8 var59; orc_int8 var60; - orc_int8 var61; + orc_union16 var61; orc_union16 var62; orc_union16 var63; orc_union16 var64; @@ -8274,13 +8186,12 @@ _backup_bad_video_convert_orc_convert_AYUV_RGBA (OrcExecutor * ORC_RESTRICT ex) orc_union16 var70; orc_union16 var71; orc_union16 var72; - orc_union16 var73; + orc_int8 var73; orc_int8 var74; orc_int8 var75; - orc_int8 var76; + orc_union16 var76; orc_union16 var77; - orc_union16 var78; - orc_union32 var79; + orc_union32 var78; for (j = 0; j < m; j++) { ptr0 = ORC_PTR_OFFSET (ex->arrays[0], ex->params[0] * j); @@ -8301,99 +8212,94 @@ _backup_bad_video_convert_orc_convert_AYUV_RGBA (OrcExecutor * ORC_RESTRICT ex) var51.i = ex->params[27]; /* 20: loadpw */ var52.i = ex->params[28]; - /* 29: loadpb */ - var53.x4[0] = (int) 0x00000080; /* 128 or 6.32404e-322f */ - var53.x4[1] = (int) 0x00000080; /* 128 or 6.32404e-322f */ - var53.x4[2] = (int) 0x00000080; /* 128 or 6.32404e-322f */ - var53.x4[3] = (int) 0x00000080; /* 128 or 6.32404e-322f */ for (i = 0; i < n; i++) { /* 0: loadl */ var46 = ptr4[i]; /* 2: subb */ - var55.x4[0] = var46.x4[0] - var47.x4[0]; - var55.x4[1] = var46.x4[1] - var47.x4[1]; - var55.x4[2] = var46.x4[2] - var47.x4[2]; - var55.x4[3] = var46.x4[3] - var47.x4[3]; + var54.x4[0] = var46.x4[0] - var47.x4[0]; + var54.x4[1] = var46.x4[1] - var47.x4[1]; + var54.x4[2] = var46.x4[2] - var47.x4[2]; + var54.x4[3] = var46.x4[3] - var47.x4[3]; /* 3: splitlw */ { orc_union32 _src; - _src.i = var55.i; - var56.i = _src.x2[1]; - var57.i = _src.x2[0]; + _src.i = var54.i; + var55.i = _src.x2[1]; + var56.i = _src.x2[0]; } /* 4: splitwb */ { orc_union16 _src; - _src.i = var57.i; - var58 = _src.x2[1]; - var59 = _src.x2[0]; + _src.i = var56.i; + var57 = _src.x2[1]; + var58 = _src.x2[0]; } /* 5: splitwb */ { orc_union16 _src; - _src.i = var56.i; - var60 = _src.x2[1]; - var61 = _src.x2[0]; + _src.i = var55.i; + var59 = _src.x2[1]; + var60 = _src.x2[0]; } /* 6: splatbw */ - var62.i = ((var58 & 0xff) << 8) | (var58 & 0xff); + var61.i = ((var57 & 0xff) << 8) | (var57 & 0xff); /* 7: splatbw */ - var63.i = ((var61 & 0xff) << 8) | (var61 & 0xff); + var62.i = ((var60 & 0xff) << 8) | (var60 & 0xff); /* 8: splatbw */ - var64.i = ((var60 & 0xff) << 8) | (var60 & 0xff); + var63.i = ((var59 & 0xff) << 8) | (var59 & 0xff); /* 10: mulhsw */ - var65.i = (var62.i * var48.i) >> 16; + var64.i = (var61.i * var48.i) >> 16; /* 12: mulhsw */ - var66.i = (var64.i * var49.i) >> 16; + var65.i = (var63.i * var49.i) >> 16; /* 13: addssw */ - var67.i = ORC_CLAMP_SW (var65.i + var66.i); + var66.i = ORC_CLAMP_SW (var64.i + var65.i); /* 15: mulhsw */ - var68.i = (var63.i * var50.i) >> 16; + var67.i = (var62.i * var50.i) >> 16; /* 16: addssw */ - var69.i = ORC_CLAMP_SW (var65.i + var68.i); + var68.i = ORC_CLAMP_SW (var64.i + var67.i); /* 18: mulhsw */ - var70.i = (var63.i * var51.i) >> 16; + var69.i = (var62.i * var51.i) >> 16; /* 19: addssw */ - var71.i = ORC_CLAMP_SW (var65.i + var70.i); + var70.i = ORC_CLAMP_SW (var64.i + var69.i); /* 21: mulhsw */ - var72.i = (var64.i * var52.i) >> 16; + var71.i = (var63.i * var52.i) >> 16; /* 22: addssw */ - var73.i = ORC_CLAMP_SW (var71.i + var72.i); + var72.i = ORC_CLAMP_SW (var70.i + var71.i); /* 23: convssswb */ - var74 = ORC_CLAMP_SB (var67.i); + var73 = ORC_CLAMP_SB (var66.i); /* 24: convssswb */ - var75 = ORC_CLAMP_SB (var73.i); + var74 = ORC_CLAMP_SB (var72.i); /* 25: convssswb */ - var76 = ORC_CLAMP_SB (var69.i); + var75 = ORC_CLAMP_SB (var68.i); /* 26: mergebw */ { orc_union16 _dest; - _dest.x2[0] = var74; - _dest.x2[1] = var75; - var77.i = _dest.i; + _dest.x2[0] = var73; + _dest.x2[1] = var74; + var76.i = _dest.i; } /* 27: mergebw */ { orc_union16 _dest; - _dest.x2[0] = var76; - _dest.x2[1] = var59; - var78.i = _dest.i; + _dest.x2[0] = var75; + _dest.x2[1] = var58; + var77.i = _dest.i; } /* 28: mergewl */ { orc_union32 _dest; - _dest.x2[0] = var77.i; - _dest.x2[1] = var78.i; - var79.i = _dest.i; - } - /* 30: addb */ - var54.x4[0] = var79.x4[0] + var53.x4[0]; - var54.x4[1] = var79.x4[1] + var53.x4[1]; - var54.x4[2] = var79.x4[2] + var53.x4[2]; - var54.x4[3] = var79.x4[3] + var53.x4[3]; - /* 31: storel */ - ptr0[i] = var54; + _dest.x2[0] = var76.i; + _dest.x2[1] = var77.i; + var78.i = _dest.i; + } + /* 29: addb */ + var53.x4[0] = var78.x4[0] + var47.x4[0]; + var53.x4[1] = var78.x4[1] + var47.x4[1]; + var53.x4[2] = var78.x4[2] + var47.x4[2]; + var53.x4[3] = var78.x4[3] + var47.x4[3]; + /* 30: storel */ + ptr0[i] = var53; } } @@ -8557,39 +8463,31 @@ bad_video_convert_orc_convert_I420_BGRA (guint8 * ORC_RESTRICT d1, #else orc_int8 var43; #endif -#if defined(__APPLE__) && __GNUC__ == 4 && __GNUC_MINOR__ == 2 && defined (__i386__) - volatile orc_int8 var44; -#else - orc_int8 var44; -#endif -#if defined(__APPLE__) && __GNUC__ == 4 && __GNUC_MINOR__ == 2 && defined (__i386__) - volatile orc_int8 var45; -#else - orc_int8 var45; -#endif + orc_union16 var44; + orc_union16 var45; orc_union16 var46; orc_union16 var47; orc_union16 var48; - orc_union16 var49; - orc_union16 var50; #if defined(__APPLE__) && __GNUC__ == 4 && __GNUC_MINOR__ == 2 && defined (__i386__) - volatile orc_int8 var51; + volatile orc_int8 var49; #else - orc_int8 var51; + orc_int8 var49; #endif #if defined(__APPLE__) && __GNUC__ == 4 && __GNUC_MINOR__ == 2 && defined (__i386__) - volatile orc_union32 var52; + volatile orc_union32 var50; #else - orc_union32 var52; + orc_union32 var50; #endif - orc_union32 var53; + orc_union32 var51; + orc_int8 var52; + orc_union16 var53; orc_int8 var54; - orc_union16 var55; - orc_int8 var56; + orc_int8 var55; + orc_union16 var56; orc_int8 var57; - orc_union16 var58; - orc_int8 var59; - orc_int8 var60; + orc_int8 var58; + orc_union16 var59; + orc_union16 var60; orc_union16 var61; orc_union16 var62; orc_union16 var63; @@ -8598,14 +8496,12 @@ bad_video_convert_orc_convert_I420_BGRA (guint8 * ORC_RESTRICT d1, orc_union16 var66; orc_union16 var67; orc_union16 var68; - orc_union16 var69; - orc_union16 var70; + orc_int8 var69; + orc_int8 var70; orc_int8 var71; - orc_int8 var72; - orc_int8 var73; - orc_union16 var74; - orc_union16 var75; - orc_union32 var76; + orc_union16 var72; + orc_union16 var73; + orc_union32 var74; ptr0 = (orc_union32 *) d1; ptr4 = (orc_int8 *) s1; @@ -8614,99 +8510,95 @@ bad_video_convert_orc_convert_I420_BGRA (guint8 * ORC_RESTRICT d1, /* 1: loadpb */ var43 = (int) 0x00000080; /* 128 or 6.32404e-322f */ - /* 5: loadpb */ - var44 = (int) 0x00000080; /* 128 or 6.32404e-322f */ - /* 9: loadpb */ - var45 = (int) 0x00000080; /* 128 or 6.32404e-322f */ + /* 10: loadpw */ + var44.i = p1; /* 12: loadpw */ - var46.i = p1; - /* 14: loadpw */ - var47.i = p2; - /* 17: loadpw */ - var48.i = p3; - /* 20: loadpw */ - var49.i = p4; - /* 23: loadpw */ - var50.i = p5; - /* 30: loadpb */ - var51 = (int) 0x0000007f; /* 127 or 6.27463e-322f */ - /* 33: loadpb */ - var52.x4[0] = (int) 0x00000080; /* 128 or 6.32404e-322f */ - var52.x4[1] = (int) 0x00000080; /* 128 or 6.32404e-322f */ - var52.x4[2] = (int) 0x00000080; /* 128 or 6.32404e-322f */ - var52.x4[3] = (int) 0x00000080; /* 128 or 6.32404e-322f */ + var45.i = p2; + /* 15: loadpw */ + var46.i = p3; + /* 18: loadpw */ + var47.i = p4; + /* 21: loadpw */ + var48.i = p5; + /* 28: loadpb */ + var49 = (int) 0x0000007f; /* 127 or 6.27463e-322f */ + /* 31: loadpb */ + var50.x4[0] = (int) 0x00000080; /* 128 or 6.32404e-322f */ + var50.x4[1] = (int) 0x00000080; /* 128 or 6.32404e-322f */ + var50.x4[2] = (int) 0x00000080; /* 128 or 6.32404e-322f */ + var50.x4[3] = (int) 0x00000080; /* 128 or 6.32404e-322f */ for (i = 0; i < n; i++) { /* 0: loadb */ var42 = ptr4[i]; /* 2: subb */ - var54 = var42 - var43; + var52 = var42 - var43; /* 3: splatbw */ - var55.i = ((var54 & 0xff) << 8) | (var54 & 0xff); + var53.i = ((var52 & 0xff) << 8) | (var52 & 0xff); /* 4: loadupdb */ - var56 = ptr5[i >> 1]; - /* 6: subb */ - var57 = var56 - var44; - /* 7: splatbw */ - var58.i = ((var57 & 0xff) << 8) | (var57 & 0xff); - /* 8: loadupdb */ - var59 = ptr6[i >> 1]; - /* 10: subb */ - var60 = var59 - var45; - /* 11: splatbw */ - var61.i = ((var60 & 0xff) << 8) | (var60 & 0xff); + var54 = ptr5[i >> 1]; + /* 5: subb */ + var55 = var54 - var43; + /* 6: splatbw */ + var56.i = ((var55 & 0xff) << 8) | (var55 & 0xff); + /* 7: loadupdb */ + var57 = ptr6[i >> 1]; + /* 8: subb */ + var58 = var57 - var43; + /* 9: splatbw */ + var59.i = ((var58 & 0xff) << 8) | (var58 & 0xff); + /* 11: mulhsw */ + var60.i = (var53.i * var44.i) >> 16; /* 13: mulhsw */ - var62.i = (var55.i * var46.i) >> 16; - /* 15: mulhsw */ - var63.i = (var61.i * var47.i) >> 16; - /* 16: addssw */ - var64.i = ORC_CLAMP_SW (var62.i + var63.i); - /* 18: mulhsw */ - var65.i = (var58.i * var48.i) >> 16; - /* 19: addssw */ - var66.i = ORC_CLAMP_SW (var62.i + var65.i); - /* 21: mulhsw */ - var67.i = (var58.i * var49.i) >> 16; - /* 22: addssw */ - var68.i = ORC_CLAMP_SW (var62.i + var67.i); - /* 24: mulhsw */ - var69.i = (var61.i * var50.i) >> 16; - /* 25: addssw */ - var70.i = ORC_CLAMP_SW (var68.i + var69.i); + var61.i = (var59.i * var45.i) >> 16; + /* 14: addssw */ + var62.i = ORC_CLAMP_SW (var60.i + var61.i); + /* 16: mulhsw */ + var63.i = (var56.i * var46.i) >> 16; + /* 17: addssw */ + var64.i = ORC_CLAMP_SW (var60.i + var63.i); + /* 19: mulhsw */ + var65.i = (var56.i * var47.i) >> 16; + /* 20: addssw */ + var66.i = ORC_CLAMP_SW (var60.i + var65.i); + /* 22: mulhsw */ + var67.i = (var59.i * var48.i) >> 16; + /* 23: addssw */ + var68.i = ORC_CLAMP_SW (var66.i + var67.i); + /* 24: convssswb */ + var69 = ORC_CLAMP_SB (var62.i); + /* 25: convssswb */ + var70 = ORC_CLAMP_SB (var68.i); /* 26: convssswb */ var71 = ORC_CLAMP_SB (var64.i); - /* 27: convssswb */ - var72 = ORC_CLAMP_SB (var70.i); - /* 28: convssswb */ - var73 = ORC_CLAMP_SB (var66.i); - /* 29: mergebw */ + /* 27: mergebw */ { orc_union16 _dest; - _dest.x2[0] = var73; - _dest.x2[1] = var72; - var74.i = _dest.i; + _dest.x2[0] = var71; + _dest.x2[1] = var70; + var72.i = _dest.i; } - /* 31: mergebw */ + /* 29: mergebw */ { orc_union16 _dest; - _dest.x2[0] = var71; - _dest.x2[1] = var51; - var75.i = _dest.i; + _dest.x2[0] = var69; + _dest.x2[1] = var49; + var73.i = _dest.i; } - /* 32: mergewl */ + /* 30: mergewl */ { orc_union32 _dest; - _dest.x2[0] = var74.i; - _dest.x2[1] = var75.i; - var76.i = _dest.i; - } - /* 34: addb */ - var53.x4[0] = var76.x4[0] + var52.x4[0]; - var53.x4[1] = var76.x4[1] + var52.x4[1]; - var53.x4[2] = var76.x4[2] + var52.x4[2]; - var53.x4[3] = var76.x4[3] + var52.x4[3]; - /* 35: storel */ - ptr0[i] = var53; + _dest.x2[0] = var72.i; + _dest.x2[1] = var73.i; + var74.i = _dest.i; + } + /* 32: addb */ + var51.x4[0] = var74.x4[0] + var50.x4[0]; + var51.x4[1] = var74.x4[1] + var50.x4[1]; + var51.x4[2] = var74.x4[2] + var50.x4[2]; + var51.x4[3] = var74.x4[3] + var50.x4[3]; + /* 33: storel */ + ptr0[i] = var51; } } @@ -8727,39 +8619,31 @@ _backup_bad_video_convert_orc_convert_I420_BGRA (OrcExecutor * ORC_RESTRICT ex) #else orc_int8 var43; #endif -#if defined(__APPLE__) && __GNUC__ == 4 && __GNUC_MINOR__ == 2 && defined (__i386__) - volatile orc_int8 var44; -#else - orc_int8 var44; -#endif -#if defined(__APPLE__) && __GNUC__ == 4 && __GNUC_MINOR__ == 2 && defined (__i386__) - volatile orc_int8 var45; -#else - orc_int8 var45; -#endif + orc_union16 var44; + orc_union16 var45; orc_union16 var46; orc_union16 var47; orc_union16 var48; - orc_union16 var49; - orc_union16 var50; #if defined(__APPLE__) && __GNUC__ == 4 && __GNUC_MINOR__ == 2 && defined (__i386__) - volatile orc_int8 var51; + volatile orc_int8 var49; #else - orc_int8 var51; + orc_int8 var49; #endif #if defined(__APPLE__) && __GNUC__ == 4 && __GNUC_MINOR__ == 2 && defined (__i386__) - volatile orc_union32 var52; + volatile orc_union32 var50; #else - orc_union32 var52; + orc_union32 var50; #endif - orc_union32 var53; + orc_union32 var51; + orc_int8 var52; + orc_union16 var53; orc_int8 var54; - orc_union16 var55; - orc_int8 var56; + orc_int8 var55; + orc_union16 var56; orc_int8 var57; - orc_union16 var58; - orc_int8 var59; - orc_int8 var60; + orc_int8 var58; + orc_union16 var59; + orc_union16 var60; orc_union16 var61; orc_union16 var62; orc_union16 var63; @@ -8768,14 +8652,12 @@ _backup_bad_video_convert_orc_convert_I420_BGRA (OrcExecutor * ORC_RESTRICT ex) orc_union16 var66; orc_union16 var67; orc_union16 var68; - orc_union16 var69; - orc_union16 var70; + orc_int8 var69; + orc_int8 var70; orc_int8 var71; - orc_int8 var72; - orc_int8 var73; - orc_union16 var74; - orc_union16 var75; - orc_union32 var76; + orc_union16 var72; + orc_union16 var73; + orc_union32 var74; ptr0 = (orc_union32 *) ex->arrays[0]; ptr4 = (orc_int8 *) ex->arrays[4]; @@ -8784,99 +8666,95 @@ _backup_bad_video_convert_orc_convert_I420_BGRA (OrcExecutor * ORC_RESTRICT ex) /* 1: loadpb */ var43 = (int) 0x00000080; /* 128 or 6.32404e-322f */ - /* 5: loadpb */ - var44 = (int) 0x00000080; /* 128 or 6.32404e-322f */ - /* 9: loadpb */ - var45 = (int) 0x00000080; /* 128 or 6.32404e-322f */ + /* 10: loadpw */ + var44.i = ex->params[24]; /* 12: loadpw */ - var46.i = ex->params[24]; - /* 14: loadpw */ - var47.i = ex->params[25]; - /* 17: loadpw */ - var48.i = ex->params[26]; - /* 20: loadpw */ - var49.i = ex->params[27]; - /* 23: loadpw */ - var50.i = ex->params[28]; - /* 30: loadpb */ - var51 = (int) 0x0000007f; /* 127 or 6.27463e-322f */ - /* 33: loadpb */ - var52.x4[0] = (int) 0x00000080; /* 128 or 6.32404e-322f */ - var52.x4[1] = (int) 0x00000080; /* 128 or 6.32404e-322f */ - var52.x4[2] = (int) 0x00000080; /* 128 or 6.32404e-322f */ - var52.x4[3] = (int) 0x00000080; /* 128 or 6.32404e-322f */ + var45.i = ex->params[25]; + /* 15: loadpw */ + var46.i = ex->params[26]; + /* 18: loadpw */ + var47.i = ex->params[27]; + /* 21: loadpw */ + var48.i = ex->params[28]; + /* 28: loadpb */ + var49 = (int) 0x0000007f; /* 127 or 6.27463e-322f */ + /* 31: loadpb */ + var50.x4[0] = (int) 0x00000080; /* 128 or 6.32404e-322f */ + var50.x4[1] = (int) 0x00000080; /* 128 or 6.32404e-322f */ + var50.x4[2] = (int) 0x00000080; /* 128 or 6.32404e-322f */ + var50.x4[3] = (int) 0x00000080; /* 128 or 6.32404e-322f */ for (i = 0; i < n; i++) { /* 0: loadb */ var42 = ptr4[i]; /* 2: subb */ - var54 = var42 - var43; + var52 = var42 - var43; /* 3: splatbw */ - var55.i = ((var54 & 0xff) << 8) | (var54 & 0xff); + var53.i = ((var52 & 0xff) << 8) | (var52 & 0xff); /* 4: loadupdb */ - var56 = ptr5[i >> 1]; - /* 6: subb */ - var57 = var56 - var44; - /* 7: splatbw */ - var58.i = ((var57 & 0xff) << 8) | (var57 & 0xff); - /* 8: loadupdb */ - var59 = ptr6[i >> 1]; - /* 10: subb */ - var60 = var59 - var45; - /* 11: splatbw */ - var61.i = ((var60 & 0xff) << 8) | (var60 & 0xff); + var54 = ptr5[i >> 1]; + /* 5: subb */ + var55 = var54 - var43; + /* 6: splatbw */ + var56.i = ((var55 & 0xff) << 8) | (var55 & 0xff); + /* 7: loadupdb */ + var57 = ptr6[i >> 1]; + /* 8: subb */ + var58 = var57 - var43; + /* 9: splatbw */ + var59.i = ((var58 & 0xff) << 8) | (var58 & 0xff); + /* 11: mulhsw */ + var60.i = (var53.i * var44.i) >> 16; /* 13: mulhsw */ - var62.i = (var55.i * var46.i) >> 16; - /* 15: mulhsw */ - var63.i = (var61.i * var47.i) >> 16; - /* 16: addssw */ - var64.i = ORC_CLAMP_SW (var62.i + var63.i); - /* 18: mulhsw */ - var65.i = (var58.i * var48.i) >> 16; - /* 19: addssw */ - var66.i = ORC_CLAMP_SW (var62.i + var65.i); - /* 21: mulhsw */ - var67.i = (var58.i * var49.i) >> 16; - /* 22: addssw */ - var68.i = ORC_CLAMP_SW (var62.i + var67.i); - /* 24: mulhsw */ - var69.i = (var61.i * var50.i) >> 16; - /* 25: addssw */ - var70.i = ORC_CLAMP_SW (var68.i + var69.i); + var61.i = (var59.i * var45.i) >> 16; + /* 14: addssw */ + var62.i = ORC_CLAMP_SW (var60.i + var61.i); + /* 16: mulhsw */ + var63.i = (var56.i * var46.i) >> 16; + /* 17: addssw */ + var64.i = ORC_CLAMP_SW (var60.i + var63.i); + /* 19: mulhsw */ + var65.i = (var56.i * var47.i) >> 16; + /* 20: addssw */ + var66.i = ORC_CLAMP_SW (var60.i + var65.i); + /* 22: mulhsw */ + var67.i = (var59.i * var48.i) >> 16; + /* 23: addssw */ + var68.i = ORC_CLAMP_SW (var66.i + var67.i); + /* 24: convssswb */ + var69 = ORC_CLAMP_SB (var62.i); + /* 25: convssswb */ + var70 = ORC_CLAMP_SB (var68.i); /* 26: convssswb */ var71 = ORC_CLAMP_SB (var64.i); - /* 27: convssswb */ - var72 = ORC_CLAMP_SB (var70.i); - /* 28: convssswb */ - var73 = ORC_CLAMP_SB (var66.i); - /* 29: mergebw */ + /* 27: mergebw */ { orc_union16 _dest; - _dest.x2[0] = var73; - _dest.x2[1] = var72; - var74.i = _dest.i; + _dest.x2[0] = var71; + _dest.x2[1] = var70; + var72.i = _dest.i; } - /* 31: mergebw */ + /* 29: mergebw */ { orc_union16 _dest; - _dest.x2[0] = var71; - _dest.x2[1] = var51; - var75.i = _dest.i; + _dest.x2[0] = var69; + _dest.x2[1] = var49; + var73.i = _dest.i; } - /* 32: mergewl */ + /* 30: mergewl */ { orc_union32 _dest; - _dest.x2[0] = var74.i; - _dest.x2[1] = var75.i; - var76.i = _dest.i; - } - /* 34: addb */ - var53.x4[0] = var76.x4[0] + var52.x4[0]; - var53.x4[1] = var76.x4[1] + var52.x4[1]; - var53.x4[2] = var76.x4[2] + var52.x4[2]; - var53.x4[3] = var76.x4[3] + var52.x4[3]; - /* 35: storel */ - ptr0[i] = var53; + _dest.x2[0] = var72.i; + _dest.x2[1] = var73.i; + var74.i = _dest.i; + } + /* 32: addb */ + var51.x4[0] = var74.x4[0] + var50.x4[0]; + var51.x4[1] = var74.x4[1] + var50.x4[1]; + var51.x4[2] = var74.x4[2] + var50.x4[2]; + var51.x4[3] = var74.x4[3] + var50.x4[3]; + /* 33: storel */ + ptr0[i] = var51; } } @@ -8903,7 +8781,7 @@ bad_video_convert_orc_convert_I420_BGRA (guint8 * ORC_RESTRICT d1, 118, 101, 114, 116, 95, 111, 114, 99, 95, 99, 111, 110, 118, 101, 114, 116, 95, 73, 52, 50, 48, 95, 66, 71, 82, 65, 11, 4, 4, 12, 1, 1, - 12, 1, 1, 12, 1, 1, 14, 1, 128, 0, 0, 0, 14, 4, 127, 0, + 12, 1, 1, 12, 1, 1, 14, 1, 128, 0, 0, 0, 14, 1, 127, 0, 0, 0, 16, 2, 16, 2, 16, 2, 16, 2, 16, 2, 20, 2, 20, 2, 20, 2, 20, 2, 20, 2, 20, 2, 20, 1, 20, 1, 20, 1, 20, 4, 65, 38, 4, 16, 151, 32, 38, 45, 38, 5, 65, 38, 38, 16, 151, 33, @@ -8926,7 +8804,7 @@ bad_video_convert_orc_convert_I420_BGRA (guint8 * ORC_RESTRICT d1, orc_program_add_source (p, 1, "s2"); orc_program_add_source (p, 1, "s3"); orc_program_add_constant (p, 1, 0x00000080, "c1"); - orc_program_add_constant (p, 4, 0x0000007f, "c2"); + orc_program_add_constant (p, 1, 0x0000007f, "c2"); orc_program_add_parameter (p, 2, "p1"); orc_program_add_parameter (p, 2, "p2"); orc_program_add_parameter (p, 2, "p3"); diff --git a/gst-plugins-bad.doap b/gst-plugins-bad.doap index f7ec8a69d1..a764e61c4f 100644 --- a/gst-plugins-bad.doap +++ b/gst-plugins-bad.doap @@ -35,6 +35,16 @@ real live maintainer, or some actual wide use. <release> <Version> + <revision>1.4.5</revision> + <branch>1.4</branch> + <name></name> + <created>2014-12-18</created> + <file-release rdf:resource="http://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-1.4.5.tar.xz" /> + </Version> + </release> + + <release> + <Version> <revision>1.4.4</revision> <branch>1.4</branch> <name></name> diff --git a/gst/audiomixer/gstaudiomixerorc-dist.c b/gst/audiomixer/gstaudiomixerorc-dist.c index 092a464beb..be377f7054 100644 --- a/gst/audiomixer/gstaudiomixerorc-dist.c +++ b/gst/audiomixer/gstaudiomixerorc-dist.c @@ -1120,16 +1120,11 @@ audiomixer_orc_volume_u8 (guint8 * ORC_RESTRICT d1, int p1, int n) orc_int8 var35; #endif orc_int8 var36; -#if defined(__APPLE__) && __GNUC__ == 4 && __GNUC_MINOR__ == 2 && defined (__i386__) - volatile orc_int8 var37; -#else orc_int8 var37; -#endif orc_int8 var38; - orc_int8 var39; + orc_union16 var39; orc_union16 var40; - orc_union16 var41; - orc_int8 var42; + orc_int8 var41; ptr0 = (orc_int8 *) d1; @@ -1137,24 +1132,22 @@ audiomixer_orc_volume_u8 (guint8 * ORC_RESTRICT d1, int p1, int n) var35 = (int) 0x00000080; /* 128 or 6.32404e-322f */ /* 3: loadpb */ var36 = p1; - /* 7: loadpb */ - var37 = (int) 0x00000080; /* 128 or 6.32404e-322f */ for (i = 0; i < n; i++) { /* 0: loadb */ var34 = ptr0[i]; /* 2: xorb */ - var39 = var34 ^ var35; + var38 = var34 ^ var35; /* 4: mulsbw */ - var40.i = var39 * var36; + var39.i = var38 * var36; /* 5: shrsw */ - var41.i = var40.i >> 3; + var40.i = var39.i >> 3; /* 6: convssswb */ - var42 = ORC_CLAMP_SB (var41.i); - /* 8: xorb */ - var38 = var42 ^ var37; - /* 9: storeb */ - ptr0[i] = var38; + var41 = ORC_CLAMP_SB (var40.i); + /* 7: xorb */ + var37 = var41 ^ var35; + /* 8: storeb */ + ptr0[i] = var37; } } @@ -1173,16 +1166,11 @@ _backup_audiomixer_orc_volume_u8 (OrcExecutor * ORC_RESTRICT ex) orc_int8 var35; #endif orc_int8 var36; -#if defined(__APPLE__) && __GNUC__ == 4 && __GNUC_MINOR__ == 2 && defined (__i386__) - volatile orc_int8 var37; -#else orc_int8 var37; -#endif orc_int8 var38; - orc_int8 var39; + orc_union16 var39; orc_union16 var40; - orc_union16 var41; - orc_int8 var42; + orc_int8 var41; ptr0 = (orc_int8 *) ex->arrays[0]; @@ -1190,24 +1178,22 @@ _backup_audiomixer_orc_volume_u8 (OrcExecutor * ORC_RESTRICT ex) var35 = (int) 0x00000080; /* 128 or 6.32404e-322f */ /* 3: loadpb */ var36 = ex->params[24]; - /* 7: loadpb */ - var37 = (int) 0x00000080; /* 128 or 6.32404e-322f */ for (i = 0; i < n; i++) { /* 0: loadb */ var34 = ptr0[i]; /* 2: xorb */ - var39 = var34 ^ var35; + var38 = var34 ^ var35; /* 4: mulsbw */ - var40.i = var39 * var36; + var39.i = var38 * var36; /* 5: shrsw */ - var41.i = var40.i >> 3; + var40.i = var39.i >> 3; /* 6: convssswb */ - var42 = ORC_CLAMP_SB (var41.i); - /* 8: xorb */ - var38 = var42 ^ var37; - /* 9: storeb */ - ptr0[i] = var38; + var41 = ORC_CLAMP_SB (var40.i); + /* 7: xorb */ + var37 = var41 ^ var35; + /* 8: storeb */ + ptr0[i] = var37; } } @@ -1229,7 +1215,7 @@ audiomixer_orc_volume_u8 (guint8 * ORC_RESTRICT d1, int p1, int n) static const orc_uint8 bc[] = { 1, 9, 24, 97, 117, 100, 105, 111, 109, 105, 120, 101, 114, 95, 111, 114, 99, 95, 118, 111, 108, 117, 109, 101, 95, 117, 56, 11, 1, 1, 14, 1, - 128, 0, 0, 0, 14, 4, 3, 0, 0, 0, 16, 1, 20, 2, 20, 1, + 128, 0, 0, 0, 14, 2, 3, 0, 0, 0, 16, 1, 20, 2, 20, 1, 68, 33, 0, 16, 174, 32, 33, 24, 94, 32, 32, 17, 159, 33, 32, 68, 0, 33, 16, 2, 0, }; @@ -1241,7 +1227,7 @@ audiomixer_orc_volume_u8 (guint8 * ORC_RESTRICT d1, int p1, int n) orc_program_set_backup_function (p, _backup_audiomixer_orc_volume_u8); orc_program_add_destination (p, 1, "d1"); orc_program_add_constant (p, 1, 0x00000080, "c1"); - orc_program_add_constant (p, 4, 0x00000003, "c2"); + orc_program_add_constant (p, 2, 0x00000003, "c2"); orc_program_add_parameter (p, 1, "p1"); orc_program_add_temporary (p, 2, "t1"); orc_program_add_temporary (p, 1, "t2"); @@ -1294,18 +1280,13 @@ audiomixer_orc_add_volume_u8 (guint8 * ORC_RESTRICT d1, orc_int8 var35; #endif orc_int8 var36; -#if defined(__APPLE__) && __GNUC__ == 4 && __GNUC_MINOR__ == 2 && defined (__i386__) - volatile orc_int8 var37; -#else orc_int8 var37; -#endif orc_int8 var38; orc_int8 var39; - orc_int8 var40; + orc_union16 var40; orc_union16 var41; - orc_union16 var42; + orc_int8 var42; orc_int8 var43; - orc_int8 var44; ptr0 = (orc_int8 *) d1; ptr4 = (orc_int8 *) s1; @@ -1314,28 +1295,26 @@ audiomixer_orc_add_volume_u8 (guint8 * ORC_RESTRICT d1, var35 = (int) 0x00000080; /* 128 or 6.32404e-322f */ /* 3: loadpb */ var36 = p1; - /* 7: loadpb */ - var37 = (int) 0x00000080; /* 128 or 6.32404e-322f */ for (i = 0; i < n; i++) { /* 0: loadb */ var34 = ptr4[i]; /* 2: xorb */ - var40 = var34 ^ var35; + var39 = var34 ^ var35; /* 4: mulsbw */ - var41.i = var40 * var36; + var40.i = var39 * var36; /* 5: shrsw */ - var42.i = var41.i >> 3; + var41.i = var40.i >> 3; /* 6: convssswb */ - var43 = ORC_CLAMP_SB (var42.i); - /* 8: xorb */ - var44 = var43 ^ var37; - /* 9: loadb */ - var38 = ptr0[i]; - /* 10: addusb */ - var39 = ORC_CLAMP_UB ((orc_uint8) var38 + (orc_uint8) var44); - /* 11: storeb */ - ptr0[i] = var39; + var42 = ORC_CLAMP_SB (var41.i); + /* 7: xorb */ + var43 = var42 ^ var35; + /* 8: loadb */ + var37 = ptr0[i]; + /* 9: addusb */ + var38 = ORC_CLAMP_UB ((orc_uint8) var37 + (orc_uint8) var43); + /* 10: storeb */ + ptr0[i] = var38; } } @@ -1355,18 +1334,13 @@ _backup_audiomixer_orc_add_volume_u8 (OrcExecutor * ORC_RESTRICT ex) orc_int8 var35; #endif orc_int8 var36; -#if defined(__APPLE__) && __GNUC__ == 4 && __GNUC_MINOR__ == 2 && defined (__i386__) - volatile orc_int8 var37; -#else orc_int8 var37; -#endif orc_int8 var38; orc_int8 var39; - orc_int8 var40; + orc_union16 var40; orc_union16 var41; - orc_union16 var42; + orc_int8 var42; orc_int8 var43; - orc_int8 var44; ptr0 = (orc_int8 *) ex->arrays[0]; ptr4 = (orc_int8 *) ex->arrays[4]; @@ -1375,28 +1349,26 @@ _backup_audiomixer_orc_add_volume_u8 (OrcExecutor * ORC_RESTRICT ex) var35 = (int) 0x00000080; /* 128 or 6.32404e-322f */ /* 3: loadpb */ var36 = ex->params[24]; - /* 7: loadpb */ - var37 = (int) 0x00000080; /* 128 or 6.32404e-322f */ for (i = 0; i < n; i++) { /* 0: loadb */ var34 = ptr4[i]; /* 2: xorb */ - var40 = var34 ^ var35; + var39 = var34 ^ var35; /* 4: mulsbw */ - var41.i = var40 * var36; + var40.i = var39 * var36; /* 5: shrsw */ - var42.i = var41.i >> 3; + var41.i = var40.i >> 3; /* 6: convssswb */ - var43 = ORC_CLAMP_SB (var42.i); - /* 8: xorb */ - var44 = var43 ^ var37; - /* 9: loadb */ - var38 = ptr0[i]; - /* 10: addusb */ - var39 = ORC_CLAMP_UB ((orc_uint8) var38 + (orc_uint8) var44); - /* 11: storeb */ - ptr0[i] = var39; + var42 = ORC_CLAMP_SB (var41.i); + /* 7: xorb */ + var43 = var42 ^ var35; + /* 8: loadb */ + var37 = ptr0[i]; + /* 9: addusb */ + var38 = ORC_CLAMP_UB ((orc_uint8) var37 + (orc_uint8) var43); + /* 10: storeb */ + ptr0[i] = var38; } } @@ -1419,7 +1391,7 @@ audiomixer_orc_add_volume_u8 (guint8 * ORC_RESTRICT d1, static const orc_uint8 bc[] = { 1, 9, 28, 97, 117, 100, 105, 111, 109, 105, 120, 101, 114, 95, 111, 114, 99, 95, 97, 100, 100, 95, 118, 111, 108, 117, 109, 101, 95, 117, 56, 11, - 1, 1, 12, 1, 1, 14, 1, 128, 0, 0, 0, 14, 4, 3, 0, 0, + 1, 1, 12, 1, 1, 14, 1, 128, 0, 0, 0, 14, 2, 3, 0, 0, 0, 16, 1, 20, 2, 20, 1, 68, 33, 4, 16, 174, 32, 33, 24, 94, 32, 32, 17, 159, 33, 32, 68, 33, 33, 16, 35, 0, 0, 33, 2, 0, @@ -1433,7 +1405,7 @@ audiomixer_orc_add_volume_u8 (guint8 * ORC_RESTRICT d1, orc_program_add_destination (p, 1, "d1"); orc_program_add_source (p, 1, "s1"); orc_program_add_constant (p, 1, 0x00000080, "c1"); - orc_program_add_constant (p, 4, 0x00000003, "c2"); + orc_program_add_constant (p, 2, 0x00000003, "c2"); orc_program_add_parameter (p, 1, "p1"); orc_program_add_temporary (p, 2, "t1"); orc_program_add_temporary (p, 1, "t2"); @@ -1574,7 +1546,7 @@ audiomixer_orc_add_volume_s8 (gint8 * ORC_RESTRICT d1, static const orc_uint8 bc[] = { 1, 9, 28, 97, 117, 100, 105, 111, 109, 105, 120, 101, 114, 95, 111, 114, 99, 95, 97, 100, 100, 95, 118, 111, 108, 117, 109, 101, 95, 115, 56, 11, - 1, 1, 12, 1, 1, 14, 4, 3, 0, 0, 0, 16, 1, 20, 2, 20, + 1, 1, 12, 1, 1, 14, 2, 3, 0, 0, 0, 16, 1, 20, 2, 20, 1, 174, 32, 4, 24, 94, 32, 32, 16, 159, 33, 32, 34, 0, 0, 33, 2, 0, }; @@ -1586,7 +1558,7 @@ audiomixer_orc_add_volume_s8 (gint8 * ORC_RESTRICT d1, orc_program_set_backup_function (p, _backup_audiomixer_orc_add_volume_s8); orc_program_add_destination (p, 1, "d1"); orc_program_add_source (p, 1, "s1"); - orc_program_add_constant (p, 4, 0x00000003, "c1"); + orc_program_add_constant (p, 2, 0x00000003, "c1"); orc_program_add_parameter (p, 1, "p1"); orc_program_add_temporary (p, 2, "t1"); orc_program_add_temporary (p, 1, "t2"); @@ -1638,18 +1610,13 @@ audiomixer_orc_add_volume_u16 (guint16 * ORC_RESTRICT d1, orc_union16 var35; #endif orc_union16 var36; -#if defined(__APPLE__) && __GNUC__ == 4 && __GNUC_MINOR__ == 2 && defined (__i386__) - volatile orc_union16 var37; -#else orc_union16 var37; -#endif orc_union16 var38; orc_union16 var39; - orc_union16 var40; + orc_union32 var40; orc_union32 var41; - orc_union32 var42; + orc_union16 var42; orc_union16 var43; - orc_union16 var44; ptr0 = (orc_union16 *) d1; ptr4 = (orc_union16 *) s1; @@ -1658,28 +1625,26 @@ audiomixer_orc_add_volume_u16 (guint16 * ORC_RESTRICT d1, var35.i = (int) 0x00008000; /* 32768 or 1.61895e-319f */ /* 3: loadpw */ var36.i = p1; - /* 7: loadpw */ - var37.i = (int) 0x00008000; /* 32768 or 1.61895e-319f */ for (i = 0; i < n; i++) { /* 0: loadw */ var34 = ptr4[i]; /* 2: xorw */ - var40.i = var34.i ^ var35.i; + var39.i = var34.i ^ var35.i; /* 4: mulswl */ - var41.i = var40.i * var36.i; + var40.i = var39.i * var36.i; /* 5: shrsl */ - var42.i = var41.i >> 11; + var41.i = var40.i >> 11; /* 6: convssslw */ - var43.i = ORC_CLAMP_SW (var42.i); - /* 8: xorw */ - var44.i = var43.i ^ var37.i; - /* 9: loadw */ - var38 = ptr0[i]; - /* 10: addusw */ - var39.i = ORC_CLAMP_UW ((orc_uint16) var38.i + (orc_uint16) var44.i); - /* 11: storew */ - ptr0[i] = var39; + var42.i = ORC_CLAMP_SW (var41.i); + /* 7: xorw */ + var43.i = var42.i ^ var35.i; + /* 8: loadw */ + var37 = ptr0[i]; + /* 9: addusw */ + var38.i = ORC_CLAMP_UW ((orc_uint16) var37.i + (orc_uint16) var43.i); + /* 10: storew */ + ptr0[i] = var38; } } @@ -1699,18 +1664,13 @@ _backup_audiomixer_orc_add_volume_u16 (OrcExecutor * ORC_RESTRICT ex) orc_union16 var35; #endif orc_union16 var36; -#if defined(__APPLE__) && __GNUC__ == 4 && __GNUC_MINOR__ == 2 && defined (__i386__) - volatile orc_union16 var37; -#else orc_union16 var37; -#endif orc_union16 var38; orc_union16 var39; - orc_union16 var40; + orc_union32 var40; orc_union32 var41; - orc_union32 var42; + orc_union16 var42; orc_union16 var43; - orc_union16 var44; ptr0 = (orc_union16 *) ex->arrays[0]; ptr4 = (orc_union16 *) ex->arrays[4]; @@ -1719,28 +1679,26 @@ _backup_audiomixer_orc_add_volume_u16 (OrcExecutor * ORC_RESTRICT ex) var35.i = (int) 0x00008000; /* 32768 or 1.61895e-319f */ /* 3: loadpw */ var36.i = ex->params[24]; - /* 7: loadpw */ - var37.i = (int) 0x00008000; /* 32768 or 1.61895e-319f */ for (i = 0; i < n; i++) { /* 0: loadw */ var34 = ptr4[i]; /* 2: xorw */ - var40.i = var34.i ^ var35.i; + var39.i = var34.i ^ var35.i; /* 4: mulswl */ - var41.i = var40.i * var36.i; + var40.i = var39.i * var36.i; /* 5: shrsl */ - var42.i = var41.i >> 11; + var41.i = var40.i >> 11; /* 6: convssslw */ - var43.i = ORC_CLAMP_SW (var42.i); - /* 8: xorw */ - var44.i = var43.i ^ var37.i; - /* 9: loadw */ - var38 = ptr0[i]; - /* 10: addusw */ - var39.i = ORC_CLAMP_UW ((orc_uint16) var38.i + (orc_uint16) var44.i); - /* 11: storew */ - ptr0[i] = var39; + var42.i = ORC_CLAMP_SW (var41.i); + /* 7: xorw */ + var43.i = var42.i ^ var35.i; + /* 8: loadw */ + var37 = ptr0[i]; + /* 9: addusw */ + var38.i = ORC_CLAMP_UW ((orc_uint16) var37.i + (orc_uint16) var43.i); + /* 10: storew */ + ptr0[i] = var38; } } @@ -1986,18 +1944,13 @@ audiomixer_orc_add_volume_u32 (guint32 * ORC_RESTRICT d1, orc_union32 var35; #endif orc_union32 var36; -#if defined(__APPLE__) && __GNUC__ == 4 && __GNUC_MINOR__ == 2 && defined (__i386__) - volatile orc_union32 var37; -#else orc_union32 var37; -#endif orc_union32 var38; orc_union32 var39; - orc_union32 var40; + orc_union64 var40; orc_union64 var41; - orc_union64 var42; + orc_union32 var42; orc_union32 var43; - orc_union32 var44; ptr0 = (orc_union32 *) d1; ptr4 = (orc_union32 *) s1; @@ -2006,30 +1959,28 @@ audiomixer_orc_add_volume_u32 (guint32 * ORC_RESTRICT d1, var35.i = (int) 0x80000000; /* -2147483648 or 1.061e-314f */ /* 3: loadpl */ var36.i = p1; - /* 7: loadpl */ - var37.i = (int) 0x80000000; /* -2147483648 or 1.061e-314f */ for (i = 0; i < n; i++) { /* 0: loadl */ var34 = ptr4[i]; /* 2: xorl */ - var40.i = var34.i ^ var35.i; + var39.i = var34.i ^ var35.i; /* 4: mulslq */ - var41.i = ((orc_int64) var40.i) * ((orc_int64) var36.i); + var40.i = ((orc_int64) var39.i) * ((orc_int64) var36.i); /* 5: shrsq */ - var42.i = var41.i >> 27; + var41.i = var40.i >> 27; /* 6: convsssql */ - var43.i = ORC_CLAMP_SL (var42.i); - /* 8: xorl */ - var44.i = var43.i ^ var37.i; - /* 9: loadl */ - var38 = ptr0[i]; - /* 10: addusl */ - var39.i = - ORC_CLAMP_UL ((orc_int64) (orc_uint32) var38.i + - (orc_int64) (orc_uint32) var44.i); - /* 11: storel */ - ptr0[i] = var39; + var42.i = ORC_CLAMP_SL (var41.i); + /* 7: xorl */ + var43.i = var42.i ^ var35.i; + /* 8: loadl */ + var37 = ptr0[i]; + /* 9: addusl */ + var38.i = + ORC_CLAMP_UL ((orc_int64) (orc_uint32) var37.i + + (orc_int64) (orc_uint32) var43.i); + /* 10: storel */ + ptr0[i] = var38; } } @@ -2049,18 +2000,13 @@ _backup_audiomixer_orc_add_volume_u32 (OrcExecutor * ORC_RESTRICT ex) orc_union32 var35; #endif orc_union32 var36; -#if defined(__APPLE__) && __GNUC__ == 4 && __GNUC_MINOR__ == 2 && defined (__i386__) - volatile orc_union32 var37; -#else orc_union32 var37; -#endif orc_union32 var38; orc_union32 var39; - orc_union32 var40; + orc_union64 var40; orc_union64 var41; - orc_union64 var42; + orc_union32 var42; orc_union32 var43; - orc_union32 var44; ptr0 = (orc_union32 *) ex->arrays[0]; ptr4 = (orc_union32 *) ex->arrays[4]; @@ -2069,30 +2015,28 @@ _backup_audiomixer_orc_add_volume_u32 (OrcExecutor * ORC_RESTRICT ex) var35.i = (int) 0x80000000; /* -2147483648 or 1.061e-314f */ /* 3: loadpl */ var36.i = ex->params[24]; - /* 7: loadpl */ - var37.i = (int) 0x80000000; /* -2147483648 or 1.061e-314f */ for (i = 0; i < n; i++) { /* 0: loadl */ var34 = ptr4[i]; /* 2: xorl */ - var40.i = var34.i ^ var35.i; + var39.i = var34.i ^ var35.i; /* 4: mulslq */ - var41.i = ((orc_int64) var40.i) * ((orc_int64) var36.i); + var40.i = ((orc_int64) var39.i) * ((orc_int64) var36.i); /* 5: shrsq */ - var42.i = var41.i >> 27; + var41.i = var40.i >> 27; /* 6: convsssql */ - var43.i = ORC_CLAMP_SL (var42.i); - /* 8: xorl */ - var44.i = var43.i ^ var37.i; - /* 9: loadl */ - var38 = ptr0[i]; - /* 10: addusl */ - var39.i = - ORC_CLAMP_UL ((orc_int64) (orc_uint32) var38.i + - (orc_int64) (orc_uint32) var44.i); - /* 11: storel */ - ptr0[i] = var39; + var42.i = ORC_CLAMP_SL (var41.i); + /* 7: xorl */ + var43.i = var42.i ^ var35.i; + /* 8: loadl */ + var37 = ptr0[i]; + /* 9: addusl */ + var38.i = + ORC_CLAMP_UL ((orc_int64) (orc_uint32) var37.i + + (orc_int64) (orc_uint32) var43.i); + /* 10: storel */ + ptr0[i] = var38; } } @@ -2115,10 +2059,10 @@ audiomixer_orc_add_volume_u32 (guint32 * ORC_RESTRICT d1, static const orc_uint8 bc[] = { 1, 9, 29, 97, 117, 100, 105, 111, 109, 105, 120, 101, 114, 95, 111, 114, 99, 95, 97, 100, 100, 95, 118, 111, 108, 117, 109, 101, 95, 117, 51, 50, - 11, 4, 4, 12, 4, 4, 14, 4, 0, 0, 0, 128, 14, 4, 27, 0, - 0, 0, 16, 4, 20, 8, 20, 4, 132, 33, 4, 16, 178, 32, 33, 24, - 147, 32, 32, 17, 170, 33, 32, 132, 33, 33, 16, 105, 0, 0, 33, 2, - 0, + 11, 4, 4, 12, 4, 4, 14, 4, 0, 0, 0, 128, 15, 8, 27, 0, + 0, 0, 0, 0, 0, 0, 16, 4, 20, 8, 20, 4, 132, 33, 4, 16, + 178, 32, 33, 24, 147, 32, 32, 17, 170, 33, 32, 132, 33, 33, 16, 105, + 0, 0, 33, 2, 0, }; p = orc_program_new_from_static_bytecode (bc); orc_program_set_backup_function (p, @@ -2131,7 +2075,7 @@ audiomixer_orc_add_volume_u32 (guint32 * ORC_RESTRICT d1, orc_program_add_destination (p, 4, "d1"); orc_program_add_source (p, 4, "s1"); orc_program_add_constant (p, 4, 0x80000000, "c1"); - orc_program_add_constant (p, 4, 0x0000001b, "c2"); + orc_program_add_constant_int64 (p, 8, 0x000000000000001bULL, "c2"); orc_program_add_parameter (p, 4, "p1"); orc_program_add_temporary (p, 8, "t1"); orc_program_add_temporary (p, 4, "t2"); @@ -2272,9 +2216,9 @@ audiomixer_orc_add_volume_s32 (gint32 * ORC_RESTRICT d1, static const orc_uint8 bc[] = { 1, 9, 29, 97, 117, 100, 105, 111, 109, 105, 120, 101, 114, 95, 111, 114, 99, 95, 97, 100, 100, 95, 118, 111, 108, 117, 109, 101, 95, 115, 51, 50, - 11, 4, 4, 12, 4, 4, 14, 4, 27, 0, 0, 0, 16, 4, 20, 8, - 20, 4, 178, 32, 4, 24, 147, 32, 32, 16, 170, 33, 32, 104, 0, 0, - 33, 2, 0, + 11, 4, 4, 12, 4, 4, 15, 8, 27, 0, 0, 0, 0, 0, 0, 0, + 16, 4, 20, 8, 20, 4, 178, 32, 4, 24, 147, 32, 32, 16, 170, 33, + 32, 104, 0, 0, 33, 2, 0, }; p = orc_program_new_from_static_bytecode (bc); orc_program_set_backup_function (p, @@ -2286,7 +2230,7 @@ audiomixer_orc_add_volume_s32 (gint32 * ORC_RESTRICT d1, _backup_audiomixer_orc_add_volume_s32); orc_program_add_destination (p, 4, "d1"); orc_program_add_source (p, 4, "s1"); - orc_program_add_constant (p, 4, 0x0000001b, "c1"); + orc_program_add_constant_int64 (p, 8, 0x000000000000001bULL, "c1"); orc_program_add_parameter (p, 4, "p1"); orc_program_add_temporary (p, 8, "t1"); orc_program_add_temporary (p, 4, "t2"); @@ -2651,8 +2595,8 @@ audiomixer_orc_add_volume_f64 (double *ORC_RESTRICT d1, { orc_union64 tmp; tmp.f = p1; - ex->params[ORC_VAR_P1] = tmp.x2[0]; - ex->params[ORC_VAR_T1] = tmp.x2[1]; + ex->params[ORC_VAR_P1] = ((orc_uint64) tmp.i) & 0xffffffff; + ex->params[ORC_VAR_T1] = ((orc_uint64) tmp.i) >> 32; } func = c->exec; diff --git a/gst/bayer/gstbayerorc-dist.c b/gst/bayer/gstbayerorc-dist.c index 1dc708de18..c9afb6a83f 100644 --- a/gst/bayer/gstbayerorc-dist.c +++ b/gst/bayer/gstbayerorc-dist.c @@ -667,21 +667,16 @@ bayer_orc_merge_bg_bgra (guint8 * ORC_RESTRICT d1, orc_union16 var43; #endif orc_union16 var44; -#if defined(__APPLE__) && __GNUC__ == 4 && __GNUC_MINOR__ == 2 && defined (__i386__) - volatile orc_union16 var45; -#else - orc_union16 var45; -#endif - orc_union64 var46; + orc_union64 var45; + orc_union16 var46; orc_union16 var47; orc_union16 var48; orc_union16 var49; orc_union16 var50; orc_union16 var51; orc_union16 var52; - orc_union16 var53; + orc_union32 var53; orc_union32 var54; - orc_union32 var55; ptr0 = (orc_union64 *) d1; ptr4 = (orc_union16 *) s1; @@ -695,9 +690,6 @@ bayer_orc_merge_bg_bgra (guint8 * ORC_RESTRICT d1, var42.i = (int) 0x000000ff; /* 255 or 1.25987e-321f */ /* 11: loadpw */ var43.i = (int) 0x0000ff00; /* 65280 or 3.22526e-319f */ - /* 16: loadpb */ - var45.x2[0] = (int) 0x000000ff; /* 255 or 1.25987e-321f */ - var45.x2[1] = (int) 0x000000ff; /* 255 or 1.25987e-321f */ for (i = 0; i < n; i++) { /* 0: loadw */ @@ -705,71 +697,71 @@ bayer_orc_merge_bg_bgra (guint8 * ORC_RESTRICT d1, /* 1: loadw */ var38 = ptr9[i]; /* 2: avgub */ - var47.x2[0] = ((orc_uint8) var37.x2[0] + (orc_uint8) var38.x2[0] + 1) >> 1; - var47.x2[1] = ((orc_uint8) var37.x2[1] + (orc_uint8) var38.x2[1] + 1) >> 1; + var46.x2[0] = ((orc_uint8) var37.x2[0] + (orc_uint8) var38.x2[0] + 1) >> 1; + var46.x2[1] = ((orc_uint8) var37.x2[1] + (orc_uint8) var38.x2[1] + 1) >> 1; /* 3: loadw */ var39 = ptr4[i]; /* 4: loadw */ var40 = ptr8[i]; /* 5: avgub */ - var48.x2[0] = ((orc_uint8) var39.x2[0] + (orc_uint8) var40.x2[0] + 1) >> 1; - var48.x2[1] = ((orc_uint8) var39.x2[1] + (orc_uint8) var40.x2[1] + 1) >> 1; + var47.x2[0] = ((orc_uint8) var39.x2[0] + (orc_uint8) var40.x2[0] + 1) >> 1; + var47.x2[1] = ((orc_uint8) var39.x2[1] + (orc_uint8) var40.x2[1] + 1) >> 1; /* 6: loadw */ var41 = ptr7[i]; /* 7: copyw */ - var49.i = var41.i; + var48.i = var41.i; /* 8: avgub */ - var50.x2[0] = ((orc_uint8) var48.x2[0] + (orc_uint8) var49.x2[0] + 1) >> 1; - var50.x2[1] = ((orc_uint8) var48.x2[1] + (orc_uint8) var49.x2[1] + 1) >> 1; + var49.x2[0] = ((orc_uint8) var47.x2[0] + (orc_uint8) var48.x2[0] + 1) >> 1; + var49.x2[1] = ((orc_uint8) var47.x2[1] + (orc_uint8) var48.x2[1] + 1) >> 1; /* 10: andw */ - var51.i = var50.i & var42.i; + var50.i = var49.i & var42.i; /* 12: andw */ - var52.i = var49.i & var43.i; + var51.i = var48.i & var43.i; /* 13: orw */ - var53.i = var52.i | var51.i; + var52.i = var51.i | var50.i; /* 14: loadw */ var44 = ptr6[i]; /* 15: mergebw */ { orc_union16 _dest; _dest.x2[0] = var44.x2[0]; - _dest.x2[1] = var53.x2[0]; - var54.x2[0] = _dest.i; + _dest.x2[1] = var52.x2[0]; + var53.x2[0] = _dest.i; } { orc_union16 _dest; _dest.x2[0] = var44.x2[1]; - _dest.x2[1] = var53.x2[1]; - var54.x2[1] = _dest.i; + _dest.x2[1] = var52.x2[1]; + var53.x2[1] = _dest.i; } - /* 17: mergebw */ + /* 16: mergebw */ { orc_union16 _dest; - _dest.x2[0] = var47.x2[0]; - _dest.x2[1] = var45.x2[0]; - var55.x2[0] = _dest.i; + _dest.x2[0] = var46.x2[0]; + _dest.x2[1] = var42.x2[0]; + var54.x2[0] = _dest.i; } { orc_union16 _dest; - _dest.x2[0] = var47.x2[1]; - _dest.x2[1] = var45.x2[1]; - var55.x2[1] = _dest.i; + _dest.x2[0] = var46.x2[1]; + _dest.x2[1] = var42.x2[1]; + var54.x2[1] = _dest.i; } - /* 18: mergewl */ + /* 17: mergewl */ { orc_union32 _dest; - _dest.x2[0] = var54.x2[0]; - _dest.x2[1] = var55.x2[0]; - var46.x2[0] = _dest.i; + _dest.x2[0] = var53.x2[0]; + _dest.x2[1] = var54.x2[0]; + var45.x2[0] = _dest.i; } { orc_union32 _dest; - _dest.x2[0] = var54.x2[1]; - _dest.x2[1] = var55.x2[1]; - var46.x2[1] = _dest.i; + _dest.x2[0] = var53.x2[1]; + _dest.x2[1] = var54.x2[1]; + var45.x2[1] = _dest.i; } - /* 19: storeq */ - ptr0[i] = var46; + /* 18: storeq */ + ptr0[i] = var45; } } @@ -803,21 +795,16 @@ _backup_bayer_orc_merge_bg_bgra (OrcExecutor * ORC_RESTRICT ex) orc_union16 var43; #endif orc_union16 var44; -#if defined(__APPLE__) && __GNUC__ == 4 && __GNUC_MINOR__ == 2 && defined (__i386__) - volatile orc_union16 var45; -#else - orc_union16 var45; -#endif - orc_union64 var46; + orc_union64 var45; + orc_union16 var46; orc_union16 var47; orc_union16 var48; orc_union16 var49; orc_union16 var50; orc_union16 var51; orc_union16 var52; - orc_union16 var53; + orc_union32 var53; orc_union32 var54; - orc_union32 var55; ptr0 = (orc_union64 *) ex->arrays[0]; ptr4 = (orc_union16 *) ex->arrays[4]; @@ -831,9 +818,6 @@ _backup_bayer_orc_merge_bg_bgra (OrcExecutor * ORC_RESTRICT ex) var42.i = (int) 0x000000ff; /* 255 or 1.25987e-321f */ /* 11: loadpw */ var43.i = (int) 0x0000ff00; /* 65280 or 3.22526e-319f */ - /* 16: loadpb */ - var45.x2[0] = (int) 0x000000ff; /* 255 or 1.25987e-321f */ - var45.x2[1] = (int) 0x000000ff; /* 255 or 1.25987e-321f */ for (i = 0; i < n; i++) { /* 0: loadw */ @@ -841,71 +825,71 @@ _backup_bayer_orc_merge_bg_bgra (OrcExecutor * ORC_RESTRICT ex) /* 1: loadw */ var38 = ptr9[i]; /* 2: avgub */ - var47.x2[0] = ((orc_uint8) var37.x2[0] + (orc_uint8) var38.x2[0] + 1) >> 1; - var47.x2[1] = ((orc_uint8) var37.x2[1] + (orc_uint8) var38.x2[1] + 1) >> 1; + var46.x2[0] = ((orc_uint8) var37.x2[0] + (orc_uint8) var38.x2[0] + 1) >> 1; + var46.x2[1] = ((orc_uint8) var37.x2[1] + (orc_uint8) var38.x2[1] + 1) >> 1; /* 3: loadw */ var39 = ptr4[i]; /* 4: loadw */ var40 = ptr8[i]; /* 5: avgub */ - var48.x2[0] = ((orc_uint8) var39.x2[0] + (orc_uint8) var40.x2[0] + 1) >> 1; - var48.x2[1] = ((orc_uint8) var39.x2[1] + (orc_uint8) var40.x2[1] + 1) >> 1; + var47.x2[0] = ((orc_uint8) var39.x2[0] + (orc_uint8) var40.x2[0] + 1) >> 1; + var47.x2[1] = ((orc_uint8) var39.x2[1] + (orc_uint8) var40.x2[1] + 1) >> 1; /* 6: loadw */ var41 = ptr7[i]; /* 7: copyw */ - var49.i = var41.i; + var48.i = var41.i; /* 8: avgub */ - var50.x2[0] = ((orc_uint8) var48.x2[0] + (orc_uint8) var49.x2[0] + 1) >> 1; - var50.x2[1] = ((orc_uint8) var48.x2[1] + (orc_uint8) var49.x2[1] + 1) >> 1; + var49.x2[0] = ((orc_uint8) var47.x2[0] + (orc_uint8) var48.x2[0] + 1) >> 1; + var49.x2[1] = ((orc_uint8) var47.x2[1] + (orc_uint8) var48.x2[1] + 1) >> 1; /* 10: andw */ - var51.i = var50.i & var42.i; + var50.i = var49.i & var42.i; /* 12: andw */ - var52.i = var49.i & var43.i; + var51.i = var48.i & var43.i; /* 13: orw */ - var53.i = var52.i | var51.i; + var52.i = var51.i | var50.i; /* 14: loadw */ var44 = ptr6[i]; /* 15: mergebw */ { orc_union16 _dest; _dest.x2[0] = var44.x2[0]; - _dest.x2[1] = var53.x2[0]; - var54.x2[0] = _dest.i; + _dest.x2[1] = var52.x2[0]; + var53.x2[0] = _dest.i; } { orc_union16 _dest; _dest.x2[0] = var44.x2[1]; - _dest.x2[1] = var53.x2[1]; - var54.x2[1] = _dest.i; + _dest.x2[1] = var52.x2[1]; + var53.x2[1] = _dest.i; } - /* 17: mergebw */ + /* 16: mergebw */ { orc_union16 _dest; - _dest.x2[0] = var47.x2[0]; - _dest.x2[1] = var45.x2[0]; - var55.x2[0] = _dest.i; + _dest.x2[0] = var46.x2[0]; + _dest.x2[1] = var42.x2[0]; + var54.x2[0] = _dest.i; } { orc_union16 _dest; - _dest.x2[0] = var47.x2[1]; - _dest.x2[1] = var45.x2[1]; - var55.x2[1] = _dest.i; + _dest.x2[0] = var46.x2[1]; + _dest.x2[1] = var42.x2[1]; + var54.x2[1] = _dest.i; } - /* 18: mergewl */ + /* 17: mergewl */ { orc_union32 _dest; - _dest.x2[0] = var54.x2[0]; - _dest.x2[1] = var55.x2[0]; - var46.x2[0] = _dest.i; + _dest.x2[0] = var53.x2[0]; + _dest.x2[1] = var54.x2[0]; + var45.x2[0] = _dest.i; } { orc_union32 _dest; - _dest.x2[0] = var54.x2[1]; - _dest.x2[1] = var55.x2[1]; - var46.x2[1] = _dest.i; + _dest.x2[0] = var53.x2[1]; + _dest.x2[1] = var54.x2[1]; + var45.x2[1] = _dest.i; } - /* 19: storeq */ - ptr0[i] = var46; + /* 18: storeq */ + ptr0[i] = var45; } } @@ -931,7 +915,7 @@ bayer_orc_merge_bg_bgra (guint8 * ORC_RESTRICT d1, 1, 9, 23, 98, 97, 121, 101, 114, 95, 111, 114, 99, 95, 109, 101, 114, 103, 101, 95, 98, 103, 95, 98, 103, 114, 97, 11, 8, 8, 12, 2, 2, 12, 2, 2, 12, 2, 2, 12, 2, 2, 12, 2, 2, 12, 2, 2, 14, - 4, 255, 0, 0, 0, 14, 4, 0, 255, 0, 0, 20, 4, 20, 4, 20, + 2, 255, 0, 0, 0, 14, 2, 0, 255, 0, 0, 20, 4, 20, 4, 20, 2, 20, 2, 20, 2, 21, 1, 39, 34, 5, 9, 21, 1, 39, 35, 4, 8, 79, 36, 7, 21, 1, 39, 35, 35, 36, 73, 35, 35, 16, 73, 36, 36, 17, 92, 35, 36, 35, 21, 1, 196, 33, 6, 35, 21, 1, 196, 32, @@ -950,8 +934,8 @@ bayer_orc_merge_bg_bgra (guint8 * ORC_RESTRICT d1, orc_program_add_source (p, 2, "s4"); orc_program_add_source (p, 2, "s5"); orc_program_add_source (p, 2, "s6"); - orc_program_add_constant (p, 4, 0x000000ff, "c1"); - orc_program_add_constant (p, 4, 0x0000ff00, "c2"); + orc_program_add_constant (p, 2, 0x000000ff, "c1"); + orc_program_add_constant (p, 2, 0x0000ff00, "c2"); orc_program_add_temporary (p, 4, "t1"); orc_program_add_temporary (p, 4, "t2"); orc_program_add_temporary (p, 2, "t3"); @@ -1037,21 +1021,16 @@ bayer_orc_merge_gr_bgra (guint8 * ORC_RESTRICT d1, orc_union16 var43; #endif orc_union16 var44; -#if defined(__APPLE__) && __GNUC__ == 4 && __GNUC_MINOR__ == 2 && defined (__i386__) - volatile orc_union16 var45; -#else - orc_union16 var45; -#endif - orc_union64 var46; + orc_union64 var45; + orc_union16 var46; orc_union16 var47; orc_union16 var48; orc_union16 var49; orc_union16 var50; orc_union16 var51; orc_union16 var52; - orc_union16 var53; + orc_union32 var53; orc_union32 var54; - orc_union32 var55; ptr0 = (orc_union64 *) d1; ptr4 = (orc_union16 *) s1; @@ -1065,9 +1044,6 @@ bayer_orc_merge_gr_bgra (guint8 * ORC_RESTRICT d1, var42.i = (int) 0x0000ff00; /* 65280 or 3.22526e-319f */ /* 11: loadpw */ var43.i = (int) 0x000000ff; /* 255 or 1.25987e-321f */ - /* 16: loadpb */ - var45.x2[0] = (int) 0x000000ff; /* 255 or 1.25987e-321f */ - var45.x2[1] = (int) 0x000000ff; /* 255 or 1.25987e-321f */ for (i = 0; i < n; i++) { /* 0: loadw */ @@ -1075,71 +1051,71 @@ bayer_orc_merge_gr_bgra (guint8 * ORC_RESTRICT d1, /* 1: loadw */ var38 = ptr8[i]; /* 2: avgub */ - var47.x2[0] = ((orc_uint8) var37.x2[0] + (orc_uint8) var38.x2[0] + 1) >> 1; - var47.x2[1] = ((orc_uint8) var37.x2[1] + (orc_uint8) var38.x2[1] + 1) >> 1; + var46.x2[0] = ((orc_uint8) var37.x2[0] + (orc_uint8) var38.x2[0] + 1) >> 1; + var46.x2[1] = ((orc_uint8) var37.x2[1] + (orc_uint8) var38.x2[1] + 1) >> 1; /* 3: loadw */ var39 = ptr5[i]; /* 4: loadw */ var40 = ptr9[i]; /* 5: avgub */ - var48.x2[0] = ((orc_uint8) var39.x2[0] + (orc_uint8) var40.x2[0] + 1) >> 1; - var48.x2[1] = ((orc_uint8) var39.x2[1] + (orc_uint8) var40.x2[1] + 1) >> 1; + var47.x2[0] = ((orc_uint8) var39.x2[0] + (orc_uint8) var40.x2[0] + 1) >> 1; + var47.x2[1] = ((orc_uint8) var39.x2[1] + (orc_uint8) var40.x2[1] + 1) >> 1; /* 6: loadw */ var41 = ptr6[i]; /* 7: copyw */ - var49.i = var41.i; + var48.i = var41.i; /* 8: avgub */ - var50.x2[0] = ((orc_uint8) var48.x2[0] + (orc_uint8) var49.x2[0] + 1) >> 1; - var50.x2[1] = ((orc_uint8) var48.x2[1] + (orc_uint8) var49.x2[1] + 1) >> 1; + var49.x2[0] = ((orc_uint8) var47.x2[0] + (orc_uint8) var48.x2[0] + 1) >> 1; + var49.x2[1] = ((orc_uint8) var47.x2[1] + (orc_uint8) var48.x2[1] + 1) >> 1; /* 10: andw */ - var51.i = var50.i & var42.i; + var50.i = var49.i & var42.i; /* 12: andw */ - var52.i = var49.i & var43.i; + var51.i = var48.i & var43.i; /* 13: orw */ - var53.i = var52.i | var51.i; + var52.i = var51.i | var50.i; /* 14: mergebw */ { orc_union16 _dest; - _dest.x2[0] = var47.x2[0]; - _dest.x2[1] = var53.x2[0]; - var54.x2[0] = _dest.i; + _dest.x2[0] = var46.x2[0]; + _dest.x2[1] = var52.x2[0]; + var53.x2[0] = _dest.i; } { orc_union16 _dest; - _dest.x2[0] = var47.x2[1]; - _dest.x2[1] = var53.x2[1]; - var54.x2[1] = _dest.i; + _dest.x2[0] = var46.x2[1]; + _dest.x2[1] = var52.x2[1]; + var53.x2[1] = _dest.i; } /* 15: loadw */ var44 = ptr7[i]; - /* 17: mergebw */ + /* 16: mergebw */ { orc_union16 _dest; _dest.x2[0] = var44.x2[0]; - _dest.x2[1] = var45.x2[0]; - var55.x2[0] = _dest.i; + _dest.x2[1] = var43.x2[0]; + var54.x2[0] = _dest.i; } { orc_union16 _dest; _dest.x2[0] = var44.x2[1]; - _dest.x2[1] = var45.x2[1]; - var55.x2[1] = _dest.i; + _dest.x2[1] = var43.x2[1]; + var54.x2[1] = _dest.i; } - /* 18: mergewl */ + /* 17: mergewl */ { orc_union32 _dest; - _dest.x2[0] = var54.x2[0]; - _dest.x2[1] = var55.x2[0]; - var46.x2[0] = _dest.i; + _dest.x2[0] = var53.x2[0]; + _dest.x2[1] = var54.x2[0]; + var45.x2[0] = _dest.i; } { orc_union32 _dest; - _dest.x2[0] = var54.x2[1]; - _dest.x2[1] = var55.x2[1]; - var46.x2[1] = _dest.i; + _dest.x2[0] = var53.x2[1]; + _dest.x2[1] = var54.x2[1]; + var45.x2[1] = _dest.i; } - /* 19: storeq */ - ptr0[i] = var46; + /* 18: storeq */ + ptr0[i] = var45; } } @@ -1173,21 +1149,16 @@ _backup_bayer_orc_merge_gr_bgra (OrcExecutor * ORC_RESTRICT ex) orc_union16 var43; #endif orc_union16 var44; -#if defined(__APPLE__) && __GNUC__ == 4 && __GNUC_MINOR__ == 2 && defined (__i386__) - volatile orc_union16 var45; -#else - orc_union16 var45; -#endif - orc_union64 var46; + orc_union64 var45; + orc_union16 var46; orc_union16 var47; orc_union16 var48; orc_union16 var49; orc_union16 var50; orc_union16 var51; orc_union16 var52; - orc_union16 var53; + orc_union32 var53; orc_union32 var54; - orc_union32 var55; ptr0 = (orc_union64 *) ex->arrays[0]; ptr4 = (orc_union16 *) ex->arrays[4]; @@ -1201,9 +1172,6 @@ _backup_bayer_orc_merge_gr_bgra (OrcExecutor * ORC_RESTRICT ex) var42.i = (int) 0x0000ff00; /* 65280 or 3.22526e-319f */ /* 11: loadpw */ var43.i = (int) 0x000000ff; /* 255 or 1.25987e-321f */ - /* 16: loadpb */ - var45.x2[0] = (int) 0x000000ff; /* 255 or 1.25987e-321f */ - var45.x2[1] = (int) 0x000000ff; /* 255 or 1.25987e-321f */ for (i = 0; i < n; i++) { /* 0: loadw */ @@ -1211,71 +1179,71 @@ _backup_bayer_orc_merge_gr_bgra (OrcExecutor * ORC_RESTRICT ex) /* 1: loadw */ var38 = ptr8[i]; /* 2: avgub */ - var47.x2[0] = ((orc_uint8) var37.x2[0] + (orc_uint8) var38.x2[0] + 1) >> 1; - var47.x2[1] = ((orc_uint8) var37.x2[1] + (orc_uint8) var38.x2[1] + 1) >> 1; + var46.x2[0] = ((orc_uint8) var37.x2[0] + (orc_uint8) var38.x2[0] + 1) >> 1; + var46.x2[1] = ((orc_uint8) var37.x2[1] + (orc_uint8) var38.x2[1] + 1) >> 1; /* 3: loadw */ var39 = ptr5[i]; /* 4: loadw */ var40 = ptr9[i]; /* 5: avgub */ - var48.x2[0] = ((orc_uint8) var39.x2[0] + (orc_uint8) var40.x2[0] + 1) >> 1; - var48.x2[1] = ((orc_uint8) var39.x2[1] + (orc_uint8) var40.x2[1] + 1) >> 1; + var47.x2[0] = ((orc_uint8) var39.x2[0] + (orc_uint8) var40.x2[0] + 1) >> 1; + var47.x2[1] = ((orc_uint8) var39.x2[1] + (orc_uint8) var40.x2[1] + 1) >> 1; /* 6: loadw */ var41 = ptr6[i]; /* 7: copyw */ - var49.i = var41.i; + var48.i = var41.i; /* 8: avgub */ - var50.x2[0] = ((orc_uint8) var48.x2[0] + (orc_uint8) var49.x2[0] + 1) >> 1; - var50.x2[1] = ((orc_uint8) var48.x2[1] + (orc_uint8) var49.x2[1] + 1) >> 1; + var49.x2[0] = ((orc_uint8) var47.x2[0] + (orc_uint8) var48.x2[0] + 1) >> 1; + var49.x2[1] = ((orc_uint8) var47.x2[1] + (orc_uint8) var48.x2[1] + 1) >> 1; /* 10: andw */ - var51.i = var50.i & var42.i; + var50.i = var49.i & var42.i; /* 12: andw */ - var52.i = var49.i & var43.i; + var51.i = var48.i & var43.i; /* 13: orw */ - var53.i = var52.i | var51.i; + var52.i = var51.i | var50.i; /* 14: mergebw */ { orc_union16 _dest; - _dest.x2[0] = var47.x2[0]; - _dest.x2[1] = var53.x2[0]; - var54.x2[0] = _dest.i; + _dest.x2[0] = var46.x2[0]; + _dest.x2[1] = var52.x2[0]; + var53.x2[0] = _dest.i; } { orc_union16 _dest; - _dest.x2[0] = var47.x2[1]; - _dest.x2[1] = var53.x2[1]; - var54.x2[1] = _dest.i; + _dest.x2[0] = var46.x2[1]; + _dest.x2[1] = var52.x2[1]; + var53.x2[1] = _dest.i; } /* 15: loadw */ var44 = ptr7[i]; - /* 17: mergebw */ + /* 16: mergebw */ { orc_union16 _dest; _dest.x2[0] = var44.x2[0]; - _dest.x2[1] = var45.x2[0]; - var55.x2[0] = _dest.i; + _dest.x2[1] = var43.x2[0]; + var54.x2[0] = _dest.i; } { orc_union16 _dest; _dest.x2[0] = var44.x2[1]; - _dest.x2[1] = var45.x2[1]; - var55.x2[1] = _dest.i; + _dest.x2[1] = var43.x2[1]; + var54.x2[1] = _dest.i; } - /* 18: mergewl */ + /* 17: mergewl */ { orc_union32 _dest; - _dest.x2[0] = var54.x2[0]; - _dest.x2[1] = var55.x2[0]; - var46.x2[0] = _dest.i; + _dest.x2[0] = var53.x2[0]; + _dest.x2[1] = var54.x2[0]; + var45.x2[0] = _dest.i; } { orc_union32 _dest; - _dest.x2[0] = var54.x2[1]; - _dest.x2[1] = var55.x2[1]; - var46.x2[1] = _dest.i; + _dest.x2[0] = var53.x2[1]; + _dest.x2[1] = var54.x2[1]; + var45.x2[1] = _dest.i; } - /* 19: storeq */ - ptr0[i] = var46; + /* 18: storeq */ + ptr0[i] = var45; } } @@ -1301,7 +1269,7 @@ bayer_orc_merge_gr_bgra (guint8 * ORC_RESTRICT d1, 1, 9, 23, 98, 97, 121, 101, 114, 95, 111, 114, 99, 95, 109, 101, 114, 103, 101, 95, 103, 114, 95, 98, 103, 114, 97, 11, 8, 8, 12, 2, 2, 12, 2, 2, 12, 2, 2, 12, 2, 2, 12, 2, 2, 12, 2, 2, 14, - 4, 0, 255, 0, 0, 14, 4, 255, 0, 0, 0, 20, 4, 20, 4, 20, + 2, 0, 255, 0, 0, 14, 2, 255, 0, 0, 0, 20, 4, 20, 4, 20, 2, 20, 2, 20, 2, 21, 1, 39, 34, 4, 8, 21, 1, 39, 35, 5, 9, 79, 36, 6, 21, 1, 39, 35, 35, 36, 73, 35, 35, 16, 73, 36, 36, 17, 92, 35, 36, 35, 21, 1, 196, 33, 34, 35, 21, 1, 196, 32, @@ -1320,8 +1288,8 @@ bayer_orc_merge_gr_bgra (guint8 * ORC_RESTRICT d1, orc_program_add_source (p, 2, "s4"); orc_program_add_source (p, 2, "s5"); orc_program_add_source (p, 2, "s6"); - orc_program_add_constant (p, 4, 0x0000ff00, "c1"); - orc_program_add_constant (p, 4, 0x000000ff, "c2"); + orc_program_add_constant (p, 2, 0x0000ff00, "c1"); + orc_program_add_constant (p, 2, 0x000000ff, "c2"); orc_program_add_temporary (p, 4, "t1"); orc_program_add_temporary (p, 4, "t2"); orc_program_add_temporary (p, 2, "t3"); @@ -1406,22 +1374,17 @@ bayer_orc_merge_bg_abgr (guint8 * ORC_RESTRICT d1, #else orc_union16 var43; #endif -#if defined(__APPLE__) && __GNUC__ == 4 && __GNUC_MINOR__ == 2 && defined (__i386__) - volatile orc_union16 var44; -#else orc_union16 var44; -#endif - orc_union16 var45; - orc_union64 var46; + orc_union64 var45; + orc_union16 var46; orc_union16 var47; orc_union16 var48; orc_union16 var49; orc_union16 var50; orc_union16 var51; orc_union16 var52; - orc_union16 var53; + orc_union32 var53; orc_union32 var54; - orc_union32 var55; ptr0 = (orc_union64 *) d1; ptr4 = (orc_union16 *) s1; @@ -1435,9 +1398,6 @@ bayer_orc_merge_bg_abgr (guint8 * ORC_RESTRICT d1, var42.i = (int) 0x000000ff; /* 255 or 1.25987e-321f */ /* 11: loadpw */ var43.i = (int) 0x0000ff00; /* 65280 or 3.22526e-319f */ - /* 14: loadpb */ - var44.x2[0] = (int) 0x000000ff; /* 255 or 1.25987e-321f */ - var44.x2[1] = (int) 0x000000ff; /* 255 or 1.25987e-321f */ for (i = 0; i < n; i++) { /* 0: loadw */ @@ -1445,71 +1405,71 @@ bayer_orc_merge_bg_abgr (guint8 * ORC_RESTRICT d1, /* 1: loadw */ var38 = ptr9[i]; /* 2: avgub */ - var47.x2[0] = ((orc_uint8) var37.x2[0] + (orc_uint8) var38.x2[0] + 1) >> 1; - var47.x2[1] = ((orc_uint8) var37.x2[1] + (orc_uint8) var38.x2[1] + 1) >> 1; + var46.x2[0] = ((orc_uint8) var37.x2[0] + (orc_uint8) var38.x2[0] + 1) >> 1; + var46.x2[1] = ((orc_uint8) var37.x2[1] + (orc_uint8) var38.x2[1] + 1) >> 1; /* 3: loadw */ var39 = ptr4[i]; /* 4: loadw */ var40 = ptr8[i]; /* 5: avgub */ - var48.x2[0] = ((orc_uint8) var39.x2[0] + (orc_uint8) var40.x2[0] + 1) >> 1; - var48.x2[1] = ((orc_uint8) var39.x2[1] + (orc_uint8) var40.x2[1] + 1) >> 1; + var47.x2[0] = ((orc_uint8) var39.x2[0] + (orc_uint8) var40.x2[0] + 1) >> 1; + var47.x2[1] = ((orc_uint8) var39.x2[1] + (orc_uint8) var40.x2[1] + 1) >> 1; /* 6: loadw */ var41 = ptr7[i]; /* 7: copyw */ - var49.i = var41.i; + var48.i = var41.i; /* 8: avgub */ - var50.x2[0] = ((orc_uint8) var48.x2[0] + (orc_uint8) var49.x2[0] + 1) >> 1; - var50.x2[1] = ((orc_uint8) var48.x2[1] + (orc_uint8) var49.x2[1] + 1) >> 1; + var49.x2[0] = ((orc_uint8) var47.x2[0] + (orc_uint8) var48.x2[0] + 1) >> 1; + var49.x2[1] = ((orc_uint8) var47.x2[1] + (orc_uint8) var48.x2[1] + 1) >> 1; /* 10: andw */ - var51.i = var50.i & var42.i; + var50.i = var49.i & var42.i; /* 12: andw */ - var52.i = var49.i & var43.i; + var51.i = var48.i & var43.i; /* 13: orw */ - var53.i = var52.i | var51.i; - /* 15: loadw */ - var45 = ptr6[i]; - /* 16: mergebw */ + var52.i = var51.i | var50.i; + /* 14: loadw */ + var44 = ptr6[i]; + /* 15: mergebw */ { orc_union16 _dest; - _dest.x2[0] = var44.x2[0]; - _dest.x2[1] = var45.x2[0]; - var54.x2[0] = _dest.i; + _dest.x2[0] = var42.x2[0]; + _dest.x2[1] = var44.x2[0]; + var53.x2[0] = _dest.i; } { orc_union16 _dest; - _dest.x2[0] = var44.x2[1]; - _dest.x2[1] = var45.x2[1]; - var54.x2[1] = _dest.i; + _dest.x2[0] = var42.x2[1]; + _dest.x2[1] = var44.x2[1]; + var53.x2[1] = _dest.i; } - /* 17: mergebw */ + /* 16: mergebw */ { orc_union16 _dest; - _dest.x2[0] = var53.x2[0]; - _dest.x2[1] = var47.x2[0]; - var55.x2[0] = _dest.i; + _dest.x2[0] = var52.x2[0]; + _dest.x2[1] = var46.x2[0]; + var54.x2[0] = _dest.i; } { orc_union16 _dest; - _dest.x2[0] = var53.x2[1]; - _dest.x2[1] = var47.x2[1]; - var55.x2[1] = _dest.i; + _dest.x2[0] = var52.x2[1]; + _dest.x2[1] = var46.x2[1]; + var54.x2[1] = _dest.i; } - /* 18: mergewl */ + /* 17: mergewl */ { orc_union32 _dest; - _dest.x2[0] = var54.x2[0]; - _dest.x2[1] = var55.x2[0]; - var46.x2[0] = _dest.i; + _dest.x2[0] = var53.x2[0]; + _dest.x2[1] = var54.x2[0]; + var45.x2[0] = _dest.i; } { orc_union32 _dest; - _dest.x2[0] = var54.x2[1]; - _dest.x2[1] = var55.x2[1]; - var46.x2[1] = _dest.i; + _dest.x2[0] = var53.x2[1]; + _dest.x2[1] = var54.x2[1]; + var45.x2[1] = _dest.i; } - /* 19: storeq */ - ptr0[i] = var46; + /* 18: storeq */ + ptr0[i] = var45; } } @@ -1542,22 +1502,17 @@ _backup_bayer_orc_merge_bg_abgr (OrcExecutor * ORC_RESTRICT ex) #else orc_union16 var43; #endif -#if defined(__APPLE__) && __GNUC__ == 4 && __GNUC_MINOR__ == 2 && defined (__i386__) - volatile orc_union16 var44; -#else orc_union16 var44; -#endif - orc_union16 var45; - orc_union64 var46; + orc_union64 var45; + orc_union16 var46; orc_union16 var47; orc_union16 var48; orc_union16 var49; orc_union16 var50; orc_union16 var51; orc_union16 var52; - orc_union16 var53; + orc_union32 var53; orc_union32 var54; - orc_union32 var55; ptr0 = (orc_union64 *) ex->arrays[0]; ptr4 = (orc_union16 *) ex->arrays[4]; @@ -1571,9 +1526,6 @@ _backup_bayer_orc_merge_bg_abgr (OrcExecutor * ORC_RESTRICT ex) var42.i = (int) 0x000000ff; /* 255 or 1.25987e-321f */ /* 11: loadpw */ var43.i = (int) 0x0000ff00; /* 65280 or 3.22526e-319f */ - /* 14: loadpb */ - var44.x2[0] = (int) 0x000000ff; /* 255 or 1.25987e-321f */ - var44.x2[1] = (int) 0x000000ff; /* 255 or 1.25987e-321f */ for (i = 0; i < n; i++) { /* 0: loadw */ @@ -1581,71 +1533,71 @@ _backup_bayer_orc_merge_bg_abgr (OrcExecutor * ORC_RESTRICT ex) /* 1: loadw */ var38 = ptr9[i]; /* 2: avgub */ - var47.x2[0] = ((orc_uint8) var37.x2[0] + (orc_uint8) var38.x2[0] + 1) >> 1; - var47.x2[1] = ((orc_uint8) var37.x2[1] + (orc_uint8) var38.x2[1] + 1) >> 1; + var46.x2[0] = ((orc_uint8) var37.x2[0] + (orc_uint8) var38.x2[0] + 1) >> 1; + var46.x2[1] = ((orc_uint8) var37.x2[1] + (orc_uint8) var38.x2[1] + 1) >> 1; /* 3: loadw */ var39 = ptr4[i]; /* 4: loadw */ var40 = ptr8[i]; /* 5: avgub */ - var48.x2[0] = ((orc_uint8) var39.x2[0] + (orc_uint8) var40.x2[0] + 1) >> 1; - var48.x2[1] = ((orc_uint8) var39.x2[1] + (orc_uint8) var40.x2[1] + 1) >> 1; + var47.x2[0] = ((orc_uint8) var39.x2[0] + (orc_uint8) var40.x2[0] + 1) >> 1; + var47.x2[1] = ((orc_uint8) var39.x2[1] + (orc_uint8) var40.x2[1] + 1) >> 1; /* 6: loadw */ var41 = ptr7[i]; /* 7: copyw */ - var49.i = var41.i; + var48.i = var41.i; /* 8: avgub */ - var50.x2[0] = ((orc_uint8) var48.x2[0] + (orc_uint8) var49.x2[0] + 1) >> 1; - var50.x2[1] = ((orc_uint8) var48.x2[1] + (orc_uint8) var49.x2[1] + 1) >> 1; + var49.x2[0] = ((orc_uint8) var47.x2[0] + (orc_uint8) var48.x2[0] + 1) >> 1; + var49.x2[1] = ((orc_uint8) var47.x2[1] + (orc_uint8) var48.x2[1] + 1) >> 1; /* 10: andw */ - var51.i = var50.i & var42.i; + var50.i = var49.i & var42.i; /* 12: andw */ - var52.i = var49.i & var43.i; + var51.i = var48.i & var43.i; /* 13: orw */ - var53.i = var52.i | var51.i; - /* 15: loadw */ - var45 = ptr6[i]; - /* 16: mergebw */ + var52.i = var51.i | var50.i; + /* 14: loadw */ + var44 = ptr6[i]; + /* 15: mergebw */ { orc_union16 _dest; - _dest.x2[0] = var44.x2[0]; - _dest.x2[1] = var45.x2[0]; - var54.x2[0] = _dest.i; + _dest.x2[0] = var42.x2[0]; + _dest.x2[1] = var44.x2[0]; + var53.x2[0] = _dest.i; } { orc_union16 _dest; - _dest.x2[0] = var44.x2[1]; - _dest.x2[1] = var45.x2[1]; - var54.x2[1] = _dest.i; + _dest.x2[0] = var42.x2[1]; + _dest.x2[1] = var44.x2[1]; + var53.x2[1] = _dest.i; } - /* 17: mergebw */ + /* 16: mergebw */ { orc_union16 _dest; - _dest.x2[0] = var53.x2[0]; - _dest.x2[1] = var47.x2[0]; - var55.x2[0] = _dest.i; + _dest.x2[0] = var52.x2[0]; + _dest.x2[1] = var46.x2[0]; + var54.x2[0] = _dest.i; } { orc_union16 _dest; - _dest.x2[0] = var53.x2[1]; - _dest.x2[1] = var47.x2[1]; - var55.x2[1] = _dest.i; + _dest.x2[0] = var52.x2[1]; + _dest.x2[1] = var46.x2[1]; + var54.x2[1] = _dest.i; } - /* 18: mergewl */ + /* 17: mergewl */ { orc_union32 _dest; - _dest.x2[0] = var54.x2[0]; - _dest.x2[1] = var55.x2[0]; - var46.x2[0] = _dest.i; + _dest.x2[0] = var53.x2[0]; + _dest.x2[1] = var54.x2[0]; + var45.x2[0] = _dest.i; } { orc_union32 _dest; - _dest.x2[0] = var54.x2[1]; - _dest.x2[1] = var55.x2[1]; - var46.x2[1] = _dest.i; + _dest.x2[0] = var53.x2[1]; + _dest.x2[1] = var54.x2[1]; + var45.x2[1] = _dest.i; } - /* 19: storeq */ - ptr0[i] = var46; + /* 18: storeq */ + ptr0[i] = var45; } } @@ -1671,7 +1623,7 @@ bayer_orc_merge_bg_abgr (guint8 * ORC_RESTRICT d1, 1, 9, 23, 98, 97, 121, 101, 114, 95, 111, 114, 99, 95, 109, 101, 114, 103, 101, 95, 98, 103, 95, 97, 98, 103, 114, 11, 8, 8, 12, 2, 2, 12, 2, 2, 12, 2, 2, 12, 2, 2, 12, 2, 2, 12, 2, 2, 14, - 4, 255, 0, 0, 0, 14, 4, 0, 255, 0, 0, 20, 4, 20, 4, 20, + 2, 255, 0, 0, 0, 14, 2, 0, 255, 0, 0, 20, 4, 20, 4, 20, 2, 20, 2, 20, 2, 21, 1, 39, 34, 5, 9, 21, 1, 39, 35, 4, 8, 79, 36, 7, 21, 1, 39, 35, 35, 36, 73, 35, 35, 16, 73, 36, 36, 17, 92, 35, 36, 35, 21, 1, 196, 32, 16, 6, 21, 1, 196, 33, @@ -1690,8 +1642,8 @@ bayer_orc_merge_bg_abgr (guint8 * ORC_RESTRICT d1, orc_program_add_source (p, 2, "s4"); orc_program_add_source (p, 2, "s5"); orc_program_add_source (p, 2, "s6"); - orc_program_add_constant (p, 4, 0x000000ff, "c1"); - orc_program_add_constant (p, 4, 0x0000ff00, "c2"); + orc_program_add_constant (p, 2, 0x000000ff, "c1"); + orc_program_add_constant (p, 2, 0x0000ff00, "c2"); orc_program_add_temporary (p, 4, "t1"); orc_program_add_temporary (p, 4, "t2"); orc_program_add_temporary (p, 2, "t3"); @@ -1776,22 +1728,17 @@ bayer_orc_merge_gr_abgr (guint8 * ORC_RESTRICT d1, #else orc_union16 var43; #endif -#if defined(__APPLE__) && __GNUC__ == 4 && __GNUC_MINOR__ == 2 && defined (__i386__) - volatile orc_union16 var44; -#else orc_union16 var44; -#endif - orc_union16 var45; - orc_union64 var46; + orc_union64 var45; + orc_union16 var46; orc_union16 var47; orc_union16 var48; orc_union16 var49; orc_union16 var50; orc_union16 var51; orc_union16 var52; - orc_union16 var53; + orc_union32 var53; orc_union32 var54; - orc_union32 var55; ptr0 = (orc_union64 *) d1; ptr4 = (orc_union16 *) s1; @@ -1805,9 +1752,6 @@ bayer_orc_merge_gr_abgr (guint8 * ORC_RESTRICT d1, var42.i = (int) 0x0000ff00; /* 65280 or 3.22526e-319f */ /* 11: loadpw */ var43.i = (int) 0x000000ff; /* 255 or 1.25987e-321f */ - /* 14: loadpb */ - var44.x2[0] = (int) 0x000000ff; /* 255 or 1.25987e-321f */ - var44.x2[1] = (int) 0x000000ff; /* 255 or 1.25987e-321f */ for (i = 0; i < n; i++) { /* 0: loadw */ @@ -1815,71 +1759,71 @@ bayer_orc_merge_gr_abgr (guint8 * ORC_RESTRICT d1, /* 1: loadw */ var38 = ptr8[i]; /* 2: avgub */ - var47.x2[0] = ((orc_uint8) var37.x2[0] + (orc_uint8) var38.x2[0] + 1) >> 1; - var47.x2[1] = ((orc_uint8) var37.x2[1] + (orc_uint8) var38.x2[1] + 1) >> 1; + var46.x2[0] = ((orc_uint8) var37.x2[0] + (orc_uint8) var38.x2[0] + 1) >> 1; + var46.x2[1] = ((orc_uint8) var37.x2[1] + (orc_uint8) var38.x2[1] + 1) >> 1; /* 3: loadw */ var39 = ptr5[i]; /* 4: loadw */ var40 = ptr9[i]; /* 5: avgub */ - var48.x2[0] = ((orc_uint8) var39.x2[0] + (orc_uint8) var40.x2[0] + 1) >> 1; - var48.x2[1] = ((orc_uint8) var39.x2[1] + (orc_uint8) var40.x2[1] + 1) >> 1; + var47.x2[0] = ((orc_uint8) var39.x2[0] + (orc_uint8) var40.x2[0] + 1) >> 1; + var47.x2[1] = ((orc_uint8) var39.x2[1] + (orc_uint8) var40.x2[1] + 1) >> 1; /* 6: loadw */ var41 = ptr6[i]; /* 7: copyw */ - var49.i = var41.i; + var48.i = var41.i; /* 8: avgub */ - var50.x2[0] = ((orc_uint8) var48.x2[0] + (orc_uint8) var49.x2[0] + 1) >> 1; - var50.x2[1] = ((orc_uint8) var48.x2[1] + (orc_uint8) var49.x2[1] + 1) >> 1; + var49.x2[0] = ((orc_uint8) var47.x2[0] + (orc_uint8) var48.x2[0] + 1) >> 1; + var49.x2[1] = ((orc_uint8) var47.x2[1] + (orc_uint8) var48.x2[1] + 1) >> 1; /* 10: andw */ - var51.i = var50.i & var42.i; + var50.i = var49.i & var42.i; /* 12: andw */ - var52.i = var49.i & var43.i; + var51.i = var48.i & var43.i; /* 13: orw */ - var53.i = var52.i | var51.i; - /* 15: mergebw */ + var52.i = var51.i | var50.i; + /* 14: mergebw */ { orc_union16 _dest; - _dest.x2[0] = var44.x2[0]; - _dest.x2[1] = var47.x2[0]; - var54.x2[0] = _dest.i; + _dest.x2[0] = var43.x2[0]; + _dest.x2[1] = var46.x2[0]; + var53.x2[0] = _dest.i; } { orc_union16 _dest; - _dest.x2[0] = var44.x2[1]; - _dest.x2[1] = var47.x2[1]; - var54.x2[1] = _dest.i; + _dest.x2[0] = var43.x2[1]; + _dest.x2[1] = var46.x2[1]; + var53.x2[1] = _dest.i; } - /* 16: loadw */ - var45 = ptr7[i]; - /* 17: mergebw */ + /* 15: loadw */ + var44 = ptr7[i]; + /* 16: mergebw */ { orc_union16 _dest; - _dest.x2[0] = var53.x2[0]; - _dest.x2[1] = var45.x2[0]; - var55.x2[0] = _dest.i; + _dest.x2[0] = var52.x2[0]; + _dest.x2[1] = var44.x2[0]; + var54.x2[0] = _dest.i; } { orc_union16 _dest; - _dest.x2[0] = var53.x2[1]; - _dest.x2[1] = var45.x2[1]; - var55.x2[1] = _dest.i; + _dest.x2[0] = var52.x2[1]; + _dest.x2[1] = var44.x2[1]; + var54.x2[1] = _dest.i; } - /* 18: mergewl */ + /* 17: mergewl */ { orc_union32 _dest; - _dest.x2[0] = var54.x2[0]; - _dest.x2[1] = var55.x2[0]; - var46.x2[0] = _dest.i; + _dest.x2[0] = var53.x2[0]; + _dest.x2[1] = var54.x2[0]; + var45.x2[0] = _dest.i; } { orc_union32 _dest; - _dest.x2[0] = var54.x2[1]; - _dest.x2[1] = var55.x2[1]; - var46.x2[1] = _dest.i; + _dest.x2[0] = var53.x2[1]; + _dest.x2[1] = var54.x2[1]; + var45.x2[1] = _dest.i; } - /* 19: storeq */ - ptr0[i] = var46; + /* 18: storeq */ + ptr0[i] = var45; } } @@ -1912,22 +1856,17 @@ _backup_bayer_orc_merge_gr_abgr (OrcExecutor * ORC_RESTRICT ex) #else orc_union16 var43; #endif -#if defined(__APPLE__) && __GNUC__ == 4 && __GNUC_MINOR__ == 2 && defined (__i386__) - volatile orc_union16 var44; -#else orc_union16 var44; -#endif - orc_union16 var45; - orc_union64 var46; + orc_union64 var45; + orc_union16 var46; orc_union16 var47; orc_union16 var48; orc_union16 var49; orc_union16 var50; orc_union16 var51; orc_union16 var52; - orc_union16 var53; + orc_union32 var53; orc_union32 var54; - orc_union32 var55; ptr0 = (orc_union64 *) ex->arrays[0]; ptr4 = (orc_union16 *) ex->arrays[4]; @@ -1941,9 +1880,6 @@ _backup_bayer_orc_merge_gr_abgr (OrcExecutor * ORC_RESTRICT ex) var42.i = (int) 0x0000ff00; /* 65280 or 3.22526e-319f */ /* 11: loadpw */ var43.i = (int) 0x000000ff; /* 255 or 1.25987e-321f */ - /* 14: loadpb */ - var44.x2[0] = (int) 0x000000ff; /* 255 or 1.25987e-321f */ - var44.x2[1] = (int) 0x000000ff; /* 255 or 1.25987e-321f */ for (i = 0; i < n; i++) { /* 0: loadw */ @@ -1951,71 +1887,71 @@ _backup_bayer_orc_merge_gr_abgr (OrcExecutor * ORC_RESTRICT ex) /* 1: loadw */ var38 = ptr8[i]; /* 2: avgub */ - var47.x2[0] = ((orc_uint8) var37.x2[0] + (orc_uint8) var38.x2[0] + 1) >> 1; - var47.x2[1] = ((orc_uint8) var37.x2[1] + (orc_uint8) var38.x2[1] + 1) >> 1; + var46.x2[0] = ((orc_uint8) var37.x2[0] + (orc_uint8) var38.x2[0] + 1) >> 1; + var46.x2[1] = ((orc_uint8) var37.x2[1] + (orc_uint8) var38.x2[1] + 1) >> 1; /* 3: loadw */ var39 = ptr5[i]; /* 4: loadw */ var40 = ptr9[i]; /* 5: avgub */ - var48.x2[0] = ((orc_uint8) var39.x2[0] + (orc_uint8) var40.x2[0] + 1) >> 1; - var48.x2[1] = ((orc_uint8) var39.x2[1] + (orc_uint8) var40.x2[1] + 1) >> 1; + var47.x2[0] = ((orc_uint8) var39.x2[0] + (orc_uint8) var40.x2[0] + 1) >> 1; + var47.x2[1] = ((orc_uint8) var39.x2[1] + (orc_uint8) var40.x2[1] + 1) >> 1; /* 6: loadw */ var41 = ptr6[i]; /* 7: copyw */ - var49.i = var41.i; + var48.i = var41.i; /* 8: avgub */ - var50.x2[0] = ((orc_uint8) var48.x2[0] + (orc_uint8) var49.x2[0] + 1) >> 1; - var50.x2[1] = ((orc_uint8) var48.x2[1] + (orc_uint8) var49.x2[1] + 1) >> 1; + var49.x2[0] = ((orc_uint8) var47.x2[0] + (orc_uint8) var48.x2[0] + 1) >> 1; + var49.x2[1] = ((orc_uint8) var47.x2[1] + (orc_uint8) var48.x2[1] + 1) >> 1; /* 10: andw */ - var51.i = var50.i & var42.i; + var50.i = var49.i & var42.i; /* 12: andw */ - var52.i = var49.i & var43.i; + var51.i = var48.i & var43.i; /* 13: orw */ - var53.i = var52.i | var51.i; - /* 15: mergebw */ + var52.i = var51.i | var50.i; + /* 14: mergebw */ { orc_union16 _dest; - _dest.x2[0] = var44.x2[0]; - _dest.x2[1] = var47.x2[0]; - var54.x2[0] = _dest.i; + _dest.x2[0] = var43.x2[0]; + _dest.x2[1] = var46.x2[0]; + var53.x2[0] = _dest.i; } { orc_union16 _dest; - _dest.x2[0] = var44.x2[1]; - _dest.x2[1] = var47.x2[1]; - var54.x2[1] = _dest.i; + _dest.x2[0] = var43.x2[1]; + _dest.x2[1] = var46.x2[1]; + var53.x2[1] = _dest.i; } - /* 16: loadw */ - var45 = ptr7[i]; - /* 17: mergebw */ + /* 15: loadw */ + var44 = ptr7[i]; + /* 16: mergebw */ { orc_union16 _dest; - _dest.x2[0] = var53.x2[0]; - _dest.x2[1] = var45.x2[0]; - var55.x2[0] = _dest.i; + _dest.x2[0] = var52.x2[0]; + _dest.x2[1] = var44.x2[0]; + var54.x2[0] = _dest.i; } { orc_union16 _dest; - _dest.x2[0] = var53.x2[1]; - _dest.x2[1] = var45.x2[1]; - var55.x2[1] = _dest.i; + _dest.x2[0] = var52.x2[1]; + _dest.x2[1] = var44.x2[1]; + var54.x2[1] = _dest.i; } - /* 18: mergewl */ + /* 17: mergewl */ { orc_union32 _dest; - _dest.x2[0] = var54.x2[0]; - _dest.x2[1] = var55.x2[0]; - var46.x2[0] = _dest.i; + _dest.x2[0] = var53.x2[0]; + _dest.x2[1] = var54.x2[0]; + var45.x2[0] = _dest.i; } { orc_union32 _dest; - _dest.x2[0] = var54.x2[1]; - _dest.x2[1] = var55.x2[1]; - var46.x2[1] = _dest.i; + _dest.x2[0] = var53.x2[1]; + _dest.x2[1] = var54.x2[1]; + var45.x2[1] = _dest.i; } - /* 19: storeq */ - ptr0[i] = var46; + /* 18: storeq */ + ptr0[i] = var45; } } @@ -2041,7 +1977,7 @@ bayer_orc_merge_gr_abgr (guint8 * ORC_RESTRICT d1, 1, 9, 23, 98, 97, 121, 101, 114, 95, 111, 114, 99, 95, 109, 101, 114, 103, 101, 95, 103, 114, 95, 97, 98, 103, 114, 11, 8, 8, 12, 2, 2, 12, 2, 2, 12, 2, 2, 12, 2, 2, 12, 2, 2, 12, 2, 2, 14, - 4, 0, 255, 0, 0, 14, 4, 255, 0, 0, 0, 20, 4, 20, 4, 20, + 2, 0, 255, 0, 0, 14, 2, 255, 0, 0, 0, 20, 4, 20, 4, 20, 2, 20, 2, 20, 2, 21, 1, 39, 34, 4, 8, 21, 1, 39, 35, 5, 9, 79, 36, 6, 21, 1, 39, 35, 35, 36, 73, 35, 35, 16, 73, 36, 36, 17, 92, 35, 36, 35, 21, 1, 196, 32, 17, 34, 21, 1, 196, 33, @@ -2060,8 +1996,8 @@ bayer_orc_merge_gr_abgr (guint8 * ORC_RESTRICT d1, orc_program_add_source (p, 2, "s4"); orc_program_add_source (p, 2, "s5"); orc_program_add_source (p, 2, "s6"); - orc_program_add_constant (p, 4, 0x0000ff00, "c1"); - orc_program_add_constant (p, 4, 0x000000ff, "c2"); + orc_program_add_constant (p, 2, 0x0000ff00, "c1"); + orc_program_add_constant (p, 2, 0x000000ff, "c2"); orc_program_add_temporary (p, 4, "t1"); orc_program_add_temporary (p, 4, "t2"); orc_program_add_temporary (p, 2, "t3"); @@ -2147,21 +2083,16 @@ bayer_orc_merge_bg_rgba (guint8 * ORC_RESTRICT d1, orc_union16 var43; #endif orc_union16 var44; -#if defined(__APPLE__) && __GNUC__ == 4 && __GNUC_MINOR__ == 2 && defined (__i386__) - volatile orc_union16 var45; -#else - orc_union16 var45; -#endif - orc_union64 var46; + orc_union64 var45; + orc_union16 var46; orc_union16 var47; orc_union16 var48; orc_union16 var49; orc_union16 var50; orc_union16 var51; orc_union16 var52; - orc_union16 var53; + orc_union32 var53; orc_union32 var54; - orc_union32 var55; ptr0 = (orc_union64 *) d1; ptr4 = (orc_union16 *) s1; @@ -2175,9 +2106,6 @@ bayer_orc_merge_bg_rgba (guint8 * ORC_RESTRICT d1, var42.i = (int) 0x000000ff; /* 255 or 1.25987e-321f */ /* 11: loadpw */ var43.i = (int) 0x0000ff00; /* 65280 or 3.22526e-319f */ - /* 16: loadpb */ - var45.x2[0] = (int) 0x000000ff; /* 255 or 1.25987e-321f */ - var45.x2[1] = (int) 0x000000ff; /* 255 or 1.25987e-321f */ for (i = 0; i < n; i++) { /* 0: loadw */ @@ -2185,71 +2113,71 @@ bayer_orc_merge_bg_rgba (guint8 * ORC_RESTRICT d1, /* 1: loadw */ var38 = ptr9[i]; /* 2: avgub */ - var47.x2[0] = ((orc_uint8) var37.x2[0] + (orc_uint8) var38.x2[0] + 1) >> 1; - var47.x2[1] = ((orc_uint8) var37.x2[1] + (orc_uint8) var38.x2[1] + 1) >> 1; + var46.x2[0] = ((orc_uint8) var37.x2[0] + (orc_uint8) var38.x2[0] + 1) >> 1; + var46.x2[1] = ((orc_uint8) var37.x2[1] + (orc_uint8) var38.x2[1] + 1) >> 1; /* 3: loadw */ var39 = ptr4[i]; /* 4: loadw */ var40 = ptr8[i]; /* 5: avgub */ - var48.x2[0] = ((orc_uint8) var39.x2[0] + (orc_uint8) var40.x2[0] + 1) >> 1; - var48.x2[1] = ((orc_uint8) var39.x2[1] + (orc_uint8) var40.x2[1] + 1) >> 1; + var47.x2[0] = ((orc_uint8) var39.x2[0] + (orc_uint8) var40.x2[0] + 1) >> 1; + var47.x2[1] = ((orc_uint8) var39.x2[1] + (orc_uint8) var40.x2[1] + 1) >> 1; /* 6: loadw */ var41 = ptr7[i]; /* 7: copyw */ - var49.i = var41.i; + var48.i = var41.i; /* 8: avgub */ - var50.x2[0] = ((orc_uint8) var48.x2[0] + (orc_uint8) var49.x2[0] + 1) >> 1; - var50.x2[1] = ((orc_uint8) var48.x2[1] + (orc_uint8) var49.x2[1] + 1) >> 1; + var49.x2[0] = ((orc_uint8) var47.x2[0] + (orc_uint8) var48.x2[0] + 1) >> 1; + var49.x2[1] = ((orc_uint8) var47.x2[1] + (orc_uint8) var48.x2[1] + 1) >> 1; /* 10: andw */ - var51.i = var50.i & var42.i; + var50.i = var49.i & var42.i; /* 12: andw */ - var52.i = var49.i & var43.i; + var51.i = var48.i & var43.i; /* 13: orw */ - var53.i = var52.i | var51.i; + var52.i = var51.i | var50.i; /* 14: mergebw */ { orc_union16 _dest; - _dest.x2[0] = var47.x2[0]; - _dest.x2[1] = var53.x2[0]; - var54.x2[0] = _dest.i; + _dest.x2[0] = var46.x2[0]; + _dest.x2[1] = var52.x2[0]; + var53.x2[0] = _dest.i; } { orc_union16 _dest; - _dest.x2[0] = var47.x2[1]; - _dest.x2[1] = var53.x2[1]; - var54.x2[1] = _dest.i; + _dest.x2[0] = var46.x2[1]; + _dest.x2[1] = var52.x2[1]; + var53.x2[1] = _dest.i; } /* 15: loadw */ var44 = ptr6[i]; - /* 17: mergebw */ + /* 16: mergebw */ { orc_union16 _dest; _dest.x2[0] = var44.x2[0]; - _dest.x2[1] = var45.x2[0]; - var55.x2[0] = _dest.i; + _dest.x2[1] = var42.x2[0]; + var54.x2[0] = _dest.i; } { orc_union16 _dest; _dest.x2[0] = var44.x2[1]; - _dest.x2[1] = var45.x2[1]; - var55.x2[1] = _dest.i; + _dest.x2[1] = var42.x2[1]; + var54.x2[1] = _dest.i; } - /* 18: mergewl */ + /* 17: mergewl */ { orc_union32 _dest; - _dest.x2[0] = var54.x2[0]; - _dest.x2[1] = var55.x2[0]; - var46.x2[0] = _dest.i; + _dest.x2[0] = var53.x2[0]; + _dest.x2[1] = var54.x2[0]; + var45.x2[0] = _dest.i; } { orc_union32 _dest; - _dest.x2[0] = var54.x2[1]; - _dest.x2[1] = var55.x2[1]; - var46.x2[1] = _dest.i; + _dest.x2[0] = var53.x2[1]; + _dest.x2[1] = var54.x2[1]; + var45.x2[1] = _dest.i; } - /* 19: storeq */ - ptr0[i] = var46; + /* 18: storeq */ + ptr0[i] = var45; } } @@ -2283,21 +2211,16 @@ _backup_bayer_orc_merge_bg_rgba (OrcExecutor * ORC_RESTRICT ex) orc_union16 var43; #endif orc_union16 var44; -#if defined(__APPLE__) && __GNUC__ == 4 && __GNUC_MINOR__ == 2 && defined (__i386__) - volatile orc_union16 var45; -#else - orc_union16 var45; -#endif - orc_union64 var46; + orc_union64 var45; + orc_union16 var46; orc_union16 var47; orc_union16 var48; orc_union16 var49; orc_union16 var50; orc_union16 var51; orc_union16 var52; - orc_union16 var53; + orc_union32 var53; orc_union32 var54; - orc_union32 var55; ptr0 = (orc_union64 *) ex->arrays[0]; ptr4 = (orc_union16 *) ex->arrays[4]; @@ -2311,9 +2234,6 @@ _backup_bayer_orc_merge_bg_rgba (OrcExecutor * ORC_RESTRICT ex) var42.i = (int) 0x000000ff; /* 255 or 1.25987e-321f */ /* 11: loadpw */ var43.i = (int) 0x0000ff00; /* 65280 or 3.22526e-319f */ - /* 16: loadpb */ - var45.x2[0] = (int) 0x000000ff; /* 255 or 1.25987e-321f */ - var45.x2[1] = (int) 0x000000ff; /* 255 or 1.25987e-321f */ for (i = 0; i < n; i++) { /* 0: loadw */ @@ -2321,71 +2241,71 @@ _backup_bayer_orc_merge_bg_rgba (OrcExecutor * ORC_RESTRICT ex) /* 1: loadw */ var38 = ptr9[i]; /* 2: avgub */ - var47.x2[0] = ((orc_uint8) var37.x2[0] + (orc_uint8) var38.x2[0] + 1) >> 1; - var47.x2[1] = ((orc_uint8) var37.x2[1] + (orc_uint8) var38.x2[1] + 1) >> 1; + var46.x2[0] = ((orc_uint8) var37.x2[0] + (orc_uint8) var38.x2[0] + 1) >> 1; + var46.x2[1] = ((orc_uint8) var37.x2[1] + (orc_uint8) var38.x2[1] + 1) >> 1; /* 3: loadw */ var39 = ptr4[i]; /* 4: loadw */ var40 = ptr8[i]; /* 5: avgub */ - var48.x2[0] = ((orc_uint8) var39.x2[0] + (orc_uint8) var40.x2[0] + 1) >> 1; - var48.x2[1] = ((orc_uint8) var39.x2[1] + (orc_uint8) var40.x2[1] + 1) >> 1; + var47.x2[0] = ((orc_uint8) var39.x2[0] + (orc_uint8) var40.x2[0] + 1) >> 1; + var47.x2[1] = ((orc_uint8) var39.x2[1] + (orc_uint8) var40.x2[1] + 1) >> 1; /* 6: loadw */ var41 = ptr7[i]; /* 7: copyw */ - var49.i = var41.i; + var48.i = var41.i; /* 8: avgub */ - var50.x2[0] = ((orc_uint8) var48.x2[0] + (orc_uint8) var49.x2[0] + 1) >> 1; - var50.x2[1] = ((orc_uint8) var48.x2[1] + (orc_uint8) var49.x2[1] + 1) >> 1; + var49.x2[0] = ((orc_uint8) var47.x2[0] + (orc_uint8) var48.x2[0] + 1) >> 1; + var49.x2[1] = ((orc_uint8) var47.x2[1] + (orc_uint8) var48.x2[1] + 1) >> 1; /* 10: andw */ - var51.i = var50.i & var42.i; + var50.i = var49.i & var42.i; /* 12: andw */ - var52.i = var49.i & var43.i; + var51.i = var48.i & var43.i; /* 13: orw */ - var53.i = var52.i | var51.i; + var52.i = var51.i | var50.i; /* 14: mergebw */ { orc_union16 _dest; - _dest.x2[0] = var47.x2[0]; - _dest.x2[1] = var53.x2[0]; - var54.x2[0] = _dest.i; + _dest.x2[0] = var46.x2[0]; + _dest.x2[1] = var52.x2[0]; + var53.x2[0] = _dest.i; } { orc_union16 _dest; - _dest.x2[0] = var47.x2[1]; - _dest.x2[1] = var53.x2[1]; - var54.x2[1] = _dest.i; + _dest.x2[0] = var46.x2[1]; + _dest.x2[1] = var52.x2[1]; + var53.x2[1] = _dest.i; } /* 15: loadw */ var44 = ptr6[i]; - /* 17: mergebw */ + /* 16: mergebw */ { orc_union16 _dest; _dest.x2[0] = var44.x2[0]; - _dest.x2[1] = var45.x2[0]; - var55.x2[0] = _dest.i; + _dest.x2[1] = var42.x2[0]; + var54.x2[0] = _dest.i; } { orc_union16 _dest; _dest.x2[0] = var44.x2[1]; - _dest.x2[1] = var45.x2[1]; - var55.x2[1] = _dest.i; + _dest.x2[1] = var42.x2[1]; + var54.x2[1] = _dest.i; } - /* 18: mergewl */ + /* 17: mergewl */ { orc_union32 _dest; - _dest.x2[0] = var54.x2[0]; - _dest.x2[1] = var55.x2[0]; - var46.x2[0] = _dest.i; + _dest.x2[0] = var53.x2[0]; + _dest.x2[1] = var54.x2[0]; + var45.x2[0] = _dest.i; } { orc_union32 _dest; - _dest.x2[0] = var54.x2[1]; - _dest.x2[1] = var55.x2[1]; - var46.x2[1] = _dest.i; + _dest.x2[0] = var53.x2[1]; + _dest.x2[1] = var54.x2[1]; + var45.x2[1] = _dest.i; } - /* 19: storeq */ - ptr0[i] = var46; + /* 18: storeq */ + ptr0[i] = var45; } } @@ -2411,7 +2331,7 @@ bayer_orc_merge_bg_rgba (guint8 * ORC_RESTRICT d1, 1, 9, 23, 98, 97, 121, 101, 114, 95, 111, 114, 99, 95, 109, 101, 114, 103, 101, 95, 98, 103, 95, 114, 103, 98, 97, 11, 8, 8, 12, 2, 2, 12, 2, 2, 12, 2, 2, 12, 2, 2, 12, 2, 2, 12, 2, 2, 14, - 4, 255, 0, 0, 0, 14, 4, 0, 255, 0, 0, 20, 4, 20, 4, 20, + 2, 255, 0, 0, 0, 14, 2, 0, 255, 0, 0, 20, 4, 20, 4, 20, 2, 20, 2, 20, 2, 21, 1, 39, 34, 5, 9, 21, 1, 39, 35, 4, 8, 79, 36, 7, 21, 1, 39, 35, 35, 36, 73, 35, 35, 16, 73, 36, 36, 17, 92, 35, 36, 35, 21, 1, 196, 32, 34, 35, 21, 1, 196, 33, @@ -2430,8 +2350,8 @@ bayer_orc_merge_bg_rgba (guint8 * ORC_RESTRICT d1, orc_program_add_source (p, 2, "s4"); orc_program_add_source (p, 2, "s5"); orc_program_add_source (p, 2, "s6"); - orc_program_add_constant (p, 4, 0x000000ff, "c1"); - orc_program_add_constant (p, 4, 0x0000ff00, "c2"); + orc_program_add_constant (p, 2, 0x000000ff, "c1"); + orc_program_add_constant (p, 2, 0x0000ff00, "c2"); orc_program_add_temporary (p, 4, "t1"); orc_program_add_temporary (p, 4, "t2"); orc_program_add_temporary (p, 2, "t3"); @@ -2517,21 +2437,16 @@ bayer_orc_merge_gr_rgba (guint8 * ORC_RESTRICT d1, orc_union16 var43; #endif orc_union16 var44; -#if defined(__APPLE__) && __GNUC__ == 4 && __GNUC_MINOR__ == 2 && defined (__i386__) - volatile orc_union16 var45; -#else - orc_union16 var45; -#endif - orc_union64 var46; + orc_union64 var45; + orc_union16 var46; orc_union16 var47; orc_union16 var48; orc_union16 var49; orc_union16 var50; orc_union16 var51; orc_union16 var52; - orc_union16 var53; + orc_union32 var53; orc_union32 var54; - orc_union32 var55; ptr0 = (orc_union64 *) d1; ptr4 = (orc_union16 *) s1; @@ -2545,9 +2460,6 @@ bayer_orc_merge_gr_rgba (guint8 * ORC_RESTRICT d1, var42.i = (int) 0x0000ff00; /* 65280 or 3.22526e-319f */ /* 11: loadpw */ var43.i = (int) 0x000000ff; /* 255 or 1.25987e-321f */ - /* 16: loadpb */ - var45.x2[0] = (int) 0x000000ff; /* 255 or 1.25987e-321f */ - var45.x2[1] = (int) 0x000000ff; /* 255 or 1.25987e-321f */ for (i = 0; i < n; i++) { /* 0: loadw */ @@ -2555,71 +2467,71 @@ bayer_orc_merge_gr_rgba (guint8 * ORC_RESTRICT d1, /* 1: loadw */ var38 = ptr8[i]; /* 2: avgub */ - var47.x2[0] = ((orc_uint8) var37.x2[0] + (orc_uint8) var38.x2[0] + 1) >> 1; - var47.x2[1] = ((orc_uint8) var37.x2[1] + (orc_uint8) var38.x2[1] + 1) >> 1; + var46.x2[0] = ((orc_uint8) var37.x2[0] + (orc_uint8) var38.x2[0] + 1) >> 1; + var46.x2[1] = ((orc_uint8) var37.x2[1] + (orc_uint8) var38.x2[1] + 1) >> 1; /* 3: loadw */ var39 = ptr5[i]; /* 4: loadw */ var40 = ptr9[i]; /* 5: avgub */ - var48.x2[0] = ((orc_uint8) var39.x2[0] + (orc_uint8) var40.x2[0] + 1) >> 1; - var48.x2[1] = ((orc_uint8) var39.x2[1] + (orc_uint8) var40.x2[1] + 1) >> 1; + var47.x2[0] = ((orc_uint8) var39.x2[0] + (orc_uint8) var40.x2[0] + 1) >> 1; + var47.x2[1] = ((orc_uint8) var39.x2[1] + (orc_uint8) var40.x2[1] + 1) >> 1; /* 6: loadw */ var41 = ptr6[i]; /* 7: copyw */ - var49.i = var41.i; + var48.i = var41.i; /* 8: avgub */ - var50.x2[0] = ((orc_uint8) var48.x2[0] + (orc_uint8) var49.x2[0] + 1) >> 1; - var50.x2[1] = ((orc_uint8) var48.x2[1] + (orc_uint8) var49.x2[1] + 1) >> 1; + var49.x2[0] = ((orc_uint8) var47.x2[0] + (orc_uint8) var48.x2[0] + 1) >> 1; + var49.x2[1] = ((orc_uint8) var47.x2[1] + (orc_uint8) var48.x2[1] + 1) >> 1; /* 10: andw */ - var51.i = var50.i & var42.i; + var50.i = var49.i & var42.i; /* 12: andw */ - var52.i = var49.i & var43.i; + var51.i = var48.i & var43.i; /* 13: orw */ - var53.i = var52.i | var51.i; + var52.i = var51.i | var50.i; /* 14: loadw */ var44 = ptr7[i]; /* 15: mergebw */ { orc_union16 _dest; _dest.x2[0] = var44.x2[0]; - _dest.x2[1] = var53.x2[0]; - var54.x2[0] = _dest.i; + _dest.x2[1] = var52.x2[0]; + var53.x2[0] = _dest.i; } { orc_union16 _dest; _dest.x2[0] = var44.x2[1]; - _dest.x2[1] = var53.x2[1]; - var54.x2[1] = _dest.i; + _dest.x2[1] = var52.x2[1]; + var53.x2[1] = _dest.i; } - /* 17: mergebw */ + /* 16: mergebw */ { orc_union16 _dest; - _dest.x2[0] = var47.x2[0]; - _dest.x2[1] = var45.x2[0]; - var55.x2[0] = _dest.i; + _dest.x2[0] = var46.x2[0]; + _dest.x2[1] = var43.x2[0]; + var54.x2[0] = _dest.i; } { orc_union16 _dest; - _dest.x2[0] = var47.x2[1]; - _dest.x2[1] = var45.x2[1]; - var55.x2[1] = _dest.i; + _dest.x2[0] = var46.x2[1]; + _dest.x2[1] = var43.x2[1]; + var54.x2[1] = _dest.i; } - /* 18: mergewl */ + /* 17: mergewl */ { orc_union32 _dest; - _dest.x2[0] = var54.x2[0]; - _dest.x2[1] = var55.x2[0]; - var46.x2[0] = _dest.i; + _dest.x2[0] = var53.x2[0]; + _dest.x2[1] = var54.x2[0]; + var45.x2[0] = _dest.i; } { orc_union32 _dest; - _dest.x2[0] = var54.x2[1]; - _dest.x2[1] = var55.x2[1]; - var46.x2[1] = _dest.i; + _dest.x2[0] = var53.x2[1]; + _dest.x2[1] = var54.x2[1]; + var45.x2[1] = _dest.i; } - /* 19: storeq */ - ptr0[i] = var46; + /* 18: storeq */ + ptr0[i] = var45; } } @@ -2653,21 +2565,16 @@ _backup_bayer_orc_merge_gr_rgba (OrcExecutor * ORC_RESTRICT ex) orc_union16 var43; #endif orc_union16 var44; -#if defined(__APPLE__) && __GNUC__ == 4 && __GNUC_MINOR__ == 2 && defined (__i386__) - volatile orc_union16 var45; -#else - orc_union16 var45; -#endif - orc_union64 var46; + orc_union64 var45; + orc_union16 var46; orc_union16 var47; orc_union16 var48; orc_union16 var49; orc_union16 var50; orc_union16 var51; orc_union16 var52; - orc_union16 var53; + orc_union32 var53; orc_union32 var54; - orc_union32 var55; ptr0 = (orc_union64 *) ex->arrays[0]; ptr4 = (orc_union16 *) ex->arrays[4]; @@ -2681,9 +2588,6 @@ _backup_bayer_orc_merge_gr_rgba (OrcExecutor * ORC_RESTRICT ex) var42.i = (int) 0x0000ff00; /* 65280 or 3.22526e-319f */ /* 11: loadpw */ var43.i = (int) 0x000000ff; /* 255 or 1.25987e-321f */ - /* 16: loadpb */ - var45.x2[0] = (int) 0x000000ff; /* 255 or 1.25987e-321f */ - var45.x2[1] = (int) 0x000000ff; /* 255 or 1.25987e-321f */ for (i = 0; i < n; i++) { /* 0: loadw */ @@ -2691,71 +2595,71 @@ _backup_bayer_orc_merge_gr_rgba (OrcExecutor * ORC_RESTRICT ex) /* 1: loadw */ var38 = ptr8[i]; /* 2: avgub */ - var47.x2[0] = ((orc_uint8) var37.x2[0] + (orc_uint8) var38.x2[0] + 1) >> 1; - var47.x2[1] = ((orc_uint8) var37.x2[1] + (orc_uint8) var38.x2[1] + 1) >> 1; + var46.x2[0] = ((orc_uint8) var37.x2[0] + (orc_uint8) var38.x2[0] + 1) >> 1; + var46.x2[1] = ((orc_uint8) var37.x2[1] + (orc_uint8) var38.x2[1] + 1) >> 1; /* 3: loadw */ var39 = ptr5[i]; /* 4: loadw */ var40 = ptr9[i]; /* 5: avgub */ - var48.x2[0] = ((orc_uint8) var39.x2[0] + (orc_uint8) var40.x2[0] + 1) >> 1; - var48.x2[1] = ((orc_uint8) var39.x2[1] + (orc_uint8) var40.x2[1] + 1) >> 1; + var47.x2[0] = ((orc_uint8) var39.x2[0] + (orc_uint8) var40.x2[0] + 1) >> 1; + var47.x2[1] = ((orc_uint8) var39.x2[1] + (orc_uint8) var40.x2[1] + 1) >> 1; /* 6: loadw */ var41 = ptr6[i]; /* 7: copyw */ - var49.i = var41.i; + var48.i = var41.i; /* 8: avgub */ - var50.x2[0] = ((orc_uint8) var48.x2[0] + (orc_uint8) var49.x2[0] + 1) >> 1; - var50.x2[1] = ((orc_uint8) var48.x2[1] + (orc_uint8) var49.x2[1] + 1) >> 1; + var49.x2[0] = ((orc_uint8) var47.x2[0] + (orc_uint8) var48.x2[0] + 1) >> 1; + var49.x2[1] = ((orc_uint8) var47.x2[1] + (orc_uint8) var48.x2[1] + 1) >> 1; /* 10: andw */ - var51.i = var50.i & var42.i; + var50.i = var49.i & var42.i; /* 12: andw */ - var52.i = var49.i & var43.i; + var51.i = var48.i & var43.i; /* 13: orw */ - var53.i = var52.i | var51.i; + var52.i = var51.i | var50.i; /* 14: loadw */ var44 = ptr7[i]; /* 15: mergebw */ { orc_union16 _dest; _dest.x2[0] = var44.x2[0]; - _dest.x2[1] = var53.x2[0]; - var54.x2[0] = _dest.i; + _dest.x2[1] = var52.x2[0]; + var53.x2[0] = _dest.i; } { orc_union16 _dest; _dest.x2[0] = var44.x2[1]; - _dest.x2[1] = var53.x2[1]; - var54.x2[1] = _dest.i; + _dest.x2[1] = var52.x2[1]; + var53.x2[1] = _dest.i; } - /* 17: mergebw */ + /* 16: mergebw */ { orc_union16 _dest; - _dest.x2[0] = var47.x2[0]; - _dest.x2[1] = var45.x2[0]; - var55.x2[0] = _dest.i; + _dest.x2[0] = var46.x2[0]; + _dest.x2[1] = var43.x2[0]; + var54.x2[0] = _dest.i; } { orc_union16 _dest; - _dest.x2[0] = var47.x2[1]; - _dest.x2[1] = var45.x2[1]; - var55.x2[1] = _dest.i; + _dest.x2[0] = var46.x2[1]; + _dest.x2[1] = var43.x2[1]; + var54.x2[1] = _dest.i; } - /* 18: mergewl */ + /* 17: mergewl */ { orc_union32 _dest; - _dest.x2[0] = var54.x2[0]; - _dest.x2[1] = var55.x2[0]; - var46.x2[0] = _dest.i; + _dest.x2[0] = var53.x2[0]; + _dest.x2[1] = var54.x2[0]; + var45.x2[0] = _dest.i; } { orc_union32 _dest; - _dest.x2[0] = var54.x2[1]; - _dest.x2[1] = var55.x2[1]; - var46.x2[1] = _dest.i; + _dest.x2[0] = var53.x2[1]; + _dest.x2[1] = var54.x2[1]; + var45.x2[1] = _dest.i; } - /* 19: storeq */ - ptr0[i] = var46; + /* 18: storeq */ + ptr0[i] = var45; } } @@ -2781,7 +2685,7 @@ bayer_orc_merge_gr_rgba (guint8 * ORC_RESTRICT d1, 1, 9, 23, 98, 97, 121, 101, 114, 95, 111, 114, 99, 95, 109, 101, 114, 103, 101, 95, 103, 114, 95, 114, 103, 98, 97, 11, 8, 8, 12, 2, 2, 12, 2, 2, 12, 2, 2, 12, 2, 2, 12, 2, 2, 12, 2, 2, 14, - 4, 0, 255, 0, 0, 14, 4, 255, 0, 0, 0, 20, 4, 20, 4, 20, + 2, 0, 255, 0, 0, 14, 2, 255, 0, 0, 0, 20, 4, 20, 4, 20, 2, 20, 2, 20, 2, 21, 1, 39, 34, 4, 8, 21, 1, 39, 35, 5, 9, 79, 36, 6, 21, 1, 39, 35, 35, 36, 73, 35, 35, 16, 73, 36, 36, 17, 92, 35, 36, 35, 21, 1, 196, 32, 7, 35, 21, 1, 196, 33, @@ -2800,8 +2704,8 @@ bayer_orc_merge_gr_rgba (guint8 * ORC_RESTRICT d1, orc_program_add_source (p, 2, "s4"); orc_program_add_source (p, 2, "s5"); orc_program_add_source (p, 2, "s6"); - orc_program_add_constant (p, 4, 0x0000ff00, "c1"); - orc_program_add_constant (p, 4, 0x000000ff, "c2"); + orc_program_add_constant (p, 2, 0x0000ff00, "c1"); + orc_program_add_constant (p, 2, 0x000000ff, "c2"); orc_program_add_temporary (p, 4, "t1"); orc_program_add_temporary (p, 4, "t2"); orc_program_add_temporary (p, 2, "t3"); @@ -2886,22 +2790,17 @@ bayer_orc_merge_bg_argb (guint8 * ORC_RESTRICT d1, #else orc_union16 var43; #endif -#if defined(__APPLE__) && __GNUC__ == 4 && __GNUC_MINOR__ == 2 && defined (__i386__) - volatile orc_union16 var44; -#else orc_union16 var44; -#endif - orc_union16 var45; - orc_union64 var46; + orc_union64 var45; + orc_union16 var46; orc_union16 var47; orc_union16 var48; orc_union16 var49; orc_union16 var50; orc_union16 var51; orc_union16 var52; - orc_union16 var53; + orc_union32 var53; orc_union32 var54; - orc_union32 var55; ptr0 = (orc_union64 *) d1; ptr4 = (orc_union16 *) s1; @@ -2915,9 +2814,6 @@ bayer_orc_merge_bg_argb (guint8 * ORC_RESTRICT d1, var42.i = (int) 0x000000ff; /* 255 or 1.25987e-321f */ /* 11: loadpw */ var43.i = (int) 0x0000ff00; /* 65280 or 3.22526e-319f */ - /* 14: loadpb */ - var44.x2[0] = (int) 0x000000ff; /* 255 or 1.25987e-321f */ - var44.x2[1] = (int) 0x000000ff; /* 255 or 1.25987e-321f */ for (i = 0; i < n; i++) { /* 0: loadw */ @@ -2925,71 +2821,71 @@ bayer_orc_merge_bg_argb (guint8 * ORC_RESTRICT d1, /* 1: loadw */ var38 = ptr9[i]; /* 2: avgub */ - var47.x2[0] = ((orc_uint8) var37.x2[0] + (orc_uint8) var38.x2[0] + 1) >> 1; - var47.x2[1] = ((orc_uint8) var37.x2[1] + (orc_uint8) var38.x2[1] + 1) >> 1; + var46.x2[0] = ((orc_uint8) var37.x2[0] + (orc_uint8) var38.x2[0] + 1) >> 1; + var46.x2[1] = ((orc_uint8) var37.x2[1] + (orc_uint8) var38.x2[1] + 1) >> 1; /* 3: loadw */ var39 = ptr4[i]; /* 4: loadw */ var40 = ptr8[i]; /* 5: avgub */ - var48.x2[0] = ((orc_uint8) var39.x2[0] + (orc_uint8) var40.x2[0] + 1) >> 1; - var48.x2[1] = ((orc_uint8) var39.x2[1] + (orc_uint8) var40.x2[1] + 1) >> 1; + var47.x2[0] = ((orc_uint8) var39.x2[0] + (orc_uint8) var40.x2[0] + 1) >> 1; + var47.x2[1] = ((orc_uint8) var39.x2[1] + (orc_uint8) var40.x2[1] + 1) >> 1; /* 6: loadw */ var41 = ptr7[i]; /* 7: copyw */ - var49.i = var41.i; + var48.i = var41.i; /* 8: avgub */ - var50.x2[0] = ((orc_uint8) var48.x2[0] + (orc_uint8) var49.x2[0] + 1) >> 1; - var50.x2[1] = ((orc_uint8) var48.x2[1] + (orc_uint8) var49.x2[1] + 1) >> 1; + var49.x2[0] = ((orc_uint8) var47.x2[0] + (orc_uint8) var48.x2[0] + 1) >> 1; + var49.x2[1] = ((orc_uint8) var47.x2[1] + (orc_uint8) var48.x2[1] + 1) >> 1; /* 10: andw */ - var51.i = var50.i & var42.i; + var50.i = var49.i & var42.i; /* 12: andw */ - var52.i = var49.i & var43.i; + var51.i = var48.i & var43.i; /* 13: orw */ - var53.i = var52.i | var51.i; - /* 15: mergebw */ + var52.i = var51.i | var50.i; + /* 14: mergebw */ { orc_union16 _dest; - _dest.x2[0] = var44.x2[0]; - _dest.x2[1] = var47.x2[0]; - var54.x2[0] = _dest.i; + _dest.x2[0] = var42.x2[0]; + _dest.x2[1] = var46.x2[0]; + var53.x2[0] = _dest.i; } { orc_union16 _dest; - _dest.x2[0] = var44.x2[1]; - _dest.x2[1] = var47.x2[1]; - var54.x2[1] = _dest.i; + _dest.x2[0] = var42.x2[1]; + _dest.x2[1] = var46.x2[1]; + var53.x2[1] = _dest.i; } - /* 16: loadw */ - var45 = ptr6[i]; - /* 17: mergebw */ + /* 15: loadw */ + var44 = ptr6[i]; + /* 16: mergebw */ { orc_union16 _dest; - _dest.x2[0] = var53.x2[0]; - _dest.x2[1] = var45.x2[0]; - var55.x2[0] = _dest.i; + _dest.x2[0] = var52.x2[0]; + _dest.x2[1] = var44.x2[0]; + var54.x2[0] = _dest.i; } { orc_union16 _dest; - _dest.x2[0] = var53.x2[1]; - _dest.x2[1] = var45.x2[1]; - var55.x2[1] = _dest.i; + _dest.x2[0] = var52.x2[1]; + _dest.x2[1] = var44.x2[1]; + var54.x2[1] = _dest.i; } - /* 18: mergewl */ + /* 17: mergewl */ { orc_union32 _dest; - _dest.x2[0] = var54.x2[0]; - _dest.x2[1] = var55.x2[0]; - var46.x2[0] = _dest.i; + _dest.x2[0] = var53.x2[0]; + _dest.x2[1] = var54.x2[0]; + var45.x2[0] = _dest.i; } { orc_union32 _dest; - _dest.x2[0] = var54.x2[1]; - _dest.x2[1] = var55.x2[1]; - var46.x2[1] = _dest.i; + _dest.x2[0] = var53.x2[1]; + _dest.x2[1] = var54.x2[1]; + var45.x2[1] = _dest.i; } - /* 19: storeq */ - ptr0[i] = var46; + /* 18: storeq */ + ptr0[i] = var45; } } @@ -3022,22 +2918,17 @@ _backup_bayer_orc_merge_bg_argb (OrcExecutor * ORC_RESTRICT ex) #else orc_union16 var43; #endif -#if defined(__APPLE__) && __GNUC__ == 4 && __GNUC_MINOR__ == 2 && defined (__i386__) - volatile orc_union16 var44; -#else orc_union16 var44; -#endif - orc_union16 var45; - orc_union64 var46; + orc_union64 var45; + orc_union16 var46; orc_union16 var47; orc_union16 var48; orc_union16 var49; orc_union16 var50; orc_union16 var51; orc_union16 var52; - orc_union16 var53; + orc_union32 var53; orc_union32 var54; - orc_union32 var55; ptr0 = (orc_union64 *) ex->arrays[0]; ptr4 = (orc_union16 *) ex->arrays[4]; @@ -3051,9 +2942,6 @@ _backup_bayer_orc_merge_bg_argb (OrcExecutor * ORC_RESTRICT ex) var42.i = (int) 0x000000ff; /* 255 or 1.25987e-321f */ /* 11: loadpw */ var43.i = (int) 0x0000ff00; /* 65280 or 3.22526e-319f */ - /* 14: loadpb */ - var44.x2[0] = (int) 0x000000ff; /* 255 or 1.25987e-321f */ - var44.x2[1] = (int) 0x000000ff; /* 255 or 1.25987e-321f */ for (i = 0; i < n; i++) { /* 0: loadw */ @@ -3061,71 +2949,71 @@ _backup_bayer_orc_merge_bg_argb (OrcExecutor * ORC_RESTRICT ex) /* 1: loadw */ var38 = ptr9[i]; /* 2: avgub */ - var47.x2[0] = ((orc_uint8) var37.x2[0] + (orc_uint8) var38.x2[0] + 1) >> 1; - var47.x2[1] = ((orc_uint8) var37.x2[1] + (orc_uint8) var38.x2[1] + 1) >> 1; + var46.x2[0] = ((orc_uint8) var37.x2[0] + (orc_uint8) var38.x2[0] + 1) >> 1; + var46.x2[1] = ((orc_uint8) var37.x2[1] + (orc_uint8) var38.x2[1] + 1) >> 1; /* 3: loadw */ var39 = ptr4[i]; /* 4: loadw */ var40 = ptr8[i]; /* 5: avgub */ - var48.x2[0] = ((orc_uint8) var39.x2[0] + (orc_uint8) var40.x2[0] + 1) >> 1; - var48.x2[1] = ((orc_uint8) var39.x2[1] + (orc_uint8) var40.x2[1] + 1) >> 1; + var47.x2[0] = ((orc_uint8) var39.x2[0] + (orc_uint8) var40.x2[0] + 1) >> 1; + var47.x2[1] = ((orc_uint8) var39.x2[1] + (orc_uint8) var40.x2[1] + 1) >> 1; /* 6: loadw */ var41 = ptr7[i]; /* 7: copyw */ - var49.i = var41.i; + var48.i = var41.i; /* 8: avgub */ - var50.x2[0] = ((orc_uint8) var48.x2[0] + (orc_uint8) var49.x2[0] + 1) >> 1; - var50.x2[1] = ((orc_uint8) var48.x2[1] + (orc_uint8) var49.x2[1] + 1) >> 1; + var49.x2[0] = ((orc_uint8) var47.x2[0] + (orc_uint8) var48.x2[0] + 1) >> 1; + var49.x2[1] = ((orc_uint8) var47.x2[1] + (orc_uint8) var48.x2[1] + 1) >> 1; /* 10: andw */ - var51.i = var50.i & var42.i; + var50.i = var49.i & var42.i; /* 12: andw */ - var52.i = var49.i & var43.i; + var51.i = var48.i & var43.i; /* 13: orw */ - var53.i = var52.i | var51.i; - /* 15: mergebw */ + var52.i = var51.i | var50.i; + /* 14: mergebw */ { orc_union16 _dest; - _dest.x2[0] = var44.x2[0]; - _dest.x2[1] = var47.x2[0]; - var54.x2[0] = _dest.i; + _dest.x2[0] = var42.x2[0]; + _dest.x2[1] = var46.x2[0]; + var53.x2[0] = _dest.i; } { orc_union16 _dest; - _dest.x2[0] = var44.x2[1]; - _dest.x2[1] = var47.x2[1]; - var54.x2[1] = _dest.i; + _dest.x2[0] = var42.x2[1]; + _dest.x2[1] = var46.x2[1]; + var53.x2[1] = _dest.i; } - /* 16: loadw */ - var45 = ptr6[i]; - /* 17: mergebw */ + /* 15: loadw */ + var44 = ptr6[i]; + /* 16: mergebw */ { orc_union16 _dest; - _dest.x2[0] = var53.x2[0]; - _dest.x2[1] = var45.x2[0]; - var55.x2[0] = _dest.i; + _dest.x2[0] = var52.x2[0]; + _dest.x2[1] = var44.x2[0]; + var54.x2[0] = _dest.i; } { orc_union16 _dest; - _dest.x2[0] = var53.x2[1]; - _dest.x2[1] = var45.x2[1]; - var55.x2[1] = _dest.i; + _dest.x2[0] = var52.x2[1]; + _dest.x2[1] = var44.x2[1]; + var54.x2[1] = _dest.i; } - /* 18: mergewl */ + /* 17: mergewl */ { orc_union32 _dest; - _dest.x2[0] = var54.x2[0]; - _dest.x2[1] = var55.x2[0]; - var46.x2[0] = _dest.i; + _dest.x2[0] = var53.x2[0]; + _dest.x2[1] = var54.x2[0]; + var45.x2[0] = _dest.i; } { orc_union32 _dest; - _dest.x2[0] = var54.x2[1]; - _dest.x2[1] = var55.x2[1]; - var46.x2[1] = _dest.i; + _dest.x2[0] = var53.x2[1]; + _dest.x2[1] = var54.x2[1]; + var45.x2[1] = _dest.i; } - /* 19: storeq */ - ptr0[i] = var46; + /* 18: storeq */ + ptr0[i] = var45; } } @@ -3151,7 +3039,7 @@ bayer_orc_merge_bg_argb (guint8 * ORC_RESTRICT d1, 1, 9, 23, 98, 97, 121, 101, 114, 95, 111, 114, 99, 95, 109, 101, 114, 103, 101, 95, 98, 103, 95, 97, 114, 103, 98, 11, 8, 8, 12, 2, 2, 12, 2, 2, 12, 2, 2, 12, 2, 2, 12, 2, 2, 12, 2, 2, 14, - 4, 255, 0, 0, 0, 14, 4, 0, 255, 0, 0, 20, 4, 20, 4, 20, + 2, 255, 0, 0, 0, 14, 2, 0, 255, 0, 0, 20, 4, 20, 4, 20, 2, 20, 2, 20, 2, 21, 1, 39, 34, 5, 9, 21, 1, 39, 35, 4, 8, 79, 36, 7, 21, 1, 39, 35, 35, 36, 73, 35, 35, 16, 73, 36, 36, 17, 92, 35, 36, 35, 21, 1, 196, 32, 16, 34, 21, 1, 196, 33, @@ -3170,8 +3058,8 @@ bayer_orc_merge_bg_argb (guint8 * ORC_RESTRICT d1, orc_program_add_source (p, 2, "s4"); orc_program_add_source (p, 2, "s5"); orc_program_add_source (p, 2, "s6"); - orc_program_add_constant (p, 4, 0x000000ff, "c1"); - orc_program_add_constant (p, 4, 0x0000ff00, "c2"); + orc_program_add_constant (p, 2, 0x000000ff, "c1"); + orc_program_add_constant (p, 2, 0x0000ff00, "c2"); orc_program_add_temporary (p, 4, "t1"); orc_program_add_temporary (p, 4, "t2"); orc_program_add_temporary (p, 2, "t3"); @@ -3256,22 +3144,17 @@ bayer_orc_merge_gr_argb (guint8 * ORC_RESTRICT d1, #else orc_union16 var43; #endif -#if defined(__APPLE__) && __GNUC__ == 4 && __GNUC_MINOR__ == 2 && defined (__i386__) - volatile orc_union16 var44; -#else orc_union16 var44; -#endif - orc_union16 var45; - orc_union64 var46; + orc_union64 var45; + orc_union16 var46; orc_union16 var47; orc_union16 var48; orc_union16 var49; orc_union16 var50; orc_union16 var51; orc_union16 var52; - orc_union16 var53; + orc_union32 var53; orc_union32 var54; - orc_union32 var55; ptr0 = (orc_union64 *) d1; ptr4 = (orc_union16 *) s1; @@ -3285,9 +3168,6 @@ bayer_orc_merge_gr_argb (guint8 * ORC_RESTRICT d1, var42.i = (int) 0x0000ff00; /* 65280 or 3.22526e-319f */ /* 11: loadpw */ var43.i = (int) 0x000000ff; /* 255 or 1.25987e-321f */ - /* 14: loadpb */ - var44.x2[0] = (int) 0x000000ff; /* 255 or 1.25987e-321f */ - var44.x2[1] = (int) 0x000000ff; /* 255 or 1.25987e-321f */ for (i = 0; i < n; i++) { /* 0: loadw */ @@ -3295,71 +3175,71 @@ bayer_orc_merge_gr_argb (guint8 * ORC_RESTRICT d1, /* 1: loadw */ var38 = ptr8[i]; /* 2: avgub */ - var47.x2[0] = ((orc_uint8) var37.x2[0] + (orc_uint8) var38.x2[0] + 1) >> 1; - var47.x2[1] = ((orc_uint8) var37.x2[1] + (orc_uint8) var38.x2[1] + 1) >> 1; + var46.x2[0] = ((orc_uint8) var37.x2[0] + (orc_uint8) var38.x2[0] + 1) >> 1; + var46.x2[1] = ((orc_uint8) var37.x2[1] + (orc_uint8) var38.x2[1] + 1) >> 1; /* 3: loadw */ var39 = ptr5[i]; /* 4: loadw */ var40 = ptr9[i]; /* 5: avgub */ - var48.x2[0] = ((orc_uint8) var39.x2[0] + (orc_uint8) var40.x2[0] + 1) >> 1; - var48.x2[1] = ((orc_uint8) var39.x2[1] + (orc_uint8) var40.x2[1] + 1) >> 1; + var47.x2[0] = ((orc_uint8) var39.x2[0] + (orc_uint8) var40.x2[0] + 1) >> 1; + var47.x2[1] = ((orc_uint8) var39.x2[1] + (orc_uint8) var40.x2[1] + 1) >> 1; /* 6: loadw */ var41 = ptr6[i]; /* 7: copyw */ - var49.i = var41.i; + var48.i = var41.i; /* 8: avgub */ - var50.x2[0] = ((orc_uint8) var48.x2[0] + (orc_uint8) var49.x2[0] + 1) >> 1; - var50.x2[1] = ((orc_uint8) var48.x2[1] + (orc_uint8) var49.x2[1] + 1) >> 1; + var49.x2[0] = ((orc_uint8) var47.x2[0] + (orc_uint8) var48.x2[0] + 1) >> 1; + var49.x2[1] = ((orc_uint8) var47.x2[1] + (orc_uint8) var48.x2[1] + 1) >> 1; /* 10: andw */ - var51.i = var50.i & var42.i; + var50.i = var49.i & var42.i; /* 12: andw */ - var52.i = var49.i & var43.i; + var51.i = var48.i & var43.i; /* 13: orw */ - var53.i = var52.i | var51.i; - /* 15: loadw */ - var45 = ptr7[i]; - /* 16: mergebw */ + var52.i = var51.i | var50.i; + /* 14: loadw */ + var44 = ptr7[i]; + /* 15: mergebw */ { orc_union16 _dest; - _dest.x2[0] = var44.x2[0]; - _dest.x2[1] = var45.x2[0]; - var54.x2[0] = _dest.i; + _dest.x2[0] = var43.x2[0]; + _dest.x2[1] = var44.x2[0]; + var53.x2[0] = _dest.i; } { orc_union16 _dest; - _dest.x2[0] = var44.x2[1]; - _dest.x2[1] = var45.x2[1]; - var54.x2[1] = _dest.i; + _dest.x2[0] = var43.x2[1]; + _dest.x2[1] = var44.x2[1]; + var53.x2[1] = _dest.i; } - /* 17: mergebw */ + /* 16: mergebw */ { orc_union16 _dest; - _dest.x2[0] = var53.x2[0]; - _dest.x2[1] = var47.x2[0]; - var55.x2[0] = _dest.i; + _dest.x2[0] = var52.x2[0]; + _dest.x2[1] = var46.x2[0]; + var54.x2[0] = _dest.i; } { orc_union16 _dest; - _dest.x2[0] = var53.x2[1]; - _dest.x2[1] = var47.x2[1]; - var55.x2[1] = _dest.i; + _dest.x2[0] = var52.x2[1]; + _dest.x2[1] = var46.x2[1]; + var54.x2[1] = _dest.i; } - /* 18: mergewl */ + /* 17: mergewl */ { orc_union32 _dest; - _dest.x2[0] = var54.x2[0]; - _dest.x2[1] = var55.x2[0]; - var46.x2[0] = _dest.i; + _dest.x2[0] = var53.x2[0]; + _dest.x2[1] = var54.x2[0]; + var45.x2[0] = _dest.i; } { orc_union32 _dest; - _dest.x2[0] = var54.x2[1]; - _dest.x2[1] = var55.x2[1]; - var46.x2[1] = _dest.i; + _dest.x2[0] = var53.x2[1]; + _dest.x2[1] = var54.x2[1]; + var45.x2[1] = _dest.i; } - /* 19: storeq */ - ptr0[i] = var46; + /* 18: storeq */ + ptr0[i] = var45; } } @@ -3392,22 +3272,17 @@ _backup_bayer_orc_merge_gr_argb (OrcExecutor * ORC_RESTRICT ex) #else orc_union16 var43; #endif -#if defined(__APPLE__) && __GNUC__ == 4 && __GNUC_MINOR__ == 2 && defined (__i386__) - volatile orc_union16 var44; -#else orc_union16 var44; -#endif - orc_union16 var45; - orc_union64 var46; + orc_union64 var45; + orc_union16 var46; orc_union16 var47; orc_union16 var48; orc_union16 var49; orc_union16 var50; orc_union16 var51; orc_union16 var52; - orc_union16 var53; + orc_union32 var53; orc_union32 var54; - orc_union32 var55; ptr0 = (orc_union64 *) ex->arrays[0]; ptr4 = (orc_union16 *) ex->arrays[4]; @@ -3421,9 +3296,6 @@ _backup_bayer_orc_merge_gr_argb (OrcExecutor * ORC_RESTRICT ex) var42.i = (int) 0x0000ff00; /* 65280 or 3.22526e-319f */ /* 11: loadpw */ var43.i = (int) 0x000000ff; /* 255 or 1.25987e-321f */ - /* 14: loadpb */ - var44.x2[0] = (int) 0x000000ff; /* 255 or 1.25987e-321f */ - var44.x2[1] = (int) 0x000000ff; /* 255 or 1.25987e-321f */ for (i = 0; i < n; i++) { /* 0: loadw */ @@ -3431,71 +3303,71 @@ _backup_bayer_orc_merge_gr_argb (OrcExecutor * ORC_RESTRICT ex) /* 1: loadw */ var38 = ptr8[i]; /* 2: avgub */ - var47.x2[0] = ((orc_uint8) var37.x2[0] + (orc_uint8) var38.x2[0] + 1) >> 1; - var47.x2[1] = ((orc_uint8) var37.x2[1] + (orc_uint8) var38.x2[1] + 1) >> 1; + var46.x2[0] = ((orc_uint8) var37.x2[0] + (orc_uint8) var38.x2[0] + 1) >> 1; + var46.x2[1] = ((orc_uint8) var37.x2[1] + (orc_uint8) var38.x2[1] + 1) >> 1; /* 3: loadw */ var39 = ptr5[i]; /* 4: loadw */ var40 = ptr9[i]; /* 5: avgub */ - var48.x2[0] = ((orc_uint8) var39.x2[0] + (orc_uint8) var40.x2[0] + 1) >> 1; - var48.x2[1] = ((orc_uint8) var39.x2[1] + (orc_uint8) var40.x2[1] + 1) >> 1; + var47.x2[0] = ((orc_uint8) var39.x2[0] + (orc_uint8) var40.x2[0] + 1) >> 1; + var47.x2[1] = ((orc_uint8) var39.x2[1] + (orc_uint8) var40.x2[1] + 1) >> 1; /* 6: loadw */ var41 = ptr6[i]; /* 7: copyw */ - var49.i = var41.i; + var48.i = var41.i; /* 8: avgub */ - var50.x2[0] = ((orc_uint8) var48.x2[0] + (orc_uint8) var49.x2[0] + 1) >> 1; - var50.x2[1] = ((orc_uint8) var48.x2[1] + (orc_uint8) var49.x2[1] + 1) >> 1; + var49.x2[0] = ((orc_uint8) var47.x2[0] + (orc_uint8) var48.x2[0] + 1) >> 1; + var49.x2[1] = ((orc_uint8) var47.x2[1] + (orc_uint8) var48.x2[1] + 1) >> 1; /* 10: andw */ - var51.i = var50.i & var42.i; + var50.i = var49.i & var42.i; /* 12: andw */ - var52.i = var49.i & var43.i; + var51.i = var48.i & var43.i; /* 13: orw */ - var53.i = var52.i | var51.i; - /* 15: loadw */ - var45 = ptr7[i]; - /* 16: mergebw */ + var52.i = var51.i | var50.i; + /* 14: loadw */ + var44 = ptr7[i]; + /* 15: mergebw */ { orc_union16 _dest; - _dest.x2[0] = var44.x2[0]; - _dest.x2[1] = var45.x2[0]; - var54.x2[0] = _dest.i; + _dest.x2[0] = var43.x2[0]; + _dest.x2[1] = var44.x2[0]; + var53.x2[0] = _dest.i; } { orc_union16 _dest; - _dest.x2[0] = var44.x2[1]; - _dest.x2[1] = var45.x2[1]; - var54.x2[1] = _dest.i; + _dest.x2[0] = var43.x2[1]; + _dest.x2[1] = var44.x2[1]; + var53.x2[1] = _dest.i; } - /* 17: mergebw */ + /* 16: mergebw */ { orc_union16 _dest; - _dest.x2[0] = var53.x2[0]; - _dest.x2[1] = var47.x2[0]; - var55.x2[0] = _dest.i; + _dest.x2[0] = var52.x2[0]; + _dest.x2[1] = var46.x2[0]; + var54.x2[0] = _dest.i; } { orc_union16 _dest; - _dest.x2[0] = var53.x2[1]; - _dest.x2[1] = var47.x2[1]; - var55.x2[1] = _dest.i; + _dest.x2[0] = var52.x2[1]; + _dest.x2[1] = var46.x2[1]; + var54.x2[1] = _dest.i; } - /* 18: mergewl */ + /* 17: mergewl */ { orc_union32 _dest; - _dest.x2[0] = var54.x2[0]; - _dest.x2[1] = var55.x2[0]; - var46.x2[0] = _dest.i; + _dest.x2[0] = var53.x2[0]; + _dest.x2[1] = var54.x2[0]; + var45.x2[0] = _dest.i; } { orc_union32 _dest; - _dest.x2[0] = var54.x2[1]; - _dest.x2[1] = var55.x2[1]; - var46.x2[1] = _dest.i; + _dest.x2[0] = var53.x2[1]; + _dest.x2[1] = var54.x2[1]; + var45.x2[1] = _dest.i; } - /* 19: storeq */ - ptr0[i] = var46; + /* 18: storeq */ + ptr0[i] = var45; } } @@ -3521,7 +3393,7 @@ bayer_orc_merge_gr_argb (guint8 * ORC_RESTRICT d1, 1, 9, 23, 98, 97, 121, 101, 114, 95, 111, 114, 99, 95, 109, 101, 114, 103, 101, 95, 103, 114, 95, 97, 114, 103, 98, 11, 8, 8, 12, 2, 2, 12, 2, 2, 12, 2, 2, 12, 2, 2, 12, 2, 2, 12, 2, 2, 14, - 4, 0, 255, 0, 0, 14, 4, 255, 0, 0, 0, 20, 4, 20, 4, 20, + 2, 0, 255, 0, 0, 14, 2, 255, 0, 0, 0, 20, 4, 20, 4, 20, 2, 20, 2, 20, 2, 21, 1, 39, 34, 4, 8, 21, 1, 39, 35, 5, 9, 79, 36, 6, 21, 1, 39, 35, 35, 36, 73, 35, 35, 16, 73, 36, 36, 17, 92, 35, 36, 35, 21, 1, 196, 32, 17, 7, 21, 1, 196, 33, @@ -3540,8 +3412,8 @@ bayer_orc_merge_gr_argb (guint8 * ORC_RESTRICT d1, orc_program_add_source (p, 2, "s4"); orc_program_add_source (p, 2, "s5"); orc_program_add_source (p, 2, "s6"); - orc_program_add_constant (p, 4, 0x0000ff00, "c1"); - orc_program_add_constant (p, 4, 0x000000ff, "c2"); + orc_program_add_constant (p, 2, 0x0000ff00, "c1"); + orc_program_add_constant (p, 2, 0x000000ff, "c2"); orc_program_add_temporary (p, 4, "t1"); orc_program_add_temporary (p, 4, "t2"); orc_program_add_temporary (p, 2, "t3"); diff --git a/gst/compositor/compositororc-dist.c b/gst/compositor/compositororc-dist.c index db71b932e9..daee2a77c1 100644 --- a/gst/compositor/compositororc-dist.c +++ b/gst/compositor/compositororc-dist.c @@ -403,7 +403,7 @@ compositor_orc_blend_u8 (guint8 * ORC_RESTRICT d1, int d1_stride, /* 6: mullw */ var41.i = (var40.i * var36.i) & 0xffff; /* 7: shlw */ - var42.i = var38.i << 8; + var42.i = ((orc_uint16) var38.i) << 8; /* 8: addw */ var43.i = var42.i + var41.i; /* 9: shruw */ @@ -460,7 +460,7 @@ _backup_compositor_orc_blend_u8 (OrcExecutor * ORC_RESTRICT ex) /* 6: mullw */ var41.i = (var40.i * var36.i) & 0xffff; /* 7: shlw */ - var42.i = var38.i << 8; + var42.i = ((orc_uint16) var38.i) << 8; /* 8: addw */ var43.i = var42.i + var41.i; /* 9: shruw */ @@ -606,8 +606,9 @@ compositor_orc_blend_argb (guint8 * ORC_RESTRICT d1, int d1_stride, var43 = var42.i; /* 3: splatbl */ var44.i = - ((var43 & 0xff) << 24) | ((var43 & 0xff) << 16) | ((var43 & 0xff) << - 8) | (var43 & 0xff); + ((((orc_uint32) var43) & 0xff) << 24) | ((((orc_uint32) var43) & 0xff) + << 16) | ((((orc_uint32) var43) & 0xff) << 8) | (((orc_uint32) var43) + & 0xff); /* 4: convubw */ var45.x4[0] = (orc_uint8) var44.x4[0]; var45.x4[1] = (orc_uint8) var44.x4[1]; @@ -731,8 +732,9 @@ _backup_compositor_orc_blend_argb (OrcExecutor * ORC_RESTRICT ex) var43 = var42.i; /* 3: splatbl */ var44.i = - ((var43 & 0xff) << 24) | ((var43 & 0xff) << 16) | ((var43 & 0xff) << - 8) | (var43 & 0xff); + ((((orc_uint32) var43) & 0xff) << 24) | ((((orc_uint32) var43) & 0xff) + << 16) | ((((orc_uint32) var43) & 0xff) << 8) | (((orc_uint32) var43) + & 0xff); /* 4: convubw */ var45.x4[0] = (orc_uint8) var44.x4[0]; var45.x4[1] = (orc_uint8) var44.x4[1]; @@ -820,7 +822,7 @@ compositor_orc_blend_argb (guint8 * ORC_RESTRICT d1, int d1_stride, static const orc_uint8 bc[] = { 1, 7, 9, 25, 99, 111, 109, 112, 111, 115, 105, 116, 111, 114, 95, 111, 114, 99, 95, 98, 108, 101, 110, 100, 95, 97, 114, 103, 98, 11, 4, 4, - 12, 4, 4, 14, 4, 255, 0, 0, 0, 14, 4, 8, 0, 0, 0, 16, + 12, 4, 4, 14, 4, 255, 0, 0, 0, 14, 2, 8, 0, 0, 0, 16, 2, 20, 4, 20, 2, 20, 1, 20, 4, 20, 8, 20, 8, 20, 8, 113, 32, 4, 163, 33, 32, 157, 34, 33, 152, 35, 34, 21, 2, 150, 38, 35, 21, 2, 89, 38, 38, 24, 21, 2, 95, 38, 38, 17, 21, 2, 150, 37, @@ -838,7 +840,7 @@ compositor_orc_blend_argb (guint8 * ORC_RESTRICT d1, int d1_stride, orc_program_add_destination (p, 4, "d1"); orc_program_add_source (p, 4, "s1"); orc_program_add_constant (p, 4, 0x000000ff, "c1"); - orc_program_add_constant (p, 4, 0x00000008, "c2"); + orc_program_add_constant (p, 2, 0x00000008, "c2"); orc_program_add_parameter (p, 2, "p1"); orc_program_add_temporary (p, 4, "t1"); orc_program_add_temporary (p, 2, "t2"); @@ -965,8 +967,9 @@ compositor_orc_blend_bgra (guint8 * ORC_RESTRICT d1, int d1_stride, var45 = var44.i; /* 4: splatbl */ var46.i = - ((var45 & 0xff) << 24) | ((var45 & 0xff) << 16) | ((var45 & 0xff) << - 8) | (var45 & 0xff); + ((((orc_uint32) var45) & 0xff) << 24) | ((((orc_uint32) var45) & 0xff) + << 16) | ((((orc_uint32) var45) & 0xff) << 8) | (((orc_uint32) var45) + & 0xff); /* 5: convubw */ var47.x4[0] = (orc_uint8) var46.x4[0]; var47.x4[1] = (orc_uint8) var46.x4[1]; @@ -1093,8 +1096,9 @@ _backup_compositor_orc_blend_bgra (OrcExecutor * ORC_RESTRICT ex) var45 = var44.i; /* 4: splatbl */ var46.i = - ((var45 & 0xff) << 24) | ((var45 & 0xff) << 16) | ((var45 & 0xff) << - 8) | (var45 & 0xff); + ((((orc_uint32) var45) & 0xff) << 24) | ((((orc_uint32) var45) & 0xff) + << 16) | ((((orc_uint32) var45) & 0xff) << 8) | (((orc_uint32) var45) + & 0xff); /* 5: convubw */ var47.x4[0] = (orc_uint8) var46.x4[0]; var47.x4[1] = (orc_uint8) var46.x4[1]; @@ -1183,7 +1187,7 @@ compositor_orc_blend_bgra (guint8 * ORC_RESTRICT d1, int d1_stride, 1, 7, 9, 25, 99, 111, 109, 112, 111, 115, 105, 116, 111, 114, 95, 111, 114, 99, 95, 98, 108, 101, 110, 100, 95, 98, 103, 114, 97, 11, 4, 4, 12, 4, 4, 14, 4, 0, 0, 0, 255, 14, 4, 24, 0, 0, 0, 14, - 4, 8, 0, 0, 0, 16, 2, 20, 4, 20, 4, 20, 2, 20, 1, 20, + 2, 8, 0, 0, 0, 16, 2, 20, 4, 20, 4, 20, 2, 20, 1, 20, 4, 20, 8, 20, 8, 20, 8, 113, 32, 4, 126, 33, 32, 17, 163, 34, 33, 157, 35, 34, 152, 36, 35, 21, 2, 150, 39, 36, 21, 2, 89, 39, 39, 24, 21, 2, 95, 39, 39, 18, 21, 2, 150, 38, 32, 113, 32, 0, @@ -1202,7 +1206,7 @@ compositor_orc_blend_bgra (guint8 * ORC_RESTRICT d1, int d1_stride, orc_program_add_source (p, 4, "s1"); orc_program_add_constant (p, 4, 0xff000000, "c1"); orc_program_add_constant (p, 4, 0x00000018, "c2"); - orc_program_add_constant (p, 4, 0x00000008, "c3"); + orc_program_add_constant (p, 2, 0x00000008, "c3"); orc_program_add_parameter (p, 2, "p1"); orc_program_add_temporary (p, 4, "t1"); orc_program_add_temporary (p, 4, "t2"); @@ -1351,8 +1355,9 @@ compositor_orc_overlay_argb (guint8 * ORC_RESTRICT d1, int d1_stride, var46 = var45.i; /* 3: splatbl */ var47.i = - ((var46 & 0xff) << 24) | ((var46 & 0xff) << 16) | ((var46 & 0xff) << - 8) | (var46 & 0xff); + ((((orc_uint32) var46) & 0xff) << 24) | ((((orc_uint32) var46) & 0xff) + << 16) | ((((orc_uint32) var46) & 0xff) << 8) | (((orc_uint32) var46) + & 0xff); /* 4: convubw */ var48.x4[0] = (orc_uint8) var47.x4[0]; var48.x4[1] = (orc_uint8) var47.x4[1]; @@ -1396,8 +1401,9 @@ compositor_orc_overlay_argb (guint8 * ORC_RESTRICT d1, int d1_stride, var58 = var57.i; /* 16: splatbl */ var59.i = - ((var58 & 0xff) << 24) | ((var58 & 0xff) << 16) | ((var58 & 0xff) << - 8) | (var58 & 0xff); + ((((orc_uint32) var58) & 0xff) << 24) | ((((orc_uint32) var58) & 0xff) + << 16) | ((((orc_uint32) var58) & 0xff) << 8) | (((orc_uint32) var58) + & 0xff); /* 17: convubw */ var60.x4[0] = (orc_uint8) var59.x4[0]; var60.x4[1] = (orc_uint8) var59.x4[1]; @@ -1557,8 +1563,9 @@ _backup_compositor_orc_overlay_argb (OrcExecutor * ORC_RESTRICT ex) var46 = var45.i; /* 3: splatbl */ var47.i = - ((var46 & 0xff) << 24) | ((var46 & 0xff) << 16) | ((var46 & 0xff) << - 8) | (var46 & 0xff); + ((((orc_uint32) var46) & 0xff) << 24) | ((((orc_uint32) var46) & 0xff) + << 16) | ((((orc_uint32) var46) & 0xff) << 8) | (((orc_uint32) var46) + & 0xff); /* 4: convubw */ var48.x4[0] = (orc_uint8) var47.x4[0]; var48.x4[1] = (orc_uint8) var47.x4[1]; @@ -1602,8 +1609,9 @@ _backup_compositor_orc_overlay_argb (OrcExecutor * ORC_RESTRICT ex) var58 = var57.i; /* 16: splatbl */ var59.i = - ((var58 & 0xff) << 24) | ((var58 & 0xff) << 16) | ((var58 & 0xff) << - 8) | (var58 & 0xff); + ((((orc_uint32) var58) & 0xff) << 24) | ((((orc_uint32) var58) & 0xff) + << 16) | ((((orc_uint32) var58) & 0xff) << 8) | (((orc_uint32) var58) + & 0xff); /* 17: convubw */ var60.x4[0] = (orc_uint8) var59.x4[0]; var60.x4[1] = (orc_uint8) var59.x4[1]; @@ -1706,7 +1714,7 @@ compositor_orc_overlay_argb (guint8 * ORC_RESTRICT d1, int d1_stride, 1, 7, 9, 27, 99, 111, 109, 112, 111, 115, 105, 116, 111, 114, 95, 111, 114, 99, 95, 111, 118, 101, 114, 108, 97, 121, 95, 97, 114, 103, 98, 11, 4, 4, 12, 4, 4, 14, 4, 255, 255, 255, 255, 14, 4, 255, 0, 0, - 0, 14, 4, 0, 255, 255, 255, 14, 4, 8, 0, 0, 0, 16, 2, 20, + 0, 14, 4, 0, 255, 255, 255, 14, 2, 8, 0, 0, 0, 16, 2, 20, 4, 20, 2, 20, 1, 20, 8, 20, 8, 20, 8, 20, 4, 20, 8, 20, 8, 113, 32, 4, 163, 33, 32, 157, 34, 33, 152, 38, 34, 21, 2, 150, 35, 38, 21, 2, 89, 35, 35, 24, 21, 2, 95, 35, 35, 19, 21, 2, @@ -1730,7 +1738,7 @@ compositor_orc_overlay_argb (guint8 * ORC_RESTRICT d1, int d1_stride, orc_program_add_constant (p, 4, 0xffffffff, "c1"); orc_program_add_constant (p, 4, 0x000000ff, "c2"); orc_program_add_constant (p, 4, 0xffffff00, "c3"); - orc_program_add_constant (p, 4, 0x00000008, "c4"); + orc_program_add_constant (p, 2, 0x00000008, "c4"); orc_program_add_parameter (p, 2, "p1"); orc_program_add_temporary (p, 4, "t1"); orc_program_add_temporary (p, 2, "t2"); @@ -1908,8 +1916,9 @@ compositor_orc_overlay_bgra (guint8 * ORC_RESTRICT d1, int d1_stride, var48 = var47.i; /* 4: splatbl */ var49.i = - ((var48 & 0xff) << 24) | ((var48 & 0xff) << 16) | ((var48 & 0xff) << - 8) | (var48 & 0xff); + ((((orc_uint32) var48) & 0xff) << 24) | ((((orc_uint32) var48) & 0xff) + << 16) | ((((orc_uint32) var48) & 0xff) << 8) | (((orc_uint32) var48) + & 0xff); /* 5: convubw */ var50.x4[0] = (orc_uint8) var49.x4[0]; var50.x4[1] = (orc_uint8) var49.x4[1]; @@ -1955,8 +1964,9 @@ compositor_orc_overlay_bgra (guint8 * ORC_RESTRICT d1, int d1_stride, var61 = var60.i; /* 18: splatbl */ var62.i = - ((var61 & 0xff) << 24) | ((var61 & 0xff) << 16) | ((var61 & 0xff) << - 8) | (var61 & 0xff); + ((((orc_uint32) var61) & 0xff) << 24) | ((((orc_uint32) var61) & 0xff) + << 16) | ((((orc_uint32) var61) & 0xff) << 8) | (((orc_uint32) var61) + & 0xff); /* 19: convubw */ var63.x4[0] = (orc_uint8) var62.x4[0]; var63.x4[1] = (orc_uint8) var62.x4[1]; @@ -2120,8 +2130,9 @@ _backup_compositor_orc_overlay_bgra (OrcExecutor * ORC_RESTRICT ex) var48 = var47.i; /* 4: splatbl */ var49.i = - ((var48 & 0xff) << 24) | ((var48 & 0xff) << 16) | ((var48 & 0xff) << - 8) | (var48 & 0xff); + ((((orc_uint32) var48) & 0xff) << 24) | ((((orc_uint32) var48) & 0xff) + << 16) | ((((orc_uint32) var48) & 0xff) << 8) | (((orc_uint32) var48) + & 0xff); /* 5: convubw */ var50.x4[0] = (orc_uint8) var49.x4[0]; var50.x4[1] = (orc_uint8) var49.x4[1]; @@ -2167,8 +2178,9 @@ _backup_compositor_orc_overlay_bgra (OrcExecutor * ORC_RESTRICT ex) var61 = var60.i; /* 18: splatbl */ var62.i = - ((var61 & 0xff) << 24) | ((var61 & 0xff) << 16) | ((var61 & 0xff) << - 8) | (var61 & 0xff); + ((((orc_uint32) var61) & 0xff) << 24) | ((((orc_uint32) var61) & 0xff) + << 16) | ((((orc_uint32) var61) & 0xff) << 8) | (((orc_uint32) var61) + & 0xff); /* 19: convubw */ var63.x4[0] = (orc_uint8) var62.x4[0]; var63.x4[1] = (orc_uint8) var62.x4[1]; @@ -2271,7 +2283,7 @@ compositor_orc_overlay_bgra (guint8 * ORC_RESTRICT d1, int d1_stride, 1, 7, 9, 27, 99, 111, 109, 112, 111, 115, 105, 116, 111, 114, 95, 111, 114, 99, 95, 111, 118, 101, 114, 108, 97, 121, 95, 98, 103, 114, 97, 11, 4, 4, 12, 4, 4, 14, 4, 255, 255, 255, 255, 14, 4, 0, 0, 0, - 255, 14, 4, 255, 255, 255, 0, 14, 4, 24, 0, 0, 0, 14, 4, 8, + 255, 14, 4, 255, 255, 255, 0, 14, 4, 24, 0, 0, 0, 14, 2, 8, 0, 0, 0, 16, 2, 20, 4, 20, 4, 20, 2, 20, 1, 20, 8, 20, 8, 20, 8, 20, 4, 20, 8, 20, 8, 113, 32, 4, 126, 33, 32, 19, 163, 34, 33, 157, 35, 34, 152, 39, 35, 21, 2, 150, 36, 39, 21, 2, @@ -2297,7 +2309,7 @@ compositor_orc_overlay_bgra (guint8 * ORC_RESTRICT d1, int d1_stride, orc_program_add_constant (p, 4, 0xff000000, "c2"); orc_program_add_constant (p, 4, 0x00ffffff, "c3"); orc_program_add_constant (p, 4, 0x00000018, "c4"); - orc_program_add_constant (p, 4, 0x00000008, "c5"); + orc_program_add_constant (p, 2, 0x00000008, "c5"); orc_program_add_parameter (p, 2, "p1"); orc_program_add_temporary (p, 4, "t1"); orc_program_add_temporary (p, 4, "t2"); diff --git a/gst/fieldanalysis/gstfieldanalysisorc-dist.c b/gst/fieldanalysis/gstfieldanalysisorc-dist.c index 06951b777d..1ae0143392 100644 --- a/gst/fieldanalysis/gstfieldanalysisorc-dist.c +++ b/gst/fieldanalysis/gstfieldanalysisorc-dist.c @@ -205,7 +205,7 @@ fieldanalysis_orc_same_parity_sad_planar_yuv (guint32 * ORC_RESTRICT a1, /* 9: andl */ var45.i = var43.i & var44.i; /* 10: accl */ - var12.i = var12.i + var45.i; + var12.i = ((orc_uint32) var12.i) + ((orc_uint32) var45.i); } *a1 = var12.i; @@ -258,7 +258,7 @@ _backup_fieldanalysis_orc_same_parity_sad_planar_yuv (OrcExecutor * /* 9: andl */ var45.i = var43.i & var44.i; /* 10: accl */ - var12.i = var12.i + var45.i; + var12.i = ((orc_uint32) var12.i) + ((orc_uint32) var45.i); } ex->accumulators[0] = var12.i; @@ -391,7 +391,7 @@ fieldanalysis_orc_same_parity_ssd_planar_yuv (guint32 * ORC_RESTRICT a1, /* 8: andl */ var44.i = var42.i & var43.i; /* 9: accl */ - var12.i = var12.i + var44.i; + var12.i = ((orc_uint32) var12.i) + ((orc_uint32) var44.i); } *a1 = var12.i; @@ -441,7 +441,7 @@ _backup_fieldanalysis_orc_same_parity_ssd_planar_yuv (OrcExecutor * /* 8: andl */ var44.i = var42.i & var43.i; /* 9: accl */ - var12.i = var12.i + var44.i; + var12.i = ((orc_uint32) var12.i) + ((orc_uint32) var44.i); } ex->accumulators[0] = var12.i; @@ -606,9 +606,9 @@ fieldanalysis_orc_same_parity_3_tap_planar_yuv (guint32 * ORC_RESTRICT a1, /* 11: convubw */ var52.i = (orc_uint8) var45; /* 12: shlw */ - var53.i = var48.i << 2; + var53.i = ((orc_uint16) var48.i) << 2; /* 13: shlw */ - var54.i = var51.i << 2; + var54.i = ((orc_uint16) var51.i) << 2; /* 14: addw */ var55.i = var47.i + var53.i; /* 15: addw */ @@ -628,7 +628,7 @@ fieldanalysis_orc_same_parity_3_tap_planar_yuv (guint32 * ORC_RESTRICT a1, /* 23: andl */ var63.i = var61.i & var62.i; /* 24: accl */ - var12.i = var12.i + var63.i; + var12.i = ((orc_uint32) var12.i) + ((orc_uint32) var63.i); } *a1 = var12.i; @@ -709,9 +709,9 @@ _backup_fieldanalysis_orc_same_parity_3_tap_planar_yuv (OrcExecutor * /* 11: convubw */ var52.i = (orc_uint8) var45; /* 12: shlw */ - var53.i = var48.i << 2; + var53.i = ((orc_uint16) var48.i) << 2; /* 13: shlw */ - var54.i = var51.i << 2; + var54.i = ((orc_uint16) var51.i) << 2; /* 14: addw */ var55.i = var47.i + var53.i; /* 15: addw */ @@ -731,7 +731,7 @@ _backup_fieldanalysis_orc_same_parity_3_tap_planar_yuv (OrcExecutor * /* 23: andl */ var63.i = var61.i & var62.i; /* 24: accl */ - var12.i = var12.i + var63.i; + var12.i = ((orc_uint32) var12.i) + ((orc_uint32) var63.i); } ex->accumulators[0] = var12.i; @@ -761,7 +761,7 @@ fieldanalysis_orc_same_parity_3_tap_planar_yuv (guint32 * ORC_RESTRICT a1, 121, 95, 51, 95, 116, 97, 112, 95, 112, 108, 97, 110, 97, 114, 95, 121, 117, 118, 12, 1, 1, 12, 1, 1, 12, 1, 1, 12, 1, 1, 12, 1, 1, - 12, 1, 1, 13, 4, 14, 4, 2, 0, 0, 0, 16, 4, 20, 2, 20, + 12, 1, 1, 13, 4, 14, 2, 2, 0, 0, 0, 16, 4, 20, 2, 20, 2, 20, 2, 20, 2, 20, 2, 20, 2, 20, 4, 20, 4, 150, 32, 4, 150, 33, 5, 150, 34, 6, 150, 35, 7, 150, 36, 8, 150, 37, 9, 93, 33, 33, 16, 93, 36, 36, 16, 70, 32, 32, 33, 70, 32, 32, 34, 70, @@ -784,7 +784,7 @@ fieldanalysis_orc_same_parity_3_tap_planar_yuv (guint32 * ORC_RESTRICT a1, orc_program_add_source (p, 1, "s5"); orc_program_add_source (p, 1, "s6"); orc_program_add_accumulator (p, 4, "a1"); - orc_program_add_constant (p, 4, 0x00000002, "c1"); + orc_program_add_constant (p, 2, 0x00000002, "c1"); orc_program_add_parameter (p, 4, "p1"); orc_program_add_temporary (p, 2, "t1"); orc_program_add_temporary (p, 2, "t2"); @@ -884,12 +884,8 @@ fieldanalysis_orc_opposite_parity_5_tap_planar_yuv (guint32 * ORC_RESTRICT a1, #else orc_union16 var44; #endif -#if defined(__APPLE__) && __GNUC__ == 4 && __GNUC_MINOR__ == 2 && defined (__i386__) - volatile orc_union16 var45; -#else - orc_union16 var45; -#endif - orc_union32 var46; + orc_union32 var45; + orc_union16 var46; orc_union16 var47; orc_union16 var48; orc_union16 var49; @@ -902,10 +898,9 @@ fieldanalysis_orc_opposite_parity_5_tap_planar_yuv (guint32 * ORC_RESTRICT a1, orc_union16 var56; orc_union16 var57; orc_union16 var58; - orc_union16 var59; + orc_union32 var59; orc_union32 var60; orc_union32 var61; - orc_union32 var62; ptr4 = (orc_int8 *) s1; ptr5 = (orc_int8 *) s2; @@ -915,56 +910,54 @@ fieldanalysis_orc_opposite_parity_5_tap_planar_yuv (guint32 * ORC_RESTRICT a1, /* 11: loadpw */ var44.i = (int) 0x00000003; /* 3 or 1.4822e-323f */ - /* 13: loadpw */ - var45.i = (int) 0x00000003; /* 3 or 1.4822e-323f */ - /* 21: loadpl */ - var46.i = p1; + /* 20: loadpl */ + var45.i = p1; for (i = 0; i < n; i++) { /* 0: loadb */ var39 = ptr4[i]; /* 1: convubw */ - var47.i = (orc_uint8) var39; + var46.i = (orc_uint8) var39; /* 2: loadb */ var40 = ptr5[i]; /* 3: convubw */ - var48.i = (orc_uint8) var40; + var47.i = (orc_uint8) var40; /* 4: loadb */ var41 = ptr6[i]; /* 5: convubw */ - var49.i = (orc_uint8) var41; + var48.i = (orc_uint8) var41; /* 6: loadb */ var42 = ptr7[i]; /* 7: convubw */ - var50.i = (orc_uint8) var42; + var49.i = (orc_uint8) var42; /* 8: loadb */ var43 = ptr8[i]; /* 9: convubw */ - var51.i = (orc_uint8) var43; + var50.i = (orc_uint8) var43; /* 10: shlw */ - var52.i = var49.i << 2; + var51.i = ((orc_uint16) var48.i) << 2; /* 12: mullw */ - var53.i = (var48.i * var44.i) & 0xffff; - /* 14: mullw */ - var54.i = (var50.i * var45.i) & 0xffff; - /* 15: subw */ - var55.i = var47.i - var53.i; - /* 16: addw */ - var56.i = var55.i + var52.i; - /* 17: subw */ - var57.i = var56.i - var54.i; - /* 18: addw */ - var58.i = var57.i + var51.i; - /* 19: absw */ - var59.i = ORC_ABS (var58.i); - /* 20: convuwl */ - var60.i = (orc_uint16) var59.i; - /* 22: cmpgtsl */ - var61.i = (var60.i > var46.i) ? (~0) : 0; - /* 23: andl */ - var62.i = var60.i & var61.i; - /* 24: accl */ - var12.i = var12.i + var62.i; + var52.i = (var47.i * var44.i) & 0xffff; + /* 13: mullw */ + var53.i = (var49.i * var44.i) & 0xffff; + /* 14: subw */ + var54.i = var46.i - var52.i; + /* 15: addw */ + var55.i = var54.i + var51.i; + /* 16: subw */ + var56.i = var55.i - var53.i; + /* 17: addw */ + var57.i = var56.i + var50.i; + /* 18: absw */ + var58.i = ORC_ABS (var57.i); + /* 19: convuwl */ + var59.i = (orc_uint16) var58.i; + /* 21: cmpgtsl */ + var60.i = (var59.i > var45.i) ? (~0) : 0; + /* 22: andl */ + var61.i = var59.i & var60.i; + /* 23: accl */ + var12.i = ((orc_uint32) var12.i) + ((orc_uint32) var61.i); } *a1 = var12.i; @@ -993,12 +986,8 @@ _backup_fieldanalysis_orc_opposite_parity_5_tap_planar_yuv (OrcExecutor * #else orc_union16 var44; #endif -#if defined(__APPLE__) && __GNUC__ == 4 && __GNUC_MINOR__ == 2 && defined (__i386__) - volatile orc_union16 var45; -#else - orc_union16 var45; -#endif - orc_union32 var46; + orc_union32 var45; + orc_union16 var46; orc_union16 var47; orc_union16 var48; orc_union16 var49; @@ -1011,10 +1000,9 @@ _backup_fieldanalysis_orc_opposite_parity_5_tap_planar_yuv (OrcExecutor * orc_union16 var56; orc_union16 var57; orc_union16 var58; - orc_union16 var59; + orc_union32 var59; orc_union32 var60; orc_union32 var61; - orc_union32 var62; ptr4 = (orc_int8 *) ex->arrays[4]; ptr5 = (orc_int8 *) ex->arrays[5]; @@ -1024,56 +1012,54 @@ _backup_fieldanalysis_orc_opposite_parity_5_tap_planar_yuv (OrcExecutor * /* 11: loadpw */ var44.i = (int) 0x00000003; /* 3 or 1.4822e-323f */ - /* 13: loadpw */ - var45.i = (int) 0x00000003; /* 3 or 1.4822e-323f */ - /* 21: loadpl */ - var46.i = ex->params[24]; + /* 20: loadpl */ + var45.i = ex->params[24]; for (i = 0; i < n; i++) { /* 0: loadb */ var39 = ptr4[i]; /* 1: convubw */ - var47.i = (orc_uint8) var39; + var46.i = (orc_uint8) var39; /* 2: loadb */ var40 = ptr5[i]; /* 3: convubw */ - var48.i = (orc_uint8) var40; + var47.i = (orc_uint8) var40; /* 4: loadb */ var41 = ptr6[i]; /* 5: convubw */ - var49.i = (orc_uint8) var41; + var48.i = (orc_uint8) var41; /* 6: loadb */ var42 = ptr7[i]; /* 7: convubw */ - var50.i = (orc_uint8) var42; + var49.i = (orc_uint8) var42; /* 8: loadb */ var43 = ptr8[i]; /* 9: convubw */ - var51.i = (orc_uint8) var43; + var50.i = (orc_uint8) var43; /* 10: shlw */ - var52.i = var49.i << 2; + var51.i = ((orc_uint16) var48.i) << 2; /* 12: mullw */ - var53.i = (var48.i * var44.i) & 0xffff; - /* 14: mullw */ - var54.i = (var50.i * var45.i) & 0xffff; - /* 15: subw */ - var55.i = var47.i - var53.i; - /* 16: addw */ - var56.i = var55.i + var52.i; - /* 17: subw */ - var57.i = var56.i - var54.i; - /* 18: addw */ - var58.i = var57.i + var51.i; - /* 19: absw */ - var59.i = ORC_ABS (var58.i); - /* 20: convuwl */ - var60.i = (orc_uint16) var59.i; - /* 22: cmpgtsl */ - var61.i = (var60.i > var46.i) ? (~0) : 0; - /* 23: andl */ - var62.i = var60.i & var61.i; - /* 24: accl */ - var12.i = var12.i + var62.i; + var52.i = (var47.i * var44.i) & 0xffff; + /* 13: mullw */ + var53.i = (var49.i * var44.i) & 0xffff; + /* 14: subw */ + var54.i = var46.i - var52.i; + /* 15: addw */ + var55.i = var54.i + var51.i; + /* 16: subw */ + var56.i = var55.i - var53.i; + /* 17: addw */ + var57.i = var56.i + var50.i; + /* 18: absw */ + var58.i = ORC_ABS (var57.i); + /* 19: convuwl */ + var59.i = (orc_uint16) var58.i; + /* 21: cmpgtsl */ + var60.i = (var59.i > var45.i) ? (~0) : 0; + /* 22: andl */ + var61.i = var59.i & var60.i; + /* 23: accl */ + var12.i = ((orc_uint32) var12.i) + ((orc_uint32) var61.i); } ex->accumulators[0] = var12.i; @@ -1102,7 +1088,7 @@ fieldanalysis_orc_opposite_parity_5_tap_planar_yuv (guint32 * ORC_RESTRICT a1, 97, 114, 105, 116, 121, 95, 53, 95, 116, 97, 112, 95, 112, 108, 97, 110, 97, 114, 95, 121, 117, 118, 12, 1, 1, 12, 1, 1, 12, 1, 1, 12, 1, - 1, 12, 1, 1, 13, 4, 14, 4, 2, 0, 0, 0, 14, 4, 3, 0, + 1, 12, 1, 1, 13, 4, 14, 2, 2, 0, 0, 0, 14, 2, 3, 0, 0, 0, 16, 4, 20, 2, 20, 2, 20, 2, 20, 2, 20, 2, 20, 4, 20, 4, 150, 32, 4, 150, 33, 5, 150, 34, 6, 150, 35, 7, 150, 36, 8, 93, 34, 34, 16, 89, 33, 33, 17, 89, 35, 35, 17, 98, 32, 32, @@ -1125,8 +1111,8 @@ fieldanalysis_orc_opposite_parity_5_tap_planar_yuv (guint32 * ORC_RESTRICT a1, orc_program_add_source (p, 1, "s4"); orc_program_add_source (p, 1, "s5"); orc_program_add_accumulator (p, 4, "a1"); - orc_program_add_constant (p, 4, 0x00000002, "c1"); - orc_program_add_constant (p, 4, 0x00000003, "c2"); + orc_program_add_constant (p, 2, 0x00000002, "c1"); + orc_program_add_constant (p, 2, 0x00000003, "c2"); orc_program_add_parameter (p, 4, "p1"); orc_program_add_temporary (p, 2, "t1"); orc_program_add_temporary (p, 2, "t2"); diff --git a/gst/gaudieffects/gstgaudieffectsorc-dist.c b/gst/gaudieffects/gstgaudieffectsorc-dist.c index b09cc47c25..0ca7fc1975 100644 --- a/gst/gaudieffects/gstgaudieffectsorc-dist.c +++ b/gst/gaudieffects/gstgaudieffectsorc-dist.c @@ -228,10 +228,10 @@ gaudi_orc_burn (guint32 * ORC_RESTRICT d1, const guint32 * ORC_RESTRICT s1, var44.x4[2] = (orc_uint8) var43.x4[2]; var44.x4[3] = (orc_uint8) var43.x4[3]; /* 9: shlw */ - var45.x4[0] = var44.x4[0] << 7; - var45.x4[1] = var44.x4[1] << 7; - var45.x4[2] = var44.x4[2] << 7; - var45.x4[3] = var44.x4[3] << 7; + var45.x4[0] = ((orc_uint16) var44.x4[0]) << 7; + var45.x4[1] = ((orc_uint16) var44.x4[1]) << 7; + var45.x4[2] = ((orc_uint16) var44.x4[2]) << 7; + var45.x4[3] = ((orc_uint16) var44.x4[3]) << 7; /* 10: divluw */ var46.x4[0] = ((var42.x4[0] & 0xff) == @@ -349,10 +349,10 @@ _backup_gaudi_orc_burn (OrcExecutor * ORC_RESTRICT ex) var44.x4[2] = (orc_uint8) var43.x4[2]; var44.x4[3] = (orc_uint8) var43.x4[3]; /* 9: shlw */ - var45.x4[0] = var44.x4[0] << 7; - var45.x4[1] = var44.x4[1] << 7; - var45.x4[2] = var44.x4[2] << 7; - var45.x4[3] = var44.x4[3] << 7; + var45.x4[0] = ((orc_uint16) var44.x4[0]) << 7; + var45.x4[1] = ((orc_uint16) var44.x4[1]) << 7; + var45.x4[2] = ((orc_uint16) var44.x4[2]) << 7; + var45.x4[3] = ((orc_uint16) var44.x4[3]) << 7; /* 10: divluw */ var46.x4[0] = ((var42.x4[0] & 0xff) == diff --git a/win32/common/config.h b/win32/common/config.h index 4c5db01341..3d1d3b6b97 100644 --- a/win32/common/config.h +++ b/win32/common/config.h @@ -86,7 +86,7 @@ #define GST_PACKAGE_ORIGIN "Unknown package origin" /* GStreamer package release date/time for plugins as YYYY-MM-DD */ -#define GST_PACKAGE_RELEASE_DATETIME "2014-11-06" +#define GST_PACKAGE_RELEASE_DATETIME "2014-12-18" /* Define if static plugins should be built */ #undef GST_PLUGIN_BUILD_STATIC @@ -640,7 +640,7 @@ #define PACKAGE_NAME "GStreamer Bad Plug-ins" /* Define to the full name and version of this package. */ -#define PACKAGE_STRING "GStreamer Bad Plug-ins 1.4.4" +#define PACKAGE_STRING "GStreamer Bad Plug-ins 1.4.5" /* Define to the one symbol short name of this package. */ #define PACKAGE_TARNAME "gst-plugins-bad" @@ -649,7 +649,7 @@ #undef PACKAGE_URL /* Define to the version of this package. */ -#define PACKAGE_VERSION "1.4.4" +#define PACKAGE_VERSION "1.4.5" /* directory where plugins are located */ #ifdef _DEBUG @@ -689,7 +689,7 @@ #undef USE_EGL_RPI /* Version number of package */ -#define VERSION "1.4.4" +#define VERSION "1.4.5" /* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most significant byte first (like Motorola and SPARC, unlike Intel). */ |