mirrors/linphone-iphone
1
0
Fork 1
mirror of https://gitlab.linphone.org/BC/public/linphone-iphone.git synced 2026-04-24 09:28:40 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'dev_videoios' into local_videoios

Browse source 
Conflicts:
	oRTP
This commit is contained in:
Simon Morlat 2011-10-28 21:57:01 +02:00
commit 92642e79c0
8 changed files with 28 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.gitmodules vendored
View file

@ -3,4 +3,4 @@
url = git://git.linphone.org/ortp.git url = git://git.linphone.org/ortp.git
[submodule "mediastreamer2"] [submodule "mediastreamer2"]
path = mediastreamer2 path = mediastreamer2
url = git://git.linphone.org/mediastreamer2.git url = gitosis@git.linphone.org:mediastreamer2-private.git

12
configure.ac
View file

@ -44,7 +44,7 @@ AM_PROG_CC_C_O
AC_CHECK_PROGS(MD5SUM,[md5sum md5]) AC_CHECK_PROGS(MD5SUM,[md5sum md5])
AM_CONDITIONAL(HAVE_MD5SUM,test -n $MD5SUM) AM_CONDITIONAL(HAVE_MD5SUM,test -n $MD5SUM)
case $target_os in case $target in
*mingw32ce) *mingw32ce)
CFLAGS="$CFLAGS -D_WIN32_WCE -DORTP_STATIC -D_WIN32_WINNT=0x0501" CFLAGS="$CFLAGS -D_WIN32_WCE -DORTP_STATIC -D_WIN32_WINNT=0x0501"
CXXFLAGS="$CXXFLAGS -DORTP_STATIC -D_WIN32_WINNT=0x0501" CXXFLAGS="$CXXFLAGS -DORTP_STATIC -D_WIN32_WINNT=0x0501"
@ -60,11 +60,18 @@ case $target_os in
CONSOLE_FLAGS="-mconsole" CONSOLE_FLAGS="-mconsole"
mingw_found=yes mingw_found=yes
;; ;;
*darwin*) armv6-apple-darwin|armv7-apple-darwin|i386-apple-darwin)
CFLAGS="$CFLAGS -DTARGET_OS_IPHONE "
build_tests=no
ios_found=yes
;;
x86_64-apple-darwin*|i686-apple-darwin*)
MSPLUGINS_CFLAGS=""
dnl use macport installation dnl use macport installation
ACLOCAL_MACOS_FLAGS="-I /opt/local/share/aclocal" ACLOCAL_MACOS_FLAGS="-I /opt/local/share/aclocal"
build_macos=yes build_macos=yes
;; ;;
esac esac
AC_SUBST(ACLOCAL_MACOS_FLAGS) AC_SUBST(ACLOCAL_MACOS_FLAGS)
@ -74,6 +81,7 @@ AC_SUBST(GUI_FLAGS)
dnl localization tools dnl localization tools
IT_PROG_INTLTOOL([0.40], [no-xml]) IT_PROG_INTLTOOL([0.40], [no-xml])
AM_CONDITIONAL(BUILD_TESTS,test x$build_tests != xno)
dnl Initialize libtool dnl Initialize libtool
LT_INIT([win32-dll shared disable-static]) LT_INIT([win32-dll shared disable-static])

3
coreapi/Makefile.am
View file

@ -50,8 +50,7 @@ liblinphone_la_LIBADD= \
if BUILD_WIN32 if BUILD_WIN32
liblinphone_la_LIBADD+=$(top_builddir)/oRTP/src/libortp.la liblinphone_la_LIBADD+=$(top_builddir)/oRTP/src/libortp.la
endif endif
if BUILD_TESTS
if ENABLE_TESTS
noinst_PROGRAMS=test_lsd test_ecc noinst_PROGRAMS=test_lsd test_ecc
test_lsd_SOURCES=test_lsd.c test_lsd_SOURCES=test_lsd.c

4
coreapi/help/Makefile.am
View file

