Add cryptoSession when comparing hints (DVDStreamInfo) #13982
Merged
Conversation
This file contains 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
peak3d
added
Type: Fix
FernetMenta
reviewed
Jun 5, 2018
| return false; | ||
|
|
||
| if (cryptoSession && | ||
| (cryptoSession->keySystem != right.cryptoSession->keySystem || |
This comment was marked as spam.
This comment was marked as spam.
Sorry, something went wrong.
FernetMenta
reviewed
Jun 5, 2018
| @@ -124,6 +125,15 @@ bool CDVDStreamInfo::Equal(const CDVDStreamInfo& right, bool withextradata) | |||
|
|
|||
| // SUBTITLE | |||
|
|
|||
| // Crypto | |||
| if ((cryptoSession.get() == nullptr) ^ (right.cryptoSession.get() == nullptr)) | |||
This comment was marked as spam.
This comment was marked as spam.
Sorry, something went wrong.
FernetMenta
approved these changes
Jun 5, 2018
12 tasks
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.
Description
When switching to another stream with same video properties as currently running one, the current decoder is reused. This fails for encrypted media if the new stream requres a separate crypto session.
This PR adds cryptoSession to the == / Equal operators to force decoder recreation on stream change.
Motivation and Context
Switching between seasons (automatic / manual) lead to VP stall (black screen with running busy sign)
How Has This Been Tested?
Win10 / amazon / any episode
Types of change