rdkcentral
diff --git a/‎.github/instructions/cpp.instructions.md‎
Lines changed: 1 addition & 1 deletion b/‎.github/instructions/cpp.instructions.md‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎.github/workflows/pr-merge-jiracomment.yml‎
Lines changed: 3 additions & 1 deletion b/‎.github/workflows/pr-merge-jiracomment.yml‎
Lines changed: 3 additions & 1 deletion
diff --git a/‎AAMP-UVE-API.md‎
Lines changed: 62 additions & 32 deletions b/‎AAMP-UVE-API.md‎
Lines changed: 62 additions & 32 deletions
diff --git a/‎AampConfig.cpp‎
Lines changed: 6 additions & 3 deletions b/‎AampConfig.cpp‎
Lines changed: 6 additions & 3 deletions
diff --git a/‎AampConfig.h‎
Lines changed: 5 additions & 2 deletions b/‎AampConfig.h‎
Lines changed: 5 additions & 2 deletions
diff --git a/‎AampDefine.h‎
Lines changed: 10 additions & 20 deletions b/‎AampDefine.h‎
Lines changed: 10 additions & 20 deletions
@@ -12,7 +12,7 @@ applyTo:
 
 ## C++ Guidelines
 
-- Target modern C++ (C++11) for new code. Highlight where newer C++ features (C++14, C++17) could be used to improve code quality, but for the time being do not use them.  If they would be of use, comment on them.
+- Target C++17 for new code. Use C++20+ features only when they are supported by the toolchain, clearly documented, and they provide a meaningful improvement in code quality.
 - Always follow the guidelines at [C++ Core Guidelines](https://isocpp.github.io/CppCoreGuidelines/CppCoreGuidelines)
 - Highlight when existing code being studied does not follow the core guidelines and suggest improvements
 - Discourage the use of C-style code within C++ (e.g. avoid memcpy(), memcmp() and char* for strings). Emphasise memory safety
 
@@ -35,6 +35,8 @@ jobs:
           JIRA_API_TOKEN: ${{ secrets.JIRA_API_TOKEN }}
           ISSUE_KEY: ${{ steps.extract.outputs.issue_key }}
           PR_URL: ${{ github.event.pull_request.html_url }}
+          SOURCE_BRANCH: ${{ github.event.pull_request.head.ref }}
+          SOURCE_BRANCH_URL: ${{ github.server_url }}/${{ github.repository }}/tree/${{ github.event.pull_request.head.ref }}
           TARGET_BRANCH: ${{ github.event.pull_request.base.ref }}
           MERGED_BY_LOGIN: ${{ github.event.pull_request.merged_by.login }}
           GITHUB_TOKEN: ${{ github.token }}
@@ -56,7 +58,7 @@ jobs:
             MERGED_BY_NAME="$MERGED_BY_LOGIN"
           fi
 
-          COMMENT_BODY="PR merged ${PR_URL} into ${TARGET_BRANCH} by ${MERGED_BY_NAME}"
+          COMMENT_BODY="PR merged ${PR_URL} from [*${SOURCE_BRANCH}*|${SOURCE_BRANCH_URL}] into ${TARGET_BRANCH} by ${MERGED_BY_NAME}"
           PAYLOAD=$(jq -n --arg body "$COMMENT_BODY" '{body: $body}')
 
           curl --fail --silent --show-error \
 
@@ -89,7 +89,7 @@ This document is targeted to application developers who are interested in evalua
 	<body>
 		<div id="videoContainer">
 			<video style="height:100%; width:100%; position:absolute; bottom:0; left:0">
-			    <source src="dummy.mp4" type=”video/ave”> <!-- hole  punching -->
+			    <source src="dummy.mp4" type="video/ave"> <!-- "video/ave" required as WPE browser hint to signal hole punching -->
 			</video>
 		</div>
 	</body>
@@ -163,8 +163,8 @@ Configuration options are passed to AAMP using the UVE `initConfig()` method. Th
 | iframeDefaultBitrate | Number | 0 | Default bitrate for iframe track selection for non-4K assets (0 = auto). |
 | iframeDefaultBitrate4K | Number | 0 | Default bitrate for iframe track selection for 4K assets (0 = auto). |
 | initRampdownLimit | Number | 0 | Maximum number of rampdown/retries for initial playlist retrieval at tune/seek time. |
-| 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). |
+| latencyMonitorDelayMs | Number | 5000 | Delay in milliseconds before starting latency monitoring after tune completion. |
+| latencyMonitorIntervalMs | Number | 1000 | Time between latency checks in milliseconds. Changing the value will only affect monitoring and corrective actions (how frequently latency is sampled and rate corrections are attempted). |
 | licenseAnonymousRequest | Boolean | false | Enable/disable acquiring of license without token. |
 | licenseKeyAcquireWaitTime | Number | 5000 | License key acquire wait time (milliseconds). |
 | licenseRetryWaitTime | Number | 500 | License retry wait interval (milliseconds). |
