From 80b119b2ca4d6f007d408a52f2159259b675df43 Mon Sep 17 00:00:00 2001 From: Gaelle Braud Date: Thu, 2 Jan 2025 10:39:28 +0100 Subject: [PATCH] fix #LINQT-1465 set auto video codecs + don't sort codec lists --- Linphone/core/App.cpp | 2 ++ Linphone/core/payload-type/PayloadTypeProxy.cpp | 2 +- Linphone/view/Control/Container/Call/CallLayout.qml | 6 +++--- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/Linphone/core/App.cpp b/Linphone/core/App.cpp index adaf8839b..7e5597afd 100644 --- a/Linphone/core/App.cpp +++ b/Linphone/core/App.cpp @@ -548,6 +548,8 @@ void App::initCore() { Utils::checkDownloadedCodecsUpdates(); mEngine->load(url); + + CoreModel::getInstance()->getCore()->setVideoCodecPriorityPolicy(linphone::CodecPriorityPolicy::Auto); }); }, Qt::BlockingQueuedConnection); diff --git a/Linphone/core/payload-type/PayloadTypeProxy.cpp b/Linphone/core/payload-type/PayloadTypeProxy.cpp index 76846dadf..84e192790 100644 --- a/Linphone/core/payload-type/PayloadTypeProxy.cpp +++ b/Linphone/core/payload-type/PayloadTypeProxy.cpp @@ -26,7 +26,7 @@ DEFINE_ABSTRACT_OBJECT(PayloadTypeProxy) PayloadTypeProxy::PayloadTypeProxy(QObject *parent) : LimitProxy(parent) { mPayloadTypeList = PayloadTypeList::create(); - setSourceModels(new SortFilterList(mPayloadTypeList.get(), Qt::AscendingOrder)); + setSourceModels(new SortFilterList(mPayloadTypeList.get())); } PayloadTypeProxy::~PayloadTypeProxy() { diff --git a/Linphone/view/Control/Container/Call/CallLayout.qml b/Linphone/view/Control/Container/Call/CallLayout.qml index 0dc1f7bed..8e08621e2 100644 --- a/Linphone/view/Control/Container/Call/CallLayout.qml +++ b/Linphone/view/Control/Container/Call/CallLayout.qml @@ -14,9 +14,9 @@ Item { property CallGui call property ConferenceGui conference: call && call.core.conference property bool callTerminatedByUser: false - property bool callStarted: call?.core.isStarted - readonly property var callState: call? call.core.state : undefined - property int conferenceLayout: call ? call.core.conferenceVideoLayout : LinphoneEnums.ConferenceLayout.ActiveSpeaker + property bool callStarted: call ? call.core.isStarted : false + readonly property var callState: call?.core.state + property int conferenceLayout: call ? call.core.conferenceVideoLayout : LinphoneEnums.ConferenceLayout.ActiveSpeaker // property int participantDeviceCount: conference ? conference.core.participantDeviceCount : -1 // onParticipantDeviceCountChanged: { // setConferenceLayout()