jpegmmx addition and some small changes

Original commit message from CVS:
jpegmmx addition and some small changes

diff --git a/configure.ac b/configure.ac
index 48d252e..857f96c 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -522,15 +522,12 @@ GST_CHECK_FEATURE(JPEG, [jpeg], jpegenc jpegdec, [
   AC_SUBST(JPEG_LIBS)
 ])
 
-dnl *** jpeg-mmx ***
-AC_ARG_WITH(jpeg-mmx-path, [ --with-jpeg-mmx-path, path to mmx accelerated jpeg lib])
-translit(dnm, m, l) AM_CONDITIONAL(USE_JPEG_MMX, true)
-GST_CHECK_FEATURE(JPEG_MMX, [jpeg-mmx], jpegmmxenc jpegmmxdec, [
-   AC_CHECK_LIB(jpeg-mmx, jpeg_start_compress, HAVE_JPEG_MMX="yes", HAVE_JPEG_MMX="no", "-L$with_jpeg_mmx_path")
-   JPEG_MMX_LIBS="-L$with_jpeg_mmx_path -ljpeg-mmx"
-   JPEG_MMX_CFLAGS="-I$with_jpeg_mmx_path"
-   AC_SUBST(JPEG_MMX_LIBS)
-   AC_SUBST(JPEG_MMX_CFLAGS)
+dnl *** mjpegtools ***
+translit(dnm, m, l) AM_CONDITIONAL(USE_MJPEGTOOLS, true)
+GST_CHECK_FEATURE(MJPEGTOOLS, [mjpegtools], jpegmmxenc jpegmmxdec, [
+  PKG_CHECK_MODULES(MJPEGTOOLS, mjpegtools, HAVE_MJPEGTOOLS="yes", HAVE_MJPEGTOOLS="no")
+  AC_SUBST(MJPEGTOOLS_LIBS)
+  AC_SUBST(MJPEGTOOLS_CFLAGS)
 ])
 
 dnl *** mad ***
@@ -1037,6 +1034,7 @@ ext/gsm/Makefile
 ext/hermes/Makefile
 ext/http/Makefile
 ext/jpeg/Makefile
+ext/jpeg-mmx/Makefile
 ext/ladspa/Makefile
 ext/lame/Makefile
 ext/mad/Makefile

diff --git a/ext/Makefile.am b/ext/Makefile.am
index bd24b63..c163c99 100644 (file)
--- a/ext/Makefile.am
+++ b/ext/Makefile.am
@@ -106,6 +106,12 @@ else
 JPEG_DIR=
 endif
 
+if USE_MJPEGTOOLS
+JPEG_MMX_DIR=jpeg-mmx
+else
+JPEG_MMX_DIR=
+endif
+
 LADSPA_DIR=ladspa
 
 if USE_LAME
@@ -192,11 +198,11 @@ SUBDIRS=$(A52DEC_DIR) $(AALIB_DIR) $(ALSA_DIR) \
        $(DVDREAD_DIR) $(ESD_DIR) $(FESTIVAL_DIR) \
        $(FLAC_DIR) $(GNOMEVFS_DIR) $(GSM_DIR) \
        $(HERMES_DIR) $(HTTP_DIR) $(JPEG_DIR) \
-       $(LADSPA_DIR) $(LAME_DIR) $(MAD_DIR) \
-       $(MIKMOD_DIR) $(MPEG2DEC_DIR) $(OPENQUICKTIME_DIR) \
-       $(RAW1394_DIR) $(RTP_DIR) $(SDL_DIR) \
-       $(SHOUT_DIR) $(SIDPLAY_DIR) $(SMOOTHWAVE_DIR) \
-       $(VORBIS_DIR) $(XMMS_DIR)
+       $(JPEG_MMX_DIR) $(LADSPA_DIR) $(LAME_DIR) \
+       $(MAD_DIR) $(MIKMOD_DIR) $(MPEG2DEC_DIR) \
+       $(OPENQUICKTIME_DIR) $(RAW1394_DIR) $(RTP_DIR) \
+       $(SDL_DIR) $(SHOUT_DIR) $(SIDPLAY_DIR) \
+       $(SMOOTHWAVE_DIR) $(VORBIS_DIR) $(XMMS_DIR)
 
 DIST_SUBDIRS=\
        a52dec aalib alsa \
@@ -205,8 +211,8 @@ DIST_SUBDIRS=\
        dvdread esd festival \
        flac gnomevfs gsm \
        hermes http jpeg \
-       ladspa lame mad \
-       mikmod mpeg2dec openquicktime \
-       raw1394 rtp sdl \
-       shout sidplay smoothwave \
-       vorbis xmms
+       jpeg-mmx ladspa lame \
+       mad mikmod mpeg2dec \
+       openquicktime raw1394 rtp \
+       sdl shout sidplay \
+       smoothwave vorbis xmms

diff --git a/sys/v4l/TODO b/sys/v4l/TODO
index afc6718..907d644 100644 (file)
--- a/sys/v4l/TODO
+++ b/sys/v4l/TODO
@@ -2,6 +2,7 @@ TODO list (short term):
 =======================
 * as soon as we've trashed Gtk-1.2, change 'gint palette'
     to 'guint16 palette' in gstv4lsrc.[ch]
+* v4lsrc: actually try the format out on capsnego
 * all three: fix interlacing (not handled at all...)
 * libgstrec: build (a library for video recording)
 

diff --git a/sys/v4l/gstv4lmjpegsink.c b/sys/v4l/gstv4lmjpegsink.c
index 7c5e399..922413c 100644 (file)
--- a/sys/v4l/gstv4lmjpegsink.c
+++ b/sys/v4l/gstv4lmjpegsink.c
@@ -184,6 +184,10 @@ gst_v4lmjpegsink_sinkconnect (GstPad  *pad,
 
   v4lmjpegsink = GST_V4LMJPEGSINK (gst_pad_get_parent (pad));
 
+  /* we are not going to act on variable caps */
+  if (!GST_CAPS_IS_FIXED (vscapslist))
+    return GST_PAD_CONNECT_DELAYED;
+
   for (caps = capslist; caps != NULL; caps = vscapslist = vscapslist->next)
   {
     v4lmjpegsink->width =  gst_caps_get_int (caps, "width");