From de1c956b760a7f4d341841b69893481f8ecfcd33 Mon Sep 17 00:00:00 2001 From: Nanang Izzuddin Date: Tue, 26 Aug 2014 10:53:52 +0000 Subject: Re #1757: Add iOS video renderer OpenGL macro settings to config.h. git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@4907 74dad513-b988-da41-8d7b-12977e46ad98 --- pjmedia/include/pjmedia-videodev/config.h | 42 +++++++++++++++++++++++++++++++ 1 file changed, 42 insertions(+) diff --git a/pjmedia/include/pjmedia-videodev/config.h b/pjmedia/include/pjmedia-videodev/config.h index a0fed9c2..f11485f0 100644 --- a/pjmedia/include/pjmedia-videodev/config.h +++ b/pjmedia/include/pjmedia-videodev/config.h @@ -54,6 +54,48 @@ PJ_BEGIN_DECL #if defined(PJMEDIA_HAS_VIDEO) && (PJMEDIA_HAS_VIDEO != 0) +/** + * This setting controls whether OpenGL for iOS should be included. + * + * Default: 0 (or detected by configure) + */ +#ifndef PJMEDIA_VIDEO_DEV_HAS_IOS_OPENGL +# define PJMEDIA_VIDEO_DEV_HAS_IOS_OPENGL 0 +#else +# if defined(PJMEDIA_VIDEO_DEV_HAS_IOS_OPENGL) && \ + PJMEDIA_VIDEO_DEV_HAS_IOS_OPENGL != 0 +# undef PJMEDIA_VIDEO_DEV_HAS_OPENGL_ES +# define PJMEDIA_VIDEO_DEV_HAS_OPENGL_ES 1 +# endif +#endif + + +/** + * This setting controls whether OpenGL ES support should be included. + * + * Default: 0 (or detected by configure) + */ +#ifndef PJMEDIA_VIDEO_DEV_HAS_OPENGL_ES +# define PJMEDIA_VIDEO_DEV_HAS_OPENGL_ES 0 +#else +# if defined(PJMEDIA_VIDEO_DEV_HAS_OPENGL_ES) && \ + PJMEDIA_VIDEO_DEV_HAS_OPENGL_ES != 0 +# undef PJMEDIA_VIDEO_DEV_HAS_OPENGL +# define PJMEDIA_VIDEO_DEV_HAS_OPENGL 1 +# endif +#endif + + +/** + * This setting controls whether OpenGL support should be included. + * + * Default: 0 (or detected by configure) + */ +#ifndef PJMEDIA_VIDEO_DEV_HAS_OPENGL +# define PJMEDIA_VIDEO_DEV_HAS_OPENGL 0 +#endif + + /** * This setting controls whether SDL support should be included. * -- cgit v1.2.3