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

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

@@ -72 +72 @@
     ffmpeg_factory              *factory;
     pj_pool_t                   *pool;
-    pjmedia_vid_param            param;
+    pjmedia_vid_dev_param        param;
     AVFormatContext             *ff_fmt_ctx;
 } ffmpeg_stream;
@@ -88 +88 @@
                                                 pjmedia_vid_dev_factory *f,
                                                 unsigned index,
-                                                pjmedia_vid_param *param);
+                                                pjmedia_vid_dev_param *param);
 static pj_status_t ffmpeg_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 ffmpeg_stream_get_param(pjmedia_vid_dev_stream *strm,
-                                           pjmedia_vid_param *param);
+                                           pjmedia_vid_dev_param *param);
 static pj_status_t ffmpeg_stream_get_cap(pjmedia_vid_dev_stream *strm,
                                          pjmedia_vid_dev_cap cap,
@@ -154 +154 @@
                                        AVInputFormat *ifmt,
                                        const char *dev_name,
-                                       const pjmedia_vid_param *param)
+                                       const pjmedia_vid_dev_param *param)
 {
     AVFormatParameters fp;
@@ -286 +286 @@
             info->base.caps = PJMEDIA_VID_DEV_CAP_FORMAT;
             info->base.fmt_cnt = 1;
-            info->base.fmt = (pjmedia_format*)
-                             pj_pool_calloc(ff->dev_pool, info->base.fmt_cnt,
-                                            sizeof(pjmedia_format));
             for (i = 0; i < info->base.fmt_cnt; ++i) {
                 pjmedia_format *fmt = &info->base.fmt[i];
@@ -328 +325 @@
                                                 pjmedia_vid_dev_factory *f,
                                                 unsigned index,
-                                                pjmedia_vid_param *param)
+                                                pjmedia_vid_dev_param *param)
 {
     ffmpeg_factory *ff = (ffmpeg_factory*)f;
@@ -359 +356 @@
 static pj_status_t ffmpeg_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)
@@ -396 +393 @@
 /* API: Get stream info. */
 static pj_status_t ffmpeg_stream_get_param(pjmedia_vid_dev_stream *s,
-                                           pjmedia_vid_param *pi)
+                                           pjmedia_vid_dev_param *pi)
 {
     ffmpeg_stream *strm = (ffmpeg_stream*)s;