[Omega] Extract default kid from init data if required #1725

matthuisman · 2024-11-10T08:15:14Z

Description

Sending the below as license_data property
AAAAMnBzc2gAAAAA7e+LqXnWSs6jyCfc1R0h7QAAABISEByIsi1reEZguaxNxHvMJt8=

Kodi 20 - OK

2024-11-10 20:09:10.652 T:1943  debug <general>: AddOnLog: inputstream.adaptive: Searching PSSH data in FILE
2024-11-10 20:09:10.652 T:1943  debug <general>: AddOnLog: inputstream.adaptive: Initializing stream with KID: 1c88b22d6b784660b9ac4dc47bcc26df

Kodi 21 - ERROR

2024-11-10 11:42:10.723 T:1003 debug <general>: AddOnLog: inputstream.adaptive: License data: Use PSSH data provided by the license data property
2024-11-10 11:42:10.723 T:1003 error <general>: AddOnLog: inputstream.adaptive: ConvertKidStrToBytes: Cannot convert KID "" as bytes due to wrong size
2024-11-10 11:42:10.723 T:1003 warning <general>: AddOnLog: inputstream.adaptive: Initializing stream with unknown KID!

Kodi 22 - OK

2024-11-10 21:24:47.437 T:22820   debug <general>: AddOnLog: inputstream.adaptive: License data: Use PSSH data provided by the license data property
2024-11-10 21:24:47.437 T:22820   debug <general>: AddOnLog: inputstream.adaptive: Default KID parsed from init data
2024-11-10 21:24:47.438 T:22820   debug <general>: AddOnLog: inputstream.adaptive: Initializing stream with KID: 1c88b22d6b784660b9ac4dc47bcc26df

Motivation and context

How has this been tested?

Screenshots (if appropriate):

Types of change

Bug fix (non-breaking change which fixes an issue)
Clean up (non-breaking change which removes non-working, unmaintained functionality)
Improvement (non-breaking change which improves existing functionality)
New feature (non-breaking change which adds functionality)
Breaking change (fix or feature that will cause existing functionality to change)
Cosmetic change (non-breaking change that doesn't touch code)
None of the above (please explain below)

Checklist:

I have read the Contributing document
My code follows the Code Guidelines of this project
My change requires a change to the Wiki documentation
I have updated the documentation accordingly

matthuisman · 2024-11-10T08:16:22Z

src/Session.cpp

+      // If no KID, but init data, extract the KID from init data
+      if (!initData.empty() && defaultKidStr.empty())
+      {
+        DRM::PSSH parser;


oh, this might not even be available in Omega

matthuisman · 2024-11-10T08:47:35Z

this isnt actually working, I still get

2024-11-10 21:44:44.730 T:21220   debug <general>: AddOnLog: inputstream.adaptive: License data: Use PSSH data provided by the license data property
2024-11-10 21:44:44.730 T:21220   error <general>: AddOnLog: inputstream.adaptive: DRM::ConvertKidStrToBytes: Cannot convert KID "" as bytes due to wrong size
2024-11-10 21:44:44.730 T:21220 warning <general>: AddOnLog: inputstream.adaptive: Initializing stream with unknown KID!

CastagnaIT · 2024-11-10T08:54:38Z

this because your PSSH data is wrong, PSSH version 0 dont support kids container

matthuisman · 2024-11-10T08:56:21Z

oh, thats because the parser in kodi 21 doesnt GetKeyIds for version 0 from the data..
Trying again now with version 1 with same keyid in kids...

matthuisman · 2024-11-10T08:57:06Z

so problems with Kodi 21:

does not create default kid from initdata (Kodi 20 and 22 both do)
does not support version 0 getting KID from data (Kodi 20 and 22 both do)

CastagnaIT · 2024-11-10T09:05:52Z

does not support version 0 getting KID from data (Kodi 20 and 22 both do)

ah yeah now remember,
on 22 i reworked the pssh parser and all others related code, and that's why i didn't backport,
too much code to change and it wasn't worth investing time with the risk of regressions

so on 22 the parser is able to get kids from widevine data, contained in the PSSH data (regardless of PSSH version)

matthuisman · 2024-11-10T09:06:19Z

when I use
AAAARnBzc2gBAAAA7e+LqXnWSs6jyCfc1R0h7QAAAAEciLIta3hGYLmsTcR7zCbfAAAAEhIQHIiyLWt4RmC5rE3Ee8wm3w==

it gets further

2024-11-10 22:03:36.659 T:20768   debug <general>: AddOnLog: inputstream.adaptive: License data: Use PSSH data provided by the license data property
2024-11-10 22:03:36.659 T:20768   debug <general>: AddOnLog: inputstream.adaptive: Default KID parsed from init data
2024-11-10 22:03:36.659 T:20768   debug <general>: AddOnLog: inputstream.adaptive: Initializing stream with KID: 
2024-11-10 22:03:36.694 T:20768   debug <general>: AddOnLog: inputstream.adaptive: CDMMessage: 1 arrived!

it plays regardless of this issue, so im not sure if the default kid is being set correctly.
I know a user has issues on Linux64 with this stream so thinking this is the problem there.

"Initializing stream with KID: "
Its just showing blank...
Maybe thats just a type issue? cant convert to str ?

matthuisman · 2024-11-10T09:07:30Z

On 22, the parser can get kid from the DATA only (version 0) :)
here is where it does that: https://github.com/xbmc/inputstream.adaptive/blob/Piers/src/decrypters/Helpers.cpp#L353

Its not a biggy, I can add the key as well.
But would still need the fix to grab default_kid from init_data (this PR)

matthuisman · 2024-11-10T09:08:24Z

oh, I see

LOG::Log(LOGDEBUG, "Initializing stream with KID: %s", sessionPsshset.defaultKID_.c_str());

We logging sessionPsshset.defaultKID not defaultkid..

matthuisman · 2024-11-10T09:10:16Z

Fixed that with latest commit :)

matthuisman · 2024-11-10T09:18:07Z

success, with this PR and adding kids to my license_data:
AAAARnBzc2gBAAAA7e+LqXnWSs6jyCfc1R0h7QAAAAEciLIta3hGYLmsTcR7zCbfAAAAEhIQHIiyLWt4RmC5rE3Ee8wm3w==

2024-11-10 22:17:26.709 T:22348   debug <general>: AddOnLog: inputstream.adaptive: media::CdmAdapter::OnInitialized: CDM is initialized: true
2024-11-10 22:17:26.709 T:22348   debug <general>: AddOnLog: inputstream.adaptive: License data: Use PSSH data provided by the license data property
2024-11-10 22:17:26.709 T:22348   debug <general>: AddOnLog: inputstream.adaptive: Default KID parsed from init data
2024-11-10 22:17:26.709 T:22348   debug <general>: AddOnLog: inputstream.adaptive: Initializing stream with KID: 1c88b22d6b784660b9ac4dc47bcc26df
2024-11-10 22:17:26.743 T:22348   debug <general>: AddOnLog: inputstream.adaptive: CDMMessage: 1 arrived!

CastagnaIT · 2024-11-10T09:37:50Z

seem there is a bit of mess with vars (also on 22)

e.g. ExtractStreamProtectionData set extracted kid to sessionPsshset but dont update defaultKidStr

also on condition below
if (sessionPsshset.pssh_ == m_adaptiveTree->m_currentPeriod->GetPSSHSets()[i].pssh_)
imo sessionPsshset.pssh_ should be updated by initData when needed

I've always found this part confusing, although with the rework i will delete all this

matthuisman · 2024-11-10T19:08:40Z

Understood. But this PR is not a rework. It's fixing a regression so I'm trying to keep changes minimal. Is this able to go in to fix the issue? Otherwise I'll need to proxy manifest and add in content protection section

CastagnaIT

its ok,
just please add prefix to commit title otherwise will make more hard to read the git history
in your case you are modify the session, so [Session] xy...

matthuisman · 2024-11-10T20:05:54Z

no worries :) I have updated the commit message

matthuisman · 2024-11-10T20:20:20Z

Thank you @CastagnaIT :)

matthuisman · 2024-11-13T23:23:23Z

@CastagnaIT if there are no more planned changes coming soon for Omega - are you able to do a release with this change ?

CastagnaIT · 2024-11-14T07:35:44Z

yes the intention is to make releases by saturday

matthuisman commented Nov 10, 2024

View reviewed changes

matthuisman force-pushed the fix_default_kid_init_data branch 2 times, most recently from 36eb7d4 to 6e623bc Compare November 10, 2024 08:35

matthuisman force-pushed the fix_default_kid_init_data branch from 6e623bc to 178e12a Compare November 10, 2024 09:10

matthuisman changed the title ~~[Omega] Parse default kid from init data if empty~~ [Omega] Extract default kid from init data if required Nov 10, 2024

CastagnaIT approved these changes Nov 10, 2024

View reviewed changes

CastagnaIT added Type: Fix non-breaking change which fixes an issue Type: Partial backport v21 Omega labels Nov 10, 2024

[Session] extract default kid from init data if required

6387a1a

matthuisman force-pushed the fix_default_kid_init_data branch from 178e12a to 6387a1a Compare November 10, 2024 20:05

CastagnaIT merged commit 0627453 into xbmc:Omega Nov 10, 2024
1 of 8 checks passed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[Omega] Extract default kid from init data if required #1725

[Omega] Extract default kid from init data if required #1725

matthuisman commented Nov 10, 2024 •

edited

Loading

matthuisman Nov 10, 2024

matthuisman commented Nov 10, 2024

CastagnaIT commented Nov 10, 2024

matthuisman commented Nov 10, 2024

matthuisman commented Nov 10, 2024 •

edited

Loading

CastagnaIT commented Nov 10, 2024 •

edited

Loading

matthuisman commented Nov 10, 2024

matthuisman commented Nov 10, 2024

matthuisman commented Nov 10, 2024

matthuisman commented Nov 10, 2024

matthuisman commented Nov 10, 2024

CastagnaIT commented Nov 10, 2024

matthuisman commented Nov 10, 2024

CastagnaIT left a comment

matthuisman commented Nov 10, 2024

matthuisman commented Nov 10, 2024

matthuisman commented Nov 13, 2024

CastagnaIT commented Nov 14, 2024

[Omega] Extract default kid from init data if required #1725

[Omega] Extract default kid from init data if required #1725

Conversation

matthuisman commented Nov 10, 2024 • edited Loading

Description

Motivation and context

How has this been tested?

Screenshots (if appropriate):

Types of change

Checklist:

matthuisman Nov 10, 2024

Choose a reason for hiding this comment

matthuisman commented Nov 10, 2024

CastagnaIT commented Nov 10, 2024

matthuisman commented Nov 10, 2024

matthuisman commented Nov 10, 2024 • edited Loading

CastagnaIT commented Nov 10, 2024 • edited Loading

matthuisman commented Nov 10, 2024

matthuisman commented Nov 10, 2024

matthuisman commented Nov 10, 2024

matthuisman commented Nov 10, 2024

matthuisman commented Nov 10, 2024

CastagnaIT commented Nov 10, 2024

matthuisman commented Nov 10, 2024

CastagnaIT left a comment

Choose a reason for hiding this comment

matthuisman commented Nov 10, 2024

matthuisman commented Nov 10, 2024

matthuisman commented Nov 13, 2024

CastagnaIT commented Nov 14, 2024

matthuisman commented Nov 10, 2024 •

edited

Loading

matthuisman commented Nov 10, 2024 •

edited

Loading

CastagnaIT commented Nov 10, 2024 •

edited

Loading