Changeset 6138 for pjproject


Ignore:
Timestamp:
Jan 28, 2020 2:42:42 AM (4 years ago)
Author:
nanang
Message:

Misc (re #2210): Get rid of annoying persistent log lines due to video conference connection between active capturer and stopped/hidden renderer (thanks to Dmytrii Gonchar for the feedback).

Location:
pjproject/trunk
Files:
5 edited

Legend:

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

    r6085 r6138  
    474474    pj_status_t status; 
    475475 
     476    /* Video conference just trying to send heart beat for updating timestamp 
     477     * or keep-alive, this port doesn't need any, just ignore. 
     478     */ 
     479    if (frame->size==0 || frame->buf==NULL) 
     480        return PJ_SUCCESS; 
     481         
    476482    if (!stream->is_running || stream->display == EGL_NO_DISPLAY) 
    477483        return PJ_EINVALIDOP; 
  • pjproject/trunk/pjmedia/src/pjmedia-videodev/darwin_dev.m

    r6124 r6138  
    13311331    struct darwin_stream *stream = (struct darwin_stream*)strm; 
    13321332 
     1333    /* Video conference just trying to send heart beat for updating timestamp 
     1334     * or keep-alive, this port doesn't need any, just ignore. 
     1335     */ 
     1336    if (frame->size==0 || frame->buf==NULL) 
     1337        return PJ_SUCCESS; 
     1338         
    13331339    if (stream->frame_size >= frame->size) 
    13341340        pj_memcpy(stream->render_buf, frame->buf, frame->size); 
  • pjproject/trunk/pjmedia/src/pjmedia-videodev/ios_opengl_dev.m

    r5406 r6138  
    472472    struct iosgl_stream *stream = (struct iosgl_stream*)strm; 
    473473     
     474    /* Video conference just trying to send heart beat for updating timestamp 
     475     * or keep-alive, this port doesn't need any, just ignore. 
     476     */ 
     477    if (frame->size==0 || frame->buf==NULL) 
     478        return PJ_SUCCESS; 
     479         
    474480    if (!stream->is_running) 
    475481        return PJ_EINVALIDOP; 
  • pjproject/trunk/pjmedia/src/pjmedia-videodev/sdl_dev.c

    r6125 r6138  
    926926    stream->last_ts.u64 = frame->timestamp.u64; 
    927927 
     928    /* Video conference just trying to send heart beat for updating timestamp 
     929     * or keep-alive, this port doesn't need any, just ignore. 
     930     */ 
     931    if (frame->size==0 || frame->buf==NULL) 
     932        return PJ_SUCCESS; 
     933 
     934    if (frame->size < stream->vafp.framebytes) 
     935        return PJ_ETOOSMALL; 
     936 
    928937    if (!stream->is_running) 
    929938        return PJ_EINVALIDOP; 
    930  
    931     if (frame->size==0 || frame->buf==NULL || 
    932         frame->size < stream->vafp.framebytes) 
    933         return PJ_SUCCESS; 
    934939 
    935940    stream->frame = frame; 
  • pjproject/trunk/pjsip/src/pjsua-lib/pjsua_vid.c

    r6117 r6138  
    668668            } 
    669669 
     670            status = pjsua_vid_conf_connect(w->cap_slot, w->rend_slot, NULL); 
     671            if (status != PJ_SUCCESS) { 
     672                PJ_PERROR(4, (THIS_FILE, status, 
     673                              "Ignored error on connecting video ports " 
     674                              "on wid=%d", wid)); 
     675            } 
     676 
    670677            /* Done */ 
    671678            *id = wid; 
     
    821828 
    822829        /* For preview window, connect capturer & renderer (via conf) */ 
    823         if (w->type == PJSUA_WND_TYPE_PREVIEW) { 
     830        if (w->type == PJSUA_WND_TYPE_PREVIEW && show) { 
    824831            status = pjsua_vid_conf_connect(w->cap_slot, w->rend_slot, NULL); 
    825832            if (status != PJ_SUCCESS) 
     
    14451452                            &enabled); 
    14461453        } else { 
     1454            status = pjsua_vid_conf_disconnect(w->cap_slot, w->rend_slot); 
     1455            if (status != PJ_SUCCESS) { 
     1456                PJ_PERROR(4, (THIS_FILE, status, 
     1457                              "Ignored error on disconnecting video ports " 
     1458                              "on stopping preview wid=%d", wid)); 
     1459            } 
    14471460            status = pjmedia_vid_port_stop(w->vp_rend); 
    14481461        } 
Note: See TracChangeset for help on using the changeset viewer.