Update FFmpeg to 4.4.1 and add libaom, librist & svt-av1 deps for Windows #86

pkviet · 2021-12-20T23:54:45Z

Description

For windows obs-deps, this:

adds librist dependency to FFmpeg,
adds libaom & svt-av1 dependecy to FFmpeg (x64 only),
updates FFmpeg from 4.2.4 to 4.4.1.
updates ffnvcodec dependency to FFmpeg (from sdk 9.0 to sdk 11.1).

For mac FFmpeg dep, cherry picks are added and instead od downloading an archive one uses git.

Motivation and Context

Update FFmpeg dll.

How Has This Been Tested?

This was tested by running the cross-compile script for windows deps.
Runs successfully and creates an archive.
I haven't tested if x86 builds correctly. I'll let CI check it for us.

Types of changes

New feature (non-breaking change which adds functionality)

Checklist:

My code has been run through clang-format.
I have read the contributing document.
My code is not on the master branch.
The code has been tested.
All commit messages are properly formatted and commits squashed where appropriate.
I have included updates to all appropriate documentation.

WizardCM · 2021-12-20T23:56:57Z

For the Nvidia headers:

Corresponds to Video Codec SDK version 11.0.10.

Minimum required driver versions:
Windows: 471.41 (June 2021) or newer

This bumps it from the previous minimum of 418.81 (Feb 2019) or newer

RytoEX · 2021-12-21T00:00:38Z

For the Nvidia headers:

Corresponds to Video Codec SDK version 11.0.10.

Minimum required driver versions:
Windows: 471.41 (June 2021) or newer

This bumps it from the previous minimum of 418.81 (Feb 2019) or newer

Wanted to ask about this. Does this exclude any graphics cards? If so, which ones?

pkviet · 2021-12-21T00:31:17Z

For the Nvidia headers:

Corresponds to Video Codec SDK version 11.0.10.

Minimum required driver versions:
Windows: 471.41 (June 2021) or newer

This bumps it from the previous minimum of 418.81 (Feb 2019) or newer

Wanted to ask about this. Does this exclude any graphics cards? If so, which ones?

i'm reverting to nvidia sdk 9 since we haven't found any info about which devices are supported by the SDK 11 and the relevant drivers.

RytoEX · 2021-12-21T01:10:02Z

As far as I can tell, NVIDIA dropped Fermi support in April 2018. It seems that the R390 driver series was the last to support Fermi, with R410 supporting only Kepler and newer. R470 was the last driver series to support Kepler. If I'm understanding this correctly, R410 through R470 should support the same hardware, with Kepler remaining as the oldest supported. Once the requirement moves beyond R470, we would be dropping Kepler support, which should only happen on a major release and should be coordinated and communicated ahead of time.

As an aside, nv-codec-headers tag n11.1.5.0 says:

Corresponds to Video Codec SDK version 11.0.10.

Minimum required driver versions:
Linux: 470.57.02 or newer
Windows: 471.41 or newer

While tag n11.0.10.1 says:

Corresponds to Video Codec SDK version 11.0.10.

Minimum required driver versions:
Linux: 455.28 or newer
Windows: 456.71 or newer

I'm guessing the former is a slight typo, and it meant to say "Corresponds to Video Codec SDK version 11.1.5.". Indeed, "Video Codec SDK 11.1 is supported on R470 and above drivers on Windows and Linux".

RytoEX

I've requested some changes. I've also left some "thinking aloud" comments possibly to address at a later time, but I wanted to write down to better commit them to memory.

CI/include/build_support_windows_cross.sh

CI/windows/build_librist.sh

win-install-tools.sh

CI/windows/build_librist.sh

CI/windows/build_svt-av1.sh

CI/windows/build_ffmpeg.sh

PatTheMav · 2021-12-25T16:27:38Z

So I've been checking the configuration scripts for libvpx and libaom and figured out how to make them both "ignore" any available pthread library and use their built-in shims.

Required adding additional lines to the patches for libvpx and adding a fresh patch for libaom, specifically targeting cross-compile scenarios. In my tests no pthread DLL was linked to the shared libs with these changes.

https://gist.github.com/PatTheMav/5708ff44c40ff8591cde3b7f2fe8e24d

PatTheMav · 2021-12-27T17:01:41Z

So I did a cross compile run today with my patch applied and checked the DLLs - looks like no stray mingw DLLs being linked to anymore:

https://gist.github.com/PatTheMav/0d399fba9d059ca6d8cd1db0d9091f78

pkviet · 2021-12-28T11:49:53Z

Update (28 dec 2021):

