From 3380ad18b892074c0769f8da05b8ac59625d0a66 Mon Sep 17 00:00:00 2001 From: Joao Carreira Date: Sat, 5 Feb 2022 14:01:20 +0000 Subject: [PATCH] Work on resources --- app/MainWindow.cpp | 2 +- app/ResourceHandle.cpp | 31 ++++++++++++++++++++++++------ app/ResourceHandle.h | 8 +++++--- app/catch2/CalypResourcesTests.cpp | 10 +++++----- 4 files changed, 36 insertions(+), 15 deletions(-) diff --git a/app/MainWindow.cpp b/app/MainWindow.cpp index 00d44d2..6a8fc5d 100644 --- a/app/MainWindow.cpp +++ b/app/MainWindow.cpp @@ -59,7 +59,7 @@ MainWindow::MainWindow() m_pDBusAdaptor = new DBusAppAdaptor( this ); #endif - m_appResourceHandle = std::make_unique( this ); + m_appResourceHandle = std::make_unique(); m_pcWindowHandle = new SubWindowHandle( this ); diff --git a/app/ResourceHandle.cpp b/app/ResourceHandle.cpp index 6da17ef..919313e 100644 --- a/app/ResourceHandle.cpp +++ b/app/ResourceHandle.cpp @@ -35,6 +35,12 @@ #include #include +auto get_new_resource_id() -> std::size_t +{ + static std::size_t unique_id{ 0 }; + return unique_id++; +} + ResourceWorker::~ResourceWorker() { stop(); @@ -116,13 +122,27 @@ public: auto isReady() -> bool override { return m_stream.hasWritingSlot(); } }; -ResourceHandle::ResourceHandle( QObject* parent ) : QObject{ parent } {} -ResourceHandle::~ResourceHandle() = default; +ResourceHandle::ResourceHandle() : m_thread{ std::make_unique() } +{ + moveToThread( m_thread.get() ); + m_thread->start(); +}; + +ResourceHandle::~ResourceHandle() +{ + QMetaObject::invokeMethod( this, "cleanup" ); + m_thread->wait(); +}; + +void ResourceHandle::cleanup() +{ + m_thread->quit(); +}; auto ResourceHandle::addResource() -> std::size_t { - auto resource_id = unique_id; - unique_id++; + auto resource_id = get_new_resource_id(); + ; auto newStreamResource = std::make_shared(); auto newStreamResourceWorker = std::make_unique( newStreamResource ); m_apcStreamResourcesList[resource_id] = newStreamResource; @@ -157,8 +177,7 @@ auto ResourceHandle::getResourceAsset( std::size_t id ) -> CalypStream* auto ResourceHandle::appendResource( std::unique_ptr&& resource ) -> std::size_t { - auto resource_id = unique_id; - unique_id++; + auto resource_id = get_new_resource_id(); m_apcStreamResourcesList[resource_id] = std::move( resource ); m_apcStreamResourcesWorkersList[resource_id] = std::make_unique( m_apcStreamResourcesList[resource_id] ); diff --git a/app/ResourceHandle.h b/app/ResourceHandle.h index c285aa7..33ef9d1 100644 --- a/app/ResourceHandle.h +++ b/app/ResourceHandle.h @@ -66,7 +66,7 @@ class ResourceHandle : public QObject { Q_OBJECT public: - ResourceHandle( QObject* parent ); + ResourceHandle(); ResourceHandle( ResourceHandle&& other ) noexcept = delete; ResourceHandle& operator=( ResourceHandle&& other ) noexcept = delete; ResourceHandle( const ResourceHandle& other ) = delete; @@ -92,7 +92,7 @@ public: return false; } bool result{ false }; - if( auto resource = dynamic_cast( m_apcStreamResourcesList[id].get() ) ) + if( auto* resource = dynamic_cast( m_apcStreamResourcesList[id].get() ) ) { QMutexLocker locker( m_apcStreamResourcesWorkersList[id]->mutex() ); result = action( resource ); @@ -101,11 +101,13 @@ public: return result; } + void cleanup(); + private: auto addResource() -> std::size_t; private: - std::size_t unique_id{ 0 }; + std::unique_ptr m_thread; std::map> m_apcStreamResourcesList; std::map> m_apcStreamResourcesWorkersList; }; diff --git a/app/catch2/CalypResourcesTests.cpp b/app/catch2/CalypResourcesTests.cpp index c587583..b34f52a 100644 --- a/app/catch2/CalypResourcesTests.cpp +++ b/app/catch2/CalypResourcesTests.cpp @@ -61,7 +61,7 @@ TEST_CASE( "Can load a YUV file", "VideoResource" ) REQUIRE( std::filesystem::exists( std::filesystem::path( kFilename ) ) ); - auto resourceHandle = std::make_unique( nullptr ); + auto resourceHandle = std::make_unique(); auto videoResource = std::make_unique(); @@ -106,7 +106,7 @@ TEST_CASE( "Can load a MKV file", "VideoResource" ) REQUIRE( std::filesystem::exists( std::filesystem::path( kFilename ) ) ); - auto resourceHandle = std::make_unique( nullptr ); + auto resourceHandle = std::make_unique(); auto videoResource = std::make_unique( nullptr ); @@ -137,7 +137,7 @@ TEST_CASE( "Can load a PNG file", "VideoResource" ) REQUIRE( std::filesystem::exists( std::filesystem::path( kFilename ) ) ); - auto resourceHandle = std::make_unique( nullptr ); + auto resourceHandle = std::make_unique(); auto videoResource = std::make_unique( nullptr ); @@ -171,7 +171,7 @@ TEST_CASE( "Resource handle can store a video resource", "VideoResource" ) REQUIRE( std::filesystem::exists( std::filesystem::path( kFilename ) ) ); - auto resourceHandle = std::make_unique( nullptr ); + auto resourceHandle = std::make_unique(); CalypFileInfo streamInfo{ .m_cFilename = QString::fromStdString( kFilename ), .m_uiWidth = kWidth, @@ -223,7 +223,7 @@ TEST_CASE( "Resource handle can play a video resource", "VideoResource" ) REQUIRE( std::filesystem::exists( std::filesystem::path( kFilename ) ) ); - auto resourceHandle = std::make_unique( nullptr ); + auto resourceHandle = std::make_unique(); CalypFileInfo streamInfo{ .m_cFilename = QString::fromStdString( kFilename ), .m_uiWidth = kWidth,