Port jpegdec to 0.9; handles 'progressive loading' now, ie. input does no longer...

Original commit message from CVS:
* configure.ac:
* ext/Makefile.am:
* ext/jpeg/Makefile.am:
* ext/jpeg/gstjpeg.c: (plugin_init):
* ext/jpeg/gstjpegdec.c: (gst_jpeg_dec_get_type),
(gst_jpeg_dec_finalize), (gst_jpeg_dec_base_init),
(gst_jpeg_dec_class_init), (gst_jpeg_dec_fill_input_buffer),
(gst_jpeg_dec_init_source), (gst_jpeg_dec_skip_input_data),
(gst_jpeg_dec_resync_to_restart), (gst_jpeg_dec_term_source),
(gst_jpeg_dec_my_output_message), (gst_jpeg_dec_my_emit_message),
(gst_jpeg_dec_my_error_exit), (gst_jpeg_dec_init),
(is_jpeg_start_marker), (is_jpeg_end_marker),
(gst_jpeg_dec_find_jpeg_header), (gst_jpeg_dec_ensure_header),
(gst_jpeg_dec_have_end_marker),
(gst_jpeg_dec_parse_tag_has_entropy_segment),
(gst_jpeg_dec_parse_image_data), (gst_jpeg_dec_chain),
(gst_jpeg_dec_change_state):
* ext/jpeg/gstjpegdec.h:
Port jpegdec to 0.9; handles 'progressive loading' now, ie. input does
no longer need to be one single buffer.

diff --git a/ChangeLog b/ChangeLog
index 7c46e5e..913e07f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,26 @@
+2005-08-08  Tim-Philipp Müller  <tim at centricular dot net>
+
+       * configure.ac:
+       * ext/Makefile.am:
+       * ext/jpeg/Makefile.am:
+       * ext/jpeg/gstjpeg.c: (plugin_init):
+       * ext/jpeg/gstjpegdec.c: (gst_jpeg_dec_get_type),
+       (gst_jpeg_dec_finalize), (gst_jpeg_dec_base_init),
+       (gst_jpeg_dec_class_init), (gst_jpeg_dec_fill_input_buffer),
+       (gst_jpeg_dec_init_source), (gst_jpeg_dec_skip_input_data),
+       (gst_jpeg_dec_resync_to_restart), (gst_jpeg_dec_term_source),
+       (gst_jpeg_dec_my_output_message), (gst_jpeg_dec_my_emit_message),
+       (gst_jpeg_dec_my_error_exit), (gst_jpeg_dec_init),
+       (is_jpeg_start_marker), (is_jpeg_end_marker),
+       (gst_jpeg_dec_find_jpeg_header), (gst_jpeg_dec_ensure_header),
+       (gst_jpeg_dec_have_end_marker),
+       (gst_jpeg_dec_parse_tag_has_entropy_segment),
+       (gst_jpeg_dec_parse_image_data), (gst_jpeg_dec_chain),
+       (gst_jpeg_dec_change_state):
+       * ext/jpeg/gstjpegdec.h:
+         Port jpegdec to 0.9; handles 'progressive loading' now, ie. input does
+         no longer need to be one single buffer.
+
 2005-08-04  Andy Wingo  <wingo@pobox.com>
 
        * sys/oss/gstossaudio.c (plugin_init): Second-class citizen.

diff --git a/common b/common
index 694de4d..856fbbf 160000 (submodule)
--- a/common
+++ b/common
@@ -1 +1 @@
-Subproject commit 694de4dbf4827f372321f0634643a254d7edd986
+Subproject commit 856fbbfa88621ab67df141ead8d4d3df32c5c176

diff --git a/configure.ac b/configure.ac
index 2941460..7e52156 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -447,6 +447,27 @@ GST_CHECK_FEATURE(SIDPLAY, [sidplay plug-in], sidplay, [
   GST_PATH_SIDPLAY()
 ])
 
+dnl *** jpeg ***
+dnl FIXME: we could use header checks here as well IMO
+translit(dnm, m, l) AM_CONDITIONAL(USE_JPEG, true)
+GST_CHECK_FEATURE(JPEG, [jpeg], jpegenc jpegdec, [
+  AC_ARG_WITH(jpeg-mmx,
+    [  --with-jpeg-mmx, path to MMX'ified JPEG library])
+  OLD_LIBS="$LIBS"
+  if test x$with_jpeg_mmx != x; then
+    LIBS="$LIBS -L$with_jpeg_mmx"
+  fi
+  AC_CHECK_LIB(jpeg-mmx, jpeg_set_defaults, HAVE_JPEG="yes", HAVE_JPEG="no")
+  JPEG_LIBS="$LIBS -ljpeg-mmx"
+  LIBS="$OLD_LIBS"
+  if test x$HAVE_JPEG != xyes; then
+    AC_CHECK_LIB(jpeg, jpeg_set_defaults, HAVE_JPEG="yes", HAVE_JPEG="no")
+    JPEG_LIBS="-ljpeg"
+  fi
+  AC_SUBST(JPEG_LIBS)
+])
+
+
 dnl *** mad ***
 dnl FIXME: we could use header checks here as well IMO
 translit(dnm, m, l) AM_CONDITIONAL(USE_MAD, true)
@@ -596,6 +617,7 @@ gst/silence/Makefile
 gst/udp/Makefile
 gst/videobox/Makefile
 gst/videofilter/Makefile
+ext/jpeg/Makefile
 gst/wavparse/Makefile
 gst-libs/Makefile
 gst-libs/gst/Makefile

diff --git a/ext/Makefile.am b/ext/Makefile.am
index e1c4869..92a468e 100644 (file)
--- a/ext/Makefile.am
+++ b/ext/Makefile.am
@@ -160,11 +160,11 @@ HERMES_DIR=
 JACK_DIR=
 # endif
 
-# if USE_JPEG
-# JPEG_DIR=jpeg
-# else
+if USE_JPEG
+JPEG_DIR=jpeg
+else
 JPEG_DIR=
-# endif
+endif
 
 # if USE_LADSPA
 # LADSPA_DIR=ladspa