rpms/opal/FC-6 rfc2833_duration.patch,NONE,1.1 opal.spec,1.10,1.11

[fedora-cvs-commits at redhat.com]

Author: veillard

Update of /cvs/dist/rpms/opal/FC-6
In directory cvs.devel.redhat.com:/tmp/cvs-serv3123

Modified Files:
	opal.spec 
Added Files:
	rfc2833_duration.patch 
Log Message:
applied patch from upstream to fix RFC2833 DTMF duration problem
Resolves: rhbz#220333
Daniel


rfc2833_duration.patch:
 codec/rfc2833.cxx |    5 +++++
 sip/sipcon.cxx    |    2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

--- NEW FILE rfc2833_duration.patch ---
--- opal-2.2.2/src/codec/rfc2833.cxx.dtmf	2006-12-19 16:35:54.000000000 -0500
+++ opal-2.2.2/src/codec/rfc2833.cxx	2006-12-19 16:36:03.000000000 -0500
@@ -23,6 +23,9 @@
  * Contributor(s): ______________________________________.
  *
  * $Log: rfc2833.cxx,v $
+ * Revision 2.2.2.1  2006/11/03 08:35:32  dsandras
+ * Backported fix from HEAD.
+ *
  * Revision 2.2  2002/02/19 07:35:08  robertj
  * Added OpalRFC2833 as a OpalMediaFormat variable.
  *
@@ -232,6 +235,8 @@
   }
 
   unsigned duration = actualTimestamp - transmitTimestamp;
+  if (duration == 0)
+    frame.SetMarker(TRUE);
   payload[2] = (BYTE)(duration>>8);
   payload[3] = (BYTE) duration    ;
 }
--- opal-2.2.2/src/sip/sipcon.cxx.dtmf	2006-12-19 16:33:09.000000000 -0500
+++ opal-2.2.2/src/sip/sipcon.cxx	2006-12-19 16:35:34.000000000 -0500
@@ -1118,7 +1118,7 @@
 	    patch->AddFilter(rfc2833Handler->GetReceiveHandler(), mediaStream.GetMediaFormat());
 	  }
 	  else {
-	    patch->AddFilter(rfc2833Handler->GetTransmitHandler());
+	    patch->AddFilter(rfc2833Handler->GetTransmitHandler(), mediaStream.GetMediaFormat());
 	  }
 	}
       }


Index: opal.spec
===================================================================
RCS file: /cvs/dist/rpms/opal/FC-6/opal.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- opal.spec	12 Jul 2006 07:30:29 -0000	1.10
+++ opal.spec	20 Dec 2006 16:51:53 -0000	1.11
@@ -1,7 +1,7 @@
 Summary: Open Phone Abstraction Library
 Name: opal
 Version: 2.2.2
-Release: 1.1
+Release: 2
 URL: http://www.openh323.org/
 Source0: http://www.ekiga.org/%{name}-%{version}.tar.gz
 License: MPL
@@ -12,6 +12,7 @@
 BuildRequires: SDL-devel
 BuildRoot: %{_tmppath}/%{name}-root
 Obsoletes: openh323
+Patch0: rfc2833_duration.patch
 
 %description
 Open Phone Abstraction Library, implementation of the ITU H.323
@@ -28,6 +29,7 @@
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
 %configure --enable-localspeex
@@ -59,6 +61,10 @@
 %{_datadir}/opal
 
 %changelog
+* Wed Dec 20 2006 Daniel Veillard <veillard at redhat.com> - 2.2.2-2
+- applied patch from upstream to fix RFC2833 DTMF duration problem
+- Resolves: rhbz#220333
+
 * Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 2.2.2-1.1
 - rebuild