From 959334d7423c144c73094ca6fd4700e117ff3818 Mon Sep 17 00:00:00 2001 From: Ghislain MARY Date: Wed, 14 Aug 2013 13:53:18 +0200 Subject: [PATCH] Enable HD video on Android. --- build/android/common.mk | 3 +++ coreapi/linphonecore.c | 6 +++--- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/build/android/common.mk b/build/android/common.mk index adb73ff42..235030d13 100644 --- a/build/android/common.mk +++ b/build/android/common.mk @@ -79,6 +79,9 @@ LOCAL_CFLAGS += -DVIDEO_ENABLED ifeq ($(BUILD_X264),1) LOCAL_CFLAGS += -DHAVE_X264 endif +ifeq ($(LINPHONE_HD_VIDEO),1) +LOCAL_CFLAGS += -DENABLE_HD +endif endif ifeq ($(USE_JAVAH),1) diff --git a/coreapi/linphonecore.c b/coreapi/linphonecore.c index 0184afab0..3a29eac4c 100644 --- a/coreapi/linphonecore.c +++ b/coreapi/linphonecore.c @@ -4954,10 +4954,10 @@ int linphone_core_get_camera_sensor_rotation(LinphoneCore *lc) { static MSVideoSizeDef supported_resolutions[]={ #ifdef ENABLE_HD - { {MS_VIDEO_SIZE_1080P_W,MS_VIDEO_SIZE_1080P_H} , "1080p" }, - { {MS_VIDEO_SIZE_720P_W,MS_VIDEO_SIZE_720P_H} , "720p" }, + { { MS_VIDEO_SIZE_1080P_W,MS_VIDEO_SIZE_1080P_H } , "1080p" }, + { { MS_VIDEO_SIZE_720P_W,MS_VIDEO_SIZE_720P_H } , "720p" }, { { MS_VIDEO_SIZE_UXGA_W, MS_VIDEO_SIZE_UXGA_H } , "uxga" }, - { { MS_VIDEO_SIZE_SXGA_MINUS_W, MS_VIDEO_SIZE_SXGA_MINUS_H , "sxga-" }, + { { MS_VIDEO_SIZE_SXGA_MINUS_W, MS_VIDEO_SIZE_SXGA_MINUS_H } , "sxga-" }, { { MS_VIDEO_SIZE_XGA_W, MS_VIDEO_SIZE_XGA_H } , "xga" }, #endif { {MS_VIDEO_SIZE_SVGA_W,MS_VIDEO_SIZE_SVGA_H} , "svga" },