Changeset 3660 for pjproject/branches/projects/2.0-dev/pjmedia/src/pjmedia-videodev/ios_dev.m

Timestamp:

Jul 15, 2011 8:36:23 AM (13 years ago)

Author:

ming

Message:

Re #1282: change for Mac and iOS

File:

• pjproject/branches/projects/2.0-dev/pjmedia/src/pjmedia-videodev/ios_dev.m (modified) (6 diffs)

pjproject/branches/projects/2.0-dev/pjmedia/src/pjmedia-videodev/ios_dev.m

@@ -75 +75 @@
 {
     pjmedia_vid_dev_stream  base;               /**< Base stream       */
-    pjmedia_vid_param       param;              /**< Settings          */
+    pjmedia_vid_dev_param   param;              /**< Settings          */
     pj_pool_t              *pool;               /**< Memory pool       */
 
-    pjmedia_vid_cb          vid_cb;             /**< Stream callback   */
+    pjmedia_vid_dev_cb      vid_cb;             /**< Stream callback   */
     void                   *user_data;          /**< Application data  */
 
@@ -110 +110 @@
                                              pjmedia_vid_dev_factory *f,
                                              unsigned index,
-                                             pjmedia_vid_param *param);
+                                             pjmedia_vid_dev_param *param);
 static pj_status_t ios_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);
 
 static pj_status_t ios_stream_get_param(pjmedia_vid_dev_stream *strm,
-                                        pjmedia_vid_param *param);
+                                        pjmedia_vid_dev_param *param);
 static pj_status_t ios_stream_get_cap(pjmedia_vid_dev_stream *strm,
                                       pjmedia_vid_dev_cap cap,
@@ -212 +212 @@
         qdi->info.fmt_cnt = PJ_ARRAY_SIZE(ios_fmts);        
         qdi->info.caps |= PJMEDIA_VID_DEV_CAP_FORMAT;
-        qdi->info.fmt = (pjmedia_format*)
-                        pj_pool_calloc(qf->pool, qdi->info.fmt_cnt,
-                                       sizeof(pjmedia_format));
         
         for (l = 0; l < PJ_ARRAY_SIZE(ios_fmts); l++) {
@@ -276 +273 @@
                                              pjmedia_vid_dev_factory *f,
                                              unsigned index,
-                                             pjmedia_vid_param *param)
+                                             pjmedia_vid_dev_param *param)
 {
     struct ios_factory *qf = (struct ios_factory*)f;
@@ -390 +387 @@
 static pj_status_t ios_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)
@@ -535 +532 @@
 /* API: Get stream info. */
 static pj_status_t ios_stream_get_param(pjmedia_vid_dev_stream *s,
-                                        pjmedia_vid_param *pi)
+                                        pjmedia_vid_dev_param *pi)
 {
     struct ios_stream *strm = (struct ios_stream*)s;