- 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/tonegen.c
r2724 r3392 559 559 struct tonegen *tonegen = (struct tonegen*) port; 560 560 short *dst, *end; 561 unsigned clock_rate = tonegen->base.info.clock_rate;561 unsigned clock_rate = PJMEDIA_PIA_SRATE(&tonegen->base.info); 562 562 563 563 PJ_ASSERT_RETURN(port->info.signature == SIGNATURE, PJ_EINVAL); … … 623 623 624 624 dst = (short*) frame->buf; 625 end = dst + port->info.samples_per_frame;625 end = dst + PJMEDIA_PIA_SPF(&port->info); 626 626 627 627 while (dst < end) { … … 637 637 (tonegen->count!=1 || !(dig->flags & PJMEDIA_TONE_INITIALIZED))) 638 638 { 639 init_generate_tone(&tonegen->state, port->info.clock_rate, 639 init_generate_tone(&tonegen->state, 640 PJMEDIA_PIA_SRATE(&port->info), 640 641 dig->freq1, dig->freq2, dig->volume); 641 642 dig->flags |= PJMEDIA_TONE_INITIALIZED; … … 652 653 if (cnt > required) 653 654 cnt = required; 654 generate_tone(&tonegen->state, port->info.channel_count, 655 generate_tone(&tonegen->state, 656 PJMEDIA_PIA_CCNT(&port->info), 655 657 cnt, dst); 656 658 … … 730 732 731 733 frame->type = PJMEDIA_FRAME_TYPE_AUDIO; 732 frame->size = port->info.bytes_per_frame;734 frame->size = PJMEDIA_PIA_AVG_FSZ(&port->info); 733 735 734 736 TRACE_((THIS_FILE, "tonegen_get_frame(): frame created, level=%u",
Note: See TracChangeset
for help on using the changeset viewer.