Changeset 4853 for pjproject/trunk

Timestamp:

May 30, 2014 6:13:24 AM (11 years ago)

Author:

nanang

Message:

Re #1762: Fixed native preview cannot be stopped.

File:

• pjproject/trunk/pjmedia/src/pjmedia-videodev/ios_dev.m (modified) (2 diffs)

pjproject/trunk/pjmedia/src/pjmedia-videodev/ios_dev.m

@@ -724 +724 @@
             pj_bool_t native_preview = *((pj_bool_t *)pval);
             
-            if (!strm->cap_session) return PJ_EINVAL;
-            
-            if (!native_preview || strm->render_view)
+            /* Disable native preview */
+            if (!native_preview) {
+                if (strm->prev_layer) {
+                    CALayer *prev_layer = strm->prev_layer;
+                    dispatch_async(dispatch_get_main_queue(), ^{
+                        [prev_layer removeFromSuperlayer];
+                        [prev_layer release];
+                    });
+                    strm->prev_layer = nil;
+                    PJ_LOG(4, (THIS_FILE, "Native preview deinitialized"));
+                }
                 return PJ_SUCCESS;
-            
-            /* Create view */
-            ios_init_view(strm);
+            }
+            
+            /* Enable native preview */
+
+            /* Verify if it is already enabled */
+            if (strm->prev_layer)
+                return PJ_SUCCESS;
+            
+            /* Verify capture session instance availability */
+            if (!strm->cap_session)
+                return PJ_EINVALIDOP;
+            
+            /* Create view, if none */
+            if (!strm->render_view)
+                ios_init_view(strm);
+            
             
             /* Preview layer instantiation should be in main thread! */
@@ -744 +765 @@
                 [strm->render_view.layer addSublayer:prev_layer];
                 strm->prev_layer = prev_layer;
-                PJ_LOG(4, (THIS_FILE, "Native preview initialized"));
             });
+            PJ_LOG(4, (THIS_FILE, "Native preview initialized"));
             
             return PJ_SUCCESS;