From: Kevin P. Fleming <kpfleming@digium.com>
Date: Tue, 9 Feb 2010 16:26:15 +0000 (+0000)
Subject: Merged revisions 245680 via svnmerge from
X-Git-Tag: 1.6.1.15-rc2~5
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b2f9762fbe728733b363967ce04dad54825734c8;p=thirdparty%2Fasterisk.git

Merged revisions 245680 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
  r245680 | kpfleming | 2010-02-09 10:24:52 -0600 (Tue, 09 Feb 2010) | 8 lines

  Don't offer MMR or JBIG transcoding during T.38 negotiation.

  After further discussion with Steve Underwood, we should not (yet) be offering
  to receive MMR or JBIG transcoded streams from T.38 endpoints. A future spandsp
  release will support those features, and then they can be enabled during
  negotiation
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@245682 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/apps/app_fax.c b/apps/app_fax.c
index 1fede40a39..c0621f5bb8 100644
--- a/apps/app_fax.c
+++ b/apps/app_fax.c
@@ -330,8 +330,12 @@ static int transmit_audio(fax_session *s)
 							     .rate = AST_T38_RATE_14400,
 							     .rate_management = AST_T38_RATE_MANAGEMENT_TRANSFERRED_TCF,
 							     .fill_bit_removal = 1,
-							     .transcoding_mmr = 1,
-							     .transcoding_jbig = 1,
+/*
+ * spandsp has API calls to support MMR and JBIG transcoding, but they aren't
+ * implemented quite yet... so don't offer them to the remote endpoint
+ *							     .transcoding_mmr = 1,
+ *							     .transcoding_jbig = 1,
+*/
 	};
 
 	/* if in called party mode, try to use T.38 */