VPLAY-12202 - [Linear] black screen in sequential channel change by anjali-syna · Pull Request #783 · rdkcentral/aamp

anjali-syna · 2025-12-22T07:18:56Z

Randomly black screen due to 'internal data stream error' is seen while doing sequential channel change

Reason for change: In the problematic sequential channel change scenario, stop is initiated just after DRMLicenseManager has initiated the license request through content security manager. Then the new session sends its content protecting data to PrefetchThread for initiating the license request. But PrefetchThread is still waiting for the license response of the previous session and this gets updated to CDM and the new session's license acquisition fails.

Changes:

Added a mutex lock in Prefetch thread for the createDrmSession flow, so that AampLicensePreFetcher::Term() can make sure that createDrmSession flow is finished before stop. Also, added license request abort check in AampDRMLicenseManager::acquireLicense after the license response is received, so that incorrect license won't be set to CDM.

Test Procedure: Refer JIRA ticket

Risks: low

Copilot

Pull request overview

This pull request addresses a race condition that causes black screens during sequential channel changes. The issue occurs when a stop is initiated during license acquisition, potentially causing the previous session's license response to be incorrectly applied to a new session's CDM.

Key Changes:

Added mutex protection around createDrmSession to synchronize with stop flow
Added abort check after license response is received to prevent applying stale licenses
Added diagnostic logging for license fetcher operations

Reviewed changes

Copilot reviewed 3 out of 3 changed files in this pull request and generated 4 comments.

File	Description
middleware/drm/DrmSessionManager.cpp	Added logging to destructor for debugging session lifecycle
drm/AampDRMLicManager.cpp	Added post-response abort check and logging to prevent stale license application
AampDRMLicPreFetcher.cpp	Added mutex protection around createDrmSession and logging for license fetcher state

drm/AampDRMLicManager.cpp

AampDRMLicPreFetcher.cpp

drm/AampDRMLicManager.cpp

AampDRMLicPreFetcher.cpp

Copilot

Pull request overview

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

drm/AampDRMLicManager.h

drm/AampDRMLicManager.cpp

AampDRMLicPreFetcher.cpp

Copilot

Pull request overview

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

AampDRMLicPreFetcher.cpp

…e doing sequential channel change Reason for change: In the problematic sequential channel change scenario, stop is initiated just after DRMLicenseManager has initiated the license request. Stop flow calls mDRMLicenseManager->setLicenseRequestAbort(true). Then as part of the new sessions start flow, this flag is again set back to false. The new session sends its content protecting data to PrefetchThread for initiating the license request. But PrefetchThread is still waiting for the license response of the previous session and when it receives the license, previous session's licence response gets updated to CDM and the new session's license acquisition fails. Changes: * Added a mutex lock in Prefetch thread for the createDrmSession flow, so that AampLicensePreFetcher::Term() or AampLicensePreFetcher::SetLicenseFetcher() can make sure that createDrmSession flow is finished before stop. Also, added license request abort check in AampDRMLicenseManager::acquireLicense after the license response is received, so that incorrect license won't be set to CDM. Test Procedure: Refer JIRA ticket Risks: low

Signed-off-by: anjali-syna <206662904+anjali-syna@users.noreply.github.com>

Copilot

Pull request overview

Copilot reviewed 35 out of 35 changed files in this pull request and generated 13 comments.

test/gstTestHarness/gst-port.cpp

downloader/AampCurlDownloader.h

AampDRMLicPreFetcher.cpp

test/utests/tests/AampCurlDownloader/FunctionalTests.cpp

downloader/AampCurlDownloader.cpp

test/utests/tests/AampCurlDownloader/FunctionalTests.cpp

test/jsBindingTest/Readme.md

test/gstTestHarness/gst-port.cpp

test/gstTestHarness/gst-port.h

