diff options
| author | Liong Sauw Ming <ming@teluu.com> | 2015-03-22 09:39:31 +0000 |
|---|---|---|
| committer | Liong Sauw Ming <ming@teluu.com> | 2015-03-22 09:39:31 +0000 |
| commit | 40d82503230ff68564a37c2a6264b94997563f7d (patch) | |
| tree | 138eb53b6a885e0927dbf1743fd243fce2bf5ba9 /pjmedia | |
| parent | d5d58e0dc82e8c440224a3b9285a4174f3e290c9 (diff) | |
Re #1790: Misc fixes:
* Fixed crash when trying to set NULL surface
* Fixed race condition between setting surface and rendering
* Fixed crash due to GC of VideoWindow
git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@5016 74dad513-b988-da41-8d7b-12977e46ad98
Diffstat (limited to 'pjmedia')
| -rw-r--r-- | pjmedia/src/pjmedia-videodev/android_opengl.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pjmedia/src/pjmedia-videodev/android_opengl.c b/pjmedia/src/pjmedia-videodev/android_opengl.c index 292f1497..6e5ee869 100644 --- a/pjmedia/src/pjmedia-videodev/android_opengl.c +++ b/pjmedia/src/pjmedia-videodev/android_opengl.c @@ -229,7 +229,7 @@ static pj_status_t render(void * data) { struct andgl_stream *stream = (struct andgl_stream *)data; - if (!stream->window || stream->err_rend == 0) + if (stream->display == EGL_NO_DISPLAY || stream->err_rend == 0) return PJ_SUCCESS; pjmedia_vid_dev_opengl_draw(stream->gl_buf, stream->vid_size.w, @@ -481,7 +481,7 @@ static pj_status_t andgl_stream_put_frame(pjmedia_vid_dev_stream *strm, struct andgl_stream *stream = (struct andgl_stream*)strm; pj_status_t status; - if (!stream->is_running || !stream->window) + if (!stream->is_running || stream->display == EGL_NO_DISPLAY) return PJ_EINVALIDOP; stream->frame = frame; |