Author: arekm Date: Sun Feb 17 20:43:29 2008 GMT
Module: SOURCES Tag: HEAD
---- Log message:
- updated
---- Files affected:
SOURCES:
kdenetwork-libjingle.patch (1.1 -> 1.2)
---- Diffs:
================================================================
Index: SOURCES/kdenetwork-libjingle.patch
diff -u SOURCES/kdenetwork-libjingle.patch:1.1
SOURCES/kdenetwork-libjingle.patch:1.2
--- SOURCES/kdenetwork-libjingle.patch:1.1 Sun Feb 17 21:31:35 2008
+++ SOURCES/kdenetwork-libjingle.patch Sun Feb 17 21:43:24 2008
@@ -18,3 +18,77 @@
codecs_.push_back(Codec(0, "PCMU", 2));
return true;
+diff -ur
kdenetwork-3.5.9/kopete/protocols/jabber/jingle/libjingle/talk/third_party.org/mediastreamer/audiostream.c
kdenetwork-3.5.9/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/audiostream.c
+---
kdenetwork-3.5.9/kopete/protocols/jabber/jingle/libjingle/talk/third_party.org/mediastreamer/audiostream.c
2008-02-17 21:33:23.542960000 +0100
++++
kdenetwork-3.5.9/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/audiostream.c
2008-02-17 21:33:37.213618816 +0100
+@@ -112,7 +112,7 @@
+ RtpSession **recvsend){
+ RtpSession *rtpr;
+ rtpr=rtp_session_new(RTP_SESSION_SENDRECV);
+- rtp_session_max_buf_size_set(rtpr,MAX_RTP_SIZE);
++ rtp_session_set_recv_buf_size(rtpr,MAX_RTP_SIZE);
+ rtp_session_set_profile(rtpr,profile);
+ rtp_session_set_local_addr(rtpr,get_local_addr_for(remip),locport);
+ if (remport>0) rtp_session_set_remote_addr(rtpr,remip,remport);
+@@ -133,7 +133,7 @@
+ /* creates two rtp filters to recv send streams (remote part)*/
+
+ rtps=rtp_session_new(RTP_SESSION_SENDONLY);
+- rtp_session_max_buf_size_set(rtps,MAX_RTP_SIZE);
++ rtp_session_set_recv_buf_size(rtps,MAX_RTP_SIZE);
+ rtp_session_set_profile(rtps,profile);
+ #ifdef INET6
+ rtp_session_set_local_addr(rtps,"::",locport+2);
+@@ -147,7 +147,7 @@
+ rtp_session_set_jitter_compensation(rtps,jitt_comp);
+
+ rtpr=rtp_session_new(RTP_SESSION_RECVONLY);
+- rtp_session_max_buf_size_set(rtpr,MAX_RTP_SIZE);
++ rtp_session_set_recv_buf_size(rtpr,MAX_RTP_SIZE);
+ rtp_session_set_profile(rtpr,profile);
+ #ifdef INET6
+ rtp_session_set_local_addr(rtpr,"::",locport);
+@@ -217,8 +217,8 @@
+
ms_filter_set_property(stream->decoder,MS_FILTER_PROPERTY_FREQ,&pt->clock_rate);
+
ms_filter_set_property(stream->decoder,MS_FILTER_PROPERTY_BITRATE,&pt->normal_bitrate);
+
+- ms_filter_set_property(stream->encoder,MS_FILTER_PROPERTY_FMTP,
(void*)pt->fmtp);
+-
ms_filter_set_property(stream->decoder,MS_FILTER_PROPERTY_FMTP,(void*)pt->fmtp);
++ ms_filter_set_property(stream->encoder,MS_FILTER_PROPERTY_FMTP,
(void*)pt->send_fmtp);
++
ms_filter_set_property(stream->decoder,MS_FILTER_PROPERTY_FMTP,(void*)pt->recv_fmtp);
+ /* create the synchronisation source */
+ stream->timer=ms_timer_new();
+
+diff -ur
kdenetwork-3.5.9/kopete/protocols/jabber/jingle/libjingle/talk/third_party.org/mediastreamer/msrtprecv.c
kdenetwork-3.5.9/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msrtprecv.c
+---
kdenetwork-3.5.9/kopete/protocols/jabber/jingle/libjingle/talk/third_party.org/mediastreamer/msrtprecv.c
2008-02-17 21:33:23.549627000 +0100
++++
kdenetwork-3.5.9/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msrtprecv.c
2008-02-17 21:33:37.220285803 +0100
+@@ -26,7 +26,7 @@
+ MSMessage *msgb_2_ms_message(mblk_t* mp){
+ MSMessage *msg;
+ MSBuffer *msbuf;
+- if (mp->b_datap->ref_count!=1) return NULL; /* cannot handle properly
non-unique buffers*/
++ if (mp->b_datap->db_ref!=1) return NULL; /* cannot handle properly
non-unique buffers*/
+ /* create a MSBuffer using the mblk_t buffer */
+ msg=ms_message_alloc();
+ msbuf=ms_buffer_alloc(0);
+@@ -120,7 +120,7 @@
+ gint got=0;
+ /* we are connected with queues (surely for video)*/
+ /* use the sync system time to compute a timestamp */
+- PayloadType
*pt=rtp_profile_get_payload(r->rtpsession->profile,r->rtpsession->payload_type);
++ PayloadType
*pt=rtp_profile_get_payload(rtp_session_get_recv_profile(r->rtpsession),rtp_session_get_recv_payload_type(r->rtpsession));
+ if (pt==NULL) {
+ ms_warning("ms_rtp_recv_process(): NULL RtpPayload-
skipping.");
+ return;
+diff -ur
kdenetwork-3.5.9/kopete/protocols/jabber/jingle/libjingle/talk/third_party.org/mediastreamer/msrtpsend.c
kdenetwork-3.5.9/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msrtpsend.c
+---
kdenetwork-3.5.9/kopete/protocols/jabber/jingle/libjingle/talk/third_party.org/mediastreamer/msrtpsend.c
2008-02-17 21:33:23.562961000 +0100
++++
kdenetwork-3.5.9/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msrtpsend.c
2008-02-17 21:33:37.226952794 +0100
+@@ -85,7 +85,7 @@
+ {
+ guint32 clockts;
+ /* use the sync system time to compute a timestamp */
+- PayloadType
*pt=rtp_profile_get_payload(r->rtpsession->profile,r->rtpsession->payload_type);
++ PayloadType
*pt=rtp_profile_get_payload(rtp_session_get_send_profile(r->rtpsession),rtp_session_get_send_payload_type(r->rtpsession));
+ g_return_val_if_fail(pt!=NULL,0);
+ clockts=(guint32)(((double)synctime * (double)pt->clock_rate)/1000.0);
+ ms_trace("ms_rtp_send_process: sync->time=%i
clock=%i",synctime,clockts);
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/kdenetwork-libjingle.patch?r1=1.1&r2=1.2&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
