Changeset 3581 for pjproject/branches/projects/2.0-dev

Timestamp:

Jun 9, 2011 4:13:50 AM (13 years ago)

Author:

ming

Message:

Closed #1292: Make sure each video device for Mac OS and iPhone OS is always unidir

Location:

pjproject/branches/projects/2.0-dev/pjmedia/src/pjmedia-videodev

Files:

• ios_dev.m (modified) (4 diffs)
• qt_dev.m (modified) (2 diffs)

pjproject/branches/projects/2.0-dev/pjmedia/src/pjmedia-videodev/ios_dev.m

@@ -277 +277 @@
 
     pj_bzero(param, sizeof(*param));
-    if (di->info.dir & PJMEDIA_DIR_CAPTURE_RENDER) {
-        param->dir = PJMEDIA_DIR_CAPTURE_RENDER;
-        param->cap_id = index;
-        param->rend_id = index;
-    } else if (di->info.dir & PJMEDIA_DIR_CAPTURE) {
+    if (di->info.dir & PJMEDIA_DIR_CAPTURE) {
         param->dir = PJMEDIA_DIR_CAPTURE;
         param->cap_id = index;
@@ -401 +397 @@
     PJ_ASSERT_RETURN(f && param && p_vid_strm, PJ_EINVAL);
     PJ_ASSERT_RETURN(param->fmt.type == PJMEDIA_TYPE_VIDEO &&
-                     param->fmt.detail_type == PJMEDIA_FORMAT_DETAIL_VIDEO,
+                     param->fmt.detail_type == PJMEDIA_FORMAT_DETAIL_VIDEO &&
+                     (param->dir == PJMEDIA_DIR_CAPTURE ||
+                     param->dir == PJMEDIA_DIR_RENDER),
                      PJ_EINVAL);
 
@@ -428 +426 @@
     strm->ts_inc = PJMEDIA_SPF2(param->clock_rate, &vfd->fps, 1);
 
-    /* Create capture stream here */
     if (param->dir & PJMEDIA_DIR_CAPTURE) {
+        /* Create capture stream here */
         strm->cap_session = [[AVCaptureSession alloc] init];
         if (!strm->cap_session) {
@@ -481 +479 @@
         strm->video_output.minFrameDuration = CMTimeMake(vfd->fps.denum,
                                                          vfd->fps.num); 
-    }
-
-    /* Create renderer stream here */
-    if (param->dir & PJMEDIA_DIR_RENDER) {
+    } else if (param->dir & PJMEDIA_DIR_RENDER) {
+        /* Create renderer stream here */
         /* Get the main window */
         UIWindow *window = [[UIApplication sharedApplication] keyWindow];

pjproject/branches/projects/2.0-dev/pjmedia/src/pjmedia-videodev/qt_dev.m

@@ -383 +383 @@
     PJ_ASSERT_RETURN(f && param && p_vid_strm, PJ_EINVAL);
     PJ_ASSERT_RETURN(param->fmt.type == PJMEDIA_TYPE_VIDEO &&
-                     param->fmt.detail_type == PJMEDIA_FORMAT_DETAIL_VIDEO,
+                     param->fmt.detail_type == PJMEDIA_FORMAT_DETAIL_VIDEO &&
+                     param->dir == PJMEDIA_DIR_RENDER,
                      PJ_EINVAL);
 
@@ -400 +401 @@
     strm->user_data = user_data;
     strm->apool = [[NSAutoreleasePool alloc]init];
-    
-    /* Create player stream here */
-    if (param->dir & PJMEDIA_DIR_PLAYBACK) {
-    }
-    
+
     /* Create capture stream here */
     if (param->dir & PJMEDIA_DIR_CAPTURE) {