Merge branch 'main' into RDKTV-33096-stable2

Author: binuinbaraj

.github/workflows/L2-ContentProtection.yml

@@ -0,0 +1,35 @@
+name: L2-ContentProtection
+
+on:
+  push:
+    paths:
+      - ContentProtection/**
+      - .github/workflows/*ContentProtection*.yml
+  pull_request:
+    paths:
+      - ContentProtection/**
+      - .github/workflows/*ContentProtection*.yml
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          path: ${{github.repository}}
+
+      - name: Install cmake
+        run: |
+          sudo apt update
+          sudo apt install -y cmake
+
+      - name: Build Thunder
+        working-directory: ${{github.workspace}}
+        run: sh +x ${GITHUB_REPOSITORY}/.github/workflows/BuildThunder.sh
+
+      - name: Build
+        working-directory: ${{github.workspace}}
+        run: |
+          cmake -S ${GITHUB_REPOSITORY}/ContentProtection -B build/ContentProtection -DCMAKE_INSTALL_PREFIX="install" -DCMAKE_CXX_FLAGS="-Wall -Werror"
+          cmake --build build/ContentProtection --target install

AVOutput/AVOutputTV.cpp

@@ -375,13 +375,6 @@ namespace Plugin {
 	} 
 	else {
             LOGINFO("Platform Init successful...\n");
-            ret = TvSyncCalibrationInfoODM();
-            if(ret != tvERROR_NONE) {
-                LOGERR(" SD3 <->cri_data sync failed, ret: %s \n", getErrorString(ret).c_str());
-            }
-            else {
-                LOGERR(" SD3 <->cri_data sync success, ret: %s \n", getErrorString(ret).c_str());
-            }
         }
 
         tvVideoFormatCallbackData callbackData = {this,tvVideoFormatChangeHandler};
@@ -2282,17 +2275,22 @@ namespace Plugin {
     {
 
         LOGINFO("Entry\n");
-        pic_modes_t *dvModes;
+        tvDolbyMode_t dvModes[tvMode_Max];
+        tvDolbyMode_t *dvModesPtr = dvModes; // Pointer to statically allocated tvDolbyMode_t array 
         unsigned short totalAvailable = 0;
-        tvError_t ret = GetTVSupportedDolbyVisionModesODM(&dvModes,&totalAvailable);
+
+        // Set an initial value to indicate the mode type
+        dvModes[0] = tvDolbyMode_Dark;
+
+        tvError_t ret = GetTVSupportedDolbyVisionModes(&dvModesPtr, &totalAvailable);
         if(ret != tvERROR_NONE) {
             returnResponse(false);
         }
         else {
             JsonArray SupportedDVModes;
 
             for(int count = 0;count <totalAvailable;count++ ) {
-                SupportedDVModes.Add(dvModes[count].name);
+                SupportedDVModes.Add(getDolbyModeStringFromEnum(dvModes[count]));
             }
 
             response["supportedDVModes"] = SupportedDVModes;
@@ -2376,7 +2374,7 @@ namespace Plugin {
 
         if( isSetRequired("Current",source,"DV") ) {
             LOGINFO("Proceed with setDolbyVisionMode\n\n");
-            ret = SetTVDolbyVisionModeODM(value.c_str());
+            ret = SetTVDolbyVisionMode(GetDolbyVisionEnumFromModeString(value.c_str()));
         }
 
         if(ret != tvERROR_NONE) {
@@ -2437,7 +2435,7 @@ namespace Plugin {
                 if( err == 0 ) {
                     std::string dolbyModeValue = getDolbyModeStringFromEnum((tvDolbyMode_t)dolbyMode);
                     LOGINFO("%s : getLocalparam success format :%d source : %d format : %d dolbyvalue : %s\n",__FUNCTION__,formatIndex, sourceIndex, pqIndex, dolbyModeValue.c_str());
-                    ret = SetTVDolbyVisionModeODM(dolbyModeValue.c_str());
+                    ret = SetTVDolbyVisionMode((tvDolbyMode_t)dolbyMode);
                 }
                 else {
                     LOGERR("%s : GetLocalParam Failed \n",__FUNCTION__);
@@ -2822,7 +2820,7 @@ namespace Plugin {
                     if ( tr181Success == err ) {
                         //get curren source and if matches save for that alone
                         tvVideoSrcType_t current_source = VIDEO_SOURCE_IP;
-                        GetCurrentSource(&current_source);
+                        GetCurrentVideoSource(&current_source);
 
                         tvVideoFormatType_t current_format = VIDEO_FORMAT_NONE;
                         GetCurrentVideoFormat(&current_format);
@@ -3077,7 +3075,7 @@ namespace Plugin {
         LOGINFO("Entry\n");
         tvVideoSrcType_t currentSource = VIDEO_SOURCE_IP;
 
-        tvError_t ret = GetCurrentSource(&currentSource);
+        tvError_t ret = GetCurrentVideoSource(&currentSource);
         if(ret != tvERROR_NONE) {
             response["currentVideoSource"] = "NONE";
             returnResponse(false);

AVOutput/AVOutputTV.h

@@ -22,6 +22,8 @@
 
 #include "string.h"
 #include <set>
+#include <boost/filesystem.hpp>
+#include <boost/property_tree/ini_parser.hpp>
 
 #include "tvTypes.h"
 #include "tvSettings.h"
@@ -67,6 +69,49 @@
 #define STRING_DEFAULT  "Default"
 #define STRING_SOURCE    "Source."
 #define CREATE_DIRTY(__X__) (__X__+=STRING_DIRTY)
+#define CAPABLITY_FILE_NAME    "pq_capabilities.ini"
+
+
+class CIniFile
+{
+	std::string m_path;
+	std::string opt_path;
+	boost::property_tree::ptree m_data;
+
+public:
+	CIniFile(const std::string & filename, const std::string & filepath = "/etc/" )
+	{
+		opt_path = "/opt/panel/";
+		m_path = filepath;
+		m_path.append(filename);
+		opt_path.append(filename);
+
+		if(!boost::filesystem::exists( opt_path)) {
+			std::cout << "AVOutput : Using " << m_path <<std::endl;
+			boost::property_tree::ini_parser::read_ini(m_path, m_data);
+		}
+		else {
+			std::cout << "AVOutput : Using " << opt_path << std::endl;
+			boost::property_tree::ini_parser::read_ini(opt_path, m_data);
+	        }
+	}
+
+	~CIniFile()
+	{
+	}
+
+	template <typename T>
+	T Get(const std::string & key)
+	{
+		return m_data.get<T>(key);
+	}
+
+	template <typename T>
+	void Set(const std::string & key, const T & value){
+		//TODO DD: Not required currently
+		//m_data.put(key, value);
+	}
+};
 
 namespace WPEFramework {
 namespace Plugin {
@@ -217,10 +262,14 @@ class AVOutputTV : public AVOutputBase {
 		tvError_t getParamsCaps(std::vector<std::string> &range, std::vector<std::string> &pqmode, std::vector<std::string> &source,
 		                        std::vector<std::string> &format,std::string param , std::string & isPlatformSupport,
 				std::vector<std::string> & index);
+		int GetPanelID(char *panelid);
+		int ConvertHDRFormatToContentFormat(tvhdr_type_t hdrFormat);
+		int ReadCapablitiesFromConf(std::string &rangeInfo,std::string &pqmodeInfo,std::string &formatInfo,std::string &sourceInfo,std::string param, std::string & isPlatformSupport, std::string & indexInfo);
 		void getDimmingModeStringFromEnum(int value, std::string &toStore);
 		void getColorTempStringFromEnum(int value, std::string &toStore);
 		int getCurrentPictureMode(char *picMode);
 		int getDolbyParamToSync(int sourceIndex, int formatIndex, int& value);
+		tvDolbyMode_t GetDolbyVisionEnumFromModeString(const char* modeString);
 		std::string getDolbyModeStringFromEnum( tvDolbyMode_t mode);
 		JsonArray getSupportedVideoSource(void);
 		int getAvailableCapabilityModesWrapper(std::string param, std::string & outparam);