Changeset 3489 for pjproject/branches/projects/2.0-dev/pjmedia/src/pjmedia-videodev/videodev.c

Timestamp:

Mar 25, 2011 8:38:26 AM (13 years ago)

Author:

bennylp

Message:

Re #1213 (Video devices):

• Video device now opens in "best effort" mode, i.e. it may open with different size and fps than requested. The actual size and fps will be reflected in the "param" upon return. The vidport must check this against any differences, and create converter accordingly.
• Removed const for param argument in vid_create_stream() API
• Currently converter in vidport will not work if vidport is opened in bidir. Converter for renderer is untested

File:

• pjproject/branches/projects/2.0-dev/pjmedia/src/pjmedia-videodev/videodev.c (modified) (4 diffs)

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

@@ -610 +610 @@
 /* API: Open video stream object using the specified parameters. */
 PJ_DEF(pj_status_t) pjmedia_vid_dev_stream_create(
-                                        const pjmedia_vid_param *prm,
+                                        pjmedia_vid_param *prm,
                                         const pjmedia_vid_cb *cb,
                                         void *user_data,
@@ -616 +616 @@
 {
     pjmedia_vid_dev_factory *cap_f=NULL, *rend_f=NULL, *f=NULL;
-    pjmedia_vid_param param;
     pj_status_t status;
 
@@ -626 +625 @@
                      PJ_EINVAL);
 
-    /* Must make copy of param because we're changing device ID */
-    pj_memcpy(&param, prm, sizeof(param));
-
     /* Normalize cap_id */
-    if (param.dir & PJMEDIA_DIR_CAPTURE) {
+    if (prm->dir & PJMEDIA_DIR_CAPTURE) {
         unsigned index;
 
-        if (param.cap_id < 0)
-            param.cap_id = PJMEDIA_VID_DEFAULT_CAPTURE_DEV;
-
-        status = lookup_dev(param.cap_id, &cap_f, &index);
+        if (prm->cap_id < 0)
+            prm->cap_id = PJMEDIA_VID_DEFAULT_CAPTURE_DEV;
+
+        status = lookup_dev(prm->cap_id, &cap_f, &index);
         if (status != PJ_SUCCESS)
             return status;
 
-        param.cap_id = index;
+        prm->cap_id = index;
         f = cap_f;
     }
 
     /* Normalize rend_id */
-    if (param.dir & PJMEDIA_DIR_RENDER) {
+    if (prm->dir & PJMEDIA_DIR_RENDER) {
         unsigned index;
 
-        if (param.rend_id < 0)
-            param.rend_id = PJMEDIA_VID_DEFAULT_RENDER_DEV;
-
-        status = lookup_dev(param.rend_id, &rend_f, &index);
+        if (prm->rend_id < 0)
+            prm->rend_id = PJMEDIA_VID_DEFAULT_RENDER_DEV;
+
+        status = lookup_dev(prm->rend_id, &rend_f, &index);
         if (status != PJ_SUCCESS)
             return status;
 
-        param.rend_id = index;
+        prm->rend_id = index;
         f = rend_f;
     }
@@ -662 +658 @@
 
     /* For now, cap_id and rend_id must belong to the same factory */
-    PJ_ASSERT_RETURN((param.dir != PJMEDIA_DIR_CAPTURE_RENDER) || 
+    PJ_ASSERT_RETURN((prm->dir != PJMEDIA_DIR_CAPTURE_RENDER) ||
                      (cap_f == rend_f),
                      PJMEDIA_EVID_INVDEV);
 
     /* Create the stream */
-    status = f->op->create_stream(f, &param, cb,
+    status = f->op->create_stream(f, prm, cb,
                                   user_data, p_vid_strm);
     if (status != PJ_SUCCESS)