Skip to content

RDKEMW-28182: Stop subtitle clock resync timer on READY and pipeline teardown #691

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
jaihere4u wants to merge 2 commits into
base: master
Choose a base branch
from
Open

RDKEMW-28182: Stop subtitle clock resync timer on READY and pipeline teardown #691

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ded2bb6
Stop subtitle clock resync timer on READY and pipeline teardown
Nov 3, 2026
907be5b
L1 tests: subtitle clock resync timer lifecycle on state changes
Nov 3, 2026
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
1 change: 1 addition & 0 deletions media/server/gstplayer/source/GstGenericPlayer.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -460,6 +460,7 @@ void GstGenericPlayer::termPipeline()

clearAudioFirstFrameFallbackProbe();
stopNotifyPlaybackInfoTimer();
stopSubtitleClockResyncTimer();

for (auto &elem : m_context.streamInfo)
{
Expand Down
17 changes: 11 additions & 6 deletions media/server/gstplayer/source/tasks/generic/AttachSource.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,17 +94,22 @@ void AttachSource::addSource() const
}
else if (m_attachedSource->getType() == MediaSourceType::SUBTITLE)
{
if (!m_glibWrapper->gObjectClassFindProperty(G_OBJECT_GET_CLASS(m_context.pipeline), "text-sink"))
{
RIALTO_SERVER_LOG_ERROR("Pipeline does not expose 'text-sink' property, subtitle source cannot be attached");
m_glibWrapper->gFree(capsStr);
m_gstWrapper->gstCapsUnref(caps);
return;
}

RIALTO_SERVER_LOG_MIL("Adding Subtitle appsrc with caps %s", capsStr);
appSrc = m_gstWrapper->gstElementFactoryMake("appsrc", "subsrc");
profilerInfo = "subsrc";

if (m_glibWrapper->gObjectClassFindProperty(G_OBJECT_GET_CLASS(m_context.pipeline), "text-sink"))
{
GstElement *elem = m_gstTextTrackSinkFactory->createGstTextTrackSink();
m_context.subtitleSink = elem;
GstElement *elem = m_gstTextTrackSinkFactory->createGstTextTrackSink();
m_context.subtitleSink = elem;

m_glibWrapper->gObjectSet(m_context.pipeline, "text-sink", elem, nullptr);
}
m_glibWrapper->gObjectSet(m_context.pipeline, "text-sink", elem, nullptr);
}
if (appSrc)
{
Expand Down
4 changes: 4 additions & 0 deletions media/server/gstplayer/source/tasks/generic/HandleBusMessage.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,6 +137,10 @@ void HandleBusMessage::execute() const
case GST_STATE_READY:
{
m_player.stopNotifyPlaybackInfoTimer();
if (m_player.hasSourceType(MediaSourceType::SUBTITLE))
{
m_player.stopSubtitleClockResyncTimer();
}
break;
}
}
Expand Down
97 changes: 97 additions & 0 deletions tests/unittests/media/server/gstplayer/genericPlayer/tasksTests/HandleBusMessageTest.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -977,3 +977,100 @@ TEST_F(HandleBusMessageTest, shouldHandleApplicationMessageForAudioOutputProtect
gst_message_unref(message);
g_object_unref(decryptor);
}

/**
* Test HandleBusMessage stops the subtitle clock resync timer when pipeline reaches READY
* and a subtitle source is attached.
*/
TEST_F(HandleBusMessageTest, shouldStopSubtitleClockResyncTimerOnStateChangedToReady)
{
GST_MESSAGE_SRC(&m_message) = GST_OBJECT(&m_pipeline);
GST_MESSAGE_TYPE(&m_message) = GST_MESSAGE_STATE_CHANGED;
GstState oldState = GST_STATE_PLAYING;
GstState newState = GST_STATE_READY;
GstState pending = GST_STATE_VOID_PENDING;

EXPECT_CALL(*m_gstWrapper, gstMessageParseStateChanged(&m_message, _, _, _))
.WillRepeatedly(DoAll(SetArgPointee<1>(oldState), SetArgPointee<2>(newState), SetArgPointee<3>(pending)));
EXPECT_CALL(m_gstPlayer, hasSourceType(firebolt::rialto::MediaSourceType::SUBTITLE)).WillOnce(Return(true));
EXPECT_CALL(*m_gstWrapper, gstElementStateGetName(oldState)).Times(1).WillRepeatedly(Return("Playing"));
EXPECT_CALL(*m_gstWrapper, gstElementStateGetName(newState)).Times(1).WillRepeatedly(Return("Ready"));
EXPECT_CALL(*m_gstWrapper, gstElementStateGetName(pending)).WillOnce(Return("Void"));
EXPECT_CALL(*m_gstWrapper, gstDebugBinToDotFileWithTs(GST_BIN(&m_pipeline), _, _));
EXPECT_CALL(m_gstPlayer, stopNotifyPlaybackInfoTimer());
EXPECT_CALL(m_gstPlayer, stopSubtitleClockResyncTimer());
EXPECT_CALL(*m_gstWrapper, gstMessageUnref(&m_message));
firebolt::rialto::server::tasks::generic::HandleBusMessage task{m_context, m_gstPlayer,
&m_gstPlayerClient, m_gstWrapper,
m_glibWrapper, &m_message,
m_flushWatcherMock};
task.execute();
}

/**
* Test HandleBusMessage stops the subtitle clock resync timer on PAUSED when a subtitle
* source is attached.
*/
TEST_F(HandleBusMessageTest, shouldStopSubtitleClockResyncTimerOnStateChangedToPausedWithSubtitle)
{
GST_MESSAGE_SRC(&m_message) = GST_OBJECT(&m_pipeline);
GST_MESSAGE_TYPE(&m_message) = GST_MESSAGE_STATE_CHANGED;
GstState oldState = GST_STATE_PLAYING;
GstState newState = GST_STATE_PAUSED;
GstState pending = GST_STATE_VOID_PENDING;

EXPECT_CALL(*m_gstWrapper, gstMessageParseStateChanged(&m_message, _, _, _))
.WillRepeatedly(DoAll(SetArgPointee<1>(oldState), SetArgPointee<2>(newState), SetArgPointee<3>(pending)));
EXPECT_CALL(m_gstPlayer, hasSourceType(firebolt::rialto::MediaSourceType::SUBTITLE)).WillOnce(Return(true));
EXPECT_CALL(*m_gstWrapper, gstElementStateGetName(oldState)).Times(1).WillRepeatedly(Return("Playing"));
EXPECT_CALL(*m_gstWrapper, gstElementStateGetName(newState)).Times(1).WillRepeatedly(Return("Paused"));
EXPECT_CALL(*m_gstWrapper, gstElementStateGetName(pending)).WillOnce(Return("Void"));
EXPECT_CALL(*m_gstWrapper, gstDebugBinToDotFileWithTs(GST_BIN(&m_pipeline), _, _));
EXPECT_CALL(m_gstPlayerClient, notifyPlaybackState(firebolt::rialto::PlaybackState::PAUSED));
EXPECT_CALL(m_gstPlayer, stopPositionReportingAndCheckAudioUnderflowTimer());
EXPECT_CALL(m_gstPlayer, startNotifyPlaybackInfoTimer());
EXPECT_CALL(m_gstPlayer, stopSubtitleClockResyncTimer());
EXPECT_CALL(*m_gstWrapper, gstMessageUnref(&m_message));
EXPECT_CALL(m_flushWatcherMock, isFlushOngoing()).WillRepeatedly(Return(kNoFlushOngoing));
EXPECT_CALL(m_flushWatcherMock, isAsyncFlushOngoing()).WillRepeatedly(Return(kNoFlushOngoing));
firebolt::rialto::server::tasks::generic::HandleBusMessage task{m_context, m_gstPlayer,
&m_gstPlayerClient, m_gstWrapper,
m_glibWrapper, &m_message,
m_flushWatcherMock};
task.execute();
}

/**
* Test HandleBusMessage starts the subtitle clock resync timer on PLAYING when a subtitle
* source is attached.
*/
TEST_F(HandleBusMessageTest, shouldStartSubtitleClockResyncTimerOnStateChangedToPlayingWithSubtitle)
{
m_context.isPlaying = false;
GST_MESSAGE_SRC(&m_message) = GST_OBJECT(&m_pipeline);
GST_MESSAGE_TYPE(&m_message) = GST_MESSAGE_STATE_CHANGED;
GstState oldState = GST_STATE_READY;
GstState newState = GST_STATE_PLAYING;
GstState pending = GST_STATE_VOID_PENDING;

EXPECT_CALL(*m_gstWrapper, gstMessageParseStateChanged(&m_message, _, _, _))
.WillRepeatedly(DoAll(SetArgPointee<1>(oldState), SetArgPointee<2>(newState), SetArgPointee<3>(pending)));
EXPECT_CALL(m_gstPlayer, hasSourceType(firebolt::rialto::MediaSourceType::SUBTITLE)).WillOnce(Return(true));
EXPECT_CALL(*m_gstWrapper, gstElementStateGetName(oldState)).Times(1).WillRepeatedly(Return("Ready"));
EXPECT_CALL(*m_gstWrapper, gstElementStateGetName(newState)).Times(1).WillRepeatedly(Return("Playing"));
EXPECT_CALL(*m_gstWrapper, gstElementStateGetName(pending)).WillOnce(Return("Void"));
EXPECT_CALL(*m_gstWrapper, gstDebugBinToDotFileWithTs(GST_BIN(&m_pipeline), _, _));
EXPECT_CALL(m_gstPlayer, startPositionReportingAndCheckAudioUnderflowTimer());
EXPECT_CALL(m_gstPlayer, startSubtitleClockResyncTimer());
EXPECT_CALL(m_gstPlayerClient, notifyPlaybackState(firebolt::rialto::PlaybackState::PLAYING));
EXPECT_CALL(*m_gstWrapper, gstMessageUnref(&m_message));
EXPECT_CALL(m_flushWatcherMock, isFlushOngoing()).WillRepeatedly(Return(kNoFlushOngoing));
EXPECT_CALL(m_flushWatcherMock, isAsyncFlushOngoing()).WillRepeatedly(Return(kNoFlushOngoing));
firebolt::rialto::server::tasks::generic::HandleBusMessage task{m_context, m_gstPlayer,
&m_gstPlayerClient, m_gstWrapper,
m_glibWrapper, &m_message,
m_flushWatcherMock};
task.execute();

EXPECT_TRUE(m_context.isPlaying);
}
Loading