Changeset 5016


Ignore:
Timestamp:
Mar 22, 2015 9:39:31 AM (6 years ago)
Author:
ming
Message:

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?
Location:
pjproject/trunk
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • pjproject/trunk/pjmedia/src/pjmedia-videodev/android_opengl.c

    r5014 r5016  
    230230    struct andgl_stream *stream = (struct andgl_stream *)data; 
    231231     
    232     if (!stream->window || stream->err_rend == 0) 
     232    if (stream->display == EGL_NO_DISPLAY || stream->err_rend == 0) 
    233233        return PJ_SUCCESS; 
    234234     
     
    482482    pj_status_t status; 
    483483 
    484     if (!stream->is_running || !stream->window) 
     484    if (!stream->is_running || stream->display == EGL_NO_DISPLAY) 
    485485        return PJ_EINVALIDOP; 
    486486     
  • pjproject/trunk/pjsip-apps/src/swig/java/android/src/org/pjsip/pjsua2/app/MyApp.java

    r5014 r5016  
    9696                                       cmi.getVideoIncomingWindowId() != pjsua2.INVALID_ID) 
    9797                        { 
    98                                 vidWin = cmi.getVideoWindow(); 
     98                                vidWin = new VideoWindow(cmi.getVideoIncomingWindowId()); 
    9999                        } 
    100100                } 
  • pjproject/trunk/pjsip-apps/src/swig/pjsua2.i

    r5014 r5016  
    108108%ignore pj::WindowHandle::window; 
    109109%typemap(in) jobject surface { 
    110     $1 = (jobject)ANativeWindow_fromSurface(jenv, $input); 
     110    $1 = ($input? (jobject)ANativeWindow_fromSurface(jenv, $input): NULL); 
    111111} 
    112112%extend pj::WindowHandle { 
Note: See TracChangeset for help on using the changeset viewer.