From 6d991a301e8f2488cc0968e3ed89a2da162a08d3 Mon Sep 17 00:00:00 2001 From: aymeric Date: Wed, 18 Nov 2009 13:23:16 +0000 Subject: [PATCH] add support for QSIF, SIF and 4SIF git-svn-id: svn+ssh://svn.savannah.nongnu.org/linphone/trunk@764 3f6dc0c8-ddfe-455d-9043-3cd528dc4637 --- linphone/mediastreamer2/include/mediastreamer2/msvideo.h | 7 +++++++ linphone/mediastreamer2/src/msvideo.c | 9 +++++++++ 2 files changed, 16 insertions(+) diff --git a/linphone/mediastreamer2/include/mediastreamer2/msvideo.h b/linphone/mediastreamer2/include/mediastreamer2/msvideo.h index acc889966..e0aa383c5 100644 --- a/linphone/mediastreamer2/include/mediastreamer2/msvideo.h +++ b/linphone/mediastreamer2/include/mediastreamer2/msvideo.h @@ -30,6 +30,13 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #define MS_VIDEO_SIZE_4CIF_W 704 #define MS_VIDEO_SIZE_4CIF_H 576 +#define MS_VIDEO_SIZE_QSIF_W 176 +#define MS_VIDEO_SIZE_QSIF_H 120 +#define MS_VIDEO_SIZE_SIF_W 352 +#define MS_VIDEO_SIZE_SIF_H 240 +#define MS_VIDEO_SIZE_4SIF_W 704 +#define MS_VIDEO_SIZE_4SIF_H 480 + #define MS_VIDEO_SIZE_QQVGA_W 160 #define MS_VIDEO_SIZE_QQVGA_H 120 diff --git a/linphone/mediastreamer2/src/msvideo.c b/linphone/mediastreamer2/src/msvideo.c index 4cd313c94..32ffb0c86 100644 --- a/linphone/mediastreamer2/src/msvideo.c +++ b/linphone/mediastreamer2/src/msvideo.c @@ -68,6 +68,15 @@ int yuv_buf_init_from_mblk(YuvBuf *buf, mblk_t *m){ }else if (size==(MS_VIDEO_SIZE_800X600_W*MS_VIDEO_SIZE_800X600_H*3)/2){ w=MS_VIDEO_SIZE_800X600_W; h=MS_VIDEO_SIZE_800X600_H; + }else if (size==(MS_VIDEO_SIZE_QSIF_W*MS_VIDEO_SIZE_QSIF_H*3)/2){ + w=MS_VIDEO_SIZE_QSIF_W; + h=MS_VIDEO_SIZE_QSIF_H; + }else if (size==(MS_VIDEO_SIZE_SIF_W*MS_VIDEO_SIZE_SIF_H*3)/2){ + w=MS_VIDEO_SIZE_SIF_W; + h=MS_VIDEO_SIZE_SIF_H; + }else if (size==(MS_VIDEO_SIZE_4SIF_W*MS_VIDEO_SIZE_4SIF_H*3)/2){ + w=MS_VIDEO_SIZE_4SIF_W; + h=MS_VIDEO_SIZE_4SIF_H; }else if (size==(160*112*3)/2){/*format used by econf*/ w=160; h=112;