Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Adjusted function calls in UniMRCP-wrapper.cpp #4

Merged
merged 2 commits into from
Jan 29, 2023
Merged

Adjusted function calls in UniMRCP-wrapper.cpp #4

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d45259a
Adjusted function calls in UniMRCP-wrapper.cpp
MayamaTakeshi Jan 1, 2023
a1f1591
Added check for UNI_VERSION_AT_LEAST(1,8,0) to retain backward compat…
MayamaTakeshi Jan 28, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 13 additions & 0 deletions UniMRCP-wrapper.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -659,14 +659,19 @@ bool UniMRCPStreamRx::ReadFrame()
return false;
}

#define DTMF_FRAME_DURATION 50

bool UniMRCPStreamRx::OnOpenInternal(UniMRCPAudioTermination const* term, mpf_audio_stream_t const* stm)
{
if (term->dg_band >= 0) {
dtmf_gen = mpf_dtmf_generator_create_ex(stm,
term->dg_band ? static_cast<mpf_dtmf_generator_band_e>(term->dg_band) :
(stm->rx_event_descriptor ? MPF_DTMF_GENERATOR_OUTBAND : MPF_DTMF_GENERATOR_INBAND),
#if UNI_VERSION_AT_LEAST(1,8,0)
term->dg_tone, term->dg_silence, DTMF_FRAME_DURATION, mrcp_application_session_pool_get(term->sess));
#else
term->dg_tone, term->dg_silence, mrcp_application_session_pool_get(term->sess));
#endif
if (!dtmf_gen) {
apt_log(APT_LOG_MARK, APT_PRIO_WARNING, "%s StreamOpenRx: Failed to create DTMF generator",
swig_target_platform);
Expand Down Expand Up @@ -1228,7 +1233,11 @@ apt_bool_t UniMRCPAudioTermination::StmOpenRx(mpf_audio_stream_t* stream, mpf_co
UniMRCPStreamRx* sr;
if (d)
sr = t->OnStreamOpenRx(d->enabled == TRUE, d->payload_type, d->name.buf,
#if UNI_VERSION_AT_LEAST(1,8,0)
NULL, d->channel_count, d->sampling_rate);
#else
d->format.buf, d->channel_count, d->sampling_rate);
#endif
else
sr = t->OnStreamOpenRx(false, 0, NULL, NULL, 0, 0);
apt_log(APT_LOG_MARK, APT_PRIO_DEBUG, "%s StreamOpenRx: return %pp",
Expand Down Expand Up @@ -1297,7 +1306,11 @@ apt_bool_t UniMRCPAudioTermination::StmOpenTx(mpf_audio_stream_t* stream, mpf_co
UniMRCPStreamTx* st;
if (d)
st = t->OnStreamOpenTx(d->enabled == TRUE, d->payload_type, d->name.buf,
#if UNI_VERSION_AT_LEAST(1,8,0)
NULL, d->channel_count, d->sampling_rate);
#else
d->format.buf, d->channel_count, d->sampling_rate);
#endif
else
st = t->OnStreamOpenTx(false, 0, NULL, NULL, 0, 0);
apt_log(APT_LOG_MARK, APT_PRIO_DEBUG, "%s StreamOpenTx: return %pp",
Expand Down