diff options
Diffstat (limited to 'openbsc/src')
-rw-r--r-- | openbsc/src/libmgcp/mgcp_network.c | 2 | ||||
-rw-r--r-- | openbsc/src/libmgcp/mgcp_protocol.c | 16 | ||||
-rw-r--r-- | openbsc/src/libmgcp/mgcp_transcode.c | 10 |
3 files changed, 14 insertions, 14 deletions
diff --git a/openbsc/src/libmgcp/mgcp_network.c b/openbsc/src/libmgcp/mgcp_network.c index e4f5f7d5c..ed90d34f7 100644 --- a/openbsc/src/libmgcp/mgcp_network.c +++ b/openbsc/src/libmgcp/mgcp_network.c @@ -614,7 +614,7 @@ int mgcp_send(struct mgcp_endpoint *endp, int dest, int is_rtp, int nbytes = 0; int len = rc; do { - cont = trans->processing_cb(endp, rtp_end, + cont = trans->process(endp, rtp_end, buf, &len, RTP_BUF_SIZE); if (cont < 0) break; diff --git a/openbsc/src/libmgcp/mgcp_protocol.c b/openbsc/src/libmgcp/mgcp_protocol.c index 8017fe874..18a25bc88 100644 --- a/openbsc/src/libmgcp/mgcp_protocol.c +++ b/openbsc/src/libmgcp/mgcp_protocol.c @@ -67,9 +67,9 @@ static int setup_rtp_processing(struct mgcp_endpoint *endp); static int mgcp_analyze_header(struct mgcp_parse_data *parse, char *data); static const struct mgcp_transcoding no_transcoder = { - .processing_cb = &mgcp_rtp_processing_default, - .setup_processing_cb = &mgcp_setup_rtp_processing_default, - .get_net_downlink_format_cb = &mgcp_get_net_downlink_format_default, + .process = &mgcp_rtp_processing_default, + .setup = &mgcp_setup_rtp_processing_default, + .get_net_downlink_format = &mgcp_get_net_downlink_format_default, }; const struct mgcp_transcoding *mgcp_default_transcoder = &no_transcoder; @@ -213,7 +213,7 @@ static int write_response_sdp(struct mgcp_endpoint *endp, int nchars; trans = endp->tcfg->transcoder; - trans->get_net_downlink_format_cb(endp, &payload_type, + trans->get_net_downlink_format(endp, &payload_type, &audio_name, &fmtp_extra); len = snprintf(sdp_record, size, @@ -1475,14 +1475,14 @@ static int setup_rtp_processing(struct mgcp_endpoint *endp) return 0; if (endp->conn_mode & MGCP_CONN_SEND_ONLY) - rc |= trans->setup_processing_cb(endp, &endp->net_end, &endp->bts_end); + rc |= trans->setup(endp, &endp->net_end, &endp->bts_end); else - rc |= trans->setup_processing_cb(endp, &endp->net_end, NULL); + rc |= trans->setup(endp, &endp->net_end, NULL); if (endp->conn_mode & MGCP_CONN_RECV_ONLY) - rc |= trans->setup_processing_cb(endp, &endp->bts_end, &endp->net_end); + rc |= trans->setup(endp, &endp->bts_end, &endp->net_end); else - rc |= trans->setup_processing_cb(endp, &endp->bts_end, NULL); + rc |= trans->setup(endp, &endp->bts_end, NULL); return rc; } diff --git a/openbsc/src/libmgcp/mgcp_transcode.c b/openbsc/src/libmgcp/mgcp_transcode.c index aaa8863fb..6407cfb4a 100644 --- a/openbsc/src/libmgcp/mgcp_transcode.c +++ b/openbsc/src/libmgcp/mgcp_transcode.c @@ -33,9 +33,9 @@ #include <osmocom/netif/rtp.h> const struct mgcp_transcoding mgcp_sw_transcoder = { - .processing_cb = mgcp_transcoding_process_rtp, - .setup_processing_cb = mgcp_transcoding_setup, - .get_net_downlink_format_cb = mgcp_transcoding_net_downlink_format, + .process = mgcp_transcoding_process_rtp, + .setup = mgcp_transcoding_setup, + .get_net_downlink_format = mgcp_transcoding_net_downlink_format, }; int mgcp_transcoding_get_frame_size(void *state_, int nsamples, int dst) @@ -480,8 +480,8 @@ struct mgcp_process_rtp_state *check_transcode_state( struct mgcp_rtp_codec tmp_codec = src_end->alt_codec; src_end->alt_codec = src_end->codec; src_end->codec = tmp_codec; - trans->setup_processing_cb(endp, &endp->net_end, &endp->bts_end); - trans->setup_processing_cb(endp, &endp->bts_end, &endp->net_end); + trans->setup(endp, &endp->net_end, &endp->bts_end); + trans->setup(endp, &endp->bts_end, &endp->net_end); } done: |