rpms/opal/devel rfc2833_duration.patch, NONE, 1.1 opal.spec, 1.14, 1.15

[fedora-cvs-commits at redhat.com]

Author: veillard

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

Modified Files:
	opal.spec 
Added Files:
	rfc2833_duration.patch 
Log Message:
Apply fix for RFC2833 DTMF duration problem
Resolves: rhbz#220333
Daniel


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

--- NEW FILE rfc2833_duration.patch ---
--- opal_v2_2_3/src/codec/rfc2833.cxx.dtmf	2006-12-19 15:58:36.000000000 -0500
+++ opal_v2_2_3/src/codec/rfc2833.cxx	2006-12-19 15:58:45.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_v2_2_3/src/sip/sipcon.cxx.dtmf	2006-12-19 15:59:02.000000000 -0500
+++ opal_v2_2_3/src/sip/sipcon.cxx	2006-12-19 15:59:07.000000000 -0500
@@ -24,6 +24,9 @@
  * Contributor(s): ______________________________________.
  *
  * $Log: sipcon.cxx,v $
+ * Revision 2.120.2.20  2006/10/06 08:16:51  dsandras
+ * Backported fix from HEAD for RFC2833 support.
+ *
  * Revision 2.120.2.19  2006/08/11 07:30:27  dsandras
  * Backported patch from HEAD.
  *
@@ -1126,7 +1129,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/devel/opal.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- opal.spec	6 Nov 2006 15:54:59 -0000	1.14
+++ opal.spec	20 Dec 2006 16:42:51 -0000	1.15
@@ -1,7 +1,7 @@
 Summary: Open Phone Abstraction Library
 Name: opal
 Version: 2.2.3
-Release: 3%{?dist}
+Release: 4%{?dist}
 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 -n opal_v2_2_3
+%patch0 -p1
 
 %build
 %configure --enable-localspeex
@@ -59,6 +61,10 @@
 %{_libdir}/*.so
 
 %changelog
+* Wed Dec 20 2006 Daniel Veillard <veillard at redhat.com> - 2.2.3-4
+- applied patch from upstream to fix RFC2833 DTMF duration problem
+- Resolves: rhbz#220333
+
 * Mon Nov  6 2006 Daniel Veillard <veillard at redhat.com> - 2.2.3-3
 - moved the .so to -devel
 - Resolves: rhbz#203633