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

Timestamp:

Mar 25, 2011 8:38:26 AM (14 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/v4l2_dev.c (modified) (7 diffs)

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

@@ -129 +129 @@
                                                  pjmedia_vid_param *param);
 static pj_status_t vid4lin_factory_create_stream(pjmedia_vid_dev_factory *f,
-                                                 const pjmedia_vid_param *prm,
+                                                 pjmedia_vid_param *prm,
                                                  const pjmedia_vid_cb *cb,
                                                  void *user_data,
@@ -412 +412 @@
                                         pj_uint32_t pix_fmt)
 {
-    const pjmedia_video_format_detail *vfd;
+    pjmedia_video_format_detail *vfd;
     struct v4l2_format v4l2_fmt;
     pj_status_t status;
@@ -438 +438 @@
         (v4l2_fmt.fmt.pix.height != vfd->size.h))
     {
-        status = PJMEDIA_EVID_BADSIZE;
-        return status;
+        /* Size has changed */
+        vfd->size.w = v4l2_fmt.fmt.pix.width;
+        vfd->size.h = v4l2_fmt.fmt.pix.height;
     }
 
@@ -514 +515 @@
 /* API: create stream */
 static pj_status_t vid4lin_factory_create_stream(pjmedia_vid_dev_factory *f,
-                                      const pjmedia_vid_param *param,
+                                      pjmedia_vid_param *param,
                                       const pjmedia_vid_cb *cb,
                                       void *user_data,
@@ -525 +526 @@
     const vid4lin_fmt_map *fmt_map;
     const pjmedia_video_format_info *fmt_info;
+    pjmedia_video_format_detail *vfd;
     pj_status_t status = PJ_SUCCESS;
+
 
     PJ_ASSERT_RETURN(f && param && p_vid_strm, PJ_EINVAL);
@@ -539 +542 @@
 
     vdi = &cf->dev_info[param->cap_id];
+    vfd = pjmedia_format_get_video_format_detail(&param->fmt, PJ_TRUE);
 
     /* Create and Initialize stream descriptor */
@@ -552 +556 @@
     stream->user_data = user_data;
     stream->fd = INVALID_FD;
-
-    PJ_LOG(4,(THIS_FILE, "Opening video4linux2 device %s: format=%s..",
-              stream->name, fmt_info->name));
 
     stream->fd = v4l2_open(vdi->dev_name, O_RDWR | O_NONBLOCK, 0);