diff options
Diffstat (limited to 'pjmedia/src/pjmedia/echo_port.c')
| -rw-r--r-- | pjmedia/src/pjmedia/echo_port.c | 32 |
1 files changed, 18 insertions, 14 deletions
diff --git a/pjmedia/src/pjmedia/echo_port.c b/pjmedia/src/pjmedia/echo_port.c index c3f689ed..4c098cc4 100644 --- a/pjmedia/src/pjmedia/echo_port.c +++ b/pjmedia/src/pjmedia/echo_port.c @@ -26,7 +26,7 @@ #define THIS_FILE "ec_port.c" -#define SIGNATURE PJMEDIA_PORT_SIGNATURE('E', 'C', 'H', 'O') +#define SIGNATURE PJMEDIA_SIG_PORT_ECHO #define BUF_COUNT 32 struct ec @@ -38,7 +38,7 @@ struct ec static pj_status_t ec_put_frame(pjmedia_port *this_port, - const pjmedia_frame *frame); + pjmedia_frame *frame); static pj_status_t ec_get_frame(pjmedia_port *this_port, pjmedia_frame *frame); static pj_status_t ec_on_destroy(pjmedia_port *this_port); @@ -52,25 +52,29 @@ PJ_DEF(pj_status_t) pjmedia_echo_port_create(pj_pool_t *pool, pjmedia_port **p_port ) { const pj_str_t AEC = { "EC", 2 }; + pjmedia_audio_format_detail *afd; struct ec *ec; pj_status_t status; PJ_ASSERT_RETURN(pool && dn_port && p_port, PJ_EINVAL); - PJ_ASSERT_RETURN(dn_port->info.bits_per_sample==16 && tail_ms, + + afd = pjmedia_format_get_audio_format_detail(&dn_port->info.fmt, PJ_TRUE); + + PJ_ASSERT_RETURN(afd->bits_per_sample==16 && tail_ms, PJ_EINVAL); /* Create the port and the AEC itself */ ec = PJ_POOL_ZALLOC_T(pool, struct ec); pjmedia_port_info_init(&ec->base.info, &AEC, SIGNATURE, - dn_port->info.clock_rate, - dn_port->info.channel_count, - dn_port->info.bits_per_sample, - dn_port->info.samples_per_frame); - - status = pjmedia_echo_create2(pool, dn_port->info.clock_rate, - dn_port->info.channel_count, - dn_port->info.samples_per_frame, + afd->clock_rate, + afd->channel_count, + afd->bits_per_sample, + PJMEDIA_AFD_SPF(afd)); + + status = pjmedia_echo_create2(pool, afd->clock_rate, + afd->channel_count, + PJMEDIA_AFD_SPF(afd), tail_ms, latency_ms, options, &ec->ec); if (status != PJ_SUCCESS) return status; @@ -89,7 +93,7 @@ PJ_DEF(pj_status_t) pjmedia_echo_port_create(pj_pool_t *pool, static pj_status_t ec_put_frame( pjmedia_port *this_port, - const pjmedia_frame *frame) + pjmedia_frame *frame) { struct ec *ec = (struct ec*)this_port; @@ -99,7 +103,7 @@ static pj_status_t ec_put_frame( pjmedia_port *this_port, return pjmedia_port_put_frame(ec->dn_port, frame); } - PJ_ASSERT_RETURN(frame->size == this_port->info.samples_per_frame * 2, + PJ_ASSERT_RETURN(frame->size == PJMEDIA_PIA_AVG_FSZ(&this_port->info), PJ_EINVAL); pjmedia_echo_capture(ec->ec, (pj_int16_t*)frame->buf, 0); @@ -119,7 +123,7 @@ static pj_status_t ec_get_frame( pjmedia_port *this_port, status = pjmedia_port_get_frame(ec->dn_port, frame); if (status!=PJ_SUCCESS || frame->type!=PJMEDIA_FRAME_TYPE_AUDIO) { pjmedia_zero_samples((pj_int16_t*)frame->buf, - this_port->info.samples_per_frame); + PJMEDIA_PIA_SPF(&this_port->info)); } pjmedia_echo_playback(ec->ec, (pj_int16_t*)frame->buf); |