Changeset 5803 for pjproject/trunk/pjmedia/src/pjmedia/jbuf.c
- Timestamp:
- Jun 6, 2018 8:38:29 AM (6 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
pjproject/trunk/pjmedia/src/pjmedia/jbuf.c
r5734 r5803 296 296 *bit_info = 0; 297 297 } else { 298 pj_size_t frm_size = framelist->content_len[framelist->head]; 299 pj_size_t max_size = size? *size : frm_size; 300 pj_size_t copy_size = PJ_MIN(max_size, frm_size); 301 302 /* Buffer size should not be smaller than frame size. */ 303 if (max_size < frm_size) { 304 pj_assert(!"Buffer too small"); 305 PJ_LOG(4, (THIS_FILE, "Warning: buffer too small for the " 306 "retrieved frame!")); 307 } 308 298 309 pj_memcpy(frame, 299 310 framelist->content + 300 311 framelist->head * framelist->frame_size, 301 framelist->frame_size);312 copy_size); 302 313 *p_type = (pjmedia_jb_frame_type) 303 314 framelist->frame_type[framelist->head]; 304 315 if (size) 305 *size = framelist->content_len[framelist->head];316 *size = copy_size; 306 317 if (bit_info) 307 318 *bit_info = framelist->bit_info[framelist->head]; … … 988 999 cur_size = jb_framelist_eff_size(&jb->jb_framelist); 989 1000 1001 /* Check if frame size is larger than JB frame size */ 1002 if (frame_size > jb->jb_frame_size) { 1003 PJ_LOG(4, (THIS_FILE, "Warning: frame too large for jitter buffer, " 1004 "it will be truncated!")); 1005 } 1006 990 1007 /* Attempt to store the frame */ 991 1008 min_frame_size = PJ_MIN(frame_size, jb->jb_frame_size);
Note: See TracChangeset
for help on using the changeset viewer.