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: https://svn.pjsip.org/repos/pjproject/trunk@1637 74dad513-b988-da41-8d7b-12977e46ad98
diff --git a/pjmedia/src/pjmedia/conference.c b/pjmedia/src/pjmedia/conference.c
index ee655a4..abf7239 100644
--- a/pjmedia/src/pjmedia/conference.c
+++ b/pjmedia/src/pjmedia/conference.c
@@ -1280,8 +1280,13 @@
} 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