Changeset 4834 for pjproject/trunk

Timestamp:

May 5, 2014 7:47:48 AM (11 years ago)

Author:

ming

Message:

Re #1762: Add capability enumerations and native preview capability

File:

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

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

@@ -253 +253 @@
         qdi = &qf->dev_info[i];
         qdi->info.fmt_cnt = PJ_ARRAY_SIZE(ios_fmts);        
-        qdi->info.caps |= PJMEDIA_VID_DEV_CAP_FORMAT;
+        qdi->info.caps |= PJMEDIA_VID_DEV_CAP_FORMAT |
+                          PJMEDIA_VID_DEV_CAP_OUTPUT_RESIZE |
+                          PJMEDIA_VID_DEV_CAP_OUTPUT_POSITION |
+                          PJMEDIA_VID_DEV_CAP_OUTPUT_HIDE |
+                          PJMEDIA_VID_DEV_CAP_ORIENTATION;
         
         for (l = 0; l < PJ_ARRAY_SIZE(ios_fmts); l++) {
@@ -575 +579 @@
         
         /* Native preview */
-        if ((param->flags & PJMEDIA_VID_DEV_CAP_INPUT_PREVIEW) &&
-            param->native_preview)
-        {
-            /* Preview layer instantiation should be in main thread! */
-            dispatch_async(dispatch_get_main_queue(), ^{
-                /* Create view */
-                ios_init_view(strm);
-
-                /* Create preview layer */
-                AVCaptureVideoPreviewLayer *previewLayer =
-                    [AVCaptureVideoPreviewLayer layerWithSession: strm->cap_session];
-
-                /* Attach preview layer to a UIView */
-                CGRect r = strm->render_view.bounds;
-                previewLayer.videoGravity = AVLayerVideoGravityResizeAspectFill;
-                previewLayer.frame = r;
-                [[strm->render_view layer] addSublayer:previewLayer];
-
-                NSLog(@"Native preview initialized.");
-            });
+        if (param->flags & PJMEDIA_VID_DEV_CAP_INPUT_PREVIEW) {
+            ios_stream_set_cap(&strm->base, PJMEDIA_VID_DEV_CAP_INPUT_PREVIEW,
+                               &param->native_preview);
         }
         
@@ -677 +664 @@
 
     switch (cap) {
+        /* Native preview */
+        case PJMEDIA_VID_DEV_CAP_INPUT_PREVIEW:
+        {
+            pj_bool_t native_preview = *((pj_bool_t *)pval);
+            
+            if (!strm->cap_session) return PJ_EINVAL;
+            
+            if (!native_preview || strm->render_view)
+                return PJ_SUCCESS;
+            
+            /* Create view */
+            ios_init_view(strm);
+            
+            /* Preview layer instantiation should be in main thread! */
+            dispatch_async(dispatch_get_main_queue(), ^{
+                /* Create preview layer */
+                AVCaptureVideoPreviewLayer *previewLayer =
+                [AVCaptureVideoPreviewLayer layerWithSession:strm->cap_session];
+                
+                /* Attach preview layer to a UIView */
+                CGRect r = strm->render_view.bounds;
+                previewLayer.videoGravity = AVLayerVideoGravityResizeAspectFill;
+                previewLayer.frame = r;
+                [[strm->render_view layer] addSublayer:previewLayer];
+            });
+            
+            NSLog(@"Native preview initialized.");
+            
+            return PJ_SUCCESS;
+        }
+
         /* Fast switch */
         case PJMEDIA_VID_DEV_CAP_SWITCH:
@@ -907 +925 @@
 
     if (stream->render_view) {
+        UIView *view = stream->render_view;
         dispatch_async(dispatch_get_main_queue(),
           ^{
-              [stream->render_view removeFromSuperview];
-              [stream->render_view release];
+              [view removeFromSuperview];
+              [view release];
            });
         stream->render_view = NULL;