- 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/dshow_dev.c
r3654 r3658 97 97 { 98 98 pjmedia_vid_dev_stream base; /**< Base stream */ 99 pjmedia_vid_ paramparam; /**< Settings */99 pjmedia_vid_dev_param param; /**< Settings */ 100 100 pj_pool_t *pool; /**< Memory pool. */ 101 101 102 pjmedia_vid_ cb vid_cb; /**< Stream callback. */102 pjmedia_vid_dev_cb vid_cb; /**< Stream callback. */ 103 103 void *user_data; /**< Application data. */ 104 104 … … 136 136 pjmedia_vid_dev_factory *f, 137 137 unsigned index, 138 pjmedia_vid_ param *param);138 pjmedia_vid_dev_param *param); 139 139 static pj_status_t dshow_factory_create_stream( 140 140 pjmedia_vid_dev_factory *f, 141 pjmedia_vid_ param *param,142 const pjmedia_vid_ cb *cb,141 pjmedia_vid_dev_param *param, 142 const pjmedia_vid_dev_cb *cb, 143 143 void *user_data, 144 144 pjmedia_vid_dev_stream **p_vid_strm); 145 145 146 146 static pj_status_t dshow_stream_get_param(pjmedia_vid_dev_stream *strm, 147 pjmedia_vid_ param *param);147 pjmedia_vid_dev_param *param); 148 148 static pj_status_t dshow_stream_get_cap(pjmedia_vid_dev_stream *strm, 149 149 pjmedia_vid_dev_cap cap, … … 436 436 437 437 ddi->info.fmt_cnt = 0; 438 ddi->info.fmt = (pjmedia_format*)439 pj_pool_calloc(df->dev_pool,440 sizeof(dshow_fmts)/441 sizeof(dshow_fmts[0]),442 sizeof(pjmedia_format));443 444 438 for (j = 0; 445 439 j < sizeof(dshow_fmts)/sizeof(dshow_fmts[0]); … … 482 476 483 477 ddi->info.fmt_cnt = 1; 484 ddi->info.fmt = PJ_POOL_ZALLOC_T(df->dev_pool, pjmedia_format);485 478 pjmedia_format_init_video(&ddi->info.fmt[0], dshow_fmts[0].pjmedia_format, 486 479 DEFAULT_WIDTH, DEFAULT_HEIGHT, … … 526 519 pjmedia_vid_dev_factory *f, 527 520 unsigned index, 528 pjmedia_vid_ param *param)521 pjmedia_vid_dev_param *param) 529 522 { 530 523 struct dshow_factory *df = (struct dshow_factory*)f; … … 814 807 static pj_status_t dshow_factory_create_stream( 815 808 pjmedia_vid_dev_factory *f, 816 pjmedia_vid_ param *param,817 const pjmedia_vid_ cb *cb,809 pjmedia_vid_dev_param *param, 810 const pjmedia_vid_dev_cb *cb, 818 811 void *user_data, 819 812 pjmedia_vid_dev_stream **p_vid_strm) … … 904 897 /* API: Get stream info. */ 905 898 static pj_status_t dshow_stream_get_param(pjmedia_vid_dev_stream *s, 906 pjmedia_vid_ param *pi)899 pjmedia_vid_dev_param *pi) 907 900 { 908 901 struct dshow_stream *strm = (struct dshow_stream*)s;
Note: See TracChangeset
for help on using the changeset viewer.