Changeset 4994 for pjproject/trunk/pjmedia/src/pjmedia-videodev/videodev.c

Timestamp:

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

Author:

nanang

Message:

Re #1822: Initial implementation of Android video capturer.

File:

• pjproject/trunk/pjmedia/src/pjmedia-videodev/videodev.c (modified) (2 diffs)

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