…e doing sequential channel change Reason for change: In the problematic sequential channel change scenario, stop is initiated just after DRMLicenseManager has initiated the license request. Stop flow calls mDRMLicenseManager->setLicenseRequestAbort(true). Then as part of the new sessions start flow, this flag is again set back to false. The new session sends its content protecting data to PrefetchThread for initiating the license request. But PrefetchThread is still waiting for the license response of the previous session and when it receives the license, previous session's licence response gets updated to CDM and the new session's license acquisition fails. Changes: * Added a mutex lock in Prefetch thread for the createDrmSession flow, so that AampLicensePreFetcher::Term() or AampLicensePreFetcher::SetLicenseFetcher() can make sure that createDrmSession flow is finished before stop. Also, added license request abort check in AampDRMLicenseManager::acquireLicense after the license response is received, so that incorrect license won't be set to CDM. Test Procedure: Refer JIRA ticket Risks: low

Signed-off-by: anjali-syna <206662904+anjali-syna@users.noreply.github.com>

drm/AampDRMLicManager.cpp

test/utests/tests/AampDRMLicPreFetcherTests/AampDRMLicPreFetcherTestCases.cpp

drm/AampDRMLicManager.cpp

test/utests/tests/AampDRMLicPreFetcherTests/AampDRMLicPreFetcherTestCases.cpp

Signed-off-by: anjali-syna <206662904+anjali-syna@users.noreply.github.com>

Copilot

Pull request overview

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

drm/AampDRMLicManager.cpp

test/utests/tests/AampDRMLicPreFetcherTests/AampDRMLicPreFetcherTestCases.cpp

Signed-off-by: anjali-syna <206662904+anjali-syna@users.noreply.github.com>

Copilot

Pull request overview

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

test/utests/tests/AampDRMLicPreFetcherTests/AampDRMLicPreFetcherTestCases.cpp

AampDRMLicPreFetcher.cpp

test/utests/tests/AampDRMLicPreFetcherTests/AampDRMLicPreFetcherTestCases.cpp

Signed-off-by: anjali-syna <206662904+anjali-syna@users.noreply.github.com>

… feature/VPLAY-12202

Copilot

Pull request overview

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

test/utests/tests/AampDRMLicPreFetcherTests/AampDRMLicPreFetcherTestCases.cpp

AampDRMLicPreFetcher.cpp

test/utests/tests/AampDRMLicPreFetcherTests/AampDRMLicPreFetcherTestCases.cpp

AampDRMLicPreFetcher.cpp

Signed-off-by: anjali-syna <206662904+anjali-syna@users.noreply.github.com>

… feature/VPLAY-12202

Signed-off-by: anjali-syna <206662904+anjali-syna@users.noreply.github.com>

Copilot

Pull request overview

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

VPLAY-12202 - [Linear] black screen due to 'internal data error' while doing sequential channel change Reason for change: In the problematic sequential channel change scenario, stop is initiated just after DRMLicenseManager has initiated the license request. Stop flow calls mDRMLicenseManager->setLicenseRequestAbort(true). Then as part of the new sessions start flow, this flag is again set back to false. The new session sends its content protecting data to PrefetchThread for initiating the license request. But PrefetchThread is still waiting for the license response of the previous session and when it receives the license, previous session's licence response gets updated to CDM and the new session's license acquisition fails. Changes: * Added a mutex lock in Prefetch thread for the createDrmSession flow, so that AampLicensePreFetcher::Term() or AampLicensePreFetcher::SetLicenseFetcher() can make sure that createDrmSession flow is finished before stop. Also, added license request abort check in AampDRMLicenseManager::acquireLicense after the license response is received, so that incorrect license won't be set to CDM. Test Procedure: Refer JIRA ticket Risks: low Signed-off-by: anjali-syna <206662904+anjali-syna@users.noreply.github.com>

