Commit 1cf3b8e3 authored by Yann Diorcet's avatar Yann Diorcet
Browse files

Merge branch 'master' of git.linphone.org:mediastreamer2 into upnp

parents b8dffb27 d5811e37
......@@ -55,7 +55,7 @@ patent must be licensed for everyone's free use or not licensed at all.
The precise terms and conditions for copying, distribution and
modification follow.
GNU GENERAL PUBLIC LICENSE
TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
......@@ -110,7 +110,7 @@ above, provided that you also meet all of these conditions:
License. (Exception: if the Program itself is interactive but
does not normally print such an announcement, your work based on
the Program is not required to print an announcement.)
These requirements apply to the modified work as a whole. If
identifiable sections of that work are not derived from the Program,
and can be reasonably considered independent and separate works in
......@@ -168,7 +168,7 @@ access to copy from a designated place, then offering equivalent
access to copy the source code from the same place counts as
distribution of the source code, even though third parties are not
compelled to copy the source along with the object code.
4. You may not copy, modify, sublicense, or distribute the Program
except as expressly provided under this License. Any attempt
otherwise to copy, modify, sublicense or distribute the Program is
......@@ -225,7 +225,7 @@ impose that choice.
This section is intended to make thoroughly clear what is believed to
be a consequence of the rest of this License.
8. If the distribution and/or use of the Program is restricted in
certain countries either by patents or by copyrighted interfaces, the
original copyright holder who places the Program under this License
......@@ -278,7 +278,7 @@ PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
POSSIBILITY OF SUCH DAMAGES.
END OF TERMS AND CONDITIONS
How to Apply These Terms to Your New Programs
If you develop a new program, and you want it to be of the greatest
......
......@@ -27,6 +27,12 @@ LOCAL_ARM_MODE := arm
MEDIASTREAMER2_INCLUDES := \
$(LOCAL_PATH)/../build/android \
$(LOCAL_PATH)/base \
$(LOCAL_PATH)/utils \
$(LOCAL_PATH)/voip \
$(LOCAL_PATH)/audiofilters \
$(LOCAL_PATH)/otherfilters \
$(LOCAL_PATH)/videofilters \
$(LOCAL_PATH)/../include \
$(LOCAL_PATH)/../../oRTP \
$(LOCAL_PATH)/../../oRTP/include \
......@@ -44,48 +50,48 @@ MEDIASTREAMER2_INCLUDES := \
LOCAL_MODULE := libmediastreamer2
LOCAL_SRC_FILES = \
audiomixer.c \
audioconference.c \
mscommon.c \
msfilter.c \
msqueue.c \
msticker.c \
mediastream.c \
msvoip.c \
alaw.c \
ulaw.c \
mssndcard.c \
msfileplayer.c \
msrtp.c \
dtmfgen.c \
msfilerec.c \
ice.c \
tee.c \
msconf.c \
msjoin.c \
msvolume.c \
mtu.c \
mswebcam.c \
equalizer.c \
dsptools.c \
kiss_fft.c \
kiss_fftr.c \
void.c \
msandroid.cpp \
eventqueue.c \
msjava.c \
tonedetector.c \
audiostream.c \
ringstream.c \
qualityindicator.c \
bitratecontrol.c \
bitratedriver.c \
qosanalyzer.c \
msg722.c \
g722_decode.c \
g722_encode.c \
l16.c \
msresample.c \
base/mscommon.c \
base/msfilter.c \
base/msqueue.c \
base/msticker.c \
base/mssndcard.c \
base/mtu.c \
base/mswebcam.c \
base/eventqueue.c \
voip/audioconference.c \
voip/mediastream.c \
voip/msvoip.c \
voip/ice.c \
voip/audiostream.c \
voip/ringstream.c \
voip/qualityindicator.c \
voip/bitratecontrol.c \
voip/bitratedriver.c \
voip/qosanalyzer.c \
utils/dsptools.c \
utils/kiss_fft.c \
utils/kiss_fftr.c \
utils/msjava.c \
utils/g722_decode.c \
utils/g722_encode.c \
otherfilters/msrtp.c \
otherfilters/tee.c \
otherfilters/join.c \
otherfilters/void.c \
audiofilters/audiomixer.c \
audiofilters/alaw.c \
audiofilters/ulaw.c \
audiofilters/msfileplayer.c \
audiofilters/dtmfgen.c \
audiofilters/msfilerec.c \
audiofilters/msconf.c \
audiofilters/msvolume.c \
audiofilters/equalizer.c \
audiofilters/tonedetector.c \
audiofilters/msg722.c \
audiofilters/l16.c \
audiofilters/msresample.c \
android/androidsound_depr.cpp \
android/loader.cpp \
android/androidsound.cpp \
android/AudioRecord.cpp \
......@@ -95,12 +101,12 @@ LOCAL_SRC_FILES = \
ifneq ($(TARGET_ARCH_ABI), x86)
LOCAL_SRC_FILES += \
webrtc_aec.c
audiofilters/webrtc_aec.c
endif
##if BUILD_ALSA
ifeq ($(strip $(BOARD_USES_ALSA_AUDIO)),true)
LOCAL_SRC_FILES += alsa.c
LOCAL_SRC_FILES += audiofilters/alsa.c
LOCAL_CFLAGS += -D__ALSA_ENABLED__
endif
......@@ -112,50 +118,50 @@ endif
ifeq ($(LINPHONE_VIDEO),1)
LOCAL_SRC_FILES += \
videostream.c \
videoenc.c \
videodec.c \
pixconv.c \
sizeconv.c \
nowebcam.c \
h264dec.c \
rfc3984.c \
mire.c \
layouts.c \
android-display.c \
android-display-bad.cpp \
msandroidvideo.cpp \
vp8.c \
shaders.c \
opengles_display.c \
android-opengl-display.c \
jpegwriter.c
voip/videostream.c \
voip/rfc3984.c \
voip/layouts.c \
utils/shaders.c \
utils/opengles_display.c \
videofilters/videoenc.c \
videofilters/videodec.c \
videofilters/pixconv.c \
videofilters/sizeconv.c \
videofilters/nowebcam.c \
videofilters/h264dec.c \
videofilters/mire.c \
videofilters/vp8.c \
videofilters/jpegwriter.c \
android/android-display.c \
android/android-display-bad.cpp \
android/androidvideo.cpp \
android/android-opengl-display.c
ifeq ($(TARGET_ARCH_ABI),armeabi-v7a)
LOCAL_CFLAGS += -DVIDEO_ENABLED
LOCAL_SRC_FILES+= \
scaler.c.neon \
scaler_arm.S.neon \
msvideo.c \
msvideo_neon.c.neon
voip/scaler.c.neon \
voip/scaler_arm.S.neon \
voip/msvideo.c \
voip/msvideo_neon.c.neon
else
LOCAL_SRC_FILES+= scaler.c \
msvideo.c
LOCAL_SRC_FILES+= voip/scaler.c \
voip/msvideo.c
endif
endif
#LOCAL_SRC_FILES += videostream.c
#LOCAL_SRC_FILES += voip/videostream.c
#
##if BUILD_THEORA
#LOCAL_SRC_FILES += theora.c
#LOCAL_SRC_FILES += videofilters/theora.c
#if BUILD_SPEEX
LOCAL_SRC_FILES += \
msspeex.c \
speexec.c
audiofilters/msspeex.c \
audiofilters/speexec.c
##if BUILD_GSM
LOCAL_SRC_FILES += gsm.c
LOCAL_SRC_FILES += audiofilters/gsm.c
LOCAL_CFLAGS += \
-UHAVE_CONFIG_H \
......
......@@ -42,7 +42,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories="..\..\include;..\..\..\oRTP\include;.;&quot;..\..\..\linphone-deps\include&quot;;&quot;..\..\..\linphone-deps\include\msvc&quot;"
AdditionalIncludeDirectories="..\..\include;..\..\src\base;..\..\src\utils;..\..\src\voip;..\..\src\audiofilters;..\..\src\otherfilters;..\..\src/videofilters;..\..\..\oRTP\include;.;&quot;..\..\..\linphone-deps\include&quot;;&quot;..\..\..\linphone-deps\include\msvc&quot;"
PreprocessorDefinitions="__STDC_CONSTANT_MACROS;HAVE_LIBSWSCALE_SWSCALE_H;HAVE_LIBAVCODEC_AVCODEC_H;HAVE_SPEEXDSP;HAVE_DIRECTSHOW;VIDEO_ENABLED;ORTP_INET6;WIN32;_DEBUG;_WINDOWS;_USRDLL;MEDIASTREAMER2_EXPORTS;WINDOW_NATIVE;_CRT_SECURE_NO_DEPRECATE;_TRUE_TIME;MS2_INTERNAL;MS2_FILTERS"
MinimalRebuild="true"
ExceptionHandling="0"
......@@ -130,7 +130,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="2"
AdditionalIncludeDirectories="..\..\include;..\..\..\oRTP\include;.;&quot;..\..\..\linphone-deps\include&quot;;&quot;..\..\..\linphone-deps\include\msvc&quot;"
AdditionalIncludeDirectories="..\..\include;..\..\src\base;..\..\src\utils;..\..\src\voip;..\..\src\audiofilters;..\..\src\otherfilters;..\..\src/videofilters;..\..\..\oRTP\include;.;&quot;..\..\..\linphone-deps\include&quot;;&quot;..\..\..\linphone-deps\include\msvc&quot;"
PreprocessorDefinitions="__STDC_CONSTANT_MACROS;HAVE_LIBSWSCALE_SWSCALE_H;HAVE_LIBAVCODEC_AVCODEC_H;HAVE_SPEEXDSP;HAVE_DIRECTSHOW;VIDEO_ENABLED;ORTP_INET6;WIN32;_DEBUG;_WINDOWS;_USRDLL;MEDIASTREAMER2_EXPORTS;WINDOW_NATIVE;_CRT_SECURE_NO_DEPRECATE;_TRUE_TIME;MS2_INTERNAL;MS2_FILTERS"
MinimalRebuild="true"
ExceptionHandling="0"
......@@ -199,115 +199,123 @@
UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
>
<File
RelativePath="..\..\src\alaw.c"
RelativePath="..\..\src\audiofilters\alaw.c"
>
</File>
<File
RelativePath="..\..\src\audioconference.c"
RelativePath="..\..\src\voip\audioconference.c"
>
</File>
<File
RelativePath="..\..\src\audiomixer.c"
RelativePath="..\..\src\audiofilters\audiomixer.c"
>
</File>
<File
RelativePath="..\..\src\audiostream.c"
RelativePath="..\..\src\voip\audiostream.c"
>
</File>
<File
RelativePath="..\..\src\bitratecontrol.c"
RelativePath="..\..\src\voip\bitratecontrol.c"
>
</File>
<File
RelativePath="..\..\src\bitratedriver.c"
RelativePath="..\..\src\voip\bitratedriver.c"
>
</File>
<File
RelativePath="..\..\src\chanadapt.c"
RelativePath="..\..\src\audiofilters\chanadapt.c"
>
</File>
<File
RelativePath="..\..\src\drawdib-display.c"
RelativePath="..\..\src\videofilters\drawdib-display.c"
>
</File>
<File
RelativePath="..\..\src\dsptools.c"
RelativePath="..\..\src\utils\dsptools.c"
>
</File>
<File
RelativePath="..\..\src\dtmfgen.c"
RelativePath="..\..\src\audiofilters\dtmfgen.c"
>
</File>
<File
RelativePath="..\..\src\equalizer.c"
RelativePath="..\..\src\audiofilters\equalizer.c"
>
</File>
<File
RelativePath="..\..\src\eventqueue.c"
RelativePath="..\..\src\base\eventqueue.c"
>
</File>
<File
RelativePath="..\..\src\extdisplay.c"
RelativePath="..\..\src\videofilters\extdisplay.c"
>
</File>
<File
RelativePath="..\..\src\g722_decode.c"
RelativePath="..\..\src\utils\g722_decode.c"
>
</File>
<File
RelativePath="..\..\src\g722_encode.c"
RelativePath="..\..\src\utils\g722_encode.c"
>
</File>
<File
RelativePath="..\..\src\gsm.c"
RelativePath="..\..\src\audiofilters\gsm.c"
>
</File>
<File
RelativePath="..\..\src\h264dec.c"
RelativePath="..\..\src\videofilters\h264dec.c"
>
</File>
<File
RelativePath="..\..\src\ice.c"
RelativePath="..\..\src\voip\ice.c"
>
</File>
<File
RelativePath="..\..\src\itc.c"
RelativePath="..\..\src\otherfilters\itc.c"
>
</File>
<File
RelativePath="..\..\src\jpegwriter.c"
RelativePath="..\..\src\otherfilters\join.c"
>
</File>
<File
RelativePath="..\..\src\kiss_fft.c"
RelativePath="..\..\src\videofilters\jpegwriter.c"
>
</File>
<File
RelativePath="..\..\src\kiss_fftr.c"
RelativePath="..\..\src\utils\kiss_fft.c"
>
</File>
<File
RelativePath="..\..\src\l16.c"
RelativePath="..\..\src\utils\kiss_fftr.c"
>
</File>
<File
RelativePath="..\..\src\layouts.c"
RelativePath="..\..\src\audiofilters\l16.c"
>
</File>
<File
RelativePath="..\..\src\mire.c"
RelativePath="..\..\src\voip\layouts.c"
>
</File>
<File
RelativePath="..\..\src\mscommon.c"
RelativePath="..\..\src\voip\mediastream.c"
>
</File>
<File
RelativePath="..\..\src\msconf.c"
RelativePath="..\..\src\videofilters\mire.c"
>
</File>
<File
RelativePath="..\..\src\msdscap-mingw.cc"
RelativePath="..\..\src\base\mscommon.c"
>
</File>
<File
RelativePath="..\..\src\audiofilters\msconf.c"
>
</File>
<File
RelativePath="..\..\src\videofilters\msdscap-mingw.cc"
>
<FileConfiguration
Name="Debug|Win32"
......@@ -327,135 +335,135 @@
</FileConfiguration>
</File>
<File
RelativePath="..\..\src\msfileplayer_win.c"
RelativePath="..\..\src\audiofilters\msfileplayer_win.c"
>
</File>
<File
RelativePath="..\..\src\msfilerec_win.c"
RelativePath="..\..\src\audiofilters\msfilerec_win.c"
>
</File>
<File
RelativePath="..\..\src\msfilter.c"
RelativePath="..\..\src\base\msfilter.c"
>
</File>
<File
RelativePath="..\..\src\msg722.c"
RelativePath="..\..\src\audiofilters\msg722.c"
>
</File>
<File
RelativePath="..\..\src\msjoin.c"
RelativePath="..\..\src\base\msqueue.c"
>
</File>
<File
RelativePath="..\..\src\msqueue.c"
RelativePath="..\..\src\audiofilters\msresample.c"
>
</File>
<File
RelativePath="..\..\src\msresample.c"
RelativePath="..\..\src\otherfilters\msrtp.c"
>
</File>
<File
RelativePath="..\..\src\msrtp.c"
RelativePath="..\..\src\base\mssndcard.c"
>
</File>
<File
RelativePath="..\..\src\mssndcard.c"
RelativePath="..\..\src\audiofilters\msspeex.c"
>
</File>
<File
RelativePath="..\..\src\msspeex.c"
RelativePath="..\..\src\base\msticker.c"
>
</File>
<File
RelativePath="..\..\src\msticker.c"
RelativePath="..\..\src\voip\msvideo.c"
>
</File>
<File
RelativePath="..\..\src\msvideo.c"
RelativePath="..\..\src\voip\msvoip.c"
>
</File>
<File
RelativePath="..\..\src\msvoip.c"
RelativePath="..\..\src\audiofilters\msvolume.c"
>
</File>
<File
RelativePath="..\..\src\msvolume.c"
RelativePath="..\..\src\base\mswebcam.c"
>
</File>
<File
RelativePath="..\..\src\mswebcam.c"
RelativePath="..\..\src\base\mtu.c"
>
</File>
<File
RelativePath="..\..\src\mtu.c"
RelativePath="..\..\src\videofilters\nowebcam.c"
>
</File>
<File
RelativePath="..\..\src\nowebcam.c"
RelativePath="..\..\src\videofilters\pixconv.c"
>
</File>
<File
RelativePath="..\..\src\pixconv.c"
RelativePath="..\..\src\voip\qosanalyzer.c"
>
</File>
<File
RelativePath="..\..\src\qosanalyzer.c"
RelativePath="..\..\src\voip\qualityindicator.c"
>
</File>
<File
RelativePath="..\..\src\qualityindicator.c"
RelativePath="..\..\src\voip\rfc3984.c"
>
</File>
<File
RelativePath="..\..\src\rfc3984.c"
RelativePath="..\..\src\voip\ringstream.c"
>
</File>
<File
RelativePath="..\..\src\sizeconv.c"
RelativePath="..\..\src\videofilters\sizeconv.c"
>
</File>
<File
RelativePath="..\..\src\speexec.c"
RelativePath="..\..\src\audiofilters\speexec.c"
>
</File>
<File
RelativePath="..\..\src\tee.c"
RelativePath="..\..\src\otherfilters\tee.c"
>
</File>
<File
RelativePath="..\..\src\theora.c"
RelativePath="..\..\src\videofilters\theora.c"
>
</File>
<File
RelativePath="..\..\src\tonedetector.c"
RelativePath="..\..\src\audiofilters\tonedetector.c"
>
</File>
<File
RelativePath="..\..\src\ulaw.c"
RelativePath="..\..\src\audiofilters\ulaw.c"
>
</File>
<File
RelativePath="..\..\src\videodec.c"
RelativePath="..\..\src\videofilters\videodec.c"
>
</File>
<File
RelativePath="..\..\src\videoenc.c"
RelativePath="..\..\src\videofilters\videoenc.c"
>
</File>
<File
RelativePath="..\..\src\videostream.c"
RelativePath="..\..\src\voip\videostream.c"
>
</File>
<File
RelativePath="..\..\src\void.c"
RelativePath="..\..\src\otherfilters\void.c"
>
</File>
<File
RelativePath="..\..\src\vp8.c"
RelativePath="..\..\src\videofilters\vp8.c"
>
</File>
<File
RelativePath="..\..\src\winsnd3.c"
RelativePath="..\..\src\audiofilters\winsnd3.c"
>
</File>
</Filter>
......@@ -465,7 +473,7 @@
UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
>
<File
RelativePath="..\..\src\_kiss_fft_guts.h"
RelativePath="..\..\src\utils\_kiss_fft_guts.h"
>
</File>
<File
......@@ -485,11 +493,11 @@
>
</File>
<File
RelativePath="..\..\src\ffmpeg-priv.h"
RelativePath="..\..\src\utils\ffmpeg-priv.h"
>
</File>
<File
RelativePath="..\..\include\mediastreamer2\g711common.h"
RelativePath="..\..\src\utils\g711common.h"
>
</File>
<File
......@@ -497,11 +505,11 @@
>
</File>
<File
RelativePath="..\..\src\kiss_fft.h"
RelativePath="..\..\src\utils\kiss_fft.h"
>
</File>
<File
RelativePath="..\..\src\kiss_fftr.h"
RelativePath="..\..\src\utils\kiss_fftr.h"
>