diff options
| author | Benny Prijono <bennylp@teluu.com> | 2007-12-22 07:43:45 +0000 |
|---|---|---|
| committer | Benny Prijono <bennylp@teluu.com> | 2007-12-22 07:43:45 +0000 |
| commit | d8efa2902b83540504be0eb78ed5a74c8b28ad55 (patch) | |
| tree | 1af499b440d5df9f3daa3dd7beb18022ec717a3e /pjmedia | |
| parent | 050af3159e072d2cde0e4354a596a5b10959cd55 (diff) | |
Fixed bug caused by ticket #427: frame type not properly initialized to PJMEDIA_FRAME_TYPE_AUDIO, causing audio frames to be dropped in the conference bridge (thanks P.J. Cast)
git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@1637 74dad513-b988-da41-8d7b-12977e46ad98
Diffstat (limited to 'pjmedia')
| -rw-r--r-- | pjmedia/src/pjmedia/conference.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/pjmedia/src/pjmedia/conference.c b/pjmedia/src/pjmedia/conference.c index ee655a42..abf7239a 100644 --- a/pjmedia/src/pjmedia/conference.c +++ b/pjmedia/src/pjmedia/conference.c @@ -1280,8 +1280,13 @@ static pj_status_t read_port( pjmedia_conf *conf, } else { - /* Initialize frame type to None */ - *type = PJMEDIA_FRAME_TYPE_NONE; + /* Initialize frame type */ + if (cport->rx_buf_count == 0) { + *type = PJMEDIA_FRAME_TYPE_NONE; + } else { + /* we got some samples in the buffer */ + *type = PJMEDIA_FRAME_TYPE_AUDIO; + } /* * If we don't have enough samples in rx_buf, read from the port |