Merge branch 'master' into development/webkitbrowser-interface

rdkcentral · Feb 11, 2025 · 897210b · 897210b
2 parents 39bd5bc + f537f4a
commit 897210b
Show file tree

Hide file tree

Showing 7 changed files with 63 additions and 79 deletions.
diff --git a/definitions/Definitions.vcxproj b/definitions/Definitions.vcxproj
@@ -43,7 +43,7 @@
     <ClCompile Include="..\interfaces\json\JsonEnum_Netflix.cpp" />
     <ClCompile Include="..\interfaces\json\JsonEnum_NetworkControl.cpp" />
     <ClCompile Include="..\interfaces\json\JsonEnum_OCDM.cpp" />
-    <ClCompile Include="..\interfaces\json\JsonEnum_Packager.cpp" />
+    <ClCompile Include="..\interfaces\json\JsonEnum_OpenCDM.cpp" />
     <ClCompile Include="..\interfaces\json\JsonEnum_PerformanceMonitor.cpp" />
     <ClCompile Include="..\interfaces\json\JsonEnum_Power.cpp" />
     <ClCompile Include="..\interfaces\json\JsonEnum_Provisioning.cpp" />
@@ -133,6 +133,20 @@
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(ProjectDir)../interfaces/json/JDeviceIdentification.h</Outputs>
       <OutputItemType Condition="'$(Configuration)|$(Platform)'=='Release|x64'">ClInclude</OutputItemType>
     </CustomBuild>
+    <CustomBuild Include="..\interfaces\IOCDM.h">
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">python  "$(ToolPath)\JsonGenerator\JsonGenerator.py" -I "$(FrameworkPath)\" -I "$(ProjectDir)\" --keep-empty --case-convention legacy -c -j "$(ProjectDir)../interfaces" -o "$(ProjectDir)../interfaces/json" "%(FullPath)" --force</Command>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">python  "$(ToolPath)\JsonGenerator\JsonGenerator.py" -I "$(FrameworkPath)\" -I "$(ProjectDir)\" --keep-empty --case-convention legacy -c -j "$(ProjectDir)../interfaces" -o "$(ProjectDir)../interfaces/json" "%(FullPath)" --force</Command>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">python  "$(ToolPath)\JsonGenerator\JsonGenerator.py" -I "$(FrameworkPath)\" -I "$(ProjectDir)\" --keep-empty --case-convention legacy -c -j "$(ProjectDir)../interfaces" -o "$(ProjectDir)../interfaces/json" "%(FullPath)" --force</Command>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">python  "$(ToolPath)\JsonGenerator\JsonGenerator.py" -I "$(FrameworkPath)\" -I "$(ProjectDir)\" --keep-empty --case-convention legacy -c -j "$(ProjectDir)../interfaces" -o "$(ProjectDir)../interfaces/json" "%(FullPath)" --force</Command>
+      <OutputItemType Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">ClInclude</OutputItemType>
+      <OutputItemType Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">ClInclude</OutputItemType>
+      <OutputItemType Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">ClInclude</OutputItemType>
+      <OutputItemType Condition="'$(Configuration)|$(Platform)'=='Release|x64'">ClInclude</OutputItemType>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(ProjectDir)../interfaces/json/JOpenCDM.h</Outputs>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(ProjectDir)../interfaces/json/JOpenCDM.h</Outputs>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(ProjectDir)../interfaces/json/JOpenCDM.h</Outputs>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(ProjectDir)../interfaces/json/JOpenCDM.h</Outputs>
+    </CustomBuild>
     <ClInclude Include="ValuePoint.h" />
     <CustomBuild Include="..\interfaces\IMath.h">
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(ProjectDir)../interfaces/json/JMath.h</Outputs>
@@ -324,9 +338,6 @@
     <CustomBuild Include="..\jsonrpc\OCDM.json">
       <FileType>Document</FileType>
     </CustomBuild>
-    <CustomBuild Include="..\jsonrpc\Packager.json">
-      <FileType>Document</FileType>
-    </CustomBuild>
     <CustomBuild Include="..\jsonrpc\PerformanceMonitor.json">
       <FileType>Document</FileType>
     </CustomBuild>

diff --git a/definitions/Definitions.vcxproj.filters b/definitions/Definitions.vcxproj.filters
@@ -87,10 +87,6 @@
     <ClCompile Include="..\interfaces\json\JsonEnum_Netflix.cpp">
       <Filter>Generated Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\interfaces\json\JsonEnum_OCDM.cpp">
-      <Filter>Generated Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\interfaces\json\JsonEnum_Packager.cpp">
       <Filter>Generated Files</Filter>
     </ClCompile>
     <ClCompile Include="..\interfaces\json\JsonEnum_PerformanceMonitor.cpp">
@@ -144,6 +140,12 @@
     <ClCompile Include="..\interfaces\json\JsonEnum_ZigWave.cpp">
       <Filter>Generated Files</Filter>
     </ClCompile>
+    <ClCompile Include="..\interfaces\json\JsonEnum_OCDM.cpp">
+      <Filter>Generated Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\interfaces\json\JsonEnum_OpenCDM.cpp">
+      <Filter>Generated Files</Filter>
+    </ClCompile>
     <ClCompile Include="..\interfaces\json\JsonEnum_MemoryMonitor.cpp">
       <Filter>Generated Files</Filter>
     </ClCompile>
@@ -213,9 +215,6 @@
     <CustomBuild Include="..\jsonrpc\OCDM.json">
       <Filter>Contracts</Filter>
     </CustomBuild>
