mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2024-11-26 03:31:05 +00:00
Massive, massive update of most source files. I went through and cleaned up all the warnings that I could, which inv...
Original commit message from CVS: Massive, massive update of most source files. I went through and cleaned up all the warnings that I could, which involved fixing some of the plugins. The configure.in script was re-arranged and cleaned up so, and a check for libtool 1.3.5 was added to autogen.sh. Added checks for Gtk and GNOME. Some plugins were removed from the list of things to build for various reasons. Added GST_DEBUG_FORCE_DISABLE in gstgetbits, since that's time critical and even an if() from a DEBUG can significantly increase runtimes.
This commit is contained in:
Erik Walthinsen
parent
18132480f4
commit
ae0d5d1889
22 changed files with 211 additions and 146 deletions
|
|
@ -7,6 +7,7 @@
|
|||
|
||||
#undef HAVE_GDK_PIXBUF
|
||||
#undef HAVE_LIBGHTTP
|
||||
#undef HAVE_GNOME
|
||||
#undef HAVE_LIBMMX
|
||||
#undef HAVE_LIBXV
|
||||
#undef HAVE_XAUDIO
|
||||
|
|
|
|||
42
autogen.sh
42
autogen.sh
|
|
@ -13,14 +13,6 @@ srcfile=gst/gstobject.h
|
|||
DIE=1
|
||||
}
|
||||
|
||||
(libtool --version) < /dev/null > /dev/null 2>&1 || {
|
||||
echo
|
||||
echo "You must have libtool installed to compile $package."
|
||||
echo "Get ftp://alpha.gnu.org/gnu/libtool-1.2.tar.gz"
|
||||
echo "(or a newer version if it is available)"
|
||||
DIE=1
|
||||
}
|
||||
|
||||
(automake --version) < /dev/null > /dev/null 2>&1 || {
|
||||
echo
|
||||
echo "You must have automake installed to compile $package."
|
||||
|
|
@ -29,6 +21,26 @@ srcfile=gst/gstobject.h
|
|||
DIE=1
|
||||
}
|
||||
|
||||
(libtool --version) < /dev/null > /dev/null 2>&1 || {
|
||||
echo
|
||||
echo "You must have libtool installed to compile $package."
|
||||
echo "Get ftp://alpha.gnu.org/gnu/libtool-1.3.5.tar.gz"
|
||||
echo "(or a newer version if it is available)"
|
||||
DIE=1
|
||||
}
|
||||
|
||||
libtool_version=`libtool --version | sed 's/^.* \([0-9\.]*\) .*$/\1/'`
|
||||
libtool_major=`echo $libtool_version | cut -d. -f1`
|
||||
libtool_minor=`echo $libtool_version | cut -d. -f2`
|
||||
libtool_micro=`echo $libtool_version | cut -d. -f3`
|
||||
if [ $libtool_major -lt 1 -o $libtool_minor -lt 3 -o $libtool_micro -lt 5 ];then
|
||||
echo
|
||||
echo "You must have libtool 1.3.5 or greater to compile $packate."
|
||||
echo "Get ftp://alpha.gnu.org/gnu/libtool-1.3.5.tar.gz"
|
||||
echo "(or a newer version if it is available)"
|
||||
DIE=1
|
||||
fi
|
||||
|
||||
if test "$DIE" -eq 1; then
|
||||
exit 1
|
||||
fi
|
||||
|
|
@ -53,13 +65,13 @@ if [ "x$1" = "x--autogen-recurse" ];then
|
|||
exit # the rest will happen later
|
||||
fi
|
||||
|
||||
for dir in `find * -name autogen.sh -print | grep -v '^autogen.sh$' | \
|
||||
sed 's/autogen.sh$//'`;do
|
||||
echo "Recursively running autogen.sh in $dir"
|
||||
pushd $dir > /dev/null
|
||||
./autogen.sh --autogen-recurse "$@"
|
||||
popd > /dev/null
|
||||
done
|
||||
#for dir in `find * -name autogen.sh -print | grep -v '^autogen.sh$' | \
|
||||
# sed 's/autogen.sh$//'`;do
|
||||
# echo "Recursively running autogen.sh in $dir"
|
||||
# pushd $dir > /dev/null
|
||||
# ./autogen.sh --autogen-recurse "$@"
|
||||
# popd > /dev/null
|
||||
#done
|
||||
|
||||
./configure --enable-maintainer-mode --enable-plugin-srcdir --enable-debug-verbose "$@"
|
||||
|
||||
|
|
|
|||
231
configure.in
231
configure.in
|
|
@ -40,24 +40,11 @@ AM_DISABLE_STATIC
|
|||
AC_LIBTOOL_DLOPEN
|
||||
AM_PROG_LIBTOOL
|
||||
|
||||
|
||||
dnl ##############################
|
||||
dnl # Do automated configuration #
|
||||
dnl ##############################
|
||||
|
||||
dnl Set up conditionals for (target) architecture:
|
||||
dnl ==============================================
|
||||
|
||||
dnl Determine CPU
|
||||
case "x${target_cpu}" in
|
||||
xi?86) HAVE_CPU_I386=yes ;
|
||||
AC_DEFINE(HAVE_CPU_I386) ;;
|
||||
xpowerpc) HAVE_CPU_PPC=yes ;
|
||||
AC_DEFINE(HAVE_CPU_PPC) ;;
|
||||
esac
|
||||
|
||||
dnl Determine endianness
|
||||
AC_C_BIGENDIAN
|
||||
|
||||
dnl Check for tools:
|
||||
dnl ================
|
||||
|
||||
|
|
@ -72,16 +59,79 @@ else
|
|||
HAVE_NASM="yes"
|
||||
fi
|
||||
|
||||
dnl check for gtkdoc
|
||||
AC_CHECK_PROG(HAVE_GTK_DOC, gtkdoc-mkdb, true, false)
|
||||
AC_CHECK_PROG(HAVE_GTK_DOC, gtkdoc-scanobj, :, false)
|
||||
AC_CHECK_PROG(HAVE_GTK_DOC, gtkdoc-scan, :, false)
|
||||
AC_CHECK_PROG(HAVE_GTK_DOC, gtkdoc-mktmpl, :, false)
|
||||
AC_CHECK_PROG(HAVE_GTK_DOC, gtkdoc-mkdb, :, false)
|
||||
AC_CHECK_PROG(HAVE_GTK_DOC, gtkdoc-mkhtml, :, false)
|
||||
AC_CHECK_PROG(HAVE_GTK_DOC, gtkdoc-fixxref, :, false)
|
||||
|
||||
dnl check for docbook tools
|
||||
AC_CHECK_PROG(HAVE_DB2HTML, db2html, true, false)
|
||||
AC_CHECK_PROG(HAVE_DB2PS, db2ps, true, false)
|
||||
AC_CHECK_PROG(HAVE_PS2PDF, ps2pdf, true, false)
|
||||
|
||||
dnl check for image conversion tool
|
||||
AC_CHECK_PROG(HAVE_FIG2DEV, fig2dev, true, false)
|
||||
|
||||
|
||||
dnl Set up conditionals for (target) architecture:
|
||||
dnl ==============================================
|
||||
|
||||
dnl Determine CPU
|
||||
case "x${target_cpu}" in
|
||||
xi?86) HAVE_CPU_I386=yes ;
|
||||
AC_DEFINE(HAVE_CPU_I386) ;;
|
||||
xpowerpc) HAVE_CPU_PPC=yes ;
|
||||
AC_DEFINE(HAVE_CPU_PPC) ;;
|
||||
esac
|
||||
|
||||
dnl Determine endianness
|
||||
AC_C_BIGENDIAN
|
||||
|
||||
dnl Check for MMX-capable compiler
|
||||
AC_MSG_CHECKING(for MMX-capable compiler)
|
||||
AC_TRY_RUN([
|
||||
#include "include/mmx.h"
|
||||
|
||||
main()
|
||||
{ movq_r2r(mm0, mm1); return 0; }
|
||||
],
|
||||
[
|
||||
HAVE_LIBMMX="yes"
|
||||
AC_MSG_RESULT(yes)
|
||||
],
|
||||
HAVE_LIBMMX="no"
|
||||
AC_MSG_RESULT(no)
|
||||
,
|
||||
HAVE_LIBMMX="no"
|
||||
AC_MSG_RESULT(no)
|
||||
)
|
||||
|
||||
|
||||
|
||||
dnl Check for essential libraries first:
|
||||
dnl ====================================
|
||||
|
||||
|
||||
dnl Check for glib
|
||||
AM_PATH_GLIB(1.2.0,,
|
||||
AC_MSG_ERROR(Cannot find glib: Is glib-config in path?),
|
||||
glib gmodule gthread)
|
||||
dnl Put the glib flags into $LIBS and $CFLAGS since we always use them
|
||||
LIBS="$LIBS $GLIB_LIBS"
|
||||
CFLAGS="$FLAGS $GLIB_CFLAGS"
|
||||
CFLAGS="$CFLAGS $GLIB_CFLAGS"
|
||||
|
||||
|
||||
dnl Check for gtk
|
||||
AM_PATH_GTK(1.2.0,,
|
||||
AC_MSG_ERROR(Cannot find gtk: Is gtk-config in path?))
|
||||
dnl Put the gtk flags into $LIBS and $CFLAGS since we always use them
|
||||
LIBS="$LIBS $GTK_LIBS"
|
||||
CFLAGS="$CFLAGS $GTK_CFLAGS"
|
||||
|
||||
|
||||
dnl Check for libxml
|
||||
AC_PATH_PROG(XML_CONFIG, xml-config, no)
|
||||
|
|
@ -92,11 +142,14 @@ XML_LIBS=`xml-config --libs`
|
|||
XML_CFLAGS=`xml-config --cflags`
|
||||
AC_SUBST(XML_LIBS)
|
||||
AC_SUBST(XML_CFLAGS)
|
||||
LIBS="$LIBS $XML_LIBS"
|
||||
CFLAGS="$CFLAGS $XML_CFLAGS"
|
||||
|
||||
|
||||
dnl Next, check for the optional libraries:
|
||||
dnl =======================================
|
||||
|
||||
|
||||
dnl Check for libgdk-pixbuf
|
||||
AC_PATH_PROG(GDK_PIXBUF_CONFIG, gdk-pixbuf-config, no)
|
||||
if test x$GDK_PIXBUF_CONFIG = xno; then
|
||||
|
|
@ -113,24 +166,35 @@ AC_SUBST(GDK_PIXBUF_LIBS)
|
|||
AC_SUBST(GDK_PIXBUF_CFLAGS)
|
||||
|
||||
|
||||
dnl Check for gtk
|
||||
AM_PATH_GTK(1.2.0)
|
||||
|
||||
dnl Check for libghttp
|
||||
dnl FIXME: need to check for header
|
||||
AC_CHECK_LIB(ghttp, ghttp_request_new,
|
||||
[GHTTP_LIBS="-lghttp"
|
||||
GST_HTTPSRC_GET_TYPE="gst_httpsrc_get_type"
|
||||
HAVE_LIBGHTTP=yes
|
||||
],
|
||||
[AC_MSG_WARN(Cannot find libghttp: can't build gsthttpsrc)
|
||||
GHTTP_LIBS=
|
||||
GST_HTTPSRC_GET_TYPE=
|
||||
HAVE_LIBGHTTP=no
|
||||
],
|
||||
$LIBS)
|
||||
AC_SUBST(GHTTP_LIBS)
|
||||
AC_SUBST(GST_HTTPSRC_GET_TYPE)
|
||||
|
||||
|
||||
dnl Check for libgnome
|
||||
AC_PATH_PROG(GNOME_CONFIG, gnome-config, no)
|
||||
if test x$GNOME_CONFIG = xno; then
|
||||
AC_MSG_WARN(Couldn't find gnome-config: can't build editor or gstplay)
|
||||
GNOME_LIBS=
|
||||
GNOME_CFLAGS=
|
||||
HAVE_GNOME=no
|
||||
else
|
||||
GNOME_LIBS=`gnome-config --libs gnome gnomeui`
|
||||
GNOME_CFLAGS=`gnome-config --cflags gnome gnomeui`
|
||||
HAVE_GNOME=yes
|
||||
fi
|
||||
AC_SUBST(GNOME_LIBS)
|
||||
AC_SUBST(GNOME_CFLAGS)
|
||||
|
||||
|
||||
dnl Check for libglade
|
||||
HAVE_LIBGLADE_GNOME="no"
|
||||
|
|
@ -148,6 +212,7 @@ else
|
|||
CFLAGS=${libglade_save_CFLAGS}
|
||||
fi
|
||||
|
||||
|
||||
dnl Check for atomic.h
|
||||
dnl Note: use AC_CHECK_HEADER not AC_CHECK_HEADERS, because the latter
|
||||
dnl defines the wrong default symbol as well (HAVE_ASM_ATOMIC_H)
|
||||
|
|
@ -170,24 +235,6 @@ main() { atomic_t t; atomic_set(&t,0); return 0;}
|
|||
])
|
||||
fi
|
||||
|
||||
dnl Check for MMX capable compiler
|
||||
AC_MSG_CHECKING(Checking MMX compilation)
|
||||
AC_TRY_RUN([
|
||||
#include "include/mmx.h"
|
||||
|
||||
main()
|
||||
{ movq_r2r(mm0, mm1); return 0; }
|
||||
],
|
||||
[
|
||||
HAVE_LIBMMX="yes"
|
||||
AC_MSG_RESULT(yes)
|
||||
],
|
||||
HAVE_LIBMMX="no"
|
||||
AC_MSG_RESULT(no)
|
||||
,
|
||||
HAVE_LIBMMX="no"
|
||||
AC_MSG_RESULT(no)
|
||||
)
|
||||
|
||||
dnl Check for X11 extensions
|
||||
AC_PATH_XTRA
|
||||
|
|
@ -199,6 +246,8 @@ AC_SUBST(X_PRE_LIBS)
|
|||
AC_SUBST(X_EXTRA_LIBS)
|
||||
AC_SUBST(X_LIBS)
|
||||
|
||||
|
||||
dnl Check for the Xv library
|
||||
xvsave_LIBS=${LIBS}
|
||||
AC_CHECK_LIB(Xv, XvQueryExtension,
|
||||
HAVE_LIBXV=yes
|
||||
|
|
@ -206,25 +255,36 @@ AC_DEFINE(HAVE_LIBXV),
|
|||
HAVE_LIBXV=no, $X_LIBS $X_PRE_LIBS -lXext -lX11 $X_EXTRA_LIBS)
|
||||
LIBS=${xvsave_LIBS}
|
||||
|
||||
|
||||
dnl Check for xaudio
|
||||
AC_CHECK_HEADER(xaudio/decoder.h,[
|
||||
AC_DEFINE(HAVE_XAUDIO)
|
||||
HAVE_XAUDIO="yes", []
|
||||
])
|
||||
|
||||
dnl Set location of plugin directory
|
||||
if test "x${prefix}" = "xNONE"; then
|
||||
PLUGINS_DIR=${ac_default_prefix}/lib/gst
|
||||
else
|
||||
PLUGINS_DIR=${prefix}/lib/gst
|
||||
fi
|
||||
AC_DEFINE_UNQUOTED(PLUGINS_DIR,"$PLUGINS_DIR")
|
||||
AC_SUBST(PLUGINS_DIR)
|
||||
|
||||
dnl Set location of uninstalled plugin directory
|
||||
PLUGINS_SRCDIR=`pwd`/$srcdir
|
||||
AC_DEFINE_UNQUOTED(PLUGINS_SRCDIR,"$PLUGINS_SRCDIR")
|
||||
AC_SUBST(PLUGINS_SRCDIR)
|
||||
dnl Check for libvorbis
|
||||
AC_MSG_CHECKING(Vorbis library)
|
||||
AC_CHECK_LIB(vorbis, ogg_sync_init,
|
||||
HAVE_VORBIS=yes
|
||||
AC_DEFINE(HAVE_VORBIS),
|
||||
HAVE_VORBIS=no, )
|
||||
|
||||
|
||||
dnl Check for cdparanoia
|
||||
AC_MSG_CHECKING(CDparanoia library)
|
||||
HAVE_CDPARANOIA=yes
|
||||
AC_CHECK_LIB(cdda_paranoia, paranoia_init, : , HAVE_CDPARANOIA=no, )
|
||||
AC_CHECK_HEADER(cdda_paranoia.h, :, HAVE_CDPARANOIA=no)
|
||||
AC_CHECK_LIB(cdda_interface, cdda_open, : , HAVE_CDPARANOIA=no, )
|
||||
AC_CHECK_HEADER(cdda_interface.h, :, HAVE_CDPARANOIA=no)
|
||||
|
||||
|
||||
dnl Check for liblame
|
||||
AC_MSG_CHECKING(LAME library)
|
||||
AC_CHECK_LIB(mp3lame, lame_init, HAVE_LIBLAME=yes, HAVE_LIBLAME=no, )
|
||||
AC_CHECK_HEADER(lame.h, :, HAVE_LIBLAME=no)
|
||||
|
||||
|
||||
dnl check if css-auth.c exists (FIXME)
|
||||
AC_MSG_CHECKING(DVD CSS code)
|
||||
|
|
@ -238,42 +298,6 @@ else
|
|||
HAVE_CSSAUTH="no"
|
||||
fi
|
||||
|
||||
dnl check for libvorbis
|
||||
AC_MSG_CHECKING(Vorbis library)
|
||||
AC_CHECK_LIB(vorbis, ogg_sync_init,
|
||||
HAVE_VORBIS=yes
|
||||
AC_DEFINE(HAVE_VORBIS),
|
||||
HAVE_VORBIS=no, )
|
||||
|
||||
dnl check for cdparanoia
|
||||
AC_MSG_CHECKING(CDparanoia library)
|
||||
HAVE_CDPARANOIA=yes
|
||||
AC_CHECK_LIB(cdda_paranoia, paranoia_init, : , HAVE_CDPARANOIA=no, )
|
||||
AC_CHECK_HEADER(cdda_paranoia.h, :, HAVE_CDPARANOIA=no)
|
||||
AC_CHECK_LIB(cdda_interface, cdda_open, : , HAVE_CDPARANOIA=no, )
|
||||
AC_CHECK_HEADER(cdda_interface.h, :, HAVE_CDPARANOIA=no)
|
||||
|
||||
dnl check for liblame
|
||||
AC_MSG_CHECKING(LAME library)
|
||||
AC_CHECK_LIB(mp3lame, lame_init, HAVE_LIBLAME=yes, HAVE_LIBLAME=no, )
|
||||
AC_CHECK_HEADER(lame.h, :, HAVE_LIBLAME=no)
|
||||
|
||||
dnl check for gtkdoc
|
||||
AC_CHECK_PROG(HAVE_GTK_DOC, gtkdoc-mkdb, true, false)
|
||||
AC_CHECK_PROG(HAVE_GTK_DOC, gtkdoc-scanobj, :, false)
|
||||
AC_CHECK_PROG(HAVE_GTK_DOC, gtkdoc-scan, :, false)
|
||||
AC_CHECK_PROG(HAVE_GTK_DOC, gtkdoc-mktmpl, :, false)
|
||||
AC_CHECK_PROG(HAVE_GTK_DOC, gtkdoc-mkdb, :, false)
|
||||
AC_CHECK_PROG(HAVE_GTK_DOC, gtkdoc-mkhtml, :, false)
|
||||
AC_CHECK_PROG(HAVE_GTK_DOC, gtkdoc-fixxref, :, false)
|
||||
|
||||
dnl check for docbook tools
|
||||
AC_CHECK_PROG(HAVE_DB2HTML, db2html, true, false)
|
||||
AC_CHECK_PROG(HAVE_DB2PS, db2ps, true, false)
|
||||
AC_CHECK_PROG(HAVE_PS2PDF, ps2pdf, true, false)
|
||||
|
||||
dnl check for image conversion tool
|
||||
AC_CHECK_PROG(HAVE_FIG2DEV, fig2dev, true, false)
|
||||
|
||||
|
||||
dnl ######################################################################
|
||||
|
|
@ -447,6 +471,32 @@ AM_CONDITIONAL(HAVE_FIG2DEV, $HAVE_FIG2DEV)
|
|||
AM_CONDITIONAL(HAVE_CDPARANOIA, test "x$HAVE_CDPARANOIA" = "xyes")
|
||||
AM_CONDITIONAL(HAVE_LIBLAME, test "x$HAVE_LIBLAME" = "xyes")
|
||||
|
||||
|
||||
|
||||
dnl ############################
|
||||
dnl # Set up some more defines #
|
||||
dnl ############################
|
||||
|
||||
dnl Set location of plugin directory
|
||||
if test "x${prefix}" = "xNONE"; then
|
||||
PLUGINS_DIR=${ac_default_prefix}/lib/gst
|
||||
else
|
||||
PLUGINS_DIR=${prefix}/lib/gst
|
||||
fi
|
||||
AC_DEFINE_UNQUOTED(PLUGINS_DIR,"$PLUGINS_DIR")
|
||||
AC_SUBST(PLUGINS_DIR)
|
||||
|
||||
dnl Set location of uninstalled plugin directory
|
||||
PLUGINS_SRCDIR=`pwd`/$srcdir
|
||||
AC_DEFINE_UNQUOTED(PLUGINS_SRCDIR,"$PLUGINS_SRCDIR")
|
||||
AC_SUBST(PLUGINS_SRCDIR)
|
||||
|
||||
|
||||
|
||||
|
||||
dnl ##############################
|
||||
dnl # Set up the defaults cflags #
|
||||
dnl ##############################
|
||||
dnl CC="kgcc"
|
||||
CFLAGS="$CFLAGS -O6 -Wall"
|
||||
|
||||
|
|
@ -456,12 +506,13 @@ AC_SUBST(CFLAGS)
|
|||
AC_SUBST(CPPFLAGS)
|
||||
AC_SUBST(LDFLAGS)
|
||||
|
||||
|
||||
dnl #############################
|
||||
dnl # Configure the subpackages #
|
||||
dnl #############################
|
||||
|
||||
AC_CONFIG_SUBDIRS(gist)
|
||||
AC_CONFIG_SUBDIRS(plugins/mp3decode/xing/libxing)
|
||||
dnl AC_CONFIG_SUBDIRS(gist)
|
||||
dnl AC_CONFIG_SUBDIRS(plugins/mp3decode/xing/libxing)
|
||||
|
||||
|
||||
dnl #########################
|
||||
|
|
@ -533,7 +584,6 @@ plugins/videoscale/Makefile
|
|||
plugins/audioscale/Makefile
|
||||
plugins/dvdsrc/Makefile
|
||||
plugins/vcdsrc/Makefile
|
||||
plugins/cobin/Makefile
|
||||
plugins/rtjpeg/Makefile
|
||||
plugins/vorbis/Makefile
|
||||
plugins/capture/Makefile
|
||||
|
|
@ -557,6 +607,7 @@ examples/queue2/Makefile
|
|||
examples/queue3/Makefile
|
||||
examples/queue4/Makefile
|
||||
examples/thread/Makefile
|
||||
examples/launch/Makefile
|
||||
examples/xml/Makefile
|
||||
editor/Makefile
|
||||
editor/pixmaps/Makefile
|
||||
|
|
|
|||
|
|
@ -9,3 +9,6 @@
|
|||
- make autoplugging algorithms pluggable
|
||||
|
||||
- make scheduling algorithms pluggable
|
||||
|
||||
- add help functions to traverse the hierarchy
|
||||
- gst_bin_traverse_with_func(GstBin *bin, funcptr)
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
bin_PROGRAMS = autoplug
|
||||
|
||||
LDADD = $(GLIB_LIBS) $(GTK_LIBS) $(top_builddir)/gst/libgst.la
|
||||
INCLUDES = $(GLIB_CFLAGS) $(GTK_CFLAGS) -I$(top_srcdir)
|
||||
LDADD = $(GNOME_LIBS) $(top_builddir)/gst/libgst.la
|
||||
INCLUDES = $(GNOME_CFLAGS)
|
||||
|
|
|
|||
|
|
@ -17,14 +17,14 @@ libgstelements_la_SOURCES = \
|
|||
gstdisksrc.c \
|
||||
gstasyncdisksrc.c \
|
||||
gstfdsrc.c \
|
||||
$(GSTHTTPSRC) \
|
||||
gstaudiosink.c \
|
||||
gstaudiosrc.c \
|
||||
gstfdsink.c \
|
||||
gstpipefilter.c \
|
||||
gstqueue.c \
|
||||
gsttypefind.c \
|
||||
gstsinesrc.c
|
||||
gstsinesrc.c \
|
||||
$(GSTHTTPSRC)
|
||||
|
||||
noinst_HEADERS = \
|
||||
gstfakesrc.h \
|
||||
|
|
|
|||
|
|
@ -244,7 +244,7 @@ gst_asyncdisksrc_get (GstPad *pad)
|
|||
} else
|
||||
GST_BUFFER_SIZE (buf) = src->bytes_per_read;
|
||||
|
||||
GST_DEBUG (0,"map %p, offset %d, size %ld\n", src->map, src->curoffset, GST_BUFFER_SIZE (buf));
|
||||
GST_DEBUG (0,"map %p, offset %ld, size %d\n", src->map, src->curoffset, GST_BUFFER_SIZE (buf));
|
||||
|
||||
//gst_util_dump_mem (GST_BUFFER_DATA (buf), GST_BUFFER_SIZE (buf));
|
||||
|
||||
|
|
@ -303,7 +303,7 @@ gst_asyncdisksrc_get_region (GstPad *pad, gulong offset, gulong size)
|
|||
} else
|
||||
GST_BUFFER_SIZE (buf) = size;
|
||||
|
||||
GST_DEBUG (0,"map %p, offset %d, size %ld\n", src->map, offset, GST_BUFFER_SIZE (buf));
|
||||
GST_DEBUG (0,"map %p, offset %ld, size %d\n", src->map, offset, GST_BUFFER_SIZE (buf));
|
||||
|
||||
/* we're done, return the buffer off now */
|
||||
return buf;
|
||||
|
|
|
|||
|
|
@ -140,7 +140,7 @@ gst_plugin_load_all(void)
|
|||
|
||||
path = _gst_plugin_paths;
|
||||
while (path != NULL) {
|
||||
GST_DEBUG (GST_CAT_PLUGIN_LOADING,"loading plugins from %s\n",path->data);
|
||||
GST_DEBUG (GST_CAT_PLUGIN_LOADING,"loading plugins from %s\n",(gchar *)path->data);
|
||||
gst_plugin_load_recurse(path->data,NULL);
|
||||
path = g_list_next(path);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -22,8 +22,7 @@
|
|||
#define __GST_COLORSPACE_H__
|
||||
|
||||
#include <gdk/gdk.h>
|
||||
#include <gst/gstbuffer.h>
|
||||
#include <gst/gstplugin.h>
|
||||
#include <gst/gst.h>
|
||||
|
||||
#include "yuv2rgb.h"
|
||||
|
||||
|
|
|
|||
|
|
@ -17,10 +17,10 @@
|
|||
* Boston, MA 02111-1307, USA.
|
||||
*/
|
||||
|
||||
//#define DEBUG_ENABLED
|
||||
#include <string.h>
|
||||
|
||||
#include <gst/gst.h>
|
||||
#include <gstcolorspace.h>
|
||||
//#define DEBUG_ENABLED
|
||||
#include "gstcolorspace.h"
|
||||
|
||||
static void gst_colorspace_rgb_to_rgb_identity(GstColorSpaceConverter *space, unsigned char *src, unsigned char *dest);
|
||||
static void gst_colorspace_rgb24_to_bgr24(GstColorSpaceConverter *space, unsigned char *src, unsigned char *dest);
|
||||
|
|
|
|||
|
|
@ -16,7 +16,7 @@ libgstgetbitsinclude_HEADERS = gstgetbits.h
|
|||
|
||||
noinst_HEADERS = gstgetbits.h gstgetbits_inl.h
|
||||
|
||||
bin_PROGRAMS = gbtest
|
||||
check_PROGRAMS = gbtest
|
||||
|
||||
gbtest_SOURCES = gbtest.c
|
||||
gbtest_LDADD = libgstgetbits.la $(top_srcdir)/gst/libgst.la
|
||||
|
|
|
|||
|
|
@ -1,5 +1,3 @@
|
|||
#include <glib.h>
|
||||
|
||||
#include "gstgetbits.h"
|
||||
|
||||
/* Defined in gstgetbits_i386.s */
|
||||
|
|
|
|||
|
|
@ -3,6 +3,8 @@
|
|||
|
||||
#include <stdio.h>
|
||||
|
||||
// getbits is critical, we need to forcibly disable DEBUG
|
||||
#define GST_DEBUG_FORCE_DISABLE
|
||||
#include <gst/gst.h>
|
||||
|
||||
/* disabled for now */
|
||||
|
|
|
|||
|
|
@ -1,5 +1,3 @@
|
|||
#include <glib.h>
|
||||
|
||||
#include "gstgetbits.h"
|
||||
|
||||
unsigned long _gst_getbits_int_cb(gst_getbits_t *gb, unsigned long bits);
|
||||
|
|
@ -52,7 +50,7 @@ unsigned long _gst_get1bit_int(gst_getbits_t *gb, unsigned long bits) {
|
|||
gb->ptr += (gb->bits>>3);
|
||||
gb->bits &= 0x7;
|
||||
|
||||
GST_DEBUG (0,"getbits%d, %08x\n", bits, rval);
|
||||
GST_DEBUG (0,"getbits%ld, %08x\n", bits, rval);
|
||||
return rval>>7;
|
||||
}
|
||||
|
||||
|
|
@ -70,7 +68,7 @@ unsigned long _gst_getbits_int(gst_getbits_t *gb, unsigned long bits) {
|
|||
gb->ptr += (gb->bits>>3);
|
||||
gb->bits &= 0x7;
|
||||
|
||||
GST_DEBUG (0,"getbits%d, %08x\n", bits, rval);
|
||||
GST_DEBUG (0,"getbits%ld, %08lx\n", bits, rval);
|
||||
return rval;
|
||||
}
|
||||
|
||||
|
|
@ -86,7 +84,7 @@ unsigned long _gst_getbits_fast_int(gst_getbits_t *gb, unsigned long bits) {
|
|||
gb->ptr += (gb->bits>>3);
|
||||
gb->bits &= 0x7;
|
||||
|
||||
GST_DEBUG (0,"getbits%d, %08x\n", bits, rval);
|
||||
GST_DEBUG (0,"getbits%ld, %08lx\n", bits, rval);
|
||||
return rval;
|
||||
}
|
||||
|
||||
|
|
@ -99,7 +97,7 @@ unsigned long _gst_showbits_int(gst_getbits_t *gb, unsigned long bits) {
|
|||
rval <<= gb->bits;
|
||||
rval >>= (32-bits);
|
||||
|
||||
GST_DEBUG (0,"showbits%d, %08x\n", bits, rval);
|
||||
GST_DEBUG (0,"showbits%ld, %08lx\n", bits, rval);
|
||||
return rval;
|
||||
}
|
||||
|
||||
|
|
@ -107,7 +105,7 @@ void _gst_flushbits_int(gst_getbits_t *gb, unsigned long bits) {
|
|||
gb->bits += bits;
|
||||
gb->ptr += (gb->bits>>3);
|
||||
gb->bits &= 0x7;
|
||||
GST_DEBUG (0,"flushbits%d\n", bits);
|
||||
GST_DEBUG (0,"flushbits%ld\n", bits);
|
||||
}
|
||||
|
||||
void _gst_getbits_back_int(gst_getbits_t *gb, unsigned long bits) {
|
||||
|
|
|
|||
|
|
@ -19,7 +19,7 @@ libgstidct_la_SOURCES = \
|
|||
libgstidctincludedir = $(includedir)/gst/libs/gstidct
|
||||
libgstidctinclude_HEADERS = gstidct.h
|
||||
|
||||
bin_PROGRAMS = ieeetest
|
||||
check_PROGRAMS = ieeetest
|
||||
|
||||
ieeetest_SOURCES = ieeetest.c
|
||||
ieeetest_LDADD = libgstidct.la $(GLIB_LIBS) $(GTK_LIBS) $(top_srcdir)/gst/libgst.la
|
||||
|
|
|
|||
|
|
@ -17,10 +17,10 @@
|
|||
* Boston, MA 02111-1307, USA.
|
||||
*/
|
||||
|
||||
#include <string.h>
|
||||
|
||||
//#define DEBUG_ENABLED
|
||||
#include <gst/gst.h>
|
||||
#include <gstriff.h>
|
||||
#include "gstriff.h"
|
||||
|
||||
#define GST_RIFF_ENCODER_BUF_SIZE 1024
|
||||
|
||||
|
|
|
|||
|
|
@ -17,8 +17,9 @@
|
|||
* Boston, MA 02111-1307, USA.
|
||||
*/
|
||||
|
||||
#include <string.h>
|
||||
|
||||
//#define DEBUG_ENABLED
|
||||
#include <gst/gst.h>
|
||||
#include <gstriff.h>
|
||||
|
||||
GstRiff*
|
||||
|
|
@ -124,7 +125,7 @@ gst_riff_parser_next_buffer (GstRiff *riff, GstBuffer *buf, gulong off)
|
|||
|
||||
if (riff->nextlikely & 0x01) riff->nextlikely++;
|
||||
|
||||
GST_DEBUG (0,"gst_riff_parser: next 0x%08x last 0x%08lx offset %08x\n",riff->nextlikely, last, off);
|
||||
GST_DEBUG (0,"gst_riff_parser: next 0x%08x last 0x%08lx offset %08lx\n",riff->nextlikely, last, off);
|
||||
/* loop while the next likely chunk header is in this buffer */
|
||||
while ((riff->nextlikely+12) <= last) {
|
||||
gulong *words = (gulong *)((guchar *)GST_BUFFER_DATA(buf) + riff->nextlikely - off );
|
||||
|
|
@ -198,7 +199,7 @@ gst_riff_parser_next_buffer (GstRiff *riff, GstBuffer *buf, gulong off)
|
|||
}
|
||||
if ((riff->nextlikely+12) > last && !riff->incomplete_chunk) {
|
||||
guint left = last - riff->nextlikely;
|
||||
GST_DEBUG (0,"gst_riff_parser: not enough data next 0x%08x last 0x%08lx %08x %08x\n",riff->nextlikely,
|
||||
GST_DEBUG (0,"gst_riff_parser: not enough data next 0x%08x last 0x%08lx %08x %08lx\n",riff->nextlikely,
|
||||
last, left, off);
|
||||
|
||||
riff->dataleft = g_malloc(left);
|
||||
|
|
|
|||
|
|
@ -18,11 +18,11 @@
|
|||
*/
|
||||
|
||||
//#define DEBUG_ENABLED
|
||||
#include <stdlib.h>
|
||||
#include <math.h>
|
||||
|
||||
#include <gst/gst.h>
|
||||
|
||||
#include <gstvideoscale.h>
|
||||
#include "gstvideoscale.h"
|
||||
//FIXME
|
||||
#include <gst/meta/videoraw.h>
|
||||
|
||||
static void gst_videoscale_scale_yuv(GstVideoScale *scale, unsigned char *src, unsigned char *dest);
|
||||
|
|
@ -281,7 +281,7 @@ static void generate_rowbytes(unsigned char *copy_row, int src_w, int dst_w, int
|
|||
pos += inc;
|
||||
}
|
||||
*eip++ = RETURN;
|
||||
GST_DEBUG (0,"scaler start/end %p %p %p\n", copy_row, eip, eip-copy_row);
|
||||
GST_DEBUG (0,"scaler start/end %p %p %p\n", copy_row, eip, (void*)(eip-copy_row));
|
||||
}
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -17,14 +17,14 @@ libgstelements_la_SOURCES = \
|
|||
gstdisksrc.c \
|
||||
gstasyncdisksrc.c \
|
||||
gstfdsrc.c \
|
||||
$(GSTHTTPSRC) \
|
||||
gstaudiosink.c \
|
||||
gstaudiosrc.c \
|
||||
gstfdsink.c \
|
||||
gstpipefilter.c \
|
||||
gstqueue.c \
|
||||
gsttypefind.c \
|
||||
gstsinesrc.c
|
||||
gstsinesrc.c \
|
||||
$(GSTHTTPSRC)
|
||||
|
||||
noinst_HEADERS = \
|
||||
gstfakesrc.h \
|
||||
|
|
|
|||
|
|
@ -244,7 +244,7 @@ gst_asyncdisksrc_get (GstPad *pad)
|
|||
} else
|
||||
GST_BUFFER_SIZE (buf) = src->bytes_per_read;
|
||||
|
||||
GST_DEBUG (0,"map %p, offset %d, size %ld\n", src->map, src->curoffset, GST_BUFFER_SIZE (buf));
|
||||
GST_DEBUG (0,"map %p, offset %ld, size %d\n", src->map, src->curoffset, GST_BUFFER_SIZE (buf));
|
||||
|
||||
//gst_util_dump_mem (GST_BUFFER_DATA (buf), GST_BUFFER_SIZE (buf));
|
||||
|
||||
|
|
@ -303,7 +303,7 @@ gst_asyncdisksrc_get_region (GstPad *pad, gulong offset, gulong size)
|
|||
} else
|
||||
GST_BUFFER_SIZE (buf) = size;
|
||||
|
||||
GST_DEBUG (0,"map %p, offset %d, size %ld\n", src->map, offset, GST_BUFFER_SIZE (buf));
|
||||
GST_DEBUG (0,"map %p, offset %ld, size %d\n", src->map, offset, GST_BUFFER_SIZE (buf));
|
||||
|
||||
/* we're done, return the buffer off now */
|
||||
return buf;
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
bin_PROGRAMS = autoplug
|
||||
|
||||
LDADD = $(GLIB_LIBS) $(GTK_LIBS) $(top_builddir)/gst/libgst.la
|
||||
INCLUDES = $(GLIB_CFLAGS) $(GTK_CFLAGS) -I$(top_srcdir)
|
||||
LDADD = $(GNOME_LIBS) $(top_builddir)/gst/libgst.la
|
||||
INCLUDES = $(GNOME_CFLAGS)
|
||||
|
|
|
|||
Loading…
Reference in a new issue