Menu
▾
▴
[gaim-vv-commits] CVS: gst-h263packetdec/src Makefile,1.1.1.1,1.2 Makefile.in,1.1.1.1,1.2 gsth263packetdec.c,1.1.1.1,1.2 gsth263packetdec.h,1.1.1.1,1.2
|
From: Zhanglei W. <fil...@us...> - 2004-08-13 05:13:40
|
Update of /cvsroot/gaim-vv/gst-h263packetdec/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16638/src Modified Files: Makefile Makefile.in gsth263packetdec.c gsth263packetdec.h Log Message: started to work on it Index: Makefile =================================================================== RCS file: /cvsroot/gaim-vv/gst-h263packetdec/src/Makefile,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -d -p -r1.1.1.1 -r1.2 --- Makefile 12 Aug 2004 04:10:44 -0000 1.1.1.1 +++ Makefile 13 Aug 2004 05:13:28 -0000 1.2 @@ -1,6 +1,7 @@ -# Makefile.in generated automatically by automake 1.5 from Makefile.am. +# Makefile.in generated by automake 1.6.3 from Makefile.am. +# src/Makefile. Generated from Makefile.in by configure. -# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001 +# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002 # Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -14,15 +15,12 @@ # plugindir is set in configure - -# change libgstplugin.la to something more suitable - SHELL = /bin/sh srcdir = . top_srcdir = .. -prefix = /usr/local +prefix = /usr exec_prefix = ${prefix} bindir = ${exec_prefix}/bin @@ -42,14 +40,18 @@ pkglibdir = $(libdir)/gst-plugin pkgincludedir = $(includedir)/gst-plugin top_builddir = .. -ACLOCAL = aclocal -AUTOCONF = autoconf -AUTOMAKE = automake -AUTOHEADER = ${SHELL} /home/aeyakovenko/projects/gst-template/gst-plugin/missing --run autoheader +ACLOCAL = ${SHELL} /linuette/src/gst-h263packetdec/missing --run aclocal-1.6 +AUTOCONF = ${SHELL} /linuette/src/gst-h263packetdec/missing --run autoconf +AUTOMAKE = ${SHELL} /linuette/src/gst-h263packetdec/missing --run automake-1.6 +AUTOHEADER = ${SHELL} /linuette/src/gst-h263packetdec/missing --run autoheader -INSTALL = /bin/install -c +am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +INSTALL = /usr/bin/install -c INSTALL_PROGRAM = ${INSTALL} INSTALL_DATA = ${INSTALL} -m 644 +install_sh_DATA = $(install_sh) -c -m 644 +install_sh_PROGRAM = $(install_sh) -c +install_sh_SCRIPT = $(install_sh) -c INSTALL_SCRIPT = ${INSTALL} INSTALL_HEADER = $(INSTALL_DATA) transform = s,x,x, @@ -61,28 +63,30 @@ PRE_UNINSTALL = : POST_UNINSTALL = : host_alias = host_triplet = i686-pc-linux-gnu + +EXEEXT = +OBJEXT = o +PATH_SEPARATOR = : ACLOCAL_AMFLAGS = -I m4 -AMTAR = ${SHELL} /home/aeyakovenko/projects/gst-template/gst-plugin/missing --run tar +AMTAR = ${SHELL} /linuette/src/gst-h263packetdec/missing --run tar AS = @AS@ AWK = gawk CC = gcc DEPDIR = .deps DLLTOOL = @DLLTOOL@ ECHO = echo -EXEEXT = GST_CFLAGS = -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -pthread -I/usr/include/gstreamer-0.8 -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/libxml2 -GST_LIBS = -Wl,--export-dynamic -pthread -lgstcontrol-0.8 -lgstreamer-0.8 -lgobject-2.0 -lgmodule-2.0 -ldl -lgthread-2.0 -lxml2 -lpthread -lz -lm -lglib-2.0 +GST_LIBS = -Wl,--export-dynamic -pthread -lgstcontrol-0.8 -lgstreamer-0.8 -lgobject-2.0 -lgmodule-2.0 -ldl -lgthread-2.0 -lxml2 -lz -lm -lglib-2.0 GST_LIBS_CFLAGS = -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -pthread -I/usr/include/gstreamer-0.8 -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/libxml2 -GST_LIBS_LIBS = -Wl,--export-dynamic -pthread -lgstreamer-0.8 -lgobject-2.0 -lgmodule-2.0 -ldl -lgthread-2.0 -lxml2 -lpthread -lz -lm -lglib-2.0 +GST_LIBS_LIBS = -Wl,--export-dynamic -pthread -lgstreamer-0.8 -lgobject-2.0 -lgmodule-2.0 -ldl -lgthread-2.0 -lxml2 -lz -lm -lglib-2.0 GST_MAJORMINOR = 0.8 GST_PLUGIN_LDFLAGS = -module -avoid-version -export-symbols-regex _*\(gst_\|Gst\|GST_\).* HAVE_PKGCONFIG = yes INSTALL_STRIP_PROGRAM = ${SHELL} $(install_sh) -c -s LIBTOOL = $(SHELL) $(top_builddir)/libtool LN_S = ln -s -MAINT = +MAINT = # OBJDUMP = @OBJDUMP@ -OBJEXT = o PACKAGE = gst-plugin PKG_CONFIG = /usr/bin/pkg-config RANLIB = ranlib @@ -90,9 +94,10 @@ STRIP = strip VERSION = 0.1.1.1 am__include = include am__quote = -install_sh = /home/aeyakovenko/projects/gst-template/gst-plugin/install-sh +install_sh = /linuette/src/gst-h263packetdec/install-sh plugindir = $(libdir)/gstreamer-0.8 +# change libgstplugin.la to something more suitable plugin_LTLIBRARIES = libgsth263packetdec.la # for the next set of variables, rename the prefix if you renamed the .la @@ -118,14 +123,15 @@ am_libgsth263packetdec_la_OBJECTS = \ libgsth263packetdec_la-gsth263packetdec.lo libgsth263packetdec_la_OBJECTS = $(am_libgsth263packetdec_la_OBJECTS) -DEFS = -DPACKAGE_NAME=\"\" -DPACKAGE_TARNAME=\"\" -DPACKAGE_VERSION=\"\" -DPACKAGE_STRING=\"\" -DPACKAGE_BUGREPORT=\"\" -DGST_PLUGIN_VERSION=\"0.1.1.1\" -DGST_PLUGIN_VERSION_RELEASE=\"20040630_145341\" -DPACKAGE=\"gst-plugin\" -DVERSION=\"0.1.1.1\" -DPACKAGE=\"gst-plugin\" -DVERSION=\"0.1.1.1\" -DSTDC_HEADERS=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_SYS_STAT_H=1 -DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1 -DHAVE_MEMORY_H=1 -DHAVE_STRINGS_H=1 -DHAVE_INTTYPES_H=1 -DHAVE_STDINT_H=1 -DHAVE_UNISTD_H=1 -DHAVE_DLFCN_H=1 +DEFS = -DPACKAGE_NAME=\"\" -DPACKAGE_TARNAME=\"\" -DPACKAGE_VERSION=\"\" -DPACKAGE_STRING=\"\" -DPACKAGE_BUGREPORT=\"\" -DGST_PLUGIN_VERSION=\"0.1.1.1\" -DGST_PLUGIN_VERSION_RELEASE=\"20040813_010535\" -DPACKAGE=\"gst-plugin\" -DVERSION=\"0.1.1.1\" -DPACKAGE=\"gst-plugin\" -DVERSION=\"0.1.1.1\" -DSTDC_HEADERS=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_SYS_STAT_H=1 -DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1 -DHAVE_MEMORY_H=1 -DHAVE_STRINGS_H=1 -DHAVE_INTTYPES_H=1 -DHAVE_STDINT_H=1 -DHAVE_UNISTD_H=1 -DHAVE_DLFCN_H=1 DEFAULT_INCLUDES = -I. -I$(srcdir) CPPFLAGS = LDFLAGS = LIBS = depcomp = $(SHELL) $(top_srcdir)/depcomp +am__depfiles_maybe = depfiles DEP_FILES = \ - $(DEPDIR)/libgsth263packetdec_la-gsth263packetdec.Plo + ./$(DEPDIR)/libgsth263packetdec_la-gsth263packetdec.Plo COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \ @@ -144,41 +150,39 @@ all: all-am .SUFFIXES: .SUFFIXES: .c .lo .o .obj - -mostlyclean-libtool: - -rm -f *.lo - -clean-libtool: - -rm -rf .libs _libs - -distclean-libtool: - -rm -f libtool -$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.ac $(ACLOCAL_M4) +$(srcdir)/Makefile.in: # Makefile.am $(top_srcdir)/configure.ac $(ACLOCAL_M4) cd $(top_srcdir) && \ $(AUTOMAKE) --gnu src/Makefile -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status - cd $(top_builddir) && \ - CONFIG_HEADERS= CONFIG_LINKS= \ - CONFIG_FILES=$(subdir)/$@ $(SHELL) ./config.status +Makefile: # $(srcdir)/Makefile.in $(top_builddir)/config.status + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) +pluginLTLIBRARIES_INSTALL = $(INSTALL) install-pluginLTLIBRARIES: $(plugin_LTLIBRARIES) @$(NORMAL_INSTALL) $(mkinstalldirs) $(DESTDIR)$(plugindir) @list='$(plugin_LTLIBRARIES)'; for p in $$list; do \ if test -f $$p; then \ - echo " $(LIBTOOL) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(plugindir)/$$p"; \ - $(LIBTOOL) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(plugindir)/$$p; \ + f="`echo $$p | sed -e 's|^.*/||'`"; \ + echo " $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(plugindir)/$$f"; \ + $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(plugindir)/$$f; \ else :; fi; \ done uninstall-pluginLTLIBRARIES: @$(NORMAL_UNINSTALL) @list='$(plugin_LTLIBRARIES)'; for p in $$list; do \ + p="`echo $$p | sed -e 's|^.*/||'`"; \ echo " $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(plugindir)/$$p"; \ $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(plugindir)/$$p; \ done clean-pluginLTLIBRARIES: -test -z "$(plugin_LTLIBRARIES)" || rm -f $(plugin_LTLIBRARIES) + @list='$(plugin_LTLIBRARIES)'; for p in $$list; do \ + dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ + test -z "$dir" && dir=.; \ + echo "rm -f \"$${dir}/so_locations\""; \ + rm -f "$${dir}/so_locations"; \ + done libgsth263packetdec_la-gsth263packetdec.lo: gsth263packetdec.c libgsth263packetdec.la: $(libgsth263packetdec_la_OBJECTS) $(libgsth263packetdec_la_DEPENDENCIES) $(LINK) -rpath $(plugindir) $(libgsth263packetdec_la_LDFLAGS) $(libgsth263packetdec_la_OBJECTS) $(libgsth263packetdec_la_LIBADD) $(LIBS) @@ -189,16 +193,16 @@ mostlyclean-compile: distclean-compile: -rm -f *.tab.c -include $(DEPDIR)/libgsth263packetdec_la-gsth263packetdec.Plo +include ./$(DEPDIR)/libgsth263packetdec_la-gsth263packetdec.Plo distclean-depend: - -rm -rf $(DEPDIR) + -rm -rf ./$(DEPDIR) .c.o: source='$<' object='$@' libtool=no \ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' \ $(CCDEPMODE) $(depcomp) \ - $(COMPILE) -c `test -f $< || echo '$(srcdir)/'`$< + $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$< .c.obj: source='$<' object='$@' libtool=no \ @@ -210,13 +214,13 @@ distclean-depend: source='$<' object='$@' libtool=yes \ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' \ $(CCDEPMODE) $(depcomp) \ - $(LTCOMPILE) -c -o $@ `test -f $< || echo '$(srcdir)/'`$< + $(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$< libgsth263packetdec_la-gsth263packetdec.o: gsth263packetdec.c source='gsth263packetdec.c' object='libgsth263packetdec_la-gsth263packetdec.o' libtool=no \ depfile='$(DEPDIR)/libgsth263packetdec_la-gsth263packetdec.Po' tmpdepfile='$(DEPDIR)/libgsth263packetdec_la-gsth263packetdec.TPo' \ $(CCDEPMODE) $(depcomp) \ - $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgsth263packetdec_la_CFLAGS) $(CFLAGS) -c -o libgsth263packetdec_la-gsth263packetdec.o `test -f gsth263packetdec.c || echo '$(srcdir)/'`gsth263packetdec.c + $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgsth263packetdec_la_CFLAGS) $(CFLAGS) -c -o libgsth263packetdec_la-gsth263packetdec.o `test -f 'gsth263packetdec.c' || echo '$(srcdir)/'`gsth263packetdec.c libgsth263packetdec_la-gsth263packetdec.obj: gsth263packetdec.c source='gsth263packetdec.c' object='libgsth263packetdec_la-gsth263packetdec.obj' libtool=no \ @@ -228,57 +232,74 @@ libgsth263packetdec_la-gsth263packetdec. source='gsth263packetdec.c' object='libgsth263packetdec_la-gsth263packetdec.lo' libtool=yes \ depfile='$(DEPDIR)/libgsth263packetdec_la-gsth263packetdec.Plo' tmpdepfile='$(DEPDIR)/libgsth263packetdec_la-gsth263packetdec.TPlo' \ $(CCDEPMODE) $(depcomp) \ - $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgsth263packetdec_la_CFLAGS) $(CFLAGS) -c -o libgsth263packetdec_la-gsth263packetdec.lo `test -f gsth263packetdec.c || echo '$(srcdir)/'`gsth263packetdec.c + $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgsth263packetdec_la_CFLAGS) $(CFLAGS) -c -o libgsth263packetdec_la-gsth263packetdec.lo `test -f 'gsth263packetdec.c' || echo '$(srcdir)/'`gsth263packetdec.c CCDEPMODE = depmode=gcc3 + +mostlyclean-libtool: + -rm -f *.lo + +clean-libtool: + -rm -rf .libs _libs + +distclean-libtool: + -rm -f libtool uninstall-info-am: +ETAGS = etags +ETAGSFLAGS = + tags: TAGS ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(TAGS_FILES)'; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ $(AWK) ' { files[$$0] = 1; } \ END { for (i in files) print i; }'`; \ - mkid -fID $$unique $(LISP) + mkid -fID $$unique TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(TAGS_FILES)'; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ $(AWK) ' { files[$$0] = 1; } \ END { for (i in files) print i; }'`; \ - test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \ - || etags $(ETAGS_ARGS) $$tags $$unique $(LISP) + test -z "$(ETAGS_ARGS)$$tags$$unique" \ + || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + $$tags $$unique GTAGS: - here=`CDPATH=: && cd $(top_builddir) && pwd` \ + here=`$(am__cd) $(top_builddir) && pwd` \ && cd $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) $$here distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH - DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) top_distdir = .. distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) distdir: $(DISTFILES) - @for file in $(DISTFILES); do \ - if test -f $$file; then d=.; else d=$(srcdir); fi; \ + @list='$(DISTFILES)'; for file in $$list; do \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ if test "$$dir" != "$$file" && test "$$dir" != "."; then \ - $(mkinstalldirs) "$(distdir)/$$dir"; \ + dir="/$$dir"; \ + $(mkinstalldirs) "$(distdir)$$dir"; \ + else \ + dir=''; \ fi; \ if test -d $$d/$$file; then \ - cp -pR $$d/$$file $(distdir) \ - || exit 1; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ + fi; \ + cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ else \ test -f $(distdir)/$$file \ || cp -p $$d/$$file $(distdir)/$$file \ @@ -303,6 +324,7 @@ install-am: all-am installcheck: installcheck-am install-strip: $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + INSTALL_STRIP_FLAG=-s \ `test -z '$(STRIP)' || \ echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install mostlyclean-generic: @@ -310,7 +332,7 @@ mostlyclean-generic: clean-generic: distclean-generic: - -rm -f Makefile $(CONFIG_CLEAN_FILES) stamp-h stamp-h[0-9]* + -rm -f Makefile $(CONFIG_CLEAN_FILES) maintainer-clean-generic: @echo "This command is intended for maintainers to use" Index: Makefile.in =================================================================== RCS file: /cvsroot/gaim-vv/gst-h263packetdec/src/Makefile.in,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -d -p -r1.1.1.1 -r1.2 --- Makefile.in 12 Aug 2004 04:10:44 -0000 1.1.1.1 +++ Makefile.in 13 Aug 2004 05:13:28 -0000 1.2 @@ -1,6 +1,7 @@ -# Makefile.in generated automatically by automake 1.5 from Makefile.am. +# Makefile.in generated by automake 1.6.3 from Makefile.am. +# @configure_input@ -# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001 +# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002 # Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -14,9 +15,6 @@ @SET_MAKE@ # plugindir is set in configure - -# change libgstplugin.la to something more suitable - SHELL = @SHELL@ srcdir = @srcdir@ @@ -47,9 +45,13 @@ AUTOCONF = @AUTOCONF@ AUTOMAKE = @AUTOMAKE@ AUTOHEADER = @AUTOHEADER@ +am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd INSTALL = @INSTALL@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_DATA = @INSTALL_DATA@ +install_sh_DATA = $(install_sh) -c -m 644 +install_sh_PROGRAM = $(install_sh) -c +install_sh_SCRIPT = $(install_sh) -c INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_HEADER = $(INSTALL_DATA) transform = @program_transform_name@ @@ -61,6 +63,10 @@ PRE_UNINSTALL = : POST_UNINSTALL = : host_alias = @host_alias@ host_triplet = @host@ + +EXEEXT = @EXEEXT@ +OBJEXT = @OBJEXT@ +PATH_SEPARATOR = @PATH_SEPARATOR@ ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@ AMTAR = @AMTAR@ AS = @AS@ @@ -69,7 +75,6 @@ CC = @CC@ DEPDIR = @DEPDIR@ DLLTOOL = @DLLTOOL@ ECHO = @ECHO@ -EXEEXT = @EXEEXT@ GST_CFLAGS = @GST_CFLAGS@ GST_LIBS = @GST_LIBS@ GST_LIBS_CFLAGS = @GST_LIBS_CFLAGS@ @@ -82,7 +87,6 @@ LIBTOOL = @LIBTOOL@ LN_S = @LN_S@ MAINT = @MAINT@ OBJDUMP = @OBJDUMP@ -OBJEXT = @OBJEXT@ PACKAGE = @PACKAGE@ PKG_CONFIG = @PKG_CONFIG@ RANLIB = @RANLIB@ @@ -93,6 +97,7 @@ am__quote = @am__quote@ install_sh = @install_sh@ plugindir = @plugindir@ +# change libgstplugin.la to something more suitable plugin_LTLIBRARIES = libgsth263packetdec.la # for the next set of variables, rename the prefix if you renamed the .la @@ -124,8 +129,9 @@ CPPFLAGS = @CPPFLAGS@ LDFLAGS = @LDFLAGS@ LIBS = @LIBS@ depcomp = $(SHELL) $(top_srcdir)/depcomp +am__depfiles_maybe = depfiles @AMDEP_TRUE@DEP_FILES = \ -@AMDEP_TRUE@ $(DEPDIR)/libgsth263packetdec_la-gsth263packetdec.Plo +@AMDEP_TRUE@ ./$(DEPDIR)/libgsth263packetdec_la-gsth263packetdec.Plo COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \ @@ -144,41 +150,39 @@ all: all-am .SUFFIXES: .SUFFIXES: .c .lo .o .obj - -mostlyclean-libtool: - -rm -f *.lo - -clean-libtool: - -rm -rf .libs _libs - -distclean-libtool: - -rm -f libtool $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.ac $(ACLOCAL_M4) cd $(top_srcdir) && \ $(AUTOMAKE) --gnu src/Makefile Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status - cd $(top_builddir) && \ - CONFIG_HEADERS= CONFIG_LINKS= \ - CONFIG_FILES=$(subdir)/$@ $(SHELL) ./config.status + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) +pluginLTLIBRARIES_INSTALL = $(INSTALL) install-pluginLTLIBRARIES: $(plugin_LTLIBRARIES) @$(NORMAL_INSTALL) $(mkinstalldirs) $(DESTDIR)$(plugindir) @list='$(plugin_LTLIBRARIES)'; for p in $$list; do \ if test -f $$p; then \ - echo " $(LIBTOOL) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(plugindir)/$$p"; \ - $(LIBTOOL) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(plugindir)/$$p; \ + f="`echo $$p | sed -e 's|^.*/||'`"; \ + echo " $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(plugindir)/$$f"; \ + $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(plugindir)/$$f; \ else :; fi; \ done uninstall-pluginLTLIBRARIES: @$(NORMAL_UNINSTALL) @list='$(plugin_LTLIBRARIES)'; for p in $$list; do \ + p="`echo $$p | sed -e 's|^.*/||'`"; \ echo " $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(plugindir)/$$p"; \ $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(plugindir)/$$p; \ done clean-pluginLTLIBRARIES: -test -z "$(plugin_LTLIBRARIES)" || rm -f $(plugin_LTLIBRARIES) + @list='$(plugin_LTLIBRARIES)'; for p in $$list; do \ + dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ + test -z "$dir" && dir=.; \ + echo "rm -f \"$${dir}/so_locations\""; \ + rm -f "$${dir}/so_locations"; \ + done libgsth263packetdec_la-gsth263packetdec.lo: gsth263packetdec.c libgsth263packetdec.la: $(libgsth263packetdec_la_OBJECTS) $(libgsth263packetdec_la_DEPENDENCIES) $(LINK) -rpath $(plugindir) $(libgsth263packetdec_la_LDFLAGS) $(libgsth263packetdec_la_OBJECTS) $(libgsth263packetdec_la_LIBADD) $(LIBS) @@ -189,16 +193,16 @@ mostlyclean-compile: distclean-compile: -rm -f *.tab.c -@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/libgsth263packetdec_la-gsth263packetdec.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgsth263packetdec_la-gsth263packetdec.Plo@am__quote@ distclean-depend: - -rm -rf $(DEPDIR) + -rm -rf ./$(DEPDIR) .c.o: @AMDEP_TRUE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ @AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ - $(COMPILE) -c `test -f $< || echo '$(srcdir)/'`$< + $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$< .c.obj: @AMDEP_TRUE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @@ -210,13 +214,13 @@ distclean-depend: @AMDEP_TRUE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@ @AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ - $(LTCOMPILE) -c -o $@ `test -f $< || echo '$(srcdir)/'`$< + $(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$< libgsth263packetdec_la-gsth263packetdec.o: gsth263packetdec.c @AMDEP_TRUE@ source='gsth263packetdec.c' object='libgsth263packetdec_la-gsth263packetdec.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@ depfile='$(DEPDIR)/libgsth263packetdec_la-gsth263packetdec.Po' tmpdepfile='$(DEPDIR)/libgsth263packetdec_la-gsth263packetdec.TPo' @AMDEPBACKSLASH@ @AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ - $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgsth263packetdec_la_CFLAGS) $(CFLAGS) -c -o libgsth263packetdec_la-gsth263packetdec.o `test -f gsth263packetdec.c || echo '$(srcdir)/'`gsth263packetdec.c + $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgsth263packetdec_la_CFLAGS) $(CFLAGS) -c -o libgsth263packetdec_la-gsth263packetdec.o `test -f 'gsth263packetdec.c' || echo '$(srcdir)/'`gsth263packetdec.c libgsth263packetdec_la-gsth263packetdec.obj: gsth263packetdec.c @AMDEP_TRUE@ source='gsth263packetdec.c' object='libgsth263packetdec_la-gsth263packetdec.obj' libtool=no @AMDEPBACKSLASH@ @@ -228,57 +232,74 @@ libgsth263packetdec_la-gsth263packetdec. @AMDEP_TRUE@ source='gsth263packetdec.c' object='libgsth263packetdec_la-gsth263packetdec.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@ depfile='$(DEPDIR)/libgsth263packetdec_la-gsth263packetdec.Plo' tmpdepfile='$(DEPDIR)/libgsth263packetdec_la-gsth263packetdec.TPlo' @AMDEPBACKSLASH@ @AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ - $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgsth263packetdec_la_CFLAGS) $(CFLAGS) -c -o libgsth263packetdec_la-gsth263packetdec.lo `test -f gsth263packetdec.c || echo '$(srcdir)/'`gsth263packetdec.c + $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgsth263packetdec_la_CFLAGS) $(CFLAGS) -c -o libgsth263packetdec_la-gsth263packetdec.lo `test -f 'gsth263packetdec.c' || echo '$(srcdir)/'`gsth263packetdec.c CCDEPMODE = @CCDEPMODE@ + +mostlyclean-libtool: + -rm -f *.lo + +clean-libtool: + -rm -rf .libs _libs + +distclean-libtool: + -rm -f libtool uninstall-info-am: +ETAGS = etags +ETAGSFLAGS = + tags: TAGS ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(TAGS_FILES)'; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ $(AWK) ' { files[$$0] = 1; } \ END { for (i in files) print i; }'`; \ - mkid -fID $$unique $(LISP) + mkid -fID $$unique TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(TAGS_FILES)'; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ $(AWK) ' { files[$$0] = 1; } \ END { for (i in files) print i; }'`; \ - test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \ - || etags $(ETAGS_ARGS) $$tags $$unique $(LISP) + test -z "$(ETAGS_ARGS)$$tags$$unique" \ + || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + $$tags $$unique GTAGS: - here=`CDPATH=: && cd $(top_builddir) && pwd` \ + here=`$(am__cd) $(top_builddir) && pwd` \ && cd $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) $$here distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH - DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) top_distdir = .. distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) distdir: $(DISTFILES) - @for file in $(DISTFILES); do \ - if test -f $$file; then d=.; else d=$(srcdir); fi; \ + @list='$(DISTFILES)'; for file in $$list; do \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ if test "$$dir" != "$$file" && test "$$dir" != "."; then \ - $(mkinstalldirs) "$(distdir)/$$dir"; \ + dir="/$$dir"; \ + $(mkinstalldirs) "$(distdir)$$dir"; \ + else \ + dir=''; \ fi; \ if test -d $$d/$$file; then \ - cp -pR $$d/$$file $(distdir) \ - || exit 1; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ + fi; \ + cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ else \ test -f $(distdir)/$$file \ || cp -p $$d/$$file $(distdir)/$$file \ @@ -303,6 +324,7 @@ install-am: all-am installcheck: installcheck-am install-strip: $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + INSTALL_STRIP_FLAG=-s \ `test -z '$(STRIP)' || \ echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install mostlyclean-generic: @@ -310,7 +332,7 @@ mostlyclean-generic: clean-generic: distclean-generic: - -rm -f Makefile $(CONFIG_CLEAN_FILES) stamp-h stamp-h[0-9]* + -rm -f Makefile $(CONFIG_CLEAN_FILES) maintainer-clean-generic: @echo "This command is intended for maintainers to use" Index: gsth263packetdec.c =================================================================== RCS file: /cvsroot/gaim-vv/gst-h263packetdec/src/gsth263packetdec.c,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -d -p -r1.1.1.1 -r1.2 --- gsth263packetdec.c 12 Aug 2004 04:10:44 -0000 1.1.1.1 +++ gsth263packetdec.c 13 Aug 2004 05:13:28 -0000 1.2 @@ -51,7 +51,7 @@ GST_STATIC_PAD_TEMPLATE ( "src", GST_PAD_SRC, GST_PAD_ALWAYS, - GST_STATIC_CAPS ("ANY") + GST_STATIC_CAPS ("video/x-h263") ); static void gst_h263packetdec_class_init (GstH263PacketDecClass *klass); @@ -183,6 +183,114 @@ gst_h263packetdec_init (GstH263PacketDec filter->silent = FALSE; } +static void Restart_buffering(GstH263PacketDec *filter) +{ + filter->int_ptr = 0; + filter->last_ebit = 0; + filter->buf_started = 0; + //printf("restart buffering...\n"); +} + +#define RTP_FIXED_HEADER_SIZE 0 +static unsigned int BufferData(GstH263PacketDec *filter, unsigned char ** ret_buf, unsigned char * data, int len, int markbit) +{ + if (len==0) + { + return 0; + } + + unsigned char payload_hdr0 = data[RTP_FIXED_HEADER_SIZE+0]; + + unsigned char payload_hdr1 = data[RTP_FIXED_HEADER_SIZE+1]; + unsigned char payload_hdr2 = data[RTP_FIXED_HEADER_SIZE+2]; + unsigned char payload_hdr3 = data[RTP_FIXED_HEADER_SIZE+3]; + unsigned char ebit = payload_hdr0 & 0x07; + unsigned char sbit = (payload_hdr0 & 0x38)>>3; + int Mode_hdr = RTP_FIXED_HEADER_SIZE + ( (payload_hdr0 &0x80)==0 ? 4 : 8 ) + (sbit>0); //Mode A or Mode B + unsigned int data_len; + + if ( markbit ) //marked frame + { + //printf("marked packet, size = %d\n", len); + if ( filter->buf_started && payload_hdr3 == filter->cur_ref && + ( ((sbit + filter->last_ebit) & 7) == 0 ) + ) //it is what we are expecting + { + memcpy(filter->int_buf + filter->int_ptr, + data + Mode_hdr, + len - Mode_hdr ); + *ret_buf = filter->int_buf; + data_len = filter->int_ptr + len - Mode_hdr; + Restart_buffering(filter); + //printf("buffering started, frame size = %d\n", data_len); + return data_len; + } + else //not what we are expecting + { + Restart_buffering(filter); + if ( (payload_hdr0 &0x38)==0 ) //complete frame. 0x38 = 0011 1000b, test SBIT + { + data_len = len - Mode_hdr; + *ret_buf = data + Mode_hdr; + //callback here + //printf("complete frame. size = %d\n", data_len); + return data_len; + } + else + { + //printf("not continuous fragment, drop it.\n"); + return 0; + } + } + } + else //handle unmarked packet + { + printf("unmarked frame, size = %d\n", len); + if (!filter->buf_started) //buffering not started. + { + if ( (payload_hdr0 &0x38)!=0 ) //not the 1st fragment, drop it + { + printf("not the 1st fragment, drop it.\n"); + return 0; + } + else //1st fragment, start buffering + { + filter->cur_ref = payload_hdr3; //start buffering + memcpy(filter->int_buf, + data + Mode_hdr, + len - Mode_hdr ); + filter->int_ptr = len - Mode_hdr; + filter->last_ebit = ebit; + filter->buf_started = 1; +// printf("1st packet, start buffering, cur_ref=%d, size = %d\n", cur_ref, int_ptr); + return 0; + } //end of 1st fragment checking + } + else //buffering has started. + { + if (payload_hdr3==filter->cur_ref && + ( ((sbit + filter->last_ebit) & 7) == 0 ) + ) + { + memcpy(filter->int_buf + filter->int_ptr, + data + Mode_hdr, + len - Mode_hdr ); + filter->int_ptr += len - Mode_hdr; + filter->last_ebit = ebit; + //printf("appending.. cur_ref = %d, size = %d\n", cur_ref, int_ptr); + return 0 ; + } + else + { + printf("packet lost\n"); + Restart_buffering(filter); + return 0; + } + } //end of buffering checking + } //end of unmarked packet + + return 0; +} /* chain function * this function does the actual processing */ @@ -205,7 +313,17 @@ gst_h263packetdec_chain (GstPad *pad, Gs g_print ("I'm plugged, therefore I'm in.\n"); /* just push out the incoming buffer without touching it */ - gst_pad_push (filter->srcpad, GST_DATA (buf)); + unsigned char * ret_buf; + unsigned int len; + len = BufferData(filter, &ret_buf, (unsigned char*)GST_DATA(buf), GST_BUFFER_SIZE(buf), 1); + if (len) + { + out_buf = gst_buffer_new_and_alloc(len); + GST_BUFFER_SIZE(out_buf) = len; + gst_pad_push (filter->srcpad, GST_DATA (out_buf)); + } + + gst_buffer_unref(buf); } static void Index: gsth263packetdec.h =================================================================== RCS file: /cvsroot/gaim-vv/gst-h263packetdec/src/gsth263packetdec.h,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -d -p -r1.1.1.1 -r1.2 --- gsth263packetdec.h 12 Aug 2004 04:10:44 -0000 1.1.1.1 +++ gsth263packetdec.h 13 Aug 2004 05:13:28 -0000 1.2 @@ -31,6 +31,13 @@ struct _GstH263PacketDec GstPad *sinkpad, *srcpad; gboolean silent; + + unsigned char cur_ref; + unsigned char buf_started; + unsigned char int_buf[8192]; + unsigned int int_ptr; + unsigned char last_ebit; + }; struct _GstH263PacketDecClass |