RDKEMW-6776 Encrypted Pipeline Changes with SVPPAY on AAMP by suryaiyappan2k · Pull Request #196 · rdkcentral/middleware-player-interface

suryaiyappan2k · 2026-07-10T08:25:05Z

Reason for change: To insert the svppayload element into encrypted pipeline immediately after the aampdecryptor element.
Test procedure: Test playback across all the apps.
Risks: Low.

github-actions · 2026-07-10T08:25:18Z

All contributors have signed the CLA ✍️ ✅
_{Posted by the CLA Assistant Lite bot.}

rdkcmf-jenkins · 2026-07-10T08:26:24Z

b'## Blackduck scan failure details

Summary: 0 violations, 0 files pending approval, 1 file pending identification.

Protex Server Path: /home/blackduck/github/middleware-player-interface/196/rdkcentral/middleware-player-interface
Commit: c4f02be

Report detail: gist'

suryaiyappan2k · 2026-07-10T08:27:35Z

I have read the CLA Document and I hereby sign the CLA

Copilot

Pull request overview

This PR is intended to adjust encrypted playback pipeline behavior (per description: insert svppayload immediately after aampdecryptor), and it also refactors DRM decryptor src-pad caps advertisement to be built dynamically based on a runtime-discovered platform secure-memory feature.

Changes:

Adds a new element_setup callback hookup for video streams in InterfacePlayerRDK (currently only logs element names).
Builds Widevine/PlayReady decryptor src pad-template caps dynamically at class_init time using new gst_cdmidecryptor_* helper APIs.
Adds runtime discovery of platform secure-memory caps feature in gstcdmidecryptor and updates caps-transform logging.

Reviewed changes

Copilot reviewed 5 out of 5 changed files in this pull request and generated 11 comments.

Show a summary per file

File	Description
InterfacePlayerRDK.cpp	Adds a new `element_setup` callback for video streams (currently logging-only).
gst-plugins/drm/gst/gstwidevinedecryptor.cpp	Replaces static src pad-template caps with dynamically generated caps string.
gst-plugins/drm/gst/gstplayreadydecryptor.cpp	Same dynamic src pad-template caps approach as Widevine.
gst-plugins/drm/gst/gstcdmidecryptor.h	Exposes new public APIs for platform memory-feature discovery and caps-string building.
gst-plugins/drm/gst/gstcdmidecryptor.cpp	Implements platform memory-feature discovery, dynamic mime-type/caps generation, and adds additional caps-transform logging.

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

+static void element_setup_cb_svppay(GstElement *playbin, GstElement *element, gpointer user_data)
+{
+	const gchar *name = gst_element_get_name(element);
+	MW_LOG_ERR("muthumani: Received element:%s", name);
+}


+static void element_setup_cb_svppay(GstElement *playbin, GstElement *element, gpointer user_data)
+{
+	const gchar *name = gst_element_get_name(element);
+	MW_LOG_ERR("muthumani: Received element:%s", name);
+}


+	if (eGST_MEDIATYPE_VIDEO == streamId)
+	{
+		g_signal_connect(stream->sinkbin, "element_setup", G_CALLBACK(element_setup_cb_svppay), pInterfacePlayerRDK);
+	}


@@ -127,6 +127,183 @@

 static const gchar *srcMimeTypes[] = { "video/x-h264", "video/x-h264(memory:SecMem)", "audio/mpeg", "video/x-h265", "video/x-h265(memory:SecMem)", "audio/x-eac3", "audio/x-gst-fourcc-ec_3", "audio/x-ac3","audio/x-opus", nullptr };


+static const gchar *baseMimeTypes[] = {
+    "video/x-h264", "video/x-h265",
+    "audio/mpeg", "audio/x-eac3", "audio/x-gst-fourcc-ec_3", "audio/x-ac3", "audio/x-opus",
+    nullptr
+};


+			if (direction == GST_PAD_SINK && !gst_caps_is_empty(transformedCaps))
+			{
+				gchar *caps_before = gst_caps_to_string(transformedCaps);
+				g_print("muthumani: OCDMGstTransformCaps - caps BEFORE transform: %s\n", caps_before);
+				g_free(caps_before);

+				if (OCDMGstTransformCaps)
+				{
+					OpenCDMError ret = OCDMGstTransformCaps(&transformedCaps);
+					gchar *caps_after = gst_caps_to_string(transformedCaps);
+					g_print("muthumani: OCDMGstTransformCaps - called, ret=%d, caps AFTER transform: %s\n", ret, caps_after);
+					g_free(caps_after);
+				}
+				else
+				{
+					g_print("muthumani: OCDMGstTransformCaps is NULL - skipping caps transform\n");
+				}
+			}


