Repair offer/answer model (bug #2293), initial CNG work for new frametype

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

2 files changed, 5 insertions, 1 deletions

diff --git a/include/asterisk/frame.h b/include/asterisk/frame.h
index b8d6c7d8e..c80ca72f5 100755
--- a/include/asterisk/frame.h
+++ b/include/asterisk/frame.h
@@ -118,7 +118,7 @@ struct ast_frame_chain {
 #define AST_FRAME_CONTROL	4
 /*! An empty, useless frame */
 #define AST_FRAME_NULL		5
-/*! Inter Aterisk Exchange private frame type */
+/*! Inter Asterisk Exchange private frame type */
 #define AST_FRAME_IAX		6
 /*! Text messages */
 #define AST_FRAME_TEXT		7
@@ -126,6 +126,9 @@ struct ast_frame_chain {
 #define AST_FRAME_IMAGE		8
 /*! HTML Frame */
 #define AST_FRAME_HTML		9
+/*! Comfort Noise frame (subclass is level of CNG in -dBov), 
+    body may include zero or more 8-bit quantization coefficients */
+#define AST_FRAME_CNG		10
 
 /* HTML subclasses */
 /*! Sending a URL */
diff --git a/include/asterisk/rtp.h b/include/asterisk/rtp.h
index 3d6b0a793..b8436578c 100755
--- a/include/asterisk/rtp.h
+++ b/include/asterisk/rtp.h
@@ -89,6 +89,7 @@ void ast_rtp_set_rtpmap_type(struct ast_rtp* rtp, int pt,
 // Mapping between RTP payload format codes and Asterisk codes:
 struct rtpPayloadType ast_rtp_lookup_pt(struct ast_rtp* rtp, int pt);
 int ast_rtp_lookup_code(struct ast_rtp* rtp, int isAstFormat, int code);
+void ast_rtp_offered_from_local(struct ast_rtp* rtp, int local);
 
 void ast_rtp_get_current_formats(struct ast_rtp* rtp,
 			     int* astFormats, int* nonAstFormats);