Changeset 177:db43877d8d4c in mediastreamer2

Timestamp:

Nov 25, 2008 9:44:38 PM (4 years ago)

Author:

smorlat <smorlat@…>

Branch:

default

Message:

merge patch from telezorg

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

Location:

linphone

Files:

• coreapi/linphonecore.c (modified) (2 diffs)
• coreapi/linphonecore.h (modified) (2 diffs)
• mediastreamer2/include/mediastreamer2/mediastream.h (modified) (2 diffs)
• mediastreamer2/src/audiostream.c (modified) (4 diffs)
• mediastreamer2/src/msv4l2.c (modified) (1 diff)

linphone/coreapi/linphonecore.c

@@ -1351 +1351 @@
   lc->videostream=NULL;
 #endif
+}
+
+static void linphone_core_dtmf_received(RtpSession* s, int dtmf, void* user_data){
+        LinphoneCore* lc = (LinphoneCore*)user_data;
+        if (lc->vtable.dtmf_received != NULL)
+                lc->vtable.dtmf_received(lc, dtmf);
 }
 
@@ -1397 +1403 @@
                                 lc->rec_file);
                 }
+                if (lc->vtable.dtmf_received!=NULL){
+                        /* replace by our default action*/
+                        audio_stream_play_received_dtmfs(lc->audiostream,FALSE);
+                        rtp_session_signal_connect(lc->audiostream->session,"telephone-event",(RtpCallback)linphone_core_dtmf_received,(unsigned long)lc);
+                }
                 audio_stream_set_rtcp_information(lc->audiostream, cname, tool);
         }

linphone/coreapi/linphonecore.h

@@ -405 +405 @@
 typedef void (*TextMessageReceived)(struct _LinphoneCore *lc, LinphoneChatRoom *room, const char *from, const char *message);
 typedef void (*GeneralStateChange)(struct _LinphoneCore *lc, LinphoneGeneralState *gstate);
+typedef void (*DtmfReceived)(struct _LinphoneCore* lc, int dtmf);
 
 typedef struct _LinphoneVTable
@@ -426 +427 @@
         TextMessageReceived text_received;
         GeneralStateChange general_state;
+        DtmfReceived dtmf_received;
 } LinphoneCoreVTable;
 

linphone/mediastreamer2/include/mediastreamer2/mediastream.h

@@ -44 +44 @@
         unsigned int last_packet_count;
         time_t last_packet_time;
+        bool_t play_dtmfs;
 };
 
@@ -78 +79 @@
 
 void audio_stream_set_rtcp_information(AudioStream *st, const char *cname, const char *tool);
+
+void audio_stream_play_received_dtmfs(AudioStream *st, bool_t yesno);
 
 /* those two function do the same as audio_stream_start() but in two steps

linphone/mediastreamer2/src/audiostream.c

@@ -63 +63 @@
 static void on_dtmf_received(RtpSession *s, int dtmf, void * user_data)
 {
-        MSFilter *dtmfgen=(MSFilter*)user_data;
+        AudioStream *stream=(AudioStream*)user_data;
         if (dtmf>15){
                 ms_warning("Unsupported telephone-event type.");
@@ -69 +69 @@
         }
         ms_message("Receiving dtmf %c.",dtmf_tab[dtmf]);
-        if (dtmfgen!=NULL){
-                ms_filter_call_method(dtmfgen,MS_DTMF_GEN_PUT,&dtmf_tab[dtmf]);
+        if (stream->dtmfgen!=NULL && stream->play_dtmfs){
+                ms_filter_call_method(stream->dtmfgen,MS_DTMF_GEN_PUT,&dtmf_tab[dtmf]);
         }
 }
@@ -210 +210 @@
         
         stream->dtmfgen=ms_filter_new(MS_DTMF_GEN_ID);
-        rtp_session_signal_connect(rtps,"telephone-event",(RtpCallback)on_dtmf_received,(unsigned long)stream->dtmfgen);
+        rtp_session_signal_connect(rtps,"telephone-event",(RtpCallback)on_dtmf_received,(unsigned long)stream);
         rtp_session_signal_connect(rtps,"payload_type_changed",(RtpCallback)payload_type_changed,(unsigned long)stream);
         
@@ -357 +357 @@
         stream->session=create_duplex_rtpsession(locport,ipv6);
         stream->rtpsend=ms_filter_new(MS_RTP_SEND_ID);
+        stream->play_dtmfs=TRUE;
         return stream;
+}
+
+void audio_stream_play_received_dtmfs(AudioStream *st, bool_t yesno){
+        st->play_dtmfs=yesno;
 }
 

linphone/mediastreamer2/src/msv4l2.c

@@ -18 +18 @@
 */
 
+#ifdef HAVE_CONFIG_H
 #include "mediastreamer-config.h"
+#endif
 
 #ifdef HAVE_LINUX_VIDEODEV2_H