Delia 69034 delia 68911 25q4 (#6406)

* Delia 68911 main (#6396)

* DELIA-68911 : Send no "clutSize" in modifyPalettedWatermark (#6389)

Reason for change: Skip palette size parameter.
Because of watermark plugin, which
by default having logic that works for
palette size of 256*4. When same watermark
plugin is interacted from aamp instead of
content protection, palette size parameter
is not passed and defaulted to 256*4 inside
watermark plugin.
Test Procedure: None
Risks: None

Signed-off-by: Nikita Poltorapavlo <npoltorapavlo@productengine.com>
Co-authored-by: Anand Kandasamy <37086488+anand-ky@users.noreply.github.com>

* update changelog and api version

---------

Signed-off-by: Nikita Poltorapavlo <npoltorapavlo@productengine.com>
Co-authored-by: Anand Kandasamy <37086488+anand-ky@users.noreply.github.com>
Co-authored-by: apatel859 <48992974+apatel859@users.noreply.github.com>

* Delia 69034 main (#6404)

* DELIA-69034 : handling errors for content protection service (#6387)

Reason for change: Add mapping for Invalid aspect dimension, and
Watermark perceptibility errors. Fix mapping for DRM entitlement error.
Test Procedure: None
Risks: None

Signed-off-by: Nikita Poltorapavlo <npoltorapavlo@productengine.com>
Co-authored-by: Anand Kandasamy <37086488+anand-ky@users.noreply.github.com>

* RDKEMW-8549 : handling errors for content protection service (#6392)

Reason for change: Typo fix.
Test Procedure: None
Risks: None

Signed-off-by: Nikita Poltorapavlo <npoltorapavlo@productengine.com>

* update changelog and api version

---------

Signed-off-by: Nikita Poltorapavlo <npoltorapavlo@productengine.com>
Co-authored-by: Anand Kandasamy <37086488+anand-ky@users.noreply.github.com>

---------

Signed-off-by: Nikita Poltorapavlo <npoltorapavlo@productengine.com>
Co-authored-by: Anand Kandasamy <37086488+anand-ky@users.noreply.github.com>
Co-authored-by: apatel859 <48992974+apatel859@users.noreply.github.com>

Author: 3 people

ContentProtection/CHANGELOG.md

@@ -16,6 +16,14 @@ All notable changes to this RDK Service will be documented in this file.
 
 * For more details, refer to [versioning](https://github.com/rdkcentral/rdkservices#versioning) section under Main README.
 
+## [3.1.0] - 2025-10-03
+### Added
+- Update the interface for handling Invalid aspect dimension, Watermark perceptibility, and DRM entitlement errors
+
+## [3.0.3] - 2025-09-30
+### Fixed
+- Skip palette size parameter in watermark plugin call, similarly to aamp
+
 ## [3.0.2] - 2025-08-08
 ### Fixed
 - JSON-RPC calls changed from sync to a-sync

ContentProtection/ContentProtection.cpp

@@ -20,8 +20,8 @@
 #include "ContentProtection.h"
 
 #define API_VERSION_NUMBER_MAJOR 3
-#define API_VERSION_NUMBER_MINOR 0
-#define API_VERSION_NUMBER_PATCH 2
+#define API_VERSION_NUMBER_MINOR 1
+#define API_VERSION_NUMBER_PATCH 0
 
 namespace WPEFramework {
 namespace Plugin {

ContentProtection/ContentProtection.h

@@ -311,8 +311,9 @@ namespace Plugin {
             uint16_t classification, uint16_t reason)
         {
             Core::OptionalType<uint32_t> result;
-            // https://github.com/comcast-contentsecurity/spec
+            // https://github.com/comcast-contentsecurity/spec/blob/master/device-security/SecManagerResultStatus.md
             static std::map<std::tuple<uint16_t, uint16_t>, uint32_t> map{
+                { { 100, 2 }, 21002 },
                 { { 100, 3 }, 21003 },
                 { { 100, 4 }, 21004 },
                 { { 100, 5 }, 21005 },
@@ -330,10 +331,15 @@ namespace Plugin {
                 { { 200, 11 }, 22011 },
                 { { 200, 12 }, 22012 },
                 { { 200, 13 }, 22013 },
-                { { 200, 16 }, 22016 },
+                { { 200, 102 }, 22016 },
                 { { 300, 1 }, 23001 },
                 { { 300, 3 }, 23003 },
-                { { 300, 12 }, 23012 }
+                { { 300, 12 }, 23012 },
+                { { 300, 1002 }, 23014 },
+                { { 300, 1003 }, 23014 },
+                { { 300, 1004 }, 23014 },
+                { { 300, 1007 }, 23014 },
+                { { 300, 1008 }, 23014 }
             };
             auto it = map.find(std::make_tuple(classification, reason));
             if (it != map.end()) {
@@ -732,6 +738,16 @@ namespace Plugin {
                                out.ClutKey = params.WatermarkClutBufferKey;
                                out.ClutSize = palette.Value().clutSize;
                                out.ClutType = palette.Value().clutType;
+                               // Skip palette size parameter.
+                               // Because of watermark plugin, which
+                               // by default having logic that works for
+                               // palette size of 256*4. When same watermark
+                               // plugin is interacted from aamp instead of
+                               // content protection, palette size parameter
+                               // is not passed and defaulted to 256*4 inside
+                               // watermark plugin.
+                               out.Remove(_T("clutSize"));
+
                                Callback1 callback =
                                    [&, id](const JsonObject& in) {
                                        if (!in["success"].Boolean()) {