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.

Sign up for GitHub

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

Jump to bottom

Add Win64 build script and full OpenCL pipeline #76

Merged
merged 41 commits into from
Dec 17, 2021
Merged

Add Win64 build script and full OpenCL pipeline #76

merged 41 commits into from
Dec 17, 2021

Conversation

nyanmisaka
Copy link
Member

@nyanmisaka nyanmisaka commented Oct 1, 2021 •
edited
Loading

FFmpeg

  • New upstream version 4.4.1

Build script

  • Only disable x86 ASM in Dav1D if nasm is outdated.
  • Add build script and github workflow for Windows win64.
  • Update Intel VAAPI deps and Dav1D.
  • Add support for Ubuntu Impish 21.10.
  • Drop support for EOL Ubuntu versions([18.10, 19.04, 19.10, 20.10](https://wiki.ubuntu.com/Releases)).

HWA pipeline & codecs

  • Refactor AMD AMF codes and add HEVC 10bit encoding support.(Win64)
  • Add OpenCL based video scaler/resizer and pixel format converter.
  • Refactor OpenCL based tonemap filter, add LUT for faster de/linearize and more SW format.
  • Refactor OpenCL based overlay filter, add PGS graphical subtitle support.
  • Add D3D11-OpenCL interop for AMD.(Win64)
  • Add QSV(D3D11)-OpenCL interop for Intel.(Win64)
  • Add D3D11 suppport for QSV.(Win64)
  • Add QSV yuv444 8/10bit decoding.
  • Add miscellaneous fixes for QSV and Nvidia from upstream.
  • Add options to set input metadata in VAAPI VPP tonemap.
    (instead of throwing error if the embedded one does not exist)
    metadata syntax: G(%hu|%hu)B(%hu|%hu)R(%hu|%hu)WP(%hu|%hu)L(%u|%u) and CLL(%hu)FALL(%hu)

SW

  • Fix for webvttenc when using segement muxer.
  • Fix for HEVC 10bit HDR decoding in bit stream filtering.
  • Add alphasrc source video filter for textual sub2video.
  • Add sub2video option to subtitles/ass filters.

@nyanmisaka nyanmisaka mentioned this pull request Oct 1, 2021
Closed
@nyanmisaka nyanmisaka force-pushed the ff4.4-jf branch 4 times, most recently from f3dcd39 to 638e766 Compare October 6, 2021 16:57
@shaino
Copy link

shaino commented Oct 14, 2021 •
edited
Loading

Great job. @nyanmisaka
I 'docker pull' the latest nightly version of linuxserver/jellyfin (10.8.0) and found that PGS subtitles still could not be displayed using OpenCL tone mapping.
ffmpeg4.4-1 build 10102021
intel-media-va-driver-non-free 21.2.2 or 21.3.1
intel-opencl-icd 21.29.20389 or 21.33.20678
thx

@nyanmisaka
Copy link
Member Author

Great job. @nyanmisaka I 'docker pull' the latest nightly version of linuxserver/jellyfin (10.8.0) and found that PGS subtitles still could not be displayed using OpenCL tone mapping. ffmpeg4.4-1 build 10102021 intel-media-va-driver-non-free 21.2.2 or 21.3.1 intel-opencl-icd 21.29.20389 or 21.33.20678 thx

Extra changes in jellyfin are required.

@nyanmisaka nyanmisaka force-pushed the ff4.4-jf branch 2 times, most recently from 285cf7f to 456da9a Compare October 14, 2021 10:14
@nyanmisaka nyanmisaka changed the title Add OpenCL based scale+ovelay+tonemap filters for AMD and Intel Add Win64 build script and full OpenCL pipeline Oct 14, 2021
@nyanmisaka nyanmisaka force-pushed the ff4.4-jf branch 6 times, most recently from da8aafc to 9b30f37 Compare October 17, 2021 12:55
@nyanmisaka
Copy link
Member Author

nyanmisaka commented Oct 29, 2021 •
edited
Loading

This PR can be merged now.

Still WIP. Dont merge.

@nyanmisaka nyanmisaka force-pushed the ff4.4-jf branch 4 times, most recently from f942044 to b23f9c6 Compare November 13, 2021 14:42
@nyanmisaka nyanmisaka force-pushed the ff4.4-jf branch 2 times, most recently from 87f0f13 to e6be37a Compare November 14, 2021 18:45
@nyanmisaka nyanmisaka force-pushed the ff4.4-jf branch 2 times, most recently from f842df1 to 51e1555 Compare November 27, 2021 10:15
@nyanmisaka
add hw_device_ctx support for qsvdec
930f8da
@nyanmisaka
add qsv(d3d11)-opencl interop
1accfc7
@nyanmisaka
add vendor opts to d3d11va and bgra fmt to d3d11/dxva2
29c27b2
@nyanmisaka
add a vaapi hwupload filter
ff7e513
@nyanmisaka
add fixes for the broken vaapi tonemap
1505e5b
@nyanmisaka
add fixes for webvttenc when using segement muxer
4f64ad1
@nyanmisaka
add fixes for nvdec exceed 32 surfaces error
deb6278
@nyanmisaka
add miscellaneous fixes for QSV from upstream
719c36d
@nyanmisaka
add miscellaneous fixes for NV from upstream
cf26dfc
@nyanmisaka
add qsv dec support for yuv444 8/10bit
aeb8ea2
@nyanmisaka
add fixes for warning on overlay filters
e19e1e9
@nyanmisaka
add fixes for HEVC 10bit HDR decoding in bsf
3f558dd
@nyanmisaka
add sub2video option to subtitles filter
b6a47d8
@nyanmisaka
add alphasrc source video filter
e966e53
@nyanmisaka
add fixes for armhf build with gcc 11
31f04e8
@nyanmisaka
add fixes to improve the performance of vaapi encode
772d849
@nyanmisaka
add fixes for alignment issue when upload to qsv
a8d4a79
@nyanmisaka
add fixes for qsv overlay to allow external pgssubs
cc8a2ff
@nyanmisaka
add fixes for a vaapi-qsv mapping error
0ffdc6e
@nyanmisaka
add a vaapi overlay filter
d9454b5
@nyanmisaka
add async support for qsv vpp
205cbdd
@nyanmisaka
Copy link
Member Author

I think it's ready for the first beta.

joshuaboniface
joshuaboniface approved these changes Dec 17, 2021
View reviewed changes
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.

YOLO

crobibero
crobibero approved these changes Dec 17, 2021
View reviewed changes
Copy link
Member

@crobibero crobibero left a comment

Choose a reason for hiding this comment

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

#yoloyolo

@crobibero crobibero merged commit 99b6c47 into jellyfin:jellyfin Dec 17, 2021
@justinas justinas mentioned this pull request Jan 1, 2022
Closed
@nyanmisaka nyanmisaka mentioned this pull request Jan 5, 2022
Closed
1 task
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@h1dden-da3m0n h1dden-da3m0n h1dden-da3m0n left review comments

@crobibero crobibero crobibero approved these changes

@joshuaboniface joshuaboniface joshuaboniface approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@nyanmisaka @shaino @joshuaboniface @crobibero @h1dden-da3m0n