@@ -258,6 +258,7 @@ Configuration options are passed to AAMP using the UVE `initConfig()` method. Th
 | preferredAudioType | String | - | Preferred accessibility type for descriptive audio in the available audio tracks list. Same can be done with setAudioTrack API also. |
 | langCodePreference | Number | 0 | Set the preferred format for language codes in other events/APIs. Available in version 2.6. Values: 0 - NO_LANGCODE_PREFERENCE, 1 - 3_CHAR_BIBLIOGRAPHIC_LANGCODE, 2 - 3_CHAR_TERMINOLOGY_LANGCODE, 3 - 2_CHAR_LANGCODE |
 | preferredSubtitleLanguage | String | en | ISO-639 language code used with VTT OOB captions. |
+| preferredTextLabel | String | - | Label of desired text track in the available text tracks list. |
 | nativeCCRendering | Boolean | false | Use native closed caption support in AAMP. Available in version 2.6. |
 | enableLiveLatencyCorrection | Boolean | false | 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 | The allowed delta from live offset configured (seconds). |
@@ -1262,6 +1263,8 @@ playerInstance.setPreferredAudioLanguage( trackPreferenceObject );
 | Name  | Type | Description |
 | ---- | ---- | ---- |
 | name  | String | Human readable language name e.g: sub_eng. |
+| label  | String | Represents the label of the text track. |
+| instreamId | String | Identifier for in-band closed captions (for example, "CC1", "SERVICE1"). Typically present for CLOSED-CAPTIONS / in-band CEA-608/708 tracks when signaled via DASH MPD `<Accessibility ... value=...>`. |
 | language  | String | iso language code. e.g: eng |
 | codec  | String | codec associated with text track. e.g: stpp |
 | rendition  | String | Role for DASH. e.g: caption,subtitle,main. |
@@ -1390,21 +1393,23 @@ playerInstance.setPreferredAudioLanguage( trackPreferenceObject );
 |Name|Type|Description|
 |----|----|-----------|
 | language | String | ISO-639 text language preference. 2-character and 3-character codes are supported. |
-| languages | String | comma-delimited ISO-639 text language preference list from highest to lowest priority:  ‘<HIGHEST>,<...>,<LOWEST>’ |
+| languages | String or String[] | For JSON input, either a single ISO-639 text language code string or an array of ISO-639 language codes in priority order (for example, ["eng","spa"]). When setPreferredTextLanguage is called with a non-JSON string parameter, a comma-delimited list of ISO-639 codes from highest to lowest priority (‘<HIGHEST>,<...>,<LOWEST>’) is also accepted. |
 | rendition | String | Optional preferred rendition for automatic text selection |
 | instreamId | String | Optional preferred instreamId (i.e. CC1, CC2) for automatic text selection |
