summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--configure.ac2
-rw-r--r--docs/plugins/Makefile.am1
-rw-r--r--docs/plugins/gst-plugins-good-plugins-docs.sgml2
-rw-r--r--docs/plugins/gst-plugins-good-plugins-sections.txt14
-rw-r--r--docs/plugins/gst-plugins-good-plugins.hierarchy1
-rw-r--r--docs/plugins/inspect/plugin-imagefreeze.xml34
-rw-r--r--tests/check/Makefile.am4
-rw-r--r--tests/check/elements/.gitignore1
8 files changed, 59 insertions, 0 deletions
diff --git a/configure.ac b/configure.ac
index b3dbb9574..8b5f46522 100644
--- a/configure.ac
+++ b/configure.ac
@@ -316,6 +316,7 @@ AG_GST_CHECK_PLUGIN(interleave)
AG_GST_CHECK_PLUGIN(flx)
AG_GST_CHECK_PLUGIN(goom)
AG_GST_CHECK_PLUGIN(goom2k1)
+AG_GST_CHECK_PLUGIN(imagefreeze)
AG_GST_CHECK_PLUGIN(law)
AG_GST_CHECK_PLUGIN(level)
AG_GST_CHECK_PLUGIN(matroska)
@@ -1079,6 +1080,7 @@ gst/equalizer/Makefile
gst/flv/Makefile
gst/id3demux/Makefile
gst/icydemux/Makefile
+gst/imagefreeze/Makefile
gst/interleave/Makefile
gst/goom/Makefile
gst/goom2k1/Makefile
diff --git a/docs/plugins/Makefile.am b/docs/plugins/Makefile.am
index f7e59462a..f33f14db9 100644
--- a/docs/plugins/Makefile.am
+++ b/docs/plugins/Makefile.am
@@ -169,6 +169,7 @@ EXTRA_HFILES = \
$(top_srcdir)/gst/law/mulaw-encode.h \
$(top_srcdir)/gst/icydemux/gsticydemux.h \
$(top_srcdir)/gst/id3demux/gstid3demux.h \
+ $(top_srcdir)/gst/imagefreeze/gstimagefreeze.h \
$(top_srcdir)/gst/interleave/deinterleave.h \
$(top_srcdir)/gst/interleave/interleave.h \
$(top_srcdir)/gst/level/gstlevel.h \
diff --git a/docs/plugins/gst-plugins-good-plugins-docs.sgml b/docs/plugins/gst-plugins-good-plugins-docs.sgml
index 54157d6e4..5709f1c5c 100644
--- a/docs/plugins/gst-plugins-good-plugins-docs.sgml
+++ b/docs/plugins/gst-plugins-good-plugins-docs.sgml
@@ -92,6 +92,7 @@
<xi:include href="xml/element-icydemux.xml" />
<xi:include href="xml/element-id3demux.xml" />
<xi:include href="xml/element-id3v2mux.xml" />
+ <xi:include href="xml/element-imagefreeze.xml" />
<xi:include href="xml/element-interleave.xml" />
<xi:include href="xml/element-jpegdec.xml" />
<xi:include href="xml/element-jpegenc.xml" />
@@ -198,6 +199,7 @@
<xi:include href="xml/plugin-halelements.xml" />
<xi:include href="xml/plugin-icydemux.xml" />
<xi:include href="xml/plugin-id3demux.xml" />
+ <xi:include href="xml/plugin-imagefreeze.xml" />
<xi:include href="xml/plugin-interleave.xml" />
<xi:include href="xml/plugin-jpeg.xml" />
<xi:include href="xml/plugin-level.xml" />
diff --git a/docs/plugins/gst-plugins-good-plugins-sections.txt b/docs/plugins/gst-plugins-good-plugins-sections.txt
index 85d44aaed..4e39a8c82 100644
--- a/docs/plugins/gst-plugins-good-plugins-sections.txt
+++ b/docs/plugins/gst-plugins-good-plugins-sections.txt
@@ -1083,6 +1083,20 @@ gst_id3v2_mux_get_type
</SECTION>
<SECTION>
+<FILE>element-imagefreeze</FILE>
+<TITLE>imagefreeze</TITLE>
+GstImageFreeze
+<SUBSECTION Standard>
+GstImageFreezeClass
+GST_IMAGE_FREEZE
+GST_IMAGE_FREEZE_CLASS
+GST_IS_IMAGE_FREEZE
+GST_IS_IMAGE_FREEZE_CLASS
+GST_TYPE_IMAGE_FREEZE
+gst_image_freeze_get_type
+</SECTION>
+
+<SECTION>
<FILE>element-interleave</FILE>
<TITLE>interleave</TITLE>
GstInterleave
diff --git a/docs/plugins/gst-plugins-good-plugins.hierarchy b/docs/plugins/gst-plugins-good-plugins.hierarchy
index 5db0c17ed..99be91cd9 100644
--- a/docs/plugins/gst-plugins-good-plugins.hierarchy
+++ b/docs/plugins/gst-plugins-good-plugins.hierarchy
@@ -235,6 +235,7 @@ GObject
GstID3Demux
GstFlxDec
GstDeinterlace
+ GstImageFreeze
GstY4mEncode
GstInterleave
GstDeinterleave
diff --git a/docs/plugins/inspect/plugin-imagefreeze.xml b/docs/plugins/inspect/plugin-imagefreeze.xml
new file mode 100644
index 000000000..2b9629d46
--- /dev/null
+++ b/docs/plugins/inspect/plugin-imagefreeze.xml
@@ -0,0 +1,34 @@
+<plugin>
+ <name>imagefreeze</name>
+ <description>Still frame stream generator</description>
+ <filename>../../gst/imagefreeze/.libs/libgstimagefreeze.so</filename>
+ <basename>libgstimagefreeze.so</basename>
+ <version>0.10.22.1</version>
+ <license>LGPL</license>
+ <source>gst-plugins-good</source>
+ <package>GStreamer Good Plug-ins git</package>
+ <origin>Unknown package origin</origin>
+ <elements>
+ <element>
+ <name>imagefreeze</name>
+ <longname>Still frame stream generator</longname>
+ <class>Filter/Video</class>
+ <description>Generates a still frame stream from an image</description>
+ <author>Sebastian Dröge &lt;sebastian.droege@collabora.co.uk&gt;</author>
+ <pads>
+ <caps>
+ <name>src</name>
+ <direction>source</direction>
+ <presence>always</presence>
+ <details>video/x-raw-yuv; video/x-raw-rgb; video/x-raw-gray</details>
+ </caps>
+ <caps>
+ <name>sink</name>
+ <direction>sink</direction>
+ <presence>always</presence>
+ <details>video/x-raw-yuv; video/x-raw-rgb; video/x-raw-gray</details>
+ </caps>
+ </pads>
+ </element>
+ </elements>
+</plugin> \ No newline at end of file
diff --git a/tests/check/Makefile.am b/tests/check/Makefile.am
index ce5d41b06..3f0071913 100644
--- a/tests/check/Makefile.am
+++ b/tests/check/Makefile.am
@@ -115,6 +115,7 @@ check_PROGRAMS = \
elements/flvmux \
elements/icydemux \
elements/id3demux \
+ elements/imagefreeze \
elements/interleave \
elements/level \
elements/matroskamux \
@@ -188,6 +189,9 @@ elements_deinterleave_LDADD = $(GST_PLUGINS_BASE_LIBS) -lgstaudio-$(GST_MAJORMIN
elements_interleave_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(CFLAGS) $(AM_CFLAGS)
elements_interleave_LDADD = $(GST_PLUGINS_BASE_LIBS) -lgstaudio-$(GST_MAJORMINOR) $(LDADD)
+elements_imagefreeze_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) $(AM_CFLAGS)
+elements_imagefreeze_LDADD = $(GST_BASE_LIBS) $(LDADD) -lgstvideo-0.10
+
elements_level_LDADD = $(LDADD) $(LIBM)
elements_rtpbin_buffer_list_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS) \
diff --git a/tests/check/elements/.gitignore b/tests/check/elements/.gitignore
index 3f17e0ea4..0d06d4576 100644
--- a/tests/check/elements/.gitignore
+++ b/tests/check/elements/.gitignore
@@ -28,6 +28,7 @@ flvmux
icydemux
id3demux
id3v2mux
+imagefreeze
interleave
jpegenc
level