@ -34,7 +34,7 @@ clean-local:
if ENABLE_TESTS if ENABLE_TESTS
#tutorials #tutorials
if BUILD_TESTS
noinst_PROGRAMS=helloworld registration buddy_status chatroom noinst_PROGRAMS=helloworld registration buddy_status chatroom
helloworld_SOURCES=helloworld.c helloworld_SOURCES=helloworld.c
@ -60,7 +60,7 @@ LINPHONE_TUTOS+=$(chatroom_SOURCES)
chatroom_LDADD=$(helloworld_LDADD) chatroom_LDADD=$(helloworld_LDADD)
endif endif
endif
INCLUDES=-I$(top_srcdir)/coreapi \ INCLUDES=-I$(top_srcdir)/coreapi \
$(MEDIASTREAMER_CFLAGS) $(MEDIASTREAMER_CFLAGS)

8
coreapi/linphonecore.c
View file

@ -3545,7 +3545,12 @@ void linphone_core_set_native_preview_window_id(LinphoneCore *lc, unsigned long
void linphone_core_use_preview_window(LinphoneCore *lc, bool_t yesno){ void linphone_core_use_preview_window(LinphoneCore *lc, bool_t yesno){
lc->use_preview_window=yesno; lc->use_preview_window=yesno;
} }
/**
*returns current device orientation
*/
int linphone_core_get_device_rotation(LinphoneCore *lc ) {
return lc->device_rotation;
}
/** /**
* Tells the core the device current orientation. This can be used by capture filters * Tells the core the device current orientation. This can be used by capture filters
* on mobile devices to select between portrait/landscape mode and to produce properly * on mobile devices to select between portrait/landscape mode and to produce properly
@ -3577,6 +3582,7 @@ static MSVideoSizeDef supported_resolutions[]={
{ {MS_VIDEO_SIZE_QVGA_H,MS_VIDEO_SIZE_QVGA_W} , "qvga-portrait" }, { {MS_VIDEO_SIZE_QVGA_H,MS_VIDEO_SIZE_QVGA_W} , "qvga-portrait" },
{ {MS_VIDEO_SIZE_QCIF_W,MS_VIDEO_SIZE_QCIF_H} , "qcif" }, { {MS_VIDEO_SIZE_QCIF_W,MS_VIDEO_SIZE_QCIF_H} , "qcif" },
{ {MS_VIDEO_SIZE_QCIF_H,MS_VIDEO_SIZE_QCIF_W} , "qcif-portrait" }, { {MS_VIDEO_SIZE_QCIF_H,MS_VIDEO_SIZE_QCIF_W} , "qcif-portrait" },
{ {MS_VIDEO_SIZE_IOS_MEDIUM_H,MS_VIDEO_SIZE_IOS_MEDIUM_W} , "ios-medium" },
{ {0,0} , NULL } { {0,0} , NULL }
}; };

1
coreapi/linphonecore.h
View file

@ -935,6 +935,7 @@ unsigned long linphone_core_get_native_preview_window_id(const LinphoneCore *lc)
void linphone_core_set_native_preview_window_id(LinphoneCore *lc, unsigned long id); void linphone_core_set_native_preview_window_id(LinphoneCore *lc, unsigned long id);
void linphone_core_use_preview_window(LinphoneCore *lc, bool_t yesno); void linphone_core_use_preview_window(LinphoneCore *lc, bool_t yesno);
int linphone_core_get_device_rotation(LinphoneCore *lc );
void linphone_core_set_device_rotation(LinphoneCore *lc, int rotation); void linphone_core_set_device_rotation(LinphoneCore *lc, int rotation);
/*play/record support: use files instead of soundcard*/ /*play/record support: use files instead of soundcard*/

4
coreapi/private.h
View file

@ -43,6 +43,10 @@
#define PACKAGE_SOUND_DIR "." #define PACKAGE_SOUND_DIR "."
#endif #endif
#ifndef PACKAGE_DATA_DIR
#define PACKAGE_DATA_DIR "."
#endif
#ifdef HAVE_GETTEXT #ifdef HAVE_GETTEXT
#include <libintl.h> #include <libintl.h>
#ifndef _ #ifndef _

2
mediastreamer2

@ -1 +1 @@
Subproject commit 0221aa7bce67b18c299c09033dc5b809423550ce Subproject commit 98198b49dc5f4bd7f192e87b6abd88e5c1e08a3a