Skip to content

Conversation

@richardssam
Copy link
Collaborator

This is adding ffmpeg-7.0 to the docker configs.

Signed-off-by: Sam.Richards@taurich.org <Sam.Richards@taurich.org>
Signed-off-by: Sam.Richards@taurich.org <Sam.Richards@taurich.org>
Copy link
Collaborator

@apetrynet apetrynet left a comment

Choose a reason for hiding this comment

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

LGTM.

Was the downgrade of cuda version in ffmpeg6.1 intentional?

@richardssam
Copy link
Collaborator Author

I was struggling to get the nvenc working, the downgrade was to help with that. Hopefully they should address that in the next ffmpeg build.

@richardssam richardssam merged commit 0e325f3 into AcademySoftwareFoundation:main Jul 22, 2024
richardssam added a commit to richardssam/EncodingGuidelines that referenced this pull request Aug 6, 2025
* Enable bit-depth in older version of x264.

Signed-off-by: Sam.Richards@taurich.org <Sam.Richards@taurich.org>

* Adding docker for ffmpeg-7.0

Signed-off-by: Sam.Richards@taurich.org <Sam.Richards@taurich.org>

---------

Signed-off-by: Sam.Richards@taurich.org <Sam.Richards@taurich.org>
Co-authored-by: Sam.Richards@taurich.org <Sam.Richards@taurich.org>
Signed-off-by: Sam.Richards@taurich.org <Sam.Richards@taurich.org>
richardssam added a commit that referenced this pull request Aug 6, 2025
* Adding in better docs for libaom-av1. (#91)

Signed-off-by: Sam.Richards@taurich.org <Sam.Richards@taurich.org>
Co-authored-by: Sam.Richards@taurich.org <Sam.Richards@taurich.org>
Signed-off-by: Sam.Richards@taurich.org <Sam.Richards@taurich.org>

* Docs update (#92)

* AV1 update

Signed-off-by: Sam.Richards@taurich.org <Sam.Richards@taurich.org>

* Adding section for sws-scale.

Signed-off-by: Sam.Richards@taurich.org <Sam.Richards@taurich.org>

* Clarifying why colormatrix isnt great, also adding zscale for completeness.

Signed-off-by: Sam.Richards@taurich.org <Sam.Richards@taurich.org>

* Adding some extra notes on what the graphs are showing, also added the allintra flag.

Signed-off-by: Sam.Richards@taurich.org <Sam.Richards@taurich.org>

* Updating the color tests, removing some un-necessary tests.

Signed-off-by: Sam.Richards@taurich.org <Sam.Richards@taurich.org>

* Adding in some more reference-results images that are needed by the AV1 page.

Signed-off-by: Sam.Richards@taurich.org <Sam.Richards@taurich.org>

---------

Signed-off-by: Sam.Richards@taurich.org <Sam.Richards@taurich.org>
Co-authored-by: Sam.Richards@taurich.org <Sam.Richards@taurich.org>
Signed-off-by: Sam.Richards@taurich.org <Sam.Richards@taurich.org>

* Docs update rgb (#93)

* Remove period.

Signed-off-by: Sam.Richards@taurich.org <Sam.Richards@taurich.org>

* Remove the wedge_results folder.

Signed-off-by: Sam.Richards@taurich.org <Sam.Richards@taurich.org>

* Breaking out separate section for RGB encoding, removing it from QuickStart.

Signed-off-by: Sam.Richards@taurich.org <Sam.Richards@taurich.org>

* Initial commit of bit-depth testing, trying to determine how well the codec tracks Luminance.

Signed-off-by: Sam.Richards@taurich.org <Sam.Richards@taurich.org>

* Fleshing out the bit-depth comparison, giving a high level summary.

Signed-off-by: Sam.Richards@taurich.org <Sam.Richards@taurich.org>

* Adding some zscale links, and other formatting changes.

Signed-off-by: Sam.Richards@taurich.org <Sam.Richards@taurich.org>

* Fixing broken link.

Signed-off-by: Sam.Richards@taurich.org <Sam.Richards@taurich.org>

---------

Signed-off-by: Sam.Richards@taurich.org <Sam.Richards@taurich.org>
Co-authored-by: Sam.Richards@taurich.org <Sam.Richards@taurich.org>
Signed-off-by: Sam.Richards@taurich.org <Sam.Richards@taurich.org>

* Broken link fixes (#94)

* Broken link fixes.

Signed-off-by: Sam.Richards@taurich.org <Sam.Richards@taurich.org>

* Minor tweak commenting on speed improvement.

Signed-off-by: Sam.Richards@taurich.org <Sam.Richards@taurich.org>

* Tweak copy-results to get data from relative paths.

Signed-off-by: Sam.Richards@taurich.org <Sam.Richards@taurich.org>

---------

Signed-off-by: Sam.Richards@taurich.org <Sam.Richards@taurich.org>
Co-authored-by: Sam.Richards@taurich.org <Sam.Richards@taurich.org>
Signed-off-by: Sam.Richards@taurich.org <Sam.Richards@taurich.org>

* Fixing more broken links. (#95)

Signed-off-by: Sam.Richards@taurich.org <Sam.Richards@taurich.org>
Co-authored-by: Sam.Richards@taurich.org <Sam.Richards@taurich.org>
Signed-off-by: Sam.Richards@taurich.org <Sam.Richards@taurich.org>

* Broken link fixes3 (#96)

* Missing file.

Signed-off-by: Sam.Richards@taurich.org <Sam.Richards@taurich.org>

* Fixing broken links.

Signed-off-by: Sam.Richards@taurich.org <Sam.Richards@taurich.org>

---------

Signed-off-by: Sam.Richards@taurich.org <Sam.Richards@taurich.org>
Co-authored-by: Sam.Richards@taurich.org <Sam.Richards@taurich.org>
Signed-off-by: Sam.Richards@taurich.org <Sam.Richards@taurich.org>

* docker ffmpeg7 (#89)

* Enable bit-depth in older version of x264.

Signed-off-by: Sam.Richards@taurich.org <Sam.Richards@taurich.org>

* Adding docker for ffmpeg-7.0

Signed-off-by: Sam.Richards@taurich.org <Sam.Richards@taurich.org>

---------

Signed-off-by: Sam.Richards@taurich.org <Sam.Richards@taurich.org>
Co-authored-by: Sam.Richards@taurich.org <Sam.Richards@taurich.org>
Signed-off-by: Sam.Richards@taurich.org <Sam.Richards@taurich.org>

* Vp8 (#97)

* Adding some vp8 tests, still a WIP.

Signed-off-by: Sam.Richards@taurich.org <Sam.Richards@taurich.org>

* We dont actually need the yml file for a still.

Signed-off-by: Sam.Richards@taurich.org <Sam.Richards@taurich.org>

* Remove irrevelant table.

Signed-off-by: Sam.Richards@taurich.org <Sam.Richards@taurich.org>

* Fix links

Signed-off-by: Sam.Richards@taurich.org <Sam.Richards@taurich.org>

* Updated VP9 section

Signed-off-by: Sam.Richards@taurich.org <Sam.Richards@taurich.org>

* Adding very basic rav1e test.

Signed-off-by: Sam.Richards@taurich.org <Sam.Richards@taurich.org>

* Minor update to rav1, in testing its not great.

Signed-off-by: Sam.Richards@taurich.org <Sam.Richards@taurich.org>

* Update with arnr-strength.

Signed-off-by: Sam.Richards@taurich.org <Sam.Richards@taurich.org>

* Minor tweaks to vp8 setup.

Signed-off-by: Sam Richards <sam.richards@taurich.org>

* -qscale 3 does not map to 90% compression.

Signed-off-by: Sam.Richards@taurich.org <Sam.Richards@taurich.org>

* Adding a graph for preset.

Signed-off-by: Sam.Richards@taurich.org <Sam.Richards@taurich.org>

* Added a codec web test page to test a variety of codecs.

Signed-off-by: Sam.Richards@taurich.org <Sam.Richards@taurich.org>

* Fixes to make it legal html.

Signed-off-by: Sam.Richards@taurich.org <Sam.Richards@taurich.org>

* Make sure the labels are right.

Signed-off-by: Sam.Richards@taurich.org <Sam.Richards@taurich.org>

* Adding more tests, that were used in the ASWF open source days presentation.

Signed-off-by: Sam.Richards@taurich.org <Sam.Richards@taurich.org>

* Add a note about alpha for vp9.

Signed-off-by: Sam.Richards@taurich.org <Sam.Richards@taurich.org>

* Add a crf value for the quickstart.

Signed-off-by: Sam.Richards@taurich.org <Sam.Richards@taurich.org>

* Adding VP8 Docs.

Signed-off-by: Sam.Richards@taurich.org <Sam.Richards@taurich.org>

* Changing the preset to 5 from 9, addresses some artifacts.

Signed-off-by: Sam.Richards@taurich.org <Sam.Richards@taurich.org>

* Defining the column ordering of the graphs.

Signed-off-by: Sam.Richards@taurich.org <Sam.Richards@taurich.org>

---------

Signed-off-by: Sam.Richards@taurich.org <Sam.Richards@taurich.org>
Signed-off-by: Sam Richards <sam.richards@taurich.org>
Co-authored-by: Sam.Richards@taurich.org <Sam.Richards@taurich.org>
Signed-off-by: Sam.Richards@taurich.org <Sam.Richards@taurich.org>

* ASWF open-source-days update (#98)

* Adding link to Nextgen white-paper.

Signed-off-by: Sam.Richards@taurich.org <Sam.Richards@taurich.org>

* The readme links were not working on the home page, so cut them out and added a link to the main encoding guidelines.

Signed-off-by: Sam.Richards@taurich.org <Sam.Richards@taurich.org>

* Updates adding in lossless encoding.

Signed-off-by: Sam.Richards@taurich.org <Sam.Richards@taurich.org>

---------

Signed-off-by: Sam.Richards@taurich.org <Sam.Richards@taurich.org>
Co-authored-by: Sam.Richards@taurich.org <Sam.Richards@taurich.org>
Signed-off-by: Sam.Richards@taurich.org <Sam.Richards@taurich.org>

* Tweak to main index. (#99)

Signed-off-by: Sam.Richards@taurich.org <Sam.Richards@taurich.org>
Co-authored-by: Sam.Richards@taurich.org <Sam.Richards@taurich.org>
Signed-off-by: Sam.Richards@taurich.org <Sam.Richards@taurich.org>

* Playbacktest (#100)

* Added some tests of playback, using some code from ffmpeg to test seeking to a frame and extracting some individual frames.

Signed-off-by: Sam.Richards@taurich.org <Sam.Richards@taurich.org>

* Comparing different intraframe encoding options.

Signed-off-by: Sam.Richards@taurich.org <Sam.Richards@taurich.org>

* Adding PC tests.

Signed-off-by: Sam Richards <sam.richards@taurich.org>

* Adding lots of timing information.

Signed-off-by: Sam.Richards@taurich.org <Sam.Richards@taurich.org>

* Adding optimization for build.

Signed-off-by: Sam.Richards@taurich.org <Sam.Richards@taurich.org>

* Adding more timing breakdown.

Signed-off-by: Sam.Richards@taurich.org <Sam.Richards@taurich.org>

---------

Signed-off-by: Sam.Richards@taurich.org <Sam.Richards@taurich.org>
Signed-off-by: Sam Richards <sam.richards@taurich.org>
Co-authored-by: Sam.Richards@taurich.org <Sam.Richards@taurich.org>
Signed-off-by: Sam.Richards@taurich.org <Sam.Richards@taurich.org>

* Ffmpeg 7.1 (#101)

* Dont need the yml files for single frames.

Signed-off-by: Sam Richards <sam.richards@taurich.org>

* Define an order to the frames.

Signed-off-by: Sam Richards <sam.richards@taurich.org>

* Adding both types of docker container for ffmpeg 7.1
This includes patches for htj2k decoding.

Signed-off-by: Sam Richards <sam.richards@taurich.org>

---------

Signed-off-by: Sam Richards <sam.richards@taurich.org>
Co-authored-by: Sam.Richards@taurich.org <Sam.Richards@taurich.org>
Signed-off-by: Sam.Richards@taurich.org <Sam.Richards@taurich.org>

* Fix typos (#102)

Signed-off-by: Dimitris Apostolou <dimitris.apostolou@icloud.com>
Signed-off-by: Sam.Richards@taurich.org <Sam.Richards@taurich.org>

* Reorg host config (#90)

* We have been recording the host-config already, this fix displays it on the results.

Signed-off-by: Sam.Richards@taurich.org <Sam.Richards@taurich.org>

* Allow you to specify a directory of config files.

Signed-off-by: Sam.Richards@taurich.org <Sam.Richards@taurich.org>

* Update enctests/testframework/main.py

Simpler way to grab a directories worth of files.

Co-authored-by: Daniel Flehner Heen <flehnerheener@gmail.com>
Signed-off-by: Sam Richards <sam_junk@taurich.org>

---------

Signed-off-by: Sam.Richards@taurich.org <Sam.Richards@taurich.org>
Signed-off-by: Sam Richards <sam_junk@taurich.org>
Co-authored-by: Sam.Richards@taurich.org <Sam.Richards@taurich.org>
Co-authored-by: Daniel Flehner Heen <flehnerheener@gmail.com>
Signed-off-by: Sam.Richards@taurich.org <Sam.Richards@taurich.org>

* Htj2k fixes (#103)

* Adding jpeg2000 codec.

Signed-off-by: Sam.Richards@taurich.org <Sam.Richards@taurich.org>

* WIP, Had problems running this in a docker container, since the timing returned didnt make sense, so we have a clock version and a non-clock version.
Also am experimenting with the thread-type.

Signed-off-by: Sam.Richards@taurich.org <Sam.Richards@taurich.org>

* A bit more docker ffmpeg-7.1 cleanup dont need aces now, since it comes with OCIO.

Signed-off-by: Sam.Richards@taurich.org <Sam.Richards@taurich.org>

* Adding the terrific parallel-frames flag, for faster conversion.

Signed-off-by: Sam.Richards@taurich.org <Sam.Richards@taurich.org>

* Added tests for htj2k, currently relying on ppm files.

Signed-off-by: Sam.Richards@taurich.org <Sam.Richards@taurich.org>

* Wrapper script for generating h2k files and then wrapping in mxf (or mov) file.

Signed-off-by: Sam.Richards@taurich.org <Sam.Richards@taurich.org>

* Frame range fix.

Signed-off-by: Sam.Richards@taurich.org <Sam.Richards@taurich.org>
(cherry picked from commit 13fbea652773b0c65027914efca741c0dd7052ad)
Signed-off-by: Sam.Richards@taurich.org <Sam.Richards@taurich.org>

* Lets just use DPX files since they are supported.

Signed-off-by: Sam.Richards@taurich.org <Sam.Richards@taurich.org>
(cherry picked from commit c999d88c4225eb0d9285a47b4d6ca320fb6181a9)
Signed-off-by: Sam.Richards@taurich.org <Sam.Richards@taurich.org>

* Update new model location.

Signed-off-by: Sam.Richards@taurich.org <Sam.Richards@taurich.org>
(cherry picked from commit 02646963e6fd7c2fc2dd2f176cecfaed50defba6)
Signed-off-by: Sam.Richards@taurich.org <Sam.Richards@taurich.org>

* Update env location so it works on both osx and docker/rockylinux

Signed-off-by: Sam.Richards@taurich.org <Sam.Richards@taurich.org>
(cherry picked from commit 2df535f36b50e7f8c6ec0c4aa907052b31fbdd8a)
Signed-off-by: Sam.Richards@taurich.org <Sam.Richards@taurich.org>

* This is measuring fps rates, purely using ffmpeg.

(cherry picked from commit 685b9cc)
Signed-off-by: Sam.Richards@taurich.org <Sam.Richards@taurich.org>

* Adding a bunch of htj2k tests.

Signed-off-by: Sam.Richards@taurich.org <Sam.Richards@taurich.org>

* Adding a dwab test.

Signed-off-by: Sam.Richards@taurich.org <Sam.Richards@taurich.org>

* Wrappers to help map htj2k and dwab into the encoding framework.

Signed-off-by: Sam.Richards@taurich.org <Sam.Richards@taurich.org>

* Adding some of the 4k media as reference.

Signed-off-by: Sam.Richards@taurich.org <Sam.Richards@taurich.org>

* Adding support for cambi.

Signed-off-by: Sam.Richards@taurich.org <Sam.Richards@taurich.org>

* Put each bit of media in a separate folder.

Signed-off-by: Sam.Richards@taurich.org <Sam.Richards@taurich.org>

* UPgrade to use the vmaf3 code, and do some better comparisons.

Signed-off-by: Sam.Richards@taurich.org <Sam.Richards@taurich.org>

* New templates for vmaf3.

Signed-off-by: Sam.Richards@taurich.org <Sam.Richards@taurich.org>

* Handle the cambi and other parameters into the template better.

Signed-off-by: Sam.Richards@taurich.org <Sam.Richards@taurich.org>

* Special case to handle QFactor= parameters, although this would work with any "=" parameter.

Signed-off-by: Sam.Richards@taurich.org <Sam.Richards@taurich.org>

* comments, and labeling.

Signed-off-by: Sam.Richards@taurich.org <Sam.Richards@taurich.org>

* Dont need this varient.

Signed-off-by: Sam.Richards@taurich.org <Sam.Richards@taurich.org>

* Adding the vmaf3 test.

Signed-off-by: Sam.Richards@taurich.org <Sam.Richards@taurich.org>

* Too extreme, makes graph hard to read.

Signed-off-by: Sam.Richards@taurich.org <Sam.Richards@taurich.org>

* Note for getting exr versions of some of the files.

Signed-off-by: Sam.Richards@taurich.org <Sam.Richards@taurich.org>

* Enable ffplay, so we can do some of the playback testing on the VM.

Signed-off-by: Sam.Richards@taurich.org <Sam.Richards@taurich.org>

* Improve units here and there.

Signed-off-by: Sam.Richards@taurich.org <Sam.Richards@taurich.org>

---------

Signed-off-by: Sam.Richards@taurich.org <Sam.Richards@taurich.org>

* Initial round of oapv tests.

Signed-off-by: Sam.Richards@taurich.org <Sam.Richards@taurich.org>

* WIP to replace pyseq with fileseq

Signed-off-by: Sam Richards <sam_junk@taurich.org>
Signed-off-by: Sam.Richards@taurich.org <Sam.Richards@taurich.org>

* Building ffmpeg (with or without apv) natively on windows using msys2, to get the better performance benchmarks.

Signed-off-by: Sam Richards <sam_junk@taurich.org>
Signed-off-by: Sam.Richards@taurich.org <Sam.Richards@taurich.org>

* Running 4k tests for apv.

Signed-off-by: Sam Richards <sam_junk@taurich.org>
Signed-off-by: Sam.Richards@taurich.org <Sam.Richards@taurich.org>

* Pip install.

Signed-off-by: Sam.Richards@taurich.org <Sam.Richards@taurich.org>

* Encoding args.

Signed-off-by: Sam.Richards@taurich.org <Sam.Richards@taurich.org>

* New style.

Signed-off-by: Sam.Richards@taurich.org <Sam.Richards@taurich.org>

* VP9 change from speed to cpu-used.

Signed-off-by: Sam.Richards@taurich.org <Sam.Richards@taurich.org>

* Wrapper cleanup.

Signed-off-by: Sam.Richards@taurich.org <Sam.Richards@taurich.org>

* Playback tests, think vanilla ffmpeg probably fine though.

Signed-off-by: Sam.Richards@taurich.org <Sam.Richards@taurich.org>

* Wrapper to build 10-bit and 12-bit versions.

Signed-off-by: Sam.Richards@taurich.org <Sam.Richards@taurich.org>

* Switch to using fileseq.

Signed-off-by: Sam.Richards@taurich.org <Sam.Richards@taurich.org>

* Re-working of tests, got cleaner and faster vmaf3.
Addewd psnr and frame-extraction.
Added better compare GUI.

Signed-off-by: Sam.Richards@taurich.org <Sam.Richards@taurich.org>

* Added apv tests.

Signed-off-by: Sam.Richards@taurich.org <Sam.Richards@taurich.org>

* Added htj2k tests.

Signed-off-by: Sam.Richards@taurich.org <Sam.Richards@taurich.org>

* Updating indexes and formatting pages.

Signed-off-by: Sam.Richards@taurich.org <Sam.Richards@taurich.org>

* Cleanup.

Signed-off-by: Sam.Richards@taurich.org <Sam.Richards@taurich.org>

* Using 10-bit and 12-bit data where appropriate.

Signed-off-by: Sam.Richards@taurich.org <Sam.Richards@taurich.org>

* Adding openapv

Signed-off-by: Sam.Richards@taurich.org <Sam.Richards@taurich.org>

* Updated scripts.

Signed-off-by: Sam.Richards@taurich.org <Sam.Richards@taurich.org>

* New configs.

Signed-off-by: Sam.Richards@taurich.org <Sam.Richards@taurich.org>

* Its ProRes not Prores.

Signed-off-by: Sam.Richards@taurich.org <Sam.Richards@taurich.org>

* CPU Used repeated.

Signed-off-by: Sam.Richards@taurich.org <Sam.Richards@taurich.org>

* Adding OpenAPV and HTJ2K WIP.

Signed-off-by: Sam.Richards@taurich.org <Sam.Richards@taurich.org>

* Support single frames.

Signed-off-by: Sam.Richards@taurich.org <Sam.Richards@taurich.org>

* Adding metadata page.

Signed-off-by: Sam.Richards@taurich.org <Sam.Richards@taurich.org>

* Updating index.

Signed-off-by: Sam.Richards@taurich.org <Sam.Richards@taurich.org>

* Add transcoding notes.

Signed-off-by: Sam.Richards@taurich.org <Sam.Richards@taurich.org>

* UPdated docs.

Signed-off-by: Sam.Richards@taurich.org <Sam.Richards@taurich.org>

* Renamed from htj2k_prep to media_prep

Signed-off-by: Sam.Richards@taurich.org <Sam.Richards@taurich.org>

* Updated sync to encode site.

Signed-off-by: Sam.Richards@taurich.org <Sam.Richards@taurich.org>

* Enhanced sync page.

Signed-off-by: Sam.Richards@taurich.org <Sam.Richards@taurich.org>

* Updated tests.

Signed-off-by: Sam.Richards@taurich.org <Sam.Richards@taurich.org>

* Update notes.

Signed-off-by: Sam.Richards@taurich.org <Sam.Richards@taurich.org>

* More tests to ignore.

Signed-off-by: Sam.Richards@taurich.org <Sam.Richards@taurich.org>

---------

Signed-off-by: Sam.Richards@taurich.org <Sam.Richards@taurich.org>
Signed-off-by: Sam Richards <sam.richards@taurich.org>
Signed-off-by: Dimitris Apostolou <dimitris.apostolou@icloud.com>
Signed-off-by: Sam Richards <sam_junk@taurich.org>
Co-authored-by: Dimitris Apostolou <dimitris.apostolou@icloud.com>
Co-authored-by: Daniel Flehner Heen <flehnerheener@gmail.com>
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.

2 participants