- Timestamp:
- Dec 10, 2010 11:04:30 AM (13 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
pjproject/branches/projects/2.0-dev/pjsip-apps/src/samples/aectest.c
r3249 r3392 198 198 199 199 /* play and rec WAVs must have the same clock rate */ 200 if ( wav_play->info.clock_rate != wav_rec->info.clock_rate) {200 if (PJMEDIA_PIA_SRATE(&wav_play->info) != PJMEDIA_PIA_SRATE(&wav_rec->info)) { 201 201 puts("Error: clock rate mismatch in the WAV files"); 202 202 return 1; … … 204 204 205 205 /* .. and channel count */ 206 if ( wav_play->info.channel_count != wav_rec->info.channel_count) {206 if (PJMEDIA_PIA_CCNT(&wav_play->info) != PJMEDIA_PIA_CCNT(&wav_rec->info)) { 207 207 puts("Error: clock rate mismatch in the WAV files"); 208 208 return 1; … … 211 211 /* Create output wav */ 212 212 status = pjmedia_wav_writer_port_create(pool, argv[pj_optind+2], 213 wav_play->info.clock_rate,214 wav_play->info.channel_count,215 wav_play->info.samples_per_frame,216 wav_play->info.bits_per_sample,213 PJMEDIA_PIA_SRATE(&wav_play->info), 214 PJMEDIA_PIA_CCNT(&wav_play->info), 215 PJMEDIA_PIA_SPF(&wav_play->info), 216 PJMEDIA_PIA_BITS(&wav_play->info), 217 217 0, 0, &wav_out); 218 218 if (status != PJ_SUCCESS) { … … 222 222 223 223 /* Create echo canceller */ 224 status = pjmedia_echo_create2(pool, wav_play->info.clock_rate,225 wav_play->info.channel_count,226 wav_play->info.samples_per_frame,224 status = pjmedia_echo_create2(pool, PJMEDIA_PIA_SRATE(&wav_play->info), 225 PJMEDIA_PIA_CCNT(&wav_play->info), 226 PJMEDIA_PIA_SPF(&wav_play->info), 227 227 tail_ms, latency_ms, 228 228 opt, &ec); … … 234 234 235 235 /* Processing loop */ 236 play_frame.buf = pj_pool_alloc(pool, wav_play->info.samples_per_frame<<1);237 rec_frame.buf = pj_pool_alloc(pool, wav_play->info.samples_per_frame<<1);236 play_frame.buf = pj_pool_alloc(pool, PJMEDIA_PIA_SPF(&wav_play->info)<<1); 237 rec_frame.buf = pj_pool_alloc(pool, PJMEDIA_PIA_SPF(&wav_play->info)<<1); 238 238 pj_get_timestamp(&t0); 239 239 for (i=0; i < repeat; ++i) { 240 240 for (;;) { 241 play_frame.size = wav_play->info.samples_per_frame<< 1;241 play_frame.size = PJMEDIA_PIA_SPF(&wav_play->info) << 1; 242 242 status = pjmedia_port_get_frame(wav_play, &play_frame); 243 243 if (status != PJ_SUCCESS) … … 246 246 status = pjmedia_echo_playback(ec, (short*)play_frame.buf); 247 247 248 rec_frame.size = wav_play->info.samples_per_frame<< 1;248 rec_frame.size = PJMEDIA_PIA_SPF(&wav_play->info) << 1; 249 249 status = pjmedia_port_get_frame(wav_rec, &rec_frame); 250 250 if (status != PJ_SUCCESS) … … 265 265 266 266 i = pjmedia_wav_writer_port_get_pos(wav_out) / sizeof(pj_int16_t) * 1000 / 267 (wav_out->info.clock_rate * wav_out->info.channel_count);267 (PJMEDIA_PIA_SRATE(&wav_out->info) * PJMEDIA_PIA_CCNT(&wav_out->info)); 268 268 PJ_LOG(3,(THIS_FILE, "Processed %3d.%03ds audio", 269 269 i / 1000, i % 1000));
Note: See TracChangeset
for help on using the changeset viewer.