Changeset 5052 for pjproject

Timestamp:

Apr 8, 2015 9:07:00 AM (9 years ago)

Author:

ming

Message:

Re #1835: More robust handling of format change, to prevent data race if clock is still running.

File:

• pjproject/trunk/pjmedia/src/pjmedia-videodev/ios_opengl_dev.m (modified) (7 diffs)

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

@@ -221 +221 @@
     pjmedia_vid_dev_opengl_draw(stream->gl_buf, stream->vid_size.w, stream->vid_size.h,
                                 stream->frame->buf);
+
+    [stream->ogl_context presentRenderbuffer:GL_RENDERBUFFER];
 }
 
@@ -228 +230 @@
      * it is called, we can be sure that render() has completed.
      */
+}
+
+- (void)change_format
+{
+    pjmedia_video_format_detail *vfd;
+    
+    vfd = pjmedia_format_get_video_format_detail(&stream->param.fmt, PJ_TRUE);
+    pj_memcpy(&stream->vid_size, &vfd->size, sizeof(vfd->size));
+    if (stream->param.disp_size.w == 0 || stream->param.disp_size.h == 0)
+        pj_memcpy(&stream->param.disp_size, &vfd->size, sizeof(vfd->size));
 }
 
@@ -254 +266 @@
     strm->ts_inc = PJMEDIA_SPF2(param->clock_rate, &vfd->fps, 1);
     
+    rect = CGRectMake(0, 0, strm->param.disp_size.w, strm->param.disp_size.h);
+    strm->gl_view = [[GLView alloc] initWithFrame:rect];
+    if (!strm->gl_view)
+        return PJ_ENOMEM;
+    strm->gl_view->stream = strm;
+
     /* If OUTPUT_RESIZE flag is not used, set display size to default */
     if (!(param->flags & PJMEDIA_VID_DEV_CAP_OUTPUT_RESIZE)) {
@@ -264 +282 @@
     if (status != PJ_SUCCESS)
         goto on_error;
-    
-    rect = CGRectMake(0, 0, strm->param.disp_size.w, strm->param.disp_size.h);
-    strm->gl_view = [[GLView alloc] initWithFrame:rect];
-    if (!strm->gl_view)
-        return PJ_ENOMEM;
-    strm->gl_view->stream = strm;
     
     /* Perform OpenGL buffer initializations in the main thread. */
@@ -373 +385 @@
     if (cap==PJMEDIA_VID_DEV_CAP_FORMAT) {
         const pjmedia_video_format_info *vfi;
-        pjmedia_video_format_detail *vfd;
         pjmedia_format *fmt = (pjmedia_format *)pval;
         iosgl_fmt_info *ifi;
@@ -387 +398 @@
         pjmedia_format_copy(&strm->param.fmt, fmt);
         
-        vfd = pjmedia_format_get_video_format_detail(fmt, PJ_TRUE);
-        pj_memcpy(&strm->vid_size, &vfd->size, sizeof(vfd->size));
-        if (strm->param.disp_size.w == 0 || strm->param.disp_size.h == 0)
-            pj_memcpy(&strm->param.disp_size, &vfd->size, sizeof(vfd->size));
+        [strm->gl_view performSelectorOnMainThread:@selector(change_format)
+                       withObject:nil waitUntilDone:YES];
 
         return PJ_SUCCESS;
@@ -460 +469 @@
                            withObject:nil waitUntilDone:YES];
     
-    [stream->ogl_context presentRenderbuffer:GL_RENDERBUFFER];
-    
     return PJ_SUCCESS;
 }