mirrors/linphone-iphone
1
0
Fork 1
mirror of https://gitlab.linphone.org/BC/public/linphone-iphone.git synced 2026-01-21 21:28:08 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

workaround to avoid sending odd number of samples per packet.

Browse source 
git-svn-id: svn+ssh://svn.savannah.nongnu.org/linphone/trunk@524 3f6dc0c8-ddfe-455d-9043-3cd528dc4637
This commit is contained in:
smorlat 2009-07-09 11:19:41 +00:00
parent ba0d970b22
commit aba53e8014
1 changed files with 16 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
linphone/mediastreamer2/src/msfileplayer.c
View file

@ -38,6 +38,7 @@ struct _PlayerData{
int hsize;
int loop_after;
int pause_time;
int count;
bool_t swap;
};
@ -53,6 +54,7 @@ static void player_init(MSFilter *f){
d->hsize=0;
d->loop_after=-1; /*by default, don't loop*/
d->pause_time=0;
d->count=0;
f->data=d;
}
@ -121,6 +123,7 @@ static int read_wav_header(PlayerData *d){
not_a_wav:
/*rewind*/
lseek(d->fd,0,SEEK_SET);
d->hsize=0;
return -1;
}
@ -190,7 +193,19 @@ static void swap_bytes(unsigned char *bytes, int len){
static void player_process(MSFilter *f){
PlayerData *d=(PlayerData*)f->data;
int bytes=2*(f->ticker->interval*d->rate*d->nchannels)/1000;
int nsamples=(f->ticker->interval*d->rate*d->nchannels)/1000;
int bytes;
/*send an even number of samples each tick. At 22050Hz the number of samples per 10 ms chunk is odd.
Odd size buffer of samples cause troubles to alsa. Fixing in alsa is difficult, so workaround here.
*/
if (nsamples & 0x1 ) { //odd number of samples
if (d->count & 0x1 )
nsamples++;
else
nsamples--;
}
bytes=2*nsamples;
d->count++;
ms_filter_lock(f);
if (d->state==STARTED){
int err;