-    <CustomBuild Include="..\jsonrpc\Packager.json">
-      <Filter>Contracts</Filter>
-    </CustomBuild>
     <CustomBuild Include="..\jsonrpc\PerformanceMonitor.json">
       <Filter>Contracts</Filter>
     </CustomBuild>
@@ -291,5 +290,8 @@
     <CustomBuild Include="..\interfaces\IDeviceIdentification.h">
       <Filter>Interfaces</Filter>
     </CustomBuild>
+    <CustomBuild Include="..\interfaces\IOCDM.h">
+      <Filter>Interfaces</Filter>
+    </CustomBuild>
   </ItemGroup>
 </Project>
diff --git a/interfaces/IContentDecryption.h b/interfaces/IContentDecryption.h
@@ -43,12 +43,10 @@ namespace Exchange {
             FAILED
         };
 
-        /* @event */
         struct EXTERNAL INotification : virtual public Core::IUnknown {
 
             enum {ID = ID_CONTENTDECRYPTION_NOTIFICATION};
 
-            /* @brief initialization status. */
             virtual void initializationStatus(const std::string& drm,
                                               const Status status) = 0;
         };

diff --git a/interfaces/IOCDM.h b/interfaces/IOCDM.h
@@ -21,9 +21,28 @@
 
 #include "Module.h"
 
+// @insert <com/IIteratorType.h>
+
 namespace Thunder {
 namespace Exchange {
 
+// @json 1.0.0 @text:legacy_lowercase
+struct EXTERNAL IOpenCDM : virtual public Core::IUnknown {
+
+    enum { ID = ID_OPENCDM };
+
+    using IStringIterator = RPC::IIteratorType<string, RPC::ID_STRINGITERATOR>;
+
+    // @property
+    // @brief Supported DRM systems
+    virtual Core::hresult Systems(IStringIterator*& keySystems /* @out */) const = 0;
+
+    // @property
+    // @brief Designators of a specified DRM system
+    // @retval ERROR_UNKNOWN_KEY Invalid DRM name
+    virtual Core::hresult Designators(const string& keySystem /* @index */, IStringIterator*& designators /* @out */) const = 0;
+};
+
 enum OCDM_RESULT : uint32_t {
     OCDM_SUCCESS = 0,
     OCDM_S_FALSE = 1,
@@ -392,7 +411,6 @@ class EXTERNAL KeyId {
     ISession::KeyStatus _status;
 };
 
-
 } //namespace Exchange
 } //namespace Thunder
 
diff --git a/interfaces/IPackager.h b/interfaces/IPackager.h
@@ -23,6 +23,7 @@
 namespace Thunder {
 namespace Exchange {
 
+    // @json 1.0.0 @text:legacy_lowercase
     struct EXTERNAL IPackager : virtual public Core::IUnknown {
         enum { ID = ID_PACKAGER };
 
@@ -49,7 +50,7 @@ namespace Exchange {
             enum { ID = ID_PACKAGER_INSTALLATIONINFO };
             virtual state State() const = 0;
             virtual uint8_t Progress() const = 0;
-	    virtual string AppName() const = 0;
+            virtual string AppName() const = 0;
             virtual uint32_t ErrorCode() const = 0;
             virtual uint32_t Abort() = 0;
         };
@@ -67,10 +68,25 @@ namespace Exchange {
             virtual void RepositorySynchronize(uint32_t status) = 0;
         };
 
+        // @json:omit
         virtual void Register(INotification* observer) = 0;
+        // @json:omit
         virtual void Unregister(const INotification* observer) = 0;
-        virtual uint32_t Configure(PluginHost::IShell* service) = 0;
-        virtual uint32_t Install(const string& name, const string& version, const string& arch) = 0;
+        // @json:omit
+        DEPRECATED virtual uint32_t Configure(PluginHost::IShell* service) = 0;
+
+        // @brief Install a package given by a name, an URL or a file path
+        // @param name: Name, URL or file path of the package to install (e.g. thunder-plugin-netflix)
+        // @param version: Version of the package to install (e.g. 1.0)
+        // @param arch: Architecture of the package to install (e.g. arm)
+        // @retval ERROR_INPROGRESS Other installation/synchronization is already in progress
+        // @retval ERROR_GENERAL Opkg package manager not initialized successfully
+        virtual uint32_t Install(const string& name, const string& version /* @opptional */, const string& arch /* @opptional */) = 0;
+
+        // @brief Synchronize repository manifest with a repository
+        // @alt::deprecated synchronize
+        // @retval ERROR_INPROGRESS Other installation/synchronization is already in progress
+        // @retval ERROR_GENERAL Opkg package manager not initialized successfully
         virtual uint32_t SynchronizeRepository() = 0;
     };
 }

diff --git a/interfaces/Ids.h b/interfaces/Ids.h
@@ -277,6 +277,7 @@ namespace Exchange {
         ID_SESSION                                   = ID_ACCESSOROCDM + 2,
         ID_SESSION_CALLBACK                          = ID_ACCESSOROCDM + 3,
         ID_SESSION_EXTENSION                         = ID_ACCESSOROCDM + 4,
+        ID_OPENCDM                                   = ID_ACCESSOROCDM + 5,
 
         //Butler
         ID_BUTLER                                    = RPC::IDS::ID_EXTERNAL_INTERFACE_OFFSET + 0x3D0,

diff --git a/jsonrpc/Packager.json b/jsonrpc/Packager.json