VPAAMP-1031 HDMI hot plug - #1944
Draft
DomSyna wants to merge 3 commits into
Draft
Conversation
Contributor
There was a problem hiding this comment.
🟢 Approval recommended
The behavior change is narrowly scoped, matches the stated intent (suppress non-fatal OUTPUT_PROTECTION escalation), and is covered by an updated L1 test for the mapping/dispatch.
Pull request overview
Adjusts direct-rialto handling of Rialto playback errors so HDMI/HDCP recovery (OUTPUT_PROTECTION) is treated as non-fatal and no longer escalated into an AAMP tune-failure path that can stall recovery after hot-plug events.
Changes:
- Suppress escalation for
PlaybackError::OUTPUT_PROTECTIONinAampRialtoPlayer::OnPlaybackError()(log-only behavior). - Update the existing L1 test to assert that
OUTPUT_PROTECTIONdoes not triggerNotifyPlaybackError().
File summaries
| File | Description |
|---|---|
| direct-rialto/AampRialtoPlayer.cpp | Stops mapping OUTPUT_PROTECTION to an AAMP tune failure; logs the event instead. |
| test/utests/tests/AampRialtoPlayerTests/AampRialtoPlayerTestCases.cpp | Updates the unit test expectation to ensure OUTPUT_PROTECTION is suppressed (no NotifyPlaybackError). |
Review details
- Files reviewed: 2/2 changed files
- Comments generated: 1
- Review effort level: Lite
💡 Add a code-review agent skill or configure MCP servers for context-aware, tailored reviews. Learn more in the docs.
Comment on lines
+2778
to
+2779
| AAMPLOG_WARN("%s - non-fatal, not escalating to tune failure", | ||
| errorDesc.c_str()); |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Fix DECRYPTION/OUTPUT_PROTECTION classification in direct-rialto OnPlaybackError
Rialto's GstDecryptor::decrypt() returns early for OUTPUT_RESTRICTED (HDCP) before ever posting the GST_STREAM_ERROR_DECRYPT warning that becomes PlaybackError::DECRYPTION - confirmed by the Rialto team and verified in GstDecryptor.cpp. DECRYPTION is therefore only ever posted for a genuine, non-HDCP decrypt failure and must still be escalated.
OUTPUT_PROTECTION fires exactly once, at the moment HDCP recovers, and escalating it previously put AAMP into eSTATE_ERROR + DisableDownloads()/NotifyInjectorToPause() right as playback was recovering from an HDMI unplug, with no automatic way back - the actual root cause of the reported "stuck until physical replug" bug.