Attachment 917 Details for Bug 1097 – Partial patch to build jingle voice support.

By default, Bugzilla does not search the list of RESOLVED bugs.
You can force it to do so by putting the upper-case word ALL in front of your search query, e.g.: ALL tdelibs
We recommend searching for bugs this way, as you may discover that your bug has already been resolved and fixed in a later release.

[patch] Partial patch to build jingle voice support.

tdenetwork-ortp-speex.diff (text/plain), 6.69 KB, created by Darrell on 2012-10-18 22:07:36 CDT

(hide)

Description:

Filename:

MIME Type:

Creator: Darrell

Created: 2012-10-18 22:07:36 CDT

Size: 6.69 KB

patch

obsolete

>diff -urN tdenetwork/kopete/protocols/jabber/jingle/libjingle/talk/session/phone/linphonemediaengine.cc tdenetwork.new/kopete/protocols/jabber/jingle/libjingle/talk/session/phone/linphonemediaengine.cc
>--- tdenetwork/kopete/protocols/jabber/jingle/libjingle/talk/session/phone/linphonemediaengine.cc	2012-09-14 18:01:05.000000000 -0500
>+++ tdenetwork.new/kopete/protocols/jabber/jingle/libjingle/talk/session/phone/linphonemediaengine.cc	2012-10-18 19:45:02.000000000 -0500
>@@ -27,7 +27,7 @@
> #include "talk/third_party/mediastreamer/msspeexdec.h"
> #endif
> }
>-#include <ortp.h>
>+#include <ortp/ortp.h>
> #include <netdb.h>
> #include <unistd.h>
> #include <fcntl.h>
>@@ -139,7 +139,7 @@
>  
> #ifdef HAVE_SPEEX
>   ms_speex_codec_init();
>-  rtp_profile_set_payload(&av_profile, 110, &speex_wb);
>+  rtp_profile_set_payload(&av_profile, 110, &payload_type_speex_wb);
>   codecs_.push_back(Codec(110, "speex", 8));
> #endif
> 
>@@ -149,7 +149,7 @@
>   codecs_.push_back(Codec(102, "iLBC", 4));
> #endif
> 
>-  rtp_profile_set_payload(&av_profile, 0, &pcmu8000);
>+  rtp_profile_set_payload(&av_profile, 0, &payload_type_pcmu8000);
>   codecs_.push_back(Codec(0, "PCMU", 2));
>   
> return true;
>diff -urN tdenetwork/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msrtprecv.h tdenetwork.new/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msrtprecv.h
>--- tdenetwork/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msrtprecv.h	2012-09-14 18:01:05.000000000 -0500
>+++ tdenetwork.new/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msrtprecv.h	2012-10-18 20:01:07.000000000 -0500
>@@ -28,7 +28,7 @@
> /* because of a conflict between config.h from oRTP and config.h from linphone:*/
> #undef PACKAGE
> #undef VERSION                                                
>-#include <ortp.h>
>+#include <ortp/ortp.h>
> 
> /*this is the class that implements a copy filter*/
> 
>diff -urN tdenetwork/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msrtpsend.c tdenetwork.new/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msrtpsend.c
>--- tdenetwork/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msrtpsend.c	2012-09-14 18:01:05.000000000 -0500
>+++ tdenetwork.new/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msrtpsend.c	2012-10-18 20:01:07.000000000 -0500
>@@ -19,7 +19,7 @@
> */
> 
> #include "msrtpsend.h"
>-#include <telephonyevents.h>
>+#include <ortp/telephonyevents.h>
> #include "mssync.h"
> #include "mscodec.h"
> 
>diff -urN tdenetwork/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msrtpsend.h tdenetwork.new/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msrtpsend.h
>--- tdenetwork/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msrtpsend.h	2012-09-14 18:01:05.000000000 -0500
>+++ tdenetwork.new/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msrtpsend.h	2012-10-18 20:01:07.000000000 -0500
>@@ -27,7 +27,7 @@
> 
> #undef PACKAGE
> #undef VERSION
>-#include <ortp.h>
>+#include <ortp/ortp.h>
> 
> 
> /*this is the class that implements a sending through rtp filter*/
>diff -urN tdenetwork/kopete/protocols/jabber/jingle/libjingle/talk/third_party/ortp/ortp.c tdenetwork.new/kopete/protocols/jabber/jingle/libjingle/talk/third_party/ortp/ortp.c
>--- tdenetwork/kopete/protocols/jabber/jingle/libjingle/talk/third_party/ortp/ortp.c	2012-09-14 18:01:05.000000000 -0500
>+++ tdenetwork.new/kopete/protocols/jabber/jingle/libjingle/talk/third_party/ortp/ortp.c	2012-10-18 20:01:07.000000000 -0500
>@@ -17,7 +17,7 @@
>   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
> */
> 
>-#include <ortp.h>
>+#include <ortp/ortp.h>
> #include "scheduler.h"
> #include <stdlib.h>
> 
>diff -urN tdenetwork/kopete/protocols/jabber/jingle/libjingle/talk/third_party/ortp/rtcpparse.c tdenetwork.new/kopete/protocols/jabber/jingle/libjingle/talk/third_party/ortp/rtcpparse.c
>--- tdenetwork/kopete/protocols/jabber/jingle/libjingle/talk/third_party/ortp/rtcpparse.c	2012-09-14 18:01:05.000000000 -0500
>+++ tdenetwork.new/kopete/protocols/jabber/jingle/libjingle/talk/third_party/ortp/rtcpparse.c	2012-10-18 20:01:07.000000000 -0500
>@@ -21,7 +21,7 @@
> */
> 
> 
>-#include <ortp.h>
>+#include <ortp/ortp.h>
> 
> 
> 
>diff -urN tdenetwork/kopete/protocols/jabber/jingle/libjingle/talk/third_party/ortp/rtpparse.c tdenetwork.new/kopete/protocols/jabber/jingle/libjingle/talk/third_party/ortp/rtpparse.c
>--- tdenetwork/kopete/protocols/jabber/jingle/libjingle/talk/third_party/ortp/rtpparse.c	2012-09-14 18:01:05.000000000 -0500
>+++ tdenetwork.new/kopete/protocols/jabber/jingle/libjingle/talk/third_party/ortp/rtpparse.c	2012-10-18 20:01:07.000000000 -0500
>@@ -18,7 +18,7 @@
> */
> 
> 
>-#include <ortp.h>
>+#include <ortp/ortp.h>
> #include "rtpmod.h"
> #include "jitterctl.h"
> 
>diff -urN tdenetwork/kopete/protocols/jabber/jingle/libjingle/talk/third_party/ortp/rtpsession.c tdenetwork.new/kopete/protocols/jabber/jingle/libjingle/talk/third_party/ortp/rtpsession.c
>--- tdenetwork/kopete/protocols/jabber/jingle/libjingle/talk/third_party/ortp/rtpsession.c	2012-09-14 18:01:05.000000000 -0500
>+++ tdenetwork.new/kopete/protocols/jabber/jingle/libjingle/talk/third_party/ortp/rtpsession.c	2012-10-18 20:01:07.000000000 -0500
>@@ -18,8 +18,8 @@
> */
> 
> 
>-#include <ortp.h>
>-#include <telephonyevents.h>
>+#include <ortp/ortp.h>
>+#include <ortp/telephonyevents.h>
> #include "rtpmod.h"
> #include "jitterctl.h"
> #include "scheduler.h"
>diff -urN tdenetwork/kopete/protocols/jabber/jingle/libjingle/talk/third_party/ortp/sessionset.c tdenetwork.new/kopete/protocols/jabber/jingle/libjingle/talk/third_party/ortp/sessionset.c
>--- tdenetwork/kopete/protocols/jabber/jingle/libjingle/talk/third_party/ortp/sessionset.c	2012-09-14 18:01:05.000000000 -0500
>+++ tdenetwork.new/kopete/protocols/jabber/jingle/libjingle/talk/third_party/ortp/sessionset.c	2012-10-18 20:01:07.000000000 -0500
>@@ -17,7 +17,7 @@
>   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
> */
> 
>-#include <ortp.h>
>+#include <ortp/ortp.h>
> #include <sessionset.h>
> #include "scheduler.h"
> 
>diff -urN tdenetwork/kopete/protocols/jabber/jingle/libjingle/talk/third_party/ortp/telephonyevents.c tdenetwork.new/kopete/protocols/jabber/jingle/libjingle/talk/third_party/ortp/telephonyevents.c
>--- tdenetwork/kopete/protocols/jabber/jingle/libjingle/talk/third_party/ortp/telephonyevents.c	2012-09-14 18:01:05.000000000 -0500
>+++ tdenetwork.new/kopete/protocols/jabber/jingle/libjingle/talk/third_party/ortp/telephonyevents.c	2012-10-18 20:01:07.000000000 -0500
>@@ -17,7 +17,7 @@
>   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
> */
> 
>-#include <telephonyevents.h>
>+#include <ortp/telephonyevents.h>
> 
> 
> PayloadType	telephone_event={

Actions: View | Diff

Attachments on bug 1097: 917 | 918 | 1024 | 1030 | 1032 | 2346