-| label	| String | Preferred Label for automatic text selection |
-| accessibilityType | String |	Optional preferred accessibility Node for descriptive audio.|
-| accessibility | Object | Optional preferred accessibility object for audio |
-| accessibility.scheme | String | Preferred Accessibility scheme Id  |
-| accessibility.int_value | Number | Preferred Accessibility scheme Id value |
+| label	| String | Optional preferred label for automatic text selection |
+| accessibilityType | String | Optional preferred DASH role/type string for text track selection. This is used as the `preferred-text-type` value and is matched against `<Accessibility ... value=...>` entries with scheme `urn:mpeg:dash:role:2011`. |
+| accessibility | Object | Optional preferred Accessibility node criteria for text (for example, to select descriptive / VI tracks). This corresponds to the full `<Accessibility ...>` element and is independent of `accessibilityType`. |
+| accessibility.scheme | String | Preferred Accessibility scheme Id for the Accessibility node. |
+| accessibility.string_value | String | Preferred Accessibility scheme Id value for the Accessibility node when expressed as a string. |
+| accessibility.int_value | Number | Preferred Accessibility scheme Id value for the Accessibility node when expressed as a number. |
 
 - ###### Example :
 ```js
 var trackPreferenceObject =
 {
     "languages": ["en", "de", "mul"],
     "rendition": "subtitle",
+    "label": "native",
     "accessibility":
     {
         "scheme": "urn:tva:metadata:cs:AudioPurposeCS:2007",
@@ -1426,22 +1431,45 @@ playerInstance.setPreferredTextLanguage( trackPreferenceObject );
 ### getTextTrackInfo
 - Supported UVE version 4.4 and above.
 - Returns playing Text track information in JSON format.
-- Currently support is limited to only out-of-band captions.
+- Supports both out-of-band captions and in-band closed captions (when available).
+- Note: The in-band CC identifier field for this API is named `instreamID`
+  (capital `ID`), whereas `getAvailableTextTracks` uses `instreamId`.
+  Use the exact casing expected by each API when consuming these fields.
+
+- ###### Examples :
+
+  - Out-of-band text track (e.g., WebVTT or TTML sidecar):
 
-- ###### Example :
 ```js
-{
-    "name": "English"
-    "languages": "eng",
-    "codec": "stpp"
-    "type": "CLOSED-CAPTIONS"
-    "rendition": "alternate",
-    "accessibility":
+[
     {
-        "scheme": "urn:tva:metadata:cs:AudioPurposeCS:2007",
-        "int_value": 2
+        "name": "English",
+        "label": "native",
+        "language": "eng",
+        "codec": "stpp",
+        "type": "captions",
+        "rendition": "alternate",
+        "accessibility":
+        {
+            "scheme": "urn:tva:metadata:cs:AudioPurposeCS:2007",
+            "int_value": 2
+        }
     }
-}
+]
+```
+
+  - In-band closed captions (instream CC):
+
+```js
+[
+    {
+        "name": "CC1",
+        "label": "Service 1",
+        "language": "eng",
+        "type": "captions",
+        "instreamID": "1"
+    }
+]
 ```
 ---
 
@@ -1452,13 +1480,13 @@ playerInstance.setPreferredTextLanguage( trackPreferenceObject );
 - ###### Example :
 ```js
 {
-    "preferred-text-languages" : ["eng", "ger", "mul"],
-    "preferred-text-labels": "subtitle",
-    "preferred-text-rendition": "",
-    "preferred-text-type": ""
+    "preferred-text-languages" : "eng,ger,mul",
+    "preferred-text-labels": "native",
+    "preferred-text-rendition": "alternate",
+    "preferred-text-type": "captions",
     "preferred-text-accessibility":
     {
-        "scheme": "urn:tva:metadata:cs:AudioPurposeCS:2007",
+        "schemeId": "urn:tva:metadata:cs:AudioPurposeCS:2007",
         "int_value": 2
     }
 }
@@ -2436,7 +2464,7 @@ Example:
 - sessionHandle: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
