Skip to content
Snippets Groups Projects
Verified Commit 52b1ad63 authored by Silas Della Contrada's avatar Silas Della Contrada
Browse files

Fixed compatability with Qt5

parent afdccb5a
No related branches found
No related tags found
1 merge request!17Draft: Resolve "Migrate frame passing to libProcessingGraph"
......@@ -37,8 +37,8 @@ namespace AVQt {
bool registerDecoder(const api::VideoDecoderInfo &info);
bool unregisterDecoder(const QString &name);
bool unregisterDecoder(const api::VideoDecoderInfo &info);
void unregisterDecoder(const QString &name);
void unregisterDecoder(const api::VideoDecoderInfo &info);
[[nodiscard]] std::shared_ptr<api::IVideoDecoderImpl> create(const common::PixelFormat &inputFormat, AVCodecID codec, const QStringList &priority = {});
......
......@@ -40,8 +40,8 @@ namespace AVQt {
bool registerEncoder(const api::VideoEncoderInfo &info);
bool unregisterEncoder(const QString &name);
bool unregisterEncoder(const api::VideoEncoderInfo &info);
void unregisterEncoder(const QString &name);
void unregisterEncoder(const api::VideoEncoderInfo &info);
[[nodiscard]] std::shared_ptr<api::IVideoEncoderImpl> create(const common::PixelFormat &inputFormat, AVCodecID codec, const EncodeParameters &encodeParams, const QStringList &priority = {});
......
......@@ -26,6 +26,7 @@
#include <QDebug>
#include <QProcessEnvironment>
#include <QtConcurrent>
namespace AVQt {
VideoDecoderFactory &VideoDecoderFactory::getInstance() {
......@@ -44,12 +45,12 @@ namespace AVQt {
return true;
}
bool VideoDecoderFactory::unregisterDecoder(const QString &name) {
return m_decoders.removeIf([&](const api::VideoDecoderInfo &i) { return i.name == name; });
void VideoDecoderFactory::unregisterDecoder(const QString &name) {
QtConcurrent::blockingFilter(m_decoders, [&](const api::VideoDecoderInfo &i) { return i.name != name; });
}
bool VideoDecoderFactory::unregisterDecoder(const api::VideoDecoderInfo &info) {
return m_decoders.removeIf([&](const api::VideoDecoderInfo &i) { return i.name == info.name; });
void VideoDecoderFactory::unregisterDecoder(const api::VideoDecoderInfo &info) {
QtConcurrent::blockingFilter(m_decoders, [&](const api::VideoDecoderInfo &i) { return i.name != info.name; });
}
std::shared_ptr<api::IVideoDecoderImpl> VideoDecoderFactory::create(const common::PixelFormat &inputFormat, AVCodecID codec, const QStringList &priority) {
......
......@@ -25,6 +25,7 @@
#include "VAAPIEncoderImpl.hpp"
#include <QtDebug>
#include <QtConcurrent>
namespace AVQt {
VideoEncoderFactory &VideoEncoderFactory::getInstance() {
......@@ -43,12 +44,12 @@ namespace AVQt {
return true;
}
bool VideoEncoderFactory::unregisterEncoder(const QString &name) {
return m_encoders.removeIf([&](const api::VideoEncoderInfo &i) { return i.name == name; });
void VideoEncoderFactory::unregisterEncoder(const QString &name) {
QtConcurrent::blockingFilter(m_encoders, [&](const api::VideoEncoderInfo &i) { return i.name != name; });
}
bool VideoEncoderFactory::unregisterEncoder(const api::VideoEncoderInfo &info) {
return m_encoders.removeIf([&](const api::VideoEncoderInfo &i) { return i.name == info.name; });
void VideoEncoderFactory::unregisterEncoder(const api::VideoEncoderInfo &info) {
QtConcurrent::blockingFilter(m_encoders, [&](const api::VideoEncoderInfo &i) { return i.name != info.name; });
}
std::shared_ptr<api::IVideoEncoderImpl> VideoEncoderFactory::create(const common::PixelFormat &inputFormat, AVCodecID codec, const EncodeParameters &encodeParams, const QStringList &priority) {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment