Changeset 5166 for pjproject/trunk/pjmedia/src/pjmedia-videodev/android_dev.c

Timestamp:

Aug 21, 2015 6:46:32 AM (8 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)

File:

• pjproject/trunk/pjmedia/src/pjmedia-videodev/android_dev.c (modified) (5 diffs)

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",