Skip to content

Added deepelement signal disconnect #502

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
balasaraswathy-n wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Added deepelement signal disconnect #502

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 16 additions & 0 deletions media/server/gstplayer/include/GstGenericPlayer.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@
#include "tasks/IPlayerTask.h"
#include <IMediaPipeline.h>
#include <atomic>
#include <mutex>
#include <memory>
#include <string>
#include <utility>
Expand Down Expand Up @@ -441,6 +442,21 @@ class GstGenericPlayer : public IGstGenericPlayer, public IGstGenericPlayerPriva
*/
std::unique_ptr<IWorkerThread> m_workerThread;

/**
* @brief Teardown fence for async GStreamer callbacks.
*/
std::atomic<bool> m_isShuttingDown{false};

/**
* @brief Protects worker thread access from callback and teardown threads.
*/
mutable std::mutex m_workerThreadMutex;

/**
* @brief deep-element-added signal handler id.
*/
gulong m_deepElementAddedHandlerId{0};

/**
* @brief Thread for handling gst bus callbacks
*/
Expand Down
35 changes: 33 additions & 2 deletions media/server/gstplayer/source/GstGenericPlayer.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -221,6 +221,17 @@ GstGenericPlayer::GstGenericPlayer(
GstGenericPlayer::~GstGenericPlayer()
{
RIALTO_SERVER_LOG_DEBUG("GstGenericPlayer is destructed.");

// Block late callbacks first.
m_isShuttingDown.store(true, std::memory_order_release);

// Disconnect deep-element callback before worker teardown.
if (m_context.pipeline && m_deepElementAddedHandlerId != 0)
{
g_signal_handler_disconnect(m_context.pipeline, m_deepElementAddedHandlerId);
m_deepElementAddedHandlerId = 0;
}
Comment on lines +228 to +233

m_gstDispatcherThread.reset();

resetWorkerThread();
Expand All @@ -244,8 +255,9 @@ void GstGenericPlayer::initMsePipeline()
// Set callbacks
m_glibWrapper->gSignalConnect(m_context.pipeline, "source-setup", G_CALLBACK(&GstGenericPlayer::setupSource), this);
m_glibWrapper->gSignalConnect(m_context.pipeline, "element-setup", G_CALLBACK(&GstGenericPlayer::setupElement), this);
m_glibWrapper->gSignalConnect(m_context.pipeline, "deep-element-added",
G_CALLBACK(&GstGenericPlayer::deepElementAdded), this);
m_deepElementAddedHandlerId =
m_glibWrapper->gSignalConnect(m_context.pipeline, "deep-element-added",
G_CALLBACK(&GstGenericPlayer::deepElementAdded), this);

// Set uri
m_glibWrapper->gObjectSet(m_context.pipeline, "uri", "rialto://", nullptr);
Expand Down Expand Up @@ -273,6 +285,13 @@ void GstGenericPlayer::initMsePipeline()

void GstGenericPlayer::resetWorkerThread()
{
std::lock_guard<std::mutex> lock{m_workerThreadMutex};

if (!m_workerThread)
{
return;
}

// Shutdown task thread
m_workerThread->enqueueTask(m_taskFactory->createShutdown(*this));
m_workerThread->join();
Expand Down Expand Up @@ -365,7 +384,19 @@ void GstGenericPlayer::setupElement(GstElement *pipeline, GstElement *element, G

void GstGenericPlayer::deepElementAdded(GstBin *pipeline, GstBin *bin, GstElement *element, GstGenericPlayer *self)
{
if (!self)
{
return;
}

if (self->m_isShuttingDown.load(std::memory_order_acquire))
{
return;
}

RIALTO_SERVER_LOG_DEBUG("Deep element %s added to the pipeline", GST_ELEMENT_NAME(element));

std::lock_guard<std::mutex> lock{self->m_workerThreadMutex};
if (self->m_workerThread)
{
self->m_workerThread->enqueueTask(
Expand Down
Loading