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

Upgrade to FFmpeg 4.3.1 and enable tonemap related filters #46

Merged
merged 6 commits into from
Jul 18, 2020

Conversation

nyanmisaka
Copy link
Member

@nyanmisaka nyanmisaka commented Jul 1, 2020

Changes

  • New upstream version 4.3.1.
  • Build fixes for MMAL/OMX-RPI.
  • Update libva to 2.8.
  • Use the stable version of nv-codec-headersto match the nvidia driver.
  • Enable OpenCL filters for hardware accelerated tonemapping.
  • Enable Zscale filter for software tonemapping.
  • Enable Cuda filters for hardware accelerated yadif and overlay.
  • Enable libmfx(QSV) support but non-free driver still needs to be manually installed or built.
  • Drop 0002-Update-AMF-files-to-support-Linux.patch as it has been merged into ffmpeg 4.3.

Notes

Issues
Closes jellyfin/jellyfin#3463
Closes jellyfin/jellyfin#3087

Windows version
jellyfin-ffmpeg.zip
sha1: d1abda00f68b198a2d108b6ee5218c46c31ba6ed

Build with similar configuration and segment muxer patch.
Please upload it to https://repo.jellyfin.org/releases/server/windows/ffmpeg/
D8EE2614-AF8A-46AE-AA18-12793847F447

@nyanmisaka
Copy link
Member Author

@joshuaboniface Is there anything that needs to be changed?

Copy link
Member

@joshuaboniface joshuaboniface left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Upstream part looks good. To verify upstream, for posterity:

  1. Download the new version source.
  2. Extract into repo and commit on new branch.
  3. Rebase this PR onto it.
  4. Check that there is no diff (only entries are .gitignore and .mailmap, both reasonable and from upstream)

For the build changes, see my one inline comment, which will require installing svn in the Docker image too if we keep it that way.

docker-build.sh Show resolved Hide resolved
@nyanmisaka nyanmisaka changed the title Upgrade to FFmpeg 4.3 and enable OpenCL filters Upgrade to FFmpeg 4.3.1 and enable tonemap related filters Jul 15, 2020
debian/rules Outdated Show resolved Hide resolved
debian/rules Outdated Show resolved Hide resolved
Copy link
Member

@joshuaboniface joshuaboniface left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Seems to build fine.

@joshuaboniface joshuaboniface merged commit e2c3a36 into jellyfin:jellyfin Jul 18, 2020
@nyanmisaka nyanmisaka deleted the upgrade branch October 30, 2020 13:10
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Still can't transcode HEVC with AMD GPU Hardware Transcoding (nvenc) on 10.5.5 stopped working (regression)
2 participants