diff options
| author | Nanang Izzuddin <nanang@teluu.com> | 2012-07-05 10:25:46 +0000 |
|---|---|---|
| committer | Nanang Izzuddin <nanang@teluu.com> | 2012-07-05 10:25:46 +0000 |
| commit | 1a722c4393f66b868068d14e998bd942befc2744 (patch) | |
| tree | 43b80396303ab2e6bc3ebaaa6e054d3221b30600 /pjmedia/src/pjmedia | |
| parent | 1d8e02448bda3f1bca867c8dc8e0d8feca4c74e1 (diff) | |
Fix #1549: Always reset conference port mixing buffer when it has transmitter(s).
git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@4198 74dad513-b988-da41-8d7b-12977e46ad98
Diffstat (limited to 'pjmedia/src/pjmedia')
| -rw-r--r-- | pjmedia/src/pjmedia/conference.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pjmedia/src/pjmedia/conference.c b/pjmedia/src/pjmedia/conference.c index d155d0ee..dbf7868a 100644 --- a/pjmedia/src/pjmedia/conference.c +++ b/pjmedia/src/pjmedia/conference.c @@ -1810,11 +1810,11 @@ static pj_status_t get_frame(pjmedia_port *this_port, /* Var "ci" is to count how many ports have been visited so far. */ ++ci; - /* Reset buffer (only necessary if more than one transmitter) and + /* Reset buffer (only necessary if the port has transmitter) and * reset auto adjustment level for mixed signal. */ conf_port->mix_adj = NORMAL_LEVEL; - if (conf_port->transmitter_cnt > 1) { + if (conf_port->transmitter_cnt) { pj_bzero(conf_port->mix_buf, conf->samples_per_frame*sizeof(conf_port->mix_buf[0])); } |