+    const gchar *platformMemFeature = gst_cdmidecryptor_get_platform_memory_feature();
+    gchar *srcCapsStr = gst_cdmidecryptor_build_src_caps_string(platformMemFeature);
+    GstCaps *srcCaps = gst_caps_from_string(srcCapsStr);
+    g_free(srcCapsStr);
+
+    GstPadTemplate *srcTemplate = gst_pad_template_new("src", GST_PAD_SRC, GST_PAD_ALWAYS, srcCaps);
+    gst_caps_unref(srcCaps);
+    gst_element_class_add_pad_template(elementClass, srcTemplate);


+        const gchar *platformMemFeature = gst_cdmidecryptor_get_platform_memory_feature();
+        gchar *srcCapsStr = gst_cdmidecryptor_build_src_caps_string(platformMemFeature);
+        GstCaps *srcCaps = gst_caps_from_string(srcCapsStr);
+        g_free(srcCapsStr);
+
+        GstPadTemplate *srcTemplate = gst_pad_template_new("src", GST_PAD_SRC, GST_PAD_ALWAYS, srcCaps);
+        gst_caps_unref(srcCaps);
+        gst_element_class_add_pad_template(elementClass, srcTemplate);
+


+ * The returned string is allocated with g_strdup_printf and must be freed with g_free().
+ * Typically called from a subclass class_init to construct a dynamic pad template.


+/* Base video/audio media types supported by all platforms */
+static const gchar *baseMimeTypes[] = {
+    "video/x-h264", "video/x-h265",
+    "audio/mpeg", "audio/x-eac3", "audio/x-gst-fourcc-ec_3", "audio/x-ac3", "audio/x-opus",
+    nullptr
+};


rdkcmf-jenkins · 2026-07-10T09:16:28Z

b'## Blackduck scan failure details

Summary: 0 violations, 0 files pending approval, 1 file pending identification.

Protex Server Path: /home/blackduck/github/middleware-player-interface/196/rdkcentral/middleware-player-interface
Commit: 4f76608

Report detail: gist'

rdkcmf-jenkins · 2026-07-10T11:23:21Z

b'## Blackduck scan failure details

Summary: 0 violations, 0 files pending approval, 1 file pending identification.

Protex Server Path: /home/blackduck/github/middleware-player-interface/196/rdkcentral/middleware-player-interface
Commit: 4f76608

Report detail: gist'

rdkcmf-jenkins · 2026-07-10T11:28:33Z

b'## WARNING: A Blackduck scan failure has been waived

A prior failure has been upvoted

Upvote reason: boilerplate matches
Commit: 4f76608
'

Copilot

Pull request overview

Copilot reviewed 5 out of 5 changed files in this pull request and generated 6 comments.

@@ -127,6 +127,182 @@ static unsigned char* ReplaceKIDPsshData(const unsigned char *InputData, const s

 static const gchar *srcMimeTypes[] = { "video/x-h264", "video/x-h264(memory:SecMem)", "audio/mpeg", "video/x-h265", "video/x-h265(memory:SecMem)", "audio/x-eac3", "audio/x-gst-fourcc-ec_3", "audio/x-ac3","audio/x-opus", nullptr };


+				gchar *caps_before = gst_caps_to_string(transformedCaps);
+				g_free(caps_before);

+				if (OCDMGstTransformCaps)
+				{
+					OpenCDMError ret = OCDMGstTransformCaps(&transformedCaps);
+					gchar *caps_after = gst_caps_to_string(transformedCaps);
+					g_free(caps_after);
+				}
+				else
+				{
+					GST_WARNING("OCDMGstTransformCaps is NULL - skipping caps transform");
+				}


+    GstPadTemplate *srcTemplate = gst_pad_template_new("src", GST_PAD_SRC, GST_PAD_ALWAYS, srcCaps);
+    gst_caps_unref(srcCaps);
+    gst_element_class_add_pad_template(elementClass, srcTemplate);


+        GstPadTemplate *srcTemplate = gst_pad_template_new("src", GST_PAD_SRC, GST_PAD_ALWAYS, srcCaps);
+        gst_caps_unref(srcCaps);
+        gst_element_class_add_pad_template(elementClass, srcTemplate);


+ * @brief Build a dynamic GstCaps string for the src pad template of a decryptor,
+ *        appending the platform-specific secure memory feature (if any) to video types.
+ *
+ * The returned string is allocated with g_strdup_printf and must be freed with g_free().


+static void element_setup_cb_svppay(GstElement *playbin, GstElement *element, gpointer user_data)
+{
+	const gchar *name = gst_element_get_name(element);
+    MW_LOG_INFO( "Received element: %s", name);
+}


Reason for change: To insert the svppayload element into encrypted pipeline immediately after the aampdecryptor element. Test procedure: Test playback across all the apps. Risks: Low.

Copilot

Pull request overview

Copilot reviewed 5 out of 5 changed files in this pull request and generated no new comments.

Comments suppressed due to low confidence (7)

InterfacePlayerRDK.cpp:2075

The new element_setup_cb_svppay logs at INFO for every element_setup invocation, which can spam logs and add overhead. Consider lowering the log level and/or filtering to the specific element(s) you care about (e.g., the decryptor) and mark unused parameters explicitly.

static void element_setup_cb_svppay(GstElement *playbin, GstElement *element, gpointer user_data)
{
	const gchar *name = gst_element_get_name(element);
    MW_LOG_INFO( "Received element: %s", name);
}

InterfacePlayerRDK.cpp:2524

PR description says svppayload should be inserted immediately after aampdecryptor in the encrypted pipeline, but the current change only connects a callback that logs element names and does not perform any insertion/relinking. Either implement the insertion here (e.g., when the decryptor element is created) or update the PR description to match the actual behavior.

	if (eGST_MEDIATYPE_VIDEO == streamId)
	{
		g_signal_connect(stream->sinkbin, "element_setup", G_CALLBACK(element_setup_cb_svppay), pInterfacePlayerRDK);
	}

gst-plugins/drm/gst/gstcdmidecryptor.cpp:133

The dynamically-built baseMimeTypes list dropped audio/x-ac4, but both Widevine and PlayReady sink templates still advertise audio/x-ac4. This can break caps negotiation for AC4 content (regression vs the previous static src caps).

static const gchar *baseMimeTypes[] = {
    "video/x-h264", "video/x-h265",
    "audio/mpeg", "audio/x-eac3", "audio/x-gst-fourcc-ec_3", "audio/x-ac3", "audio/x-opus",
    nullptr
};

gst-plugins/drm/gst/gstcdmidecryptor.cpp:640

This block creates caps strings (and a ret variable) but immediately frees/ignores them, which is wasted work and may trigger -Wunused-variable warnings in builds that treat warnings as errors. Either remove it entirely or log the values via GST_* macros.

				gchar *caps_before = gst_caps_to_string(transformedCaps);
				g_free(caps_before);

				if (OCDMGstTransformCaps)
				{

gst-plugins/drm/gst/gstwidevinedecryptor.cpp:92

gst_caps_from_string() can return NULL; the current code unrefs srcCaps unconditionally, which can crash and/or fail to register the src pad template. Add a fallback (e.g., retry without the platform memory feature or use gst_caps_new_any()) before creating the pad template.

    GstCaps *srcCaps = gst_caps_from_string(srcCapsStr);
    g_free(srcCapsStr);

    GstPadTemplate *srcTemplate = gst_pad_template_new("src", GST_PAD_SRC, GST_PAD_ALWAYS, srcCaps);
    gst_caps_unref(srcCaps);

gst-plugins/drm/gst/gstplayreadydecryptor.cpp:95

gst_caps_from_string() can return NULL; the current code unrefs srcCaps unconditionally, which can crash and/or fail to register the src pad template. Add a fallback (e.g., retry without the platform memory feature or use gst_caps_new_any()) before creating the pad template.

        GstCaps *srcCaps = gst_caps_from_string(srcCapsStr);
        g_free(srcCapsStr);

        GstPadTemplate *srcTemplate = gst_pad_template_new("src", GST_PAD_SRC, GST_PAD_ALWAYS, srcCaps);
        gst_caps_unref(srcCaps);

gst-plugins/drm/gst/gstcdmidecryptor.h:91

The docstring says the returned string is allocated with g_strdup_printf, but the implementation uses GString/g_string_free(). Update the comment to avoid misleading callers (the important part is that g_free() must be used).

 * The returned string is allocated with g_strdup_printf and must be freed with g_free().

Copilot AI review requested due to automatic review settings July 10, 2026 08:25

suryaiyappan2k requested a review from a team as a code owner July 10, 2026 08:25

Copilot started reviewing on behalf of suryaiyappan2k July 10, 2026 08:25 View session

Copilot AI reviewed Jul 10, 2026

View reviewed changes

suryaiyappan2k force-pushed the feature/RDKEMW-6776-v1 branch from c4f02be to 4f76608 Compare July 10, 2026 09:14

Copilot AI review requested due to automatic review settings July 14, 2026 04:28

suryaiyappan2k force-pushed the feature/RDKEMW-6776-v1 branch from 4f76608 to ecc97aa Compare July 14, 2026 04:28

Copilot started reviewing on behalf of suryaiyappan2k July 14, 2026 04:28 View session

Copilot AI reviewed Jul 14, 2026

View reviewed changes

suryaiyappan2k force-pushed the feature/RDKEMW-6776-v1 branch from ecc97aa to c39b353 Compare July 14, 2026 04:36

RDKEMW-6776 Encrypted Pipeline Changes with SVPPAY on AAMP

e834710

Reason for change: To insert the svppayload element into encrypted pipeline immediately after the aampdecryptor element. Test procedure: Test playback across all the apps. Risks: Low.

Copilot AI review requested due to automatic review settings July 19, 2026 13:59

suryaiyappan2k force-pushed the feature/RDKEMW-6776-v1 branch from c39b353 to e834710 Compare July 19, 2026 13:59

Copilot started reviewing on behalf of suryaiyappan2k July 19, 2026 14:00 View session

Copilot AI reviewed Jul 19, 2026

View reviewed changes

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

RDKEMW-6776 Encrypted Pipeline Changes with SVPPAY on AAMP#196

RDKEMW-6776 Encrypted Pipeline Changes with SVPPAY on AAMP#196
suryaiyappan2k wants to merge 1 commit into
developfrom
feature/RDKEMW-6776-v1

suryaiyappan2k commented Jul 10, 2026

Uh oh!

github-actions Bot commented Jul 10, 2026 •

edited

Loading

Uh oh!

rdkcmf-jenkins commented Jul 10, 2026

Uh oh!

suryaiyappan2k commented Jul 10, 2026

Uh oh!

Copilot AI left a comment

Uh oh!

rdkcmf-jenkins commented Jul 10, 2026

Uh oh!

rdkcmf-jenkins commented Jul 10, 2026

Uh oh!

rdkcmf-jenkins commented Jul 10, 2026

Uh oh!

Copilot AI left a comment

Uh oh!

Copilot AI left a comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

		@@ -127,6 +127,183 @@

		static const gchar *srcMimeTypes[] = { "video/x-h264", "video/x-h264(memory:SecMem)", "audio/mpeg", "video/x-h265", "video/x-h265(memory:SecMem)", "audio/x-eac3", "audio/x-gst-fourcc-ec_3", "audio/x-ac3","audio/x-opus", nullptr };

		* The returned string is allocated with g_strdup_printf and must be freed with g_free().
		* Typically called from a subclass class_init to construct a dynamic pad template.

		@@ -127,6 +127,182 @@ static unsigned char* ReplaceKIDPsshData(const unsigned char *InputData, const s

		static const gchar *srcMimeTypes[] = { "video/x-h264", "video/x-h264(memory:SecMem)", "audio/mpeg", "video/x-h265", "video/x-h265(memory:SecMem)", "audio/x-eac3", "audio/x-gst-fourcc-ec_3", "audio/x-ac3","audio/x-opus", nullptr };

Uh oh!

Conversation

suryaiyappan2k commented Jul 10, 2026

Uh oh!

github-actions Bot commented Jul 10, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

rdkcmf-jenkins commented Jul 10, 2026

Uh oh!

suryaiyappan2k commented Jul 10, 2026

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Reviewed changes

Uh oh!

rdkcmf-jenkins commented Jul 10, 2026

Uh oh!

rdkcmf-jenkins commented Jul 10, 2026

Uh oh!

rdkcmf-jenkins commented Jul 10, 2026

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

github-actions Bot commented Jul 10, 2026 •

edited

Loading