Send segment twice to be sure, that it will be replaced by GstAppSrc (rdkcentral#365)

Summary: Send segment twice to be sure, that it will be replaced by
GstAppSrc
Type: Fix
Test Plan: Fullstack, UT
Jira: RDKAAMP-3975

Author: skywojciechowskim

media/server/gstplayer/include/GenericPlayerContext.h

@@ -230,6 +230,13 @@ struct GenericPlayerContext
      */
     std::map<GstElement *, std::vector<SegmentData>> initialPositions;
 
+    /**
+     * @brief Currently set position of a source. Used to check, if additional segment should be pushed.
+     *
+     * Attribute can be used only in worker thread
+     */
+    std::map<GstElement *, SegmentData> currentPosition;
+
     /**
      * @brief The mutex, which protects properties, which are read/written by main/worker thread.
      *        This mutex should be removed in future, when we find out better solution for

media/server/gstplayer/include/GstGenericPlayer.h

@@ -316,6 +316,15 @@ class GstGenericPlayer : public IGstGenericPlayer, public IGstGenericPlayerPriva
      */
     void setTextTrackPositionIfRequired(GstElement *source);
 
+    /**
+     * @brief GstAppSrc does not replace segment, if it's the same as previous one.
+     *        It causes problems with position reporing in amlogic devices, so we need to push
+     *        two segments with different reset time value.
+     *
+     * @param[in] source : the media source
+     */
+    void pushAdditionalSegmentIfRequired(GstElement *source);
+
 private:
     /**
      * @brief The player context.

media/server/gstplayer/source/GstGenericPlayer.cpp

@@ -41,6 +41,12 @@ namespace
  *        whenever the session moves to another playback state.
  */
 constexpr std::chrono::milliseconds kPositionReportTimerMs{250};
+
+bool operator==(const firebolt::rialto::server::SegmentData &lhs, const firebolt::rialto::server::SegmentData &rhs)
+{
+    return (lhs.position == rhs.position) && (lhs.resetTime == rhs.resetTime) && (lhs.appliedRate == rhs.appliedRate) &&
+           (lhs.stopPosition == rhs.stopPosition);
+}
 } // namespace
 
 namespace firebolt::rialto::server
@@ -926,6 +932,11 @@ void GstGenericPlayer::pushSampleIfRequired(GstElement *source, const std::strin
         // Sending initial sample not needed
         return;
     }
+    // GstAppSrc does not replace segment, if it's the same as previous one.
+    // It causes problems with position reporing in amlogic devices, so we need to push
+    // two segments with different reset time value.
+    pushAdditionalSegmentIfRequired(source);
+
     for (const auto &[position, resetTime, appliedRate, stopPosition] : initialPosition->second)
     {
         GstSeekFlags seekFlag = resetTime ? GST_SEEK_FLAG_FLUSH : GST_SEEK_FLAG_NONE;
@@ -957,10 +968,33 @@ void GstGenericPlayer::pushSampleIfRequired(GstElement *source, const std::strin
 
         m_gstWrapper->gstSegmentFree(segment);
     }
+    m_context.currentPosition[source] = initialPosition->second.back();
     m_context.initialPositions.erase(initialPosition);
     return;
 }
 
+void GstGenericPlayer::pushAdditionalSegmentIfRequired(GstElement *source)
+{
+    auto currentPosition = m_context.currentPosition.find(source);
+    if (m_context.currentPosition.end() == currentPosition)
+    {
+        return;
+    }
+    auto initialPosition = m_context.initialPositions.find(source);
+    if (m_context.initialPositions.end() == initialPosition)
+    {
+        return;
+    }
+    if (initialPosition->second.size() == 1 && initialPosition->second.back().resetTime &&
+        currentPosition->second == initialPosition->second.back())
+    {
+        RIALTO_SERVER_LOG_INFO("Adding additional segment with reset_time = false");
+        SegmentData additionalSegment = initialPosition->second.back();
+        additionalSegment.resetTime = false;
+        initialPosition->second.push_back(additionalSegment);
+    }
+}
+
 void GstGenericPlayer::setTextTrackPositionIfRequired(GstElement *source)
 {
     auto initialPosition = m_context.initialPositions.find(source);

tests/unittests/media/server/gstplayer/genericPlayer/GstGenericPlayerPrivateTest.cpp

@@ -904,6 +904,53 @@ TEST_F(GstGenericPlayerPrivateTest, shouldAttachAudioSample)
     EXPECT_EQ(segment.applied_rate, kAppliedRate);
 }
 
