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

Timestamp:

Jun 25, 2015 8:17:52 AM (9 years ago)

Author:

ming

Message:

Re #1861: Initial implementation of video orientation support

• Utility to resize and rotate video frame
• Support for iOS + sample
• pjsua API to set video device's orientation

File:

• pjproject/trunk/pjsip-apps/src/pjsua/ios/ipjsua/ipjsuaAppDelegate.m (modified) (5 diffs)

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

@@ -40 +40 @@
 static char           **restartArgv;
 static int              restartArgc;
-static pj_thread_desc   a_thread_desc;
-static pj_thread_t     *a_thread;
 
 static void displayMsg(const char *msg)
@@ -118 +116 @@
         }
     
+        /* Setup device orientation change notification */
+        [[UIDevice currentDevice] beginGeneratingDeviceOrientationNotifications];
+        [[NSNotificationCenter defaultCenter] addObserver:app
+            selector:@selector(orientationChanged:)
+            name:UIDeviceOrientationDidChangeNotification
+            object:[UIDevice currentDevice]];
+        
         status = pjsua_app_run(PJ_TRUE);
         if (status != PJ_SUCCESS) {
@@ -124 +129 @@
             displayMsg(errmsg);
         }
+        
+        [[UIDevice currentDevice] endGeneratingDeviceOrientationNotifications];
     
         pjsua_app_destroy();
@@ -158 +165 @@
 }
 
+- (void)orientationChanged:(NSNotification *)note
+{
+#if PJSUA_HAS_VIDEO
+    const pjmedia_orient pj_ori[4] =
+    {
+        PJMEDIA_ORIENT_ROTATE_90DEG,  /* UIDeviceOrientationPortrait */
+        PJMEDIA_ORIENT_ROTATE_270DEG, /* UIDeviceOrientationPortraitUpsideDown */
+        PJMEDIA_ORIENT_ROTATE_180DEG, /* UIDeviceOrientationLandscapeLeft,
+                                         home button on the right side */
+        PJMEDIA_ORIENT_NATURAL        /* UIDeviceOrientationLandscapeRight,
+                                         home button on the left side */
+    };
+    static pj_thread_desc a_thread_desc;
+    static pj_thread_t *a_thread;
+    static UIDeviceOrientation prev_ori = 0;
+    UIDeviceOrientation dev_ori = [[UIDevice currentDevice] orientation];
+    
+    if (dev_ori == prev_ori && !note) return;
+    
+    NSLog(@"Device orientation changed: %d", (prev_ori = dev_ori));
+    
+    if (dev_ori >= UIDeviceOrientationPortrait &&
+        dev_ori <= UIDeviceOrientationLandscapeRight)
+    {
+        if (!pj_thread_is_registered()) {
+            pj_thread_register("ipjsua", a_thread_desc, &a_thread);
+        }
+        
+        pjsua_vid_dev_set_orient(PJMEDIA_VID_DEFAULT_CAPTURE_DEV,
+                                 pj_ori[dev_ori-1]);
+    }
+#endif
+}
+
 - (void)keepAlive {
+    static pj_thread_desc a_thread_desc;
+    static pj_thread_t *a_thread;
     int i;
     
-    if (!pj_thread_is_registered())
-    {
+    if (!pj_thread_is_registered()) {
         pj_thread_register("ipjsua", a_thread_desc, &a_thread);
     }
@@ -230 +272 @@
     i = (wid == PJSUA_INVALID_ID) ? 0 : wid;
     last = (wid == PJSUA_INVALID_ID) ? PJSUA_MAX_VID_WINS : wid+1;
+
+    [app orientationChanged:NULL];
     
     for (;i < last; ++i) {