- Timestamp:
- Jul 15, 2011 7:52:44 AM (13 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
pjproject/branches/projects/2.0-dev/pjmedia/src/pjmedia-videodev/colorbar_dev.c
r3640 r3658 82 82 { 83 83 pjmedia_vid_dev_stream base; /**< Base stream */ 84 pjmedia_vid_ paramparam; /**< Settings */84 pjmedia_vid_dev_param param; /**< Settings */ 85 85 pj_pool_t *pool; /**< Memory pool. */ 86 86 87 pjmedia_vid_ cb vid_cb; /**< Stream callback. */87 pjmedia_vid_dev_cb vid_cb; /**< Stream callback. */ 88 88 void *user_data; /**< Application data. */ 89 89 … … 108 108 pjmedia_vid_dev_factory *f, 109 109 unsigned index, 110 pjmedia_vid_ param *param);110 pjmedia_vid_dev_param *param); 111 111 static pj_status_t cbar_factory_create_stream( 112 112 pjmedia_vid_dev_factory *f, 113 pjmedia_vid_ param *param,114 const pjmedia_vid_ cb *cb,113 pjmedia_vid_dev_param *param, 114 const pjmedia_vid_dev_cb *cb, 115 115 void *user_data, 116 116 pjmedia_vid_dev_stream **p_vid_strm); 117 117 118 118 static pj_status_t cbar_stream_get_param(pjmedia_vid_dev_stream *strm, 119 pjmedia_vid_ param *param);119 pjmedia_vid_dev_param *param); 120 120 static pj_status_t cbar_stream_get_cap(pjmedia_vid_dev_stream *strm, 121 121 pjmedia_vid_dev_cap cap, … … 200 200 ddi->info.caps = PJMEDIA_VID_DEV_CAP_FORMAT; 201 201 ddi->info.fmt_cnt = sizeof(cbar_fmts)/sizeof(cbar_fmts[0]); 202 ddi->info.fmt = (pjmedia_format*)203 pj_pool_calloc(cf->pool, ddi->info.fmt_cnt,204 sizeof(pjmedia_format));205 202 for (i = 0; i < ddi->info.fmt_cnt; i++) { 206 203 pjmedia_format *fmt = &ddi->info.fmt[i]; … … 263 260 pjmedia_vid_dev_factory *f, 264 261 unsigned index, 265 pjmedia_vid_ param *param)262 pjmedia_vid_dev_param *param) 266 263 { 267 264 struct cbar_factory *cf = (struct cbar_factory*)f; … … 372 369 static pj_status_t cbar_factory_create_stream( 373 370 pjmedia_vid_dev_factory *f, 374 pjmedia_vid_ param *param,375 const pjmedia_vid_ cb *cb,371 pjmedia_vid_dev_param *param, 372 const pjmedia_vid_dev_cb *cb, 376 373 void *user_data, 377 374 pjmedia_vid_dev_stream **p_vid_strm) … … 442 439 /* API: Get stream info. */ 443 440 static pj_status_t cbar_stream_get_param(pjmedia_vid_dev_stream *s, 444 pjmedia_vid_ param *pi)441 pjmedia_vid_dev_param *pi) 445 442 { 446 443 struct cbar_stream *strm = (struct cbar_stream*)s;
Note: See TracChangeset
for help on using the changeset viewer.