rdkcentral · psiva01 · Oct 11, 2025 · Oct 13, 2025 · Oct 13, 2025 · Oct 13, 2025
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
@@ -2,4 +2,4 @@
 # the repo. Unless a later match takes precedence,
 # @global-owner1 and @global-owner2 will be requested for
 # review when someone opens a pull request.
-*       @rdkcentral/rdke_aamp_maintainer  @rdkcentral/rdke_aamp_admin
+*       @rdkcentral/aamp-maintainers
diff --git a/AAMP-UVE-API.md b/AAMP-UVE-API.md
@@ -86,11 +86,11 @@ Configuration options are passed to AAMP using the UVE initConfig method. This a
 | cdvrLiveOffset | Number | 30 | Live offset time in seconds for cdvr, aamp starts live playback this much time before the live point for inprogress cdvr. |
 | customHeader | String | - | Custom header data to be appended to curl request. |
 | contentProtectionDataUpdateTimeout | Number | 5000ms | Timeout for Content Protection Data Update on Dynamic Key Rotation. Player waits for [setContentProtectionDataConfig]()#setcontentprotectiondataconfig_json-string)  API update within the timeout interval .On timeout use last configured values. Also refer API [setContentProtectionDataUpdateTimeout](#setcontentprotectiondataupdatetimeout_timeout)  |
-| disableLowLatencyABR | Boolean | False | Configuration to enable/disable Low Latency ABR. |
+| disableLowLatencyABR | Boolean | True | Enables Low Latency ABR handling. |
 | disablePlaylistIndexEvent | Boolean | True | Configuration to enable/disable generation of playlist indexed event by AAMP on tune/trickplay/seek. |
 | downloadBufferChunks | Number | 20 | Low Latency Fragment chunk cache length. |
-| enableLowLatencyCorrection | Boolean | False | Configuration to enable/disable Low Latency Correction. |
-| enableLowLatencyDash | Boolean | True | Configuration to enable/disable Low Latency Dash. |
+| enableLowLatencyCorrection | Boolean | True | If disabled, latency may gradually drift from the live edge, especially under poor network conditions. |
+| enableLowLatencyDash | Boolean | True | Enables Low Latency DASH playback mode, allowing media chunks to be injected earlier (even before full fragment download is complete), allowing player to start and stay closer to live edge. |
 | enableSubscribedTags | Boolean | True | Configuration to enable/disable subscribed tags. |
 | enableVideoEndEvent | Boolean | True | Configuration to enable/disable Video End event generation. |
 | enableVideoRectangle | Boolean | True | Configuration to enable/disable setting of rectangle property for sink element. |
@@ -100,15 +100,23 @@ Configuration options are passed to AAMP using the UVE initConfig method. This a
 | iframeDefaultBitrate | Number | 0 | Default bitrate for iframe track selection for non-4K assets. |
 | iframeDefaultBitrate4K | Number | 0 | Default bitrate for iframe track selection for 4K assets. |
 | initRampdownLimit | Number | 0 | Maximum number of rampdown/retries for initial playlist retrieval at tune/seek time. |
-| latencyMonitorDelay | Number | 9 | Low Latency Monitor delay. |
-| latencyMonitorInterval | Number | 6 | Low Latency Monitor Interval. |
+| latencyMonitorDelay | Number | 9 | Delay in seconds before starting latency monitoring after tune completion. |
+| latencyMonitorInterval | Number | 1 | Time between latency checks in seconds. Changing the value will only affect monitoring and corrective actions (how frequently latency is sampled and rate corrections are attempted). |
 | licenseAnonymousRequest | Boolean | False | Configuration to enable/disable acquiring of license without token. |
 | licenseKeyAcquireWaitTime | Number | 5000 | License key acquire wait time in msecs. |
 | licenseRetryWaitTime | Number | 500 | License retry wait interval in msecs. |
 | licenseServerUrl | String | - | URL to be used for license requests for encrypted(PR/WV) assets. |
 | linearTrickPlayFps | Number | 8 | Specify the framerate for Linear trickplay. |
