Changeset 1623


Ignore:
Timestamp:
Dec 9, 2007 5:34:09 AM (12 years ago)
Author:
bennylp
Message:

Ticket #427: conference bridge does not handle NONE frame (thanks Daniel Braun)

File:
1 edited

Legend:

Unmodified
Added
Removed
  • pjproject/trunk/pjmedia/src/pjmedia/conference.c

    r1417 r1623  
    12701270    } else { 
    12711271 
     1272        /* Initialize frame type to None */ 
     1273        *type = PJMEDIA_FRAME_TYPE_NONE; 
     1274 
    12721275        /* 
    12731276         * If we don't have enough samples in rx_buf, read from the port  
     
    12971300                pjmedia_zero_samples( cport->rx_buf + cport->rx_buf_count, 
    12981301                                      cport->samples_per_frame); 
     1302            } else { 
     1303                /* We've got at least one frame */ 
     1304                *type = PJMEDIA_FRAME_TYPE_AUDIO; 
    12991305            } 
    13001306 
     
    17191725            if (conf->ports[i] == NULL) 
    17201726                continue; 
     1727 
     1728            /* Ignore if we didn't get any frame */ 
     1729            if (frame_type != PJMEDIA_FRAME_TYPE_AUDIO) 
     1730                continue; 
    17211731        } 
    17221732 
Note: See TracChangeset for help on using the changeset viewer.