Changeset 6085 for pjproject/trunk/pjmedia/src/pjmedia/vid_port.c

Timestamp:

Oct 4, 2019 4:26:39 AM (3 years ago)

Author:

nanang

Message:

Fixed #2239:

• Deinit OpenGL immediately when initialization fails, so video device start() and put_frame() will return immediately.
• Introduced new media event PJMEDIA_EVENT_VID_DEV_ERROR, used for notifying app when video device reinit (due to format change) fails.

File:

• pjproject/trunk/pjmedia/src/pjmedia/vid_port.c (modified) (2 diffs)

pjproject/trunk/pjmedia/src/pjmedia/vid_port.c

@@ -1004 +1004 @@
                                                 &vp->conv.conv_param.dst);
             if (status != PJ_SUCCESS) {
+                pjmedia_event e;
+
                 PJ_PERROR(3,(THIS_FILE, status,
                     "failure in changing the format of the video device"));
@@ -1009 +1011 @@
                                       status != PJMEDIA_EVID_ERR ? "success" :
                                       "failure"));
+
+                pjmedia_event_init(&e, PJMEDIA_EVENT_VID_DEV_ERROR, NULL, vp);
+                e.data.vid_dev_err.dir = vp->dir;
+                e.data.vid_dev_err.status = status;
+                e.data.vid_dev_err.id = (vp->dir==PJMEDIA_DIR_ENCODING?
+                                         vid_param.cap_id : vid_param.rend_id);
+                pjmedia_event_publish(NULL, vp, &e,
+                                      PJMEDIA_EVENT_PUBLISH_POST_EVENT);
+
                 return status;
             }