Commit 6f2612b0 authored by Simon Morlat's avatar Simon Morlat

ready for a new release

parent 5c139fbb
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
......
# 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
......
......@@ -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:
--------------------
......
dnl Process this file with autoconf to produce a configure script.
AC_INIT([mediastreamer],[2.7.2])
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)])
......
/*
mediastreamer2 library - modular sound and video processing and streaming
Copyright (C) 2006 Simon MORLAT (simon.morlat@linphone.org)
Copyright (C) 2010-2011 Belledonne Communications (simon.morlat@linphone.org)
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
......@@ -17,7 +17,12 @@ along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
/* this file is specifically distributed under a BSD license */
/*
A prior version of this file was developed by Hiroki Mori and was contributed to the project
under a BSD license.
The source code has then largely evolved and was refactored.
The BSD license below is for the original work.
*/
/**
* Copyright (C) 2007 Hiroki Mori (himori@users.sourceforge.net)
......@@ -45,6 +50,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
**/
#include <CoreServices/CoreServices.h>
#include <AudioUnit/AudioUnit.h>
#include <AudioToolbox/AudioToolbox.h>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment