From ab071b33682b9048142094b41d33043d6e9a6555 Mon Sep 17 00:00:00 2001
From: Kateryna Kostiuk <kateryna.kostiuk@savoirfairelinux.com>
Date: Wed, 9 Aug 2023 15:20:24 -0400
Subject: [PATCH] conference: fix local input for iOS
This patch creates a sink client for local video,
even if the video is managed by the client, so that it can
be used during conferences.
Change-Id: I5f2241a6f2fa03b0cb4f0eac7eddc4c1f354ca04
---
src/media/video/video_input.cpp | 6 ------
src/media/video/video_rtp_session.cpp | 2 +-
2 files changed, 1 insertion(+), 7 deletions(-)
diff --git a/src/media/video/video_input.cpp b/src/media/video/video_input.cpp
index 8b224a5d60..23937d97d8 100644
--- a/src/media/video/video_input.cpp
+++ b/src/media/video/video_input.cpp
@@ -69,13 +69,7 @@ VideoInput::VideoInput(VideoInputMode inputMode, const std::string& id_)
inputMode_ = VideoInputMode::ManagedByDaemon;
#endif
}
-#ifdef __ANDROID__
sink_ = Manager::instance().createSinkClient(id_);
-#else
- if (inputMode_ == VideoInputMode::ManagedByDaemon) {
- sink_ = Manager::instance().createSinkClient(id_);
- }
-#endif
switchInput(id_);
}
diff --git a/src/media/video/video_rtp_session.cpp b/src/media/video/video_rtp_session.cpp
index c6e6a563a3..6d861d7ef2 100644
--- a/src/media/video/video_rtp_session.cpp
+++ b/src/media/video/video_rtp_session.cpp
@@ -154,7 +154,7 @@ VideoRtpSession::startSender()
return;
}
-#ifdef __ANDROID__
+#if (defined(__ANDROID__) || (defined(TARGET_OS_IOS) && TARGET_OS_IOS))
if (auto input1 = std::static_pointer_cast<VideoInput>(videoLocal_)) {
input1->setupSink();
input1->setFrameSize(localVideoParams_.width, localVideoParams_.height);
--
GitLab