Merge branch 'master' of git.savannah.nongnu.org:/srv/git/linphone

[linphone] / coreapi / linphonecall.c

diff --git a/coreapi/linphonecall.c b/coreapi/linphonecall.c
index 7254e94ac47b3575720eee1a22be3f2380929be7..cea826a25aacfdb285ce3f6e9418d5125679cb5b 100644 (file)
--- a/coreapi/linphonecall.c
+++ b/coreapi/linphonecall.c
@@ -572,6 +572,20 @@ static void rendercb(void *data, const MSPicture *local, const MSPicture *remote
 }
 #endif
 
+#ifdef VIDEO_ENABLED
+static void video_stream_event_cb(void *user_pointer, const MSFilter *f, const unsigned int event_id, const void *args){
+       ms_warning("In linphonecall.c: video_stream_event_cb");
+       switch (event_id) {
+               case MS_VIDEO_DECODER_DECODING_ERRORS:
+                       ms_warning("CAse is MS_VIDEO_DECODER_DECODING_ERRORS");
+                       linphone_call_send_vfu_request((LinphoneCall*) user_pointer);
+                       break;
+               default:
+                       ms_warning("Unhandled event %i", event_id);
+                       break;
+       }
+}
+#endif
 
 void linphone_call_init_media_streams(LinphoneCall *call){
        LinphoneCore *lc=call->core;
@@ -607,6 +621,7 @@ void linphone_call_init_media_streams(LinphoneCall *call){
                call->videostream=video_stream_new(md->streams[1].port,linphone_core_ipv6_enabled(lc));
        if( lc->video_conf.displaytype != NULL)
                video_stream_set_display_filter_name(call->videostream,lc->video_conf.displaytype);
+       video_stream_set_event_callback(call->videostream,video_stream_event_cb, call);
 #ifdef TEST_EXT_RENDERER
                video_stream_set_render_callback(call->videostream,rendercb,NULL);
 #endif
@@ -974,7 +989,8 @@ void linphone_call_stop_media_streams(LinphoneCall *call){
 **/
 void linphone_call_send_vfu_request(LinphoneCall *call)
 {
-       sal_call_send_vfu_request(call->op);
+       if (LinphoneCallStreamsRunning == linphone_call_get_state(call))
+               sal_call_send_vfu_request(call->op);
 }
 #endif