Changeset 3638 for pjproject/branches/projects/2.0-dev

Timestamp:

Jul 14, 2011 3:47:04 AM (13 years ago)

Author:

nanang

Message:

Re #1263:

• Added API pjsua_vid_enum_wins() to enumerate video windows.
• Minor fixes on video window manipulations.

Location:

pjproject/branches/projects/2.0-dev

Files:

• pjsip-apps/src/pjsua/pjsua_app.c (modified) (4 diffs)
• pjsip/include/pjsua-lib/pjsua.h (modified) (1 diff)
• pjsip/src/pjsua-lib/pjsua_vid.c (modified) (3 diffs)

pjproject/branches/projects/2.0-dev/pjsip-apps/src/pjsua/pjsua_app.c

@@ -3809 +3809 @@
     } else if (strcmp(argv[1], "win")==0) {
         if (argc==3 && strcmp(argv[2], "list")==0) {
-            PJ_LOG(1,(THIS_FILE, "Not implemented"));
-            PJ_TODO(vid_list_window);
+            pjsua_vid_win_id wids[PJSUA_MAX_VID_WINS];
+            unsigned i, cnt = PJ_ARRAY_SIZE(wids);
+
+            pjsua_vid_enum_wins(wids, &cnt);
+
+            PJ_LOG(3,(THIS_FILE, "Found %d video windows:", cnt));
+            PJ_LOG(3,(THIS_FILE, "WID show    pos       size"));
+            PJ_LOG(3,(THIS_FILE, "------------------------------"));
+            for (i = 0; i < cnt; ++i) {
+                pjsua_vid_win_info wi;
+                pjsua_vid_win_get_info(wids[i], &wi);
+                PJ_LOG(3,(THIS_FILE, "%3d   %c  (%d,%d)  %dx%d",
+                          wids[i], (wi.show?'Y':'N'), wi.pos.x, wi.pos.y,
+                          wi.size.w, wi.size.h));
+            }
         } else if (argc==4 && (strcmp(argv[2], "show")==0 ||
                                strcmp(argv[2], "hide")==0))
@@ -3816 +3829 @@
             pj_bool_t show = (strcmp(argv[2], "show")==0);
             pjsua_vid_win_id wid = atoi(argv[3]);
-
             pjsua_vid_win_set_show(wid, show);
-
         } else if (argc==6 && strcmp(argv[2], "move")==0) {
             pjsua_vid_win_id wid = atoi(argv[3]);
@@ -3824 +3835 @@
 
             pos.x = atoi(argv[4]);
-            pos.y = atoi(argv[4]);
+            pos.y = atoi(argv[5]);
             pjsua_vid_win_set_pos(wid, &pos);
-
         } else if (argc==6 && strcmp(argv[2], "resize")==0) {
             pjsua_vid_win_id wid = atoi(argv[3]);
@@ -3832 +3842 @@
 
             size.w = atoi(argv[4]);
-            size.h = atoi(argv[4]);
+            size.h = atoi(argv[5]);
             pjsua_vid_win_set_size(wid, &size);
         } else

pjproject/branches/projects/2.0-dev/pjsip/include/pjsua-lib/pjsua.h

@@ -5402 +5402 @@
 
 /**
+ * Enumerates all video windows.
+ *
+ * @param id            Array of window ID to be initialized.
+ * @param count         On input, specifies max elements in the array.
+ *                      On return, it contains actual number of elements
+ *                      that have been initialized.
+ *
+ * @return              PJ_SUCCESS on success, or the appropriate error code.
+ */
+PJ_DECL(pj_status_t) pjsua_vid_enum_wins(pjsua_vid_win_id wids[],
+                                         unsigned *count);
+
+
+/**
  * Get window info.
  *

pjproject/branches/projects/2.0-dev/pjsip/src/pjsua-lib/pjsua_vid.c

@@ -878 +878 @@
  */
 
+
+/*
+ * Enumerates all video windows.
+ */
+PJ_DEF(pj_status_t) pjsua_vid_enum_wins( pjsua_vid_win_id wids[],
+                                         unsigned *count)
+{
+    unsigned i, cnt;
+
+    cnt = 0;
+
+    for (i=0; i<PJSUA_MAX_VID_WINS && cnt <*count; ++i) {
+        pjsua_vid_win *w = &pjsua_var.win[i];
+        if (w->type != PJSUA_WND_TYPE_NONE)
+            wids[cnt++] = i;
+    }
+
+    *count = cnt;
+
+    return PJ_SUCCESS;
+}
+
+
 /*
  * Get window info.
@@ -980 +1003 @@
 
     status = pjmedia_vid_dev_stream_set_cap(s,
-                            PJMEDIA_VID_DEV_CAP_OUTPUT_POSITION, &pos);
+                            PJMEDIA_VID_DEV_CAP_OUTPUT_POSITION, pos);
 
     PJSUA_UNLOCK();
@@ -1013 +1036 @@
 
     status = pjmedia_vid_dev_stream_set_cap(s,
-                            PJMEDIA_VID_DEV_CAP_OUTPUT_RESIZE, &size);
+                            PJMEDIA_VID_DEV_CAP_OUTPUT_RESIZE, size);
 
     PJSUA_UNLOCK();