+| lowLatencyMinValue | Number | 3 | Minimum acceptable latency in seconds. Avoids getting too close to live edge, preventing buffering. If latency drops below this, playback slows down to increase delay and avoid buffer underrun. |
+| lowLatencyTargetValue | Number | 6 | Target latency for playback in seconds. If reduced, playback will be closer to live edge, but with increased chance of buffering. |
+| lowLatencyMaxValue | Number | 9 | Maximum acceptable latency in seconds. Ensures playback does not fall too far behind live stream. If latency exceeds this, playback speeds up to catch up with live edge. |
+| lowLatencyMinBuffer | Float | 2 | It is used by low latency buffering logic to set the minimum buffer level(in seconds) the player should maintain. |
+| lowLatencyTargetBuffer | Float | 4 | Target buffer size in seconds for low latency mode. Balances latency and stability by keeping a healthy buffer. |
 | maxABRBufferRampup | Number | 15 | Maximum ABR Buffer for Rampup in secs. |
+| maxLatencyCorrectionPlaybackRate | Float | 1.03 | Maximum playback speed for latency correction. When the player detects that it’s too far from the live edge (or fall behind target latency), it can speeds up playback slightly to catch up with the live edge without noticeable fast-forward effect. |
 | minABRBufferRampdown | Number | 10 | Minimum ABR Buffer for Rampdown in secs. |
+| minLatencyCorrectionPlaybackRate | Float | 0.97 | Minimum playback speed for latency correction. When the player detects that it’s too close to the live edge (or ahead of target latency), it can slow down playback slightly to increase latency without causing noticeable slow motion. |
+| normalLatencyCorrectionPlaybackRate | Float | 1.0 | Normal playback speed when latency is within acceptable range. Maintains standard playback when no correction is needed. |
 | playreadyOutputProtection | Boolean | False | Configuration to enable/disable HDCP output protection for DASH-PlayReady playback. |
 | preferredDrm | Number | 2 | Preferred DRM for playback. Refer Preferred DRM table below for available values. 0 -No DRM  , 1 - Widevine, 2 - PlayReady ( Default), 3 - Consec, 4 - AdobeAccess, 5 - Vanilla AES, 6 - ClearKey |
 | ceaFormat | Number | -1 | Preferred CEA option for CC. Default stream based. 0 - CEA 608, 1 - CEA 708  |
@@ -188,7 +196,7 @@ Configuration options are passed to AAMP using the UVE initConfig method. This a
 | langCodePreference | Number | 0 | Set the preferred format for language codes in other events/APIs (version 2.6) NO_LANGCODE_PREFERENCE = 0, 3_CHAR_BIBLIOGRAPHIC_LANGCODE = 1, 3_CHAR_TERMINOLOGY_LANGCODE = 2, 2_CHAR_LANGCODE = 3 |
 | preferredSubtitleLanguage | String | en | ISO-639 language code used with VTT OOB captions |
 | nativeCCRendering | Boolean | False | Use native ClosedCaption support in AAMP (version 2.6) |
-| enableLiveLatencyCorrection | Boolean | False | Optional field to enable live latency correction for non-Low Latency streams |
+| enableLiveLatencyCorrection | Boolean | False | Optional field to enable correction of playback delay during regular live streaming ( non LLD). Keeps the video close to real-time by adjusting playback speed if it drifts behind. |
 | liveOffsetDriftCorrectionInterval | Number | 1 | Optional field to set the allowed delta from live offset configured |
 | sendLicenseResponseHeaders | Boolean | False | Optional field to enable headers in DRM metadata event after license request |
 | enableCMCD | Boolean | True | Optional field to enable/disable CMCD Metrics reporting from player |
