From aba53e801481d4a43335440c50774e1bc103c41c Mon Sep 17 00:00:00 2001
From: smorlat <smorlat@3f6dc0c8-ddfe-455d-9043-3cd528dc4637>
Date: Thu, 9 Jul 2009 11:19:41 +0000
Subject: [PATCH] workaround to avoid sending odd number of samples per packet.

git-svn-id: svn+ssh://svn.savannah.nongnu.org/linphone/trunk@524 3f6dc0c8-ddfe-455d-9043-3cd528dc4637
---
 linphone/mediastreamer2/src/msfileplayer.c | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/linphone/mediastreamer2/src/msfileplayer.c b/linphone/mediastreamer2/src/msfileplayer.c
index 57c61b743..2dec8059a 100644
--- a/linphone/mediastreamer2/src/msfileplayer.c
+++ b/linphone/mediastreamer2/src/msfileplayer.c
@@ -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;