Changeset 5867 for pjproject

Timestamp:

Aug 23, 2018 4:48:03 AM (6 years ago)

Author:

ming

Message:

Re #2103: Darwin's capture device is passive, thus the video port's clock will fetch the frames much earlier than when the device is ready, getting zero frames and resulting in green screen on the remote side.

File:

• pjproject/trunk/pjmedia/src/pjmedia-videodev/darwin_dev.m (modified) (5 diffs)

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

@@ -142 +142 @@
     AVCaptureSession            *cap_session;
     AVCaptureDeviceInput        *dev_input;
+    pj_bool_t                    has_image;
     AVCaptureVideoDataOutput    *video_output;
     VOutDelegate                *vout_delegate;
@@ -547 +548 @@
 
     [stream->frame_lock lock];
+    stream->has_image = PJ_TRUE;
     
     if (stream->is_planar && stream->capture_buf) {
@@ -569 +571 @@
             
             p = (pj_uint8_t*)CVPixelBufferGetBaseAddressOfPlane(img, 0);
+
             p_len = stream->vid_size.w * stream->vid_size.h;
             Y = (pj_uint8_t*)stream->capture_buf;
@@ -630 +633 @@
 {
     struct darwin_stream *stream = (struct darwin_stream *)strm;
+
+    if (!stream->has_image) {
+        frame->size = 0;
+        frame->type = PJMEDIA_FRAME_TYPE_NONE;
+        frame->timestamp.u64 = stream->frame_ts.u64;
+        return PJMEDIA_EVID_NOTREADY;
+    }
 
     frame->type = PJMEDIA_FRAME_TYPE_VIDEO;
@@ -1303 +1313 @@
         [stream->cap_session stopRunning];
     });
+    stream->has_image = PJ_FALSE;
     
     return PJ_SUCCESS;