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

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

@@ -135 +135 @@
 {
     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.  */
 
@@ -195 +195 @@
                                              pjmedia_vid_dev_factory *f,
                                              unsigned index,
-                                             pjmedia_vid_param *param);
+                                             pjmedia_vid_dev_param *param);
 static pj_status_t sdl_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 sdl_stream_get_param(pjmedia_vid_dev_stream *strm,
-                                        pjmedia_vid_param *param);
+                                        pjmedia_vid_dev_param *param);
 static pj_status_t sdl_stream_get_cap(pjmedia_vid_dev_stream *strm,
                                       pjmedia_vid_dev_cap cap,
@@ -321 +321 @@
 #endif
 
-        ddi->info.fmt = (pjmedia_format*)
-                        pj_pool_calloc(sf->pool, ddi->info.fmt_cnt,
-                                       sizeof(pjmedia_format));
         for (j = 0; j < ddi->info.fmt_cnt; j++) {
             pjmedia_format *fmt = &ddi->info.fmt[j];
@@ -392 +389 @@
                                              pjmedia_vid_dev_factory *f,
                                              unsigned index,
-                                             pjmedia_vid_param *param)
+                                             pjmedia_vid_dev_param *param)
 {
     struct sdl_factory *sf = (struct sdl_factory*)f;
@@ -991 +988 @@
 static pj_status_t sdl_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)
@@ -1076 +1073 @@
 /* API: Get stream info. */
 static pj_status_t sdl_stream_get_param(pjmedia_vid_dev_stream *s,
-                                        pjmedia_vid_param *pi)
+                                        pjmedia_vid_dev_param *pi)
 {
     struct sdl_stream *strm = (struct sdl_stream*)s;