Merge pull request #473 from rdkcentral/feature/RDK-59058_federated_2509

RDK-59058: AAMP Federated Release for Sprint 2509

Author: paulpandian25

AAMP-UVE-API.md

@@ -324,8 +324,8 @@ Example:
 	    var url1 = "https://example.com/multilang/sample.m3u8"; // replace with valid URL!
 	    var url2 = "https://example.com/multilang/sample1.m3u8"; // replace with valid URL!
 
-	    var params_1 = { sessionId: "12192978-da71-4da7-8335-76fbd9ae2ae9" };
-	    var params_2 = { sessionId: "6e3c49cb-6254-4324-9f5e-bddef465bdff" };
+	    var params_1 = { sessionId: "12192978-da71-4da7-8335-76fbd9ae2ae9" }; // base16
+	    var params_2 = { sessionId: "6e3c49cb-6254-4324-9f5e-bddef465bdff" }; // base16
 
 	    player1.load(url1, true, params_1); // for immediate playback
 	    player2.load(url2, false, params_2); // for background buffering,no playback.

AAMPAnomalyMessageType.h

@@ -0,0 +1,34 @@
+/*
+ * If not stated otherwise in this file or this component's license file the
+ * following copyright and licenses apply:
+ *
+ * Copyright 2023 RDK Management
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+*/
+
+#ifndef AAMP_ANOMALY_MESSAGE_TYPE_H
+#define AAMP_ANOMALY_MESSAGE_TYPE_H
+
+/**
+ * @enum AAMPAnomalyMessageType
+ * @brief AAMP anomaly message types
+ */
+typedef enum
+{
+    ANOMALY_ERROR,    /**< Error Message */
+    ANOMALY_WARNING,  /**< Warning Message */
+    ANOMALY_TRACE      /**< Trace Message */
+} AAMPAnomalyMessageType;
+
+#endif // AAMP_ANOMALY_MESSAGE_TYPE_H

AampCacheHandler.h

@@ -28,9 +28,13 @@
 #include <memory>
 #include <unordered_map>
 #include <exception>
-#include "priv_aamp.h"
 #include <mutex>
 #include <condition_variable>
+#include "AampGrowableBuffer.h"
+#include "AampMediaType.h"
+#include "AampUtils.h"
+#include "AampLogManager.h"
+#include "AampDefine.h"
 
 #define PLAYLIST_CACHE_SIZE_UNLIMITED -1
 

AampConfig.cpp

@@ -865,23 +865,23 @@ void AampConfig::ApplyDeviceCapabilities()
 	SetConfigValue(AAMP_DEFAULT_SETTING, eAAMPConfig_UseSecManager, isSecMgr);
 }
 
-std::string AampConfig::GetUserAgentString()
+std::string AampConfig::GetUserAgentString() const
 {
 	return std::string(configValueString[eAAMPConfig_UserAgent].value);
 }
 
 /**
  * @brief Gets the boolean configuration value
  */
-bool AampConfig::IsConfigSet(AAMPConfigSettingBool cfg)
+bool AampConfig::IsConfigSet(AAMPConfigSettingBool cfg) const
 {	if (cfg < AAMPCONFIG_BOOL_COUNT)
 	{
 		return configValueBool[cfg].value;
 	}
 	return false;
 }
 
