Re #1282: change for Mac and iOS
git-svn-id: https://svn.pjsip.org/repos/pjproject/branches/projects/2.0-dev@3660 74dad513-b988-da41-8d7b-12977e46ad98
diff --git a/pjmedia/src/pjmedia-videodev/ios_dev.m b/pjmedia/src/pjmedia-videodev/ios_dev.m
index 2ac8a9e..cafa57a 100644
--- a/pjmedia/src/pjmedia-videodev/ios_dev.m
+++ b/pjmedia/src/pjmedia-videodev/ios_dev.m
@@ -74,10 +74,10 @@
struct ios_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 */
- pjmedia_vid_cb vid_cb; /**< Stream callback */
+ pjmedia_vid_dev_cb vid_cb; /**< Stream callback */
void *user_data; /**< Application data */
pjmedia_rect_size size;
@@ -109,16 +109,16 @@
static pj_status_t ios_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 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,
void *value);
@@ -211,9 +211,6 @@
qdi = &qf->dev_info[i];
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++) {
pjmedia_format *fmt = &qdi->info.fmt[l];
@@ -275,7 +272,7 @@
static pj_status_t ios_factory_default_param(pj_pool_t *pool,
pjmedia_vid_dev_factory *f,
unsigned index,
- pjmedia_vid_param *param)
+ pjmedia_vid_dev_param *param)
{
struct ios_factory *qf = (struct ios_factory*)f;
struct ios_dev_info *di = &qf->dev_info[index];
@@ -389,8 +386,8 @@
/* API: create stream */
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)
{
@@ -534,7 +531,7 @@
/* 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;