I've integrated Pat's patch for libaom and libvpx so that winpthread is not used at all.
disabled winpthread in librist in favour of their thread shim.
Apart from aja, which is implemented separately, this achieves parity with Jim's custom FFmpeg builds and relies only on win32-pthread or a shim. There's no use of winpthread.

RytoEX

The first commit message subject should be: "windows: Update FFmpeg to 4.4.1 and add aom, librist, svt-av1". Please fix the bulleted list in that commit message.

The third commit message should mention that it's on Linux when setting up the cross-compile tools. It doesn't actually take place on Windows. If you include the changes in win-install-tools.sh, it doesn't need the CI or windows prefix.

All other review comments are nitpicks or clarifying questions which hopefully will not result in major changes.

CI/include/build_support_windows_cross.sh

CI/build-deps-windows-cross.sh

CI/include/build_support_windows_cross.sh

CI/macos/build_ffmpeg.sh

CI/windows/build_ffmpeg.sh

pkviet · 2021-12-28T22:15:38Z

New push after removing the cherry picks from FFmpeg.
One could go back for macOS to @PatTheMav initial implementation. Unless instructed otherwise by Pat, I'll leave the build_setup_git for macOS FFmpeg script in case a cherry pick is needed in the future and because this aligns windows and mac scripts.

RytoEX

Checking over this again. Hopefully my last review, and anything else can be left to follow-ups.

CI/windows/patches/librist/librist.patch

CI/windows/build_svt-av1.sh

pkviet · 2021-12-30T01:15:47Z

I checked on windows 10 x64 with obs master that:

aom encodes fine with obs standard recording output,
same with svt-av1,
rist protocol works fine for streaming to a server (a client plays fine).
I didn't check x86.

For Windows obs-deps: - Add librist, libaom (x64 only), and SVT-AV1 (x64 only) to FFmpeg - Update FFmpeg from 4.2.4 to 4.4.1 - Use a shim instead of winpthreads for libaom and libvpx (PatTheMav) Co-authored-by: pkv <pkv@obsproject.com> Co-authored-by: PatTheMav <PatTheMav@users.noreply.github.com> Co-authored-by: WizardCM <git@wizardcm.com>

Allows cherry picking in the future and aligns implementation with Windows. Co-authored-by: PatTheMav <PatTheMav@users.noreply.github.com> Co-authored-by: pkv <pkv@obsproject.com>

Required for obsproject#5467 and obsproject/obs-deps#86

RytoEX · 2022-03-17T00:19:15Z

@pkviet
I somehow missed this when reviewing, but why did this need to add yasm? We had previously been building without it, using nasm instead, if I understand correctly.

pkviet · 2022-03-17T08:27:51Z

@pkviet
I somehow missed this when reviewing, but why did this need to add yasm? We had previously been building without it, using nasm instead, if I understand correctly.

It is required by svt-av1 according to its build instructions.
Did Jim build it with nasm ?
I haven't tested and don't know if it is possible.

pkviet · 2022-03-17T08:32:40Z

So i checked the CMakeLists.txt for svt-av1 and nasm can be used but it requires a cmake flag to be set. So yasm is their recommended choice on default

pkviet force-pushed the ffmpeg-update branch from caf78ee to c09c8e0 Compare December 21, 2021 00:29

pkviet force-pushed the ffmpeg-update branch from c09c8e0 to 0dd1109 Compare December 21, 2021 00:48

pkviet force-pushed the ffmpeg-update branch 9 times, most recently from 3750a8c to 69b2849 Compare December 21, 2021 03:04

RytoEX requested changes Dec 21, 2021

View reviewed changes

pkviet force-pushed the ffmpeg-update branch 7 times, most recently from 57eb67b to a71f9c5 Compare December 22, 2021 23:36

pkviet changed the title ~~Update FFmpeg to 4.4.1 and add librist dep for Windows~~ Update FFmpeg to 4.4.1 and add libaom, librist & svt-av1 deps for Windows Dec 23, 2021

PatTheMav added the Seeking Testers label Dec 23, 2021

pkviet force-pushed the ffmpeg-update branch 4 times, most recently from 481979f to f5fa58d Compare December 23, 2021 02:22

WizardCM requested changes Dec 23, 2021

View reviewed changes

CI/windows/build_svt-av1.sh Outdated Show resolved Hide resolved

tytan652 mentioned this pull request Dec 23, 2021

Flatpak: Update FFmpeg to 4.4.1 and add RIST, libaom and SVT-AV1 support obsproject/obs-studio#5686

Merged

6 tasks

tytan652 reviewed Dec 23, 2021

View reviewed changes

CI/windows/build_ffmpeg.sh Show resolved Hide resolved

WizardCM added the enhancement New feature or request label Dec 24, 2021

