- Timestamp:
- Feb 24, 2011 7:47:55 AM (13 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
pjproject/branches/projects/2.0-dev/pjmedia/src/pjmedia-videodev/colorbar_dev.c
r3401 r3420 81 81 struct cbar_stream 82 82 { 83 pjmedia_vid_ stream base; /**< Base stream*/84 pjmedia_vid_param param; /**< Settings*/85 pj_pool_t *pool; /**< Memory pool.*/86 87 pjmedia_vid_cb vid_cb; /**< Stream callback.*/88 void *user_data; /**< Application data.*/83 pjmedia_vid_dev_stream base; /**< Base stream */ 84 pjmedia_vid_param param; /**< Settings */ 85 pj_pool_t *pool; /**< Memory pool. */ 86 87 pjmedia_vid_cb vid_cb; /**< Stream callback. */ 88 void *user_data; /**< Application data. */ 89 89 90 90 const struct cbar_fmt_info *cbfi; … … 106 106 unsigned index, 107 107 pjmedia_vid_param *param); 108 static pj_status_t cbar_factory_create_stream(pjmedia_vid_dev_factory *f, 109 const pjmedia_vid_param *param, 110 const pjmedia_vid_cb *cb, 111 void *user_data, 112 pjmedia_vid_stream **p_vid_strm); 113 114 static pj_status_t cbar_stream_get_param(pjmedia_vid_stream *strm, 108 static pj_status_t cbar_factory_create_stream( 109 pjmedia_vid_dev_factory *f, 110 const pjmedia_vid_param *param, 111 const pjmedia_vid_cb *cb, 112 void *user_data, 113 pjmedia_vid_dev_stream **p_vid_strm); 114 115 static pj_status_t cbar_stream_get_param(pjmedia_vid_dev_stream *strm, 115 116 pjmedia_vid_param *param); 116 static pj_status_t cbar_stream_get_cap(pjmedia_vid_ stream *strm,117 static pj_status_t cbar_stream_get_cap(pjmedia_vid_dev_stream *strm, 117 118 pjmedia_vid_dev_cap cap, 118 119 void *value); 119 static pj_status_t cbar_stream_set_cap(pjmedia_vid_ stream *strm,120 static pj_status_t cbar_stream_set_cap(pjmedia_vid_dev_stream *strm, 120 121 pjmedia_vid_dev_cap cap, 121 122 const void *value); 122 static pj_status_t cbar_stream_get_frame(pjmedia_vid_ stream *strm,123 static pj_status_t cbar_stream_get_frame(pjmedia_vid_dev_stream *strm, 123 124 pjmedia_frame *frame); 124 static pj_status_t cbar_stream_start(pjmedia_vid_ stream *strm);125 static pj_status_t cbar_stream_stop(pjmedia_vid_ stream *strm);126 static pj_status_t cbar_stream_destroy(pjmedia_vid_ stream *strm);125 static pj_status_t cbar_stream_start(pjmedia_vid_dev_stream *strm); 126 static pj_status_t cbar_stream_stop(pjmedia_vid_dev_stream *strm); 127 static pj_status_t cbar_stream_destroy(pjmedia_vid_dev_stream *strm); 127 128 128 129 /* Operations */ … … 137 138 }; 138 139 139 static pjmedia_vid_ stream_op stream_op =140 static pjmedia_vid_dev_stream_op stream_op = 140 141 { 141 142 &cbar_stream_get_param, … … 355 356 356 357 /* API: create stream */ 357 static pj_status_t cbar_factory_create_stream(pjmedia_vid_dev_factory *f, 358 const pjmedia_vid_param *param, 359 const pjmedia_vid_cb *cb, 360 void *user_data, 361 pjmedia_vid_stream **p_vid_strm) 358 static pj_status_t cbar_factory_create_stream( 359 pjmedia_vid_dev_factory *f, 360 const pjmedia_vid_param *param, 361 const pjmedia_vid_cb *cb, 362 void *user_data, 363 pjmedia_vid_dev_stream **p_vid_strm) 362 364 { 363 365 struct cbar_factory *cf = (struct cbar_factory*)f; … … 420 422 421 423 /* API: Get stream info. */ 422 static pj_status_t cbar_stream_get_param(pjmedia_vid_ stream *s,424 static pj_status_t cbar_stream_get_param(pjmedia_vid_dev_stream *s, 423 425 pjmedia_vid_param *pi) 424 426 { … … 439 441 440 442 /* API: get capability */ 441 static pj_status_t cbar_stream_get_cap(pjmedia_vid_ stream *s,443 static pj_status_t cbar_stream_get_cap(pjmedia_vid_dev_stream *s, 442 444 pjmedia_vid_dev_cap cap, 443 445 void *pval) … … 459 461 460 462 /* API: set capability */ 461 static pj_status_t cbar_stream_set_cap(pjmedia_vid_ stream *s,463 static pj_status_t cbar_stream_set_cap(pjmedia_vid_dev_stream *s, 462 464 pjmedia_vid_dev_cap cap, 463 465 const void *pval) … … 553 555 554 556 /* API: Get frame from stream */ 555 static pj_status_t cbar_stream_get_frame(pjmedia_vid_ stream *strm,557 static pj_status_t cbar_stream_get_frame(pjmedia_vid_dev_stream *strm, 556 558 pjmedia_frame *frame) 557 559 { … … 562 564 563 565 /* API: Start stream. */ 564 static pj_status_t cbar_stream_start(pjmedia_vid_ stream *strm)566 static pj_status_t cbar_stream_start(pjmedia_vid_dev_stream *strm) 565 567 { 566 568 struct cbar_stream *stream = (struct cbar_stream*)strm; … … 574 576 575 577 /* API: Stop stream. */ 576 static pj_status_t cbar_stream_stop(pjmedia_vid_ stream *strm)578 static pj_status_t cbar_stream_stop(pjmedia_vid_dev_stream *strm) 577 579 { 578 580 struct cbar_stream *stream = (struct cbar_stream*)strm; … … 587 589 588 590 /* API: Destroy stream. */ 589 static pj_status_t cbar_stream_destroy(pjmedia_vid_ stream *strm)591 static pj_status_t cbar_stream_destroy(pjmedia_vid_dev_stream *strm) 590 592 { 591 593 struct cbar_stream *stream = (struct cbar_stream*)strm;
Note: See TracChangeset
for help on using the changeset viewer.