rendered paste bodyOnly in ../../FarSightCVS/gst-plugins-0.9/.: .#configure.ac.1.10
Only in ../../FarSightCVS/gst-plugins-0.9/.: CVS
Only in ../../FarSightCVS/gst-plugins-0.9/.: Makefile
diff -r ./Makefile.am ../../FarSightCVS/gst-plugins-0.9/./Makefile.am
1,2d0
< ACLOCAL_AMFLAGS = -I m4
<
Only in ../../FarSightCVS/gst-plugins-0.9/.: Makefile.in
Only in .: _darcs
Only in ../../FarSightCVS/gst-plugins-0.9/.: aclocal.m4
diff -r ./autogen.sh ../../FarSightCVS/gst-plugins-0.9/./autogen.sh
4,23c4,86
< # Not all echo versions allow -n, so we check what is possible. This test is
< # based on the one in autoconf.
< case `echo "testing\c"; echo 1,2,3`,`echo -n testing; echo 1,2,3` in
< *c*,-n*) ECHO_N= ;;
< *c*,* ) ECHO_N=-n ;;
< *) ECHO_N= ;;
< esac
<
<
< # some terminal codes ...
< boldface="`tput bold 2>/dev/null`"
< normal="`tput sgr0 2>/dev/null`"
< printbold() {
< echo $ECHO_N "$boldface"
< echo "$@"
< echo $ECHO_N "$normal"
< }
< printerr() {
< echo "$@" >&2
< }
---
> DIE=0
> package=gst-plugins
> srcfile=configure.ac
>
> # a quick cvs co if necessary to alleviate the pain - may remove this
> # when developers get a clue ;)
> if test ! -d common;
> then
> echo "+ getting common/ from cvs"
> cvs co common
> fi
>
> # source helper functions
> if test ! -f common/autogen-helper.sh;
> then
> echo There is something wrong with your source tree.
> echo You are missing common/autogen-helper.sh
> exit 1
> fi
> . common/autogen-helper.sh
>
> CONFIGURE_DEF_OPT='--enable-maintainer-mode'
>
> autogen_options $@
>
> echo -n "+ check for build tools"
> if test ! -z "$NOCHECK"; then echo " skipped"; else echo; fi
> version_check "autoconf" "$AUTOCONF autoconf autoconf-2.54 autoconf-2.53" \
> "ftp://ftp.gnu.org/pub/gnu/autoconf/" 2 53 || DIE=1
> version_check "automake" "$AUTOMAKE automake automake-1.7 automake-1.6" \
> "ftp://ftp.gnu.org/pub/gnu/automake/" 1 6 || DIE=1
> # version_check "autopoint" "autopoint" \
> # "ftp://ftp.gnu.org/pub/gnu/gettext/" 0 11 5 || DIE=1
> version_check "libtoolize" "$LIBTOOLIZE libtoolize" \
> "ftp://ftp.gnu.org/pub/gnu/libtool/" 1 5 0 || DIE=1
> version_check "pkg-config" "" \
> "http://www.freedesktop.org/software/pkgconfig" 0 8 0 || DIE=1
>
> die_check $DIE
>
> aclocal_check || DIE=1
> autoheader_check || DIE=1
>
> die_check $DIE
>
> # if no arguments specified then this will be printed
> if test -z "$*"; then
> echo "+ checking for autogen.sh options"
> echo " This autogen script will automatically run ./configure as:"
> echo " ./configure $CONFIGURE_DEF_OPT"
> echo " To pass any additional options, please specify them on the $0"
> echo " command line."
> fi
>
> toplevel_check $srcfile
>
> # # autopoint
> # # older autopoint (< 0.12) has a tendency to complain about mkinstalldirs
> # if test -x mkinstalldirs; then rm mkinstalldirs; fi
> # # first remove patch if necessary, then run autopoint, then reapply
> # if test -f po/Makefile.in.in;
> # then
> # patch -p0 -R < common/gettext.patch
> # fi
> # tool_run "$autopoint --force"
> # patch -p0 < common/gettext.patch
>
> tool_run "$aclocal" "-I m4 $ACLOCAL_FLAGS"
> tool_run "$libtoolize" "--copy --force"
> tool_run "$autoheader"
>
> # touch the stamp-h.in build stamp so we don't re-run autoheader in maintainer mode -- wingo
> echo timestamp > stamp-h.in 2> /dev/null
>
> tool_run "$autoconf"
> tool_run "$automake" "-a -c"
>
> # if enable exists, add an -enable option for each of the lines in that file
> if test -f enable; then
> for a in `cat enable`; do
> CONFIGURE_FILE_OPT="--enable-$a"
> done
> fi
25,42c88,98
< # Usage:
< # compare_versions MIN_VERSION ACTUAL_VERSION
< # returns true if ACTUAL_VERSION >= MIN_VERSION
< compare_versions() {
< ch_min_version=$1
< ch_actual_version=$2
< ch_status=0
< IFS="${IFS= }"; ch_save_IFS="$IFS"; IFS="."
< set $ch_actual_version
< for ch_min in $ch_min_version; do
< ch_cur=`echo $1 | sed 's/[^0-9].*$//'`; shift # remove letter suffixes
< if [ -z "$ch_min" ]; then break; fi
< if [ -z "$ch_cur" ]; then ch_status=1; break; fi
< if [ $ch_cur -gt $ch_min ]; then break; fi
< if [ $ch_cur -lt $ch_min ]; then ch_status=1; break; fi
< done
< IFS="$ch_save_IFS"
< return $ch_status
---
> # if disable exists, add an -disable option for each of the lines in that file
> if test -f disable; then
> for a in `cat disable`; do
> CONFIGURE_FILE_OPT="$CONFIGURE_FILE_OPT --disable-$a"
> done
> fi
>
> test -n "$NOCONFIGURE" && {
> echo "+ skipping configure stage for package $package, as requested."
> echo "+ autogen.sh done."
> exit 0
45,88c101,109
< # Usage:
< # version_check PACKAGE VARIABLE CHECKPROGS MIN_VERSION SOURCE
< # checks to see if the package is available
< version_check() {
< vc_package=$1
< vc_variable=$2
< vc_checkprogs=$3
< vc_min_version=$4
< vc_source=$5
< vc_status=1
<
< vc_checkprog=`eval echo "\\$$vc_variable"`
< if [ -n "$vc_checkprog" ]; then
< printbold "using $vc_checkprog for $vc_package"
< return 0
< fi
<
< printbold "checking for $vc_package >= $vc_min_version..."
< for vc_checkprog in $vc_checkprogs; do
< echo $ECHO_N " testing $vc_checkprog... "
< if $vc_checkprog --version < /dev/null > /dev/null 2>&1; then
< vc_actual_version=`$vc_checkprog --version | head -n 1 | \
< sed 's/^.*[ ]\([0-9.]*[a-z]*\).*$/\1/'`
< if compare_versions $vc_min_version $vc_actual_version; then
< echo "found $vc_actual_version"
< # set variable
< eval "$vc_variable=$vc_checkprog"
< vc_status=0
< break
< else
< echo "too old (found version $vc_actual_version)"
< fi
< else
< echo "not found."
< fi
< done
< if [ "$vc_status" != 0 ]; then
< printerr "***Error***: You must have $vc_package >= $vc_min_version installed"
< printerr " to build $PKG_NAME. Download the appropriate package for"
< printerr " from your distribution or get the source tarball at"
< printerr " $vc_source"
< printerr
< fi
< return $vc_status
---
> echo "+ running configure ... "
> test ! -z "$CONFIGURE_DEF_OPT" && echo " ./configure default flags: $CONFIGURE_DEF_OPT"
> test ! -z "$CONFIGURE_EXT_OPT" && echo " ./configure external flags: $CONFIGURE_EXT_OPT"
> test ! -z "$CONFIGURE_FILE_OPT" && echo " ./configure enable/disable flags: $CONFIGURE_FILE_OPT"
> echo
>
> ./configure $CONFIGURE_DEF_OPT $CONFIGURE_EXT_OPT $CONFIGURE_FILE_OPT || {
> echo " configure failed"
> exit 1
91,115c112
< #tell Mandrake autoconf wrapper we want autoconf 2.5x, not 2.13
< WANT_AUTOCONF_2_5=1
< export WANT_AUTOCONF_2_5
< version_check autoreconf AUTORECONF 'autoreconf' 2.50 \
< "http://ftp.gnu.org/pub/gnu/autoconf/autoconf-2.50.tar.gz" || DIE=1
<
< automake_progs="automake automake-1.9 automake-1.8 automake-1.7 automake-1.6 automake-1.5"
<
< version_check automake AUTOMAKE "$automake_progs" 1.5 \
< "http://ftp.gnu.org/pub/gnu/automake/automake-1.5.tar.gz" || DIE=1
< ACLOCAL=`echo $AUTOMAKE | sed s/automake/aclocal/`
<
< export AUTOMAKE ACLOCAL
< gtkdocize
< autoreconf --install || exit 1
<
< #conf_flags="--enable-maintainer-mode"
<
< if test x$NOCONFIGURE = x; then
< printbold Running $srcdir/configure $conf_flags "$@" ...
< ./configure $conf_flags "$@" \
< && echo Now type \`make\' to compile $PKG_NAME || exit 1
< else
< echo Skipping configure process.
< fi
---
> echo "Now type 'make' to compile $package."
Only in ../../FarSightCVS/gst-plugins-0.9/.: autom4te.cache
Only in ../../FarSightCVS/gst-plugins-0.9/.: autoregen.sh
Only in ../../FarSightCVS/gst-plugins-0.9/.: common
Only in ../../FarSightCVS/gst-plugins-0.9/.: compile
Only in ../../FarSightCVS/gst-plugins-0.9/.: config.guess
Only in ../../FarSightCVS/gst-plugins-0.9/.: config.h
Only in ../../FarSightCVS/gst-plugins-0.9/.: config.h.in
Only in ../../FarSightCVS/gst-plugins-0.9/.: config.h.in~
Only in ../../FarSightCVS/gst-plugins-0.9/.: config.log
Only in ../../FarSightCVS/gst-plugins-0.9/.: config.status
Only in ../../FarSightCVS/gst-plugins-0.9/.: config.sub
Only in ../../FarSightCVS/gst-plugins-0.9/.: configure
diff -r ./configure.ac ../../FarSightCVS/gst-plugins-0.9/./configure.ac
1,2c1,2
< AC_PREREQ([2.59])
<
---
> dnl fill in your package name and version here
> dnl autoconf configuration files for gst-plugins
4,6d3
<
< AC_CONFIG_MACRO_DIR([m4])
<
8a6,11
> dnl We disable static building for development, for time savings
> dnl this goes before AS_LIBTOOL to appease autoconf
> dnl *NOTE*: dnl this line before release, so release does static too
> AM_DISABLE_STATIC
>
> dnl AM_MAINTAINER_MODE only provides the option to configure to enable it
53,54d55
< GTK_DOC_CHECK
<
122c123
< AM_CONDITIONAL(USE_JRTP, true)
---
> translit(dnm, m, l) AM_CONDITIONAL(USE_JRTP, true)
124c125,126
< PKG_CHECK_MODULES(JRTP, jrtplib-3.1.0,
---
> JRTPLIB_REQUIRED=3.3.0
> PKG_CHECK_MODULES(JRTP, jrtplib >= $JRTPLIB_REQUIRED,
132c134
< AM_CONDITIONAL(USE_MIMIC, true)
---
> translit(dnm, m, l) AM_CONDITIONAL(USE_MIMIC, true)
144c146
< AM_CONDITIONAL(USE_GSM, true)
---
> translit(dnm, m, l) AM_CONDITIONAL(USE_GSM, true)
199a202,203
>
> dnl if entered yes use /usr default value
202a207,208
>
> dnl set the given prefix
204d209
< enable_libj2k=yes
207c212
< AC_CHECK_LIB([j2k], j2k_encode, enable_libj2k=yes, enablelibj2k=no, -lm)
---
> dnl AC_CHECK_LIB([j2k], j2k_encode, enable_libj2k=yes, enablelibj2k=no, -lm)
Only in ../../FarSightCVS/gst-plugins-0.9/.: depcomp
Only in .: diffed
Only in ../../FarSightCVS/gst-plugins-0.9/./ext: CVS
Only in ../../FarSightCVS/gst-plugins-0.9/./ext: Makefile
Only in ../../FarSightCVS/gst-plugins-0.9/./ext: Makefile.in
Only in ../../FarSightCVS/gst-plugins-0.9/./ext/gsm: .deps
Only in ../../FarSightCVS/gst-plugins-0.9/./ext/gsm: .gstgsm.c.swp
Only in ../../FarSightCVS/gst-plugins-0.9/./ext/gsm: .gstgsmdec.c.swp
Only in ../../FarSightCVS/gst-plugins-0.9/./ext/gsm: .gstgsmdec.h.swp
Only in ../../FarSightCVS/gst-plugins-0.9/./ext/gsm: .gstgsmenc.c.swp
Only in ../../FarSightCVS/gst-plugins-0.9/./ext/gsm: .gstgsmenc.h.swp
Only in ../../FarSightCVS/gst-plugins-0.9/./ext/gsm: .gstmsgsmdec.c.swp
Only in ../../FarSightCVS/gst-plugins-0.9/./ext/gsm: .gstmsgsmdec.h.swp
Only in ../../FarSightCVS/gst-plugins-0.9/./ext/gsm: .gstmsgsmenc.c.swp
Only in ../../FarSightCVS/gst-plugins-0.9/./ext/gsm: .gstmsgsmenc.h.swp
Only in ../../FarSightCVS/gst-plugins-0.9/./ext/gsm: .libs
Only in ../../FarSightCVS/gst-plugins-0.9/./ext/gsm: CVS
Only in ../../FarSightCVS/gst-plugins-0.9/./ext/gsm: Makefile
Only in ../../FarSightCVS/gst-plugins-0.9/./ext/gsm: Makefile.in
diff -r ./ext/gsm/gstgsmdec.h ../../FarSightCVS/gst-plugins-0.9/./ext/gsm/gstgsmdec.h
28c28,32
< #include "gsm.h"
---
> #ifdef GSM_HEADER_IN_SUBDIR
> #include <gsm/gsm.h>
> #else
> #include <gsm.h>
> #endif
diff -r ./ext/gsm/gstgsmenc.c ../../FarSightCVS/gst-plugins-0.9/./ext/gsm/gstgsmenc.c
175c175
< GST_BUFFER_TIMESTAMP (outbuf) = gsmenc->next_ts;
---
> //GST_BUFFER_TIMESTAMP (outbuf) = gsmenc->next_ts;
179c179
< // encode 160 bytes into 33 bytes
---
> // encode 160 16-bit samples into 33 bytes
diff -r ./ext/gsm/gstmsgsmenc.c ../../FarSightCVS/gst-plugins-0.9/./ext/gsm/gstmsgsmenc.c
179,180c179
< //GST_BUFFER_TIMESTAMP (outbuf) = msgsmenc->next_ts;
< GST_BUFFER_TIMESTAMP (outbuf) = GST_BUFFER_TIMESTAMP (buf);
---
> GST_BUFFER_TIMESTAMP (outbuf) = msgsmenc->next_ts;
184c183
< // encode first 160 bytes into 32 bytes
---
> // encode first 160 16-bit samples into 32 bytes
190c189
< // encode the second 160 bytes into 33 bytes
---
> // encode the second 160 16-bit smaples into 33 bytes
198c197
< gst_util_dump_mem (GST_BUFFER_DATA(outbuf), GST_BUFFER_SIZE (outbuf));
---
> //gst_util_dump_mem (GST_BUFFER_DATA(outbuf), GST_BUFFER_SIZE (outbuf));
Only in ../../FarSightCVS/gst-plugins-0.9/./ext/gsm: libgstgsm.la
Only in ../../FarSightCVS/gst-plugins-0.9/./ext/gsm: libgstgsm_la-gstgsm.lo
Only in ../../FarSightCVS/gst-plugins-0.9/./ext/gsm: libgstgsm_la-gstgsmdec.lo
Only in ../../FarSightCVS/gst-plugins-0.9/./ext/gsm: libgstgsm_la-gstgsmenc.lo
Only in ../../FarSightCVS/gst-plugins-0.9/./ext/gsm: libgstgsm_la-gstmsgsmdec.lo
Only in ../../FarSightCVS/gst-plugins-0.9/./ext/gsm: libgstgsm_la-gstmsgsmenc.lo
Only in ../../FarSightCVS/gst-plugins-0.9/./ext/jpeg2000: .Makefile.am.swp
Only in ../../FarSightCVS/gst-plugins-0.9/./ext/jpeg2000: .deps
Only in ../../FarSightCVS/gst-plugins-0.9/./ext/jpeg2000: .gstj2k.c.swp
Only in ../../FarSightCVS/gst-plugins-0.9/./ext/jpeg2000: .gstj2kdec.c.swp
Only in ../../FarSightCVS/gst-plugins-0.9/./ext/jpeg2000: .gstj2kdec.h.swp
Only in ../../FarSightCVS/gst-plugins-0.9/./ext/jpeg2000: .gstj2kenc.c.swp
Only in ../../FarSightCVS/gst-plugins-0.9/./ext/jpeg2000: .gstj2kenc.h.swp
Only in ../../FarSightCVS/gst-plugins-0.9/./ext/jpeg2000: .gstyahooparse.c.swp
Only in ../../FarSightCVS/gst-plugins-0.9/./ext/jpeg2000: .gstyahooparse.h.swp
Only in ../../FarSightCVS/gst-plugins-0.9/./ext/jpeg2000: .libs
Only in ../../FarSightCVS/gst-plugins-0.9/./ext/jpeg2000: CVS
Only in ../../FarSightCVS/gst-plugins-0.9/./ext/jpeg2000: Makefile
diff -r ./ext/jpeg2000/Makefile.am ../../FarSightCVS/gst-plugins-0.9/./ext/jpeg2000/Makefile.am
3c3
< libgstjpeg2k_la_SOURCES = gstj2k.c gstj2kdec.c
---
> libgstjpeg2k_la_SOURCES = gstj2k.c gstj2kdec.c gstj2kenc.c gstyahooparse.c
5c5
< libgstjpeg2k_la_CFLAGS = $(GST_CFLAGS) $(GST_BASE_CFLAGS) -I$(LIBJ2K_PREFIX)/include
---
> libgstjpeg2k_la_CFLAGS = $(GST_CFLAGS) $(GST_BASE_CFLAGS) $(GST_PLUGINS_BASE_CFLAGS) -I$(LIBJ2K_PREFIX)/include
7c7
< libgstjpeg2k_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) $(GST_BASE_LIBS) -L$(LIBJ2K_PREFIX)/lib -lj2k
---
> libgstjpeg2k_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) $(GST_BASE_LIBS) $(GST_PLUGINS_BASE_LIBS) -L$(LIBJ2K_PREFIX)/lib -lj2k
9c9
< noinst_HEADERS = gstj2kdec.h
---
> noinst_HEADERS = gstj2kdec.h gstj2kenc.h gstyahooparse.h
Only in ../../FarSightCVS/gst-plugins-0.9/./ext/jpeg2000: Makefile.in
diff -r ./ext/jpeg2000/gstj2k.c ../../FarSightCVS/gst-plugins-0.9/./ext/jpeg2000/gstj2k.c
26c26,27
< //#include "gstj2kenc.h"
---
> #include "gstj2kenc.h"
> #include "gstyahooparse.h"
31,34c32,36
< if (
< !gst_element_register(plugin, "jpeg2000dec",
< GST_RANK_NONE, GST_TYPE_JPEG2000DEC)
< )
---
> if (!gst_jpeg2000enc_plugin_init (plugin))
> return FALSE;
> if (!gst_jpeg2000dec_plugin_init (plugin))
> return FALSE;
> if (!gst_yahooparse_plugin_init (plugin))
44c46
< "JPEG2000 codec",
---
> "JPEG2000 codec and yahoo webcam",
48,50c50,51
< "Gstreamer",
< "http://gstreamer.net")
<
---
> "Farsight",
> "http://farsight.sourceforge.net")
diff -r ./ext/jpeg2000/gstj2kdec.c ../../FarSightCVS/gst-plugins-0.9/./ext/jpeg2000/gstj2kdec.c
52d51
< //#include <string.h>
54a54
> #include "gst/video/video.h"
83d82
< static void gst_jpeg2000dec_dispose (GObject * object);
140,141c139
< GST_STATIC_CAPS("ANY")
< /* GST_STATIC_CAPS("image/jp2, "
---
> GST_STATIC_CAPS("image/jp2, "
145d142
< */
172,173d168
< gobject_class->dispose = gst_jpeg2000dec_dispose;
<
194,195d188
< j2kdec->adapter = gst_adapter_new ();
<
200,201d192
< j2kdec->have_header = FALSE;
<
213,222d203
<
< }
<
< static void
< gst_jpeg2000dec_dispose (GObject * object)
< {
< GstJpeg2000Dec *j2kdec = GST_JPEG2000DEC (object);
<
< gst_adapter_clear (j2kdec->adapter);
< g_object_unref (j2kdec->adapter);
229d209
< gboolean found = FALSE;
286c266
< gst_jpeg2000dec_chain(GstPad *pad, GstBuffer *in)
---
> gst_jpeg2000dec_chain(GstPad *pad, GstBuffer *buf)
288d267
< GstBuffer *buf;
291,294c270
< guchar *data, *header, *outdata, *small_chunk;
< guchar reason;
< guint8 *peek_at_header_len;
< guint8 header_len;
---
> guchar *data, *outdata;
300,304c276,278
< g_return_if_fail(pad != NULL);
< g_return_if_fail(GST_IS_PAD(pad));
<
< buf = GST_BUFFER(in);
< g_return_if_fail(buf != NULL);
---
> g_return_val_if_fail(pad != NULL, GST_FLOW_ERROR);
> g_return_val_if_fail(GST_IS_PAD(pad), GST_FLOW_ERROR);
> g_return_val_if_fail(buf != NULL, GST_FLOW_ERROR);
313,314c287
< //gst_util_dump_mem (GST_BUFFER_DATA(buf), GST_BUFFER_SIZE(buf));
< gst_adapter_push (j2kdec->adapter, buf);
---
> data = GST_BUFFER_DATA (buf);
316,332c289,291
< // if we have no header, we seek until the start of a header (header_len 00 05 00)
< if (!j2kdec->have_header)
< {
< gboolean found = FALSE;
< while (!found)
< {
< small_chunk = (guchar *) gst_adapter_peek (j2kdec->adapter, 4);
< if (small_chunk[2] == 0x05 && small_chunk[3] == 0x00)
< {
< found = TRUE;
< }
< else
< {
< if (gst_adapter_available (j2kdec->adapter) >= 1)
< gst_adapter_flush (j2kdec->adapter, 1);
< }
< }
---
> if (!j2k_decode(data, GST_BUFFER_SIZE(buf), &img, &cp)) {
> GST_DEBUG("Failed to decode image!");
> return GST_FLOW_ERROR;
335,446c294,346
< peek_at_header_len = (guint8 *) gst_adapter_peek (j2kdec->adapter, 1);
<
< // do we have enough bytes to read a header
< while (gst_adapter_available (j2kdec->adapter) >=
< (j2kdec->have_header ? j2kdec->payload_size : *peek_at_header_len)) {
< if (!j2kdec->have_header) {
< header = (guchar *) gst_adapter_peek (j2kdec->adapter, *peek_at_header_len);
< header_len = header[0];
<
< if (header_len >= 8) {
< reason = header[1];
< /* next 2 bytes should always be 05 00 */
< j2kdec->payload_size = GUINT32_FROM_BE (*((guint32 *) (header + 4)));
< }
< if (header_len >= 13) {
< j2kdec->packet_type = header[8];
< j2kdec->timestamp = GUINT32_FROM_BE (*((guint32 *) (header + 9)));
< }
<
< gst_util_dump_mem (header, header_len);
< g_printf ("Got header info length %d packet_type %.2X reason %d payload_size %d timestamp %d\n",
< header_len, j2kdec->packet_type, reason, j2kdec->payload_size, j2kdec->timestamp);
<
< gst_adapter_flush (j2kdec->adapter, header_len);
<
< j2kdec->have_header = TRUE;
< }
<
< if (j2kdec->packet_type == 0x07)
< {
< // he's gone
< // let's emit a signal to client app, or use the bus?
< }
<
< if (j2kdec->payload_size == 0 || j2kdec->packet_type != 0x02)
< {
< j2kdec->have_header = FALSE;
< gst_adapter_flush (j2kdec->adapter, j2kdec->payload_size);
< return GST_FLOW_OK;
< }
<
< if (gst_adapter_available (j2kdec->adapter) < j2kdec->payload_size)
< {
< return GST_FLOW_OK;
< }
<
< data = (guchar *) gst_adapter_peek (j2kdec->adapter, j2kdec->payload_size);
<
< if (!j2k_decode(data, j2kdec->payload_size, &img, &cp)) {
< GST_DEBUG("Failed to decode image!");
< return GST_FLOW_ERROR;
< }
<
< GST_DEBUG("numcmps = %d", img->numcomps);
< if (img->numcomps==3 && img->comps[0].dx==img->comps[1].dx && img->comps[1].dx==img->comps[2].dx &&
< img->comps[0].dy==img->comps[1].dy && img->comps[1].dy==img->comps[2].dy &&
< img->comps[0].prec==img->comps[1].prec && img->comps[1].prec==img->comps[2].prec) {
<
< width = ceildiv(img->x1-img->x0, img->comps[0].dx);
< height = ceildiv(img->y1-img->y0, img->comps[0].dy);
<
< max = (1<<img->comps[0].prec)-1; /* What was this supposed to be and be for? */
<
< GST_DEBUG("width %d, height %d", width, height);
<
< outbuf = gst_buffer_new_and_alloc (width * height * 4);
< outdata = GST_BUFFER_DATA(outbuf);
< GST_BUFFER_TIMESTAMP(outbuf) = GST_BUFFER_TIMESTAMP(buf);
<
< int depth = 24;
< caps = gst_caps_new_simple ("video/x-raw-rgb",
< "bpp", G_TYPE_INT, depth,
< "depth", G_TYPE_INT, depth,
< "endianness", G_TYPE_INT, 4321,
< "framerate", G_TYPE_DOUBLE, 30.0,
< "red_mask", G_TYPE_INT, 16711680,
< "green_mask", G_TYPE_INT, 65280,
< "blue_mask", G_TYPE_INT, 255,
< "width", G_TYPE_INT, width,
< "height", G_TYPE_INT, height, NULL);
< gst_buffer_set_caps (outbuf, caps);
<
< switch (depth) {
< case 32:
< for (i = 0, j = 0; i < (width * height); i++) {
< guint32 *tmp = (guint32 *) outdata;
< tmp[i] = ((img->comps[0].data[i] >> j2kdec->red_loss) << j2kdec->red_shift)
< | ((img->comps[1].data[i] >> j2kdec->green_loss) << j2kdec->green_shift)
< | ((img->comps[2].data[i] >> j2kdec->blue_loss) << j2kdec->blue_shift);
< }
< break;
< case 24:
< for (i = 0, j = 0; i < (width * height); i++) {
< /* this assumes 8:8:8 r:g:b and is probably wrong */
< outdata[j++] = img->comps[0].data[i];
< outdata[j++] = img->comps[1].data[i];
< outdata[j++] = img->comps[2].data[i];
< }
< break;
< case 16:
< for (i = 0; i < (width * height); i++) {
< ((guint16 *) outdata)[i] = (img->comps[0].data[i] >> j2kdec->red_loss) << j2kdec->red_shift;
< ((guint16 *) outdata)[i] |= (img->comps[1].data[i] >> j2kdec->green_loss) << j2kdec->green_shift;
< ((guint16 *) outdata)[i] |= (img->comps[2].data[i] >> j2kdec->blue_loss) << j2kdec->blue_shift;
< }
< break;
< }
<
< j2k_release(img, cp);
<
< } else {
< GST_DEBUG("if failed!");
---
> GST_DEBUG("numcmps = %d", img->numcomps);
> if (img->numcomps==3 && img->comps[0].dx==img->comps[1].dx && img->comps[1].dx==img->comps[2].dx &&
> img->comps[0].dy==img->comps[1].dy && img->comps[1].dy==img->comps[2].dy &&
> img->comps[0].prec==img->comps[1].prec && img->comps[1].prec==img->comps[2].prec) {
>
> width = ceildiv(img->x1-img->x0, img->comps[0].dx);
> height = ceildiv(img->y1-img->y0, img->comps[0].dy);
>
> max = (1<<img->comps[0].prec)-1; /* What was this supposed to be and be for? */
>
> GST_DEBUG("width %d, height %d", width, height);
>
> outbuf = gst_buffer_new_and_alloc (width * height * 3);
> outdata = GST_BUFFER_DATA(outbuf);
> GST_BUFFER_TIMESTAMP(outbuf) = GST_BUFFER_TIMESTAMP(buf);
>
> int depth = 24;
> caps = gst_caps_new_simple ("video/x-raw-rgb",
> "bpp", G_TYPE_INT, depth,
> "depth", G_TYPE_INT, depth,
> "endianness", G_TYPE_INT, 4321,
> "framerate", G_TYPE_DOUBLE, 30.0,
> "red_mask", G_TYPE_INT, 16711680,
> "green_mask", G_TYPE_INT, 65280,
> "blue_mask", G_TYPE_INT, 255,
> "width", G_TYPE_INT, width,
> "height", G_TYPE_INT, height, NULL);
> gst_buffer_set_caps (outbuf, caps);
>
> switch (depth) {
> case 32:
> for (i = 0, j = 0; i < (width * height); i++) {
> guint32 *tmp = (guint32 *) outdata;
> tmp[i] = ((img->comps[0].data[i] >> j2kdec->red_loss) << j2kdec->red_shift)
> | ((img->comps[1].data[i] >> j2kdec->green_loss) << j2kdec->green_shift)
> | ((img->comps[2].data[i] >> j2kdec->blue_loss) << j2kdec->blue_shift);
> }
> break;
> case 24:
> for (i = 0, j = 0; i < (width * height); i++) {
> /* this assumes 8:8:8 r:g:b and is probably wrong */
> outdata[j++] = img->comps[0].data[i];
> outdata[j++] = img->comps[1].data[i];
> outdata[j++] = img->comps[2].data[i];
> }
> break;
> case 16:
> for (i = 0; i < (width * height); i++) {
> ((guint16 *) outdata)[i] = (img->comps[0].data[i] >> j2kdec->red_loss) << j2kdec->red_shift;
> ((guint16 *) outdata)[i] |= (img->comps[1].data[i] >> j2kdec->green_loss) << j2kdec->green_shift;
> ((guint16 *) outdata)[i] |= (img->comps[2].data[i] >> j2kdec->blue_loss) << j2kdec->blue_shift;
> }
> break;
448a349
> GST_DEBUG ("Pushing %d bytes", GST_BUFFER_SIZE(outbuf));
450,451c351
< j2kdec->have_header = FALSE;
< gst_adapter_flush (j2kdec->adapter, j2kdec->payload_size);
---
> j2k_release(img, cp);
453c353,354
< return GST_FLOW_OK;
---
> } else {
> GST_DEBUG("if failed!");
454a356
>
456a359,365
>
> gboolean
> gst_jpeg2000dec_plugin_init (GstPlugin * plugin)
> {
> return gst_element_register (plugin, "jpeg2000dec",
> GST_RANK_NONE, GST_TYPE_JPEG2000DEC);
> }
diff -r ./ext/jpeg2000/gstj2kdec.h ../../FarSightCVS/gst-plugins-0.9/./ext/jpeg2000/gstj2kdec.h
28d27
< #include <gst/base/gstadapter.h>
31,34d29
< #ifdef __cplusplus
< extern "C" {
< #endif /* __cplusplus */
<
55,58d49
< GstAdapter *adapter;
<
< gboolean have_header;
<
69,72d59
<
< guchar packet_type;
< guint payload_size;
< guint timestamp;
81,84c68
< #ifdef __cplusplus
< }
< #endif /* __cplusplus */
<
---
> gboolean gst_jpeg2000dec_plugin_init (GstPlugin * plugin);
Only in ../../FarSightCVS/gst-plugins-0.9/./ext/jpeg2000: gstj2kenc.c
Only in ../../FarSightCVS/gst-plugins-0.9/./ext/jpeg2000: gstj2kenc.h
Only in ../../FarSightCVS/gst-plugins-0.9/./ext/jpeg2000: gstyahooparse.c
Only in ../../FarSightCVS/gst-plugins-0.9/./ext/jpeg2000: gstyahooparse.h
Only in ../../FarSightCVS/gst-plugins-0.9/./ext/jpeg2000: libgstjpeg2k.la
Only in ../../FarSightCVS/gst-plugins-0.9/./ext/jpeg2000: libgstjpeg2k_la-gstj2k.lo
Only in ../../FarSightCVS/gst-plugins-0.9/./ext/jpeg2000: libgstjpeg2k_la-gstj2kdec.lo
Only in ../../FarSightCVS/gst-plugins-0.9/./ext/jpeg2000: libgstjpeg2k_la-gstj2kenc.lo
Only in ../../FarSightCVS/gst-plugins-0.9/./ext/jpeg2000: libgstjpeg2k_la-gstyahooparse.lo
Only in ../../FarSightCVS/gst-plugins-0.9/./ext/jpeg2000: temp
Only in ../../FarSightCVS/gst-plugins-0.9/./ext/jrtp: .deps
Only in ../../FarSightCVS/gst-plugins-0.9/./ext/jrtp: .gstrtpsession.h.swp
Only in ../../FarSightCVS/gst-plugins-0.9/./ext/jrtp: .jrtplib_c.cpp.swp
Only in ../../FarSightCVS/gst-plugins-0.9/./ext/jrtp: .libs
Only in ../../FarSightCVS/gst-plugins-0.9/./ext/jrtp: CVS
Only in ../../FarSightCVS/gst-plugins-0.9/./ext/jrtp: Makefile
Only in ../../FarSightCVS/gst-plugins-0.9/./ext/jrtp: Makefile.in
Only in ../../FarSightCVS/gst-plugins-0.9/./ext/jrtp: libgstjrtp.la
Only in ../../FarSightCVS/gst-plugins-0.9/./ext/jrtp: libgstjrtp_la-gstjrtp.lo
Only in ../../FarSightCVS/gst-plugins-0.9/./ext/jrtp: libgstjrtp_la-gstrtpbin.lo
Only in ../../FarSightCVS/gst-plugins-0.9/./ext/jrtp: libgstjrtp_la-gstrtprecv.lo
Only in ../../FarSightCVS/gst-plugins-0.9/./ext/jrtp: libgstjrtp_la-gstrtpsend.lo
Only in ../../FarSightCVS/gst-plugins-0.9/./ext/jrtp: libgstjrtp_la-jrtplib_c.lo
Only in ../../FarSightCVS/gst-plugins-0.9/./ext/jrtp: temp
Only in ../../FarSightCVS/gst-plugins-0.9/./ext/mimic: .deps
Only in ../../FarSightCVS/gst-plugins-0.9/./ext/mimic: CVS
Only in ../../FarSightCVS/gst-plugins-0.9/./ext/mimic: Makefile
Only in ../../FarSightCVS/gst-plugins-0.9/./ext/mimic: Makefile.in
Only in ../../FarSightCVS/gst-plugins-0.9/./ext: temp
Only in ../../FarSightCVS/gst-plugins-0.9/./gst: CVS
Only in ../../FarSightCVS/gst-plugins-0.9/./gst: Makefile
Only in ../../FarSightCVS/gst-plugins-0.9/./gst: Makefile.in
Only in ../../FarSightCVS/gst-plugins-0.9/./gst/r263: .#gstr263enc.c.1.11
Only in ../../FarSightCVS/gst-plugins-0.9/./gst/r263: .deps
Only in ../../FarSightCVS/gst-plugins-0.9/./gst/r263: .gstr263enc.withoutbase.c.swp
Only in ../../FarSightCVS/gst-plugins-0.9/./gst/r263: .gstr263enc.withoutbase.h.swp
Only in ../../FarSightCVS/gst-plugins-0.9/./gst/r263: .libs
Only in ../../FarSightCVS/gst-plugins-0.9/./gst/r263: CVS
Only in ../../FarSightCVS/gst-plugins-0.9/./gst/r263: Makefile
Only in ../../FarSightCVS/gst-plugins-0.9/./gst/r263: Makefile.in
Only in ../../FarSightCVS/gst-plugins-0.9/./gst/r263: gstr263enc.c.withbase
Only in ../../FarSightCVS/gst-plugins-0.9/./gst/r263: gstr263enc.h.withbase
Only in ../../FarSightCVS/gst-plugins-0.9/./gst/r263: gstr263enc.withoutbase.c
Only in ../../FarSightCVS/gst-plugins-0.9/./gst/r263: gstr263enc.withoutbase.h
Only in ../../FarSightCVS/gst-plugins-0.9/./gst/r263: libgstr263.la
Only in ../../FarSightCVS/gst-plugins-0.9/./gst/r263: libgstr263_la-gstr263.lo
Only in ../../FarSightCVS/gst-plugins-0.9/./gst/r263: libgstr263_la-gstr263depayload.lo
Only in ../../FarSightCVS/gst-plugins-0.9/./gst/r263: libgstr263_la-gstr263enc.lo
Only in ../../FarSightCVS/gst-plugins-0.9/./gst/r263/libr263: CVS
Only in ../../FarSightCVS/gst-plugins-0.9/./gst/r263/libr263: coder.o
Only in ../../FarSightCVS/gst-plugins-0.9/./gst/r263/libr263: countbit.o
Only in ../../FarSightCVS/gst-plugins-0.9/./gst/r263/libr263: dct.o
Only in ../../FarSightCVS/gst-plugins-0.9/./gst/r263/libr263: huffman.o
Only in ../../FarSightCVS/gst-plugins-0.9/./gst/r263/libr263: libr263.a
Only in ../../FarSightCVS/gst-plugins-0.9/./gst/r263/libr263: libr263.o
Only in ../../FarSightCVS/gst-plugins-0.9/./gst/r263/libr263: mot_est.o
Only in ../../FarSightCVS/gst-plugins-0.9/./gst/r263/libr263: pred.o
Only in ../../FarSightCVS/gst-plugins-0.9/./gst/r263/libr263: quant.o
Only in ../../FarSightCVS/gst-plugins-0.9/./gst/r263/libr263: rlib.a
Only in ../../FarSightCVS/gst-plugins-0.9/./gst/r263/libr263: rlib.o
Only in ../../FarSightCVS/gst-plugins-0.9/./gst/r263/libr263: stream.o
Only in ../../FarSightCVS/gst-plugins-0.9/./gst/r263: temp
Only in ../../FarSightCVS/gst-plugins-0.9/./gst/rtppayloads: .Makefile.am.swp
Only in ../../FarSightCVS/gst-plugins-0.9/./gst/rtppayloads: .deps
Only in ../../FarSightCVS/gst-plugins-0.9/./gst/rtppayloads: .gstmsgsmdepayload.c.swp
Only in ../../FarSightCVS/gst-plugins-0.9/./gst/rtppayloads: .gstmsgsmpayload.c.swp
Only in ../../FarSightCVS/gst-plugins-0.9/./gst/rtppayloads: .gstr263depayload.c.swp
Only in ../../FarSightCVS/gst-plugins-0.9/./gst/rtppayloads: .gstrtpgsmparse.c.swp
Only in ../../FarSightCVS/gst-plugins-0.9/./gst/rtppayloads: .gstrtppayloads.c.swp
Only in ../../FarSightCVS/gst-plugins-0.9/./gst/rtppayloads: .libs
Only in ../../FarSightCVS/gst-plugins-0.9/./gst/rtppayloads: CVS
Only in ../../FarSightCVS/gst-plugins-0.9/./gst/rtppayloads: Makefile
Only in ../../FarSightCVS/gst-plugins-0.9/./gst/rtppayloads: Makefile.in
diff -r ./gst/rtppayloads/gstmsgsmdepayload.c ../../FarSightCVS/gst-plugins-0.9/./gst/rtppayloads/gstmsgsmdepayload.c
43c43
< GST_STATIC_CAPS ("audio/x-gsm")
---
> GST_STATIC_CAPS ("audio/x-msgsm")
165c165
< //gst_util_dump_mem (payload, gst_rtpbuffer_get_payload_len(in));
---
> gst_util_dump_mem (payload, gst_rtpbuffer_get_payload_len(in));
172d171
< gst_buffer_unref (in);
diff -r ./gst/rtppayloads/gstmsgsmpayload.c ../../FarSightCVS/gst-plugins-0.9/./gst/rtppayloads/gstmsgsmpayload.c
45c45
< GST_STATIC_CAPS ("audio/x-gsm, "
---
> GST_STATIC_CAPS ("audio/x-msgsm, "
164c164
< gst_util_dump_mem (GST_BUFFER_DATA(buffer), GST_BUFFER_SIZE(buffer));
---
> //gst_util_dump_mem (GST_BUFFER_DATA(buffer), GST_BUFFER_SIZE(buffer));
diff -r ./gst/rtppayloads/gstr263depayload.c ../../FarSightCVS/gst-plugins-0.9/./gst/rtppayloads/gstr263depayload.c
192d191
< gst_buffer_unref (buf);
Only in ../../FarSightCVS/gst-plugins-0.9/./gst/rtppayloads: gstrtpgsmparse.c
Only in ../../FarSightCVS/gst-plugins-0.9/./gst/rtppayloads: gstrtpgsmparse.h
Only in ../../FarSightCVS/gst-plugins-0.9/./gst/rtppayloads: libgstrtppayloads.la
Only in ../../FarSightCVS/gst-plugins-0.9/./gst/rtppayloads: libgstrtppayloads_la-gstmsgsmdepayload.lo
Only in ../../FarSightCVS/gst-plugins-0.9/./gst/rtppayloads: libgstrtppayloads_la-gstmsgsmpayload.lo
Only in ../../FarSightCVS/gst-plugins-0.9/./gst/rtppayloads: libgstrtppayloads_la-gstr263depayload.lo
Only in ../../FarSightCVS/gst-plugins-0.9/./gst/rtppayloads: libgstrtppayloads_la-gstrtppayloads.lo
Only in ../../FarSightCVS/gst-plugins-0.9/./gst/rtppayloads: temp
Only in ../../FarSightCVS/gst-plugins-0.9/.: install-sh
Only in ../../FarSightCVS/gst-plugins-0.9/.: libtool
Only in ../../FarSightCVS/gst-plugins-0.9/.: ltmain.sh
Only in ../../FarSightCVS/gst-plugins-0.9/./m4: CVS
Only in ../../FarSightCVS/gst-plugins-0.9/./m4: Makefile
Only in ../../FarSightCVS/gst-plugins-0.9/./m4: Makefile.in
Only in ../../FarSightCVS/gst-plugins-0.9/.: missing
Only in ../../FarSightCVS/gst-plugins-0.9/.: stamp-h.in
Only in ../../FarSightCVS/gst-plugins-0.9/.: stamp-h1
Only in ../../FarSightCVS/gst-plugins-0.9/.: temp
Only in ../../FarSightCVS/gst-plugins-0.9/./tests: .#msgsmrecv.c.1.1
Only in ../../FarSightCVS/gst-plugins-0.9/./tests: .#msgsmsend.c.1.1
Only in ../../FarSightCVS/gst-plugins-0.9/./tests: .deps
Only in ../../FarSightCVS/gst-plugins-0.9/./tests: .libs
Only in ../../FarSightCVS/gst-plugins-0.9/./tests: CVS
Only in ../../FarSightCVS/gst-plugins-0.9/./tests: Makefile
Only in ../../FarSightCVS/gst-plugins-0.9/./tests: Makefile.in
Only in ../../FarSightCVS/gst-plugins-0.9/./tests: file.wav
Only in ../../FarSightCVS/gst-plugins-0.9/./tests: h263recv
Only in ../../FarSightCVS/gst-plugins-0.9/./tests: h263recv-h263recv.o
Only in ../../FarSightCVS/gst-plugins-0.9/./tests: h263send
Only in ../../FarSightCVS/gst-plugins-0.9/./tests: h263send-h263send.o
diff -r ./tests/h263send.c ../../FarSightCVS/gst-plugins-0.9/./tests/h263send.c
45a46
> "framerate", G_TYPE_INT, 10,
Only in ../../FarSightCVS/gst-plugins-0.9/./tests: msgsmrecv
Only in ../../FarSightCVS/gst-plugins-0.9/./tests: msgsmrecv-msgsmrecv.o
diff -r ./tests/msgsmrecv.c ../../FarSightCVS/gst-plugins-0.9/./tests/msgsmrecv.c
42c42
< decoder = gst_element_factory_make("gsmdec", "gsmdec");
---
> decoder = gst_element_factory_make("msgsmdec", "msgsmdec");
69c69,71
< gst_debug_set_threshold_for_name ("*", 5);
---
> gst_debug_set_threshold_for_name ("msgsmdepayload", 5);
> gst_debug_set_threshold_for_name ("basertpdepayload", 5);
>
Only in ../../FarSightCVS/gst-plugins-0.9/./tests: msgsmsend
Only in ../../FarSightCVS/gst-plugins-0.9/./tests: msgsmsend-msgsmsend.o
diff -r ./tests/msgsmsend.c ../../FarSightCVS/gst-plugins-0.9/./tests/msgsmsend.c
35c35
< encoder = gst_element_factory_make("gsmenc", "gsmenc");
---
> encoder = gst_element_factory_make("msgsmenc", "msgsmenc");
53c53
< gst_debug_set_threshold_for_name ("rtpsend", 1);
---
> gst_debug_set_threshold_for_name ("rtpsend", 5);
Only in ../../FarSightCVS/gst-plugins-0.9/./tests: sounddump
Only in ../../FarSightCVS/gst-plugins-0.9/./tests: temp
Only in ../../FarSightCVS/gst-plugins-0.9/./tests: temp2