Changeset 5166

Timestamp:

Aug 21, 2015 6:46:32 AM (9 years ago)

Author:

ming

Message:

Fixed #1880: Incorrect orientation after switching video capture or when using back camera

Included in this fix:

• Change the spec & doc of pjmedia_orient enumeration
• Change iOS sample app to rotate all video devices upon orientation change event.
• Set orientation as well when fast switching cameras (for iOS and Android)

Location:

pjproject/trunk

Files:

• pjmedia/include/pjmedia/types.h (modified) (4 diffs)
• pjmedia/src/pjmedia-videodev/android_dev.c (modified) (5 diffs)
• pjmedia/src/pjmedia-videodev/ios_dev.m (modified) (1 diff)
• pjsip-apps/src/pjsua/ios/ipjsua/ipjsuaAppDelegate.m (modified) (2 diffs)

pjproject/trunk/pjmedia/include/pjmedia/types.h

@@ -203 +203 @@
 
     /**
-     * Natural orientation, e.g: sky upside on landscape view, head upside
-     * on human portrait.
+     * Natural orientation, i.e. the original orientation video will be
+     * displayed/captured without rotation.
      */
     PJMEDIA_ORIENT_NATURAL,
@@ -210 +210 @@
     /**
      * Specifies that the video/picture needs to be rotated 90 degrees
-     * clockwise to be displayed in natural orientation.
+     * from its natural orientation in clockwise direction from the user's
+     * perspective.
+     * Note that for devices with back cameras (which faces away
+     * from the user), the video will actually need to be rotated
+     * 270 degrees clockwise instead.
      */
     PJMEDIA_ORIENT_ROTATE_90DEG,
@@ -216 +220 @@
     /**
      * Specifies that the video/picture needs to be rotated 180 degrees
-     * clockwise to be displayed in natural orientation.
+     * from its natural orientation.
      */
     PJMEDIA_ORIENT_ROTATE_180DEG,
@@ -222 +226 @@
     /**
      * Specifies that the video/picture needs to be rotated 270 degrees
-     * clockwise to be displayed in natural orientation.
+     * from its natural orientation in clockwise direction from the user's
+     * perspective.
+     * Note that for devices with back cameras (which faces away
+     * from the user), the video will actually need to be rotated
+     * 90 degrees clockwise instead.
      */
     PJMEDIA_ORIENT_ROTATE_270DEG

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

@@ -72 +72 @@
     pjmedia_vid_dev_info         info;          /**< Base info         */
     unsigned                     dev_idx;       /**< Original dev ID   */
+    pj_bool_t                    facing;        /**< Front/back camera?*/
     unsigned                     sup_size_cnt;  /**< # of supp'd size  */
     pjmedia_rect_size           *sup_size;      /**< Supported size    */
@@ -526 +527 @@
         /* Set driver & name info */
         pj_ansi_strncpy(vdi->driver, "Android", sizeof(vdi->driver));
+        adi->facing = facing;
         if (facing == 0) {
             pj_ansi_strncpy(vdi->name, "Back camera", sizeof(vdi->name));
@@ -954 +956 @@
             } else {
                 strm->param.cap_id = p->target_id;
+                
+                /* If successful, set the orientation as well */
+                and_stream_set_cap(s, PJMEDIA_VID_DEV_CAP_ORIENTATION,
+                                   &strm->param.orient);
             }
             jni_detach_env(with_attach);
@@ -962 +968 @@
         {
             pjmedia_orient orient = *(pjmedia_orient *)pval;
+            pjmedia_orient eff_ori;
+            and_dev_info *adi;
 
             pj_assert(orient >= PJMEDIA_ORIENT_UNKNOWN &&
@@ -985 +993 @@
             }
             
-            pjmedia_vid_dev_conv_set_rotation(&strm->conv, strm->param.orient);
+            eff_ori = strm->param.orient;
+            adi = &strm->factory->dev_info[strm->param.cap_id];
+            /* Normalize the orientation for back-facing camera */
+            if (!adi->facing) {
+                if (eff_ori == PJMEDIA_ORIENT_ROTATE_90DEG)
+                    eff_ori = PJMEDIA_ORIENT_ROTATE_270DEG;
+                else if (eff_ori == PJMEDIA_ORIENT_ROTATE_270DEG)
+                    eff_ori = PJMEDIA_ORIENT_ROTATE_90DEG;
+            }
+            pjmedia_vid_dev_conv_set_rotation(&strm->conv, eff_ori);
             
             PJ_LOG(4, (THIS_FILE, "Video capture orientation set to %d",

pjproject/trunk/pjmedia/src/pjmedia-videodev/ios_dev.m

@@ -963 +963 @@
             strm->param.cap_id = p->target_id;
             
+            /* Set the orientation as well */
+            ios_stream_set_cap(s, PJMEDIA_VID_DEV_CAP_ORIENTATION,
+                               &strm->param.orient);
+            
             return PJ_SUCCESS;
         }

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

@@ -181 +181 @@
     static UIDeviceOrientation prev_ori = 0;
     UIDeviceOrientation dev_ori = [[UIDevice currentDevice] orientation];
+    int i;
     
     if (dev_ori == prev_ori) return;
@@ -193 +194 @@
         }
         
-        pjsua_vid_dev_set_setting(PJMEDIA_VID_DEFAULT_CAPTURE_DEV,
-                                  PJMEDIA_VID_DEV_CAP_ORIENTATION,
-                                  &pj_ori[dev_ori-1], PJ_TRUE);
+        /* Here we set the orientation for all video devices.
+         * This may return failure for renderer devices or for
+         * capture devices which do not support orientation setting,
+         * we can simply ignore them.
+         */
+        for (i = pjsua_vid_dev_count()-1; i >= 0; i--) {
+            pjsua_vid_dev_set_setting(i, PJMEDIA_VID_DEV_CAP_ORIENTATION,
+                                      &pj_ori[dev_ori-1], PJ_TRUE);
+        }
     }
 #endif