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

Apply HEVC patch on n5.0 or greater, and master #612

Merged
merged 2 commits into from
Feb 11, 2022
Merged

Conversation

AnimMouse
Copy link
Contributor

@tokawa-ms
Copy link

tokawa-ms commented Feb 10, 2022

Description of SVT-HEVC Patch document says the following.
https://github.com/OpenVisualCloud/SVT-HEVC/tree/master/ffmpeg_plugin

If the above patch failed when you work on master branch or newer version of FFmpeg,
please try the patch for master branch: master-0001-lavc-svt_hevc-add-libsvt-hevc-encoder-wrapper.patch

This SVT-HEVC patch should be applied to FFmpeg n5.0 and newer versions and master branch in order to follow the SVT-HEVC patch documentation.
But @AnimMouse 's code may apply its patch on n4.1 or lower, n5.0 or grater, and master branch.

So this code block must check $ffmpeg_git_checkout_version is not n4.1 or lower, and $ffmpeg_git_checkout_version is master or n5.0 or newer, I think.
The expected patch behavior for each version is summarized below.

$ffmpeg_git_checkout_version patch
<=n4.1 not apply
n4.2,n4.3,n4.4 git apply "$work_dir/SVT-HEVC_git/ffmpeg_plugin/n4.4-0001-lavc-svt_hevc-add-libsvt-hevc-encoder-wrapper.patch"
git apply "$patch_dir/SVT-HEVC-0002-doc-Add-libsvt_hevc-encoder-docs.patch"
master git apply "$work_dir/SVT-HEVC_git/ffmpeg_plugin/master-0001-lavc-svt_hevc-add-libsvt-hevc-encoder-wrapper.patch"
>=n5.0 git apply "$work_dir/SVT-HEVC_git/ffmpeg_plugin/master-0001-lavc-svt_hevc-add-libsvt-hevc-encoder-wrapper.patch"

@AnimMouse
Copy link
Contributor Author

@tokawa-ms Thanks! I have now committed a code block not to apply patch when below n4.1 and only those releases that is still maintained.

@rdp rdp merged commit b369f41 into rdp:master Feb 11, 2022
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.

None yet

3 participants