[Iaxclient-cvs] SF.net SVN: iaxclient:[1461] trunk/lib

[<bc...@us...>]

Revision: 1461
          http://iaxclient.svn.sourceforge.net/iaxclient/?rev=1461&view=rev
Author:   bcholew
Date:     2010-01-29 15:29:04 +0000 (Fri, 29 Jan 2010)

Log Message:
-----------
Increase de/slicer constants to handle at least 512kbps.
Update comments to complain, but not fix.

Modified Paths:
--------------
    trunk/lib/iaxclient_lib.h
    trunk/lib/slice.h

Modified: trunk/lib/iaxclient_lib.h
===================================================================
--- trunk/lib/iaxclient_lib.h	2010-01-29 15:24:33 UTC (rev 1460)
+++ trunk/lib/iaxclient_lib.h	2010-01-29 15:29:04 UTC (rev 1461)
@@ -170,8 +170,10 @@
 	void (*destroy) ( struct iaxc_audio_codec *codec);
 };
 
+//FIXME: This is all very static. What of higher
+//       bitrates, that require more slices?
 #define MAX_TRUNK_LEN	(1<<16)
-#define MAX_NO_SLICES	32
+#define MAX_NO_SLICES	64
 
 struct slice_set_t
 {

Modified: trunk/lib/slice.h
===================================================================
--- trunk/lib/slice.h	2010-01-29 15:24:33 UTC (rev 1460)
+++ trunk/lib/slice.h	2010-01-29 15:29:04 UTC (rev 1461)
@@ -39,7 +39,12 @@
 
 #include "iaxclient_lib.h"
 
-#define MAX_ENCODED_FRAME_SIZE 48 * 1024
+// We don't bother deslicing frames larger than this,
+// but we DO slice-up frames as long as they don't exceed
+// MAX_NO_SLICES, each up to MAX_TRUNK_LEN long
+// ( see definition of struct slice_set_t )
+//FIXME: this doesn't depend on the bitrate
+#define MAX_ENCODED_FRAME_SIZE 96 * 1024
 
 struct slicer_context
 {


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.