Changeset 5810

Timestamp:

Jun 22, 2018 8:22:01 AM (6 years ago)

Author:

nanang

Message:

Fixed #2122: Reorder supported format list in Android camera to have I420 before YV12 & NV21.

File:

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

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

@@ -566 +566 @@
             jsize cnt, j;
             pj_bool_t has_i420 = PJ_FALSE;
+            int k;
 
             cnt = (*jni_env)->GetArrayLength(jni_env, jiarray);
             fmts = (*jni_env)->GetIntArrayElements(jni_env, jiarray, 0);
             for (j = 0; j < cnt; j++) {
-                int k;
                 pjmedia_format_id fmt = and_fmt_to_pj((pj_uint32_t)fmts[j]);
-                
-                /* Check for any duplicate */
-                for (k = 0; k < vdi->fmt_cnt; k++) {
-                    if (fmt == 0 || fmt == vdi->fmt[k].id) {
-                        fmt = 0;
-                        break;
-                    }
-                }
 
                 /* Make sure we recognize this format */
@@ -589 +581 @@
                 else if (fmt == PJMEDIA_FORMAT_YV12) adi->has_yv12 = PJ_TRUE;
                 else if (fmt == PJMEDIA_FORMAT_NV21) adi->has_nv21 = PJ_TRUE;
-
+            }
+            (*jni_env)->ReleaseIntArrayElements(jni_env, jiarray, fmts,
+                                                JNI_ABORT);
+            (*jni_env)->DeleteLocalRef(jni_env, jtmp);
+
+            /* Always put I420/IYUV and in the first place, for better
+             * compatibility.
+             */
+            adi->forced_i420 = !has_i420;
+            for (k = 0; k < adi->sup_size_cnt &&
+                        vdi->fmt_cnt < max_fmt_cnt-1; k++)
+            {
+                /* Landscape video */
+                pjmedia_format_init_video(&vdi->fmt[vdi->fmt_cnt++],
+                                          PJMEDIA_FORMAT_I420,
+                                          adi->sup_size[k].w,
+                                          adi->sup_size[k].h,
+                                          DEFAULT_FPS, 1);
+                /* Portrait video */
+                pjmedia_format_init_video(&vdi->fmt[vdi->fmt_cnt++],
+                                          PJMEDIA_FORMAT_I420,
+                                          adi->sup_size[k].h,
+                                          adi->sup_size[k].w,
+                                          DEFAULT_FPS, 1);
+            }
+
+            /* YV12 */
+            if (adi->has_yv12) {
                 for (k = 0; k < adi->sup_size_cnt &&
                             vdi->fmt_cnt < max_fmt_cnt-1; k++)
@@ -595 +614 @@
                     /* Landscape video */
                     pjmedia_format_init_video(&vdi->fmt[vdi->fmt_cnt++],
-                                              fmt,
+                                              PJMEDIA_FORMAT_YV12,
                                               adi->sup_size[k].w,
                                               adi->sup_size[k].h,
@@ -601 +620 @@
                     /* Portrait video */
                     pjmedia_format_init_video(&vdi->fmt[vdi->fmt_cnt++],
-                                              fmt,
+                                              PJMEDIA_FORMAT_YV12,
                                               adi->sup_size[k].h,
                                               adi->sup_size[k].w,
@@ -607 +626 @@
                 }
             }
-            (*jni_env)->ReleaseIntArrayElements(jni_env, jiarray, fmts,
-                                                JNI_ABORT);
-            (*jni_env)->DeleteLocalRef(jni_env, jtmp);
-
-            /* Pretend to support I420/IYUV, only if we support YV12/NV21 */
-            if (!has_i420 && (adi->has_yv12 || adi->has_nv21) &&
-                vdi->fmt_cnt < PJ_ARRAY_SIZE(vdi->fmt))
-            {
-                int k;
-                adi->forced_i420 = PJ_TRUE;
+            
+            /* NV21 */
+            if (adi->has_nv21) {
                 for (k = 0; k < adi->sup_size_cnt &&
                             vdi->fmt_cnt < max_fmt_cnt-1; k++)
                 {
+                    /* Landscape video */
                     pjmedia_format_init_video(&vdi->fmt[vdi->fmt_cnt++],
-                                              PJMEDIA_FORMAT_I420,
+                                              PJMEDIA_FORMAT_NV21,
                                               adi->sup_size[k].w,
                                               adi->sup_size[k].h,
                                               DEFAULT_FPS, 1);
+                    /* Portrait video */
                     pjmedia_format_init_video(&vdi->fmt[vdi->fmt_cnt++],
-                                              PJMEDIA_FORMAT_I420,
+                                              PJMEDIA_FORMAT_NV21,
                                               adi->sup_size[k].h,
                                               adi->sup_size[k].w,
@@ -632 +646 @@
                 }
             }
+            
         } else {
             goto on_skip_dev;