Changeset 4994 for pjproject/trunk

Timestamp:

Mar 17, 2015 4:02:44 AM (10 years ago)

Author:

nanang

Message:

Re #1822: Initial implementation of Android video capturer.

Location:

pjproject/trunk

Files:

• pjmedia/build/Makefile (modified) (1 diff)
• pjmedia/include/pjmedia-videodev/config.h (modified) (2 diffs)
• pjmedia/include/pjmedia-videodev/videodev.h (modified) (1 diff)
• pjmedia/include/pjmedia/format.h (modified) (1 diff)
• pjmedia/src/pjmedia-videodev/android_dev.c (added)
• pjmedia/src/pjmedia-videodev/videodev.c (modified) (2 diffs)
• pjsip-apps/src/pjsua/android/src/org/pjsip/PjCamera.java (added)
• pjsip-apps/src/pjsua/android/src/org/pjsip/PjCameraInfo.java (added)

pjproject/trunk/pjmedia/build/Makefile

@@ -108 +108 @@
 export PJMEDIA_VIDEODEV_OBJS +=  errno.o videodev.o avi_dev.o ffmpeg_dev.o \
                                 colorbar_dev.o v4l2_dev.o opengl_dev.o \
-                                android_opengl.o
+                                android_opengl.o android_dev.o
 export PJMEDIA_VIDEODEV_CFLAGS += $(_CFLAGS)
 export PJMEDIA_VIDEODEV_CXXFLAGS += $(_CXXFLAGS)

pjproject/trunk/pjmedia/include/pjmedia-videodev/config.h

@@ -46 +46 @@
  * supported by a video device.
  *
- * Default: 16
+ * Default: 64
  */
 #ifndef PJMEDIA_VID_DEV_INFO_FMT_CNT
-#   define PJMEDIA_VID_DEV_INFO_FMT_CNT 16
+#   define PJMEDIA_VID_DEV_INFO_FMT_CNT 64
 #endif
 
@@ -193 +193 @@
 #endif
 
+
+/**
+ * This setting controls whether Android support should be included.
+ *
+ * Default: 0
+ */
+#ifndef PJMEDIA_VIDEO_DEV_HAS_ANDROID
+#   define PJMEDIA_VIDEO_DEV_HAS_ANDROID        0
+#endif
+
+
 /**
  * Specify the SDL library name to be linked with Visual Studio project. 

pjproject/trunk/pjmedia/include/pjmedia-videodev/videodev.h

@@ -233 +233 @@
      * by setting this capability to PJ_TRUE or PJ_FALSE. Once the preview
      * is started, application may use PJMEDIA_VID_DEV_CAP_OUTPUT_WINDOW
-     * capability to query the vidow window.
+     * capability to query the video window.
      *
      * The value of this capability is a pj_bool_t containing boolean

pjproject/trunk/pjmedia/include/pjmedia/format.h

@@ -177 +177 @@
     PJMEDIA_FORMAT_YV12     = PJMEDIA_FORMAT_PACK('Y', 'V', '1', '2'),
 
+    /**
+     * This is planar 4:2:0/12bpp YUV format, the data can be treated as
+     * two planes of color components, where the first plane contains
+     * only the Y samples, the second plane contains interleaved
+     * V (Cr) - U (Cb) samples.
+     */
+    PJMEDIA_FORMAT_NV21     = PJMEDIA_FORMAT_PACK('N', 'V', '2', '1'),
+    
     /**
      * This is planar 4:2:2/16bpp YUV format, the data can be treated as

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

@@ -100 +100 @@
 #if PJMEDIA_VIDEO_DEV_HAS_OPENGL
 pjmedia_vid_dev_factory* pjmedia_opengl_factory(pj_pool_factory *pf);
+#endif
+
+#if PJMEDIA_VIDEO_DEV_HAS_ANDROID
+pjmedia_vid_dev_factory* pjmedia_and_factory(pj_pool_factory *pf);
 #endif
 
@@ -394 +398 @@
     vid_subsys.drv[vid_subsys.drv_cnt++].create = &pjmedia_ffmpeg_factory;
 #endif
-#if PJMEDIA_VIDEO_DEV_HAS_CBAR_SRC
-    vid_subsys.drv[vid_subsys.drv_cnt++].create = &pjmedia_cbar_factory;
-#endif
 #if PJMEDIA_VIDEO_DEV_HAS_SDL
     vid_subsys.drv[vid_subsys.drv_cnt++].create = &pjmedia_sdl_factory;
+#endif
+#if PJMEDIA_VIDEO_DEV_HAS_ANDROID
+    vid_subsys.drv[vid_subsys.drv_cnt++].create = &pjmedia_and_factory;
+#endif
+#if PJMEDIA_VIDEO_DEV_HAS_CBAR_SRC
+    /* Better put colorbar at the last, so the default capturer will be
+     * a real capturer, if any.
+     */
+    vid_subsys.drv[vid_subsys.drv_cnt++].create = &pjmedia_cbar_factory;
 #endif