Changeset 1686


Ignore:
Timestamp:
Jan 12, 2008 3:32:17 PM (11 years ago)
Author:
bennylp
Message:

In mix.c, handle FRAME_TYPE_NONE if the conference ever returns one

File:
1 edited

Legend:

Unmodified
Added
Removed
  • pjproject/trunk/pjsip-apps/src/samples/mix.c

    r1684 r1686  
    8383    pjmedia_port *wavout; 
    8484    struct wav_input wav_input[MAX_WAV]; 
    85     pj_ssize_t longest = 0, processed; 
     85    pj_size_t longest = 0, processed; 
    8686    unsigned i, input_cnt = 0; 
    8787    pj_status_t status; 
     
    174174        len = (pj_ssize_t)(len * 1.0 * clock_rate /  
    175175                            wav_input[i].port->info.clock_rate); 
    176         if (len > longest) 
     176        if (len > (pj_ssize_t)longest) 
    177177            longest = len; 
    178178 
     
    196196        CHECK( pjmedia_port_get_frame(cp, &frame) ); 
    197197 
     198        if (frame.type != PJMEDIA_FRAME_TYPE_AUDIO) { 
     199            pj_bzero(frame.buf, frame.size); 
     200            frame.type = PJMEDIA_FRAME_TYPE_AUDIO; 
     201        } 
     202 
    198203        CHECK( pjmedia_port_put_frame(wavout, &frame)); 
    199204 
Note: See TracChangeset for help on using the changeset viewer.