+TEST_F(GstGenericPlayerPrivateTest, shouldAttachAdditionalAudioSample)
+{
+    constexpr std::int64_t kPosition{124};
+    constexpr double kRate{1.0};
+    constexpr bool kResetTime{true};
+    constexpr double kAppliedRate{1.0};
+    constexpr uint64_t kStopPosition{3453425};
+    GstBuffer buffer{};
+    GstAppSrc audioSrc{};
+    GstAppSrc videoSrc{};
+    GstSegment segment{};
+    GstSample *sample{nullptr};
+    GstCaps caps{};
+    modifyContext(
+        [&](GenericPlayerContext &context)
+        {
+            context.streamInfo[firebolt::rialto::MediaSourceType::AUDIO].buffers.emplace_back(&buffer);
+            context.streamInfo[firebolt::rialto::MediaSourceType::AUDIO].isDataNeeded = true;
+            context.playbackRate = kRate;
+            context.streamInfo[firebolt::rialto::MediaSourceType::AUDIO].appSrc = GST_ELEMENT(&audioSrc);
+            context.initialPositions[GST_ELEMENT(&audioSrc)].emplace_back(
+                SegmentData{kPosition, kResetTime, kAppliedRate, kStopPosition});
+            context.streamInfo[firebolt::rialto::MediaSourceType::VIDEO].appSrc = GST_ELEMENT(&videoSrc);
+            context.currentPosition[GST_ELEMENT(&audioSrc)] =
+                SegmentData{kPosition, kResetTime, kAppliedRate, kStopPosition};
+        });
+    EXPECT_CALL(*m_gstWrapperMock, gstAppSrcGetCaps(&audioSrc)).WillRepeatedly(Return(&caps));
+    EXPECT_CALL(*m_gstWrapperMock, gstSegmentNew()).WillRepeatedly(Return(&segment));
+    EXPECT_CALL(*m_gstWrapperMock, gstSegmentInit(&segment, GST_FORMAT_TIME)).Times(2);
+    EXPECT_CALL(*m_gstWrapperMock,
+                gstSegmentDoSeek(&segment, kRate, GST_FORMAT_TIME, GST_SEEK_FLAG_FLUSH, GST_SEEK_TYPE_SET, kPosition,
+                                 GST_SEEK_TYPE_SET, kStopPosition, nullptr))
+        .WillOnce(Return(true));
+    EXPECT_CALL(*m_gstWrapperMock,
+                gstSegmentDoSeek(&segment, kRate, GST_FORMAT_TIME, GST_SEEK_FLAG_NONE, GST_SEEK_TYPE_SET, kPosition,
+                                 GST_SEEK_TYPE_SET, kStopPosition, nullptr))
+        .WillOnce(Return(true));
+    EXPECT_CALL(*m_gstWrapperMock, gstSampleNew(nullptr, &caps, &segment, nullptr)).WillRepeatedly(Return(sample));
+    EXPECT_CALL(*m_gstWrapperMock, gstAppSrcPushSample(&audioSrc, sample)).Times(2);
+    EXPECT_CALL(*m_gstWrapperMock, gstSampleUnref(sample)).Times(2);
+    EXPECT_CALL(*m_gstWrapperMock, gstSegmentFree(&segment)).Times(2);
+    EXPECT_CALL(*m_gstWrapperMock, gstCapsUnref(&caps)).Times(2);
+    EXPECT_CALL(*m_gstWrapperMock, gstAppSrcPushBuffer(_, &buffer));
+    m_sut->attachData(firebolt::rialto::MediaSourceType::AUDIO);
+    EXPECT_EQ(segment.applied_rate, kAppliedRate);
+}
+
 TEST_F(GstGenericPlayerPrivateTest, undefinedStopPositionInSetSourcePosition)
 {
     constexpr std::int64_t kPosition{124};