… (#1001) VPLAY-12202 - [Linear] black screen due to 'internal data error' while doing sequential channel change Reason for change: In the problematic sequential channel change scenario, stop is initiated just after DRMLicenseManager has initiated the license request. Stop flow calls mDRMLicenseManager->setLicenseRequestAbort(true). Then as part of the new sessions start flow, this flag is again set back to false. The new session sends its content protecting data to PrefetchThread for initiating the license request. But PrefetchThread is still waiting for the license response of the previous session and when it receives the license, previous session's licence response gets updated to CDM and the new session's license acquisition fails. Changes: * Added a mutex lock in Prefetch thread for the createDrmSession flow, so that AampLicensePreFetcher::Term() or AampLicensePreFetcher::SetLicenseFetcher() can make sure that createDrmSession flow is finished before stop. Also, added license request abort check in AampDRMLicenseManager::acquireLicense after the license response is received, so that incorrect license won't be set to CDM. Test Procedure: Refer JIRA ticket Risks: low Signed-off-by: anjali-syna <206662904+anjali-syna@users.noreply.github.com> Co-authored-by: anjali-syna <206662904+anjali-syna@users.noreply.github.com>

anjali-syna marked this pull request as ready for review December 22, 2025 18:09

anjali-syna requested a review from a team as a code owner December 22, 2025 18:09

Copilot AI review requested due to automatic review settings December 22, 2025 18:09

Copilot started reviewing on behalf of anjali-syna December 22, 2025 18:09 View session

anjali-syna requested a review from Vinish100 December 22, 2025 18:10

Copilot AI reviewed Dec 22, 2025

View reviewed changes

drm/AampDRMLicManager.cpp Outdated Show resolved Hide resolved

AampDRMLicPreFetcher.cpp Show resolved Hide resolved

drm/AampDRMLicManager.cpp Outdated Show resolved Hide resolved

AampDRMLicPreFetcher.cpp Outdated Show resolved Hide resolved

rdkcmf-jenkins reviewed Dec 23, 2025

View reviewed changes

AampDRMLicPreFetcher.cpp Show resolved Hide resolved

AampDRMLicPreFetcher.cpp Show resolved Hide resolved

Copilot AI review requested due to automatic review settings December 24, 2025 03:08

Copilot started reviewing on behalf of anjali-syna December 24, 2025 03:08 View session

Copilot AI reviewed Dec 24, 2025

View reviewed changes

Copilot AI review requested due to automatic review settings December 24, 2025 07:53

Copilot started reviewing on behalf of anjali-syna December 24, 2025 07:53 View session

Copilot AI reviewed Dec 24, 2025

View reviewed changes

AampDRMLicPreFetcher.cpp Outdated Show resolved Hide resolved

AampDRMLicPreFetcher.cpp Outdated Show resolved Hide resolved

anjali-syna added 9 commits January 5, 2026 13:52

Code is updated

1bccf9e

Signed-off-by: anjali-syna <206662904+anjali-syna@users.noreply.github.com>

Resolving merge conflicts

c94fce1

Signed-off-by: anjali-syna <206662904+anjali-syna@users.noreply.github.com>

Removed commented code and logs are updated

2c5fde6

Signed-off-by: anjali-syna <206662904+anjali-syna@users.noreply.github.com>

Added comments

97f22c8

Signed-off-by: anjali-syna <206662904+anjali-syna@users.noreply.github.com>

Resolving merge conflicts

f8dfd74

Signed-off-by: anjali-syna <206662904+anjali-syna@users.noreply.github.com>

Resolving Merge conflicts

41d186e

Signed-off-by: anjali-syna <206662904+anjali-syna@users.noreply.github.com>

Addressed a review comment from copilot

1228cc8

Signed-off-by: anjali-syna <206662904+anjali-syna@users.noreply.github.com>

Addressed more comments from copilot

77544a9

Signed-off-by: anjali-syna <206662904+anjali-syna@users.noreply.github.com>

Copilot AI review requested due to automatic review settings January 5, 2026 08:34

Copilot started reviewing on behalf of anjali-syna January 5, 2026 08:35 View session

Copilot AI reviewed Jan 5, 2026

View reviewed changes

anjali-syna added 3 commits January 5, 2026 14:13

Resolved merge conficts

1067225

Signed-off-by: anjali-syna <206662904+anjali-syna@users.noreply.github.com>

Resolved merge conflicts

eb820d4

Signed-off-by: anjali-syna <206662904+anjali-syna@users.noreply.github.com>

anjali-syna force-pushed the feature/VPLAY-12202 branch from cde7eda to eb820d4 Compare January 5, 2026 08:58

Merge branch 'dev_sprint_25_2' into feature/VPLAY-12202

b201b29

jfagunde reviewed Jan 8, 2026

View reviewed changes

addressed new review comments

29fce50

Signed-off-by: anjali-syna <206662904+anjali-syna@users.noreply.github.com>

Copilot AI review requested due to automatic review settings January 8, 2026 17:12

Copilot started reviewing on behalf of anjali-syna January 8, 2026 17:13 View session

Copilot AI reviewed Jan 8, 2026

View reviewed changes

jfagunde reviewed Jan 9, 2026

View reviewed changes

test/utests/tests/AampDRMLicPreFetcherTests/AampDRMLicPreFetcherTestCases.cpp Outdated Show resolved Hide resolved

anjali-syna added 2 commits January 9, 2026 21:30

Addressed all review comments

45de3cd

Signed-off-by: anjali-syna <206662904+anjali-syna@users.noreply.github.com>

Merge branch 'dev_sprint_25_2' into feature/VPLAY-12202

8e4d79b

Copilot AI review requested due to automatic review settings January 9, 2026 16:02

Copilot started reviewing on behalf of anjali-syna January 9, 2026 16:03 View session

Copilot AI reviewed Jan 9, 2026

View reviewed changes

test/utests/tests/AampDRMLicPreFetcherTests/AampDRMLicPreFetcherTestCases.cpp Show resolved Hide resolved

test/utests/tests/AampDRMLicPreFetcherTests/AampDRMLicPreFetcherTestCases.cpp Outdated Show resolved Hide resolved

AampDRMLicPreFetcher.cpp Outdated Show resolved Hide resolved

jfagunde reviewed Jan 9, 2026

View reviewed changes

anjali-syna added 3 commits January 12, 2026 12:55

Addressing review comments

1d86a02

Signed-off-by: anjali-syna <206662904+anjali-syna@users.noreply.github.com>

Merge branch 'feature/VPLAY-12202' of github.com:rdkcentral/aamp into…

c1167a0

… feature/VPLAY-12202

Merge branch 'dev_sprint_25_2' into feature/VPLAY-12202

4fa6b5c

Copilot AI review requested due to automatic review settings January 12, 2026 07:26

Copilot started reviewing on behalf of anjali-syna January 12, 2026 07:27 View session

Copilot AI reviewed Jan 12, 2026

View reviewed changes

anjali-syna added 3 commits January 12, 2026 13:38

Addresing new review comments

28ef65e

Signed-off-by: anjali-syna <206662904+anjali-syna@users.noreply.github.com>

Merge branch 'feature/VPLAY-12202' of github.com:rdkcentral/aamp into…

533a1d5

… feature/VPLAY-12202

Addressing new review comments

92bd14f

Signed-off-by: anjali-syna <206662904+anjali-syna@users.noreply.github.com>

Copilot AI review requested due to automatic review settings January 12, 2026 09:21

Copilot started reviewing on behalf of anjali-syna January 12, 2026 09:22 View session

Copilot AI reviewed Jan 12, 2026

View reviewed changes

jfagunde approved these changes Jan 12, 2026

View reviewed changes

Merge branch 'dev_sprint_25_2' into feature/VPLAY-12202

70104cc

pstroffolino merged commit cf1c37f into dev_sprint_25_2 Jan 13, 2026
7 of 8 checks passed

pstroffolino deleted the feature/VPLAY-12202 branch January 13, 2026 01:22

Conversation

anjali-syna commented Dec 22, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Reviewed changes

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Uh oh!

Uh oh!

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

anjali-syna commented Dec 22, 2025 •

edited

Loading