pkviet force-pushed the ffmpeg-update branch from 3662cf5 to a9474af Compare December 25, 2021 04:43

pkviet force-pushed the ffmpeg-update branch from 30e125e to 7cdd8c2 Compare December 28, 2021 14:28

RytoEX requested changes Dec 28, 2021

View reviewed changes

pkviet force-pushed the ffmpeg-update branch 3 times, most recently from cfc8b00 to 935d1c1 Compare December 28, 2021 22:11

RytoEX requested changes Dec 30, 2021

View reviewed changes

CI/windows/patches/librist/librist.patch Outdated Show resolved Hide resolved

CI/windows/build_svt-av1.sh Outdated Show resolved Hide resolved

pkviet force-pushed the ffmpeg-update branch from 935d1c1 to d0c3599 Compare December 30, 2021 00:42

pkviet force-pushed the ffmpeg-update branch from d0c3599 to c6c4156 Compare December 30, 2021 22:20

RytoEX force-pushed the ffmpeg-update branch from c6c4156 to e97a4cd Compare January 1, 2022 00:57

pkviet and others added 2 commits December 31, 2021 20:56

macos: Switch to git for FFmpeg

007d7db

Allows cherry picking in the future and aligns implementation with Windows. Co-authored-by: PatTheMav <PatTheMav@users.noreply.github.com> Co-authored-by: pkv <pkv@obsproject.com>

RytoEX force-pushed the ffmpeg-update branch from e97a4cd to 007d7db Compare January 1, 2022 01:57

RytoEX merged commit 15072cd into obsproject:master Jan 1, 2022

RytoEX mentioned this pull request Jan 1, 2022

Update CI deps to 2022-01-01 packages obsproject/obs-studio#5722

Merged

6 tasks

flaeri mentioned this pull request Jan 12, 2022

Add some features to NVENC codec settings in Advanced mode targeted t… obsproject/obs-studio#5774

Open

6 tasks

flaeri pushed a commit to flaeri/obs-studio that referenced this pull request Jan 26, 2022

cmake: Add libRIST to copied Windows libs

ca14cc4

Required for obsproject#5467 and obsproject/obs-deps#86

RytoEX mentioned this pull request Mar 16, 2022

CI: Unified build scripts for all platforms #98

Merged

6 tasks

pkviet deleted the ffmpeg-update branch May 21, 2023 14:34

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Update FFmpeg to 4.4.1 and add libaom, librist & svt-av1 deps for Windows #86

Update FFmpeg to 4.4.1 and add libaom, librist & svt-av1 deps for Windows #86

pkviet commented Dec 20, 2021 •

edited

Loading

WizardCM commented Dec 20, 2021 •

edited

Loading

RytoEX commented Dec 21, 2021

pkviet commented Dec 21, 2021

RytoEX commented Dec 21, 2021 •

edited

Loading

RytoEX left a comment

PatTheMav commented Dec 25, 2021

PatTheMav commented Dec 27, 2021

pkviet commented Dec 28, 2021

RytoEX left a comment

pkviet commented Dec 28, 2021

RytoEX left a comment

pkviet commented Dec 30, 2021 •

edited

Loading

RytoEX commented Mar 17, 2022

pkviet commented Mar 17, 2022

pkviet commented Mar 17, 2022

Update FFmpeg to 4.4.1 and add libaom, librist & svt-av1 deps for Windows #86

Update FFmpeg to 4.4.1 and add libaom, librist & svt-av1 deps for Windows #86

Conversation

pkviet commented Dec 20, 2021 • edited Loading

Description

Motivation and Context

How Has This Been Tested?

Types of changes

Checklist:

WizardCM commented Dec 20, 2021 • edited Loading

RytoEX commented Dec 21, 2021

pkviet commented Dec 21, 2021

RytoEX commented Dec 21, 2021 • edited Loading

RytoEX left a comment

Choose a reason for hiding this comment

PatTheMav commented Dec 25, 2021

PatTheMav commented Dec 27, 2021

pkviet commented Dec 28, 2021

RytoEX left a comment

Choose a reason for hiding this comment

pkviet commented Dec 28, 2021

RytoEX left a comment

Choose a reason for hiding this comment

pkviet commented Dec 30, 2021 • edited Loading

RytoEX commented Mar 17, 2022

pkviet commented Mar 17, 2022

pkviet commented Mar 17, 2022

pkviet commented Dec 20, 2021 •

edited

Loading

WizardCM commented Dec 20, 2021 •

edited

Loading

RytoEX commented Dec 21, 2021 •

edited

Loading

pkviet commented Dec 30, 2021 •

edited

Loading