@@ -208,8 +216,11 @@ Configuration options are passed to AAMP using the UVE initConfig method. This a
 | showDiagnosticsOverlay | Number | 0 (None) | Configures the diagnostics overlay: 0 (None), 1 (Minimal), 2 (Extended). Controls the visibility and level of detail for diagnostics displayed during playback. Refer [Diagnostics Overlay Configuration](#diagnostics-overlay-configuration)
 | localTSBEnabled | Boolean | False | Enable use of time shift buffer (TSB) for live playback, leveraging local storage in AAMP.  This is a development-only configuration, not to be used by apps. |
 | tsbLength | Number | 3600 (1 hour) or 1500 (25 min) | Max duration (seconds) of Local TSB to build up before culling  (not recommended for apps to change). Refer to [TSB Feature](#tsb-feature) for complete details. |
-| monitorAV | Boolean | False | Enable background monitoring of audio/video positions to infer video freeze, audio drop, or av sync issues |
-| monitorAVReportingInterval | Number | 1000 | Timeout in milliseconds for reporting MonitorAV events |
+| monitorAV | Boolean | False | Enable background monitoring of audio/video positions to infer video freeze, audio drop, and av sync issues |
+| monitorAVReportingInterval | Number | 1000 | sampling delay (ms) between reported MonitorAV events |
+| monitorAVSyncThresholdPositive | Number | 100 | threshold (ms) for leading (early) audio to be considered worth reporting |
+| monitorAVSyncThresholdNegative | Number | 100 | threshold (ms) for lagging (late) audio to be considered worth reporting |
+| monitorAVJumpThreshold  | Number | 100 | threshold (ms) for aligned audio,video positions advancing together to be considered worth reporting |
 
 Example:
 ```js
@@ -2247,10 +2258,17 @@ Example:
 ### watermarkSessionUpdate
 
 **Event Payload:**
-- sessionId: string Refer to [load](#load-uri_autoplay_tuneparams) API for details
+- sessionId: string Refer to [load](#load-uri_autoplay_tuneparams) API for details.
 - sessionHandle:string
-- status:string
-- system:string
+- system:string Identifies the content watermarking protection provider, i.e. "fmts_asid" (FriendMTS).  Note: this is only valid when using SecManager.
+- status:string Additional information regarding security system state.  See below table:
+
+| Code      | Name         |   Definition
+| --------- |------------- |--------------
+| 1         | GRANTED      | No security issues
+| 2         | NOT_REQUIRED | Watermark session granted
+| 3         | DENIED       | Watermark session not required
+| 4 / 20001 | FAILED       | Watermark session denied
 
 **Description:**
 - Watermarking session information

diff --git a/AampCMCDCollector.cpp b/AampCMCDCollector.cpp
@@ -74,7 +74,7 @@ void AampCMCDCollector::Initialize(bool enableDisable , std::string &traceId)
 			traceId = sid;
 		}
 		mTraceId = traceId;
-		AAMPLOG_WARN("CMCD Enabled. TraceId:%s", mTraceId.c_str());
+		AAMPLOG_MIL("CMCD Enabled. TraceId:%s", mTraceId.c_str());
 		// Create metric handlers for each stream type
 		// Add it to table
 		CMCDHeaders *pCMCDMetrics = NULL;

diff --git a/AampConfig.cpp b/AampConfig.cpp
@@ -299,7 +299,7 @@ static const ConfigLookupEntryBool mConfigLookupTableBool[AAMPCONFIG_BOOL_COUNT]
 	{true,"dashParallelFragDownload",eAAMPConfig_DashParallelFragDownload,false},
 	{false,"persistBitrateOverSeek",eAAMPConfig_PersistentBitRateOverSeek,true},
 	{true,"setLicenseCaching",eAAMPConfig_SetLicenseCaching,false},
-	{true,"fragmp4LicensePrefetch",eAAMPConfig_Fragmp4PrefetchLicense,false},
+	{true,"fragmp4LicensePrefetch",eAAMPConfig_FragMp4PrefetchLicense,false},
 	{true,"useNewABR",eAAMPConfig_ABRBufferCheckEnabled,false},
 	{false,"useNewAdBreaker",eAAMPConfig_NewDiscontinuity,false},
 	{false,"bulkTimedMetadata",eAAMPConfig_BulkTimedMetaReport,false},
@@ -854,8 +854,6 @@ void AampConfig::ApplyDeviceCapabilities()
 	bool IsWifiCurlHeader = pInstance->IsConfigWifiCurlHeader();	
 
 	configValueBool[eAAMPConfig_UseAppSrcForProgressivePlayback].value = SocUtils::UseAppSrcForProgressivePlayback();
-	configValueBool[eAAMPConfig_DisableAC4].value = SocUtils::IsSupportedAC4();
-	configValueBool[eAAMPConfig_DisableAC3].value = SocUtils::IsSupportedAC3();
 	configValueBool[eAAMPConfig_UseWesterosSink].value = SocUtils::UseWesterosSink();
 	configValueBool[eAAMPConfig_SyncAudioFragments].value = SocUtils::IsAudioFragmentSyncSupported();
 	SetConfigValue(AAMP_DEFAULT_SETTING, eAAMPConfig_WifiCurlHeader, IsWifiCurlHeader);

diff --git a/AampConfig.h b/AampConfig.h
@@ -146,7 +146,7 @@ typedef enum
 	eAAMPConfig_DashParallelFragDownload,					/**< Enable dash fragment parallel download*/
 	eAAMPConfig_PersistentBitRateOverSeek,					/**< ABR profile persistence during Seek/Trickplay/Audio switching*/
 	eAAMPConfig_SetLicenseCaching,						/**< License caching*/
-	eAAMPConfig_Fragmp4PrefetchLicense,					/*** Enable fragment mp4 license prefetching**/
+	eAAMPConfig_FragMp4PrefetchLicense,					/*** Enable fragment mp4 license prefetching**/
 	eAAMPConfig_ABRBufferCheckEnabled,					/**< Flag to enable/disable buffer based ABR handling*/
 	eAAMPConfig_NewDiscontinuity,						/**< Flag to enable/disable new discontinuity handling with PDT*/
 	eAAMPConfig_BulkTimedMetaReport, 					/**< Enabled Bulk event reporting for TimedMetadata*/

diff --git a/AampDRMLicPreFetcher.cpp b/AampDRMLicPreFetcher.cpp
@@ -176,13 +176,13 @@ bool AampLicensePreFetcher::QueueContentProtection(DrmHelperPtr drmHelper, std::
 				mFetchQueue.push_back(std::move(fetchObject));
 				if (!mPreFetchThreadStarted)
 				{
-					AAMPLOG_WARN("Starting mPreFetchThread");
+					AAMPLOG_MIL("Starting mPreFetchThread");
 					mPreFetchThread = std::thread(&AampLicensePreFetcher::PreFetchThread, this);
 					mPreFetchThreadStarted = true;
 				}
 				else
 				{
-					AAMPLOG_WARN("Notify mPreFetchThread");
+					AAMPLOG_MIL("Notify mPreFetchThread");
 					mQCond.notify_one();
 				}
 			}

diff --git a/AampDefine.h b/AampDefine.h
@@ -30,7 +30,7 @@
 #define AAMP_CFG_PATH "/opt/aamp.cfg"
 #define AAMP_JSON_PATH "/opt/aampcfg.json"
 
-#define AAMP_VERSION "7.08"
+#define AAMP_VERSION "7.10"
 #define AAMP_TUNETIME_VERSION 7
 
 //Stringification of Macro : use two levels of macros

diff --git a/AampEvent.h b/AampEvent.h
@@ -153,7 +153,10 @@ typedef enum
 	AAMP_TUNE_INVALID_MANIFEST_FAILURE,		   /**< Manifest is invalid */
 	AAMP_TUNE_FAILED_PTS_ERROR,			   /**< Playback failed due to PTS error */
 	AAMP_TUNE_MP4_INIT_FRAGMENT_MISSING,		   /**< Init fragments missing in playlist */
-	AAMP_TUNE_FAILURE_UNKNOWN			   /**<  Unknown failure */
+	AAMP_TUNE_DNS_RESOLVE_TIMEOUT,
+	AAMP_TUNE_CURL_CONNECTION_TIMEOUT,
+	AAMP_TUNE_DATA_TRANSFER_TIMEOUT,
+	AAMP_TUNE_FAILURE_UNKNOWN		   /**<  Unknown failure */
 } AAMPTuneFailure;
 
 /**

diff --git a/AampEventManager.cpp b/AampEventManager.cpp
@@ -85,7 +85,7 @@ void AampEventManager::FlushPendingEvents()
 	std::lock_guard<std::mutex> guard(mMutexVar);
 	while(!mEventWorkerDataQue.empty())
 	{
-		// Remove each AampEventPtr from the queue , not deleting the Shard_ptr
+		// Remove each AampEventPtr from the queue, not deleting the shared_ptr
 		mEventWorkerDataQue.pop();
 	}
 
@@ -121,7 +121,10 @@ void AampEventManager::AddListenerForAllEvents(EventListener* eventListener)
 {
 	if(eventListener != NULL)
 	{
-		AddEventListener(AAMP_EVENT_ALL_EVENTS,eventListener);
+		std::shared_ptr<EventListener> sharedListener(eventListener, [](EventListener* ptr) {
+			// No-op deleter to avoid accidental deletion
+		});
+		AddEventListener(AAMP_EVENT_ALL_EVENTS,sharedListener);
 	}
 	else
 	{
@@ -136,7 +139,10 @@ void AampEventManager::RemoveListenerForAllEvents(EventListener* eventListener)
 {
 	if(eventListener != NULL)
 	{
-		RemoveEventListener(AAMP_EVENT_ALL_EVENTS,eventListener);
+		std::shared_ptr<EventListener> sharedListener(eventListener, [](EventListener* ptr) {
+		// No-op deleter to avoid accidental deletion
+		});
+		RemoveEventListener(AAMP_EVENT_ALL_EVENTS,sharedListener);
 	}
 	else
 	{
@@ -146,15 +152,15 @@ void AampEventManager::RemoveListenerForAllEvents(EventListener* eventListener)
 
 /**
  * @brief AddEventListener - Register  listener for one eventtype
- */ 
-void AampEventManager::AddEventListener(AAMPEventType eventType, EventListener* eventListener)
+ */
+void AampEventManager::AddEventListener(AAMPEventType eventType, std::shared_ptr<EventListener>& eventListener)
 {
 	if ((eventListener != NULL) && (eventType >= AAMP_EVENT_ALL_EVENTS) && (eventType < AAMP_MAX_NUM_EVENTS))
 	{
 		ListenerData* pListener = new ListenerData;
 		if (pListener)
 		{
-			AAMPLOG_INFO("EventType:%d, Listener %p new %p", eventType, eventListener, pListener);
+			AAMPLOG_INFO("EventType:%d, Listener %p new %p", eventType, eventListener.get(), pListener);
 			std::lock_guard<std::mutex> guard(mMutexVar);
 			pListener->eventListener = eventListener;
 			pListener->pNext = mEventListeners[eventType];
@@ -170,7 +176,7 @@ void AampEventManager::AddEventListener(AAMPEventType eventType, EventListener*
 /**
  * @brief RemoveEventListener - Remove one listener registration for one event
  */
-void AampEventManager::RemoveEventListener(AAMPEventType eventType, EventListener* eventListener)
+void AampEventManager::RemoveEventListener(AAMPEventType eventType, std::shared_ptr<EventListener>& eventListener)
 {
 	// listener instance is cleared here , but created outside
 	if ((eventListener != NULL) && (eventType >= AAMP_EVENT_ALL_EVENTS) && (eventType < AAMP_MAX_NUM_EVENTS))
@@ -183,7 +189,7 @@ void AampEventManager::RemoveEventListener(AAMPEventType eventType, EventListene
 			if (pListener->eventListener == eventListener)
 			{
 				*ppLast = pListener->pNext;
-				AAMPLOG_INFO("Eventtype:%d %p delete %p", eventType, eventListener, pListener);
+				AAMPLOG_INFO("Eventtype:%d %p delete %p use_count = %d", eventType, eventListener.get(), pListener, (int)eventListener.use_count());
 				SAFE_DELETE(pListener);
 				return;
 			}
@@ -374,11 +380,10 @@ void AampEventManager::SendEventSync(const AAMPEventPtr &eventData)
 		}
 		else
 		{
-			AAMPLOG_WARN("(type=%d)(state=%d)(session_id=%s)", eventType, std::dynamic_pointer_cast<StateChangedEvent>(eventData)->getState(),
+			AAMPLOG_MIL("(type=%d)(state=%d)(session_id=%s)", eventType, std::dynamic_pointer_cast<StateChangedEvent>(eventData)->getState(),
 				eventData->GetSessionId().c_str());
 		}
 	}
-
 	// Build list of registered event listeners.
 	ListenerData* pList = NULL;
 	ListenerData* pListener = mEventListeners[eventType];

diff --git a/AampEventManager.h b/AampEventManager.h
@@ -42,7 +42,7 @@
  * @brief  Structure of the event listener list
  */
 struct ListenerData {
-	EventListener* eventListener;   /**< Event listener */
+	std::shared_ptr<EventListener> eventListener;   /**< Event listener */
 	ListenerData* pNext;            /**< Next listener */
 };
 
@@ -164,22 +164,25 @@ class AampEventManager
 	 * @fn RemoveListenerForAllEvents
 	 * @param eventListener - listener for events
 	 * @return void
-	 */	
+	 */
 	void RemoveListenerForAllEvents(EventListener* eventListener);
 	/**
 	 * @fn AddEventListener
 	 * @param eventType - Aamp Event type
-	 * @param eventListener - listener for events
+	 * @param eventListener - shared pointer to listener for events
 	 * @return void
 	 */
-	void AddEventListener(AAMPEventType eventType, EventListener* eventListener);
+	void AddEventListener(AAMPEventType eventType, std::shared_ptr<EventListener>& eventListener);
+
 	/**
 	 * @fn RemoveEventListener
 	 * @param eventType - Aamp Event type
 	 * @param eventListener - listener for events
 	 * @return void
 	 */
-	void RemoveEventListener(AAMPEventType eventType, EventListener* eventListener);
+	void RemoveEventListener(AAMPEventType eventType, std::shared_ptr<EventListener>& eventListener);
+
+
 	/**
 	 * @fn IsEventListenerAvailable - Check if any listeners present for this event
 	 * @param eventType - Aamp Event Type

diff --git a/AampLogManager.h b/AampLogManager.h
@@ -199,7 +199,7 @@ class AampLogManager
 	 * @param[in] type - media type
 	 * @return void
 	 */
-	static void LogNetworkError(const char* url, AAMPNetworkErrorType errorType, int errorCode, AampMediaType type)
+	static void LogNetworkError(const char* url, AAMPNetworkErrorType errorType, int errorCode, AampMediaType type )
 	{
 		std::string location;
 		std::string symptom;
@@ -218,13 +218,8 @@ class AampLogManager
 				break; /*AAMPNetworkErrorHttp*/
 
 			case AAMPNetworkErrorTimeout:
-			{
-				if(errorCode > 0)
-				{
-					logprintf( eLOGLEVEL_ERROR, __FUNCTION__, __LINE__, "AAMPLogNetworkError error='timeout %d' type='%s' location='%s' symptom='%s' url='%s'",
+				logprintf( eLOGLEVEL_ERROR, __FUNCTION__, __LINE__, "AAMPLogNetworkError error='timeout %d' type='%s' location='%s' symptom='%s' url='%s'",
 							  errorCode, GetMediaTypeName(type), location.c_str(), symptom.c_str(), url );
-				}
-			}
 				break; /*AAMPNetworkErrorTimeout*/
 
 			case AAMPNetworkErrorCurl: