Add PLC and jitter buffer and iax2 meta trunk with timestamps (bug #2532, #3400)

git-svn-id: http://svn.digium.com/svn/asterisk/trunk@5192 f38db490-d61c-443f-a65b-d21fe96a405b

2 files changed, 9 insertions, 1 deletions

diff --git a/include/asterisk/channel.h b/include/asterisk/channel.h
index e0a2c64ef..1ebcb3064 100755
--- a/include/asterisk/channel.h
+++ b/include/asterisk/channel.h
@@ -82,8 +82,12 @@ struct ast_channel_tech {
 	const char * const type;
 	const char * const description;
 
+	/*! Bitmap of formats this channel can handle */
 	int capabilities;
 
+	/*! Technology Properties */
+	int properties;
+
 	struct ast_channel *(* const requester)(const char *type, int format, void *data, int *cause);
 
 	int (* const devicestate)(void *data);
@@ -311,6 +315,10 @@ struct ast_channel {
 
 };
 
+/* Channel tech properties: */
+/* Channels have this property if they can accept input with jitter; i.e. most VoIP channels */
+#define AST_CHAN_TP_WANTSJITTER	(1 << 0)	
+
 #define AST_FLAG_DIGITAL	(1 << 0)	/* if the call is a digital ISDN call */
 #define AST_FLAG_DEFER_DTMF	(1 << 1)	/* if dtmf should be deferred */
 #define AST_FLAG_WRITE_INT	(1 << 2)	/* if write should be interrupt generator */
diff --git a/include/asterisk/translate.h b/include/asterisk/translate.h
index 2bcd4ef40..b33cec629 100755
--- a/include/asterisk/translate.h
+++ b/include/asterisk/translate.h
@@ -21,6 +21,7 @@ extern "C" {
 #endif
 
 #include <asterisk/frame.h>
+#include <asterisk/plc.h>
 
 /* Declared by individual translators */
 struct ast_translator_pvt;
@@ -103,7 +104,6 @@ extern void ast_translator_free_path(struct ast_trans_pvt *tr);
  */
 extern struct ast_frame *ast_translate(struct ast_trans_pvt *tr, struct ast_frame *f, int consume);
 
-
 #if defined(__cplusplus) || defined(c_plusplus)
 }
 #endif