Changeset 4994


Ignore:
Timestamp:
Mar 17, 2015 4:02:44 AM (5 years ago)
Author:
nanang
Message:

Re #1822: Initial implementation of Android video capturer.

Location:
pjproject/trunk
Files:
3 added
5 edited

Legend:

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

    r4928 r4994  
    108108export PJMEDIA_VIDEODEV_OBJS +=  errno.o videodev.o avi_dev.o ffmpeg_dev.o \ 
    109109                                colorbar_dev.o v4l2_dev.o opengl_dev.o \ 
    110                                 android_opengl.o 
     110                                android_opengl.o android_dev.o 
    111111export PJMEDIA_VIDEODEV_CFLAGS += $(_CFLAGS) 
    112112export PJMEDIA_VIDEODEV_CXXFLAGS += $(_CXXFLAGS) 
  • pjproject/trunk/pjmedia/include/pjmedia-videodev/config.h

    r4928 r4994  
    4646 * supported by a video device. 
    4747 * 
    48  * Default: 16 
     48 * Default: 64 
    4949 */ 
    5050#ifndef PJMEDIA_VID_DEV_INFO_FMT_CNT 
    51 #   define PJMEDIA_VID_DEV_INFO_FMT_CNT 16 
     51#   define PJMEDIA_VID_DEV_INFO_FMT_CNT 64 
    5252#endif 
    5353 
     
    193193#endif 
    194194 
     195 
     196/** 
     197 * This setting controls whether Android support should be included. 
     198 * 
     199 * Default: 0 
     200 */ 
     201#ifndef PJMEDIA_VIDEO_DEV_HAS_ANDROID 
     202#   define PJMEDIA_VIDEO_DEV_HAS_ANDROID        0 
     203#endif 
     204 
     205 
    195206/** 
    196207 * Specify the SDL library name to be linked with Visual Studio project.  
  • pjproject/trunk/pjmedia/include/pjmedia-videodev/videodev.h

    r4925 r4994  
    233233     * by setting this capability to PJ_TRUE or PJ_FALSE. Once the preview 
    234234     * is started, application may use PJMEDIA_VID_DEV_CAP_OUTPUT_WINDOW 
    235      * capability to query the vidow window. 
     235     * capability to query the video window. 
    236236     * 
    237237     * The value of this capability is a pj_bool_t containing boolean 
  • pjproject/trunk/pjmedia/include/pjmedia/format.h

    r4785 r4994  
    177177    PJMEDIA_FORMAT_YV12     = PJMEDIA_FORMAT_PACK('Y', 'V', '1', '2'), 
    178178 
     179    /** 
     180     * This is planar 4:2:0/12bpp YUV format, the data can be treated as 
     181     * two planes of color components, where the first plane contains 
     182     * only the Y samples, the second plane contains interleaved 
     183     * V (Cr) - U (Cb) samples. 
     184     */ 
     185    PJMEDIA_FORMAT_NV21     = PJMEDIA_FORMAT_PACK('N', 'V', '2', '1'), 
     186     
    179187    /** 
    180188     * This is planar 4:2:2/16bpp YUV format, the data can be treated as 
  • pjproject/trunk/pjmedia/src/pjmedia-videodev/videodev.c

    r4908 r4994  
    100100#if PJMEDIA_VIDEO_DEV_HAS_OPENGL 
    101101pjmedia_vid_dev_factory* pjmedia_opengl_factory(pj_pool_factory *pf); 
     102#endif 
     103 
     104#if PJMEDIA_VIDEO_DEV_HAS_ANDROID 
     105pjmedia_vid_dev_factory* pjmedia_and_factory(pj_pool_factory *pf); 
    102106#endif 
    103107 
     
    394398    vid_subsys.drv[vid_subsys.drv_cnt++].create = &pjmedia_ffmpeg_factory; 
    395399#endif 
    396 #if PJMEDIA_VIDEO_DEV_HAS_CBAR_SRC 
    397     vid_subsys.drv[vid_subsys.drv_cnt++].create = &pjmedia_cbar_factory; 
    398 #endif 
    399400#if PJMEDIA_VIDEO_DEV_HAS_SDL 
    400401    vid_subsys.drv[vid_subsys.drv_cnt++].create = &pjmedia_sdl_factory; 
     402#endif 
     403#if PJMEDIA_VIDEO_DEV_HAS_ANDROID 
     404    vid_subsys.drv[vid_subsys.drv_cnt++].create = &pjmedia_and_factory; 
     405#endif 
     406#if PJMEDIA_VIDEO_DEV_HAS_CBAR_SRC 
     407    /* Better put colorbar at the last, so the default capturer will be 
     408     * a real capturer, if any. 
     409     */ 
     410    vid_subsys.drv[vid_subsys.drv_cnt++].create = &pjmedia_cbar_factory; 
    401411#endif 
    402412 
Note: See TracChangeset for help on using the changeset viewer.