Changeset 4115
- Timestamp:
- Apr 30, 2012 2:34:40 AM (13 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
pjproject/trunk/pjmedia/src/pjmedia/vid_stream.c
r4099 r4115 126 126 127 127 unsigned dec_max_size; /**< Size of decoded/raw picture*/ 128 pjmedia_ratio dec_max_fps; /**< Max fps of decoding dir. */ 128 129 pjmedia_frame dec_frame; /**< Current decoded frame. */ 129 130 pjmedia_event fmt_event; /**< Buffered fmt_changed event … … 1081 1082 vfd->fps.num * ts_diff) 1082 1083 { 1083 pjmedia_ratio old_fps;1084 1085 old_fps = vfd->fps;1086 1087 1084 /* Frame rate changed, update decoding port info */ 1088 1085 if (stream->info.codec_info.clock_rate % ts_diff == 0) { … … 1100 1097 * increased and not exceeding 100fps. 1101 1098 */ 1102 if (vfd->fps.num/vfd->fps.denum < 100 && 1103 vfd->fps.num*old_fps.denum > old_fps.num*vfd->fps.denum) 1099 if (vfd->fps.num/vfd->fps.denum <= 100 && 1100 vfd->fps.num * stream->dec_max_fps.denum > 1101 stream->dec_max_fps.num * vfd->fps.denum) 1104 1102 { 1105 1103 pjmedia_event *event = &stream->fmt_event; 1104 1105 /* Update max fps of decoding dir */ 1106 stream->dec_max_fps = vfd->fps; 1106 1107 1107 1108 /* Use the buffered format changed event: … … 1496 1497 */ 1497 1498 vfd_dec->fps.num = vfd_dec->fps.num * 3 / 2; 1499 stream->dec_max_fps = vfd_dec->fps; 1498 1500 1499 1501 /* Create decoder channel */
Note: See TracChangeset
for help on using the changeset viewer.