Changeset 4812


Ignore:
Timestamp:
Apr 8, 2014 9:03:35 AM (6 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:
3 added
3 edited

Legend:

Unmodified
Added
Removed
  • pjproject/trunk/pjmedia/build/Makefile

    r4727 r4812  
    107107export PJMEDIA_VIDEODEV_SRCDIR = ../src/pjmedia-videodev 
    108108export PJMEDIA_VIDEODEV_OBJS +=  errno.o videodev.o avi_dev.o ffmpeg_dev.o \ 
    109                                 colorbar_dev.o v4l2_dev.o 
     109                                colorbar_dev.o v4l2_dev.o opengl_dev.o 
    110110export PJMEDIA_VIDEODEV_CFLAGS += $(_CFLAGS) 
    111111export PJMEDIA_VIDEODEV_CXXFLAGS += $(_CXXFLAGS) 
  • pjproject/trunk/pjmedia/build/os-auto.mak.in

    r4723 r4812  
    215215# 
    216216ifeq ($(AC_PJMEDIA_VIDEO),iphone_os) 
    217 export PJMEDIA_VIDEODEV_OBJS += ios_dev.o 
     217export PJMEDIA_VIDEODEV_OBJS += ios_dev.o ios_opengl_dev.o 
    218218endif 
    219219 
  • pjproject/trunk/pjmedia/src/pjmedia-videodev/videodev.c

    r4016 r4812  
    9696#if PJMEDIA_VIDEO_DEV_HAS_IOS 
    9797pjmedia_vid_dev_factory* pjmedia_ios_factory(pj_pool_factory *pf); 
     98#endif 
     99 
     100#if PJMEDIA_VIDEO_DEV_HAS_OPENGL 
     101pjmedia_vid_dev_factory* pjmedia_opengl_factory(pj_pool_factory *pf); 
    98102#endif 
    99103 
     
    381385    vid_subsys.drv[vid_subsys.drv_cnt++].create = &pjmedia_ios_factory; 
    382386#endif 
     387#if PJMEDIA_VIDEO_DEV_HAS_OPENGL 
     388    vid_subsys.drv[vid_subsys.drv_cnt++].create = &pjmedia_opengl_factory; 
     389#endif 
    383390#if PJMEDIA_VIDEO_DEV_HAS_DSHOW 
    384391    vid_subsys.drv[vid_subsys.drv_cnt++].create = &pjmedia_dshow_factory; 
Note: See TracChangeset for help on using the changeset viewer.