Changeset 3658 for pjproject/branches/projects/2.0-dev/pjmedia/include/pjmedia-videodev/videodev.h

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/include/pjmedia-videodev/videodev.h (modified) (12 diffs)

pjproject/branches/projects/2.0-dev/pjmedia/include/pjmedia-videodev/videodev.h

@@ -76 +76 @@
  *
  * Application can also set the specific features/capabilities when opening
- * the video stream by setting the \a flags member of #pjmedia_vid_param
+ * the video stream by setting the \a flags member of #pjmedia_vid_dev_param
  * structure.
  *
@@ -167 +167 @@
      * to zero, it indicates that the exact format combination is being used. 
      */
-    pjmedia_format *fmt;
+    pjmedia_format fmt[PJMEDIA_VID_DEV_INFO_FMT_CNT];
 
 } pjmedia_vid_dev_info;
@@ -175 +175 @@
 typedef struct pjmedia_vid_dev_stream pjmedia_vid_dev_stream;
 
-typedef struct pjmedia_vid_cb
+typedef struct pjmedia_vid_dev_cb
 {
     /**
@@ -215 +215 @@
                              pjmedia_frame *frame);
 
-} pjmedia_vid_cb;
+} pjmedia_vid_dev_cb;
 
 
@@ -221 +221 @@
  * This structure specifies the parameters to open the video stream.
  */
-typedef struct pjmedia_vid_param
+typedef struct pjmedia_vid_dev_param
 {
     /**
@@ -288 +288 @@
     pj_bool_t window_hide;
 
-} pjmedia_vid_param;
+} pjmedia_vid_dev_param;
 
 
@@ -313 +313 @@
 
 /**
- * Set a capability field value in #pjmedia_vid_param structure. This will
+ * Set a capability field value in #pjmedia_vid_dev_param structure. This will
  * also set the flags field for the specified capability in the structure.
  *
@@ -324 +324 @@
  *                  error code.
  */
-PJ_DECL(pj_status_t) pjmedia_vid_param_set_cap(pjmedia_vid_param *param,
-                                               pjmedia_vid_dev_cap cap,
-                                               const void *pval);
-
-
-/**
- * Get a capability field value from #pjmedia_vid_param structure. This
+PJ_DECL(pj_status_t)
+pjmedia_vid_dev_param_set_cap(pjmedia_vid_dev_param *param,
+                              pjmedia_vid_dev_cap cap,
+                              const void *pval);
+
+
+/**
+ * Get a capability field value from #pjmedia_vid_dev_param structure. This
  * function will return PJMEDIA_EVID_INVCAP error if the flag for that
  * capability is not set in the flags field in the structure.
@@ -342 +343 @@
  *                  error code.
  */
-PJ_DECL(pj_status_t) pjmedia_vid_param_get_cap(const pjmedia_vid_param *param,
-                                               pjmedia_vid_dev_cap cap,
-                                               void *pval);
+PJ_DECL(pj_status_t)
+pjmedia_vid_dev_param_get_cap(const pjmedia_vid_dev_param *param,
+                              pjmedia_vid_dev_cap cap,
+                              void *pval);
 
 /**
@@ -470 +472 @@
  *                  error code.
  */
-PJ_DECL(pj_status_t) pjmedia_vid_dev_default_param(pj_pool_t *pool,
-                                                   pjmedia_vid_dev_index id,
-                                                   pjmedia_vid_param *param);
+PJ_DECL(pj_status_t)
+pjmedia_vid_dev_default_param(pj_pool_t *pool,
+                              pjmedia_vid_dev_index id,
+                              pjmedia_vid_dev_param *param);
 
 
@@ -498 +501 @@
  */
 PJ_DECL(pj_status_t) pjmedia_vid_dev_stream_create(
-                                            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_strm);
@@ -515 +518 @@
 PJ_DECL(pj_status_t) pjmedia_vid_dev_stream_get_param(
                                             pjmedia_vid_dev_stream *strm,
-                                            pjmedia_vid_param *param);
+                                            pjmedia_vid_dev_param *param);
 
 /**