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

allow to play mkv file during call on hold

Browse source
This commit is contained in:
Simon Morlat 2015-11-25 14:30:50 +01:00
parent 262575f921
commit 4ad41a4b8e
2 changed files with 15 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
coreapi/linphonecall.c
View file

@ -2940,6 +2940,7 @@ static void linphone_call_start_audio_stream(LinphoneCall *call, LinphoneCallSta
bool_t mute;
const char *playfile;
const char *recfile;
const char *file_to_play = NULL;
const SalStreamDescription *local_st_desc;
int crypto_idx;
MSMediaStreamIO io = MS_MEDIA_STREAM_IO_INITIALIZER;
@ -3052,21 +3053,29 @@ static void linphone_call_start_audio_stream(LinphoneCall *call, LinphoneCallSta
io.input.soundcard = captcard;
}else{
io.input.type = MSResourceFile;
io.input.file = playfile;
file_to_play = playfile;
io.input.file = NULL; /*we prefer to use the remote_play api, that allows to play multimedia files */
}
}
if (ok == TRUE) {
audio_stream_start_from_io(call->audiostream,
int err = audio_stream_start_from_io(call->audiostream,
call->audio_profile,
rtp_addr,
stream->rtp_port,
stream->rtcp_addr[0]!='\0' ? stream->rtcp_addr : call->resultdesc->addr,
(linphone_core_rtcp_enabled(lc) && !is_multicast) ? (stream->rtcp_port ? stream->rtcp_port : stream->rtp_port+1) : 0,
used_pt,
&io
);
post_configure_audio_streams(call, (call->all_muted || call->audio_muted) && !call->playing_ringbacktone);
&io);
if (err == 0){
post_configure_audio_streams(call, (call->all_muted || call->audio_muted) && !call->playing_ringbacktone);
if (file_to_play){
MSFilter *player = audio_stream_open_remote_play(call->audiostream, file_to_play);
if (player){
ms_filter_call_method_noarg(player, MS_PLAYER_START);
}
}
}
}
ms_media_stream_sessions_set_encryption_mandatory(&call->audiostream->ms.sessions,linphone_core_is_media_encryption_mandatory(call->core));

2
mediastreamer2

@ -1 +1 @@
Subproject commit 30e4d5e32feadd93ecdd6090d488d9c512cf62a5
Subproject commit 40fb0cfc7c89bc8d59d220d76800dda600c9cb93