@@ -2679,12 +2707,12 @@ Response:
 ```
 
 
-## Inband (CEA608/708) Closed Caption Management (legacy XREReceiver API) 
+## Inband (CEA608/708) Closed Caption Management (legacy XREReceiver API)
 * on scaled X1 devices this is mapped directly to receiver APIs interacting with RDK CC Manager
     * here by default will inherit X1 caption style settings as set by user through guide settings
     * apps can override caption styling, but typically wouldn't need to do so
 * on non-XRE devices this is implemented as a wrapper for backwards compatibility, but with limitations - only default styles will ever be applied, and with no way for app to change, and won't reflect guide settings
- 
+
 To use legacy XREReceiver inband closed captions, first register an event listener to discover decoder handle:
 ```
 player.addEventListener("decoderAvailable", decoderHandleAvailable);
@@ -2749,16 +2777,18 @@ player.setClosedCaptionStatus(false); // hide captions
 
 Get/Set CC track:
 ```js
-player.getTextTrack();             // returns JSON object listing track attributes
-player.setTextTrack(trackIdentifier);
+player.getTextTrack();             // returns the numeric index of the currently selected text track
+player.setTextTrack(trackIndex);   // set by numeric index (as returned by getTextTrack), or -1 to disable
 ```
 
 Get/Set CC style options:
 ```js
-player.getTextStyleOptions();      // returns JSON object reflecting current styling options
+player.getTextStyleOptions();      // returns a JSON-formatted string reflecting current styling options
 player.setTextStyleOptions(options); // set styling options (see setTextStyleOptions API for format)
 ```
 
+On newer devices there is no need to call `setTextStyleOptions`, as the Text Track plugin will automatically map guide-configured caption styling.
+
 ---
 
 <div style="page-break-after: always;"></div>
 
