VPLAY-11062 Bring back with L2 & L3 fixes

VPLAY-11062  Bring back with L2 & L3 fixes

This reverts commit 546df9a.

Reason for change: During detach(), set the EventManager state to
RELEASED to disable further event processing. When reusing a previously
detached player, reset the EventManager state to IDLE to re-enable
event handling.
Test Procedure: Refer Jira
Risks: Low

Signed-off-by: psiva01 <[email protected]>

Author: psiva01

main_aamp.cpp

@@ -622,6 +622,10 @@ void PlayerInstanceAAMP::SetRateInternal(float rate,int overshootcorrection)
 
 		if (aamp->mpStreamAbstractionAAMP && !(aamp->mbUsingExternalPlayer))
 		{
+			if (aamp->mbDetached)
+			{
+				aamp->enableEventProcessing();
+			}
 			if ( AAMP_SLOWMOTION_RATE != rate && !aamp->mIsIframeTrackPresent && rate != AAMP_NORMAL_PLAY_RATE && rate != 0 && aamp->mMediaFormat != eMEDIAFORMAT_PROGRESSIVE)
 			{
 				AAMPLOG_WARN("Ignoring trickplay. No iframe tracks in stream");
@@ -1093,6 +1097,11 @@ void PlayerInstanceAAMP::SeekInternal(double secondsRelativeToTuneTime, bool kee
 		AAMPPlayerState state = GetState();
 		aamp->StopPausePositionMonitoring("Seek() called");
 
+		if (aamp->mbDetached)
+		{
+			aamp->enableEventProcessing();
+		}
+
 		if ((aamp->mMediaFormat == eMEDIAFORMAT_HLS || aamp->mMediaFormat == eMEDIAFORMAT_HLS_MP4) && (eSTATE_INITIALIZING == state)  && aamp->mpStreamAbstractionAAMP)
 		{
 			AAMPLOG_WARN("aamp_Seek(%f) at the middle of tune, no fragments downloaded yet.state(%d), keep paused(%d)", secondsRelativeToTuneTime, state, keepPaused);

priv_aamp.cpp

@@ -6714,6 +6714,24 @@ bool PrivateInstanceAAMP::IsPlayEnabled()
 	return mbPlayEnabled;
 }
 
+/**
+ * @brief Enable event processing
+ */
+void PrivateInstanceAAMP::enableEventProcessing()
+{
+	// Reset Event Manager State to IDLE to resume event processing
+	mEventManager->SetPlayerState(eSTATE_IDLE);
+}
+
+/**
+ * @brief Disable event processing
+ */
+void PrivateInstanceAAMP::disableEventProcessing()
+{
+	// Set Event Manager State to RELEASED to avoid further event processing
+	mEventManager->SetPlayerState(eSTATE_RELEASED);
+}
+
 /**
  * @brief Soft stop the player instance.
  *
@@ -6752,6 +6770,7 @@ void PrivateInstanceAAMP::detach()
 		mbDetached=true;
 		mPlayerPreBuffered  = false;
 		mTelemetryInterval = 0;
+		disableEventProcessing();
 		//EnableDownloads();// enable downloads
 	}
 	else

priv_aamp.h

@@ -3043,6 +3043,18 @@ class PrivateInstanceAAMP : public DrmCallbacks, public std::enable_shared_from_
 	 */
 	bool IsPlayEnabled();
 
+	/**
+	 *   @fn enableEventProcessing
+	 *
+	 *   @return void
+	 */
+	void enableEventProcessing();
+	/**
+	 *   @fn disableEventProcessing
+	 *
+	 *   @return void
+	 */
+	void disableEventProcessing();
 	/**
 	 * @fn detach
 	 *

test/utests/drm/mocks/aampMocks.cpp

@@ -243,6 +243,14 @@ void PrivateInstanceAAMP::Tune(const char *mainManifestUrl, bool autoPlay, const
 	mFogTSBEnabled = strcasestr(mainManifestUrl, "tsb?");
 }
 
+void PrivateInstanceAAMP::enableEventProcessing()
+{
+}
+
+void PrivateInstanceAAMP::disableEventProcessing()
+{
+}
+
 void PrivateInstanceAAMP::detach()
 {
 }

test/utests/fakes/FakePrivateInstanceAAMP.cpp

@@ -255,6 +255,14 @@ void PrivateInstanceAAMP::Tune(const char *mainManifestUrl,
 	mFogTSBEnabled = strcasestr(mainManifestUrl, "tsb?");
 }
 
+void PrivateInstanceAAMP::enableEventProcessing()
+{
+}
+
+void PrivateInstanceAAMP::disableEventProcessing()
+{
+}
+
 void PrivateInstanceAAMP::detach()
 {
 }