Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

kodi: update to current master with ffmpeg 7.1 #9570

Merged
merged 4 commits into from
Dec 22, 2024

Conversation

HiassofT
Copy link
Member

Initial testing on RPi4 and RPi5 looks fine.

Depends on #9569

@HiassofT HiassofT mentioned this pull request Dec 13, 2024
@HiassofT HiassofT marked this pull request as ready for review December 15, 2024 15:13
@knaerzche
Copy link
Contributor

knaerzche commented Dec 15, 2024

@HiassofT AVFrame.interlaced_frame has been deprecated (in ffmpeg 7.0, I think) and moved to AVFrame.flags - so the deinterlace filter kodi patches should be updated accordingly, i.e.

if (!m_processInfo.GetVideoInterlaced() && m_pFrame->interlaced_frame)

should be converted to

if (!m_processInfo.GetVideoInterlaced() && !!(m_pFrame->flags & AV_FRAME_FLAG_INTERLACED))

I didin't do this myself, because I noticed RPi project has more patches which are touching this code which won't apply after I changed the common ones.
Would be good if you could do - should be pretty trivial changes

@HiassofT
Copy link
Member Author

@knaerzche thanks a lot for the hint, I've updated the drmprime-filter patchset and rebased the RPi patchset.

SW deinterlace still works fine on RPi4, HW deinterlace on RPi is a separate issue which we'll likely handle in a separate PR.

@HiassofT
Copy link
Member Author

@jernejsk can you please test again with the current version of this PR if HW deinterlace still is fine on AW?

@popcornmix found out why HW deinterlace didn't work on RPi and this looks like a genuine bug in the filter patches:
popcornmix/xbmc@77a2e06

I've added that commit to the drmprime-filter patchset, if it causes issues on AW I can move it to the RPi patchset

@jernejsk
Copy link
Member

Will do.

@HiassofT
Copy link
Member Author

I've moved the additional fix from drmprime-filters to RPi as it broke HW deinterlace on AW.

So non-RPi patches are back to before

@jernejsk
Copy link
Member

Do you mind update Kodi again? xbmc/xbmc#25467 was merged, which is important for new AW/RK v4l2_request implementation.

Signed-off-by: Matthias Reichl <[email protected]>
Change the deprecated interlaced_frame flag usages to flag
mask checks.

Signed-off-by: Matthias Reichl <[email protected]>
Signed-off-by: Matthias Reichl <[email protected]>
Signed-off-by: Matthias Reichl <[email protected]>
@HiassofT
Copy link
Member Author

@jernejsk done - and I dropped the local PR25467 patch from the ffmpeg PR

@knaerzche knaerzche merged commit 26e43c2 into LibreELEC:master Dec 22, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants