From 4a925f7f5401af1c0a410a648b06d2255a6935bb Mon Sep 17 00:00:00 2001 From: Liong Sauw Ming Date: Thu, 26 Mar 2015 05:40:51 +0000 Subject: Fixed #1790: Remove unsupported capabilities and some cleanup git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@5028 74dad513-b988-da41-8d7b-12977e46ad98 --- pjmedia/src/pjmedia-videodev/android_opengl.c | 30 ++++----------------------- 1 file changed, 4 insertions(+), 26 deletions(-) (limited to 'pjmedia') diff --git a/pjmedia/src/pjmedia-videodev/android_opengl.c b/pjmedia/src/pjmedia-videodev/android_opengl.c index 6e5ee869..5ac49a1e 100644 --- a/pjmedia/src/pjmedia-videodev/android_opengl.c +++ b/pjmedia/src/pjmedia-videodev/android_opengl.c @@ -38,9 +38,7 @@ /* Define the number of errors before the stream stops trying to do rendering. * 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 { @@ -138,8 +136,7 @@ static pjmedia_vid_dev_stream_op stream_op = 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; } static andgl_fmt_info* get_andgl_format_info(pjmedia_format_id id) @@ -298,11 +295,6 @@ pjmedia_vid_dev_opengl_imp_create_stream(pj_pool_t *pool, vfd = pjmedia_format_get_video_format_detail(&strm->param.fmt, PJ_TRUE); 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, ¶m->fmt); @@ -325,12 +317,6 @@ pjmedia_vid_dev_opengl_imp_create_stream(pj_pool_t *pool, goto on_error; } - /* Apply the remaining settings */ -/* if (param->flags & PJMEDIA_VID_DEV_CAP_ORIENTATION) { - andgl_stream_set_cap(&strm->base, PJMEDIA_VID_DEV_CAP_ORIENTATION, - ¶m->orient); - } -*/ PJ_LOG(4, (THIS_FILE, "Android OpenGL ES renderer successfully created")); /* Done */ @@ -443,19 +429,11 @@ static pj_status_t andgl_stream_set_cap(pjmedia_vid_dev_stream *s, job_queue_post_job(strm->jq, init_opengl, strm, 0, &status); } - 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; } return PJMEDIA_EVID_INVCAP; -- cgit v1.2.3