Changeset 4174

Timestamp:

Jun 21, 2012 8:09:53 AM (12 years ago)

Author:

bennylp

Message:

Fixed #1541: Crash in third party media sample application after library is restarted

Location:

pjproject/trunk/pjsip-apps/src/3rdparty_media_sample

Files:

• alt_pjsua_aud.c (modified) (3 diffs)
• alt_pjsua_vid.c (modified) (3 diffs)

pjproject/trunk/pjsip-apps/src/3rdparty_media_sample/alt_pjsua_aud.c

@@ -225 +225 @@
     const char *pkt = "Not RTP packet";
 
-    if (call_med->call->inv == NULL) {
+    if (!call_med->call || !call_med->call->inv || !call_med->tp) {
         /* Call has been disconnected. There is race condition here as
          * this cb may be called sometime after call has been disconnected */
@@ -241 +241 @@
     const char *pkt = "Not RTCP packet";
 
-    if (call_med->call->inv == NULL) {
+    if (!call_med->call || !call_med->call->inv || !call_med->tp) {
         /* Call has been disconnected. There is race condition here as
          * this cb may be called sometime after call has been disconnected */
@@ -302 +302 @@
 }
 
+void pjsua_check_snd_dev_idle()
+{
+}
 
 /*****************************************************************************

pjproject/trunk/pjsip-apps/src/3rdparty_media_sample/alt_pjsua_vid.c

@@ -235 +235 @@
 pj_status_t pjsua_vid_subsys_destroy(void)
 {
+    if (pjmedia_vid_codec_mgr_instance())
+        pjmedia_vid_codec_mgr_destroy(NULL);
+
+    if (pjmedia_video_format_mgr_instance())
+        pjmedia_video_format_mgr_destroy(NULL);
+
     /*
      * TODO: put your 3rd party library cleanup routine here
@@ -292 +298 @@
     const char *pkt = "Not RTP packet";
 
-    if (call_med->call->inv == NULL) {
+    if (!call_med->call || !call_med->call->inv || !call_med->tp) {
         /* Call has been disconnected. There is race condition here as
          * this cb may be called sometime after call has been disconnected */
@@ -308 +314 @@
     const char *pkt = "Not RTCP packet";
 
-    if (call_med->call->inv == NULL) {
+    if (!call_med->call || !call_med->call->inv || !call_med->tp) {
         /* Call has been disconnected. There is race condition here as
          * this cb may be called sometime after call has been disconnected */