Changeset 4821 for pjproject/trunk/pjmedia/src/pjmedia-videodev/opengl_dev.c

Timestamp:

Apr 22, 2014 5:04:43 AM (11 years ago)

Author:

ming

Message:

Closed #1757: iOS OpenGL renderer

• Optimize rendering speed and CPU usage by avoiding buffer copy from frame's buffer
• Add various video dev capabilities

File:

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

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

@@ -337 +337 @@
     struct opengl_factory *qf = (struct opengl_factory*)f;
     struct opengl_dev_info *qdi;
-    unsigned i, l;
+    unsigned l;
     
     /* Initialize input and output devices here */
@@ -350 +350 @@
     qdi->info.dir = PJMEDIA_DIR_RENDER;
     qdi->info.has_callback = PJ_FALSE;
-    qdi->info.caps = PJMEDIA_VID_DEV_CAP_OUTPUT_WINDOW;
-
-    for (i = 0; i < qf->dev_count; i++) {
-        qdi = &qf->dev_info[i];
-        qdi->info.fmt_cnt = PJ_ARRAY_SIZE(opengl_fmts);
-        qdi->info.caps |= PJMEDIA_VID_DEV_CAP_FORMAT;
+    qdi->info.caps = PJMEDIA_VID_DEV_CAP_FORMAT;
+    qdi->info.fmt_cnt = PJ_ARRAY_SIZE(opengl_fmts);
+    qdi->info.caps |= pjmedia_vid_dev_opengl_imp_get_cap();
         
-        for (l = 0; l < PJ_ARRAY_SIZE(opengl_fmts); l++) {
-            pjmedia_format *fmt = &qdi->info.fmt[l];
-            pjmedia_format_init_video(fmt,
-                                      opengl_fmts[l],
-                                      DEFAULT_WIDTH,
-                                      DEFAULT_HEIGHT,
-                                      DEFAULT_FPS, 1);
-        }
-    }
-    
-    PJ_LOG(4, (THIS_FILE, "OpenGL initialized with %d devices",
-               qf->dev_count));
+    for (l = 0; l < PJ_ARRAY_SIZE(opengl_fmts); l++) {
+        pjmedia_format *fmt = &qdi->info.fmt[l];
+        pjmedia_format_init_video(fmt, opengl_fmts[l], DEFAULT_WIDTH,
+                                  DEFAULT_HEIGHT, DEFAULT_FPS, 1);
+    }
+    
+    PJ_LOG(4, (THIS_FILE, "OpenGL device initialized"));
     
     return PJ_SUCCESS;