Ffmpeg 7.1 (#101)

* Dont need the yml files for single frames. Signed-off-by: Sam Richards <[email protected]> * Define an order to the frames. Signed-off-by: Sam Richards <[email protected]> * Adding both types of docker container for ffmpeg 7.1 This includes patches for htj2k decoding. Signed-off-by: Sam Richards <[email protected]> --------- Signed-off-by: Sam Richards <[email protected]> Co-authored-by: [email protected] <[email protected]>
AcademySoftwareFoundation · Nov 10, 2024 · e4f19ac · e4f19ac
1 parent b13487e
commit e4f19ac
Show file tree

Hide file tree

Showing 8 changed files with 1,519 additions and 2 deletions.
diff --git a/docker/ffmpeg-7.1/Dockerfile b/docker/ffmpeg-7.1/Dockerfile
diff --git a/docker/ffmpeg-7.1/runme.bat b/docker/ffmpeg-7.1/runme.bat
@@ -0,0 +1,3 @@
+FOR /F %%a IN ('git rev-parse --show-toplevel') DO SET GITROOT=%%a
+echo Mounting: %GITROOT%
+docker run -it --name ci-ffmpeg-7.1  --gpus=all,capabilities=video --mount type=bind,source=%GITROOT%,target=/test ci-ffmpeg-7.1
diff --git a/docker/ffmpeg-7.1/runme.sh b/docker/ffmpeg-7.1/runme.sh
@@ -0,0 +1,6 @@
+GITROOT=`git rev-parse --show-toplevel`
+docker run \
+  -it \
+  --name ci-ffmpeg7.1  --gpus=all,capabilities=video \
+  --mount type=bind,source=${GITROOT},target=/test \
+  ci-ffmpeg7.1
diff --git a/docker/rocky-ffmpeg-7.1/Dockerfile b/docker/rocky-ffmpeg-7.1/Dockerfile
diff --git a/docker/rocky-ffmpeg-7.1/runme.bat b/docker/rocky-ffmpeg-7.1/runme.bat
@@ -0,0 +1,3 @@
+FOR /F %%a IN ('git rev-parse --show-toplevel') DO SET GITROOT=%%a
+echo Mounting: %GITROOT%
+docker run -it --name rocky-ffmpeg-7.1 --gpus=all,capabilities=video --mount type=bind,source=%GITROOT%,target=/test rocky-ffmpeg-7.1
diff --git a/docker/rocky-ffmpeg-7.1/runme.sh b/docker/rocky-ffmpeg-7.1/runme.sh
@@ -0,0 +1,6 @@
+GITROOT=`git rev-parse --show-toplevel`
+docker run \
+  -it \
+  --name rocky-ffmpeg-7.1  --gpus=all,capabilities=video \
+  --mount type=bind,source=${GITROOT},target=/test \
+  rocky-ffmpeg-7.1
diff --git a/enctests/test_configs/swsscale_tests.yml b/enctests/test_configs/swsscale_tests.yml
@@ -7,7 +7,8 @@ test_sws:
     -y "{outfile}"
   name: test_sws
   sources:
-#  - ../sourceimages/smptehdbars_10.dpx.yml
+
+#  - ../sourceimages/smptehdbars_10.dpx
   - ../sourceimages/zoneplate_rgb16.png
   - ../sourceimages/bellnuitHDTestchart.tif
   - ../sourceimages/SonyF35.StillLife_srgb.png
@@ -71,7 +72,7 @@ test_oiio:
     -o "{outfile}"
   name: test_oiio
   sources:
-#  - ../sourceimages/smptehdbars_10.dpx.yml
+#  - ../sourceimages/smptehdbars_10.dpx
   - ../sourceimages/zoneplate_rgb16.png
   - ../sourceimages/bellnuitHDTestchart.tif
   - ../sourceimages/SonyF35.StillLife_srgb.png

diff --git a/enctests/test_wedge_configs/codec_444_tests.yml b/enctests/test_wedge_configs/codec_444_tests.yml
@@ -81,6 +81,7 @@ reports:
     graphs:
     - args:
         color: wedge
+        colororder: ['libx264-10bit', 'libx265-10bit', 'libvpx-vp9-10bit', 'libaom-av1-10bit', 'prores_ks', 'dnxhd']
         height: 400
         barmode: group
         x: media