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

Timestamp:

Jul 15, 2011 7:52:44 AM (13 years ago)

Author:

ming

Message:

Re #1282:

• Change *fmt in pjmedia_vid_dev_info to array
• Change pjmedia_vid_cb/param to pjmedia_vid_dev_*

File:

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

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

@@ -93 +93 @@
 {
     pjmedia_vid_dev_stream       base;          /**< Base stream        */
-    pjmedia_vid_param            param;         /**< Settings           */
+    pjmedia_vid_dev_param        param;         /**< Settings           */
     pj_pool_t                   *pool;          /**< Memory pool.       */
 
@@ -103 +103 @@
     pj_time_val                  start_time;    /**< Time when started  */
 
-    pjmedia_vid_cb               vid_cb;        /**< Stream callback    */
+    pjmedia_vid_dev_cb           vid_cb;        /**< Stream callback    */
     void                        *user_data;     /**< Application data   */
 } vid4lin_stream;
@@ -129 +129 @@
                                                  pjmedia_vid_dev_factory *f,
                                                  unsigned index,
-                                                 pjmedia_vid_param *param);
+                                                 pjmedia_vid_dev_param *param);
 static pj_status_t vid4lin_factory_create_stream(pjmedia_vid_dev_factory *f,
-                                                 pjmedia_vid_param *prm,
-                                                 const pjmedia_vid_cb *cb,
+                                                 pjmedia_vid_dev_param *prm,
+                                                 const pjmedia_vid_dev_cb *cb,
                                                  void *user_data,
                                                  pjmedia_vid_dev_stream **p);
 
 static pj_status_t vid4lin_stream_get_param(pjmedia_vid_dev_stream *strm,
-                                            pjmedia_vid_param *param);
+                                            pjmedia_vid_dev_param *param);
 static pj_status_t vid4lin_stream_get_cap(pjmedia_vid_dev_stream *strm,
                                           pjmedia_vid_dev_cap cap,
@@ -301 +301 @@
 
         pdi->info.fmt_cnt = fmt_cnt;
-        pdi->info.fmt = (pjmedia_format*)
-                        pj_pool_calloc(pool, sizeof(pjmedia_format), fmt_cnt);
-
         for (j=0; j<fmt_cnt; ++j) {
             pjmedia_format_init_video(&pdi->info.fmt[j],
@@ -395 +392 @@
                                                  pjmedia_vid_dev_factory *f,
                                                  unsigned index,
-                                                 pjmedia_vid_param *param)
+                                                 pjmedia_vid_dev_param *param)
 {
     vid4lin_factory *cf = (vid4lin_factory*)f;
@@ -426 +423 @@
 /* util: setup format */
 static pj_status_t vid4lin_stream_init_fmt(vid4lin_stream *stream,
-                                        const pjmedia_vid_param *param,
+                                        const pjmedia_vid_dev_param *param,
                                         pj_uint32_t pix_fmt)
 {
@@ -532 +529 @@
 /* API: create stream */
 static pj_status_t vid4lin_factory_create_stream(pjmedia_vid_dev_factory *f,
-                                      pjmedia_vid_param *param,
-                                      const pjmedia_vid_cb *cb,
+                                      pjmedia_vid_dev_param *param,
+                                      const pjmedia_vid_dev_cb *cb,
                                       void *user_data,
                                       pjmedia_vid_dev_stream **p_vid_strm)
@@ -615 +612 @@
 /* API: Get stream info. */
 static pj_status_t vid4lin_stream_get_param(pjmedia_vid_dev_stream *s,
-                                            pjmedia_vid_param *pi)
+                                            pjmedia_vid_dev_param *pi)
 {
     vid4lin_stream *strm = (vid4lin_stream*)s;