From 6c89df132d425152655acf4be313e12f18d7e0f7 Mon Sep 17 00:00:00 2001 From: Yann Diorcet Date: Wed, 25 Jan 2012 11:20:10 +0100 Subject: [PATCH 1/5] Add AMR-WB --- coreapi/linphonecore.c | 1 + 1 file changed, 1 insertion(+) diff --git a/coreapi/linphonecore.c b/coreapi/linphonecore.c index d2ef42364..f045c1a6c 100644 --- a/coreapi/linphonecore.c +++ b/coreapi/linphonecore.c @@ -1083,6 +1083,7 @@ static void linphone_core_init (LinphoneCore * lc, const LinphoneCoreVTable *vta /*add all payload type for which we don't care about the number */ linphone_core_assign_payload_type(lc,&payload_type_ilbc,-1,"mode=30"); linphone_core_assign_payload_type(lc,&payload_type_amr,-1,"octet-align=1"); + linphone_core_assign_payload_type(lc,&payload_type_amrwb,-1,"octet-align=1"); linphone_core_assign_payload_type(lc,&payload_type_lpc1015,-1,NULL); linphone_core_assign_payload_type(lc,&payload_type_g726_16,-1,NULL); linphone_core_assign_payload_type(lc,&payload_type_g726_24,-1,NULL); From 9b11921ae7147de44c718bb4a636d6c794be0946 Mon Sep 17 00:00:00 2001 From: Yann Diorcet Date: Thu, 26 Jan 2012 15:56:53 +0100 Subject: [PATCH 2/5] Update oRTP mediastreamer2 for AMR-WB integration --- mediastreamer2 | 2 +- oRTP | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/mediastreamer2 b/mediastreamer2 index 8e3778f1f..fbc201571 160000 --- a/mediastreamer2 +++ b/mediastreamer2 @@ -1 +1 @@ -Subproject commit 8e3778f1fd61b44124f7303e540b936f9da4560f +Subproject commit fbc201571d8ea4bdc208e87d2f81a109b8ebe060 diff --git a/oRTP b/oRTP index a936749fa..92f78b950 160000 --- a/oRTP +++ b/oRTP @@ -1 +1 @@ -Subproject commit a936749fac4d3e2f788a0c03b3c4ea2021b3ae13 +Subproject commit 92f78b9504915db0220bc6f617f0cd7ad9910771 From d964a2516783eed76b916415db2c2339745c3134 Mon Sep 17 00:00:00 2001 From: Yann Diorcet Date: Thu, 26 Jan 2012 15:59:03 +0100 Subject: [PATCH 3/5] Update Android make for AMR-WB integration --- build/android/Android.mk | 27 ++++++++++++++++++++------- 1 file changed, 20 insertions(+), 7 deletions(-) diff --git a/build/android/Android.mk b/build/android/Android.mk index 944f23611..346b57350 100755 --- a/build/android/Android.mk +++ b/build/android/Android.mk @@ -105,15 +105,28 @@ endif endif - -ifneq ($(BUILD_AMR),0) -LOCAL_CFLAGS += -DHAVE_AMR - -LOCAL_STATIC_LIBRARIES += \ - libmsamr \ - libopencoreamr +_BUILD_AMR=0 +ifneq ($(BUILD_AMRNB), 0) +_BUILD_AMR=1 endif +ifneq ($(BUILD_AMRWB), 0) +_BUILD_AMR=1 +endif + +ifneq ($(_BUILD_AMR), 0) +LOCAL_CFLAGS += -DHAVE_AMR +LOCAL_STATIC_LIBRARIES += \ + libmsamr \ + libopencoreamr +endif + +ifneq ($(BUILD_AMRWB), 0) +LOCAL_STATIC_LIBRARIES += \ + libvoamrwbenc +endif + + ifeq ($(BUILD_SILK),1) LOCAL_CFLAGS += -DHAVE_SILK LOCAL_STATIC_LIBRARIES += libmssilk From 83949d6c693e4a1b5d35a604f3e23436ad9b5425 Mon Sep 17 00:00:00 2001 From: Simon Morlat Date: Fri, 27 Jan 2012 17:21:31 +0100 Subject: [PATCH 4/5] update README for mingw --- README.mingw | 8 -------- 1 file changed, 8 deletions(-) diff --git a/README.mingw b/README.mingw index 91fe0f9be..e076c7ef0 100644 --- a/README.mingw +++ b/README.mingw @@ -14,7 +14,6 @@ In mingw shell, run mingw-get install msys-zip mingw-get install msys-unzip mingw-get install msys-wget -mingw-get install msys-libopenssl mkdir -p /opt/perl/bin cp /bin/perl /opt/perl/bin/. @@ -41,13 +40,6 @@ cd /share/themes wget http://art.gnome.org/download/themes/gtk2/1122/GTK2-Outcrop.tar.gz tar -xvzf GTK2-Outcrop.tar.gz -#Remove the special stdint.h and inttypes.h included in linphone-deps: it is for MSVC only. -#Mingw will use the one in /mingw/include -rm /include/stdint.h /include/inttypes.h - -#Remove libgcc specific libraries, only needed for MSVC: -rm /lib/libgcc.a /lib/libmingw32.a /lib/libmingwex.a - #To get the translations working, remove from C:/MinGW/lib : libintl.a libintl.la libintl.dll.a From feb0f9a9386cbf8561bdcc3d8e164efeef1298f8 Mon Sep 17 00:00:00 2001 From: Yann Diorcet Date: Mon, 30 Jan 2012 14:39:52 +0100 Subject: [PATCH 5/5] Fix dist build on windows --- gtk/Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gtk/Makefile.am b/gtk/Makefile.am index 42d5ff838..e237b823c 100644 --- a/gtk/Makefile.am +++ b/gtk/Makefile.am @@ -58,7 +58,7 @@ linphone_LDADD=$(ORTP_LIBS) \ if BUILD_WIN32 linphone.res: $(LINPHONE_ICO_RC_FILE) $(LINPHONE_ICO_FILE) - windres $(LINPHONE_ICO_RC_FILE) -O coff -o linphone.res + windres $(srcdir)/$(LINPHONE_ICO_RC_FILE) -O coff -o linphone.res linphone_LDADD+=linphone.res -lwininet linphone_LDFLAGS=-Wl,--export-all-symbols -mwindows