jpegmmx addition and some small changes
Original commit message from CVS: jpegmmx addition and some small changes
This commit is contained in:
parent
07ba249957
commit
ad9974927b
16
configure.ac
16
configure.ac
@ -522,15 +522,12 @@ GST_CHECK_FEATURE(JPEG, [jpeg], jpegenc jpegdec, [
|
|||||||
AC_SUBST(JPEG_LIBS)
|
AC_SUBST(JPEG_LIBS)
|
||||||
])
|
])
|
||||||
|
|
||||||
dnl *** jpeg-mmx ***
|
dnl *** mjpegtools ***
|
||||||
AC_ARG_WITH(jpeg-mmx-path, [ --with-jpeg-mmx-path, path to mmx accelerated jpeg lib])
|
translit(dnm, m, l) AM_CONDITIONAL(USE_MJPEGTOOLS, true)
|
||||||
translit(dnm, m, l) AM_CONDITIONAL(USE_JPEG_MMX, true)
|
GST_CHECK_FEATURE(MJPEGTOOLS, [mjpegtools], jpegmmxenc jpegmmxdec, [
|
||||||
GST_CHECK_FEATURE(JPEG_MMX, [jpeg-mmx], jpegmmxenc jpegmmxdec, [
|
PKG_CHECK_MODULES(MJPEGTOOLS, mjpegtools, HAVE_MJPEGTOOLS="yes", HAVE_MJPEGTOOLS="no")
|
||||||
AC_CHECK_LIB(jpeg-mmx, jpeg_start_compress, HAVE_JPEG_MMX="yes", HAVE_JPEG_MMX="no", "-L$with_jpeg_mmx_path")
|
AC_SUBST(MJPEGTOOLS_LIBS)
|
||||||
JPEG_MMX_LIBS="-L$with_jpeg_mmx_path -ljpeg-mmx"
|
AC_SUBST(MJPEGTOOLS_CFLAGS)
|
||||||
JPEG_MMX_CFLAGS="-I$with_jpeg_mmx_path"
|
|
||||||
AC_SUBST(JPEG_MMX_LIBS)
|
|
||||||
AC_SUBST(JPEG_MMX_CFLAGS)
|
|
||||||
])
|
])
|
||||||
|
|
||||||
dnl *** mad ***
|
dnl *** mad ***
|
||||||
@ -1037,6 +1034,7 @@ ext/gsm/Makefile
|
|||||||
ext/hermes/Makefile
|
ext/hermes/Makefile
|
||||||
ext/http/Makefile
|
ext/http/Makefile
|
||||||
ext/jpeg/Makefile
|
ext/jpeg/Makefile
|
||||||
|
ext/jpeg-mmx/Makefile
|
||||||
ext/ladspa/Makefile
|
ext/ladspa/Makefile
|
||||||
ext/lame/Makefile
|
ext/lame/Makefile
|
||||||
ext/mad/Makefile
|
ext/mad/Makefile
|
||||||
|
@ -106,6 +106,12 @@ else
|
|||||||
JPEG_DIR=
|
JPEG_DIR=
|
||||||
endif
|
endif
|
||||||
|
|
||||||
|
if USE_MJPEGTOOLS
|
||||||
|
JPEG_MMX_DIR=jpeg-mmx
|
||||||
|
else
|
||||||
|
JPEG_MMX_DIR=
|
||||||
|
endif
|
||||||
|
|
||||||
LADSPA_DIR=ladspa
|
LADSPA_DIR=ladspa
|
||||||
|
|
||||||
if USE_LAME
|
if USE_LAME
|
||||||
@ -192,11 +198,11 @@ SUBDIRS=$(A52DEC_DIR) $(AALIB_DIR) $(ALSA_DIR) \
|
|||||||
$(DVDREAD_DIR) $(ESD_DIR) $(FESTIVAL_DIR) \
|
$(DVDREAD_DIR) $(ESD_DIR) $(FESTIVAL_DIR) \
|
||||||
$(FLAC_DIR) $(GNOMEVFS_DIR) $(GSM_DIR) \
|
$(FLAC_DIR) $(GNOMEVFS_DIR) $(GSM_DIR) \
|
||||||
$(HERMES_DIR) $(HTTP_DIR) $(JPEG_DIR) \
|
$(HERMES_DIR) $(HTTP_DIR) $(JPEG_DIR) \
|
||||||
$(LADSPA_DIR) $(LAME_DIR) $(MAD_DIR) \
|
$(JPEG_MMX_DIR) $(LADSPA_DIR) $(LAME_DIR) \
|
||||||
$(MIKMOD_DIR) $(MPEG2DEC_DIR) $(OPENQUICKTIME_DIR) \
|
$(MAD_DIR) $(MIKMOD_DIR) $(MPEG2DEC_DIR) \
|
||||||
$(RAW1394_DIR) $(RTP_DIR) $(SDL_DIR) \
|
$(OPENQUICKTIME_DIR) $(RAW1394_DIR) $(RTP_DIR) \
|
||||||
$(SHOUT_DIR) $(SIDPLAY_DIR) $(SMOOTHWAVE_DIR) \
|
$(SDL_DIR) $(SHOUT_DIR) $(SIDPLAY_DIR) \
|
||||||
$(VORBIS_DIR) $(XMMS_DIR)
|
$(SMOOTHWAVE_DIR) $(VORBIS_DIR) $(XMMS_DIR)
|
||||||
|
|
||||||
DIST_SUBDIRS=\
|
DIST_SUBDIRS=\
|
||||||
a52dec aalib alsa \
|
a52dec aalib alsa \
|
||||||
@ -205,8 +211,8 @@ DIST_SUBDIRS=\
|
|||||||
dvdread esd festival \
|
dvdread esd festival \
|
||||||
flac gnomevfs gsm \
|
flac gnomevfs gsm \
|
||||||
hermes http jpeg \
|
hermes http jpeg \
|
||||||
ladspa lame mad \
|
jpeg-mmx ladspa lame \
|
||||||
mikmod mpeg2dec openquicktime \
|
mad mikmod mpeg2dec \
|
||||||
raw1394 rtp sdl \
|
openquicktime raw1394 rtp \
|
||||||
shout sidplay smoothwave \
|
sdl shout sidplay \
|
||||||
vorbis xmms
|
smoothwave vorbis xmms
|
||||||
|
@ -2,6 +2,7 @@ TODO list (short term):
|
|||||||
=======================
|
=======================
|
||||||
* as soon as we've trashed Gtk-1.2, change 'gint palette'
|
* as soon as we've trashed Gtk-1.2, change 'gint palette'
|
||||||
to 'guint16 palette' in gstv4lsrc.[ch]
|
to 'guint16 palette' in gstv4lsrc.[ch]
|
||||||
|
* v4lsrc: actually try the format out on capsnego
|
||||||
* all three: fix interlacing (not handled at all...)
|
* all three: fix interlacing (not handled at all...)
|
||||||
* libgstrec: build (a library for video recording)
|
* libgstrec: build (a library for video recording)
|
||||||
|
|
||||||
|
@ -184,6 +184,10 @@ gst_v4lmjpegsink_sinkconnect (GstPad *pad,
|
|||||||
|
|
||||||
v4lmjpegsink = GST_V4LMJPEGSINK (gst_pad_get_parent (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)
|
for (caps = capslist; caps != NULL; caps = vscapslist = vscapslist->next)
|
||||||
{
|
{
|
||||||
v4lmjpegsink->width = gst_caps_get_int (caps, "width");
|
v4lmjpegsink->width = gst_caps_get_int (caps, "width");
|
||||||
|
Loading…
x
Reference in New Issue
Block a user