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

Update ffmpeg #13870

Merged
merged 2 commits into from Aug 2, 2023
Merged

Update ffmpeg #13870

merged 2 commits into from Aug 2, 2023

Conversation

Megamouse
Copy link
Contributor

@Megamouse Megamouse commented May 16, 2023

Updates ffmpeg based on Vita3K repo to 5.1.2.

The new ffmpeg version is more optimized overall, so this is actually useful to performance during de/encoding.
Here some random timings of mostly the same scenes on repeat:

Encoding (720p) ~20% faster

Old:
E Media: average: 5008.96 us
E Media: average: 5008.11 us
E Media: average: 5020.52 us
E Media: average: 5576.87 us
E Media: average: 6629.70 us
E Media: average: 6560.65 us

New:
E Media: average: 4092.24 us
E Media: average: 4101.77 us
E Media: average: 4087.86 us
E Media: average: 4050.64 us
E Media: average: 5006.84 us
E Media: average: 5860.35 us

Encoding (4K) ~20% faster

4K Old:
E Media: average: 27370.50 us
E Media: average: 27518.19 us
E Media: average: 27480.09 us
E Media: average: 27321.86 us

4K New:
E Media: average: 21630.02 us
E Media: average: 21576.04 us
E Media: average: 21503.02 us
E Media: average: 21505.84 us

Decoding (720p) ~10% faster

Old:
E cellVdec: average: 2724.74 us
E cellVdec: average: 2601.69 us
E cellVdec: average: 2631.09 us
E cellVdec: average: 2621.00 us
E cellVdec: average: 2594.64 us
E cellVdec: average: 2601.26 us
E cellVdec: average: 2602.29 us

New:
E cellVdec: average: 2476.39 us
E cellVdec: average: 2348.26 us
E cellVdec: average: 2372.78 us
E cellVdec: average: 2334.19 us
E cellVdec: average: 2346.55 us
E cellVdec: average: 2312.74 us
E cellVdec: average: 2347.38 us

The new commit drops the source and uses CI (see .github) and a patch with the options to build the libs.
The artifacts are created automatically on our fork in the github actions section.
The codecs seem to be the same still:

image

@Megamouse Megamouse added Audio Video Build and CI Anything related to the build process and continuous integration labels May 16, 2023
@Megamouse Megamouse force-pushed the ffmpegsup branch 9 times, most recently from bc7a064 to a6156b1 Compare May 23, 2023 16:20
@Megamouse Megamouse force-pushed the ffmpegsup branch 8 times, most recently from 9516a27 to cf64805 Compare May 30, 2023 18:18
@Megamouse Megamouse force-pushed the ffmpegsup branch 2 times, most recently from b865d97 to cea2f69 Compare June 15, 2023 18:29
@DarthMDev
Copy link
Contributor

Can this be updated again? A recent change was pushed to the ffmpeg repo to have macOS prebuilt arm64 libraries, and it would be helpful for #14028

@Megamouse Megamouse force-pushed the ffmpegsup branch 2 times, most recently from 98f1a27 to fa399ed Compare June 28, 2023 18:37
@DarthMDev
Copy link
Contributor

DarthMDev commented Jul 3, 2023

seems to be an issue with the macOS minimum version with the newer ffmpeg update

(was built for newer macOS version (12.6) than being linked (12.0))

Maybe if we change
CMAKE_OSX_DEPLOYMENT_TARGET to 12.6?

@DarthMDev
Copy link
Contributor

seems to be an issue with the macOS minimum version with the newer ffmpeg update

(was built for newer macOS version (12.6) than being linked (12.0))

Maybe if we change CMAKE_OSX_DEPLOYMENT_TARGET to 12.6?

I made a pr to address this on your fork Megamouse#15

@shinra-electric
Copy link
Contributor

seems to be an issue with the macOS minimum version with the newer ffmpeg update

(was built for newer macOS version (12.6) than being linked (12.0))

Maybe if we change CMAKE_OSX_DEPLOYMENT_TARGET to 12.6?

I think bumping the Cirrus image from Monterey (12) to Ventura (13) might help.

@Megamouse
Copy link
Contributor Author

This PR is nowhere near being considered for merge.
This won't happen until Ubuntu 18.04 is dropped.
So all of these changes are not really worth spending time on right now

@Megamouse
Copy link
Contributor Author

Megamouse commented Jul 3, 2023

Also, The libs are built with macOs latest, as proof of concept.
There is no reason to bump the macOs version in this PR.
That should happen in a seperate PR if even needed.

@Megamouse Megamouse force-pushed the ffmpegsup branch 3 times, most recently from 65b0680 to 0d99a36 Compare July 6, 2023 06:50
@Megamouse Megamouse force-pushed the ffmpegsup branch 4 times, most recently from c08c821 to 217146b Compare July 21, 2023 12:21
@Megamouse Megamouse force-pushed the ffmpegsup branch 5 times, most recently from 4fdda2a to 116c232 Compare July 31, 2023 19:05
@Megamouse Megamouse force-pushed the ffmpegsup branch 6 times, most recently from 8563010 to aeec559 Compare August 1, 2023 00:08
@Megamouse Megamouse merged commit bb2d706 into RPCS3:master Aug 2, 2023
5 checks passed
@Megamouse Megamouse deleted the ffmpegsup branch August 2, 2023 06:39
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Audio Build and CI Anything related to the build process and continuous integration Video
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants