Changeset 4848 for pjproject

Timestamp:

May 22, 2014 4:52:53 AM (11 years ago)

Author:

ming

Message:

Re #1757: Modify display video function in r4813 so it can display video preview as well

Location:

pjproject/trunk/pjsip-apps/src/pjsua

Files:

• ios/ipjsua/ipjsuaAppDelegate.m (modified) (1 diff)
• pjsua_app.c (modified) (2 diffs)
• pjsua_app_common.c (modified) (2 diffs)

pjproject/trunk/pjsip-apps/src/pjsua/ios/ipjsua/ipjsuaAppDelegate.m

@@ -226 +226 @@
 {
 #if PJSUA_HAS_VIDEO
-    pjsua_vid_win_info wi;
-    
-    if (wid != PJSUA_INVALID_ID &&
-        pjsua_vid_win_get_info(wid, &wi) == PJ_SUCCESS)
-    {
-        UIView *view = (__bridge UIView *)wi.hwnd.info.ios.window;
-        if (view) {
-            dispatch_async(dispatch_get_main_queue(), ^{
-                UIView *parent = app.viewController.view;
-                /* Add the video window as subview */
-                [parent addSubview:view];
-                /* Center it */
-                view.center = CGPointMake(parent.bounds.size.width/2.0,
-                                          parent.bounds.size.height/2.0);
-            });
-        }
-    }
+    int i, last;
+    
+    i = (wid == PJSUA_INVALID_ID) ? 0 : wid;
+    last = (wid == PJSUA_INVALID_ID) ? PJSUA_MAX_VID_WINS : wid+1;
+    
+    for (;i < last; ++i) {
+        pjsua_vid_win_info wi;
+        
+        if (pjsua_vid_win_get_info(i, &wi) == PJ_SUCCESS) {
+            UIView *parent = app.viewController.view;
+            UIView *view = (__bridge UIView *)wi.hwnd.info.ios.window;
+            
+            if (view && ![view isDescendantOfView:parent]) {
+                dispatch_async(dispatch_get_main_queue(), ^{
+                    /* Add the video window as subview */
+                    [parent addSubview:view];
+                    
+                    if (!wi.is_native) {
+                        /* Center it horizontally */
+                        view.center = CGPointMake(parent.bounds.size.width/2.0,
+                                              view.bounds.size.height/2.0);
+                    } else {
+                        /* Preview window, move it to the bottom */
+                        view.center = CGPointMake(parent.bounds.size.width/2.0,
+                                                  parent.bounds.size.height-
+                                                  view.bounds.size.height/2.0);
+                    }
+                });
+            }
+        }
+    }
+
+    
 #endif
 }

pjproject/trunk/pjsip-apps/src/pjsua/pjsua_app.c

@@ -49 +49 @@
 #ifdef USE_GUI
 pj_bool_t showNotification(pjsua_call_id call_id);
-void displayWindow(pjsua_vid_win_id wid);
 #endif
 
@@ -557 +556 @@
 
     arrange_window(ci->media[mi].stream.vid.win_in);
-#ifdef USE_GUI
-    displayWindow(ci->media[mi].stream.vid.win_in);
-#endif
 
     PJ_UNUSED_ARG(has_error);

pjproject/trunk/pjsip-apps/src/pjsua/pjsua_app_common.c

@@ -29 +29 @@
 #endif
 
+#ifdef USE_GUI
+void displayWindow(pjsua_vid_win_id wid);
+#endif
+
 static char some_buf[SOME_BUF_SIZE];
 
@@ -252 +256 @@
     if (wid != PJSUA_INVALID_ID)
         pjsua_vid_win_set_pos(wid, &pos);
+
+#ifdef USE_GUI
+    displayWindow(wid);
+#endif
+
 #else
     PJ_UNUSED_ARG(wid);