@@ -426,8 +426,8 @@ static const ConfigLookupEntryInt mConfigLookupTableInt[AAMPCONFIG_INT_COUNT+CON
 	{ePAUSED_BEHAVIOR_AUTOPLAY_IMMEDIATE,"livePauseBehavior",eAAMPConfig_LivePauseBehavior,false,eCONFIG_RANGE_PAUSE_BEHAVIOR },
 	{MAX_GST_VIDEO_BUFFER_BYTES,"gstVideoBufBytes", eAAMPConfig_GstVideoBufBytes,true},
 	{MAX_GST_AUDIO_BUFFER_BYTES,"gstAudioBufBytes", eAAMPConfig_GstAudioBufBytes,true},
-	{DEFAULT_LATENCY_MONITOR_DELAY,"latencyMonitorDelay",eAAMPConfig_LatencyMonitorDelay,false},
-	{AAMP_LLD_LATENCY_MONITOR_INTERVAL,"latencyMonitorInterval",eAAMPConfig_LatencyMonitorInterval,false},
+	{DEFAULT_LATENCY_MONITOR_DELAY_MS,"latencyMonitorDelayMs",eAAMPConfig_LatencyMonitorDelayMs,false},
+	{DEFAULT_LATENCY_MONITOR_INTERVAL_MS,"latencyMonitorIntervalMs",eAAMPConfig_LatencyMonitorIntervalMs,false},
 	{DEFAULT_CACHED_FRAGMENT_CHUNKS_PER_TRACK,"downloadBufferChunks",eAAMPConfig_MaxFragmentChunkCached,false},
 	{DEFAULT_AAMP_ABR_CHUNK_THRESHOLD_SIZE,"abrChunkThresholdSize",eAAMPConfig_ABRChunkThresholdSize,false},
 	{DEFAULT_MIN_LOW_LATENCY,"lowLatencyMinValue",eAAMPConfig_LLMinLatency,true},
@@ -515,7 +515,10 @@ static const ConfigLookupEntryFloat mConfigLookupTableFloat[AAMPCONFIG_FLOAT_COU
 	{DEFAULT_UNDERFLOW_DETECT_THRESHOLD_SEC, "underflowDetectThresholdSec", eAAMPConfig_UnderflowDetectThresholdSec, true},
 	{DEFAULT_UNDERFLOW_RESUME_THRESHOLD_SEC, "underflowResumeThresholdSec", eAAMPConfig_UnderflowResumeThresholdSec, true},
 	{DEFAULT_UNDERFLOW_LOW_BUFFER_SEC, "underflowLowBufferSec", eAAMPConfig_UnderflowLowBufferSec, true},
-	{DEFAULT_UNDERFLOW_HIGH_BUFFER_SEC, "underflowHighBufferSec", eAAMPConfig_UnderflowHighBufferSec, true}
+	{DEFAULT_UNDERFLOW_HIGH_BUFFER_SEC, "underflowHighBufferSec", eAAMPConfig_UnderflowHighBufferSec, true},
+	{DEFAULT_BUFFER_LEVEL_TO_ENABLE_LATENCY_SEC, "bufferLevelToEnableLatencySec", eAAMPConfig_BufferLevelToEnableCorrectionSec, false},
+	{DEFAULT_REBUFFER_LATENCY_STEP_SEC, "rebufferLatencyStepSec", eAAMPConfig_RebufferLatencyStepSec, false},
+	{DEFAULT_REBUFFER_LATENCY_MAX_INCREMENT_SEC, "rebufferLatencyMaxIncrementSec", eAAMPConfig_RebufferLatencyMaxIncrementSec, false}
 };
 
 /**
 
@@ -278,8 +278,8 @@ typedef enum
 	eAAMPConfig_LivePauseBehavior,                                          /**< player paused state behavior */
 	eAAMPConfig_GstVideoBufBytes,                                           /**< Gstreamer Max Video buffering bytes*/
 	eAAMPConfig_GstAudioBufBytes,                                           /**< Gstreamer Max Audio buffering bytes*/
-	eAAMPConfig_LatencyMonitorDelay,               				/**< Latency Monitor Delay */
-	eAAMPConfig_LatencyMonitorInterval,           				/**< Latency Monitor Interval */
+	eAAMPConfig_LatencyMonitorDelayMs,               				/**< Latency Monitor Delay */
+	eAAMPConfig_LatencyMonitorIntervalMs,           				/**< Latency Monitor Interval */
 	eAAMPConfig_MaxFragmentChunkCached,           				/**< fragment chunk cache length*/
 	eAAMPConfig_ABRChunkThresholdSize,                			/**< AAMP ABR Chunk threshold size*/
 	eAAMPConfig_LLMinLatency,						/**< Low Latency Min Latency Offset */
@@ -359,6 +359,9 @@ typedef enum
 	eAAMPConfig_UnderflowResumeThresholdSec,		/**< Underflow resume threshold in seconds */
 	eAAMPConfig_UnderflowLowBufferSec,				/**< Low buffer threshold in seconds */
 	eAAMPConfig_UnderflowHighBufferSec,				/**< High buffer threshold in seconds */
+	eAAMPConfig_BufferLevelToEnableCorrectionSec,   /**< Buffer level to enable latency correction in seconds */
+	eAAMPConfig_RebufferLatencyStepSec,				/**< Step value for latency increase when rebuffering occurs */
+	eAAMPConfig_RebufferLatencyMaxIncrementSec,		/**< Max latency increment allowed due to rebuffering */
 	eAAMPConfig_FloatMaxValue						/**< Max value for float config always last element*/
 } AAMPConfigSettingFloat;
 #define AAMPCONFIG_FLOAT_COUNT (eAAMPConfig_FloatMaxValue)
 
@@ -157,6 +157,10 @@
 #define DEFAULT_UNDERFLOW_LOW_BUFFER_SEC 5.0			/**< Low buffer threshold in seconds */
 #define DEFAULT_UNDERFLOW_HIGH_BUFFER_SEC 10.0			/**< High buffer threshold in seconds */
 
