Re #1282:
- Change *fmt in pjmedia_vid_dev_info to array
- Change pjmedia_vid_cb/param to pjmedia_vid_dev_*
git-svn-id: https://svn.pjsip.org/repos/pjproject/branches/projects/2.0-dev@3658 74dad513-b988-da41-8d7b-12977e46ad98
diff --git a/pjmedia/src/pjmedia-videodev/v4l2_dev.c b/pjmedia/src/pjmedia-videodev/v4l2_dev.c
index 199377c..545c997 100644
--- a/pjmedia/src/pjmedia-videodev/v4l2_dev.c
+++ b/pjmedia/src/pjmedia-videodev/v4l2_dev.c
@@ -92,7 +92,7 @@
typedef struct vid4lin_stream
{
pjmedia_vid_dev_stream base; /**< Base stream */
- pjmedia_vid_param param; /**< Settings */
+ pjmedia_vid_dev_param param; /**< Settings */
pj_pool_t *pool; /**< Memory pool. */
int fd; /**< Video fd. */
@@ -102,7 +102,7 @@
vid4lin_buffer *buffers; /**< MMap buffers. */
pj_time_val start_time; /**< Time when started */
- pjmedia_vid_cb vid_cb; /**< Stream callback */
+ pjmedia_vid_dev_cb vid_cb; /**< Stream callback */
void *user_data; /**< Application data */
} vid4lin_stream;
@@ -128,15 +128,15 @@
static pj_status_t vid4lin_factory_default_param(pj_pool_t *pool,
pjmedia_vid_dev_factory *f,
unsigned index,
- pjmedia_vid_param *param);
+ pjmedia_vid_dev_param *param);
static pj_status_t vid4lin_factory_create_stream(pjmedia_vid_dev_factory *f,
- 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);
static pj_status_t vid4lin_stream_get_param(pjmedia_vid_dev_stream *strm,
- pjmedia_vid_param *param);
+ pjmedia_vid_dev_param *param);
static pj_status_t vid4lin_stream_get_cap(pjmedia_vid_dev_stream *strm,
pjmedia_vid_dev_cap cap,
void *value);
@@ -300,9 +300,6 @@
pdi->info.caps = PJMEDIA_VID_DEV_CAP_FORMAT;
pdi->info.fmt_cnt = fmt_cnt;
- pdi->info.fmt = (pjmedia_format*)
- pj_pool_calloc(pool, sizeof(pjmedia_format), fmt_cnt);
-
for (j=0; j<fmt_cnt; ++j) {
pjmedia_format_init_video(&pdi->info.fmt[j],
fmt_cap[j],
@@ -394,7 +391,7 @@
static pj_status_t vid4lin_factory_default_param(pj_pool_t *pool,
pjmedia_vid_dev_factory *f,
unsigned index,
- pjmedia_vid_param *param)
+ pjmedia_vid_dev_param *param)
{
vid4lin_factory *cf = (vid4lin_factory*)f;
@@ -425,7 +422,7 @@
/* util: setup format */
static pj_status_t vid4lin_stream_init_fmt(vid4lin_stream *stream,
- const pjmedia_vid_param *param,
+ const pjmedia_vid_dev_param *param,
pj_uint32_t pix_fmt)
{
pjmedia_video_format_detail *vfd;
@@ -531,8 +528,8 @@
/* API: create stream */
static pj_status_t vid4lin_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)
{
@@ -614,7 +611,7 @@
/* API: Get stream info. */
static pj_status_t vid4lin_stream_get_param(pjmedia_vid_dev_stream *s,
- pjmedia_vid_param *pi)
+ pjmedia_vid_dev_param *pi)
{
vid4lin_stream *strm = (vid4lin_stream*)s;