- Timestamp:
- Dec 10, 2010 11:04:30 AM (13 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
pjproject/branches/projects/2.0-dev/pjmedia/src/pjmedia/wav_playlist.c
r2394 r3392 237 237 { 238 238 struct playlist_port *fport; 239 pjmedia_audio_format_detail *afd; 239 240 pj_off_t pos; 240 241 pj_status_t status; … … 280 281 return PJ_ENOMEM; 281 282 } 283 284 afd = pjmedia_format_get_audio_format_detail(&fport->base.info.fmt, 1); 282 285 283 286 /* start with the first file. */ … … 467 470 */ 468 471 if (!has_wave_info) { 469 fport->base.info.channel_count = wavehdr.fmt_hdr.nchan; 470 fport->base.info.clock_rate = wavehdr.fmt_hdr.sample_rate; 471 fport->base.info.bits_per_sample = wavehdr.fmt_hdr.bits_per_sample; 472 fport->base.info.samples_per_frame = fport->base.info.clock_rate * 473 wavehdr.fmt_hdr.nchan * 474 ptime / 1000; 475 fport->base.info.bytes_per_frame = 476 fport->base.info.samples_per_frame * 477 fport->base.info.bits_per_sample / 8; 472 afd->channel_count = wavehdr.fmt_hdr.nchan; 473 afd->clock_rate = wavehdr.fmt_hdr.sample_rate; 474 afd->bits_per_sample = wavehdr.fmt_hdr.bits_per_sample; 475 afd->frame_time_usec = ptime * 1000; 476 afd->avg_bps = afd->max_bps = afd->clock_rate * 477 afd->channel_count * 478 afd->bits_per_sample / 8; 478 479 479 480 has_wave_info = PJ_TRUE; … … 484 485 * files. 485 486 */ 486 if (wavehdr.fmt_hdr.nchan != fport->base.info.channel_count ||487 wavehdr.fmt_hdr.sample_rate != fport->base.info.clock_rate ||488 wavehdr.fmt_hdr.bits_per_sample != fport->base.info.bits_per_sample)487 if (wavehdr.fmt_hdr.nchan != afd->channel_count || 488 wavehdr.fmt_hdr.sample_rate != afd->clock_rate || 489 wavehdr.fmt_hdr.bits_per_sample != afd->bits_per_sample) 489 490 { 490 491 /* This file has different characteristics than the other … … 520 521 (int)port_label->slen, 521 522 port_label->ptr, 522 fport->base.info.clock_rate,523 fport->base.info.channel_count,523 afd->clock_rate, 524 afd->channel_count, 524 525 fport->bufsize / 1000)); 525 526
Note: See TracChangeset
for help on using the changeset viewer.