+#define DEFAULT_BUFFER_LEVEL_TO_ENABLE_LATENCY_SEC 0.0  /*< Default is 0.0 means latency correction is enabled at all buffer values */
+#define DEFAULT_REBUFFER_LATENCY_STEP_SEC 1.0		/*< Step value for latency increase when rebuffering occurs in seconds */
+#define DEFAULT_REBUFFER_LATENCY_MAX_INCREMENT_SEC 6	/*< LiveOffset(15s) - MaxLatency(9s) */
+
 // We can enable the following once we have a thread monitoring video PTS progress and triggering subtec clock fast update when we detect video freeze. Disabled it for now for brute force fast refresh..
 //#define SUBTEC_VARIABLE_CLOCK_UPDATE_RATE   /* enable this to make the clock update rate dynamic*/
 #ifdef SUBTEC_VARIABLE_CLOCK_UPDATE_RATE
@@ -187,15 +191,14 @@
 #define MAX_GST_VIDEO_BUFFER_BYTES			(GST_VIDEOBUFFER_SIZE_BYTES)
 #define MAX_GST_AUDIO_BUFFER_BYTES			(GST_AUDIOBUFFER_SIZE_BYTES)
 
-#define DEFAULT_LATENCY_MONITOR_DELAY			9					/**< Latency Monitor Delay */
-#define DEFAULT_LATENCY_MONITOR_INTERVAL		6					/**< Latency monitor Interval */
-#define DEFAULT_MIN_LOW_LATENCY			3					/**< min Default Latency */
-#define DEFAULT_MAX_LOW_LATENCY			9					/**< max Default Latency */
-#define DEFAULT_TARGET_LOW_LATENCY			6					/**< Target Default Latency */
+#define DEFAULT_LATENCY_MONITOR_DELAY_MS		5000		/**< Latency Monitor Delay */
+#define DEFAULT_LATENCY_MONITOR_INTERVAL_MS		1000		/**< Latency monitor interval */
+#define DEFAULT_MIN_LOW_LATENCY					3			/**< min Default Latency */
+#define DEFAULT_MAX_LOW_LATENCY					9			/**< max Default Latency */
+#define DEFAULT_TARGET_LOW_LATENCY				6			/**< Target Default Latency */
 #define DEFAULT_MIN_RATE_CORRECTION_SPEED		0.97f		/**< min Rate correction speed */
 #define DEFAULT_MAX_RATE_CORRECTION_SPEED		1.03f		/**< max Rate correction speed */
-#define DEFAULT_NORMAL_RATE_CORRECTION_SPEED    1.00f	   	/**< Live Catchup Normal play rate */
-#define AAMP_LLD_LATENCY_MONITOR_INTERVAL 		(1)   		/**< Latency monitor interval for LLD*/
+#define DEFAULT_NORMAL_RATE_CORRECTION_SPEED	1.00f		/**< Live Catchup Normal play rate */
 #define AAMP_LLD_MINIMUM_CACHE_SEGMENTS 		(2)     	/**< Number of segments to be cached minimum before rate change*/
 #define AAMP_LLD_LOW_BUFF_CHECK_COUNT           (4)         /**< Count to confirm low buffer state for LLD stream playback; 4 sec to ABR; So Allow ABR first*/
 #define DEFAULT_MIN_BUFFER_LOW_LATENCY          (2.0f)      /**< Default minimum buffer for Low latency stream*/
@@ -288,19 +291,6 @@ typedef enum
 	AAMP_MAX_SETTING
 }ConfigPriority;
 
-/**
- * @brief Latency status
- */
-enum LatencyStatus
-{
-	LATENCY_STATUS_UNKNOWN=-1,     /**< The latency is Unknown */
-	LATENCY_STATUS_MIN,            /**< The latency is within range but less than minimum latency */
-	LATENCY_STATUS_THRESHOLD_MIN,  /**< The latency is within range but less than target latency but greater than minimum latency */
-	LATENCY_STATUS_THRESHOLD,      /**< The latency is equal to given latency from mpd */
-	LATENCY_STATUS_THRESHOLD_MAX,  /**< The latency is more that target latency but less than maximum latency */
-	LATENCY_STATUS_MAX             /**< The latency is more than maximum latency */
-};
-
 /**
  * @brief AAMP Function return values
  */