From 8c9d20e2958657a463bba90239ba1ecaea6d8edf Mon Sep 17 00:00:00 2001
From: Andreas Traczyk <andreas.traczyk@savoirfairelinux.com>
Date: Thu, 17 Mar 2022 15:49:54 -0400
Subject: [PATCH] directrenderer: follow jamid API changes
Follow changes from https://review.jami.net/c/jami-daemon/+/21262
Follow changes from https://review.jami.net/c/jami-daemon/+/21271
Change-Id: I61368a625aa4320c524b05f1df52f503d7932ec1
---
src/directrenderer.cpp | 15 +++++++--------
src/qtwrapper/videomanager_wrap.h | 9 ---------
2 files changed, 7 insertions(+), 17 deletions(-)
diff --git a/src/directrenderer.cpp b/src/directrenderer.cpp
index 5889783a..a207cf76 100644
--- a/src/directrenderer.cpp
+++ b/src/directrenderer.cpp
@@ -51,31 +51,30 @@ public:
void configureTarget()
{
using namespace std::placeholders;
- target.pull = std::bind(&Impl::pullCallback, this, _1);
+ target.pull = std::bind(&Impl::pullCallback, this);
target.push = std::bind(&Impl::pushCallback, this, _1);
};
- DRing::SinkTarget::FrameBufferPtr pullCallback(std::size_t bytes)
+ DRing::FrameBuffer pullCallback()
{
QMutexLocker lk(&mutex);
if (!frameBufferPtr) {
- frameBufferPtr.reset(new DRing::FrameBuffer);
- frameBufferPtr->avframe.reset(av_frame_alloc());
+ frameBufferPtr.reset(av_frame_alloc());
}
// A response to this signal should be used to provide client
// allocated buffer specs via the AVFrame structure.
// Important: Subscription to this signal MUST be synchronous(Qt::DirectConnection).
- Q_EMIT parent_->frameBufferRequested(frameBufferPtr->avframe.get());
+ Q_EMIT parent_->frameBufferRequested(frameBufferPtr.get());
- if (frameBufferPtr->avframe->data[0] == nullptr) {
+ if (frameBufferPtr->data[0] == nullptr) {
return nullptr;
}
return std::move(frameBufferPtr);
};
- void pushCallback(DRing::SinkTarget::FrameBufferPtr buf)
+ void pushCallback(DRing::FrameBuffer buf)
{
{
QMutexLocker lk(&mutex);
@@ -91,7 +90,7 @@ private:
public:
DRing::SinkTarget target;
QMutex mutex;
- DRing::SinkTarget::FrameBufferPtr frameBufferPtr;
+ DRing::FrameBuffer frameBufferPtr;
};
DirectRenderer::DirectRenderer(const QString& id, const QSize& res)
diff --git a/src/qtwrapper/videomanager_wrap.h b/src/qtwrapper/videomanager_wrap.h
index e86c63b5..64f1a24b 100644
--- a/src/qtwrapper/videomanager_wrap.h
+++ b/src/qtwrapper/videomanager_wrap.h
@@ -151,15 +151,6 @@ public Q_SLOTS: // METHODS
#endif
}
- void registerAVSinkTarget(const QString& sinkID, const DRing::AVSinkTarget& target)
- {
- Q_UNUSED(sinkID)
- Q_UNUSED(target)
-#ifdef ENABLE_VIDEO
- DRing::registerAVSinkTarget(sinkID.toStdString(), target);
-#endif
- }
-
bool getDecodingAccelerated() { return DRing::getDecodingAccelerated(); }
void setDecodingAccelerated(bool state) { DRing::setDecodingAccelerated(state); }
--
GitLab