[svn-commits] juggie: trunk r121599 - /trunk/codecs/codec_ilbc.c

[SVN commits to the Digium repositories]

Author: juggie
Date: Tue Jun 10 14:03:11 2008
New Revision: 121599

URL: http://svn.digium.com/view/asterisk?view=rev&rev=121599
Log:
Revision 117802 changed frame.data to frame.data.ptr however codec_ilbc.c was not updated.  This resolves that oversight.

Modified:
    trunk/codecs/codec_ilbc.c

Modified: trunk/codecs/codec_ilbc.c
URL: http://svn.digium.com/view/asterisk/trunk/codecs/codec_ilbc.c?view=diff&rev=121599&r1=121598&r2=121599
==============================================================================
--- trunk/codecs/codec_ilbc.c (original)
+++ trunk/codecs/codec_ilbc.c Tue Jun 10 14:03:11 2008
@@ -87,7 +87,7 @@
 	f.mallocd = 0;
 	f.offset = 0;
 	f.src = __PRETTY_FUNCTION__;
-	f.data = slin_ilbc_ex;
+	f.data.ptr = slin_ilbc_ex;
 	return &f;
 }
 
@@ -102,7 +102,7 @@
 	f.mallocd = 0;
 	f.offset = 0;
 	f.src = __PRETTY_FUNCTION__;
-	f.data = ilbc_slin_ex;
+	f.data.ptr = ilbc_slin_ex;
 	return &f;
 }
 
@@ -134,7 +134,7 @@
 			ast_log(LOG_WARNING, "Out of buffer space\n");
 			return -1;
 		}		
-		iLBC_decode(tmpf, plc_mode ? f->data + x : NULL, &tmp->dec, plc_mode);
+		iLBC_decode(tmpf, plc_mode ? f->data.ptr + x : NULL, &tmp->dec, plc_mode);
 		for ( i=0; i < ILBC_SAMPLES; i++)
 			dst[pvt->samples + i] = tmpf[i];
 		pvt->samples += ILBC_SAMPLES;
@@ -152,7 +152,7 @@
 	/* XXX We should look at how old the rest of our stream is, and if it
 	   is too old, then we should overwrite it entirely, otherwise we can
 	   get artifacts of earlier talk that do not belong */
-	memcpy(tmp->buf + pvt->samples, f->data, f->datalen);
+	memcpy(tmp->buf + pvt->samples, f->data.ptr, f->datalen);
 	pvt->samples += f->samples;
 	return 0;
 }