sysmocom
/
pjproject
11
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

In mix.c, handle FRAME_TYPE_NONE if the conference ever returns one 

git-svn-id: https://svn.pjsip.org/repos/pjproject/trunk@1686 74dad513-b988-da41-8d7b-12977e46ad98
This commit is contained in:
Benny Prijono 2008-01-12 15:32:17 +00:00
parent 39e232add0
commit e9a653062f
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pjsip-apps/src/samples/mix.c
View File

@ -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;