Changeset 3658 for pjproject/branches/projects/2.0-dev/pjmedia/src/pjmedia-videodev/videodev.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/videodev.c (modified) (6 diffs)

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

@@ -145 +145 @@
 }
 
-static pj_status_t get_cap_pointer(const pjmedia_vid_param *param,
+static pj_status_t get_cap_pointer(const pjmedia_vid_dev_param *param,
                                    pjmedia_vid_dev_cap cap,
                                    void **ptr,
@@ -182 +182 @@
 
 /* API: set cap value to param */
-PJ_DEF(pj_status_t) pjmedia_vid_param_set_cap( pjmedia_vid_param *param,
-                                               pjmedia_vid_dev_cap cap,
-                                               const void *pval)
+PJ_DEF(pj_status_t)
+pjmedia_vid_dev_param_set_cap( pjmedia_vid_dev_param *param,
+                               pjmedia_vid_dev_cap cap,
+                               const void *pval)
 {
     void *cap_ptr;
@@ -201 +202 @@
 
 /* API: get cap value from param */
-PJ_DEF(pj_status_t) pjmedia_vid_param_get_cap( const pjmedia_vid_param *param,
-                                               pjmedia_vid_dev_cap cap,
-                                               void *pval)
+PJ_DEF(pj_status_t)
+pjmedia_vid_dev_param_get_cap( const pjmedia_vid_dev_param *param,
+                               pjmedia_vid_dev_cap cap,
+                               void *pval)
 {
     void *cap_ptr;
@@ -632 +634 @@
 PJ_DEF(pj_status_t) pjmedia_vid_dev_default_param(pj_pool_t *pool,
                                                   pjmedia_vid_dev_index id,
-                                                  pjmedia_vid_param *param)
+                                                  pjmedia_vid_dev_param *param)
 {
     pjmedia_vid_dev_factory *f;
@@ -661 +663 @@
 /* API: Open video stream object using the specified parameters. */
 PJ_DEF(pj_status_t) pjmedia_vid_dev_stream_create(
-                                        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_vid_strm)
@@ -727 +729 @@
 PJ_DEF(pj_status_t) pjmedia_vid_dev_stream_get_param(
                                             pjmedia_vid_dev_stream *strm,
-                                            pjmedia_vid_param *param)
+                                            pjmedia_vid_dev_param *param)
 {
     pj_status_t status;