mirrors/linphone-iphone
1
0
Fork 1
mirror of https://gitlab.linphone.org/BC/public/linphone-iphone.git synced 2026-01-31 02:09:22 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

port linphone-daemon to lastest liblinphone

Browse source
This commit is contained in:
Simon Morlat 2015-01-23 21:57:58 +01:00
parent 2293421958
commit 89e36acf31
4 changed files with 36 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
daemon/commands/audio-codec-set.cc
View file

@ -108,12 +108,8 @@ void AudioCodecSetCommand::exec(Daemon *app, const char *args) {
app->sendResponse(Response("New payload type number is already used.", Response::Error));
} else {
int idx = atoi(value.c_str());
RtpProfile *default_profile=app->getCore()->default_profile;
long old_idx = _payload_type_get_number(payload);
_payload_type_set_number(payload, idx);
rtp_profile_set_payload(default_profile, idx, payload);
rtp_profile_clear_payload(default_profile, old_idx);
app->sendResponse(PayloadTypeResponse(app->getCore(), payload, index));
linphone_core_set_payload_type_number(app->getCore(),payload, idx);
app->sendResponse(PayloadTypeResponse(app->getCore(), payload, idx));
}
return;
}

41
daemon/commands/audio-stream-start.cc
View file

@ -10,11 +10,21 @@ AudioStreamStartCommand::AudioStreamStartCommand() :
"Id: 1"));
}
static PayloadType *getPayloadType(LinphoneCore *lc, const MSList *codecs, int number){
const MSList *elem;
for (elem=codecs;elem!=NULL;elem=elem->next){
PayloadType *pt=(PayloadType*)elem->data;
if (linphone_core_get_payload_type_number(lc, pt)==number)
return pt;
}
return NULL;
}
void AudioStreamStartCommand::exec(Daemon *app, const char *args) {
char addr[256];
int port;
int payload_type;
RtpProfile *default_profile=app->getCore()->default_profile;
if (sscanf(args, "%255s %d %d", addr, &port, &payload_type) == 3) {
int local_port = linphone_core_get_audio_port(app->getCore());
int jitt = linphone_core_get_audio_jittcomp(app->getCore());
@ -23,24 +33,29 @@ void AudioStreamStartCommand::exec(Daemon *app, const char *args) {
MSSndCardManager *manager = ms_snd_card_manager_get();
MSSndCard *capture_card = ms_snd_card_manager_get_card(manager, linphone_core_get_capture_device(app->getCore()));
MSSndCard *play_card = ms_snd_card_manager_get_card(manager, linphone_core_get_playback_device(app->getCore()));
PayloadType *oldpt=rtp_profile_get_payload(default_profile,payload_type);
PayloadType *pt;
RtpProfile *prof=rtp_profile_new("stream");
PayloadType *pt=getPayloadType(app->getCore(), linphone_core_get_audio_codecs(app->getCore()), payload_type);
if (!pt){
app->sendResponse(Response("No payload type were assigned to this number."));
return;
}
AudioStream *stream = audio_stream_new(local_port, local_port + 1, linphone_core_ipv6_enabled(app->getCore()));
audio_stream_set_features(stream,linphone_core_get_audio_features(app->getCore()));
if (oldpt){
if (ptime>0){
char fmtp[256];
snprintf(fmtp,sizeof(fmtp)-1,"ptime=%i",ptime);
pt=payload_type_clone(oldpt);
payload_type_append_send_fmtp(pt,fmtp);
rtp_profile_set_payload(default_profile,payload_type,pt);
}
pt=payload_type_clone(pt);
if (ptime!=0){
char fmtp[32];
snprintf(fmtp,sizeof(fmtp)-1,"ptime=%i",ptime);
payload_type_append_send_fmtp(pt,fmtp);
}
rtp_profile_set_payload(prof,payload_type,pt);
audio_stream_enable_adaptive_jittcomp(stream, linphone_core_audio_adaptive_jittcomp_enabled(app->getCore()));
rtp_session_set_symmetric_rtp(stream->ms.sessions.rtp_session, linphone_core_symmetric_rtp_enabled(app->getCore()));
int err=audio_stream_start_now(stream, default_profile, addr, port, port + 1, payload_type, jitt, play_card, capture_card, echo_canceller);
if (oldpt) rtp_profile_set_payload(default_profile,payload_type,oldpt);
int err=audio_stream_start_now(stream, prof, addr, port, port + 1, payload_type, jitt, play_card, capture_card, echo_canceller);
if (err != 0) {
app->sendResponse(Response("Error during audio stream creation."));
return;

2
daemon/commands/audio-stream-stop.cc
View file

@ -20,7 +20,9 @@ void AudioStreamStopCommand::exec(Daemon *app, const char *args) {
return;
}
app->removeAudioStream(id);
RtpProfile *prof=rtp_session_get_profile(stream->ms.sessions.rtp_session);
audio_stream_stop(stream);
rtp_profile_destroy(prof);
app->sendResponse(Response());
} else {
app->sendResponse(Response("Missing/Incorrect parameter(s)."));

8
daemon/commands/msfilter-add-fmtp.cc
View file

@ -17,10 +17,10 @@ MSFilterAddFmtpCommand::MSFilterAddFmtpCommand() :
}
void MSFilterAddFmtpCommand::exec(Daemon *app, const char *args) {
char type[256], fmtp[256];
char type[16]={0}, fmtp[512]={0};
int id;
if (sscanf(args, "%255s %d %255s", type, &id, fmtp) == 3) {
if (sscanf(args, "%15s %d %511s", type, &id, fmtp) == 3) {
if(strcmp(type, "call") == 0) {
LinphoneCall *call = app->findCall(id);
if (call == NULL) {
@ -31,14 +31,14 @@ void MSFilterAddFmtpCommand::exec(Daemon *app, const char *args) {
app->sendResponse(Response("This call doesn't have an active audio stream."));
return;
}
ms_filter_call_method(call->audiostream->ms.encoder, MS_FILTER_ADD_FMTP, (void*) args);
ms_filter_call_method(call->audiostream->ms.encoder, MS_FILTER_ADD_FMTP, fmtp);
} else if(strcmp(type, "stream") == 0) {
AudioStream *stream = app->findAudioStream(id);
if (stream == NULL) {
app->sendResponse(Response("No Audio Stream with such id."));
return;
}
ms_filter_call_method(stream->ms.encoder, MS_FILTER_ADD_FMTP, (void*) args);
ms_filter_call_method(stream->ms.encoder, MS_FILTER_ADD_FMTP, fmtp);
} else {
app->sendResponse(Response("Incorrect parameter(s)."));
}