Changeset 5028 for pjproject/trunk

Timestamp:

Mar 26, 2015 5:40:51 AM (10 years ago)

Author:

ming

Message:

Fixed #1790: Remove unsupported capabilities and some cleanup

File:

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

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

@@ -39 +39 @@
  * To disable this feature, put 0.
  */
-#define STOP_IF_ERROR_RENDERING 5
-
-extern JavaVM *pj_jni_jvm;
+#define STOP_IF_ERROR_RENDERING 8
 
 typedef struct andgl_fmt_info
@@ -139 +137 @@
 int pjmedia_vid_dev_opengl_imp_get_cap(void)
 {
-    return PJMEDIA_VID_DEV_CAP_OUTPUT_WINDOW |
-           PJMEDIA_VID_DEV_CAP_OUTPUT_RESIZE;
+    return PJMEDIA_VID_DEV_CAP_OUTPUT_WINDOW;
 }
 
@@ -299 +296 @@
     strm->ts_inc = PJMEDIA_SPF2(param->clock_rate, &vfd->fps, 1);
     
-    /* If OUTPUT_RESIZE flag is not used, set display size to default */
-    if (!(param->flags & PJMEDIA_VID_DEV_CAP_OUTPUT_RESIZE)) {
-        pj_bzero(&strm->param.disp_size, sizeof(strm->param.disp_size));
-    }
-
     /* Set video format */
     status = andgl_stream_set_cap(&strm->base, PJMEDIA_VID_DEV_CAP_FORMAT,
@@ -326 +318 @@
     }
 
-    /* Apply the remaining settings */
-/*    if (param->flags & PJMEDIA_VID_DEV_CAP_ORIENTATION) {
-        andgl_stream_set_cap(&strm->base, PJMEDIA_VID_DEV_CAP_ORIENTATION,
-                             &param->orient);
-    }
-*/
     PJ_LOG(4, (THIS_FILE, "Android OpenGL ES renderer successfully created"));
                     
@@ -444 +430 @@
         }
 
-        PJ_LOG(4, (THIS_FILE, "Re-initializing OpenGL with window %p: %s",
-                              strm->window,
+        PJ_LOG(4, (THIS_FILE, "Re-initializing OpenGL with native window"
+                              " %p: %s", strm->window,
                               (status == PJ_SUCCESS? "success": "failed")));
         
         return status;
-    } else if (cap == PJMEDIA_VID_DEV_CAP_OUTPUT_RESIZE) {
-        pj_memcpy(&strm->param.disp_size, pval, sizeof(strm->param.disp_size));
-        return PJ_SUCCESS;
-    } else if (cap == PJMEDIA_VID_DEV_CAP_ORIENTATION) {
-        pj_memcpy(&strm->param.orient, pval, sizeof(strm->param.orient));
-        if (strm->param.orient == PJMEDIA_ORIENT_UNKNOWN)
-            return PJ_SUCCESS;
-        return PJ_SUCCESS;
     }