Changeset 3075Tweet

Timestamp:

Oct 23, 2008, 4:25:09 PM (14 years ago)

Author:

Jean-Yves Lamoureux

Message:

• Added 'Modular' codec as a testbed for hand-written codecs, as well as a JPEG decoder (libjpeg). Some stuff are

temporary, though.

Location:

libpipi/trunk

Files:

• configure.ac (modified) (1 diff)
• pipi/Makefile.am (modified) (1 diff)
• pipi/codec.c (modified) (2 diffs)
• pipi/codec/modular (added)
• pipi/codec/modular.c (added)
• pipi/codec/modular.h (added)
• pipi/codec/modular/jpeg.c (added)
• pipi/pipi_internals.h (modified) (1 diff)

libpipi/trunk/configure.ac

@@ -184 +184 @@
 
 
-if test "${ac_cv_my_have_il}" = "no" -a "${ac_cv_my_have_ole}" = "no" -a "${ac_cv_my_have_sdl}" = "no" -a "${ac_cv_my_have_imlib2}" = "no" -a "${ac_cv_my_have_opencv}" = "no" -a "${ac_cv_my_have_cocoa}" = "no"; then
+# Use Modular codecs ?
+MODULAR_CODEC=""
+ac_cv_my_have_modular="no"
+
+ac_cv_my_have_libjpeg="no"
+AC_CHECK_HEADERS(jpeglib.h,
+ [ac_cv_my_have_libjpeg="yes"],
+ [ac_cv_my_have_libjpeg="no"])
+if test "${ac_cv_my_have_libjpeg}" != "no"; then
+  ac_cv_my_have_modular="yes"
+  AC_DEFINE(USE_LIBJPEG, 1, Define to 1 to use libjpeg)
+  AC_DEFINE(USE_MODULAR, 1, Define to 1 to use modular codecs)
+  MODULAR_CODEC="${MODULAR_CODEC} libjpeg"
+fi
+AM_CONDITIONAL(USE_LIBJPEG, test "${ac_cv_my_have_libjpeg}" = "yes")
+AM_CONDITIONAL(USE_MODULAR, test "${ac_cv_my_have_modular}" = "yes")
+
+AC_MSG_CHECKING(valid modular codecs)
+if test -z "${MODULAR_CODEC}"; then
+  AC_MSG_RESULT(none)
+else
+  MODULAR_CODEC="${MODULAR_CODEC# *}"
+  AC_MSG_RESULT([${MODULAR_CODEC}])
+fi
+
+
+
+if test "${ac_cv_my_have_il}" = "no" -a "${ac_cv_my_have_ole}" = "no" -a "${ac_cv_my_have_sdl}" = "no" -a "${ac_cv_my_have_imlib2}" = "no" -a "${ac_cv_my_have_opencv}" = "no" -a "${ac_cv_my_have_cocoa}" = "no" -a "${ac_cv_my_have_modular}" = "no"; then
   AC_MSG_ERROR([[cannot find DevIL, OLE, SDL_Image, Imlib2, Cocoa, or OpenCV, please install one of them]])
 fi

libpipi/trunk/pipi/Makefile.am

@@ -123 +123 @@
 codec_sources += codec/coreimage.m
 endif
+
+# Modular codecs
+if USE_MODULAR
+codec_sources += codec/modular.c
+if USE_LIBJPEG
+codec_libs += -ljpeg
+codec_sources += codec/modular/jpeg.c
+endif
+endif

libpipi/trunk/pipi/codec.c

@@ -39 +39 @@
         ret = pipi_load_oric(name);
 
+#if USE_LIBJPEG
+    if(!ret)
+        ret = pipi_load_modular(name);
+#endif
 #if USE_IMLIB2
     if(!ret)
@@ -111 +115 @@
         ret = pipi_save_coreimage(img, name);
 #endif
-    
+
     return ret;
 }

libpipi/trunk/pipi/pipi_internals.h

@@ -98 +98 @@
 #endif
 
+/* Modular codecs */
+#ifdef USE_MODULAR
+pipi_image_t *pipi_load_modular(const char *name);
+int pipi_save_modular(pipi_image_t *img, const char *name);
+#endif
+
+
 
 pipi_image_t *pipi_load_oric(const char *name);