Changeset 6093

Timestamp:

Oct 15, 2019 8:58:41 AM (5 years ago)

Author:

nanang

Message:

Fix #2245: Reconnect video stream listeners in video conference bridge after format changed.

Location:

pjproject/trunk

Files:

• pjmedia/src/pjmedia/vid_stream.c (modified) (1 diff)
• pjsip/src/pjsua-lib/pjsua_media.c (modified) (2 diffs)
• pjsip/src/pjsua-lib/pjsua_vid.c (modified) (1 diff)

pjproject/trunk/pjmedia/src/pjmedia/vid_stream.c

@@ -1342 +1342 @@
                     } else {
                         pjmedia_event_init(event, PJMEDIA_EVENT_FMT_CHANGED,
-                                           &frame->timestamp, stream);
+                                           &frame->timestamp, &channel->port);
                         event->data.fmt_changed.dir = PJMEDIA_DIR_DECODING;
                         pj_memcpy(&event->data.fmt_changed.new_fmt,

pjproject/trunk/pjsip/src/pjsua-lib/pjsua_media.c

@@ -1543 +1543 @@
             if (call_med->strm.v.rdr_win_id != PJSUA_INVALID_ID) {
                 pjsua_vid_win *w = &pjsua_var.win[call_med->strm.v.rdr_win_id];
-                if (event->src == w->vp_rend) {
+                if (event->epub == w->vp_rend) {
                     /* Renderer just changed format, reconnect stream */
                     pjsua_vid_conf_disconnect(call_med->strm.v.strm_dec_slot,
@@ -1549 +1549 @@
                     pjsua_vid_conf_connect(call_med->strm.v.strm_dec_slot,
                                            w->rend_slot, NULL);
+                }
+            }
+
+            if (call_med->strm.v.strm_dec_slot != PJSUA_INVALID_ID) {
+                /* Stream decoder changed format, update all conf listeners
+                 * by reconnecting.
+                 */
+                pjsua_conf_port_id dec_pid = call_med->strm.v.strm_dec_slot;
+                pjmedia_port *strm_dec;
+                pjsua_vid_conf_port_info pi;
+                unsigned i;
+
+                status = pjmedia_vid_stream_get_port(call_med->strm.v.stream,
+                                                     PJMEDIA_DIR_DECODING,
+                                                     &strm_dec);
+                if (status != PJ_SUCCESS)
+                    break;
+
+                /* Verify that the publisher is the stream decoder */
+                if (event->epub != strm_dec)
+                    break;
+
+                status = pjsua_vid_conf_get_port_info(dec_pid, &pi);
+                if (status != PJ_SUCCESS)
+                    break;
+
+                for (i = 0; i < pi.listener_cnt; i++) {
+                    pjsua_vid_conf_disconnect(dec_pid, pi.listeners[i]);
+                    pjsua_vid_conf_connect(dec_pid, pi.listeners[i], NULL);
                 }
             }

pjproject/trunk/pjsip/src/pjsua-lib/pjsua_vid.c

@@ -1132 +1132 @@
             pjmedia_event_subscribe(NULL, &call_media_on_event,
                                     call_med, w->vp_rend);
+            pjmedia_event_subscribe(NULL, &call_media_on_event,
+                                    call_med, media_port);
 #endif