-bool AampConfig::GetConfigValue( AAMPConfigSettingBool cfg )
+bool AampConfig::GetConfigValue( AAMPConfigSettingBool cfg ) const
 {
 	if(cfg < AAMPCONFIG_BOOL_COUNT)
 	{
@@ -893,7 +893,7 @@ bool AampConfig::GetConfigValue( AAMPConfigSettingBool cfg )
  * @brief GetConfigValue - Gets configuration for integer data type
  *
  */
-int AampConfig::GetConfigValue(AAMPConfigSettingInt cfg)
+int AampConfig::GetConfigValue(AAMPConfigSettingInt cfg) const
 {
 	if(cfg < AAMPCONFIG_INT_COUNT)
 	{
@@ -905,7 +905,7 @@ int AampConfig::GetConfigValue(AAMPConfigSettingInt cfg)
  * @brief GetConfigValue - Gets configuration for double data type
  *
  */
-double AampConfig::GetConfigValue(AAMPConfigSettingFloat cfg)
+double AampConfig::GetConfigValue(AAMPConfigSettingFloat cfg) const
 {
 	if(cfg < AAMPCONFIG_FLOAT_COUNT)
 	{
@@ -918,7 +918,7 @@ double AampConfig::GetConfigValue(AAMPConfigSettingFloat cfg)
  * @brief GetConfigValue - Gets configuration for string data type
  *
  */
-std::string AampConfig::GetConfigValue(AAMPConfigSettingString cfg)
+std::string AampConfig::GetConfigValue(AAMPConfigSettingString cfg) const
 {
 	if(cfg < AAMPCONFIG_STRING_COUNT)
 	{
@@ -932,19 +932,19 @@ std::string AampConfig::GetConfigValue(AAMPConfigSettingString cfg)
  *
  * @return ConfigPriority - owner of the config
  */
-ConfigPriority AampConfig::GetConfigOwner(AAMPConfigSettingBool cfg)
+ConfigPriority AampConfig::GetConfigOwner(AAMPConfigSettingBool cfg) const
 {
 	return configValueBool[cfg].owner;
 }
-ConfigPriority AampConfig::GetConfigOwner(AAMPConfigSettingInt cfg)
+ConfigPriority AampConfig::GetConfigOwner(AAMPConfigSettingInt cfg) const
 {
 	return configValueInt[cfg].owner;
 }
-ConfigPriority AampConfig::GetConfigOwner(AAMPConfigSettingFloat cfg)
+ConfigPriority AampConfig::GetConfigOwner(AAMPConfigSettingFloat cfg) const
 {
 	return configValueFloat[cfg].owner;
 }
-ConfigPriority AampConfig::GetConfigOwner(AAMPConfigSettingString cfg)
+ConfigPriority AampConfig::GetConfigOwner(AAMPConfigSettingString cfg) const
 {
 	return configValueString[cfg].owner;
 }
@@ -954,13 +954,13 @@ ConfigPriority AampConfig::GetConfigOwner(AAMPConfigSettingString cfg)
  *
  * @return true - if valid return
  */
-const char * AampConfig::GetChannelOverride(const std::string manifestUrl)
+const char * AampConfig::GetChannelOverride(const std::string manifestUrl) const
 {
 	if(mChannelOverrideMap.size() && manifestUrl.size())
 	{
 		for (auto it = mChannelOverrideMap.begin(); it != mChannelOverrideMap.end(); ++it)
 		{
-			ConfigChannelInfo &pChannelInfo = *it;
+			const ConfigChannelInfo &pChannelInfo = *it;
 			if (manifestUrl.find(pChannelInfo.name) != std::string::npos)
 			{
 				return pChannelInfo.uri.c_str();
@@ -975,13 +975,13 @@ const char * AampConfig::GetChannelOverride(const std::string manifestUrl)
  *
  * @return true - if valid return
  */
-const char * AampConfig::GetChannelLicenseOverride(const std::string manifestUrl)
+const char * AampConfig::GetChannelLicenseOverride(const std::string manifestUrl) const
 {
     if(mChannelOverrideMap.size() && manifestUrl.size())
     {
         for (auto it = mChannelOverrideMap.begin(); it != mChannelOverrideMap.end(); ++it)
         {
-            ConfigChannelInfo &pChannelInfo = *it;
+            const ConfigChannelInfo &pChannelInfo = *it;
             if (manifestUrl.find(pChannelInfo.uri) != std::string::npos)
             {
                 if(!pChannelInfo.licenseUri.empty())
@@ -1347,7 +1347,7 @@ bool AampConfig::CustomSearch( std::string url, int playerId , std::string appna
  *
  * @return true
  */
-bool AampConfig::GetAampConfigJSONStr(std::string &str)
+bool AampConfig::GetAampConfigJSONStr(std::string &str) const
 {
 	AampJsonObject jsondata;
 
@@ -1406,7 +1406,7 @@ void AampConfig::ProcessConfigText(std::string &cfg, ConfigPriority owner )
 				while (getline(iss, token, ' '))
 				{
 					const char *uri = token.c_str();
-					if( PlayerInstanceAAMP::isTuneScheme(uri) )
+					if( aamp_isTuneScheme(uri) )
 					{
 						AAMPLOG_INFO("Override %s", uri );
 						channelInfo.uri = token;
@@ -1911,19 +1911,19 @@ void AampConfig::DoCustomSetting(ConfigPriority owner)
 	ConfigureLogSettings();
 }
 
-const char * AampConfig::GetConfigName(AAMPConfigSettingBool cfg )
+const char * AampConfig::GetConfigName(AAMPConfigSettingBool cfg ) const
 {
 	return mConfigLookupTableBool[cfg].cmdString;
 }
-const char * AampConfig::GetConfigName(AAMPConfigSettingInt cfg )
+const char * AampConfig::GetConfigName(AAMPConfigSettingInt cfg ) const
 {
 	return mConfigLookupTableInt[cfg].cmdString;
 }
-const char * AampConfig::GetConfigName(AAMPConfigSettingFloat cfg )
+const char * AampConfig::GetConfigName(AAMPConfigSettingFloat cfg ) const
 {
 	return mConfigLookupTableFloat[cfg].cmdString;
 }
-const char *AampConfig::GetConfigName(AAMPConfigSettingString cfg )
+const char *AampConfig::GetConfigName(AAMPConfigSettingString cfg ) const
 {
 	return mConfigLookupTableString[cfg].cmdString;
 }

AampConfig.h

@@ -599,27 +599,27 @@ class AampConfig
      	 * @param[in] cfg - Configuration enum
      	 * @return true / false 
      	 */
-	bool IsConfigSet(AAMPConfigSettingBool cfg);
-	bool GetConfigValue( AAMPConfigSettingBool cfg );
-	int GetConfigValue( AAMPConfigSettingInt cfg );
-	double GetConfigValue( AAMPConfigSettingFloat cfg );
-	std::string GetConfigValue( AAMPConfigSettingString cfg );
+	bool IsConfigSet(AAMPConfigSettingBool cfg) const;
+	bool GetConfigValue( AAMPConfigSettingBool cfg ) const;
+	int GetConfigValue( AAMPConfigSettingInt cfg ) const;
+	double GetConfigValue( AAMPConfigSettingFloat cfg ) const;
+	std::string GetConfigValue( AAMPConfigSettingString cfg ) const;
 
-	ConfigPriority GetConfigOwner(AAMPConfigSettingBool cfg);
-	ConfigPriority GetConfigOwner(AAMPConfigSettingInt cfg);
-	ConfigPriority GetConfigOwner(AAMPConfigSettingFloat cfg);
-	ConfigPriority GetConfigOwner(AAMPConfigSettingString cfg);
+	ConfigPriority GetConfigOwner(AAMPConfigSettingBool cfg) const;
+	ConfigPriority GetConfigOwner(AAMPConfigSettingInt cfg) const;
+	ConfigPriority GetConfigOwner(AAMPConfigSettingFloat cfg) const;
+	ConfigPriority GetConfigOwner(AAMPConfigSettingString cfg) const;
 
  	/**
      	 * @fn GetChannelOverride
      	 * @param[in] chName - channel name to search
      	 */
-	const char * GetChannelOverride(const std::string chName);    
+	const char * GetChannelOverride(const std::string chName) const;
  	/**
      	 * @fn GetChannelLicenseOverride
      	 * @param[in] chName - channel Name to override
      	 */
- 	const char * GetChannelLicenseOverride(const std::string chName);
+ 	const char * GetChannelLicenseOverride(const std::string chName) const;
 
 	/**
          * @fn ProcessConfigJson
@@ -676,7 +676,7 @@ class AampConfig
      	 * @fn GetAampConfigJSONStr
      	 * @param[in] str  - input string where config json will be stored
      	 */
-	bool GetAampConfigJSONStr(std::string &str);
+	bool GetAampConfigJSONStr(std::string &str) const;
 	/**
      	 * @fn DoCustomSetting 
      	 *
@@ -693,7 +693,7 @@ class AampConfig
      	 */
 	bool CustomSearch( std::string url, int playerId , std::string appname);
 
-	std::string GetUserAgentString();
+	std::string GetUserAgentString() const;
 private:
 
 	/**
@@ -722,10 +722,10 @@ class AampConfig
 		 */
 	void CustomArrayRead( cJSON *customArray,ConfigPriority owner );
 
-	const char * GetConfigName(AAMPConfigSettingBool cfg );
-	const char * GetConfigName(AAMPConfigSettingInt cfg );
-	const char * GetConfigName(AAMPConfigSettingFloat cfg );
-	const char * GetConfigName(AAMPConfigSettingString cfg );
+	const char * GetConfigName(AAMPConfigSettingBool cfg ) const;
+	const char * GetConfigName(AAMPConfigSettingInt cfg ) const;
+	const char * GetConfigName(AAMPConfigSettingFloat cfg ) const;
+	const char * GetConfigName(AAMPConfigSettingString cfg ) const;
 
 	std::vector<struct customJson>vCustom;
 	std::vector<struct customJson>::iterator vCustomIt;

AampDefine.h

@@ -31,7 +31,7 @@
 #define AAMP_JSON_PATH "/opt/aampcfg.json"
 
 #define AAMP_VERSION "7.07"
-#define AAMP_TUNETIME_VERSION 5
+#define AAMP_TUNETIME_VERSION 6
 
 //Stringification of Macro : use two levels of macros
 #define MACRO_TO_STRING(s) X_STR(s)

AampEvent.cpp

@@ -1165,9 +1165,9 @@ VTTCue* WebVttCueEvent::getCueData() const
 /**
  * @brief AdResolvedEvent Constructor
  */
-AdResolvedEvent::AdResolvedEvent(bool resolveStatus, const std::string &adId, uint64_t startMS, uint64_t durationMs, std::string sid):
+AdResolvedEvent::AdResolvedEvent(bool resolveStatus, const std::string &adId, uint64_t startMS, uint64_t durationMs, const std::string &errorCode, const std::string &errorDesc, std::string sid):
 		AAMPEventObject(AAMP_EVENT_AD_RESOLVED, std::move(sid)), mResolveStatus(resolveStatus), mAdId(adId),
-		mStartMS(startMS), mDurationMs(durationMs)
+		mStartMS(startMS), mDurationMs(durationMs), mErrorCode(errorCode), mErrorDescription(errorDesc)
 {
 
 }
@@ -1212,6 +1212,26 @@ uint64_t AdResolvedEvent::getDuration() const
 	return mDurationMs;
 }
 
+/**
+ * @brief Get ErrorCode
+ *
+ * @return Error code
+ */
+const std::string &AdResolvedEvent::getErrorCode() const
+{
+	return mErrorCode;
+}
+
+/**
+ * @brief Get Error Description
+ *
+ * @return Error description
+ */
+const std::string &AdResolvedEvent::getErrorDescription() const
+{
+	return mErrorDescription;
+}
+
 /**
  * @brief AdReservationEvent Constructor
  */