Commit 5ac6cbe5 authored by Simon Morlat's avatar Simon Morlat Committed by Sylvain Berfini
Browse files

Works not so bad.

parent e45e5451
......@@ -172,6 +172,7 @@ int LocalConference::inviteAddresses (const list<const LinphoneAddress *> &addre
new_params = linphone_core_create_call_params(m_core, nullptr);
linphone_call_params_enable_video(new_params, m_currentParams->videoEnabled());
}
linphone_call_params_set_in_conference(new_params, TRUE);
call = linphone_core_invite_address_with_params(m_core, address, new_params);
if (!call){
ms_error("LocalConference::inviteAddresses(): could not invite participant");
......
......@@ -38,6 +38,7 @@ class LINPHONE_PUBLIC CallSessionParams : public ClonableObject {
friend class CallSession;
friend class CallSessionPrivate;
friend class ClientGroupChatRoom;
friend class ToneManager;
public:
CallSessionParams ();
......
......@@ -153,10 +153,8 @@ void MS2AudioMixer::setRecordPath(const std::string &path){
void MS2AudioMixer::enableMic(bool value){
mLocalMicEnabled = value;
if (!mLocalMicEnabled)
audio_stream_set_mic_gain(mLocalParticipantStream, 0);
else
audio_stream_set_mic_gain_db(mLocalParticipantStream, getSession().getCCore()->sound_conf.soft_mic_lev);
if (mLocalEndpoint)
ms_audio_conference_mute_member(mConference, mLocalEndpoint, !value);
}
bool MS2AudioMixer::micEnabled()const{
......
......@@ -1988,10 +1988,6 @@ LinphoneStatus MediaSessionPrivate::acceptUpdate (const CallSessionParams *csp,
lWarning() << "Requested video but video support is globally disabled. Refusing video";
getParams()->enableVideo(false);
}
if (q->getCurrentParams()->getPrivate()->getInConference()) {
lWarning() << "Video isn't supported in conference";
getParams()->enableVideo(false);
}
updateRemoteSessionIdAndVer();
makeLocalMediaDescription(op->getRemoteMediaDescription() ? false : true);
......
......@@ -255,7 +255,10 @@ void MS2Stream::configureAdaptiveRateControl (const OfferAnswerContext &params)
}
if (isAdvanced) {
lInfo() << "Setting up advanced rate control";
ms_bandwidth_controller_add_stream(getCCore()->bw_controller, ms);
if (getMixer() == nullptr || getType() == SalAudio){
// Don't use bandwidth controller in video conf.
ms_bandwidth_controller_add_stream(getCCore()->bw_controller, ms);
}
media_stream_enable_adaptive_bitrate_control(ms, false);
} else {
media_stream_set_adaptive_bitrate_algorithm(ms, MSQosAnalyzerAlgorithmSimple);
......
......@@ -23,6 +23,7 @@
#include "call/call-p.h"
#include "conference/session/media-session.h"
#include "conference/session/media-session-p.h"
#include "conference/params/call-session-params-p.h"
#include "linphone/utils/general.h"
#include "core/core-p.h"
#include "conference_private.h"
......@@ -75,6 +76,11 @@ void ToneManager::startRingbackTone(const std::shared_ptr<CallSession> &session)
setState(session, State::Ringback);
mStats->number_of_startRingbackTone++;
if (session->getParams()->getPrivate()->getInConference()){
lInfo() << "Skip ring back tone, call is in conference.";
return;
}
if (!isAnotherSessionInState(session, State::Ringback)) {
doStopToneToPlaySomethingElse(session);
......
......@@ -103,6 +103,7 @@ void MS2VideoMixer::addLocalParticipant(){
void MS2VideoMixer::removeLocalParticipant(){
if (mLocalEndpoint){
ms_message("Conference: removing video local endpoint");
ms_video_conference_remove_member(mConference, mLocalEndpoint);
ms_video_endpoint_release_from_stream(mLocalEndpoint);
mLocalEndpoint = nullptr;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment