diff options
| -rw-r--r-- | ChangeLog | 14 | ||||
| -rw-r--r-- | configure.ac | 20 | ||||
| -rw-r--r-- | docs/plugins/Makefile.am | 4 | ||||
| -rw-r--r-- | docs/plugins/gst-plugins-good-plugins-docs.sgml | 4 | ||||
| -rw-r--r-- | docs/plugins/gst-plugins-good-plugins-sections.txt | 24 | ||||
| -rw-r--r-- | docs/plugins/inspect/plugin-videocrop.xml | 6 | ||||
| -rw-r--r-- | gst-plugins-good.spec.in | 1 | ||||
| -rw-r--r-- | sys/Makefile.am | 14 | ||||
| -rw-r--r-- | tests/check/Makefile.am | 10 | ||||
| -rw-r--r-- | tests/icles/Makefile.am | 7 | ||||
| -rw-r--r-- | tests/icles/videocrop-test.c | 2 |
11 files changed, 93 insertions, 13 deletions
@@ -4,6 +4,20 @@ * docs/plugins/Makefile.am: * docs/plugins/gst-plugins-good-plugins-docs.sgml: * docs/plugins/gst-plugins-good-plugins-sections.txt: + * docs/plugins/inspect/plugin-videocrop.xml: + * gst-plugins-good.spec.in: + * sys/Makefile.am: + * tests/check/Makefile.am: + * tests/icles/Makefile.am: + * tests/icles/videocrop-test.c: + Move videocrop and osxvideo from -bad. + +2007-06-12 Jan Schmidt <thaytan@mad.scientist.com> + + * configure.ac: + * docs/plugins/Makefile.am: + * docs/plugins/gst-plugins-good-plugins-docs.sgml: + * docs/plugins/gst-plugins-good-plugins-sections.txt: * docs/plugins/gst-plugins-good-plugins.args: * docs/plugins/inspect/plugin-qtdemux.xml: * docs/plugins/inspect/plugin-quicktime.xml: diff --git a/configure.ac b/configure.ac index e4e8fd8a..f04c12bc 100644 --- a/configure.ac +++ b/configure.ac @@ -104,6 +104,7 @@ GST_PLUGINS_ALL="\ smpte \ udp \ videobox \ + videocrop \ videomixer \ wavenc \ wavparse \ @@ -467,6 +468,22 @@ AG_GST_CHECK_FEATURE(OSX_AUDIO, [OSX audio], osxaudio, [ AC_CHECK_HEADER(CoreAudio/CoreAudio.h, HAVE_OSX_AUDIO="yes", HAVE_OSX_AUDIO="no") ]) +dnl *** OS X video *** +translit(dnm, m, l) AM_CONDITIONAL(USE_OSX_VIDEO, true) +HAVE_OSX_VIDEO="no" +AG_GST_CHECK_FEATURE(OSX_VIDEO, [OSX video], osxvideosink, [ + AC_CHECK_HEADER(OpenGL/gl.h, HAVE_OSX_VIDEO="yes", HAVE_OSX_VIDEO="no") +]) +dnl in case header OpenGL/gl.h is found on other platforms +case "$host" in + *-*darwin*) + dnl do nothing + ;; + *) + HAVE_OSX_VIDEO="no" + ;; +esac + dnl *** Video 4 Linux 2 *** dnl for information about the header/define, see sys/v4l2/gstv4l2element.h @@ -908,6 +925,7 @@ AM_CONDITIONAL(USE_DIRECTSOUND, false) AM_CONDITIONAL(USE_OSS, false) AM_CONDITIONAL(USE_SUNAUDIO, false) AM_CONDITIONAL(USE_OSX_AUDIO, false) +AM_CONDITIONAL(USE_OSX_VIDEO, false) AM_CONDITIONAL(USE_X, false) AM_CONDITIONAL(USE_XSHM, false) AM_CONDITIONAL(USE_AALIB, false) @@ -1006,6 +1024,7 @@ gst/rtsp/Makefile gst/smpte/Makefile gst/udp/Makefile gst/videobox/Makefile +gst/videocrop/Makefile gst/videofilter/Makefile gst/videomixer/Makefile gst/wavenc/Makefile @@ -1037,6 +1056,7 @@ sys/directsound/Makefile sys/oss/Makefile sys/sunaudio/Makefile sys/osxaudio/Makefile +sys/osxvideo/Makefile sys/v4l2/Makefile sys/ximage/Makefile po/Makefile.in diff --git a/docs/plugins/Makefile.am b/docs/plugins/Makefile.am index 2941dafa..2ea1f932 100644 --- a/docs/plugins/Makefile.am +++ b/docs/plugins/Makefile.am @@ -56,7 +56,7 @@ FIXXREF_OPTIONS=--extra-dir=$(GLIB_PREFIX)/share/gtk-doc/html/gobject \ # Used for dependencies. HFILE_GLOB=$(DOC_SOURCE_DIR)/*/*/*.h -CFILE_GLOB=$(DOC_SOURCE_DIR)/*/*/*.c $(DOC_SOURCE_DIR)/*/*/*.cc +CFILE_GLOB=$(DOC_SOURCE_DIR)/*/*/*.c $(DOC_SOURCE_DIR)/*/*/*.cc $(DOC_SOURCE_DIR)/*/*/*.m # this is a wingo addition # thomasvs: another nice wingo addition would be an explanation on why @@ -116,6 +116,7 @@ EXTRA_HFILES = \ $(top_srcdir)/gst/rtsp/gstrtspsrc.h \ $(top_srcdir)/gst/udp/gstmultiudpsink.h \ $(top_srcdir)/gst/udp/gstudpsrc.h \ + $(top_srcdir)/gst/videocrop/gstvideocrop.h \ $(top_srcdir)/gst/videofilter/gstvideobalance.h \ $(top_srcdir)/gst/videofilter/gstvideoflip.h \ $(top_srcdir)/gst/videomixer/videomixer.c \ @@ -129,6 +130,7 @@ EXTRA_HFILES = \ $(top_srcdir)/sys/oss/gstossmixerelement.h \ $(top_srcdir)/sys/oss/gstosssink.h \ $(top_srcdir)/sys/oss/gstosssrc.h \ + $(top_srcdir)/sys/osxvideo/osxvideosink.h \ $(top_srcdir)/sys/v4l2/gstv4l2src.h \ $(top_srcdir)/sys/ximage/gstximagesrc.h diff --git a/docs/plugins/gst-plugins-good-plugins-docs.sgml b/docs/plugins/gst-plugins-good-plugins-docs.sgml index dd09540f..8cba176e 100644 --- a/docs/plugins/gst-plugins-good-plugins-docs.sgml +++ b/docs/plugins/gst-plugins-good-plugins-docs.sgml @@ -50,6 +50,7 @@ <xi:include href="xml/element-osssrc.xml" /> <xi:include href="xml/element-osxaudiosink.xml" /> <xi:include href="xml/element-osxaudiosrc.xml" /> + <xi:include href="xml/element-osxvideosink.xml" /> <xi:include href="xml/element-progressreport.xml" /> <xi:include href="xml/element-qtdemux.xml" /> <xi:include href="xml/element-rtspsrc.xml" /> @@ -58,6 +59,7 @@ <xi:include href="xml/element-smokeenc.xml" /> <xi:include href="xml/element-udpsrc.xml" /> <xi:include href="xml/element-videobalance.xml" /> + <xi:include href="xml/element-videocrop.xml" /> <xi:include href="xml/element-videoflip.xml" /> <xi:include href="xml/element-videomixer.xml" /> <xi:include href="xml/element-waveformsink.xml" /> @@ -108,6 +110,7 @@ <xi:include href="xml/plugin-navigationtest.xml" /> <xi:include href="xml/plugin-ossaudio.xml" /> <xi:include href="xml/plugin-osxaudio.xml" /> + <xi:include href="xml/plugin-osxvideo.xml" /> <xi:include href="xml/plugin-png.xml" /> <xi:include href="xml/plugin-quicktime.xml" /> <xi:include href="xml/plugin-rtp.xml" /> @@ -118,6 +121,7 @@ <xi:include href="xml/plugin-taglib.xml" /> <xi:include href="xml/plugin-udp.xml" /> <xi:include href="xml/plugin-videobox.xml" /> + <xi:include href="xml/plugin-videocrop.xml" /> <xi:include href="xml/plugin-videobalance.xml" /> <xi:include href="xml/plugin-videoflip.xml" /> <xi:include href="xml/plugin-videomixer.xml" /> diff --git a/docs/plugins/gst-plugins-good-plugins-sections.txt b/docs/plugins/gst-plugins-good-plugins-sections.txt index 54c31d9e..4f440d3f 100644 --- a/docs/plugins/gst-plugins-good-plugins-sections.txt +++ b/docs/plugins/gst-plugins-good-plugins-sections.txt @@ -508,6 +508,22 @@ GST_TYPE_OSX_AUDIO_SINK </SECTION> <SECTION> +<FILE>element-osxvideosink</FILE> +GstOSXVideoSink +<TITLE>osxvideosink</TITLE> +<SUBSECTION Standard> +GstOSXVideoSinkClass +<SUBSECTION Private> +GST_IS_OSX_VIDEO_SINK +GST_IS_OSX_VIDEO_SINK_CLASS +GST_OSX_VIDEO_SINK +GST_OSX_VIDEO_SINK_CLASS +GST_TYPE_OSXVIDEOBUFFER +GST_TYPE_OSX_VIDEO_SINK +GstOSXWindow +</SECTION> + +<SECTION> <FILE>element-progressreport</FILE> GstProgressReport <TITLE>progressreport</TITLE> @@ -623,6 +639,14 @@ GST_IS_UDPSRC_CLASS </SECTION> <SECTION> +<FILE>element-videocrop</FILE> +GstVideoCrop +<TITLE>videocrop</TITLE> +<SUBSECTION Standard> +GstVideoCropClass +</SECTION> + +<SECTION> <FILE>element-videoflip</FILE> GstVideoFlip GstVideoFlipMethod diff --git a/docs/plugins/inspect/plugin-videocrop.xml b/docs/plugins/inspect/plugin-videocrop.xml index bc262683..c75f73b6 100644 --- a/docs/plugins/inspect/plugin-videocrop.xml +++ b/docs/plugins/inspect/plugin-videocrop.xml @@ -3,10 +3,10 @@ <description>Crops video into a user-defined region</description> <filename>../../gst/videocrop/.libs/libgstvideocrop.so</filename> <basename>libgstvideocrop.so</basename> - <version>0.10.4.1</version> + <version>0.10.5.1</version> <license>LGPL</license> - <source>gst-plugins-bad</source> - <package>GStreamer Bad Plug-ins CVS/prerelease</package> + <source>gst-plugins-good</source> + <package>GStreamer Good Plug-ins CVS/prerelease</package> <origin>Unknown package origin</origin> <elements> <element> diff --git a/gst-plugins-good.spec.in b/gst-plugins-good.spec.in index adb1f002..2d17ccc9 100644 --- a/gst-plugins-good.spec.in +++ b/gst-plugins-good.spec.in @@ -120,6 +120,7 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/gstreamer-%{majorminor}/libgstapetag.so %{_libdir}/gstreamer-%{majorminor}/libgstannodex.so %{_libdir}/gstreamer-%{majorminor}/libgstvideobalance.so +%{_libdir}/gstreamer-%{majorminor}/libgstvideocrop.so %{_libdir}/gstreamer-%{majorminor}/libgsticydemux.so %{_libdir}/gstreamer-%{majorminor}/libgsttaglib.so %{_libdir}/gstreamer-%{majorminor}/libgstximagesrc.so diff --git a/sys/Makefile.am b/sys/Makefile.am index 0076cd57..b4d52f12 100644 --- a/sys/Makefile.am +++ b/sys/Makefile.am @@ -34,11 +34,11 @@ else OSX_AUDIO_DIR= endif -# if USE_OSX_VIDEO -# OSX_VIDEO_DIR=osxvideo -# else -# OSX_VIDEO_DIR= -# endif +if USE_OSX_VIDEO +OSX_VIDEO_DIR=osxvideo +else +OSX_VIDEO_DIR= +endif # if USE_QCAM # QCAM_DIR=qcam @@ -76,6 +76,6 @@ else XIMAGE_DIR= endif -SUBDIRS=$(DIRECTDRAW_DIR) $(DIRECTSOUND_DIR) $(OSS_DIR) $(OSX_AUDIO_DIR) $(SUNAUDIO_DIR) $(V4L2_DIR) $(XIMAGE_DIR) +SUBDIRS=$(DIRECTDRAW_DIR) $(DIRECTSOUND_DIR) $(OSS_DIR) $(OSX_AUDIO_DIR) $(OSX_VIDEO_DIR) $(SUNAUDIO_DIR) $(V4L2_DIR) $(XIMAGE_DIR) -DIST_SUBDIRS=directdraw directsound oss osxaudio sunaudio v4l2 ximage +DIST_SUBDIRS=directdraw directsound oss osxaudio osxvideo sunaudio v4l2 ximage diff --git a/tests/check/Makefile.am b/tests/check/Makefile.am index 7357468c..195f0373 100644 --- a/tests/check/Makefile.am +++ b/tests/check/Makefile.am @@ -62,6 +62,7 @@ check_PROGRAMS = \ elements/level \ elements/matroskamux \ elements/icydemux \ + elements/videocrop \ elements/videofilter \ $(check_sunaudio) \ $(check_taglib) \ @@ -80,7 +81,10 @@ AM_CFLAGS = $(GST_OBJ_CFLAGS) $(GST_CHECK_CFLAGS) $(CHECK_CFLAGS) LDADD = $(GST_OBJ_LIBS) $(GST_CHECK_LIBS) $(CHECK_LIBS) # valgrind testing -VALGRIND_TESTS_DISABLE = $(VALGRIND_TO_FIX) +# videocrop disabled since it takes way too long in valgrind +VALGRIND_TESTS_DISABLE = \ + elements/videocrop \ + $(VALGRIND_TO_FIX) SUPPRESSIONS = $(top_srcdir)/common/gst.supp @@ -103,3 +107,7 @@ elements_sunaudio_CFLAGS = \ elements_sunaudio_LDADD = \ $(GST_PLUGINS_BASE_LIBS) -lgstinterfaces-@GST_MAJORMINOR@ \ $(LDADD) + +elements_videocrop_LDADD = $(LDADD) $(GST_BASE_LIBS) +elements_videocrop_CFLAGS = $(CFLAGS) $(AM_CFLAGS) $(GST_BASE_CFLAGS) + diff --git a/tests/icles/Makefile.am b/tests/icles/Makefile.am index dd415ef8..9f5ddc9d 100644 --- a/tests/icles/Makefile.am +++ b/tests/icles/Makefile.am @@ -21,5 +21,10 @@ else X_TESTS = endif -noinst_PROGRAMS = $(V4L2_TESTS) $(X_TESTS) +videocrop_test_SOURCES = videocrop-test.c +videocrop_test_CFLAGS = $(GST_CFLAGS) +videocrop_test_LDADD = $(GST_LIBS) +videocrop_test_LDFLAGS = $(GST_PLUGIN_LDFLAGS) + +noinst_PROGRAMS = $(V4L2_TESTS) $(X_TESTS) videocrop-test diff --git a/tests/icles/videocrop-test.c b/tests/icles/videocrop-test.c index 1c7ae4ba..da84f25c 100644 --- a/tests/icles/videocrop-test.c +++ b/tests/icles/videocrop-test.c @@ -34,7 +34,9 @@ GST_DEBUG_CATEGORY_STATIC (videocrop_test_debug); #define TIME_PER_TEST 10 /* seconds each format is tested */ #define FRAMERATE 15 /* frames per second */ +#ifndef DEFAULT_VIDEOSINK #define DEFAULT_VIDEOSINK "xvimagesink" +#endif static gboolean check_bus_for_errors (GstBus * bus, GstClockTime max_wait_time) |