diff options
| author | Benny Prijono <bennylp@teluu.com> | 2008-01-12 15:32:17 +0000 |
|---|---|---|
| committer | Benny Prijono <bennylp@teluu.com> | 2008-01-12 15:32:17 +0000 |
| commit | b6222259efa412572d82f6d247113a08cd5bdfd2 (patch) | |
| tree | d5994e2fbd013fb5220a30a5582ccc50506ef8ff /pjsip-apps/src | |
| parent | 754f91a4ebe3a3bd6b9516e1a9c87ed4e548cd9e (diff) | |
In mix.c, handle FRAME_TYPE_NONE if the conference ever returns one
git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@1686 74dad513-b988-da41-8d7b-12977e46ad98
Diffstat (limited to 'pjsip-apps/src')
| -rw-r--r-- | pjsip-apps/src/samples/mix.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/pjsip-apps/src/samples/mix.c b/pjsip-apps/src/samples/mix.c index 4fb8882d..654ee632 100644 --- a/pjsip-apps/src/samples/mix.c +++ b/pjsip-apps/src/samples/mix.c @@ -82,7 +82,7 @@ int main(int argc, char *argv[]) pjmedia_conf *conf; pjmedia_port *wavout; struct wav_input wav_input[MAX_WAV]; - pj_ssize_t longest = 0, processed; + pj_size_t longest = 0, processed; unsigned i, input_cnt = 0; pj_status_t status; @@ -173,7 +173,7 @@ int main(int argc, char *argv[]) len = pjmedia_wav_player_get_len(wav_input[i].port); len = (pj_ssize_t)(len * 1.0 * clock_rate / wav_input[i].port->info.clock_rate); - if (len > longest) + if (len > (pj_ssize_t)longest) longest = len; CHECK( pjmedia_conf_add_port(conf, pool, wav_input[i].port, @@ -195,6 +195,11 @@ int main(int argc, char *argv[]) CHECK( pjmedia_port_get_frame(cp, &frame) ); + if (frame.type != PJMEDIA_FRAME_TYPE_AUDIO) { + pj_bzero(frame.buf, frame.size); + frame.type = PJMEDIA_FRAME_TYPE_AUDIO; + } + CHECK( pjmedia_port_put_frame(wavout, &frame)); processed += frame.size; |