diff options
| author | Sebastian Dröge <sebastian@centricular.com> | 2014-12-18 12:30:10 +0100 |
|---|---|---|
| committer | Sebastian Dröge <sebastian@centricular.com> | 2014-12-18 12:30:10 +0100 |
| commit | 094f90c4c55da9017decb80b922e48cda77a93c6 (patch) | |
| tree | fba82e9a2fd09793e76b8df3eb3b36f7a2853a1a | |
| parent | 508a3df0953ee70f9fbcab84a4618f71abab9249 (diff) | |
Release 1.4.51.4.5
40 files changed, 1301 insertions, 1172 deletions
@@ -1,9 +1,297 @@ +=== release 1.4.5 === + +2014-12-18 Sebastian Dröge <slomo@coaxion.net> + + * configure.ac: + releasing 1.4.5 + +2014-12-09 22:47:31 -0300 Thiago Santos <thiagoss@osg.samsung.com> + + * gst-libs/gst/audio/gstaudiodecoder.c: + audiodecoder: do not use fixed caps on source pad + decoders can change the caps on their source pads, so they don't + use fixed caps. Having fixed caps can cause renegotiation issues. + +2014-12-09 22:46:42 -0300 Thiago Santos <thiagoss@osg.samsung.com> + + * gst-libs/gst/video/gstvideodecoder.c: + videodecoder: do not use fixed caps on source pad + decoders can change the caps on their source pads, so they don't + use fixed caps. Having fixed caps can cause renegotiation issues. + +2014-12-16 15:03:55 +0100 Sebastian Dröge <sebastian@centricular.com> + + * gst-libs/gst/video/gstvideosink.c: + * tests/check/libs/video.c: + Revert "video: Fix non-default usage of gst_video_sink_center_rect" + This reverts commit 899461d722e45f591eeddf33c405677170d63de4. + There seems to be a lot of code out there that does not properly initialize + the rectangles and then causes undefined behaviour. Including our video sinks. + Let's keep this out of 1.4, fix everything everywhere and keep it in 1.6 + +2014-12-16 12:57:55 +0100 Wim Taymans <wtaymans@redhat.com> + + * sys/ximage/ximagesink.c: + * sys/xvimage/xvimagesink.c: + ximagesink: clear src and dest rectangles + Now that the center function also takes into account the x and y + coordinates of the dest rectangle, better clear all the fields before + using them. + +2014-12-16 12:10:53 +0100 Song Bing <b06498@freescale.com> + + * gst-libs/gst/video/gstvideopool.c: + * sys/ximage/ximagepool.c: + * sys/xvimage/xvimagepool.c: + videopool: update buffer size after video alignment + Update the new buffer size after alignment in the pool configuration + before calling the parent set_config. This ensures that the parent knows + about the buffer size that we will allocate and makes the size check + work in the release_buffer method. + Fixes https://bugzilla.gnome.org/show_bug.cgi?id=741420 + +2014-12-15 14:10:17 +0100 Edward Hervey <bilboed@bilboed.com> + + * gst-libs/gst/video/gstvideosink.c: + * tests/check/libs/video.c: + video: Fix non-default usage of gst_video_sink_center_rect + Make sure we take into account non-0 x/y destination rectangles + +2014-12-15 09:45:43 +0100 Sebastian Dröge <sebastian@centricular.com> + + * gst/playback/gstdecodebin2.c: + Revert "decodebin: Only emit the drain signal for the main decode chain, not any subchains" + This reverts commit a391dfe17f1a325f60e1d51a6d40c1a68eb196de. + It breaks gapless playback: https://bugzilla.gnome.org/show_bug.cgi?id=740045 + +2014-11-28 13:29:37 +0000 Tim-Philipp Müller <tim@centricular.com> + + * tests/check/Makefile.am: + tests: don't run orc/* tests under valgrind + They just seem to blow up for some reason that needs investigating. + +2014-12-12 14:56:36 +0000 Tim-Philipp Müller <tim@centricular.com> + + * tests/check/libs/audiodecoder.c: + tests: audiodecoder: fix broken refcounting in unit test + The set_format vfunc does not pass ownership of the caps + to the decoder, so we mustn't unref the caps there. + gst_event_new_caps() does not take ownership of the caps + passed, so we must unref the caps afterwards. + Fixes leaks when running test in valgrind in 1.4 branch. + +2014-12-11 13:45:38 +0100 Thibault Saunier <tsaunier@gnome.org> + + * gst/playback/gstplaybin2.c: + playbin: Do not mix up stream type when getting stream combiner element + We were always returning the video stream combiner whatever stream type + combiner was wanted. + +2014-12-10 13:23:23 -0300 Thiago Santos <thiagoss@osg.samsung.com> + + * gst/playback/gstplaybin2.c: + playbin2: always unref the combiner sinkpad when removing the srcpad + Create a function to do the pad cleanup of the GstSourceCombine struct + and use it to not forget to also cleanup the sink pad and fix a memory + leak. + https://bugzilla.gnome.org/show_bug.cgi?id=741198 + +2014-12-11 01:53:15 +1100 Jan Schmidt <jan@centricular.com> + + * gst-libs/gst/video/gstvideodecoder.h: + videodecoder: Add GST_VIDEO_DECODER_CAST macro + It's used in some macros already, so let's make it exist. + +2014-11-25 13:31:48 +0100 Göran Jönsson <goranjn@axis.com> + + * gst-libs/gst/rtsp/gstrtspconnection.c: + rtspconnection: No remove child if destroyed. + Fixes https://bugzilla.gnome.org/show_bug.cgi?id=740730 + +2014-11-28 15:06:27 +0100 Mathieu Duponchelle <mathieu.duponchelle@opencreed.com> + + * gst-libs/gst/audio/gstaudiodecoder.c: + * tests/check/libs/audiodecoder.c: + audiodecoder: Push pending events before sending EOS. + Segments are added to the pending events, and pushing a segment + is mandatory before sending EOS. + + Adds a test. + https://bugzilla.gnome.org/show_bug.cgi?id=740853 + +2014-12-02 15:58:00 -0500 Chad <crh184@psu.edu> + + * gst/audiorate/gstaudiorate.c: + audiorate: Use gst_util_uint64_scale_int_round() + Using gst_util_uint64_scale_int() causes slight drift + which accumulates over time. + https://bugzilla.gnome.org/show_bug.cgi?id=741045 + +2014-12-01 22:28:52 -0300 Thiago Santos <thiagoss@osg.samsung.com> + + * tools/gst-play.c: + gst-play: do not set system's volume to 100% by default + Only change the volume if requested + +2014-12-01 09:50:24 +0100 Thomas Klausner <wiz@danbala.tuwien.ac.at> + + * ext/alsa/gstalsasink.c: + * ext/alsa/gstalsasrc.c: + alsa: Use EPIPE instead of ESTRPIPE if the latter does not exist + NetBSD does not have ESTRPIPE. + https://bugzilla.gnome.org/show_bug.cgi?id=740952 + +2014-11-25 11:38:34 +0300 Andrei Sarakeev <sarakusha@gmail.com> + + * gst/playback/gstplaysink.c: + playsink: Reset mute property of the sink to playsink's value when setting up the audio chain + Otherwise the following can happen: + 1. set mute=true + 2. play media1 (Ok) + 3. play media without audio (audiochain removed) + 4. play media2 (audiochain created, mute=*false*) + https://bugzilla.gnome.org/show_bug.cgi?id=740675 + +2014-11-25 11:38:34 +0300 Andrei Sarakeev <sarakusha@gmail.com> + + * gst-libs/gst/pbutils/gstdiscoverer.h: + discoverer: fix typo in header file + https://bugzilla.gnome.org/show_bug.cgi?id=740675 + +2014-11-25 09:08:18 +0000 Tim-Philipp Müller <tim@centricular.com> + + * gst-libs/gst/pbutils/descriptions.c: + pbutils: add description for audio/x-audible + +2014-11-25 01:02:28 +0000 Tim-Philipp Müller <tim@centricular.com> + + * gst/typefind/gsttypefindfunctions.c: + typefind: improve 'audible' audio typefinder a little + Don't return NEARLY_CERTAIN just based on 4 bytes. + Also change media type to audio/x-audible. + https://bugzilla.gnome.org/show_bug.cgi?id=715050 + +2013-11-23 11:36:43 +1000 Jonathan Matthew <jonathan@d14n.org> + + * gst/typefind/gsttypefindfunctions.c: + typefindfunctions: add audio/audible typefinder + https://bugzilla.gnome.org/show_bug.cgi?id=715050 + +2014-11-22 21:51:33 +0100 Matej Knopp <matej.knopp@gmail.com> + + * gst-libs/gst/video/gstvideoencoder.c: + videoencoder: don't complain about PTS != DTS on keyframes + It is valid for streams with b-frames + https://bugzilla.gnome.org/show_bug.cgi?id=740556 + +2014-07-26 14:52:01 +0100 Tim-Philipp Müller <tim@centricular.com> + + * gst/playback/gstplaybin2.c: + playbin: fix 'attempt to unlock mutex that was not locked' in error code path + Fixes playbin unit test with latest GLib. + +2014-11-09 14:44:36 +0000 Tim-Philipp Müller <tim@centricular.com> + + * gst-libs/gst/pbutils/descriptions.c: + pbutils: add description for Apple Core Audio Format + https://bugzilla.gnome.org/show_bug.cgi?id=739840 + +2014-11-09 12:53:32 +0100 Peter G. Baum <peter@dr-baum.net> + + * gst/typefind/gsttypefindfunctions.c: + typefind: recognize Apple Core Audio Format + (CAF) Specification 1.0 + https://bugzilla.gnome.org/show_bug.cgi?id=739840 + +2014-11-06 14:14:22 +0000 William Manley <will@williammanley.net> + + * gst/tcp/gstmultihandlesink.c: + * gst/tcp/gsttcpserversink.c: + tcpserversink: Don't leak a `GSocket` and a `GInetSocketAddress` + when accepting a connection. + Discovered by `make check-valgrind` with the new `socketintegrationtest`. + https://bugzilla.gnome.org/show_bug.cgi?id=739544 + === release 1.4.4 === -2014-11-06 Sebastian Dröge <slomo@coaxion.net> +2014-11-06 12:52:52 +0100 Sebastian Dröge <sebastian@centricular.com> + * ChangeLog: + * NEWS: + * RELEASE: * configure.ac: - releasing 1.4.4 + * docs/plugins/gst-plugins-base-plugins.hierarchy: + * docs/plugins/inspect/plugin-adder.xml: + * docs/plugins/inspect/plugin-alsa.xml: + * docs/plugins/inspect/plugin-app.xml: + * docs/plugins/inspect/plugin-audioconvert.xml: + * docs/plugins/inspect/plugin-audiorate.xml: + * docs/plugins/inspect/plugin-audioresample.xml: + * docs/plugins/inspect/plugin-audiotestsrc.xml: + * docs/plugins/inspect/plugin-cdparanoia.xml: + * docs/plugins/inspect/plugin-encoding.xml: + * docs/plugins/inspect/plugin-gio.xml: + * docs/plugins/inspect/plugin-libvisual.xml: + * docs/plugins/inspect/plugin-ogg.xml: + * docs/plugins/inspect/plugin-pango.xml: + * docs/plugins/inspect/plugin-playback.xml: + * docs/plugins/inspect/plugin-subparse.xml: + * docs/plugins/inspect/plugin-tcp.xml: + * docs/plugins/inspect/plugin-theora.xml: + * docs/plugins/inspect/plugin-typefindfunctions.xml: + * docs/plugins/inspect/plugin-videoconvert.xml: + * docs/plugins/inspect/plugin-videorate.xml: + * docs/plugins/inspect/plugin-videoscale.xml: + * docs/plugins/inspect/plugin-videotestsrc.xml: + * docs/plugins/inspect/plugin-volume.xml: + * docs/plugins/inspect/plugin-vorbis.xml: + * docs/plugins/inspect/plugin-ximagesink.xml: + * docs/plugins/inspect/plugin-xvimagesink.xml: + * gst-plugins-base.doap: + * win32/common/_stdint.h: + * win32/common/config.h: + Release 1.4.4 + +2014-11-06 12:36:18 +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/lt.po: + * po/lv.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 09:39:08 +0000 Tim-Philipp Müller <tim@centricular.com> @@ -1,2 +1,2 @@ -This is GStreamer Base Plugins 1.4.4 +This is GStreamer Base Plugins 1.4.5 @@ -1,5 +1,5 @@ -Release notes for GStreamer Base Plugins 1.4.4 +Release notes for GStreamer Base 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 @@ -71,12 +71,17 @@ contains a set of codecs plugins based on libav (formerly gst-ffmpeg) Bugs fixed in this release - * 736969 : queue2: dead lock when buffering - * 737055 : audiosink: Setting URI on playbin at about-to-finish when playing AAC and using an alsasink causes delayed playback - * 737706 : videoencoder: release frame in finish_frame when no output state is configured - * 737742 : vorbisdec: Crashes when handling more than 8 channels - * 737752 : rtsp-client: crash when cleaning up session - * 738064 : decodebin: The “drained” signal is emitted multiple times, first time too early (~1s) + * 741420 : video pools: should update size in configuration after applying alignment + * 715050 : add typefinder for audio/x-audible + * 739544 : tcp: Add test and fix memory leak in tcp elements + * 739840 : typefind should recognize Apple Core Audio Format (CAF) + * 740556 : videodecoder: don't complain when DTS != PTS on keyframes + * 740675 : playsink: continues playback, reset mute property + * 740730 : rtspconnection: don't remove child source if parent source is already destroyed + * 740853 : audiodecoder: Push pending events before sending EOS. + * 740952 : alsa: NetBSD fixes + * 741045 : audiorate can can lose timestamp precision in some cases + * 741198 : playbin: leaks GstPads ==== Download ==== @@ -113,11 +118,21 @@ subscribe to the gstreamer-devel list. Contributors to this release - * Aleix Conchillo Flaqué * Andrei Sarakeev - * Aurélien Zanelli - * Heinrich Fink + * Chad + * Edward Hervey + * Göran Jönsson + * Jan Schmidt + * Jonathan Matthew + * Matej Knopp + * Mathieu Duponchelle + * Peter G. Baum * Sebastian Dröge + * Song Bing * Thiago Santos + * Thibault Saunier + * Thomas Klausner * Tim-Philipp Müller + * William Manley + * Wim Taymans
\ No newline at end of file diff --git a/configure.ac b/configure.ac index f36799442..4633c8408 100644 --- a/configure.ac +++ b/configure.ac @@ -5,7 +5,7 @@ dnl please read gstreamer/docs/random/autotools before changing this file dnl initialize autoconf dnl releases only do -Wall, git and prerelease does -Werror too dnl use a three digit version number for releases, and four for git/prerelease -AC_INIT([GStreamer Base Plug-ins],[1.4.4],[http://bugzilla.gnome.org/enter_bug.cgi?product=GStreamer],[gst-plugins-base]) +AC_INIT([GStreamer Base Plug-ins],[1.4.5],[http://bugzilla.gnome.org/enter_bug.cgi?product=GStreamer],[gst-plugins-base]) AG_GST_INIT @@ -56,7 +56,7 @@ dnl 1.2.5 => 205 dnl 1.10.9 (who knows) => 1009 dnl 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-adder.xml b/docs/plugins/inspect/plugin-adder.xml index 3512319b5..939a772fd 100644 --- a/docs/plugins/inspect/plugin-adder.xml +++ b/docs/plugins/inspect/plugin-adder.xml @@ -3,7 +3,7 @@ <description>Adds multiple streams</description> <filename>../../gst/adder/.libs/libgstadder.so</filename> <basename>libgstadder.so</basename> - <version>1.4.4</version> + <version>1.4.5</version> <license>LGPL</license> <source>gst-plugins-base</source> <package>GStreamer Base Plug-ins source release</package> diff --git a/docs/plugins/inspect/plugin-alsa.xml b/docs/plugins/inspect/plugin-alsa.xml index 3b63fb161..f61707e33 100644 --- a/docs/plugins/inspect/plugin-alsa.xml +++ b/docs/plugins/inspect/plugin-alsa.xml @@ -3,7 +3,7 @@ <description>ALSA plugin library</description> <filename>../../ext/alsa/.libs/libgstalsa.so</filename> <basename>libgstalsa.so</basename> - <version>1.4.4</version> + <version>1.4.5</version> <license>LGPL</license> <source>gst-plugins-base</source> <package>GStreamer Base Plug-ins source release</package> diff --git a/docs/plugins/inspect/plugin-app.xml b/docs/plugins/inspect/plugin-app.xml index 54db60559..45a9525d2 100644 --- a/docs/plugins/inspect/plugin-app.xml +++ b/docs/plugins/inspect/plugin-app.xml @@ -3,7 +3,7 @@ <description>Elements used to communicate with applications</description> <filename>../../gst/app/.libs/libgstapp.so</filename> <basename>libgstapp.so</basename> - <version>1.4.4</version> + <version>1.4.5</version> <license>LGPL</license> <source>gst-plugins-base</source> <package>GStreamer Base Plug-ins source release</package> diff --git a/docs/plugins/inspect/plugin-audioconvert.xml b/docs/plugins/inspect/plugin-audioconvert.xml index d7e24f0f8..5179a0518 100644 --- a/docs/plugins/inspect/plugin-audioconvert.xml +++ b/docs/plugins/inspect/plugin-audioconvert.xml @@ -3,7 +3,7 @@ <description>Convert audio to different formats</description> <filename>../../gst/audioconvert/.libs/libgstaudioconvert.so</filename> <basename>libgstaudioconvert.so</basename> - <version>1.4.4</version> + <version>1.4.5</version> <license>LGPL</license> <source>gst-plugins-base</source> <package>GStreamer Base Plug-ins source release</package> diff --git a/docs/plugins/inspect/plugin-audiorate.xml b/docs/plugins/inspect/plugin-audiorate.xml index f83e2f745..20294f3e2 100644 --- a/docs/plugins/inspect/plugin-audiorate.xml +++ b/docs/plugins/inspect/plugin-audiorate.xml @@ -3,7 +3,7 @@ <description>Adjusts audio frames</description> <filename>../../gst/audiorate/.libs/libgstaudiorate.so</filename> <basename>libgstaudiorate.so</basename> - <version>1.4.4</version> + <version>1.4.5</version> <license>LGPL</license> <source>gst-plugins-base</source> <package>GStreamer Base Plug-ins source release</package> diff --git a/docs/plugins/inspect/plugin-audioresample.xml b/docs/plugins/inspect/plugin-audioresample.xml index cb20331e5..87136099f 100644 --- a/docs/plugins/inspect/plugin-audioresample.xml +++ b/docs/plugins/inspect/plugin-audioresample.xml @@ -3,7 +3,7 @@ <description>Resamples audio</description> <filename>../../gst/audioresample/.libs/libgstaudioresample.so</filename> <basename>libgstaudioresample.so</basename> - <version>1.4.4</version> + <version>1.4.5</version> <license>LGPL</license> <source>gst-plugins-base</source> <package>GStreamer Base Plug-ins source release</package> diff --git a/docs/plugins/inspect/plugin-audiotestsrc.xml b/docs/plugins/inspect/plugin-audiotestsrc.xml index 667351c80..cf912a305 100644 --- a/docs/plugins/inspect/plugin-audiotestsrc.xml +++ b/docs/plugins/inspect/plugin-audiotestsrc.xml @@ -3,7 +3,7 @@ <description>Creates audio test signals of given frequency and volume</description> <filename>../../gst/audiotestsrc/.libs/libgstaudiotestsrc.so</filename> <basename>libgstaudiotestsrc.so</basename> - <version>1.4.4</version> + <version>1.4.5</version> <license>LGPL</license> <source>gst-plugins-base</source> <package>GStreamer Base Plug-ins source release</package> diff --git a/docs/plugins/inspect/plugin-cdparanoia.xml b/docs/plugins/inspect/plugin-cdparanoia.xml index 9f1e9d172..381f4e73a 100644 --- a/docs/plugins/inspect/plugin-cdparanoia.xml +++ b/docs/plugins/inspect/plugin-cdparanoia.xml @@ -3,7 +3,7 @@ <description>Read audio from CD in paranoid mode</description> <filename>../../ext/cdparanoia/.libs/libgstcdparanoia.so</filename> <basename>libgstcdparanoia.so</basename> - <version>1.4.4</version> + <version>1.4.5</version> <license>LGPL</license> <source>gst-plugins-base</source> <package>GStreamer Base Plug-ins source release</package> diff --git a/docs/plugins/inspect/plugin-encoding.xml b/docs/plugins/inspect/plugin-encoding.xml index e60c871e2..5d3b66c37 100644 --- a/docs/plugins/inspect/plugin-encoding.xml +++ b/docs/plugins/inspect/plugin-encoding.xml @@ -3,7 +3,7 @@ <description>various encoding-related elements</description> <filename>../../gst/encoding/.libs/libgstencodebin.so</filename> <basename>libgstencodebin.so</basename> - <version>1.4.4</version> + <version>1.4.5</version> <license>LGPL</license> <source>gst-plugins-base</source> <package>GStreamer Base Plug-ins source release</package> diff --git a/docs/plugins/inspect/plugin-gio.xml b/docs/plugins/inspect/plugin-gio.xml index c6212e27b..731b634b8 100644 --- a/docs/plugins/inspect/plugin-gio.xml +++ b/docs/plugins/inspect/plugin-gio.xml @@ -3,7 +3,7 @@ <description>GIO elements</description> <filename>../../gst/gio/.libs/libgstgio.so</filename> <basename>libgstgio.so</basename> - <version>1.4.4</version> + <version>1.4.5</version> <license>LGPL</license> <source>gst-plugins-base</source> <package>GStreamer Base Plug-ins source release</package> diff --git a/docs/plugins/inspect/plugin-libvisual.xml b/docs/plugins/inspect/plugin-libvisual.xml index ab242e95a..9154ca29e 100644 --- a/docs/plugins/inspect/plugin-libvisual.xml +++ b/docs/plugins/inspect/plugin-libvisual.xml @@ -3,7 +3,7 @@ <description>libvisual visualization plugins</description> <filename>../../ext/libvisual/.libs/libgstlibvisual.so</filename> <basename>libgstlibvisual.so</basename> - <version>1.4.4</version> + <version>1.4.5</version> <license>LGPL</license> <source>gst-plugins-base</source> <package>GStreamer Base Plug-ins source release</package> diff --git a/docs/plugins/inspect/plugin-ogg.xml b/docs/plugins/inspect/plugin-ogg.xml index c509b5d16..f012757fa 100644 --- a/docs/plugins/inspect/plugin-ogg.xml +++ b/docs/plugins/inspect/plugin-ogg.xml @@ -3,7 +3,7 @@ <description>ogg stream manipulation (info about ogg: http://xiph.org)</description> <filename>../../ext/ogg/.libs/libgstogg.so</filename> <basename>libgstogg.so</basename> - <version>1.4.4</version> + <version>1.4.5</version> <license>LGPL</license> <source>gst-plugins-base</source> <package>GStreamer Base Plug-ins source release</package> diff --git a/docs/plugins/inspect/plugin-pango.xml b/docs/plugins/inspect/plugin-pango.xml index e8e38c901..a5a557b5c 100644 --- a/docs/plugins/inspect/plugin-pango.xml +++ b/docs/plugins/inspect/plugin-pango.xml @@ -3,7 +3,7 @@ <description>Pango-based text rendering and overlay</description> <filename>../../ext/pango/.libs/libgstpango.so</filename> <basename>libgstpango.so</basename> - <version>1.4.4</version> + <version>1.4.5</version> <license>LGPL</license> <source>gst-plugins-base</source> <package>GStreamer Base Plug-ins source release</package> diff --git a/docs/plugins/inspect/plugin-playback.xml b/docs/plugins/inspect/plugin-playback.xml index bcb1874a1..de564940d 100644 --- a/docs/plugins/inspect/plugin-playback.xml +++ b/docs/plugins/inspect/plugin-playback.xml @@ -3,7 +3,7 @@ <description>various playback elements</description> <filename>../../gst/playback/.libs/libgstplayback.so</filename> <basename>libgstplayback.so</basename> - <version>1.4.4</version> + <version>1.4.5</version> <license>LGPL</license> <source>gst-plugins-base</source> <package>GStreamer Base Plug-ins source release</package> diff --git a/docs/plugins/inspect/plugin-subparse.xml b/docs/plugins/inspect/plugin-subparse.xml index f70689dae..6089257b5 100644 --- a/docs/plugins/inspect/plugin-subparse.xml +++ b/docs/plugins/inspect/plugin-subparse.xml @@ -3,7 +3,7 @@ <description>Subtitle parsing</description> <filename>../../gst/subparse/.libs/libgstsubparse.so</filename> <basename>libgstsubparse.so</basename> - <version>1.4.4</version> + <version>1.4.5</version> <license>LGPL</license> <source>gst-plugins-base</source> <package>GStreamer Base Plug-ins source release</package> diff --git a/docs/plugins/inspect/plugin-tcp.xml b/docs/plugins/inspect/plugin-tcp.xml index 76e0254d9..621cc0b00 100644 --- a/docs/plugins/inspect/plugin-tcp.xml +++ b/docs/plugins/inspect/plugin-tcp.xml @@ -3,7 +3,7 @@ <description>transfer data over the network via TCP</description> <filename>../../gst/tcp/.libs/libgsttcp.so</filename> <basename>libgsttcp.so</basename> - <version>1.4.4</version> + <version>1.4.5</version> <license>LGPL</license> <source>gst-plugins-base</source> <package>GStreamer Base Plug-ins source release</package> diff --git a/docs/plugins/inspect/plugin-theora.xml b/docs/plugins/inspect/plugin-theora.xml index e1594a73f..bc274420c 100644 --- a/docs/plugins/inspect/plugin-theora.xml +++ b/docs/plugins/inspect/plugin-theora.xml @@ -3,7 +3,7 @@ <description>Theora plugin library</description> <filename>../../ext/theora/.libs/libgsttheora.so</filename> <basename>libgsttheora.so</basename> - <version>1.4.4</version> + <version>1.4.5</version> <license>LGPL</license> <source>gst-plugins-base</source> <package>GStreamer Base Plug-ins source release</package> diff --git a/docs/plugins/inspect/plugin-typefindfunctions.xml b/docs/plugins/inspect/plugin-typefindfunctions.xml index f3c2e7d43..71cfe4560 100644 --- a/docs/plugins/inspect/plugin-typefindfunctions.xml +++ b/docs/plugins/inspect/plugin-typefindfunctions.xml @@ -3,7 +3,7 @@ <description>default typefind functions</description> <filename>../../gst/typefind/.libs/libgsttypefindfunctions.so</filename> <basename>libgsttypefindfunctions.so</basename> - <version>1.4.4</version> + <version>1.4.5</version> <license>LGPL</license> <source>gst-plugins-base</source> <package>GStreamer Base Plug-ins source release</package> diff --git a/docs/plugins/inspect/plugin-videoconvert.xml b/docs/plugins/inspect/plugin-videoconvert.xml index e03625c98..1b7360406 100644 --- a/docs/plugins/inspect/plugin-videoconvert.xml +++ b/docs/plugins/inspect/plugin-videoconvert.xml @@ -3,7 +3,7 @@ <description>Colorspace conversion</description> <filename>../../gst/videoconvert/.libs/libgstvideoconvert.so</filename> <basename>libgstvideoconvert.so</basename> - <version>1.4.4</version> + <version>1.4.5</version> <license>LGPL</license> <source>gst-plugins-base</source> <package>GStreamer Base Plug-ins source release</package> diff --git a/docs/plugins/inspect/plugin-videorate.xml b/docs/plugins/inspect/plugin-videorate.xml index 9167688a4..e7382b69e 100644 --- a/docs/plugins/inspect/plugin-videorate.xml +++ b/docs/plugins/inspect/plugin-videorate.xml @@ -3,7 +3,7 @@ <description>Adjusts video frames</description> <filename>../../gst/videorate/.libs/libgstvideorate.so</filename> <basename>libgstvideorate.so</basename> - <version>1.4.4</version> + <version>1.4.5</version> <license>LGPL</license> <source>gst-plugins-base</source> <package>GStreamer Base Plug-ins source release</package> diff --git a/docs/plugins/inspect/plugin-videoscale.xml b/docs/plugins/inspect/plugin-videoscale.xml index 4bad5ded4..7941dcbb0 100644 --- a/docs/plugins/inspect/plugin-videoscale.xml +++ b/docs/plugins/inspect/plugin-videoscale.xml @@ -3,7 +3,7 @@ <description>Resizes video</description> <filename>../../gst/videoscale/.libs/libgstvideoscale.so</filename> <basename>libgstvideoscale.so</basename> - <version>1.4.4</version> + <version>1.4.5</version> <license>LGPL</license> <source>gst-plugins-base</source> <package>GStreamer Base Plug-ins source release</package> diff --git a/docs/plugins/inspect/plugin-videotestsrc.xml b/docs/plugins/inspect/plugin-videotestsrc.xml index 9194b5187..a0bc6607b 100644 --- a/docs/plugins/inspect/plugin-videotestsrc.xml +++ b/docs/plugins/inspect/plugin-videotestsrc.xml @@ -3,7 +3,7 @@ <description>Creates a test video stream</description> <filename>../../gst/videotestsrc/.libs/libgstvideotestsrc.so</filename> <basename>libgstvideotestsrc.so</basename> - <version>1.4.4</version> + <version>1.4.5</version> <license>LGPL</license> <source>gst-plugins-base</source> <package>GStreamer Base Plug-ins source release</package> diff --git a/docs/plugins/inspect/plugin-volume.xml b/docs/plugins/inspect/plugin-volume.xml index 9b9d1f7fa..552a54918 100644 --- a/docs/plugins/inspect/plugin-volume.xml +++ b/docs/plugins/inspect/plugin-volume.xml @@ -3,7 +3,7 @@ <description>plugin for controlling audio volume</description> <filename>../../gst/volume/.libs/libgstvolume.so</filename> <basename>libgstvolume.so</basename> - <version>1.4.4</version> + <version>1.4.5</version> <license>LGPL</license> <source>gst-plugins-base</source> <package>GStreamer Base Plug-ins source release</package> diff --git a/docs/plugins/inspect/plugin-vorbis.xml b/docs/plugins/inspect/plugin-vorbis.xml index 9147a4b01..62a11d9e3 100644 --- a/docs/plugins/inspect/plugin-vorbis.xml +++ b/docs/plugins/inspect/plugin-vorbis.xml @@ -3,7 +3,7 @@ <description>Vorbis plugin library</description> <filename>../../ext/vorbis/.libs/libgstvorbis.so</filename> <basename>libgstvorbis.so</basename> - <version>1.4.4</version> + <version>1.4.5</version> <license>LGPL</license> <source>gst-plugins-base</source> <package>GStreamer Base Plug-ins source release</package> diff --git a/docs/plugins/inspect/plugin-ximagesink.xml b/docs/plugins/inspect/plugin-ximagesink.xml index 0b12b605c..609fe395c 100644 --- a/docs/plugins/inspect/plugin-ximagesink.xml +++ b/docs/plugins/inspect/plugin-ximagesink.xml @@ -3,7 +3,7 @@ <description>X11 video output element based on standard Xlib calls</description> <filename>../../sys/ximage/.libs/libgstximagesink.so</filename> <basename>libgstximagesink.so</basename> - <version>1.4.4</version> + <version>1.4.5</version> <license>LGPL</license> <source>gst-plugins-base</source> <package>GStreamer Base Plug-ins source release</package> diff --git a/docs/plugins/inspect/plugin-xvimagesink.xml b/docs/plugins/inspect/plugin-xvimagesink.xml index ba3c91a5d..a08ba54a3 100644 --- a/docs/plugins/inspect/plugin-xvimagesink.xml +++ b/docs/plugins/inspect/plugin-xvimagesink.xml @@ -3,7 +3,7 @@ <description>XFree86 video output plugin using Xv extension</description> <filename>../../sys/xvimage/.libs/libgstxvimagesink.so</filename> <basename>libgstxvimagesink.so</basename> - <version>1.4.4</version> + <version>1.4.5</version> <license>LGPL</license> <source>gst-plugins-base</source> <package>GStreamer Base Plug-ins source release</package> diff --git a/gst-libs/gst/audio/gstaudiopack-dist.c b/gst-libs/gst/audio/gstaudiopack-dist.c index 004e20321..4f8c124c2 100644 --- a/gst-libs/gst/audio/gstaudiopack-dist.c +++ b/gst-libs/gst/audio/gstaudiopack-dist.c @@ -250,7 +250,7 @@ audio_orc_unpack_u8 (gint32 * ORC_RESTRICT d1, const guint8 * ORC_RESTRICT s1, /* 2: convuwl */ var38.i = (orc_uint16) var37.i; /* 3: shll */ - var39.i = var38.i << 24; + var39.i = ((orc_uint32) var38.i) << 24; /* 5: xorl */ var36.i = var39.i ^ var35.i; /* 6: storel */ @@ -292,7 +292,7 @@ _backup_audio_orc_unpack_u8 (OrcExecutor * ORC_RESTRICT ex) /* 2: convuwl */ var38.i = (orc_uint16) var37.i; /* 3: shll */ - var39.i = var38.i << 24; + var39.i = ((orc_uint32) var38.i) << 24; /* 5: xorl */ var36.i = var39.i ^ var35.i; /* 6: storel */ @@ -391,7 +391,7 @@ audio_orc_unpack_s8 (gint32 * ORC_RESTRICT d1, const guint8 * ORC_RESTRICT s1, /* 2: convuwl */ var37.i = (orc_uint16) var36.i; /* 3: shll */ - var35.i = var37.i << 24; + var35.i = ((orc_uint32) var37.i) << 24; /* 4: storel */ ptr0[i] = var35; } @@ -423,7 +423,7 @@ _backup_audio_orc_unpack_s8 (OrcExecutor * ORC_RESTRICT ex) /* 2: convuwl */ var37.i = (orc_uint16) var36.i; /* 3: shll */ - var35.i = var37.i << 24; + var35.i = ((orc_uint32) var37.i) << 24; /* 4: storel */ ptr0[i] = var35; } @@ -522,7 +522,7 @@ audio_orc_unpack_u16 (gint32 * ORC_RESTRICT d1, const guint8 * ORC_RESTRICT s1, /* 1: convuwl */ var36.i = (orc_uint16) var33.i; /* 2: shll */ - var37.i = var36.i << 16; + var37.i = ((orc_uint32) var36.i) << 16; /* 4: xorl */ var35.i = var37.i ^ var34.i; /* 5: storel */ @@ -561,7 +561,7 @@ _backup_audio_orc_unpack_u16 (OrcExecutor * ORC_RESTRICT ex) /* 1: convuwl */ var36.i = (orc_uint16) var33.i; /* 2: shll */ - var37.i = var36.i << 16; + var37.i = ((orc_uint32) var36.i) << 16; /* 4: xorl */ var35.i = var37.i ^ var34.i; /* 5: storel */ @@ -654,7 +654,7 @@ audio_orc_unpack_s16 (gint32 * ORC_RESTRICT d1, const guint8 * ORC_RESTRICT s1, /* 1: convuwl */ var35.i = (orc_uint16) var33.i; /* 2: shll */ - var34.i = var35.i << 16; + var34.i = ((orc_uint32) var35.i) << 16; /* 3: storel */ ptr0[i] = var34; } @@ -683,7 +683,7 @@ _backup_audio_orc_unpack_s16 (OrcExecutor * ORC_RESTRICT ex) /* 1: convuwl */ var35.i = (orc_uint16) var33.i; /* 2: shll */ - var34.i = var35.i << 16; + var34.i = ((orc_uint32) var35.i) << 16; /* 3: storel */ ptr0[i] = var34; } @@ -781,7 +781,7 @@ audio_orc_unpack_u16_swap (gint32 * ORC_RESTRICT d1, /* 2: convuwl */ var38.i = (orc_uint16) var37.i; /* 3: shll */ - var39.i = var38.i << 16; + var39.i = ((orc_uint32) var38.i) << 16; /* 5: xorl */ var36.i = var39.i ^ var35.i; /* 6: storel */ @@ -823,7 +823,7 @@ _backup_audio_orc_unpack_u16_swap (OrcExecutor * ORC_RESTRICT ex) /* 2: convuwl */ var38.i = (orc_uint16) var37.i; /* 3: shll */ - var39.i = var38.i << 16; + var39.i = ((orc_uint32) var38.i) << 16; /* 5: xorl */ var36.i = var39.i ^ var35.i; /* 6: storel */ @@ -923,7 +923,7 @@ audio_orc_unpack_s16_swap (gint32 * ORC_RESTRICT d1, /* 2: convuwl */ var37.i = (orc_uint16) var36.i; /* 3: shll */ - var35.i = var37.i << 16; + var35.i = ((orc_uint32) var37.i) << 16; /* 4: storel */ ptr0[i] = var35; } @@ -955,7 +955,7 @@ _backup_audio_orc_unpack_s16_swap (OrcExecutor * ORC_RESTRICT ex) /* 2: convuwl */ var37.i = (orc_uint16) var36.i; /* 3: shll */ - var35.i = var37.i << 16; + var35.i = ((orc_uint32) var37.i) << 16; /* 4: storel */ ptr0[i] = var35; } @@ -1051,7 +1051,7 @@ audio_orc_unpack_u24_32 (gint32 * ORC_RESTRICT d1, /* 0: loadl */ var33 = ptr4[i]; /* 1: shll */ - var36.i = var33.i << 8; + var36.i = ((orc_uint32) var33.i) << 8; /* 3: xorl */ var35.i = var36.i ^ var34.i; /* 4: storel */ @@ -1087,7 +1087,7 @@ _backup_audio_orc_unpack_u24_32 (OrcExecutor * ORC_RESTRICT ex) /* 0: loadl */ var33 = ptr4[i]; /* 1: shll */ - var36.i = var33.i << 8; + var36.i = ((orc_uint32) var33.i) << 8; /* 3: xorl */ var35.i = var36.i ^ var34.i; /* 4: storel */ @@ -1175,7 +1175,7 @@ audio_orc_unpack_s24_32 (gint32 * ORC_RESTRICT d1, /* 0: loadl */ var32 = ptr4[i]; /* 1: shll */ - var33.i = var32.i << 8; + var33.i = ((orc_uint32) var32.i) << 8; /* 2: storel */ ptr0[i] = var33; } @@ -1201,7 +1201,7 @@ _backup_audio_orc_unpack_s24_32 (OrcExecutor * ORC_RESTRICT ex) /* 0: loadl */ var32 = ptr4[i]; /* 1: shll */ - var33.i = var32.i << 8; + var33.i = ((orc_uint32) var32.i) << 8; /* 2: storel */ ptr0[i] = var33; } @@ -1293,7 +1293,7 @@ audio_orc_unpack_u24_32_swap (gint32 * ORC_RESTRICT d1, /* 1: swapl */ var36.i = ORC_SWAP_L (var33.i); /* 2: shll */ - var37.i = var36.i << 8; + var37.i = ((orc_uint32) var36.i) << 8; /* 4: xorl */ var35.i = var37.i ^ var34.i; /* 5: storel */ @@ -1332,7 +1332,7 @@ _backup_audio_orc_unpack_u24_32_swap (OrcExecutor * ORC_RESTRICT ex) /* 1: swapl */ var36.i = ORC_SWAP_L (var33.i); /* 2: shll */ - var37.i = var36.i << 8; + var37.i = ((orc_uint32) var36.i) << 8; /* 4: xorl */ var35.i = var37.i ^ var34.i; /* 5: storel */ @@ -1426,7 +1426,7 @@ audio_orc_unpack_s24_32_swap (gint32 * ORC_RESTRICT d1, /* 1: swapl */ var35.i = ORC_SWAP_L (var33.i); /* 2: shll */ - var34.i = var35.i << 8; + var34.i = ((orc_uint32) var35.i) << 8; /* 3: storel */ ptr0[i] = var34; } @@ -1455,7 +1455,7 @@ _backup_audio_orc_unpack_s24_32_swap (OrcExecutor * ORC_RESTRICT ex) /* 1: swapl */ var35.i = ORC_SWAP_L (var33.i); /* 2: shll */ - var34.i = var35.i << 8; + var34.i = ((orc_uint32) var35.i) << 8; /* 3: storel */ ptr0[i] = var34; } diff --git a/gst-libs/gst/video/video-orc-dist.c b/gst-libs/gst/video/video-orc-dist.c index fad5d6aa1..9ce4fd9c0 100644 --- a/gst-libs/gst/video/video-orc-dist.c +++ b/gst-libs/gst/video/video-orc-dist.c @@ -259,8 +259,9 @@ video_orc_blend_little (guint8 * ORC_RESTRICT d1, var42 = var41.i; /* 3: splatbl */ var43.i = - ((var42 & 0xff) << 24) | ((var42 & 0xff) << 16) | ((var42 & 0xff) << 8) - | (var42 & 0xff); + ((((orc_uint32) var42) & 0xff) << 24) | ((((orc_uint32) var42) & 0xff) + << 16) | ((((orc_uint32) var42) & 0xff) << 8) | (((orc_uint32) var42) & + 0xff); /* 4: convubw */ var44.x4[0] = (orc_uint8) var43.x4[0]; var44.x4[1] = (orc_uint8) var43.x4[1]; @@ -368,8 +369,9 @@ _backup_video_orc_blend_little (OrcExecutor * ORC_RESTRICT ex) var42 = var41.i; /* 3: splatbl */ var43.i = - ((var42 & 0xff) << 24) | ((var42 & 0xff) << 16) | ((var42 & 0xff) << 8) - | (var42 & 0xff); + ((((orc_uint32) var42) & 0xff) << 24) | ((((orc_uint32) var42) & 0xff) + << 16) | ((((orc_uint32) var42) & 0xff) << 8) | (((orc_uint32) var42) & + 0xff); /* 4: convubw */ var44.x4[0] = (orc_uint8) var43.x4[0]; var44.x4[1] = (orc_uint8) var43.x4[1]; @@ -451,7 +453,7 @@ video_orc_blend_little (guint8 * ORC_RESTRICT d1, static const orc_uint8 bc[] = { 1, 9, 22, 118, 105, 100, 101, 111, 95, 111, 114, 99, 95, 98, 108, 101, 110, 100, 95, 108, 105, 116, 116, 108, 101, 11, 4, 4, 12, 4, 4, 14, - 4, 255, 0, 0, 0, 14, 4, 8, 0, 0, 0, 20, 4, 20, 2, 20, + 4, 255, 0, 0, 0, 14, 2, 8, 0, 0, 0, 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, 95, 38, 38, 17, 21, 2, 150, 37, 32, 113, 32, 0, 21, 2, 150, 36, 32, 21, 2, 98, @@ -468,7 +470,7 @@ video_orc_blend_little (guint8 * ORC_RESTRICT d1, 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_temporary (p, 4, "t1"); orc_program_add_temporary (p, 2, "t2"); orc_program_add_temporary (p, 1, "t3"); @@ -579,8 +581,9 @@ video_orc_blend_big (guint8 * ORC_RESTRICT d1, const guint8 * ORC_RESTRICT s1, var44 = var43.i; /* 4: splatbl */ var45.i = - ((var44 & 0xff) << 24) | ((var44 & 0xff) << 16) | ((var44 & 0xff) << 8) - | (var44 & 0xff); + ((((orc_uint32) var44) & 0xff) << 24) | ((((orc_uint32) var44) & 0xff) + << 16) | ((((orc_uint32) var44) & 0xff) << 8) | (((orc_uint32) var44) & + 0xff); /* 5: convubw */ var46.x4[0] = (orc_uint8) var45.x4[0]; var46.x4[1] = (orc_uint8) var45.x4[1]; @@ -691,8 +694,9 @@ _backup_video_orc_blend_big (OrcExecutor * ORC_RESTRICT ex) var44 = var43.i; /* 4: splatbl */ var45.i = - ((var44 & 0xff) << 24) | ((var44 & 0xff) << 16) | ((var44 & 0xff) << 8) - | (var44 & 0xff); + ((((orc_uint32) var44) & 0xff) << 24) | ((((orc_uint32) var44) & 0xff) + << 16) | ((((orc_uint32) var44) & 0xff) << 8) | (((orc_uint32) var44) & + 0xff); /* 5: convubw */ var46.x4[0] = (orc_uint8) var45.x4[0]; var46.x4[1] = (orc_uint8) var45.x4[1]; @@ -774,7 +778,7 @@ video_orc_blend_big (guint8 * ORC_RESTRICT d1, const guint8 * ORC_RESTRICT s1, static const orc_uint8 bc[] = { 1, 9, 19, 118, 105, 100, 101, 111, 95, 111, 114, 99, 95, 98, 108, 101, 110, 100, 95, 98, 105, 103, 11, 4, 4, 12, 4, 4, 14, 4, 0, 0, - 0, 255, 14, 4, 24, 0, 0, 0, 14, 4, 8, 0, 0, 0, 20, 4, + 0, 255, 14, 4, 24, 0, 0, 0, 14, 2, 8, 0, 0, 0, 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, 95, 39, 39, 18, 21, 2, 150, 38, 32, 113, 32, @@ -792,7 +796,7 @@ video_orc_blend_big (guint8 * ORC_RESTRICT d1, const guint8 * ORC_RESTRICT s1, 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_temporary (p, 4, "t1"); orc_program_add_temporary (p, 4, "t2"); orc_program_add_temporary (p, 2, "t3"); @@ -6997,7 +7001,7 @@ video_orc_merge_linear_u8 (orc_uint8 * ORC_RESTRICT d1, static const orc_uint8 bc[] = { 1, 9, 25, 118, 105, 100, 101, 111, 95, 111, 114, 99, 95, 109, 101, 114, 103, 101, 95, 108, 105, 110, 101, 97, 114, 95, 117, 56, 11, 1, 1, 12, - 1, 1, 12, 1, 1, 14, 4, 128, 0, 0, 0, 16, 1, 20, 2, 20, + 1, 1, 12, 1, 1, 14, 2, 128, 0, 0, 0, 16, 1, 20, 2, 20, 2, 20, 1, 20, 1, 43, 34, 4, 150, 32, 4, 150, 33, 5, 98, 33, 33, 32, 89, 33, 33, 24, 70, 33, 33, 16, 158, 35, 33, 33, 0, 35, 34, 2, 0, @@ -7011,7 +7015,7 @@ video_orc_merge_linear_u8 (orc_uint8 * ORC_RESTRICT d1, orc_program_add_destination (p, 1, "d1"); orc_program_add_source (p, 1, "s1"); orc_program_add_source (p, 1, "s2"); - orc_program_add_constant (p, 4, 0x00000080, "c1"); + orc_program_add_constant (p, 2, 0x00000080, "c1"); orc_program_add_parameter (p, 1, "p1"); orc_program_add_temporary (p, 2, "t1"); orc_program_add_temporary (p, 2, "t2"); diff --git a/gst-plugins-base.doap b/gst-plugins-base.doap index 8dd5b903d..a7b81f922 100644 --- a/gst-plugins-base.doap +++ b/gst-plugins-base.doap @@ -36,6 +36,16 @@ A wide range of video and audio decoders, encoders, and filters are included. <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-base/gst-plugins-base-1.4.5.tar.xz" /> + </Version> + </release> + + <release> + <Version> <revision>1.4.4</revision> <branch>1.4</branch> <name></name> diff --git a/gst/adder/gstadderorc-dist.c b/gst/adder/gstadderorc-dist.c index 7d6e50211..a35abd6bc 100644 --- a/gst/adder/gstadderorc-dist.c +++ b/gst/adder/gstadderorc-dist.c @@ -1121,16 +1121,11 @@ adder_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; @@ -1138,24 +1133,22 @@ adder_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; } } @@ -1174,16 +1167,11 @@ _backup_adder_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]; @@ -1191,24 +1179,22 @@ _backup_adder_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; } } @@ -1230,7 +1216,7 @@ adder_orc_volume_u8 (guint8 * ORC_RESTRICT d1, int p1, int n) static const orc_uint8 bc[] = { 1, 9, 19, 97, 100, 100, 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, 68, 33, 0, 16, 174, + 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, }; @@ -1242,7 +1228,7 @@ adder_orc_volume_u8 (guint8 * ORC_RESTRICT d1, int p1, int n) orc_program_set_backup_function (p, _backup_adder_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"); @@ -1361,7 +1347,7 @@ adder_orc_volume_s8 (gint8 * ORC_RESTRICT d1, int p1, int n) #if 1 static const orc_uint8 bc[] = { 1, 9, 19, 97, 100, 100, 101, 114, 95, 111, 114, 99, 95, 118, 111, 108, - 117, 109, 101, 95, 115, 56, 11, 1, 1, 14, 4, 3, 0, 0, 0, 16, + 117, 109, 101, 95, 115, 56, 11, 1, 1, 14, 2, 3, 0, 0, 0, 16, 1, 20, 2, 174, 32, 0, 24, 94, 32, 32, 16, 159, 0, 32, 2, 0, }; @@ -1372,7 +1358,7 @@ adder_orc_volume_s8 (gint8 * ORC_RESTRICT d1, int p1, int n) orc_program_set_name (p, "adder_orc_volume_s8"); orc_program_set_backup_function (p, _backup_adder_orc_volume_s8); orc_program_add_destination (p, 1, "d1"); - 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"); @@ -1418,16 +1404,11 @@ adder_orc_volume_u16 (guint16 * ORC_RESTRICT d1, int p1, int n) 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_union32 var39; orc_union32 var40; - orc_union32 var41; - orc_union16 var42; + orc_union16 var41; ptr0 = (orc_union16 *) d1; @@ -1435,24 +1416,22 @@ adder_orc_volume_u16 (guint16 * ORC_RESTRICT d1, int p1, int n) 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 = ptr0[i]; /* 2: xorw */ - var39.i = var34.i ^ var35.i; + var38.i = var34.i ^ var35.i; /* 4: mulswl */ - var40.i = var39.i * var36.i; + var39.i = var38.i * var36.i; /* 5: shrsl */ - var41.i = var40.i >> 11; + var40.i = var39.i >> 11; /* 6: convssslw */ - var42.i = ORC_CLAMP_SW (var41.i); - /* 8: xorw */ - var38.i = var42.i ^ var37.i; - /* 9: storew */ - ptr0[i] = var38; + var41.i = ORC_CLAMP_SW (var40.i); + /* 7: xorw */ + var37.i = var41.i ^ var35.i; + /* 8: storew */ + ptr0[i] = var37; } } @@ -1471,16 +1450,11 @@ _backup_adder_orc_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_union32 var39; orc_union32 var40; - orc_union32 var41; - orc_union16 var42; + orc_union16 var41; ptr0 = (orc_union16 *) ex->arrays[0]; @@ -1488,24 +1462,22 @@ _backup_adder_orc_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 = ptr0[i]; /* 2: xorw */ - var39.i = var34.i ^ var35.i; + var38.i = var34.i ^ var35.i; /* 4: mulswl */ - var40.i = var39.i * var36.i; + var39.i = var38.i * var36.i; /* 5: shrsl */ - var41.i = var40.i >> 11; + var40.i = var39.i >> 11; /* 6: convssslw */ - var42.i = ORC_CLAMP_SW (var41.i); - /* 8: xorw */ - var38.i = var42.i ^ var37.i; - /* 9: storew */ - ptr0[i] = var38; + var41.i = ORC_CLAMP_SW (var40.i); + /* 7: xorw */ + var37.i = var41.i ^ var35.i; + /* 8: storew */ + ptr0[i] = var37; } } @@ -1715,16 +1687,11 @@ adder_orc_volume_u32 (guint32 * ORC_RESTRICT d1, int p1, int n) 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_union64 var39; orc_union64 var40; - orc_union64 var41; - orc_union32 var42; + orc_union32 var41; ptr0 = (orc_union32 *) d1; @@ -1732,24 +1699,22 @@ adder_orc_volume_u32 (guint32 * ORC_RESTRICT d1, int p1, int n) 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 = ptr0[i]; /* 2: xorl */ - var39.i = var34.i ^ var35.i; + var38.i = var34.i ^ var35.i; /* 4: mulslq */ - var40.i = ((orc_int64) var39.i) * ((orc_int64) var36.i); + var39.i = ((orc_int64) var38.i) * ((orc_int64) var36.i); /* 5: shrsq */ - var41.i = var40.i >> 27; + var40.i = var39.i >> 27; /* 6: convsssql */ - var42.i = ORC_CLAMP_SL (var41.i); - /* 8: xorl */ - var38.i = var42.i ^ var37.i; - /* 9: storel */ - ptr0[i] = var38; + var41.i = ORC_CLAMP_SL (var40.i); + /* 7: xorl */ + var37.i = var41.i ^ var35.i; + /* 8: storel */ + ptr0[i] = var37; } } @@ -1768,16 +1733,11 @@ _backup_adder_orc_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_union64 var39; orc_union64 var40; - orc_union64 var41; - orc_union32 var42; + orc_union32 var41; ptr0 = (orc_union32 *) ex->arrays[0]; @@ -1785,24 +1745,22 @@ _backup_adder_orc_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 = ptr0[i]; /* 2: xorl */ - var39.i = var34.i ^ var35.i; + var38.i = var34.i ^ var35.i; /* 4: mulslq */ - var40.i = ((orc_int64) var39.i) * ((orc_int64) var36.i); + var39.i = ((orc_int64) var38.i) * ((orc_int64) var36.i); /* 5: shrsq */ - var41.i = var40.i >> 27; + var40.i = var39.i >> 27; /* 6: convsssql */ - var42.i = ORC_CLAMP_SL (var41.i); - /* 8: xorl */ - var38.i = var42.i ^ var37.i; - /* 9: storel */ - ptr0[i] = var38; + var41.i = ORC_CLAMP_SL (var40.i); + /* 7: xorl */ + var37.i = var41.i ^ var35.i; + /* 8: storel */ + ptr0[i] = var37; } } @@ -1824,9 +1782,9 @@ adder_orc_volume_u32 (guint32 * ORC_RESTRICT d1, int p1, int n) static const orc_uint8 bc[] = { 1, 9, 20, 97, 100, 100, 101, 114, 95, 111, 114, 99, 95, 118, 111, 108, 117, 109, 101, 95, 117, 51, 50, 11, 4, 4, 14, 4, 0, 0, 0, 128, - 14, 4, 27, 0, 0, 0, 16, 4, 20, 8, 20, 4, 132, 33, 0, 16, - 178, 32, 33, 24, 147, 32, 32, 17, 170, 33, 32, 132, 0, 33, 16, 2, - 0, + 15, 8, 27, 0, 0, 0, 0, 0, 0, 0, 16, 4, 20, 8, 20, 4, + 132, 33, 0, 16, 178, 32, 33, 24, 147, 32, 32, 17, 170, 33, 32, 132, + 0, 33, 16, 2, 0, }; p = orc_program_new_from_static_bytecode (bc); orc_program_set_backup_function (p, _backup_adder_orc_volume_u32); @@ -1836,7 +1794,7 @@ adder_orc_volume_u32 (guint32 * ORC_RESTRICT d1, int p1, int n) orc_program_set_backup_function (p, _backup_adder_orc_volume_u32); orc_program_add_destination (p, 4, "d1"); 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"); @@ -1955,9 +1913,9 @@ adder_orc_volume_s32 (gint32 * ORC_RESTRICT d1, int p1, int n) #if 1 static const orc_uint8 bc[] = { 1, 9, 20, 97, 100, 100, 101, 114, 95, 111, 114, 99, 95, 118, 111, 108, - 117, 109, 101, 95, 115, 51, 50, 11, 4, 4, 14, 4, 27, 0, 0, 0, - 16, 4, 20, 8, 178, 32, 0, 24, 147, 32, 32, 16, 170, 0, 32, 2, - 0, + 117, 109, 101, 95, 115, 51, 50, 11, 4, 4, 15, 8, 27, 0, 0, 0, + 0, 0, 0, 0, 16, 4, 20, 8, 178, 32, 0, 24, 147, 32, 32, 16, + 170, 0, 32, 2, 0, }; p = orc_program_new_from_static_bytecode (bc); orc_program_set_backup_function (p, _backup_adder_orc_volume_s32); @@ -1966,7 +1924,7 @@ adder_orc_volume_s32 (gint32 * ORC_RESTRICT d1, int p1, int n) orc_program_set_name (p, "adder_orc_volume_s32"); orc_program_set_backup_function (p, _backup_adder_orc_volume_s32); orc_program_add_destination (p, 4, "d1"); - 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"); @@ -2243,8 +2201,8 @@ adder_orc_volume_f64 (double *ORC_RESTRICT d1, double p1, int n) { 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; @@ -2269,18 +2227,13 @@ adder_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; @@ -2289,28 +2242,26 @@ adder_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; } } @@ -2330,18 +2281,13 @@ _backup_adder_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]; @@ -2350,28 +2296,26 @@ _backup_adder_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; } } @@ -2394,7 +2338,7 @@ adder_orc_add_volume_u8 (guint8 * ORC_RESTRICT d1, static const orc_uint8 bc[] = { 1, 9, 23, 97, 100, 100, 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, 0, 16, 1, 20, 2, + 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, }; @@ -2407,7 +2351,7 @@ adder_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"); @@ -2548,7 +2492,7 @@ adder_orc_add_volume_s8 (gint8 * ORC_RESTRICT d1, const gint8 * ORC_RESTRICT s1, static const orc_uint8 bc[] = { 1, 9, 23, 97, 100, 100, 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, 174, 32, 4, 24, + 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, }; p = orc_program_new_from_static_bytecode (bc); @@ -2559,7 +2503,7 @@ adder_orc_add_volume_s8 (gint8 * ORC_RESTRICT d1, const gint8 * ORC_RESTRICT s1, orc_program_set_backup_function (p, _backup_adder_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"); @@ -2611,18 +2555,13 @@ adder_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; @@ -2631,28 +2570,26 @@ adder_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; } } @@ -2672,18 +2609,13 @@ _backup_adder_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]; @@ -2692,28 +2624,26 @@ _backup_adder_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; } } @@ -2953,18 +2883,13 @@ adder_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; @@ -2973,30 +2898,28 @@ adder_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; } } @@ -3016,18 +2939,13 @@ _backup_adder_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]; @@ -3036,30 +2954,28 @@ _backup_adder_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; } } @@ -3082,9 +2998,10 @@ adder_orc_add_volume_u32 (guint32 * ORC_RESTRICT d1, static const orc_uint8 bc[] = { 1, 9, 24, 97, 100, 100, 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, + 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, _backup_adder_orc_add_volume_u32); @@ -3095,7 +3012,7 @@ adder_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"); @@ -3236,8 +3153,9 @@ adder_orc_add_volume_s32 (gint32 * ORC_RESTRICT d1, static const orc_uint8 bc[] = { 1, 9, 24, 97, 100, 100, 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, + 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, _backup_adder_orc_add_volume_s32); @@ -3247,7 +3165,7 @@ adder_orc_add_volume_s32 (gint32 * ORC_RESTRICT d1, orc_program_set_backup_function (p, _backup_adder_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"); @@ -3606,8 +3524,8 @@ adder_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/audioconvert/gstaudioconvertorc-dist.c b/gst/audioconvert/gstaudioconvertorc-dist.c index ee3a539d9..a694cfb7b 100644 --- a/gst/audioconvert/gstaudioconvertorc-dist.c +++ b/gst/audioconvert/gstaudioconvertorc-dist.c @@ -283,7 +283,7 @@ audio_convert_orc_unpack_u8 (gint32 * ORC_RESTRICT d1, /* 2: convuwl */ var38.i = (orc_uint16) var37.i; /* 3: shll */ - var39.i = var38.i << p1; + var39.i = ((orc_uint32) var38.i) << p1; /* 5: xorl */ var36.i = var39.i ^ var35.i; /* 6: storel */ @@ -325,7 +325,7 @@ _backup_audio_convert_orc_unpack_u8 (OrcExecutor * ORC_RESTRICT ex) /* 2: convuwl */ var38.i = (orc_uint16) var37.i; /* 3: shll */ - var39.i = var38.i << ex->params[24]; + var39.i = ((orc_uint32) var38.i) << ex->params[24]; /* 5: xorl */ var36.i = var39.i ^ var35.i; /* 6: storel */ @@ -426,7 +426,7 @@ audio_convert_orc_unpack_s8 (gint32 * ORC_RESTRICT d1, /* 2: convuwl */ var37.i = (orc_uint16) var36.i; /* 3: shll */ - var35.i = var37.i << p1; + var35.i = ((orc_uint32) var37.i) << p1; /* 4: storel */ ptr0[i] = var35; } @@ -458,7 +458,7 @@ _backup_audio_convert_orc_unpack_s8 (OrcExecutor * ORC_RESTRICT ex) /* 2: convuwl */ var37.i = (orc_uint16) var36.i; /* 3: shll */ - var35.i = var37.i << ex->params[24]; + var35.i = ((orc_uint32) var37.i) << ex->params[24]; /* 4: storel */ ptr0[i] = var35; } @@ -558,7 +558,7 @@ audio_convert_orc_unpack_u16 (gint32 * ORC_RESTRICT d1, /* 1: convuwl */ var36.i = (orc_uint16) var33.i; /* 2: shll */ - var37.i = var36.i << p1; + var37.i = ((orc_uint32) var36.i) << p1; /* 4: xorl */ var35.i = var37.i ^ var34.i; /* 5: storel */ @@ -597,7 +597,7 @@ _backup_audio_convert_orc_unpack_u16 (OrcExecutor * ORC_RESTRICT ex) /* 1: convuwl */ var36.i = (orc_uint16) var33.i; /* 2: shll */ - var37.i = var36.i << ex->params[24]; + var37.i = ((orc_uint32) var36.i) << ex->params[24]; /* 4: xorl */ var35.i = var37.i ^ var34.i; /* 5: storel */ @@ -691,7 +691,7 @@ audio_convert_orc_unpack_s16 (gint32 * ORC_RESTRICT d1, /* 1: convuwl */ var35.i = (orc_uint16) var33.i; /* 2: shll */ - var34.i = var35.i << p1; + var34.i = ((orc_uint32) var35.i) << p1; /* 3: storel */ ptr0[i] = var34; } @@ -720,7 +720,7 @@ _backup_audio_convert_orc_unpack_s16 (OrcExecutor * ORC_RESTRICT ex) /* 1: convuwl */ var35.i = (orc_uint16) var33.i; /* 2: shll */ - var34.i = var35.i << ex->params[24]; + var34.i = ((orc_uint32) var35.i) << ex->params[24]; /* 3: storel */ ptr0[i] = var34; } @@ -820,7 +820,7 @@ audio_convert_orc_unpack_u16_swap (gint32 * ORC_RESTRICT d1, /* 2: convuwl */ var38.i = (orc_uint16) var37.i; /* 3: shll */ - var39.i = var38.i << p1; + var39.i = ((orc_uint32) var38.i) << p1; /* 5: xorl */ var36.i = var39.i ^ var35.i; /* 6: storel */ @@ -862,7 +862,7 @@ _backup_audio_convert_orc_unpack_u16_swap (OrcExecutor * ORC_RESTRICT ex) /* 2: convuwl */ var38.i = (orc_uint16) var37.i; /* 3: shll */ - var39.i = var38.i << ex->params[24]; + var39.i = ((orc_uint32) var38.i) << ex->params[24]; /* 5: xorl */ var36.i = var39.i ^ var35.i; /* 6: storel */ @@ -965,7 +965,7 @@ audio_convert_orc_unpack_s16_swap (gint32 * ORC_RESTRICT d1, /* 2: convuwl */ var37.i = (orc_uint16) var36.i; /* 3: shll */ - var35.i = var37.i << p1; + var35.i = ((orc_uint32) var37.i) << p1; /* 4: storel */ ptr0[i] = var35; } @@ -997,7 +997,7 @@ _backup_audio_convert_orc_unpack_s16_swap (OrcExecutor * ORC_RESTRICT ex) /* 2: convuwl */ var37.i = (orc_uint16) var36.i; /* 3: shll */ - var35.i = var37.i << ex->params[24]; + var35.i = ((orc_uint32) var37.i) << ex->params[24]; /* 4: storel */ ptr0[i] = var35; } @@ -1096,7 +1096,7 @@ audio_convert_orc_unpack_u32 (gint32 * ORC_RESTRICT d1, /* 0: loadl */ var33 = ptr4[i]; /* 1: shll */ - var36.i = var33.i << p1; + var36.i = ((orc_uint32) var33.i) << p1; /* 3: xorl */ var35.i = var36.i ^ var34.i; /* 4: storel */ @@ -1132,7 +1132,7 @@ _backup_audio_convert_orc_unpack_u32 (OrcExecutor * ORC_RESTRICT ex) /* 0: loadl */ var33 = ptr4[i]; /* 1: shll */ - var36.i = var33.i << ex->params[24]; + var36.i = ((orc_uint32) var33.i) << ex->params[24]; /* 3: xorl */ var35.i = var36.i ^ var34.i; /* 4: storel */ @@ -1221,7 +1221,7 @@ audio_convert_orc_unpack_s32 (gint32 * ORC_RESTRICT d1, /* 0: loadl */ var32 = ptr4[i]; /* 1: shll */ - var33.i = var32.i << p1; + var33.i = ((orc_uint32) var32.i) << p1; /* 2: storel */ ptr0[i] = var33; } @@ -1247,7 +1247,7 @@ _backup_audio_convert_orc_unpack_s32 (OrcExecutor * ORC_RESTRICT ex) /* 0: loadl */ var32 = ptr4[i]; /* 1: shll */ - var33.i = var32.i << ex->params[24]; + var33.i = ((orc_uint32) var32.i) << ex->params[24]; /* 2: storel */ ptr0[i] = var33; } @@ -1340,7 +1340,7 @@ audio_convert_orc_unpack_u32_swap (gint32 * ORC_RESTRICT d1, /* 1: swapl */ var36.i = ORC_SWAP_L (var33.i); /* 2: shll */ - var37.i = var36.i << p1; + var37.i = ((orc_uint32) var36.i) << p1; /* 4: xorl */ var35.i = var37.i ^ var34.i; /* 5: storel */ @@ -1379,7 +1379,7 @@ _backup_audio_convert_orc_unpack_u32_swap (OrcExecutor * ORC_RESTRICT ex) /* 1: swapl */ var36.i = ORC_SWAP_L (var33.i); /* 2: shll */ - var37.i = var36.i << ex->params[24]; + var37.i = ((orc_uint32) var36.i) << ex->params[24]; /* 4: xorl */ var35.i = var37.i ^ var34.i; /* 5: storel */ @@ -1476,7 +1476,7 @@ audio_convert_orc_unpack_s32_swap (gint32 * ORC_RESTRICT d1, /* 1: swapl */ var35.i = ORC_SWAP_L (var33.i); /* 2: shll */ - var34.i = var35.i << p1; + var34.i = ((orc_uint32) var35.i) << p1; /* 3: storel */ ptr0[i] = var34; } @@ -1505,7 +1505,7 @@ _backup_audio_convert_orc_unpack_s32_swap (OrcExecutor * ORC_RESTRICT ex) /* 1: swapl */ var35.i = ORC_SWAP_L (var33.i); /* 2: shll */ - var34.i = var35.i << ex->params[24]; + var34.i = ((orc_uint32) var35.i) << ex->params[24]; /* 3: storel */ ptr0[i] = var34; } @@ -2897,7 +2897,7 @@ audio_convert_orc_unpack_u8_double (gdouble * ORC_RESTRICT d1, /* 2: convuwl */ var38.i = (orc_uint16) var37.i; /* 3: shll */ - var39.i = var38.i << p1; + var39.i = ((orc_uint32) var38.i) << p1; /* 5: xorl */ var40.i = var39.i ^ var35.i; /* 6: convld */ @@ -2942,7 +2942,7 @@ _backup_audio_convert_orc_unpack_u8_double (OrcExecutor * ORC_RESTRICT ex) /* 2: convuwl */ var38.i = (orc_uint16) var37.i; /* 3: shll */ - var39.i = var38.i << ex->params[24]; + var39.i = ((orc_uint32) var38.i) << ex->params[24]; /* 5: xorl */ var40.i = var39.i ^ var35.i; /* 6: convld */ @@ -3050,7 +3050,7 @@ audio_convert_orc_unpack_s8_double (gdouble * ORC_RESTRICT d1, /* 2: convuwl */ var37.i = (orc_uint16) var36.i; /* 3: shll */ - var38.i = var37.i << p1; + var38.i = ((orc_uint32) var37.i) << p1; /* 4: convld */ var35.f = var38.i; /* 5: storeq */ @@ -3085,7 +3085,7 @@ _backup_audio_convert_orc_unpack_s8_double (OrcExecutor * ORC_RESTRICT ex) /* 2: convuwl */ var37.i = (orc_uint16) var36.i; /* 3: shll */ - var38.i = var37.i << ex->params[24]; + var38.i = ((orc_uint32) var37.i) << ex->params[24]; /* 4: convld */ var35.f = var38.i; /* 5: storeq */ @@ -3193,7 +3193,7 @@ audio_convert_orc_unpack_u16_double (gdouble * ORC_RESTRICT d1, /* 1: convuwl */ var36.i = (orc_uint16) var33.i; /* 2: shll */ - var37.i = var36.i << p1; + var37.i = ((orc_uint32) var36.i) << p1; /* 4: xorl */ var38.i = var37.i ^ var34.i; /* 5: convld */ @@ -3235,7 +3235,7 @@ _backup_audio_convert_orc_unpack_u16_double (OrcExecutor * ORC_RESTRICT ex) /* 1: convuwl */ var36.i = (orc_uint16) var33.i; /* 2: shll */ - var37.i = var36.i << ex->params[24]; + var37.i = ((orc_uint32) var36.i) << ex->params[24]; /* 4: xorl */ var38.i = var37.i ^ var34.i; /* 5: convld */ @@ -3337,7 +3337,7 @@ audio_convert_orc_unpack_s16_double (gdouble * ORC_RESTRICT d1, /* 1: convuwl */ var35.i = (orc_uint16) var33.i; /* 2: shll */ - var36.i = var35.i << p1; + var36.i = ((orc_uint32) var35.i) << p1; /* 3: convld */ var34.f = var36.i; /* 4: storeq */ @@ -3369,7 +3369,7 @@ _backup_audio_convert_orc_unpack_s16_double (OrcExecutor * ORC_RESTRICT ex) /* 1: convuwl */ var35.i = (orc_uint16) var33.i; /* 2: shll */ - var36.i = var35.i << ex->params[24]; + var36.i = ((orc_uint32) var35.i) << ex->params[24]; /* 3: convld */ var34.f = var36.i; /* 4: storeq */ @@ -3476,7 +3476,7 @@ audio_convert_orc_unpack_u16_double_swap (gdouble * ORC_RESTRICT d1, /* 2: convuwl */ var38.i = (orc_uint16) var37.i; /* 3: shll */ - var39.i = var38.i << p1; + var39.i = ((orc_uint32) var38.i) << p1; /* 5: xorl */ var40.i = var39.i ^ var35.i; /* 6: convld */ @@ -3521,7 +3521,7 @@ _backup_audio_convert_orc_unpack_u16_double_swap (OrcExecutor * ORC_RESTRICT ex) /* 2: convuwl */ var38.i = (orc_uint16) var37.i; /* 3: shll */ - var39.i = var38.i << ex->params[24]; + var39.i = ((orc_uint32) var38.i) << ex->params[24]; /* 5: xorl */ var40.i = var39.i ^ var35.i; /* 6: convld */ @@ -3630,7 +3630,7 @@ audio_convert_orc_unpack_s16_double_swap (gdouble * ORC_RESTRICT d1, /* 2: convuwl */ var37.i = (orc_uint16) var36.i; /* 3: shll */ - var38.i = var37.i << p1; + var38.i = ((orc_uint32) var37.i) << p1; /* 4: convld */ var35.f = var38.i; /* 5: storeq */ @@ -3665,7 +3665,7 @@ _backup_audio_convert_orc_unpack_s16_double_swap (OrcExecutor * ORC_RESTRICT ex) /* 2: convuwl */ var37.i = (orc_uint16) var36.i; /* 3: shll */ - var38.i = var37.i << ex->params[24]; + var38.i = ((orc_uint32) var37.i) << ex->params[24]; /* 4: convld */ var35.f = var38.i; /* 5: storeq */ @@ -3770,7 +3770,7 @@ audio_convert_orc_unpack_u32_double (gdouble * ORC_RESTRICT d1, /* 0: loadl */ var33 = ptr4[i]; /* 1: shll */ - var36.i = var33.i << p1; + var36.i = ((orc_uint32) var33.i) << p1; /* 3: xorl */ var37.i = var36.i ^ var34.i; /* 4: convld */ @@ -3809,7 +3809,7 @@ _backup_audio_convert_orc_unpack_u32_double (OrcExecutor * ORC_RESTRICT ex) /* 0: loadl */ var33 = ptr4[i]; /* 1: shll */ - var36.i = var33.i << ex->params[24]; + var36.i = ((orc_uint32) var33.i) << ex->params[24]; /* 3: xorl */ var37.i = var36.i ^ var34.i; /* 4: convld */ @@ -3906,7 +3906,7 @@ audio_convert_orc_unpack_s32_double (gdouble * ORC_RESTRICT d1, /* 0: loadl */ var33 = ptr4[i]; /* 1: shll */ - var35.i = var33.i << p1; + var35.i = ((orc_uint32) var33.i) << p1; /* 2: convld */ var34.f = var35.i; /* 3: storeq */ @@ -3935,7 +3935,7 @@ _backup_audio_convert_orc_unpack_s32_double (OrcExecutor * ORC_RESTRICT ex) /* 0: loadl */ var33 = ptr4[i]; /* 1: shll */ - var35.i = var33.i << ex->params[24]; + var35.i = ((orc_uint32) var33.i) << ex->params[24]; /* 2: convld */ var34.f = var35.i; /* 3: storeq */ @@ -4037,7 +4037,7 @@ audio_convert_orc_unpack_u32_double_swap (gdouble * ORC_RESTRICT d1, /* 1: swapl */ var36.i = ORC_SWAP_L (var33.i); /* 2: shll */ - var37.i = var36.i << p1; + var37.i = ((orc_uint32) var36.i) << p1; /* 4: xorl */ var38.i = var37.i ^ var34.i; /* 5: convld */ @@ -4079,7 +4079,7 @@ _backup_audio_convert_orc_unpack_u32_double_swap (OrcExecutor * ORC_RESTRICT ex) /* 1: swapl */ var36.i = ORC_SWAP_L (var33.i); /* 2: shll */ - var37.i = var36.i << ex->params[24]; + var37.i = ((orc_uint32) var36.i) << ex->params[24]; /* 4: xorl */ var38.i = var37.i ^ var34.i; /* 5: convld */ @@ -4181,7 +4181,7 @@ audio_convert_orc_unpack_s32_double_swap (gdouble * ORC_RESTRICT d1, /* 1: swapl */ var35.i = ORC_SWAP_L (var33.i); /* 2: shll */ - var36.i = var35.i << p1; + var36.i = ((orc_uint32) var35.i) << p1; /* 3: convld */ var34.f = var36.i; /* 4: storeq */ @@ -4213,7 +4213,7 @@ _backup_audio_convert_orc_unpack_s32_double_swap (OrcExecutor * ORC_RESTRICT ex) /* 1: swapl */ var35.i = ORC_SWAP_L (var33.i); /* 2: shll */ - var36.i = var35.i << ex->params[24]; + var36.i = ((orc_uint32) var35.i) << ex->params[24]; /* 3: convld */ var34.f = var36.i; /* 4: storeq */ diff --git a/gst/videoconvert/gstvideoconvertorc-dist.c b/gst/videoconvert/gstvideoconvertorc-dist.c index 362f5273a..3eae94900 100644 --- a/gst/videoconvert/gstvideoconvertorc-dist.c +++ b/gst/videoconvert/gstvideoconvertorc-dist.c @@ -859,18 +859,13 @@ 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; @@ -881,20 +876,18 @@ 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]; @@ -903,35 +896,35 @@ 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; } } @@ -955,18 +948,13 @@ _backup_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]; @@ -977,20 +965,18 @@ _backup_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]; @@ -999,35 +985,35 @@ _backup_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; } } @@ -6583,19 +6569,15 @@ video_convert_orc_convert_AYUV_ARGB (guint8 * ORC_RESTRICT d1, int d1_stride, 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; @@ -6607,13 +6589,12 @@ video_convert_orc_convert_AYUV_ARGB (guint8 * ORC_RESTRICT d1, int d1_stride, 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); @@ -6634,99 +6615,94 @@ video_convert_orc_convert_AYUV_ARGB (guint8 * ORC_RESTRICT d1, int d1_stride, 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; } } @@ -6753,19 +6729,15 @@ _backup_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; @@ -6777,13 +6749,12 @@ _backup_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); @@ -6804,99 +6775,94 @@ _backup_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; } } @@ -7062,19 +7028,15 @@ video_convert_orc_convert_AYUV_BGRA (guint8 * ORC_RESTRICT d1, int d1_stride, 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; @@ -7086,13 +7048,12 @@ video_convert_orc_convert_AYUV_BGRA (guint8 * ORC_RESTRICT d1, int d1_stride, 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); @@ -7113,99 +7074,94 @@ video_convert_orc_convert_AYUV_BGRA (guint8 * ORC_RESTRICT d1, int d1_stride, 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; } } @@ -7232,19 +7188,15 @@ _backup_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; @@ -7256,13 +7208,12 @@ _backup_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); @@ -7283,99 +7234,94 @@ _backup_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; } } @@ -7541,19 +7487,15 @@ video_convert_orc_convert_AYUV_ABGR (guint8 * ORC_RESTRICT d1, int d1_stride, 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; @@ -7565,13 +7507,12 @@ video_convert_orc_convert_AYUV_ABGR (guint8 * ORC_RESTRICT d1, int d1_stride, 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); @@ -7592,99 +7533,94 @@ video_convert_orc_convert_AYUV_ABGR (guint8 * ORC_RESTRICT d1, int d1_stride, 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; } } @@ -7711,19 +7647,15 @@ _backup_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; @@ -7735,13 +7667,12 @@ _backup_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); @@ -7762,99 +7693,94 @@ _backup_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; } } @@ -8020,19 +7946,15 @@ video_convert_orc_convert_AYUV_RGBA (guint8 * ORC_RESTRICT d1, int d1_stride, 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; @@ -8044,13 +7966,12 @@ video_convert_orc_convert_AYUV_RGBA (guint8 * ORC_RESTRICT d1, int d1_stride, 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); @@ -8071,99 +7992,94 @@ video_convert_orc_convert_AYUV_RGBA (guint8 * ORC_RESTRICT d1, int d1_stride, 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; } } @@ -8190,19 +8106,15 @@ _backup_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; @@ -8214,13 +8126,12 @@ _backup_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); @@ -8241,99 +8152,94 @@ _backup_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; } } @@ -8496,39 +8402,31 @@ 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; @@ -8537,14 +8435,12 @@ 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; @@ -8553,99 +8449,95 @@ 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; } } @@ -8666,39 +8558,31 @@ _backup_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; @@ -8707,14 +8591,12 @@ _backup_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]; @@ -8723,99 +8605,95 @@ _backup_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; } } @@ -8841,7 +8719,7 @@ video_convert_orc_convert_I420_BGRA (guint8 * ORC_RESTRICT d1, 1, 9, 35, 118, 105, 100, 101, 111, 95, 99, 111, 110, 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, 0, 0, 16, 2, + 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, 38, 45, 38, 6, @@ -8864,7 +8742,7 @@ 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/videoscale/gstvideoscaleorc-dist.c b/gst/videoscale/gstvideoscaleorc-dist.c index 85b37fd3d..108bc67fb 100644 --- a/gst/videoscale/gstvideoscaleorc-dist.c +++ b/gst/videoscale/gstvideoscaleorc-dist.c @@ -320,7 +320,7 @@ video_scale_orc_merge_linear_u8 (orc_uint8 * ORC_RESTRICT d1, 1, 9, 31, 118, 105, 100, 101, 111, 95, 115, 99, 97, 108, 101, 95, 111, 114, 99, 95, 109, 101, 114, 103, 101, 95, 108, 105, 110, 101, 97, 114, 95, - 117, 56, 11, 1, 1, 12, 1, 1, 12, 1, 1, 14, 4, 128, 0, 0, + 117, 56, 11, 1, 1, 12, 1, 1, 12, 1, 1, 14, 2, 128, 0, 0, 0, 16, 1, 20, 2, 20, 2, 20, 1, 20, 1, 43, 34, 4, 150, 32, 4, 150, 33, 5, 98, 33, 33, 32, 89, 33, 33, 24, 70, 33, 33, 16, 158, 35, 33, 33, 0, 35, 34, 2, 0, @@ -336,7 +336,7 @@ video_scale_orc_merge_linear_u8 (orc_uint8 * ORC_RESTRICT d1, orc_program_add_destination (p, 1, "d1"); orc_program_add_source (p, 1, "s1"); orc_program_add_source (p, 1, "s2"); - orc_program_add_constant (p, 4, 0x00000080, "c1"); + orc_program_add_constant (p, 2, 0x00000080, "c1"); orc_program_add_parameter (p, 1, "p1"); orc_program_add_temporary (p, 2, "t1"); orc_program_add_temporary (p, 2, "t2"); @@ -417,13 +417,17 @@ video_scale_orc_merge_linear_u16 (orc_uint16 * ORC_RESTRICT d1, /* 0: loadw */ var34 = ptr4[i]; /* 2: muluwl */ - var39.i = ((orc_uint16) var34.i) * ((orc_uint16) var35.i); + var39.i = + ((orc_uint32) ((orc_uint16) var34.i)) * + ((orc_uint32) ((orc_uint16) var35.i)); /* 3: loadw */ var36 = ptr5[i]; /* 5: muluwl */ - var40.i = ((orc_uint16) var36.i) * ((orc_uint16) var37.i); + var40.i = + ((orc_uint32) ((orc_uint16) var36.i)) * + ((orc_uint32) ((orc_uint16) var37.i)); /* 6: addl */ - var41.i = var39.i + var40.i; + var41.i = ((orc_uint32) var39.i) + ((orc_uint32) var40.i); /* 7: shrul */ var42.i = ((orc_uint32) var41.i) >> 16; /* 8: convlw */ @@ -466,13 +470,17 @@ _backup_video_scale_orc_merge_linear_u16 (OrcExecutor * ORC_RESTRICT ex) /* 0: loadw */ var34 = ptr4[i]; /* 2: muluwl */ - var39.i = ((orc_uint16) var34.i) * ((orc_uint16) var35.i); + var39.i = + ((orc_uint32) ((orc_uint16) var34.i)) * + ((orc_uint32) ((orc_uint16) var35.i)); /* 3: loadw */ var36 = ptr5[i]; /* 5: muluwl */ - var40.i = ((orc_uint16) var36.i) * ((orc_uint16) var37.i); + var40.i = + ((orc_uint32) ((orc_uint16) var36.i)) * + ((orc_uint32) ((orc_uint16) var37.i)); /* 6: addl */ - var41.i = var39.i + var40.i; + var41.i = ((orc_uint32) var39.i) + ((orc_uint32) var40.i); /* 7: shrul */ var42.i = ((orc_uint32) var41.i) >> 16; /* 8: convlw */ @@ -856,8 +864,8 @@ video_scale_orc_splat_u64 (orc_uint64 * ORC_RESTRICT d1, orc_int64 p1, int n) { orc_union64 tmp; tmp.i = 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; @@ -2345,23 +2353,27 @@ video_scale_orc_merge_bicubic_u8 (guint8 * ORC_RESTRICT d1, /* 0: loadb */ var34 = ptr5[i]; /* 2: mulubw */ - var44.i = ((orc_uint8) var34) * ((orc_uint8) var35); + var44.i = + ((orc_uint16) ((orc_uint8) var34)) * ((orc_uint16) ((orc_uint8) var35)); /* 3: loadb */ var36 = ptr6[i]; /* 5: mulubw */ - var45.i = ((orc_uint8) var36) * ((orc_uint8) var37); + var45.i = + ((orc_uint16) ((orc_uint8) var36)) * ((orc_uint16) ((orc_uint8) var37)); /* 6: addw */ var46.i = var44.i + var45.i; /* 7: loadb */ var38 = ptr4[i]; /* 9: mulubw */ - var47.i = ((orc_uint8) var38) * ((orc_uint8) var39); + var47.i = + ((orc_uint16) ((orc_uint8) var38)) * ((orc_uint16) ((orc_uint8) var39)); /* 10: subw */ var48.i = var46.i - var47.i; /* 11: loadb */ var40 = ptr7[i]; /* 13: mulubw */ - var49.i = ((orc_uint8) var40) * ((orc_uint8) var41); + var49.i = + ((orc_uint16) ((orc_uint8) var40)) * ((orc_uint16) ((orc_uint8) var41)); /* 14: subw */ var50.i = var48.i - var49.i; /* 16: addw */ @@ -2432,23 +2444,27 @@ _backup_video_scale_orc_merge_bicubic_u8 (OrcExecutor * ORC_RESTRICT ex) /* 0: loadb */ var34 = ptr5[i]; /* 2: mulubw */ - var44.i = ((orc_uint8) var34) * ((orc_uint8) var35); + var44.i = + ((orc_uint16) ((orc_uint8) var34)) * ((orc_uint16) ((orc_uint8) var35)); /* 3: loadb */ var36 = ptr6[i]; /* 5: mulubw */ - var45.i = ((orc_uint8) var36) * ((orc_uint8) var37); + var45.i = + ((orc_uint16) ((orc_uint8) var36)) * ((orc_uint16) ((orc_uint8) var37)); /* 6: addw */ var46.i = var44.i + var45.i; /* 7: loadb */ var38 = ptr4[i]; /* 9: mulubw */ - var47.i = ((orc_uint8) var38) * ((orc_uint8) var39); + var47.i = + ((orc_uint16) ((orc_uint8) var38)) * ((orc_uint16) ((orc_uint8) var39)); /* 10: subw */ var48.i = var46.i - var47.i; /* 11: loadb */ var40 = ptr7[i]; /* 13: mulubw */ - var49.i = ((orc_uint8) var40) * ((orc_uint8) var41); + var49.i = + ((orc_uint16) ((orc_uint8) var40)) * ((orc_uint16) ((orc_uint8) var41)); /* 14: subw */ var50.i = var48.i - var49.i; /* 16: addw */ @@ -2484,7 +2500,7 @@ video_scale_orc_merge_bicubic_u8 (guint8 * ORC_RESTRICT d1, 1, 9, 32, 118, 105, 100, 101, 111, 95, 115, 99, 97, 108, 101, 95, 111, 114, 99, 95, 109, 101, 114, 103, 101, 95, 98, 105, 99, 117, 98, 105, 99, 95, 117, 56, 11, 1, 1, 12, 1, 1, 12, 1, 1, 12, 1, 1, 12, - 1, 1, 14, 4, 32, 0, 0, 0, 14, 4, 6, 0, 0, 0, 16, 4, + 1, 1, 14, 2, 32, 0, 0, 0, 14, 2, 6, 0, 0, 0, 16, 4, 16, 4, 16, 4, 16, 4, 20, 2, 20, 2, 175, 32, 5, 25, 175, 33, 6, 26, 70, 32, 32, 33, 175, 33, 4, 24, 98, 32, 32, 33, 175, 33, 7, 27, 98, 32, 32, 33, 70, 32, 32, 16, 94, 32, 32, 17, 160, 0, @@ -2503,8 +2519,8 @@ video_scale_orc_merge_bicubic_u8 (guint8 * ORC_RESTRICT d1, orc_program_add_source (p, 1, "s2"); orc_program_add_source (p, 1, "s3"); orc_program_add_source (p, 1, "s4"); - orc_program_add_constant (p, 4, 0x00000020, "c1"); - orc_program_add_constant (p, 4, 0x00000006, "c2"); + orc_program_add_constant (p, 2, 0x00000020, "c1"); + orc_program_add_constant (p, 2, 0x00000006, "c2"); orc_program_add_parameter (p, 4, "p1"); orc_program_add_parameter (p, 4, "p2"); orc_program_add_parameter (p, 4, "p3"); diff --git a/gst/volume/gstvolumeorc-dist.c b/gst/volume/gstvolumeorc-dist.c index 4d37493c1..4b6ee6dc2 100644 --- a/gst/volume/gstvolumeorc-dist.c +++ b/gst/volume/gstvolumeorc-dist.c @@ -291,8 +291,8 @@ volume_orc_scalarmultiply_f64_ns (double *ORC_RESTRICT d1, double p1, int n) { 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; @@ -512,9 +512,9 @@ volume_orc_process_int32 (gint32 * ORC_RESTRICT d1, int p1, int n) #if 1 static const orc_uint8 bc[] = { 1, 9, 24, 118, 111, 108, 117, 109, 101, 95, 111, 114, 99, 95, 112, 114, - 111, 99, 101, 115, 115, 95, 105, 110, 116, 51, 50, 11, 4, 4, 14, 4, - 27, 0, 0, 0, 16, 4, 20, 8, 178, 32, 0, 24, 147, 32, 32, 16, - 169, 0, 32, 2, 0, + 111, 99, 101, 115, 115, 95, 105, 110, 116, 51, 50, 11, 4, 4, 15, 8, + 27, 0, 0, 0, 0, 0, 0, 0, 16, 4, 20, 8, 178, 32, 0, 24, + 147, 32, 32, 16, 169, 0, 32, 2, 0, }; p = orc_program_new_from_static_bytecode (bc); orc_program_set_backup_function (p, _backup_volume_orc_process_int32); @@ -523,7 +523,7 @@ volume_orc_process_int32 (gint32 * ORC_RESTRICT d1, int p1, int n) orc_program_set_name (p, "volume_orc_process_int32"); orc_program_set_backup_function (p, _backup_volume_orc_process_int32); orc_program_add_destination (p, 4, "d1"); - 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"); @@ -638,8 +638,8 @@ volume_orc_process_int32_clamp (gint32 * ORC_RESTRICT d1, int p1, int n) static const orc_uint8 bc[] = { 1, 9, 30, 118, 111, 108, 117, 109, 101, 95, 111, 114, 99, 95, 112, 114, 111, 99, 101, 115, 115, 95, 105, 110, 116, 51, 50, 95, 99, 108, 97, 109, - 112, 11, 4, 4, 14, 4, 27, 0, 0, 0, 16, 4, 20, 8, 178, 32, - 0, 24, 147, 32, 32, 16, 170, 0, 32, 2, 0, + 112, 11, 4, 4, 15, 8, 27, 0, 0, 0, 0, 0, 0, 0, 16, 4, + 20, 8, 178, 32, 0, 24, 147, 32, 32, 16, 170, 0, 32, 2, 0, }; p = orc_program_new_from_static_bytecode (bc); orc_program_set_backup_function (p, @@ -650,7 +650,7 @@ volume_orc_process_int32_clamp (gint32 * ORC_RESTRICT d1, int p1, int n) orc_program_set_backup_function (p, _backup_volume_orc_process_int32_clamp); orc_program_add_destination (p, 4, "d1"); - 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"); @@ -1016,7 +1016,7 @@ volume_orc_process_int8 (gint8 * ORC_RESTRICT d1, int p1, int n) #if 1 static const orc_uint8 bc[] = { 1, 9, 23, 118, 111, 108, 117, 109, 101, 95, 111, 114, 99, 95, 112, 114, - 111, 99, 101, 115, 115, 95, 105, 110, 116, 56, 11, 1, 1, 14, 4, 3, + 111, 99, 101, 115, 115, 95, 105, 110, 116, 56, 11, 1, 1, 14, 2, 3, 0, 0, 0, 16, 1, 20, 2, 174, 32, 0, 24, 94, 32, 32, 16, 157, 0, 32, 2, 0, }; @@ -1027,7 +1027,7 @@ volume_orc_process_int8 (gint8 * ORC_RESTRICT d1, int p1, int n) orc_program_set_name (p, "volume_orc_process_int8"); orc_program_set_backup_function (p, _backup_volume_orc_process_int8); orc_program_add_destination (p, 1, "d1"); - 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"); @@ -1143,7 +1143,7 @@ volume_orc_process_int8_clamp (gint8 * ORC_RESTRICT d1, int p1, int n) 1, 9, 29, 118, 111, 108, 117, 109, 101, 95, 111, 114, 99, 95, 112, 114, 111, 99, 101, 115, 115, 95, 105, 110, 116, 56, 95, 99, 108, 97, 109, 112, - 11, 1, 1, 14, 4, 3, 0, 0, 0, 16, 1, 20, 2, 174, 32, 0, + 11, 1, 1, 14, 2, 3, 0, 0, 0, 16, 1, 20, 2, 174, 32, 0, 24, 94, 32, 32, 16, 159, 0, 32, 2, 0, }; p = orc_program_new_from_static_bytecode (bc); @@ -1155,7 +1155,7 @@ volume_orc_process_int8_clamp (gint8 * ORC_RESTRICT d1, int p1, int n) orc_program_set_backup_function (p, _backup_volume_orc_process_int8_clamp); orc_program_add_destination (p, 1, "d1"); - 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"); @@ -1284,8 +1284,8 @@ volume_orc_memset_f64 (gdouble * ORC_RESTRICT d1, double p1, int n) { 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/win32/common/_stdint.h b/win32/common/_stdint.h index 88657630f..a751fde4e 100644 --- a/win32/common/_stdint.h +++ b/win32/common/_stdint.h @@ -1,8 +1,8 @@ #ifndef _GST_PLUGINS_BASE__STDINT_H #define _GST_PLUGINS_BASE__STDINT_H 1 #ifndef _GENERATED_STDINT_H -#define _GENERATED_STDINT_H "gst-plugins-base 1.4.4" -/* generated using gnu compiler gcc (Debian 4.9.2-1) 4.9.2 */ +#define _GENERATED_STDINT_H "gst-plugins-base 1.4.5" +/* generated using gnu compiler gcc (Debian 4.9.2-8) 4.9.2 */ #define _STDINT_HAVE_STDINT_H 1 #include <stdint.h> #endif diff --git a/win32/common/config.h b/win32/common/config.h index 512bb1f40..f5623c00a 100644 --- a/win32/common/config.h +++ b/win32/common/config.h @@ -84,7 +84,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 @@ -325,7 +325,7 @@ #define PACKAGE_NAME "GStreamer Base Plug-ins" /* Define to the full name and version of this package. */ -#define PACKAGE_STRING "GStreamer Base Plug-ins 1.4.4" +#define PACKAGE_STRING "GStreamer Base Plug-ins 1.4.5" /* Define to the one symbol short name of this package. */ #define PACKAGE_TARNAME "gst-plugins-base" @@ -334,7 +334,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 @@ -368,7 +368,7 @@ #undef USE_TREMOLO /* 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). */ |