Changeset 5914

Timestamp:

Nov 22, 2018 10:11:25 AM (6 years ago)

Author:

nanang

Message:

Misc (re #2147): Invalid media direction (dir=NONE) when receiving first video event PJMEDIA_EVENT_FMT_CHANGED (thanks Giorgio Alfarano for the report).

File:

• pjproject/trunk/pjsip/src/pjsua-lib/pjsua_media.c (modified) (4 diffs)

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

@@ -3153 +3153 @@
                 pjmedia_transport_info tp_info;
                 pjmedia_srtp_info *srtp_info;
+
+                /* Call media direction */
+                call_med->dir = si->dir;
+
+                /* Call media state */
+                if (call->local_hold)
+                    call_med->state = PJSUA_CALL_MEDIA_LOCAL_HOLD;
+                else if (call_med->dir == PJMEDIA_DIR_DECODING)
+                    call_med->state = PJSUA_CALL_MEDIA_REMOTE_HOLD;
+                else
+                    call_med->state = PJSUA_CALL_MEDIA_ACTIVE;
 
                 if (call->inv->following_fork) {
@@ -3221 +3232 @@
                     }
                 }
-
-                /* Call media direction */
-                call_med->dir = si->dir;
-
-                /* Call media state */
-                if (call->local_hold)
-                    call_med->state = PJSUA_CALL_MEDIA_LOCAL_HOLD;
-                else if (call_med->dir == PJMEDIA_DIR_DECODING)
-                    call_med->state = PJSUA_CALL_MEDIA_REMOTE_HOLD;
-                else
-                    call_med->state = PJSUA_CALL_MEDIA_ACTIVE;
             }
 
@@ -3321 +3321 @@
                 pjmedia_srtp_info *srtp_info;
 
+                /* Call media direction */
+                call_med->dir = si->dir;
+
+                /* Call media state */
+                if (call->local_hold)
+                    call_med->state = PJSUA_CALL_MEDIA_LOCAL_HOLD;
+                else if (call_med->dir == PJMEDIA_DIR_DECODING)
+                    call_med->state = PJSUA_CALL_MEDIA_REMOTE_HOLD;
+                else
+                    call_med->state = PJSUA_CALL_MEDIA_ACTIVE;
+
                 /* Start/restart media transport */
                 status = pjmedia_transport_media_start(call_med->tp,
@@ -3358 +3369 @@
                     }
                 }
-
-                /* Call media direction */
-                call_med->dir = si->dir;
-
-                /* Call media state */
-                if (call->local_hold)
-                    call_med->state = PJSUA_CALL_MEDIA_LOCAL_HOLD;
-                else if (call_med->dir == PJMEDIA_DIR_DECODING)
-                    call_med->state = PJSUA_CALL_MEDIA_REMOTE_HOLD;
-                else
-                    call_med->state = PJSUA_CALL_MEDIA_ACTIVE;
             }