diff options
| author | Sebastian Dröge <sebastian@centricular.com> | 2013-12-26 17:37:46 +0100 |
|---|---|---|
| committer | Sebastian Dröge <sebastian@centricular.com> | 2013-12-26 17:37:46 +0100 |
| commit | 1c64bd005b5d861fc361048ae8106defa5124928 (patch) | |
| tree | 44848f46523a973d9cf2a634403ef5af06bba487 | |
| parent | 431c06365c727229a4f4419c4fe18c0d62db614e (diff) | |
Release 1.2.2gst-plugins-base-1.2.2
36 files changed, 433 insertions, 846 deletions
@@ -1,9 +1,267 @@ +=== release 1.2.2 === + +2013-12-26 Sebastian Dröge <slomo@coaxion.net> + + * configure.ac: + releasing 1.2.2 + +2013-12-26 16:45:54 +0100 Sebastian Dröge <sebastian@centricular.com> + + * po/da.po: + * po/de.po: + * po/pl.po: + * po/ru.po: + * po/uk.po: + * po/vi.po: + po: Update translations + +2013-12-23 14:54:02 +0100 Sebastian Dröge <sebastian@centricular.com> + + * gst/videoconvert/gstvideoconvertorc.orc: + * gst/videoconvert/videoconvert.c: + videoconvert: Fix I420 to BGRA fast-path alpha setting + This fast-path was adding 128 to every component including + alpha while it should only be done for all components except + alpha. This caused wrong alpha values to be generated. + Also remove the high-quality I420 to BGRA fast-path as it needs + the same fix, which causes an additional instruction, which causes + orc to emit more than 96 variables, which then just crashes. + This can only be fixed in orc by breaking ABI and allowing more + variables. + +2013-12-16 11:35:12 +0100 Sebastian Dröge <sebastian@centricular.com> + + * gst-libs/gst/tag/gstvorbistag.c: + vorbistag: Read image-type from the GstSample info struct + But for backwards compatibility keep reading it from the caps and only + use the info struct if the caps don't contain the image-type. + +2013-12-13 14:36:41 +0100 Sebastian Dröge <sebastian@centricular.com> + + * gst-libs/gst/video/gstvideodecoder.c: + videodecoder: gst_video_decoder_release_frame() is available since 1.2.2 + +2013-12-01 12:37:52 +0100 Mark Nauwelaerts <mnauw@users.sourceforge.net> + + * docs/libs/gst-plugins-base-libs-sections.txt: + * win32/common/libgstvideo.def: + videodecoder: add new API to docs and defs + +2013-11-26 20:51:58 +0100 Mark Nauwelaerts <mnauw@users.sourceforge.net> + + * gst-libs/gst/video/gstvideodecoder.c: + videodecoder: fix spelling error in debug message + +2013-11-26 20:50:33 +0100 Mark Nauwelaerts <mnauw@users.sourceforge.net> + + * gst-libs/gst/video/gstvideodecoder.c: + * gst-libs/gst/video/gstvideodecoder.h: + videodecoder: make _release_frame external API + ... so subclasses can release a frame all the way (also from frame list) + without having to pass through _finish_frame or _drop_frame. + The latter may not be applicable, or may or may not have already + been called for the frame in question. + See https://bugzilla.gnome.org/show_bug.cgi?id=693772 + +2013-12-05 00:27:14 +0900 Justin Joy <justin.joy.9to5@gmail.com> + + * gst-libs/gst/video/convertframe.c: + convertframe: Fix trivial memory leak in debug statement + gst_element_get_name() requires the caller to g_free() the return value + https://bugzilla.gnome.org/show_bug.cgi?id=719850 + convertframe: Fix indention + +2013-12-04 19:24:08 +0100 Mark Nauwelaerts <mnauw@users.sourceforge.net> + + * gst-libs/gst/audio/gstaudiodecoder.c: + audiodecoder: no fallback to segment start for reverse playback + See https://bugzilla.gnome.org/show_bug.cgi?id=709965 + +2013-12-02 20:35:04 +0100 Mark Nauwelaerts <mnauw@users.sourceforge.net> + + * gst-libs/gst/audio/gstaudiodecoder.c: + audiodecoder: use segment start as fallback ts if no other available + Fixes https://bugzilla.gnome.org/show_bug.cgi?id=709965 + +2013-11-29 17:26:13 +0100 Wim Taymans <wtaymans@redhat.com> + + * gst/playback/gstdecodebin2.c: + decodebin2: copy sticky events + +2013-11-29 17:30:09 +0100 Wim Taymans <wtaymans@redhat.com> + + * gst/playback/gsturidecodebin.c: + uridecodebin: copy sticky events + +2013-11-29 13:32:55 +0100 Sebastian Dröge <sebastian@centricular.com> + + * ext/theora/gsttheoraparse.c: + theoraparse: Fix event handling + Send CAPS event before any SEGMENT events or any other events + that must come in order after the CAPS event. + +2013-11-28 16:22:01 +0000 Tim-Philipp Müller <tim@centricular.com> + + * gst/tcp/gsttcpserversink.c: + tcp: fix compilation with MSVC + error C2440 at line 165 of gsttcpserversink.c + type cast error: cannot convert from GSocket* to GstMultiSinkHandle + +2013-11-28 11:25:20 +0100 Wim Taymans <wtaymans@redhat.com> + + * gst/playback/gstdecodebin2.c: + decodebin2: activate ghost pad before targetting + Activate the decodebin2 pad before setting the target. This makes sure + that the events are copied. + +2013-11-21 21:33:59 +0100 Mark Nauwelaerts <mnauw@users.sourceforge.net> + + * gst-libs/gst/video/gstvideodecoder.c: + videodecoder: avoid descending output timestamps + Fixes https://bugzilla.gnome.org/show_bug.cgi?id=712796 + +2013-11-26 12:03:24 +0100 Sebastian Dröge <sebastian@centricular.com> + + * gst/playback/gstplaysink.c: + playsink: Fix visualizations if no visualization plugin was set + https://bugzilla.gnome.org/show_bug.cgi?id=712280 + +2013-11-21 22:04:46 +0900 Jihyun Cho <jihyun.jo@gmail.com> + + * gst/subparse/samiparse.c: + subparse: fix null pointer access in sami parser + https://bugzilla.gnome.org/show_bug.cgi?id=712805 + +2013-11-21 15:19:47 +0000 Tim-Philipp Müller <tim@centricular.com> + + * gst/subparse/gstssaparse.c: + * gst/subparse/gstsubparse.c: + subparse: g_memmove() is deprecated + Just use plain memmove(), g_memmove() is deprecated in + recent GLib versions. + https://bugzilla.gnome.org/show_bug.cgi?id=712811 + +2013-11-18 19:27:14 +0000 Tim-Philipp Müller <tim@centricular.com> + + * tests/icles/input-selector-test.c: + tests: fix input-selector-test + Update for pad template name changes. + +2013-11-18 16:03:07 +0000 Tim-Philipp Müller <tim@centricular.com> + + * tests/check/elements/appsrc.c: + tests: fix appsrc test with latest GLib version + With the latest GLib, g_source_remove() complains about not finding + the timeout source with the given ID here, since it was already + destroyed by returning FALSE from the timeout callback. Also return + FALSE from the bus watches when we don't want to be called any more. + +2013-11-14 01:53:31 -0300 Reynaldo H. Verdejo Pinochet <r.verdejo@sisa.samsung.com> + + * gst/typefind/gsttypefindfunctions.c: + typefind: Fix identification of some MPEG files + Make sure we begin by peeking at MPEG2_MAX_PROBE_LENGTH + bytes. + Fixes: + https://bugzilla.gnome.org/show_bug.cgi?id=678011 + +2013-11-13 20:12:48 +0100 Sebastian Dröge <sebastian@centricular.com> + + * gst-libs/gst/rtp/gstrtpbuffer.c: + rtpbuffer: Fix gst_rtp_buffer_ext_timestamp() with clang 5 on iOS/ARM + The bitwise NOT operator is not defined on signed integers. + Thanks to Wim Taymans for finding the cause. + https://bugzilla.gnome.org/show_bug.cgi?id=711819 + +2013-11-12 18:58:43 +0000 Tim-Philipp Müller <tim@centricular.com> + + * tests/check/elements/streamsynchronizer.c: + tests: fix race in streamsynchronizer test + Wait for thread to exit before starting to free the + to_push list, otherwise thread might check the final + to_push->next node only after we've freed it already. + === release 1.2.1 === -2013-11-09 Sebastian Dröge <slomo@coaxion.net> +2013-11-09 12:15:57 +0100 Sebastian Dröge <sebastian@centricular.com> + * ChangeLog: + * NEWS: + * RELEASE: * configure.ac: - releasing 1.2.1 + * 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-ivorbisdec.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.2.1 + +2013-11-09 12:15:37 +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 2013-11-09 12:01:11 +0100 Sebastian Dröge <sebastian@centricular.com> @@ -1,2 +1,2 @@ -This is GStreamer Base Plugins 1.2.1 +This is GStreamer Base Plugins 1.2.2 @@ -1,5 +1,5 @@ -Release notes for GStreamer Base Plugins 1.2.1 +Release notes for GStreamer Base Plugins 1.2.2 The GStreamer team is proud to announce a new bug-fix release @@ -60,23 +60,15 @@ contains a set of codecs plugins based on libav (formerly gst-ffmpeg) Bugs fixed in this release - * 701813 : Reverse playback not working with videotestsrc - * 708689 : rtspconnection: RTSP watch is dispatched after closing the connection - * 708773 : pbutils: add MPEG 2 AAC description - * 708789 : playbin: make sure elements are in null before disposing - * 708880 : rtspconnection: Not connecting to proxy when specified - * 708952 : audio: change buffer ts when clipping buffer even if data length is same - * 708953 : audiorate: clip buffers before pushing them out - * 708954 : pbutils: add entry for text/x-raw - * 709210 : Hangs on startup getting PulseAudio volume - * 709408 : audioconvert: modifies buffer mapped for READ - * 709637 : oggmux: Make sure we end up sending EOS if we received EOS on all sinkpads - * 709754 : audioringbuffer: Clears need_reorder flag wrongly - * 709938 : navigation: Missing gobject-introspection annotations - * 710325 : playback: Add subpicture/x-dvb as raw caps - * 711003 : videoscale: borders are filled with green when using NV12 pixelformat - * 711231 : rtspconnection: allow setting tls certificate validation flags - * 711550 : appsrc: Deadlocking because holding mutex while setting caps + * 715138 : xvimagesink 1.2 ignores resize events when used on a QWidget + * 708200 : multiqueue: Switching audio tracks doesn't work on some files + * 707621 : decodebin: stream-id can't be retrieved from autoplug-continue signal + * 709965 : vorbisdec: Does not put timestamps on first buffer sometimes + * 711819 : rtpbuffer: gst_rtp_buffer_ext_timestamp() returns wrong value when compiled with clang 5 on iOS/ARM + * 712280 : playsink: Unable to play audio stream with visualization plugin + * 712796 : videodecoder: incorrect timestamps sequence + * 712805 : subparse: crashes when loading a sami subtitle + * 678011 : typefinding: some mpeg files are not identified as mpeg files ==== Download ==== @@ -113,17 +105,11 @@ subscribe to the gstreamer-devel list. Contributors to this release - * Aleix Conchillo Flaque - * Antonio Ospite - * Hans Månsson - * Matej Knopp - * Ognyan Tonchev + * Jihyun Cho + * Justin Joy + * Mark Nauwelaerts + * Reynaldo H. Verdejo Pinochet * Sebastian Dröge - * Stefan Sauer - * Stephan Sundermann - * Takashi Iwai - * Thiago Santos - * Thibault Saunier * Tim-Philipp Müller - * Tom Greenwood + * Wim Taymans
\ No newline at end of file diff --git a/configure.ac b/configure.ac index 67593c620f..364c40cb1d 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.2.1],[http://bugzilla.gnome.org/enter_bug.cgi?product=GStreamer],[gst-plugins-base]) +AC_INIT([GStreamer Base Plug-ins],[1.2.2],[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, 201, 0, 201) +AS_LIBTOOL(GST, 202, 0, 202) dnl *** required versions of GStreamer stuff *** GST_REQ=1.2.0 diff --git a/docs/plugins/inspect/plugin-adder.xml b/docs/plugins/inspect/plugin-adder.xml index 4b956db4bc..e539070f92 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.2.1</version> + <version>1.2.2</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 abebd2f87c..90bb8600ae 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.2.1</version> + <version>1.2.2</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 6b4dc7e155..8bab2d5509 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.2.1</version> + <version>1.2.2</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 09f23ab410..96c012e3b1 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.2.1</version> + <version>1.2.2</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 f2fdeb8ab7..15c0b7827a 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.2.1</version> + <version>1.2.2</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 dcf3f8198b..971ba6c59d 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.2.1</version> + <version>1.2.2</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 e65fdffe05..d0fd330f7c 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.2.1</version> + <version>1.2.2</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 2ba91412a9..9b0b82c081 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.2.1</version> + <version>1.2.2</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 9ac1184605..d637cf0e08 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.2.1</version> + <version>1.2.2</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 2e41c8fa66..b0b0fb55ba 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.2.1</version> + <version>1.2.2</version> <license>LGPL</license> <source>gst-plugins-base</source> <package>GStreamer Base Plug-ins source release</package> diff --git a/docs/plugins/inspect/plugin-ivorbisdec.xml b/docs/plugins/inspect/plugin-ivorbisdec.xml index e0bda1f3ea..166697de3a 100644 --- a/docs/plugins/inspect/plugin-ivorbisdec.xml +++ b/docs/plugins/inspect/plugin-ivorbisdec.xml @@ -3,7 +3,7 @@ <description>Vorbis Tremor decoder</description> <filename>../../ext/vorbis/.libs/libgstivorbisdec.so</filename> <basename>libgstivorbisdec.so</basename> - <version>1.2.1</version> + <version>1.2.2</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 f9934d49bf..e9fe717536 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.2.1</version> + <version>1.2.2</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 60a016c5a3..3ad08ac5a8 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.2.1</version> + <version>1.2.2</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 675ff5a776..16ae64089b 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.2.1</version> + <version>1.2.2</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 5f148a6750..c8385d8434 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.2.1</version> + <version>1.2.2</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 b0cb1f58a1..bc9a4986d5 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.2.1</version> + <version>1.2.2</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 dcd098ba76..8de13b4fa0 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.2.1</version> + <version>1.2.2</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 3aa0f15110..e36b181e11 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.2.1</version> + <version>1.2.2</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 b7d912441a..8385224321 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.2.1</version> + <version>1.2.2</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 6ee3d7b839..57d1e352c3 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.2.1</version> + <version>1.2.2</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 359c00da3f..03616e01d0 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.2.1</version> + <version>1.2.2</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 4cb12ba3c7..a4fc45cabb 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.2.1</version> + <version>1.2.2</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 8b19437e2d..31207c2cc0 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.2.1</version> + <version>1.2.2</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 8a7c3470b2..0c8d6ee76f 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.2.1</version> + <version>1.2.2</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 9083bf39f8..97ae5993fc 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.2.1</version> + <version>1.2.2</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 8630aebc23..8d7f5cce50 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.2.1</version> + <version>1.2.2</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 c2b8b23f12..295ba3036f 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.2.1</version> + <version>1.2.2</version> <license>LGPL</license> <source>gst-plugins-base</source> <package>GStreamer Base Plug-ins source release</package> diff --git a/gst-plugins-base.doap b/gst-plugins-base.doap index e4d3e319b7..fdf2a26ddd 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.2.2</revision> + <branch>1.2</branch> + <name></name> + <created>2013-12-26</created> + <file-release rdf:resource="http://gstreamer.freedesktop.org/src/gst-plugins-base/gst-plugins-base-1.2.2.tar.xz" /> + </Version> + </release> + + <release> + <Version> <revision>1.2.1</revision> <branch>1.2</branch> <name></name> diff --git a/gst/videoconvert/gstvideoconvertorc-dist.c b/gst/videoconvert/gstvideoconvertorc-dist.c index 4a4f9782c0..4ba952e56f 100644 --- a/gst/videoconvert/gstvideoconvertorc-dist.c +++ b/gst/videoconvert/gstvideoconvertorc-dist.c @@ -207,10 +207,6 @@ void video_convert_orc_convert_AYUV_RGBA (guint8 * ORC_RESTRICT d1, void video_convert_orc_convert_I420_BGRA (guint8 * ORC_RESTRICT d1, const guint8 * ORC_RESTRICT s1, const guint8 * ORC_RESTRICT s2, const guint8 * ORC_RESTRICT s3, int n); -void video_convert_orc_convert_I420_BGRA_avg (guint8 * ORC_RESTRICT d1, - const guint8 * ORC_RESTRICT s1, const guint8 * ORC_RESTRICT s2, - const guint8 * ORC_RESTRICT s3, const guint8 * ORC_RESTRICT s4, - const guint8 * ORC_RESTRICT s5, int n); void video_convert_orc_getline_I420 (guint8 * ORC_RESTRICT d1, const guint8 * ORC_RESTRICT s1, const guint8 * ORC_RESTRICT s2, const guint8 * ORC_RESTRICT s3, int n); @@ -9067,7 +9063,12 @@ video_convert_orc_convert_I420_BGRA (guint8 * ORC_RESTRICT d1, const orc_int8 *ORC_RESTRICT ptr4; const orc_int8 *ORC_RESTRICT ptr5; const orc_int8 *ORC_RESTRICT ptr6; + orc_int8 var44; +#if defined(__APPLE__) && __GNUC__ == 4 && __GNUC_MINOR__ == 2 && defined (__i386__) + volatile orc_int8 var45; +#else orc_int8 var45; +#endif #if defined(__APPLE__) && __GNUC__ == 4 && __GNUC_MINOR__ == 2 && defined (__i386__) volatile orc_int8 var46; #else @@ -9079,9 +9080,9 @@ video_convert_orc_convert_I420_BGRA (guint8 * ORC_RESTRICT d1, orc_int8 var47; #endif #if defined(__APPLE__) && __GNUC__ == 4 && __GNUC_MINOR__ == 2 && defined (__i386__) - volatile orc_int8 var48; + volatile orc_union16 var48; #else - orc_int8 var48; + orc_union16 var48; #endif #if defined(__APPLE__) && __GNUC__ == 4 && __GNUC_MINOR__ == 2 && defined (__i386__) volatile orc_union16 var49; @@ -9114,9 +9115,9 @@ video_convert_orc_convert_I420_BGRA (guint8 * ORC_RESTRICT d1, orc_int8 var54; #endif #if defined(__APPLE__) && __GNUC__ == 4 && __GNUC_MINOR__ == 2 && defined (__i386__) - volatile orc_union32 var55; + volatile orc_int8 var55; #else - orc_union32 var55; + orc_int8 var55; #endif orc_union32 var56; orc_int8 var57; @@ -9152,7 +9153,8 @@ video_convert_orc_convert_I420_BGRA (guint8 * ORC_RESTRICT d1, orc_int8 var87; orc_union16 var88; orc_union16 var89; - orc_union32 var90; + orc_int8 var90; + orc_union16 var91; ptr0 = (orc_union32 *) d1; ptr4 = (orc_int8 *) s1; @@ -9160,34 +9162,34 @@ video_convert_orc_convert_I420_BGRA (guint8 * ORC_RESTRICT d1, ptr6 = (orc_int8 *) s3; /* 1: loadpb */ - var46 = (int) 0x00000080; /* 128 or 6.32404e-322f */ + var45 = (int) 0x00000080; /* 128 or 6.32404e-322f */ /* 5: loadpb */ - var47 = (int) 0x00000080; /* 128 or 6.32404e-322f */ + var46 = (int) 0x00000080; /* 128 or 6.32404e-322f */ /* 9: loadpb */ - var48 = (int) 0x00000080; /* 128 or 6.32404e-322f */ + var47 = (int) 0x00000080; /* 128 or 6.32404e-322f */ /* 12: loadpw */ - var49.i = (int) 0x0000002a; /* 42 or 2.07508e-322f */ + var48.i = (int) 0x0000002a; /* 42 or 2.07508e-322f */ /* 17: loadpw */ - var50.i = (int) 0x00000067; /* 103 or 5.08888e-322f */ + var49.i = (int) 0x00000067; /* 103 or 5.08888e-322f */ /* 24: loadpw */ - var51.i = (int) 0x00000004; /* 4 or 1.97626e-323f */ + var50.i = (int) 0x00000004; /* 4 or 1.97626e-323f */ /* 28: loadpw */ - var52.i = (int) 0x00000064; /* 100 or 4.94066e-322f */ + var51.i = (int) 0x00000064; /* 100 or 4.94066e-322f */ /* 32: loadpw */ - var53.i = (int) 0x00000068; /* 104 or 5.13828e-322f */ + var52.i = (int) 0x00000068; /* 104 or 5.13828e-322f */ /* 41: loadpb */ - var54 = (int) 0x000000ff; /* 255 or 1.25987e-321f */ - /* 44: loadpb */ - var55.x4[0] = (int) 0x00000080; /* 128 or 6.32404e-322f */ - var55.x4[1] = (int) 0x00000080; /* 128 or 6.32404e-322f */ - var55.x4[2] = (int) 0x00000080; /* 128 or 6.32404e-322f */ - var55.x4[3] = (int) 0x00000080; /* 128 or 6.32404e-322f */ + var53.x2[0] = (int) 0x00000080; /* 128 or 6.32404e-322f */ + var53.x2[1] = (int) 0x00000080; /* 128 or 6.32404e-322f */ + /* 43: loadpb */ + var54 = (int) 0x00000080; /* 128 or 6.32404e-322f */ + /* 45: loadpb */ + var55 = (int) 0x000000ff; /* 255 or 1.25987e-321f */ for (i = 0; i < n; i++) { /* 0: loadb */ - var45 = ptr4[i]; + var44 = ptr4[i]; /* 2: subb */ - var57 = var45 - var46; + var57 = var44 - var45; /* 3: convsbw */ var58.i = var57; /* 4: loadupib */ @@ -9195,7 +9197,7 @@ video_convert_orc_convert_I420_BGRA (guint8 * ORC_RESTRICT d1, (i & 1) ? ((orc_uint8) ptr5[i >> 1] + (orc_uint8) ptr5[(i >> 1) + 1] + 1) >> 1 : ptr5[i >> 1]; /* 6: subb */ - var60 = var59 - var47; + var60 = var59 - var46; /* 7: convsbw */ var61.i = var60; /* 8: loadupib */ @@ -9203,11 +9205,11 @@ video_convert_orc_convert_I420_BGRA (guint8 * ORC_RESTRICT d1, (i & 1) ? ((orc_uint8) ptr6[i >> 1] + (orc_uint8) ptr6[(i >> 1) + 1] + 1) >> 1 : ptr6[i >> 1]; /* 10: subb */ - var63 = var62 - var48; + var63 = var62 - var47; /* 11: convsbw */ var64.i = var63; /* 13: mullw */ - var65.i = (var58.i * var49.i) & 0xffff; + var65.i = (var58.i * var48.i) & 0xffff; /* 14: shrsw */ var66.i = var65.i >> 8; /* 15: addssw */ @@ -9215,7 +9217,7 @@ video_convert_orc_convert_I420_BGRA (guint8 * ORC_RESTRICT d1, /* 16: addssw */ var68.i = ORC_CLAMP_SW (var67.i + var64.i); /* 18: mullw */ - var69.i = (var64.i * var50.i) & 0xffff; + var69.i = (var64.i * var49.i) & 0xffff; /* 19: shrsw */ var70.i = var69.i >> 8; /* 20: subssw */ @@ -9227,19 +9229,19 @@ video_convert_orc_convert_I420_BGRA (guint8 * ORC_RESTRICT d1, /* 23: addssw */ var74.i = ORC_CLAMP_SW (var73.i + var61.i); /* 25: mullw */ - var75.i = (var61.i * var51.i) & 0xffff; + var75.i = (var61.i * var50.i) & 0xffff; /* 26: shrsw */ var76.i = var75.i >> 8; /* 27: addssw */ var77.i = ORC_CLAMP_SW (var74.i + var76.i); /* 29: mullw */ - var78.i = (var61.i * var52.i) & 0xffff; + var78.i = (var61.i * var51.i) & 0xffff; /* 30: shrsw */ var79.i = var78.i >> 8; /* 31: subssw */ var80.i = ORC_CLAMP_SW (var67.i - var79.i); /* 33: mullw */ - var81.i = (var64.i * var53.i) & 0xffff; + var81.i = (var64.i * var52.i) & 0xffff; /* 34: shrsw */ var82.i = var81.i >> 8; /* 35: subssw */ @@ -9259,26 +9261,26 @@ video_convert_orc_convert_I420_BGRA (guint8 * ORC_RESTRICT d1, _dest.x2[1] = var86; var88.i = _dest.i; } - /* 42: mergebw */ + /* 42: subb */ + var89.x2[0] = var88.x2[0] - var53.x2[0]; + var89.x2[1] = var88.x2[1] - var53.x2[1]; + /* 44: subb */ + var90 = var85 - var54; + /* 46: mergebw */ { orc_union16 _dest; - _dest.x2[0] = var85; - _dest.x2[1] = var54; - var89.i = _dest.i; + _dest.x2[0] = var90; + _dest.x2[1] = var55; + var91.i = _dest.i; } - /* 43: mergewl */ + /* 47: mergewl */ { orc_union32 _dest; - _dest.x2[0] = var88.i; - _dest.x2[1] = var89.i; - var90.i = _dest.i; - } - /* 45: addb */ - var56.x4[0] = var90.x4[0] + var55.x4[0]; - var56.x4[1] = var90.x4[1] + var55.x4[1]; - var56.x4[2] = var90.x4[2] + var55.x4[2]; - var56.x4[3] = var90.x4[3] + var55.x4[3]; - /* 46: storel */ + _dest.x2[0] = var89.i; + _dest.x2[1] = var91.i; + var56.i = _dest.i; + } + /* 48: storel */ ptr0[i] = var56; } @@ -9294,7 +9296,12 @@ _backup_video_convert_orc_convert_I420_BGRA (OrcExecutor * ORC_RESTRICT ex) const orc_int8 *ORC_RESTRICT ptr4; const orc_int8 *ORC_RESTRICT ptr5; const orc_int8 *ORC_RESTRICT ptr6; + orc_int8 var44; +#if defined(__APPLE__) && __GNUC__ == 4 && __GNUC_MINOR__ == 2 && defined (__i386__) + volatile orc_int8 var45; +#else orc_int8 var45; +#endif #if defined(__APPLE__) && __GNUC__ == 4 && __GNUC_MINOR__ == 2 && defined (__i386__) volatile orc_int8 var46; #else @@ -9306,9 +9313,9 @@ _backup_video_convert_orc_convert_I420_BGRA (OrcExecutor * ORC_RESTRICT ex) orc_int8 var47; #endif #if defined(__APPLE__) && __GNUC__ == 4 && __GNUC_MINOR__ == 2 && defined (__i386__) - volatile orc_int8 var48; + volatile orc_union16 var48; #else - orc_int8 var48; + orc_union16 var48; #endif #if defined(__APPLE__) && __GNUC__ == 4 && __GNUC_MINOR__ == 2 && defined (__i386__) volatile orc_union16 var49; @@ -9341,9 +9348,9 @@ _backup_video_convert_orc_convert_I420_BGRA (OrcExecutor * ORC_RESTRICT ex) orc_int8 var54; #endif #if defined(__APPLE__) && __GNUC__ == 4 && __GNUC_MINOR__ == 2 && defined (__i386__) - volatile orc_union32 var55; + volatile orc_int8 var55; #else - orc_union32 var55; + orc_int8 var55; #endif orc_union32 var56; orc_int8 var57; @@ -9379,7 +9386,8 @@ _backup_video_convert_orc_convert_I420_BGRA (OrcExecutor * ORC_RESTRICT ex) orc_int8 var87; orc_union16 var88; orc_union16 var89; - orc_union32 var90; + orc_int8 var90; + orc_union16 var91; ptr0 = (orc_union32 *) ex->arrays[0]; ptr4 = (orc_int8 *) ex->arrays[4]; @@ -9387,34 +9395,34 @@ _backup_video_convert_orc_convert_I420_BGRA (OrcExecutor * ORC_RESTRICT ex) ptr6 = (orc_int8 *) ex->arrays[6]; /* 1: loadpb */ - var46 = (int) 0x00000080; /* 128 or 6.32404e-322f */ + var45 = (int) 0x00000080; /* 128 or 6.32404e-322f */ /* 5: loadpb */ - var47 = (int) 0x00000080; /* 128 or 6.32404e-322f */ + var46 = (int) 0x00000080; /* 128 or 6.32404e-322f */ /* 9: loadpb */ - var48 = (int) 0x00000080; /* 128 or 6.32404e-322f */ + var47 = (int) 0x00000080; /* 128 or 6.32404e-322f */ /* 12: loadpw */ - var49.i = (int) 0x0000002a; /* 42 or 2.07508e-322f */ + var48.i = (int) 0x0000002a; /* 42 or 2.07508e-322f */ /* 17: loadpw */ - var50.i = (int) 0x00000067; /* 103 or 5.08888e-322f */ + var49.i = (int) 0x00000067; /* 103 or 5.08888e-322f */ /* 24: loadpw */ - var51.i = (int) 0x00000004; /* 4 or 1.97626e-323f */ + var50.i = (int) 0x00000004; /* 4 or 1.97626e-323f */ /* 28: loadpw */ - var52.i = (int) 0x00000064; /* 100 or 4.94066e-322f */ + var51.i = (int) 0x00000064; /* 100 or 4.94066e-322f */ /* 32: loadpw */ - var53.i = (int) 0x00000068; /* 104 or 5.13828e-322f */ + var52.i = (int) 0x00000068; /* 104 or 5.13828e-322f */ /* 41: loadpb */ - var54 = (int) 0x000000ff; /* 255 or 1.25987e-321f */ - /* 44: loadpb */ - var55.x4[0] = (int) 0x00000080; /* 128 or 6.32404e-322f */ - var55.x4[1] = (int) 0x00000080; /* 128 or 6.32404e-322f */ - var55.x4[2] = (int) 0x00000080; /* 128 or 6.32404e-322f */ - var55.x4[3] = (int) 0x00000080; /* 128 or 6.32404e-322f */ + var53.x2[0] = (int) 0x00000080; /* 128 or 6.32404e-322f */ + var53.x2[1] = (int) 0x00000080; /* 128 or 6.32404e-322f */ + /* 43: loadpb */ + var54 = (int) 0x00000080; /* 128 or 6.32404e-322f */ + /* 45: loadpb */ + var55 = (int) 0x000000ff; /* 255 or 1.25987e-321f */ for (i = 0; i < n; i++) { /* 0: loadb */ - var45 = ptr4[i]; + var44 = ptr4[i]; /* 2: subb */ - var57 = var45 - var46; + var57 = var44 - var45; /* 3: convsbw */ var58.i = var57; /* 4: loadupib */ @@ -9422,7 +9430,7 @@ _backup_video_convert_orc_convert_I420_BGRA (OrcExecutor * ORC_RESTRICT ex) (i & 1) ? ((orc_uint8) ptr5[i >> 1] + (orc_uint8) ptr5[(i >> 1) + 1] + 1) >> 1 : ptr5[i >> 1]; /* 6: subb */ - var60 = var59 - var47; + var60 = var59 - var46; /* 7: convsbw */ var61.i = var60; /* 8: loadupib */ @@ -9430,11 +9438,11 @@ _backup_video_convert_orc_convert_I420_BGRA (OrcExecutor * ORC_RESTRICT ex) (i & 1) ? ((orc_uint8) ptr6[i >> 1] + (orc_uint8) ptr6[(i >> 1) + 1] + 1) >> 1 : ptr6[i >> 1]; /* 10: subb */ - var63 = var62 - var48; + var63 = var62 - var47; /* 11: convsbw */ var64.i = var63; /* 13: mullw */ - var65.i = (var58.i * var49.i) & 0xffff; + var65.i = (var58.i * var48.i) & 0xffff; /* 14: shrsw */ var66.i = var65.i >> 8; /* 15: addssw */ @@ -9442,7 +9450,7 @@ _backup_video_convert_orc_convert_I420_BGRA (OrcExecutor * ORC_RESTRICT ex) /* 16: addssw */ var68.i = ORC_CLAMP_SW (var67.i + var64.i); /* 18: mullw */ - var69.i = (var64.i * var50.i) & 0xffff; + var69.i = (var64.i * var49.i) & 0xffff; /* 19: shrsw */ var70.i = var69.i >> 8; /* 20: subssw */ @@ -9454,19 +9462,19 @@ _backup_video_convert_orc_convert_I420_BGRA (OrcExecutor * ORC_RESTRICT ex) /* 23: addssw */ var74.i = ORC_CLAMP_SW (var73.i + var61.i); /* 25: mullw */ - var75.i = (var61.i * var51.i) & 0xffff; + var75.i = (var61.i * var50.i) & 0xffff; /* 26: shrsw */ var76.i = var75.i >> 8; /* 27: addssw */ var77.i = ORC_CLAMP_SW (var74.i + var76.i); /* 29: mullw */ - var78.i = (var61.i * var52.i) & 0xffff; + var78.i = (var61.i * var51.i) & 0xffff; /* 30: shrsw */ var79.i = var78.i >> 8; /* 31: subssw */ var80.i = ORC_CLAMP_SW (var67.i - var79.i); /* 33: mullw */ - var81.i = (var64.i * var53.i) & 0xffff; + var81.i = (var64.i * var52.i) & 0xffff; /* 34: shrsw */ var82.i = var81.i >> 8; /* 35: subssw */ @@ -9486,26 +9494,26 @@ _backup_video_convert_orc_convert_I420_BGRA (OrcExecutor * ORC_RESTRICT ex) _dest.x2[1] = var86; var88.i = _dest.i; } - /* 42: mergebw */ + /* 42: subb */ + var89.x2[0] = var88.x2[0] - var53.x2[0]; + var89.x2[1] = var88.x2[1] - var53.x2[1]; + /* 44: subb */ + var90 = var85 - var54; + /* 46: mergebw */ { orc_union16 _dest; - _dest.x2[0] = var85; - _dest.x2[1] = var54; - var89.i = _dest.i; + _dest.x2[0] = var90; + _dest.x2[1] = var55; + var91.i = _dest.i; } - /* 43: mergewl */ + /* 47: mergewl */ { orc_union32 _dest; - _dest.x2[0] = var88.i; - _dest.x2[1] = var89.i; - var90.i = _dest.i; - } - /* 45: addb */ - var56.x4[0] = var90.x4[0] + var55.x4[0]; - var56.x4[1] = var90.x4[1] + var55.x4[1]; - var56.x4[2] = var90.x4[2] + var55.x4[2]; - var56.x4[3] = var90.x4[3] + var55.x4[3]; - /* 46: storel */ + _dest.x2[0] = var89.i; + _dest.x2[1] = var91.i; + var56.i = _dest.i; + } + /* 48: storel */ ptr0[i] = var56; } @@ -9535,16 +9543,16 @@ video_convert_orc_convert_I420_BGRA (guint8 * ORC_RESTRICT d1, 42, 0, 0, 0, 14, 4, 103, 0, 0, 0, 14, 4, 4, 0, 0, 0, 14, 4, 100, 0, 0, 0, 14, 4, 104, 0, 0, 0, 14, 4, 255, 0, 0, 0, 20, 2, 20, 2, 20, 1, 20, 2, 20, 2, 20, 2, 20, 2, - 20, 2, 20, 2, 20, 1, 20, 1, 20, 1, 20, 4, 65, 34, 4, 17, - 149, 35, 34, 46, 34, 5, 65, 34, 34, 17, 149, 36, 34, 46, 34, 6, - 65, 34, 34, 17, 149, 37, 34, 89, 32, 35, 18, 94, 32, 32, 16, 71, - 35, 35, 32, 71, 38, 35, 37, 89, 32, 37, 19, 94, 32, 32, 16, 99, - 38, 38, 32, 71, 38, 38, 37, 71, 40, 35, 36, 71, 40, 40, 36, 89, - 32, 36, 20, 94, 32, 32, 16, 71, 40, 40, 32, 89, 32, 36, 21, 94, - 32, 32, 16, 99, 39, 35, 32, 89, 32, 37, 22, 94, 32, 32, 16, 99, - 39, 39, 32, 99, 39, 39, 32, 159, 41, 38, 159, 42, 39, 159, 43, 40, - 196, 32, 43, 42, 196, 33, 41, 23, 195, 44, 32, 33, 21, 2, 33, 0, - 44, 17, 2, 0, + 20, 2, 20, 2, 20, 1, 20, 1, 20, 1, 65, 34, 4, 17, 149, 35, + 34, 46, 34, 5, 65, 34, 34, 17, 149, 36, 34, 46, 34, 6, 65, 34, + 34, 17, 149, 37, 34, 89, 32, 35, 18, 94, 32, 32, 16, 71, 35, 35, + 32, 71, 38, 35, 37, 89, 32, 37, 19, 94, 32, 32, 16, 99, 38, 38, + 32, 71, 38, 38, 37, 71, 40, 35, 36, 71, 40, 40, 36, 89, 32, 36, + 20, 94, 32, 32, 16, 71, 40, 40, 32, 89, 32, 36, 21, 94, 32, 32, + 16, 99, 39, 35, 32, 89, 32, 37, 22, 94, 32, 32, 16, 99, 39, 39, + 32, 99, 39, 39, 32, 159, 41, 38, 159, 42, 39, 159, 43, 40, 196, 32, + 43, 42, 21, 1, 65, 32, 32, 17, 65, 41, 41, 17, 196, 33, 41, 23, + 195, 0, 32, 33, 2, 0, }; p = orc_program_new_from_static_bytecode (bc); orc_program_set_backup_function (p, @@ -9578,7 +9586,6 @@ video_convert_orc_convert_I420_BGRA (guint8 * ORC_RESTRICT d1, orc_program_add_temporary (p, 1, "t10"); orc_program_add_temporary (p, 1, "t11"); orc_program_add_temporary (p, 1, "t12"); - orc_program_add_temporary (p, 4, "t13"); orc_program_append_2 (p, "subb", 0, ORC_VAR_T3, ORC_VAR_S1, ORC_VAR_C2, ORC_VAR_D1); @@ -9644,684 +9651,13 @@ video_convert_orc_convert_I420_BGRA (guint8 * ORC_RESTRICT d1, ORC_VAR_D1, ORC_VAR_D1); orc_program_append_2 (p, "mergebw", 0, ORC_VAR_T1, ORC_VAR_T12, ORC_VAR_T11, ORC_VAR_D1); - orc_program_append_2 (p, "mergebw", 0, ORC_VAR_T2, ORC_VAR_T10, - ORC_VAR_C8, ORC_VAR_D1); - orc_program_append_2 (p, "mergewl", 0, ORC_VAR_T13, ORC_VAR_T1, - ORC_VAR_T2, ORC_VAR_D1); - orc_program_append_2 (p, "addb", 2, ORC_VAR_D1, ORC_VAR_T13, ORC_VAR_C2, - ORC_VAR_D1); -#endif - - orc_program_compile (p); - c = orc_program_take_code (p); - orc_program_free (p); - } - p_inited = TRUE; - orc_once_mutex_unlock (); - } - ex->arrays[ORC_VAR_A2] = c; - ex->program = 0; - - ex->n = n; - ex->arrays[ORC_VAR_D1] = d1; - ex->arrays[ORC_VAR_S1] = (void *) s1; - ex->arrays[ORC_VAR_S2] = (void *) s2; - ex->arrays[ORC_VAR_S3] = (void *) s3; - - func = c->exec; - func (ex); -} -#endif - - -/* video_convert_orc_convert_I420_BGRA_avg */ -#ifdef DISABLE_ORC -void -video_convert_orc_convert_I420_BGRA_avg (guint8 * ORC_RESTRICT d1, - const guint8 * ORC_RESTRICT s1, const guint8 * ORC_RESTRICT s2, - const guint8 * ORC_RESTRICT s3, const guint8 * ORC_RESTRICT s4, - const guint8 * ORC_RESTRICT s5, int n) -{ - int i; - orc_union32 *ORC_RESTRICT ptr0; - const orc_int8 *ORC_RESTRICT ptr4; - const orc_int8 *ORC_RESTRICT ptr5; - const orc_int8 *ORC_RESTRICT ptr6; - const orc_int8 *ORC_RESTRICT ptr7; - const orc_int8 *ORC_RESTRICT ptr8; - orc_int8 var46; -#if defined(__APPLE__) && __GNUC__ == 4 && __GNUC_MINOR__ == 2 && defined (__i386__) - volatile orc_int8 var47; -#else - orc_int8 var47; -#endif -#if defined(__APPLE__) && __GNUC__ == 4 && __GNUC_MINOR__ == 2 && defined (__i386__) - volatile orc_int8 var48; -#else - orc_int8 var48; -#endif -#if defined(__APPLE__) && __GNUC__ == 4 && __GNUC_MINOR__ == 2 && defined (__i386__) - volatile orc_int8 var49; -#else - orc_int8 var49; -#endif -#if defined(__APPLE__) && __GNUC__ == 4 && __GNUC_MINOR__ == 2 && defined (__i386__) - volatile orc_union16 var50; -#else - orc_union16 var50; -#endif -#if defined(__APPLE__) && __GNUC__ == 4 && __GNUC_MINOR__ == 2 && defined (__i386__) - volatile orc_union16 var51; -#else - orc_union16 var51; -#endif -#if defined(__APPLE__) && __GNUC__ == 4 && __GNUC_MINOR__ == 2 && defined (__i386__) - volatile orc_union16 var52; -#else - orc_union16 var52; -#endif -#if defined(__APPLE__) && __GNUC__ == 4 && __GNUC_MINOR__ == 2 && defined (__i386__) - volatile orc_union16 var53; -#else - orc_union16 var53; -#endif -#if defined(__APPLE__) && __GNUC__ == 4 && __GNUC_MINOR__ == 2 && defined (__i386__) - volatile orc_union16 var54; -#else - orc_union16 var54; -#endif -#if defined(__APPLE__) && __GNUC__ == 4 && __GNUC_MINOR__ == 2 && defined (__i386__) - volatile orc_int8 var55; -#else - orc_int8 var55; -#endif -#if defined(__APPLE__) && __GNUC__ == 4 && __GNUC_MINOR__ == 2 && defined (__i386__) - volatile orc_union32 var56; -#else - orc_union32 var56; -#endif - orc_union32 var57; - orc_int8 var58; - orc_union16 var59; - orc_int8 var60; - orc_int8 var61; - orc_int8 var62; - orc_int8 var63; - orc_union16 var64; - orc_int8 var65; - orc_int8 var66; - orc_int8 var67; - orc_int8 var68; - orc_union16 var69; - orc_union16 var70; - orc_union16 var71; - orc_union16 var72; - orc_union16 var73; - orc_union16 var74; - orc_union16 var75; - orc_union16 var76; - orc_union16 var77; - orc_union16 var78; - orc_union16 var79; - orc_union16 var80; - orc_union16 var81; - orc_union16 var82; - orc_union16 var83; - orc_union16 var84; - orc_union16 var85; - orc_union16 var86; - orc_union16 var87; - orc_union16 var88; - orc_union16 var89; - orc_int8 var90; - orc_int8 var91; - orc_int8 var92; - orc_union16 var93; - orc_union16 var94; - orc_union32 var95; - - ptr0 = (orc_union32 *) d1; - ptr4 = (orc_int8 *) s1; - ptr5 = (orc_int8 *) s2; - ptr6 = (orc_int8 *) s3; - ptr7 = (orc_int8 *) s4; - ptr8 = (orc_int8 *) s5; - - /* 1: loadpb */ - var47 = (int) 0x00000080; /* 128 or 6.32404e-322f */ - /* 7: loadpb */ - var48 = (int) 0x00000080; /* 128 or 6.32404e-322f */ - /* 13: loadpb */ - var49 = (int) 0x00000080; /* 128 or 6.32404e-322f */ - /* 16: loadpw */ - var50.i = (int) 0x0000002a; /* 42 or 2.07508e-322f */ - /* 21: loadpw */ - var51.i = (int) 0x00000067; /* 103 or 5.08888e-322f */ - /* 28: loadpw */ - var52.i = (int) 0x00000004; /* 4 or 1.97626e-323f */ - /* 32: loadpw */ - var53.i = (int) 0x00000064; /* 100 or 4.94066e-322f */ - /* 36: loadpw */ - var54.i = (int) 0x00000068; /* 104 or 5.13828e-322f */ - /* 45: loadpb */ - var55 = (int) 0x000000ff; /* 255 or 1.25987e-321f */ - /* 48: loadpb */ - var56.x4[0] = (int) 0x00000080; /* 128 or 6.32404e-322f */ - var56.x4[1] = (int) 0x00000080; /* 128 or 6.32404e-322f */ - var56.x4[2] = (int) 0x00000080; /* 128 or 6.32404e-322f */ - var56.x4[3] = (int) 0x00000080; /* 128 or 6.32404e-322f */ - - for (i = 0; i < n; i++) { - /* 0: loadb */ - var46 = ptr4[i]; - /* 2: subb */ - var58 = var46 - var47; - /* 3: convsbw */ - var59.i = var58; - /* 4: loadupib */ - var60 = - (i & 1) ? ((orc_uint8) ptr5[i >> 1] + (orc_uint8) ptr5[(i >> 1) + 1] + - 1) >> 1 : ptr5[i >> 1]; - /* 5: loadupib */ - var61 = - (i & 1) ? ((orc_uint8) ptr6[i >> 1] + (orc_uint8) ptr6[(i >> 1) + 1] + - 1) >> 1 : ptr6[i >> 1]; - /* 6: avgub */ - var62 = ((orc_uint8) var60 + (orc_uint8) var61 + 1) >> 1; - /* 8: subb */ - var63 = var62 - var48; - /* 9: convsbw */ - var64.i = var63; - /* 10: loadupib */ - var65 = - (i & 1) ? ((orc_uint8) ptr7[i >> 1] + (orc_uint8) ptr7[(i >> 1) + 1] + - 1) >> 1 : ptr7[i >> 1]; - /* 11: loadupib */ - var66 = - (i & 1) ? ((orc_uint8) ptr8[i >> 1] + (orc_uint8) ptr8[(i >> 1) + 1] + - 1) >> 1 : ptr8[i >> 1]; - /* 12: avgub */ - var67 = ((orc_uint8) var65 + (orc_uint8) var66 + 1) >> 1; - /* 14: subb */ - var68 = var67 - var49; - /* 15: convsbw */ - var69.i = var68; - /* 17: mullw */ - var70.i = (var59.i * var50.i) & 0xffff; - /* 18: shrsw */ - var71.i = var70.i >> 8; - /* 19: addssw */ - var72.i = ORC_CLAMP_SW (var59.i + var71.i); - /* 20: addssw */ - var73.i = ORC_CLAMP_SW (var72.i + var69.i); - /* 22: mullw */ - var74.i = (var69.i * var51.i) & 0xffff; - /* 23: shrsw */ - var75.i = var74.i >> 8; - /* 24: subssw */ - var76.i = ORC_CLAMP_SW (var73.i - var75.i); - /* 25: addssw */ - var77.i = ORC_CLAMP_SW (var76.i + var69.i); - /* 26: addssw */ - var78.i = ORC_CLAMP_SW (var72.i + var64.i); - /* 27: addssw */ - var79.i = ORC_CLAMP_SW (var78.i + var64.i); - /* 29: mullw */ - var80.i = (var64.i * var52.i) & 0xffff; - /* 30: shrsw */ - var81.i = var80.i >> 8; - /* 31: addssw */ - var82.i = ORC_CLAMP_SW (var79.i + var81.i); - /* 33: mullw */ - var83.i = (var64.i * var53.i) & 0xffff; - /* 34: shrsw */ - var84.i = var83.i >> 8; - /* 35: subssw */ - var85.i = ORC_CLAMP_SW (var72.i - var84.i); - /* 37: mullw */ - var86.i = (var69.i * var54.i) & 0xffff; - /* 38: shrsw */ - var87.i = var86.i >> 8; - /* 39: subssw */ - var88.i = ORC_CLAMP_SW (var85.i - var87.i); - /* 40: subssw */ - var89.i = ORC_CLAMP_SW (var88.i - var87.i); - /* 41: convssswb */ - var90 = ORC_CLAMP_SB (var77.i); - /* 42: convssswb */ - var91 = ORC_CLAMP_SB (var89.i); - /* 43: convssswb */ - var92 = ORC_CLAMP_SB (var82.i); - /* 44: mergebw */ - { - orc_union16 _dest; - _dest.x2[0] = var92; - _dest.x2[1] = var91; - var93.i = _dest.i; - } - /* 46: mergebw */ - { - orc_union16 _dest; - _dest.x2[0] = var90; - _dest.x2[1] = var55; - var94.i = _dest.i; - } - /* 47: mergewl */ - { - orc_union32 _dest; - _dest.x2[0] = var93.i; - _dest.x2[1] = var94.i; - var95.i = _dest.i; - } - /* 49: addb */ - var57.x4[0] = var95.x4[0] + var56.x4[0]; - var57.x4[1] = var95.x4[1] + var56.x4[1]; - var57.x4[2] = var95.x4[2] + var56.x4[2]; - var57.x4[3] = var95.x4[3] + var56.x4[3]; - /* 50: storel */ - ptr0[i] = var57; - } - -} - -#else -static void -_backup_video_convert_orc_convert_I420_BGRA_avg (OrcExecutor * ORC_RESTRICT ex) -{ - int i; - int n = ex->n; - orc_union32 *ORC_RESTRICT ptr0; - const orc_int8 *ORC_RESTRICT ptr4; - const orc_int8 *ORC_RESTRICT ptr5; - const orc_int8 *ORC_RESTRICT ptr6; - const orc_int8 *ORC_RESTRICT ptr7; - const orc_int8 *ORC_RESTRICT ptr8; - orc_int8 var46; -#if defined(__APPLE__) && __GNUC__ == 4 && __GNUC_MINOR__ == 2 && defined (__i386__) - volatile orc_int8 var47; -#else - orc_int8 var47; -#endif -#if defined(__APPLE__) && __GNUC__ == 4 && __GNUC_MINOR__ == 2 && defined (__i386__) - volatile orc_int8 var48; -#else - orc_int8 var48; -#endif -#if defined(__APPLE__) && __GNUC__ == 4 && __GNUC_MINOR__ == 2 && defined (__i386__) - volatile orc_int8 var49; -#else - orc_int8 var49; -#endif -#if defined(__APPLE__) && __GNUC__ == 4 && __GNUC_MINOR__ == 2 && defined (__i386__) - volatile orc_union16 var50; -#else - orc_union16 var50; -#endif -#if defined(__APPLE__) && __GNUC__ == 4 && __GNUC_MINOR__ == 2 && defined (__i386__) - volatile orc_union16 var51; -#else - orc_union16 var51; -#endif -#if defined(__APPLE__) && __GNUC__ == 4 && __GNUC_MINOR__ == 2 && defined (__i386__) - volatile orc_union16 var52; -#else - orc_union16 var52; -#endif -#if defined(__APPLE__) && __GNUC__ == 4 && __GNUC_MINOR__ == 2 && defined (__i386__) - volatile orc_union16 var53; -#else - orc_union16 var53; -#endif -#if defined(__APPLE__) && __GNUC__ == 4 && __GNUC_MINOR__ == 2 && defined (__i386__) - volatile orc_union16 var54; -#else - orc_union16 var54; -#endif -#if defined(__APPLE__) && __GNUC__ == 4 && __GNUC_MINOR__ == 2 && defined (__i386__) - volatile orc_int8 var55; -#else - orc_int8 var55; -#endif -#if defined(__APPLE__) && __GNUC__ == 4 && __GNUC_MINOR__ == 2 && defined (__i386__) - volatile orc_union32 var56; -#else - orc_union32 var56; -#endif - orc_union32 var57; - orc_int8 var58; - orc_union16 var59; - orc_int8 var60; - orc_int8 var61; - orc_int8 var62; - orc_int8 var63; - orc_union16 var64; - orc_int8 var65; - orc_int8 var66; - orc_int8 var67; - orc_int8 var68; - orc_union16 var69; - orc_union16 var70; - orc_union16 var71; - orc_union16 var72; - orc_union16 var73; - orc_union16 var74; - orc_union16 var75; - orc_union16 var76; - orc_union16 var77; - orc_union16 var78; - orc_union16 var79; - orc_union16 var80; - orc_union16 var81; - orc_union16 var82; - orc_union16 var83; - orc_union16 var84; - orc_union16 var85; - orc_union16 var86; - orc_union16 var87; - orc_union16 var88; - orc_union16 var89; - orc_int8 var90; - orc_int8 var91; - orc_int8 var92; - orc_union16 var93; - orc_union16 var94; - orc_union32 var95; - - ptr0 = (orc_union32 *) ex->arrays[0]; - ptr4 = (orc_int8 *) ex->arrays[4]; - ptr5 = (orc_int8 *) ex->arrays[5]; - ptr6 = (orc_int8 *) ex->arrays[6]; - ptr7 = (orc_int8 *) ex->arrays[7]; - ptr8 = (orc_int8 *) ex->arrays[8]; - - /* 1: loadpb */ - var47 = (int) 0x00000080; /* 128 or 6.32404e-322f */ - /* 7: loadpb */ - var48 = (int) 0x00000080; /* 128 or 6.32404e-322f */ - /* 13: loadpb */ - var49 = (int) 0x00000080; /* 128 or 6.32404e-322f */ - /* 16: loadpw */ - var50.i = (int) 0x0000002a; /* 42 or 2.07508e-322f */ - /* 21: loadpw */ - var51.i = (int) 0x00000067; /* 103 or 5.08888e-322f */ - /* 28: loadpw */ - var52.i = (int) 0x00000004; /* 4 or 1.97626e-323f */ - /* 32: loadpw */ - var53.i = (int) 0x00000064; /* 100 or 4.94066e-322f */ - /* 36: loadpw */ - var54.i = (int) 0x00000068; /* 104 or 5.13828e-322f */ - /* 45: loadpb */ - var55 = (int) 0x000000ff; /* 255 or 1.25987e-321f */ - /* 48: loadpb */ - var56.x4[0] = (int) 0x00000080; /* 128 or 6.32404e-322f */ - var56.x4[1] = (int) 0x00000080; /* 128 or 6.32404e-322f */ - var56.x4[2] = (int) 0x00000080; /* 128 or 6.32404e-322f */ - var56.x4[3] = (int) 0x00000080; /* 128 or 6.32404e-322f */ - - for (i = 0; i < n; i++) { - /* 0: loadb */ - var46 = ptr4[i]; - /* 2: subb */ - var58 = var46 - var47; - /* 3: convsbw */ - var59.i = var58; - /* 4: loadupib */ - var60 = - (i & 1) ? ((orc_uint8) ptr5[i >> 1] + (orc_uint8) ptr5[(i >> 1) + 1] + - 1) >> 1 : ptr5[i >> 1]; - /* 5: loadupib */ - var61 = - (i & 1) ? ((orc_uint8) ptr6[i >> 1] + (orc_uint8) ptr6[(i >> 1) + 1] + - 1) >> 1 : ptr6[i >> 1]; - /* 6: avgub */ - var62 = ((orc_uint8) var60 + (orc_uint8) var61 + 1) >> 1; - /* 8: subb */ - var63 = var62 - var48; - /* 9: convsbw */ - var64.i = var63; - /* 10: loadupib */ - var65 = - (i & 1) ? ((orc_uint8) ptr7[i >> 1] + (orc_uint8) ptr7[(i >> 1) + 1] + - 1) >> 1 : ptr7[i >> 1]; - /* 11: loadupib */ - var66 = - (i & 1) ? ((orc_uint8) ptr8[i >> 1] + (orc_uint8) ptr8[(i >> 1) + 1] + - 1) >> 1 : ptr8[i >> 1]; - /* 12: avgub */ - var67 = ((orc_uint8) var65 + (orc_uint8) var66 + 1) >> 1; - /* 14: subb */ - var68 = var67 - var49; - /* 15: convsbw */ - var69.i = var68; - /* 17: mullw */ - var70.i = (var59.i * var50.i) & 0xffff; - /* 18: shrsw */ - var71.i = var70.i >> 8; - /* 19: addssw */ - var72.i = ORC_CLAMP_SW (var59.i + var71.i); - /* 20: addssw */ - var73.i = ORC_CLAMP_SW (var72.i + var69.i); - /* 22: mullw */ - var74.i = (var69.i * var51.i) & 0xffff; - /* 23: shrsw */ - var75.i = var74.i >> 8; - /* 24: subssw */ - var76.i = ORC_CLAMP_SW (var73.i - var75.i); - /* 25: addssw */ - var77.i = ORC_CLAMP_SW (var76.i + var69.i); - /* 26: addssw */ - var78.i = ORC_CLAMP_SW (var72.i + var64.i); - /* 27: addssw */ - var79.i = ORC_CLAMP_SW (var78.i + var64.i); - /* 29: mullw */ - var80.i = (var64.i * var52.i) & 0xffff; - /* 30: shrsw */ - var81.i = var80.i >> 8; - /* 31: addssw */ - var82.i = ORC_CLAMP_SW (var79.i + var81.i); - /* 33: mullw */ - var83.i = (var64.i * var53.i) & 0xffff; - /* 34: shrsw */ - var84.i = var83.i >> 8; - /* 35: subssw */ - var85.i = ORC_CLAMP_SW (var72.i - var84.i); - /* 37: mullw */ - var86.i = (var69.i * var54.i) & 0xffff; - /* 38: shrsw */ - var87.i = var86.i >> 8; - /* 39: subssw */ - var88.i = ORC_CLAMP_SW (var85.i - var87.i); - /* 40: subssw */ - var89.i = ORC_CLAMP_SW (var88.i - var87.i); - /* 41: convssswb */ - var90 = ORC_CLAMP_SB (var77.i); - /* 42: convssswb */ - var91 = ORC_CLAMP_SB (var89.i); - /* 43: convssswb */ - var92 = ORC_CLAMP_SB (var82.i); - /* 44: mergebw */ - { - orc_union16 _dest; - _dest.x2[0] = var92; - _dest.x2[1] = var91; - var93.i = _dest.i; - } - /* 46: mergebw */ - { - orc_union16 _dest; - _dest.x2[0] = var90; - _dest.x2[1] = var55; - var94.i = _dest.i; - } - /* 47: mergewl */ - { - orc_union32 _dest; - _dest.x2[0] = var93.i; - _dest.x2[1] = var94.i; - var95.i = _dest.i; - } - /* 49: addb */ - var57.x4[0] = var95.x4[0] + var56.x4[0]; - var57.x4[1] = var95.x4[1] + var56.x4[1]; - var57.x4[2] = var95.x4[2] + var56.x4[2]; - var57.x4[3] = var95.x4[3] + var56.x4[3]; - /* 50: storel */ - ptr0[i] = var57; - } - -} - -void -video_convert_orc_convert_I420_BGRA_avg (guint8 * ORC_RESTRICT d1, - const guint8 * ORC_RESTRICT s1, const guint8 * ORC_RESTRICT s2, - const guint8 * ORC_RESTRICT s3, const guint8 * ORC_RESTRICT s4, - const guint8 * ORC_RESTRICT s5, int n) -{ - OrcExecutor _ex, *ex = &_ex; - static volatile int p_inited = 0; - static OrcCode *c = 0; - void (*func) (OrcExecutor *); - - if (!p_inited) { - orc_once_mutex_lock (); - if (!p_inited) { - OrcProgram *p; - -#if 1 - static const orc_uint8 bc[] = { - 1, 9, 39, 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, 95, 97, 118, 103, 11, 4, 4, 12, 1, 1, - 12, 1, 1, 12, 1, 1, 12, 1, 1, 12, 1, 1, 14, 1, 8, 0, - 0, 0, 14, 1, 128, 0, 0, 0, 14, 4, 42, 0, 0, 0, 14, 4, - 103, 0, 0, 0, 14, 4, 4, 0, 0, 0, 14, 4, 100, 0, 0, 0, - 14, 4, 104, 0, 0, 0, 14, 4, 255, 0, 0, 0, 20, 2, 20, 2, - 20, 1, 20, 1, 20, 2, 20, 2, 20, 2, 20, 2, 20, 2, 20, 2, - 20, 1, 20, 1, 20, 1, 20, 4, 65, 34, 4, 17, 149, 36, 34, 46, - 34, 5, 46, 35, 6, 39, 34, 34, 35, 65, 34, 34, 17, 149, 37, 34, - 46, 34, 7, 46, 35, 8, 39, 34, 34, 35, 65, 34, 34, 17, 149, 38, - 34, 89, 32, 36, 18, 94, 32, 32, 16, 71, 36, 36, 32, 71, 39, 36, - 38, 89, 32, 38, 19, 94, 32, 32, 16, 99, 39, 39, 32, 71, 39, 39, - 38, 71, 41, 36, 37, 71, 41, 41, 37, 89, 32, 37, 20, 94, 32, 32, - 16, 71, 41, 41, 32, 89, 32, 37, 21, 94, 32, 32, 16, 99, 40, 36, - 32, 89, 32, 38, 22, 94, 32, 32, 16, 99, 40, 40, 32, 99, 40, 40, - 32, 159, 42, 39, 159, 43, 40, 159, 44, 41, 196, 32, 44, 43, 196, 33, - 42, 23, 195, 45, 32, 33, 21, 2, 33, 0, 45, 17, 2, 0, - }; - p = orc_program_new_from_static_bytecode (bc); - orc_program_set_backup_function (p, - _backup_video_convert_orc_convert_I420_BGRA_avg); -#else - p = orc_program_new (); - orc_program_set_name (p, "video_convert_orc_convert_I420_BGRA_avg"); - orc_program_set_backup_function (p, - _backup_video_convert_orc_convert_I420_BGRA_avg); - orc_program_add_destination (p, 4, "d1"); - orc_program_add_source (p, 1, "s1"); - orc_program_add_source (p, 1, "s2"); - orc_program_add_source (p, 1, "s3"); - orc_program_add_source (p, 1, "s4"); - orc_program_add_source (p, 1, "s5"); - orc_program_add_constant (p, 1, 0x00000008, "c1"); - orc_program_add_constant (p, 1, 0x00000080, "c2"); - orc_program_add_constant (p, 4, 0x0000002a, "c3"); - orc_program_add_constant (p, 4, 0x00000067, "c4"); - orc_program_add_constant (p, 4, 0x00000004, "c5"); - orc_program_add_constant (p, 4, 0x00000064, "c6"); - orc_program_add_constant (p, 4, 0x00000068, "c7"); - orc_program_add_constant (p, 4, 0x000000ff, "c8"); - orc_program_add_temporary (p, 2, "t1"); - orc_program_add_temporary (p, 2, "t2"); - orc_program_add_temporary (p, 1, "t3"); - orc_program_add_temporary (p, 1, "t4"); - orc_program_add_temporary (p, 2, "t5"); - orc_program_add_temporary (p, 2, "t6"); - orc_program_add_temporary (p, 2, "t7"); - orc_program_add_temporary (p, 2, "t8"); - orc_program_add_temporary (p, 2, "t9"); - orc_program_add_temporary (p, 2, "t10"); - orc_program_add_temporary (p, 1, "t11"); - orc_program_add_temporary (p, 1, "t12"); - orc_program_add_temporary (p, 1, "t13"); - orc_program_add_temporary (p, 4, "t14"); - - orc_program_append_2 (p, "subb", 0, ORC_VAR_T3, ORC_VAR_S1, ORC_VAR_C2, - ORC_VAR_D1); - orc_program_append_2 (p, "convsbw", 0, ORC_VAR_T5, ORC_VAR_T3, ORC_VAR_D1, - ORC_VAR_D1); - orc_program_append_2 (p, "loadupib", 0, ORC_VAR_T3, ORC_VAR_S2, - ORC_VAR_D1, ORC_VAR_D1); - orc_program_append_2 (p, "loadupib", 0, ORC_VAR_T4, ORC_VAR_S3, - ORC_VAR_D1, ORC_VAR_D1); - orc_program_append_2 (p, "avgub", 0, ORC_VAR_T3, ORC_VAR_T3, ORC_VAR_T4, - ORC_VAR_D1); - orc_program_append_2 (p, "subb", 0, ORC_VAR_T3, ORC_VAR_T3, ORC_VAR_C2, - ORC_VAR_D1); - orc_program_append_2 (p, "convsbw", 0, ORC_VAR_T6, ORC_VAR_T3, ORC_VAR_D1, + orc_program_append_2 (p, "subb", 1, ORC_VAR_T1, ORC_VAR_T1, ORC_VAR_C2, ORC_VAR_D1); - orc_program_append_2 (p, "loadupib", 0, ORC_VAR_T3, ORC_VAR_S4, - ORC_VAR_D1, ORC_VAR_D1); - orc_program_append_2 (p, "loadupib", 0, ORC_VAR_T4, ORC_VAR_S5, - ORC_VAR_D1, ORC_VAR_D1); - orc_program_append_2 (p, "avgub", 0, ORC_VAR_T3, ORC_VAR_T3, ORC_VAR_T4, - ORC_VAR_D1); - orc_program_append_2 (p, "subb", 0, ORC_VAR_T3, ORC_VAR_T3, ORC_VAR_C2, - ORC_VAR_D1); - orc_program_append_2 (p, "convsbw", 0, ORC_VAR_T7, ORC_VAR_T3, ORC_VAR_D1, - ORC_VAR_D1); - orc_program_append_2 (p, "mullw", 0, ORC_VAR_T1, ORC_VAR_T5, ORC_VAR_C3, - ORC_VAR_D1); - orc_program_append_2 (p, "shrsw", 0, ORC_VAR_T1, ORC_VAR_T1, ORC_VAR_C1, - ORC_VAR_D1); - orc_program_append_2 (p, "addssw", 0, ORC_VAR_T5, ORC_VAR_T5, ORC_VAR_T1, - ORC_VAR_D1); - orc_program_append_2 (p, "addssw", 0, ORC_VAR_T8, ORC_VAR_T5, ORC_VAR_T7, - ORC_VAR_D1); - orc_program_append_2 (p, "mullw", 0, ORC_VAR_T1, ORC_VAR_T7, ORC_VAR_C4, + orc_program_append_2 (p, "subb", 0, ORC_VAR_T10, ORC_VAR_T10, ORC_VAR_C2, ORC_VAR_D1); - orc_program_append_2 (p, "shrsw", 0, ORC_VAR_T1, ORC_VAR_T1, ORC_VAR_C1, - ORC_VAR_D1); - orc_program_append_2 (p, "subssw", 0, ORC_VAR_T8, ORC_VAR_T8, ORC_VAR_T1, - ORC_VAR_D1); - orc_program_append_2 (p, "addssw", 0, ORC_VAR_T8, ORC_VAR_T8, ORC_VAR_T7, - ORC_VAR_D1); - orc_program_append_2 (p, "addssw", 0, ORC_VAR_T10, ORC_VAR_T5, ORC_VAR_T6, - ORC_VAR_D1); - orc_program_append_2 (p, "addssw", 0, ORC_VAR_T10, ORC_VAR_T10, - ORC_VAR_T6, ORC_VAR_D1); - orc_program_append_2 (p, "mullw", 0, ORC_VAR_T1, ORC_VAR_T6, ORC_VAR_C5, - ORC_VAR_D1); - orc_program_append_2 (p, "shrsw", 0, ORC_VAR_T1, ORC_VAR_T1, ORC_VAR_C1, - ORC_VAR_D1); - orc_program_append_2 (p, "addssw", 0, ORC_VAR_T10, ORC_VAR_T10, - ORC_VAR_T1, ORC_VAR_D1); - orc_program_append_2 (p, "mullw", 0, ORC_VAR_T1, ORC_VAR_T6, ORC_VAR_C6, - ORC_VAR_D1); - orc_program_append_2 (p, "shrsw", 0, ORC_VAR_T1, ORC_VAR_T1, ORC_VAR_C1, - ORC_VAR_D1); - orc_program_append_2 (p, "subssw", 0, ORC_VAR_T9, ORC_VAR_T5, ORC_VAR_T1, - ORC_VAR_D1); - orc_program_append_2 (p, "mullw", 0, ORC_VAR_T1, ORC_VAR_T7, ORC_VAR_C7, - ORC_VAR_D1); - orc_program_append_2 (p, "shrsw", 0, ORC_VAR_T1, ORC_VAR_T1, ORC_VAR_C1, - ORC_VAR_D1); - orc_program_append_2 (p, "subssw", 0, ORC_VAR_T9, ORC_VAR_T9, ORC_VAR_T1, - ORC_VAR_D1); - orc_program_append_2 (p, "subssw", 0, ORC_VAR_T9, ORC_VAR_T9, ORC_VAR_T1, - ORC_VAR_D1); - orc_program_append_2 (p, "convssswb", 0, ORC_VAR_T11, ORC_VAR_T8, - ORC_VAR_D1, ORC_VAR_D1); - orc_program_append_2 (p, "convssswb", 0, ORC_VAR_T12, ORC_VAR_T9, - ORC_VAR_D1, ORC_VAR_D1); - orc_program_append_2 (p, "convssswb", 0, ORC_VAR_T13, ORC_VAR_T10, - ORC_VAR_D1, ORC_VAR_D1); - orc_program_append_2 (p, "mergebw", 0, ORC_VAR_T1, ORC_VAR_T13, - ORC_VAR_T12, ORC_VAR_D1); - orc_program_append_2 (p, "mergebw", 0, ORC_VAR_T2, ORC_VAR_T11, + orc_program_append_2 (p, "mergebw", 0, ORC_VAR_T2, ORC_VAR_T10, ORC_VAR_C8, ORC_VAR_D1); - orc_program_append_2 (p, "mergewl", 0, ORC_VAR_T14, ORC_VAR_T1, - ORC_VAR_T2, ORC_VAR_D1); - orc_program_append_2 (p, "addb", 2, ORC_VAR_D1, ORC_VAR_T14, ORC_VAR_C2, + orc_program_append_2 (p, "mergewl", 0, ORC_VAR_D1, ORC_VAR_T1, ORC_VAR_T2, ORC_VAR_D1); #endif @@ -10340,8 +9676,6 @@ video_convert_orc_convert_I420_BGRA_avg (guint8 * ORC_RESTRICT d1, ex->arrays[ORC_VAR_S1] = (void *) s1; ex->arrays[ORC_VAR_S2] = (void *) s2; ex->arrays[ORC_VAR_S3] = (void *) s3; - ex->arrays[ORC_VAR_S4] = (void *) s4; - ex->arrays[ORC_VAR_S5] = (void *) s5; func = c->exec; func (ex); diff --git a/gst/videoconvert/gstvideoconvertorc-dist.h b/gst/videoconvert/gstvideoconvertorc-dist.h index b08ed58237..abc0c8777a 100644 --- a/gst/videoconvert/gstvideoconvertorc-dist.h +++ b/gst/videoconvert/gstvideoconvertorc-dist.h @@ -115,7 +115,6 @@ void video_convert_orc_convert_AYUV_BGRA (guint8 * ORC_RESTRICT d1, int d1_strid void video_convert_orc_convert_AYUV_ABGR (guint8 * ORC_RESTRICT d1, int d1_stride, const guint8 * ORC_RESTRICT s1, int s1_stride, int n, int m); void video_convert_orc_convert_AYUV_RGBA (guint8 * ORC_RESTRICT d1, int d1_stride, const guint8 * ORC_RESTRICT s1, int s1_stride, int n, int m); void video_convert_orc_convert_I420_BGRA (guint8 * ORC_RESTRICT d1, const guint8 * ORC_RESTRICT s1, const guint8 * ORC_RESTRICT s2, const guint8 * ORC_RESTRICT s3, int n); -void video_convert_orc_convert_I420_BGRA_avg (guint8 * ORC_RESTRICT d1, const guint8 * ORC_RESTRICT s1, const guint8 * ORC_RESTRICT s2, const guint8 * ORC_RESTRICT s3, const guint8 * ORC_RESTRICT s4, const guint8 * ORC_RESTRICT s5, int n); void video_convert_orc_getline_I420 (guint8 * ORC_RESTRICT d1, const guint8 * ORC_RESTRICT s1, const guint8 * ORC_RESTRICT s2, const guint8 * ORC_RESTRICT s3, int n); void video_convert_orc_getline_YUV9 (guint8 * ORC_RESTRICT d1, const guint8 * ORC_RESTRICT s1, const guint8 * ORC_RESTRICT s2, const guint8 * ORC_RESTRICT s3, int n); void video_convert_orc_getline_YUY2 (guint8 * ORC_RESTRICT d1, const guint8 * ORC_RESTRICT s1, int n); diff --git a/win32/common/_stdint.h b/win32/common/_stdint.h index faba5f9e4e..627efd6947 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.2.1" -/* generated using gnu compiler gcc (Debian 4.8.2-2) 4.8.2 */ +#define _GENERATED_STDINT_H "gst-plugins-base 1.2.2" +/* generated using gnu compiler gcc (Debian 4.8.2-10) 4.8.2 */ #define _STDINT_HAVE_STDINT_H 1 #include <stdint.h> #endif diff --git a/win32/common/config.h b/win32/common/config.h index b6cbda7638..798813e79e 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 "2013-11-09" +#define GST_PACKAGE_RELEASE_DATETIME "2013-12-26" /* Define if static plugins should be built */ #undef GST_PLUGIN_BUILD_STATIC @@ -322,7 +322,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.2.1" +#define PACKAGE_STRING "GStreamer Base Plug-ins 1.2.2" /* Define to the one symbol short name of this package. */ #define PACKAGE_TARNAME "gst-plugins-base" @@ -331,7 +331,7 @@ #undef PACKAGE_URL /* Define to the version of this package. */ -#define PACKAGE_VERSION "1.2.1" +#define PACKAGE_VERSION "1.2.2" /* directory where plugins are located */ #ifdef _DEBUG @@ -365,7 +365,7 @@ #undef USE_TREMOLO /* Version number of package */ -#define VERSION "1.2.1" +#define VERSION "1.2.2" /* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most significant byte first (like Motorola and SPARC, unlike Intel). */ |