Changeset 4812 for pjproject/trunk

Timestamp:

Apr 8, 2014 9:03:35 AM (11 years ago)

Author:

ming

Message:

Re #1757: Initial implementation of iOS OpenGL ES renderer. To use it, application needs to add:
#define PJMEDIA_VIDEO_DEV_HAS_OPENGL 1
#define PJMEDIA_VIDEO_DEV_HAS_OPENGL_ES 1
#define PJMEDIA_VIDEO_DEV_HAS_IOS_OPENGL 1

Location:

pjproject/trunk/pjmedia

Files:

• build/Makefile (modified) (1 diff)
• build/os-auto.mak.in (modified) (1 diff)
• include/pjmedia-videodev/opengl_dev.h (added)
• src/pjmedia-videodev/ios_opengl_dev.m (added)
• src/pjmedia-videodev/opengl_dev.c (added)
• src/pjmedia-videodev/videodev.c (modified) (2 diffs)

pjproject/trunk/pjmedia/build/Makefile

@@ -107 +107 @@
 export PJMEDIA_VIDEODEV_SRCDIR = ../src/pjmedia-videodev
 export PJMEDIA_VIDEODEV_OBJS +=  errno.o videodev.o avi_dev.o ffmpeg_dev.o \
-                                colorbar_dev.o v4l2_dev.o
+                                colorbar_dev.o v4l2_dev.o opengl_dev.o
 export PJMEDIA_VIDEODEV_CFLAGS += $(_CFLAGS)
 export PJMEDIA_VIDEODEV_CXXFLAGS += $(_CXXFLAGS)

pjproject/trunk/pjmedia/build/os-auto.mak.in

@@ -215 +215 @@
 #
 ifeq ($(AC_PJMEDIA_VIDEO),iphone_os)
-export PJMEDIA_VIDEODEV_OBJS += ios_dev.o
+export PJMEDIA_VIDEODEV_OBJS += ios_dev.o ios_opengl_dev.o
 endif
 

pjproject/trunk/pjmedia/src/pjmedia-videodev/videodev.c

@@ -96 +96 @@
 #if PJMEDIA_VIDEO_DEV_HAS_IOS
 pjmedia_vid_dev_factory* pjmedia_ios_factory(pj_pool_factory *pf);
+#endif
+
+#if PJMEDIA_VIDEO_DEV_HAS_OPENGL
+pjmedia_vid_dev_factory* pjmedia_opengl_factory(pj_pool_factory *pf);
 #endif
 
@@ -381 +385 @@
     vid_subsys.drv[vid_subsys.drv_cnt++].create = &pjmedia_ios_factory;
 #endif
+#if PJMEDIA_VIDEO_DEV_HAS_OPENGL
+    vid_subsys.drv[vid_subsys.drv_cnt++].create = &pjmedia_opengl_factory;
+#endif
 #if PJMEDIA_VIDEO_DEV_HAS_DSHOW
     vid_subsys.drv[vid_subsys.drv_cnt++].create = &pjmedia_dshow_factory;