Changeset 198:0c83883672a0 in mediastreamer2

Timestamp:

Dec 11, 2008 5:39:36 PM (4 years ago)

Author:

smorlat <smorlat@…>

Branch:

default

Message:

fix bug in msx264
fix segfault when sending a dtmf when call is not yet established.

git-svn-id: ​svn+ssh://svn.savannah.nongnu.org/linphone/trunk@201 3f6dc0c8-ddfe-455d-9043-3cd528dc4637

Location:

linphone/mediastreamer2

Files:

• plugins/msx264/src/msx264.c (modified) (1 diff)
• src/audiostream.c (modified) (1 diff)

linphone/mediastreamer2/plugins/msx264/src/msx264.c

@@ -458 +458 @@
                 *dst++=*src++;
                 while(src<(im->b_wptr-3)){
-                        if (src[0]==0 && src[1]==0 && src[2]<=3){
+                        if (src[0]==0 && src[1]==0 && src[2]<3){
                                 *dst++=0;
                                 *dst++=0;

linphone/mediastreamer2/src/audiostream.c

@@ -441 +441 @@
 int audio_stream_send_dtmf(AudioStream *stream, char dtmf)
 {
-        ms_filter_call_method(stream->rtpsend,MS_RTP_SEND_SEND_DTMF,&dtmf);
-        ms_filter_call_method(stream->dtmfgen,MS_DTMF_GEN_PUT,&dtmf);
+        if (stream->rtpsend)
+                ms_filter_call_method(stream->rtpsend,MS_RTP_SEND_SEND_DTMF,&dtmf);
+        if (stream->dtmfgen)
+                ms_filter_call_method(stream->dtmfgen,MS_DTMF_GEN_PUT,&dtmf);
         return 0;
 }