Commit 612c339d authored by Guillaume Beraudo's avatar Guillaume Beraudo

Merge branch 'master' of git://git.linphone.org/mediastreamer2

Conflicts:
	tests/java/org/mediastreamer2/test/Ring.java
parents cfc25579 27a37706
......@@ -26,4 +26,5 @@ mediastreamer.pc
mediastreamer2.spec
missing
stamp-h1
*.gmo
2011-02-14 gettextize <bug-gnu-gettext@gnu.org>
* Makefile.am (SUBDIRS): Add po.
(ACLOCAL_AMFLAGS): New variable.
(EXTRA_DIST): Add config.rpath, m4/ChangeLog.
* configure.ac (AC_OUTPUT): Add po/Makefile.in.
EXTRA_DIST=mediastreamer-config.h.in pkg.list autogen.sh mediastreamer.pc.in mediastreamer2.spec.in mediastreamer2.spec Makefile.macosx
EXTRA_DIST=mediastreamer-config.h.in pkg.list autogen.sh mediastreamer.pc.in mediastreamer2.spec.in mediastreamer2.spec
SUBDIRS=src build include tests help
SUBDIRS=po src build include tests help
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = mediastreamer.pc
......@@ -58,3 +58,5 @@ clean-local:
rm -f files.list
endif WITH_EPM
ACLOCAL_AMFLAGS = -I m4
# MacOS X Temporary make file
# H.M 2007.05.23
SPEEXDIR = ../../../speex-1.2beta1
GSMDIR = ../../../gsm-1.0-pl12
ORTPDIR = ../../oRTP
INCPATH = -I../include -I$(ORTPDIR)/include -I$(SPEEXDIR)/include -I$(GSMDIR)/inc/
LIBPATH = -L. -L../../../gsm-1.0-pl12/lib
FRAMEWORK = -framework CoreAudio -framework AudioToolbox -framework Carbon -framework AudioUnit
CFLUGS = -g $(INCPATH) -DWORDS_BIGENDIAN -DDEBUG
#CFLUGS = $(INCPATH) -DWORDS_BIGENDIAN
LIBOBJ = mscommon.o msqueue.o msfilerec.o msfilter.o msspeex.o mssndcard.o alaw.o ulaw.o msconf.o msjoin.o msrtp.o ice.o tee.o gsm.o speexec.o audiostream.o msticker.o macsnd.o msfileplayer.o
DYLIB = libms.dylib
all: echo
echo: ../tests/echo.c $(DYLIB)
cc -c $(CFLUGS) ../tests/echo.c
cc -o echo $(FRAMEWORK) $(LIBPATH) echo.o $(DYLIB) -lortp -lspeex -lgsm
clean:
rm -rf *.o *.dylib
$(DYLIB): $(LIBOBJ) libortp.dylib libspeex.dylib
cc -o $(DYLIB) $(FRAMEWORK) -dynamiclib -compatibility_version 1 -current_version 1 $(LIBOBJ) $(LIBPATH) -lortp -lspeex -lgsm
libortp.dylib:
cp $(ORTPDIR)/src/.libs/libortp.dylib .
install_name_tool -id @executable_path/libortp.dylib libortp.dylib
libspeex.dylib:
cp $(SPEEXDIR)/libspeex/.libs/libspeex.dylib .
install_name_tool -id @executable_path/libspeex.dylib libspeex.dylib
msfileplayer.o: msfileplayer.c
gcc -c $(CFLUGS) msfileplayer.c
msticker.o: msticker.c
gcc -c $(CFLUGS) msticker.c
audiostream.o: audiostream.c
gcc -c $(CFLUGS) audiostream.c
speexec.o: speexec.c
gcc -c $(CFLUGS) speexec.c
gsm.o: gsm.c
gcc -c $(CFLUGS) gsm.c
tee.o: tee.c
gcc -c $(CFLUGS) tee.c
ice.o: ice.c
gcc -c $(CFLUGS) ice.c
msrtp.o: msrtp.c
gcc -c $(CFLUGS) msrtp.c
msjoin.o: msjoin.c
gcc -c $(CFLUGS) msjoin.c
msconf.o: msconf.c
gcc -c $(CFLUGS) msconf.c
msfilter.o: msfilter.c
gcc -c $(CFLUGS) msfilter.c
alaw.o: alaw.c
gcc -c $(CFLUGS) alaw.c
ulaw.o: ulaw.c
gcc -c $(CFLUGS) ulaw.c
msfilerec.o: msfilerec.c
gcc -c $(CFLUGS) msfilerec.c
msspeex.o: msspeex.c
gcc -c $(CFLUGS) msspeex.c
mssndcard.o: mssndcard.c
gcc -c $(CFLUGS) mssndcard.c
msqueue.o: msqueue.c
gcc -c $(CFLUGS) msqueue.c
macsnd.o: macsnd.c
gcc -c $(CFLUGS) macsnd.c
mscommon.o: mscommon.c
gcc -c $(CFLUGS) -DPACKAGE_PLUGINS_DIR=\".\" mscommon.c
mediastreamer-2.7.3: March 28, 2011
* major rework of the Mac OS X Audio Unit sound filter (macsnd.c)
* compilation fix for FreeBSD
mediastreamer-2.7.2: March 3rd, 2011
* fix windows crashes with some webcam outputing rgb
mediastreamer-2.7.1: February 17th, 2011
* enhance build for visual studio
* fix configure bugs
......
......@@ -35,12 +35,12 @@ Here is a complete list of built-in filters.
* audio capture & playback
* mme API (windows)
* alsa API (linux)
* oss API (linux)
* arts API (linux)
* portaudio API (macosx and other)
* audio queues (audio queue, mac os API )
* audio unit (iOS)
* oss and oss4 apis (linux)
* MacOS X Audio Units
* MacOS X Audio Queues (discouraged)
* iOS Audio Unit (Voice Processing audio unit for iPhone)
* Android sound system
* portaudio API (macosx and other)
* several audio encoder/decoder: PCMU, PCMA, speex, gsm
* wav file reader.
* wav file recorder.
......@@ -74,16 +74,28 @@ Here is a complete list of built-in filters.
Note that, you can build your own components/filters to do your
own processing or support other codecs.
Installation procedure:
-----------------------
Compilation and installation
----------------------------
* Required dependencies:
- oRTP
- libspeex and libspeexdsp
* Optional dependencies (for video to be enabled, see --enable-video):
- libavcodec
- libswscale
- x11 with libxv-dev on linux
- theora
The program is known to run on linux, but might work
on any unix and windows systems.
For Linux, MacOS, mingw compilation:
$> ./configure
$> make
$> su -c 'make install'
For Windows with Visual Studio 2008 IDE, open build/win32native/mediastreamer2.sln
More instructions and advices can be found for the mingw compilation procedure in Linphone's README.mingw.
Contact information:
--------------------
......
......@@ -43,6 +43,7 @@ fi
echo "Generating build scripts in mediastreamer..."
set -x
$libtoolize --copy --force
intltoolize --copy --force --automake
$ACLOCAL $ACLOCAL_ARGS
autoheader
$AUTOMAKE --force-missing --add-missing --copy ${AUTOMAKE_FLAGS}
......
......@@ -141,6 +141,9 @@ LOCAL_SRC_FILES += gsm.c
LOCAL_CFLAGS += \
-UHAVE_CONFIG_H \
-include $(LOCAL_PATH)/../build/android/libmediastreamer2_AndroidConfig.h \
-DMS2_INTERNAL \
-DINET6 \
-DORTP_INET6 \
-D_POSIX_SOURCE -Wall
......
dnl Process this file with autoconf to produce a configure script.
AC_INIT([mediastreamer],[2.7.1])
AC_INIT([mediastreamer],[2.7.3])
AC_MSG_NOTICE([$PACKAGE_NAME-$PACKAGE_VERSION A mediastreaming library for telephony application.])
AC_MSG_NOTICE([licensed under the terms of the General Public License (GPL)])
......@@ -71,24 +71,24 @@ if test x$ipv6 = xtrue ; then
fi
AC_ARG_ENABLE(debug,
[ --enable-debug=[yes/no] enables the display of traces showing the execution of the library. [default=yes]],
[case "${enableval}" in
yes) debug_enabled=yes;;
no) debug_enabled=no;;
*) AC_MSG_ERROR("Bad value for --enable-debug");;
esac],
[debug_enabled=no] )
dnl Checks for programs.
AC_PROG_CC
AC_PROG_CXX
AC_PROG_OBJC
AC_LIBTOOL_WIN32_DLL
AC_PROG_LIBTOOL
AC_ENABLE_SHARED(yes)
AC_ENABLE_STATIC(no)
AC_CONFIG_MACRO_DIR([m4])
LT_INIT([win32-dll shared disable-static])
AC_SUBST([LIBTOOL_DEPS])
dnl localization tools
IT_PROG_INTLTOOL([0.40], [no-xml])
AM_GNU_GETTEXT([external])
AM_GNU_GETTEXT_VERSION([0.18])
GETTEXT_PACKAGE="mediastreamer"
AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,["mediastreamer"],[name of the gettext domain. Used in the call to 'bindtextdomain()'])
AC_SUBST([GETTEXT_PACKAGE])
if test "$GCC" != "yes" ; then
case $target_os in
......@@ -101,13 +101,29 @@ else
CFLAGS="$CFLAGS -Wall"
fi
if test $debug_enabled = "yes"; then
CFLAGS="$CFLAGS -g -DDEBUG"
else
CFLAGS="$CFLAGS -O2 -g "
fi
AC_ARG_ENABLE([debug],
AS_HELP_STRING([--enable-debug=@<:@yes/no@:>@],[enables the display of traces showing the execution of the library. @<:@default=yes@:>@]),
[], dnl [action-if-given]
[enable_debug=no]) dnl [action-if-not-given]
AS_CASE([$enable_debug],
[yes],[
CFLAGS="$CFLAGS -g -DDEBUG"
CXXFLAGS="$CXXFLAGS -g -DDEBUG"
],
[no],
[
case "$CFLAGS" in
*-O*)
;;
*)
CFLAGS="$CFLAGS -O2 -g"
CXXFLAGS="$CXXFLAGS -O2 -g"
;;
esac
],
[AC_MSG_ERROR([Bad value ($enable_debug) for --enable-debug. Valid values are yes or no.])])
dnl Checks for header files.
AC_HEADER_STDC
......@@ -134,7 +150,7 @@ case $target_os in
MSPLUGINS_CFLAGS=""
MSPLUGINS_LIBS="-dynamiclib"
macosx_found=yes
LIBS="$LIBS -framework CoreFoundation -framework AudioToolbox -framework CoreAudio"
LIBS="$LIBS -framework CoreFoundation -framework AudioToolbox -framework CoreAudio "
;;
*mingw32ce)
CFLAGS="$CFLAGS -DINET6 -DORTP_INET6 -D_WIN32_WINNT=0x0501 -D_WIN32_WCE -DORTP_STATIC"
......@@ -335,42 +351,43 @@ AC_SUBST(PORTAUDIO_LIBS)
AM_CONDITIONAL(BUILD_PORTAUDIO, test x$portaudio_enabled = xtrue)
AC_ARG_ENABLE(macsnd,
[ --enable-macsnd Turn on native macosx sound support (default=no)],
[ --enable-macsnd Turn on Audio Units macosx sound support (default=yes)],
[case "${enableval}" in
yes) macsnd=true ;;
no) macsnd=false ;;
*) AC_MSG_ERROR(bad value ${enableval} for --enable-macsnd) ;;
esac],[macsnd=false])
if test "$macsnd" = "true"; then
AC_DEFINE(__MACSND_ENABLED__,1,[defined if native macosx sound support is available])
macsnd_enabled=true
found_sound=yes
fi
AM_CONDITIONAL(BUILD_MACSND, test x$macsnd_enabled = xtrue)
esac],[macsnd=true])
AC_ARG_ENABLE(macaqsnd,
[ --enable-macaqsnd Turn on native macosx Audio Queue sound support (default=yes)],
[ --enable-macaqsnd Turn on native macosx Audio Queue sound support (default=no)],
[case "${enableval}" in
yes) macaqsnd=true ;;
no) macaqsnd=false ;;
*) AC_MSG_ERROR(bad value ${enableval} for --enable-macaqsnd) ;;
esac],[macaqsnd=true])
esac],[macaqsnd=false])
if test "$macosx_found" != "yes" ; then
macaqsnd=false
fi
if test "$macaqsnd" = "true"; then
AC_DEFINE(__MAC_AQ_ENABLED__,1,[defined if native macosx AQ sound support is available])
found_sound=yes
if test "$macosx_found" = "yes" ; then
if test "$macsnd" = "true"; then
AC_DEFINE(__MACSND_ENABLED__,1,[defined if native macosx sound support is available])
macsnd_enabled=true
LIBS="$LIBS -framework Carbon -framework AudioUnit"
found_sound=yes
fi
if test "$macaqsnd" = "true"; then
AC_DEFINE(__MAC_AQ_ENABLED__,1,[defined if native macosx AQ sound support is available])
found_sound=yes
macaqsnd=true
fi
fi
AM_CONDITIONAL(BUILD_MACSND, test x$macsnd_enabled = xtrue)
AM_CONDITIONAL(BUILD_MACAQSND, test x$macaqsnd = xtrue)
AC_ARG_ENABLE(iounit,
[ --enable-iounit Turn on native apple iounit support (default=no)],
[ --enable-iounit Turn on native iOS audio unit support (default=no)],
[case "${enableval}" in
yes) iounit=true ;;
no) iounit=false ;;
......@@ -471,7 +488,7 @@ PKG_CHECK_MODULES(SPEEXDSP, speexdsp >= 1.2beta3,
[SPEEX_LIBS="$SPEEX_LIBS $SPEEXDSP_LIBS"
AC_DEFINE(HAVE_SPEEXDSP,1,[have speexdsp library])
build_resample=yes] ,
[AC_MSG_NOTICE([No speexdsp library found.])
[AC_MSG_ERROR([No libspeexdsp library found.])
]
)
AC_SUBST(SPEEX_CFLAGS)
......@@ -700,13 +717,14 @@ AC_SUBST(VENDOR)
RELEASE=1
AC_SUBST(RELEASE)
CFLAGS="$CFLAGS $MS_PUBLIC_CFLAGS"
CXXFLAGS="$CXXFLAGS $MS_PUBLIC_CFLAGS"
CFLAGS="$CFLAGS $MS_PUBLIC_CFLAGS "
CXXFLAGS="$CXXFLAGS $MS_PUBLIC_CFLAGS "
dnl: these ones gets exported in pkgconfig file.
AC_SUBST(MS_PUBLIC_CFLAGS)
AC_OUTPUT(
AC_CONFIG_FILES(
Makefile
po/Makefile.in
include/Makefile
include/mediastreamer2/Makefile
src/Makefile
......@@ -724,3 +742,6 @@ help/Doxyfile
help/doxygen.dox
)
AC_OUTPUT
......@@ -20,7 +20,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#ifndef dtmfgen_h
#define dtmfgen_h
#include "msfilter.h"
#include <mediastreamer2/msfilter.h>
#define MS_DTMF_GEN_PUT MS_FILTER_METHOD(MS_DTMF_GEN_ID,0,const char)
/** Plays dtmf tone given in argument with default duration*/
......
......@@ -20,7 +20,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#ifndef ice_hh
#define ice_hh
#include "msfilter.h"
#include <mediastreamer2/msfilter.h>
#include "ortp/stun_udp.h"
#include "ortp/stun.h"
#include "ortp/ortp.h"
......
......@@ -21,15 +21,13 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#ifndef MEDIASTREAM_H
#define MEDIASTREAM_H
#include "mediastreamer2/msfilter.h"
#include "mediastreamer2/msticker.h"
#include "mediastreamer2/mssndcard.h"
#include "mediastreamer2/mswebcam.h"
#include "mediastreamer2/msvideo.h"
#include "ortp/ortp.h"
#include "ortp/event.h"
#include <mediastreamer2/msfilter.h>
#include <mediastreamer2/msticker.h>
#include <mediastreamer2/mssndcard.h>
#include <mediastreamer2/mswebcam.h>
#include <mediastreamer2/msvideo.h>
#include <ortp/ortp.h>
#include <ortp/event.h>
typedef enum EchoLimiterType{
......@@ -58,9 +56,6 @@ struct _AudioStream
uint64_t last_packet_count;
time_t last_packet_time;
EchoLimiterType el_type; /*use echo limiter: two MSVolume, measured input level controlling local output level*/
int ec_tail_len; /*milliseconds*/
int ec_delay; /*milliseconds*/
int ec_framesize; /* number of fft points */
OrtpEvQueue *evq;
bool_t play_dtmfs;
bool_t use_gc;
......
......@@ -19,7 +19,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#ifndef msaudiomixer_h
#define msaudiomixer_h
#include "mediastreamer2/msfilter.h"
#include <mediastreamer2/msfilter.h>
typedef struct MSAudioMixerCtl{
int pin;
......
......@@ -19,7 +19,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#ifndef mchanadapter_h
#define mchanadapter_h
#include "msfilter.h"
#include <mediastreamer2/msfilter.h>
#define MS_CHANNEL_ADAPTER_SET_OUTPUT_NCHANNELS MS_FILTER_METHOD(MS_CHANNEL_ADAPTER_ID,0,int)
#define MS_CHANNEL_ADAPTER_GET_OUTPUT_NCHANNELS MS_FILTER_METHOD(MS_CHANNEL_ADAPTER_ID,1,int)
......
......@@ -78,8 +78,6 @@ static inline void ms_debug(const char *fmt,...)
#endif
#endif
#define ms_message ortp_message
#define ms_warning ortp_warning
#define ms_error ortp_error
......@@ -219,8 +217,21 @@ MS2_PUBLIC void ms_set_mtu(int mtu);
}
#endif
#ifdef MS2_INTERNAL
# ifdef HAVE_CONFIG_H
# include "mediastreamer-config.h" /*necessary to know if ENABLE_NLS is there*/
# endif
# if defined(ENABLE_NLS)
# include <libintl.h>
# define _(String) dgettext (GETTEXT_PACKAGE, String)
# else
# define _(String) (String)
# endif // ENABLE_NLS
#define N_(String) (String)
#endif // MS2_INTERNAL
#ifdef ANDROID
#include "mediastreamer2/msjava.h"
#endif
#endif
......@@ -20,7 +20,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#ifndef mseventqueue_h
#define mseventqueue_h
#include "mediastreamer2/mscommon.h"
#include <mediastreamer2/mscommon.h>
typedef struct _MSEventQueue MSEventQueue;
......
......@@ -19,8 +19,8 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#ifndef msextdisplay_h
#define msextdisplay_h
#include "mediastreamer2/msfilter.h"
#include "mediastreamer2/msvideo.h"
#include <mediastreamer2/msfilter.h>
#include <mediastreamer2/msvideo.h>
typedef struct _MSExtDisplayOutput{
MSPicture remote_view;
......
......@@ -19,7 +19,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#ifndef msfileplayer_h
#define msfileplayer_h
#include "msfilter.h"
#include <mediastreamer2/msfilter.h>
/*methods*/
......
......@@ -19,7 +19,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#ifndef msfilerec_h
#define msfilerec_h
#include "msfilter.h"
#include <mediastreamer2/msfilter.h>
extern MSFilterDesc ms_file_rec_desc;
......
......@@ -223,6 +223,16 @@ MS2_PUBLIC MSFilterDesc * ms_filter_get_encoder(const char *mime);
*/
MS2_PUBLIC MSFilterDesc * ms_filter_get_decoder(const char *mime);
/**
* Lookup a mediastreamer2 filter using its name.
* If found, the descriptor (MSFilterDesc) is returned.
* This descriptor can be used to instanciate the filter using ms_filter_new_from_desc()
* This function can be useful to query the presence of a filter loaded as a plugin, for example.
*
* @param name The filter name.
**/
MS2_PUBLIC MSFilterDesc *ms_filter_lookup_by_name(const char *filter_name);
/**
* Create encoder filter according to codec name.
*
......@@ -563,7 +573,4 @@ void ms_filter_unregister_all(void);
/* used by awk script in Makefile.am to generate alldescs.c */
#define MS_FILTER_DESC_EXPORT(desc)
/* xgettext markup */
#define N_(String) String
#endif
......@@ -100,16 +100,25 @@ typedef enum _MSPlayerState MSPlayerState;
#define MS_ECHO_CANCELLER_SET_TAIL_LENGTH \
MS_FILTER_METHOD(MSFilterEchoCancellerInterface,2,int)
/** Interface definitions for video decoders */
#define MS_VIDEO_DECODER_DECODING_ERRORS \
MS_FILTER_EVENT_NO_ARG(MSFilterVideoDecoderInterface,0)
/** put filter in bypass mode */
#define MS_ECHO_CANCELLER_SET_BYPASS_MODE \
MS_FILTER_METHOD(MSFilterEchoCancellerInterface,3,bool_t)
/** get filter bypass mode */
#define MS_ECHO_CANCELLER_GET_BYPASS_MODE \
MS_FILTER_METHOD(MSFilterEchoCancellerInterface,4,bool_t)
/** retrieve echo canceller internal state, as a base64 encoded string */
#define MS_ECHO_CANCELLER_GET_STATE_STRING \
MS_FILTER_METHOD(MSFilterEchoCancellerInterface,5,char **)
/** restore a previous state suppling the echo canceller config as base64 encoded string */
#define MS_ECHO_CANCELLER_SET_STATE_STRING \
MS_FILTER_METHOD(MSFilterEchoCancellerInterface,6, const char *)
/** Interface definitions for video decoders */
#define MS_VIDEO_DECODER_DECODING_ERRORS \
MS_FILTER_EVENT_NO_ARG(MSFilterVideoDecoderInterface,0)
#endif
......@@ -19,7 +19,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#ifndef msitc_h
#define msitc_h
#include "msfilter.h"
#include <mediastreamer2/msfilter.h>
#define MS_ITC_SINK_CONNECT MS_FILTER_METHOD(MS_ITC_SINK_ID,0,MSFilter)
......
......@@ -20,7 +20,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#ifndef msjpegwriter_h
#define msjpegwriter_h
#include "mediastreamer2/msfilter.h"
#include <mediastreamer2/msfilter.h>
#define MS_JPEG_WRITER_TAKE_SNAPSHOT MS_FILTER_METHOD(MS_JPEG_WRITER_ID,0,const char)
......
......@@ -19,8 +19,8 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#ifndef MSQUEUE_H
#define MSQUEUE_H
#include "ortp/str_utils.h"
#include "mediastreamer2/mscommon.h"
#include <ortp/str_utils.h>
#include <mediastreamer2/mscommon.h>
/* for the moment these are stupid queues limited to one element*/
......
......@@ -21,9 +21,9 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#ifndef msrtp_hh
#define msrtp_hh
#include "msfilter.h"
#include "ice.h"
#include "ortp/ortp.h"
#include <mediastreamer2/msfilter.h>
#include <mediastreamer2/ice.h>
#include <ortp/ortp.h>
#define MS_RTP_RECV_SET_SESSION MS_FILTER_METHOD(MS_RTP_RECV_ID,0,RtpSession*)
......
......@@ -20,7 +20,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#ifndef sndcard_h
#define sndcard_h
#include "mscommon.h"
#include <mediastreamer2/mscommon.h>
/**
* @file mssndcard.h
......
......@@ -19,7 +19,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#ifndef mstee_h
#define mstee_h
#include "msfilter.h"
#include <mediastreamer2/msfilter.h>
/*mute/unmute some outputs of the MSTee */
#define MS_TEE_UNMUTE MS_FILTER_METHOD(MS_TEE_ID,0,int)
......
......@@ -21,9 +21,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#ifndef MS_TICKER_H
#define MS_TICKER_H
#include "msfilter.h"
#include "mscommon.h"
#include <mediastreamer2/msfilter.h>
/**
* @file msticker.h
......
......@@ -21,7 +21,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#ifndef mstonedetector_h
#define mstonedetector_h
#include "mediastreamer2/msfilter.h"
#include <mediastreamer2/msfilter.h>
/**
* Structure describing which tone is to be detected.
......
......@@ -20,7 +20,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#ifndef msv4l_h
#define msv4l_h
#include "msfilter.h"
#include <mediastreamer2/msfilter.h>
#define MS_V4L_START MS_FILTER_METHOD_NO_ARG(MS_V4L_ID,0)
#define MS_V4L_STOP MS_FILTER_METHOD_NO_ARG(MS_V4L_ID,1)
......
......@@ -20,7 +20,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#ifndef msvideo_h
#define msvideo_h
#include "msfilter.h"
#include <mediastreamer2/msfilter.h>
/* some global constants for video MSFilter(s) */
#define MS_VIDEO_SIZE_SQCIF_W 128
......
......@@ -20,7 +20,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#ifndef msvolume_h
#define msvolume_h
#include "msfilter.h"
#include <mediastreamer2/msfilter.h>
/**
* The Volume MSFilter can do:
......@@ -69,6 +69,9 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#define MS_VOLUME_SET_EA_TRANSMIT_THRESHOLD MS_FILTER_METHOD(MS_VOLUME_ID,17,float)
#define MS_VOLUME_DB_LOWEST (-120) /*arbitrary value returned when linear volume is 0*/
extern MSFilterDesc ms_volume_desc;
#endif
......@@ -20,7 +20,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#ifndef webcam_h
#define webcam_h
#include "mscommon.h"
#include <mediastreamer2/mscommon.h>
/**
* @file mswebcam.h
......
......@@ -20,8 +20,8 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#ifndef rfc3984_h
#define rfc3984_h
#include "mediastreamer2/mscommon.h"
#include "mediastreamer2/msqueue.h"
#include <mediastreamer2/mscommon.h>
#include <mediastreamer2/msqueue.h>
/*
This file declares an API useful to pack/unpack H264 nals as described in RFC3984
......
......@@ -20,10 +20,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
/* the following code was taken from a free software utility that I don't remember the name. */
/* sorry */
#ifdef HAVE_CONFIG_H
#include "mediastreamer-config.h"
#endif
#ifndef waveheader_h
#define waveheader_h
......
.intltool-merge-cache
Makefile
Makefile.in
Makefile.in.in