add ffmpeg8 in various locations

Author: Daniel Flores

.github/workflows/build_ffmpeg.yaml

@@ -27,7 +27,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ffmpeg-version: ["4.4.4", "5.1.4", "6.1.1", "7.0.1"]
+        ffmpeg-version: ["4.4.4", "5.1.4", "6.1.1", "7.0.1", "8.0"]
     uses: pytorch/test-infra/.github/workflows/linux_job_v2.yml@main
     permissions:
       id-token: write
@@ -52,7 +52,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ffmpeg-version: ["4.4.4", "5.1.4", "6.1.1", "7.0.1"]
+        ffmpeg-version: ["4.4.4", "5.1.4", "6.1.1", "7.0.1", "8.0"]
     uses: pytorch/test-infra/.github/workflows/macos_job.yml@main
     with:
       job-name: Build
@@ -75,7 +75,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ffmpeg-version: ["4.4.4", "5.1.4", "6.1.1", "7.0.1"]
+        ffmpeg-version: ["4.4.4", "5.1.4", "6.1.1", "7.0.1", "8.0"]
     uses: pytorch/test-infra/.github/workflows/windows_job.yml@main
     with:
       job-name: Build

packaging/build_ffmpeg.sh

@@ -104,6 +104,14 @@ if [[ "$(uname)" == Darwin ]]; then
         avfilter=libavfilter.10
         swscale=libswscale.8
         swresample=libswresample.5
+    elif [[ ${major_ver} == 8 ]]; then
+        avutil=libavutil.60
+        avcodec=libavcodec.62
+        avformat=libavformat.62
+        avdevice=libavdevice.62
+        avfilter=libavfilter.11
+        swscale=libswscale.9
+        swresample=libswresample.6
     else
         printf "Error: unexpected FFmpeg major version: %s\n"  ${major_ver}
         exit 1;

src/torchcodec/_core/CMakeLists.txt

@@ -263,11 +263,12 @@ if(DEFINED ENV{BUILD_AGAINST_ALL_FFMPEG_FROM_S3})
         you still need a different FFmpeg to be installed for run time!"
     )
 
-    # This will expose the ffmpeg4, ffmpeg5, ffmpeg6, and ffmpeg7 targets
+    # This will expose the ffmpeg4, ffmpeg5, ffmpeg6, ffmpeg7, and ffmpeg8 targets
     include(
         ${CMAKE_CURRENT_SOURCE_DIR}/fetch_and_expose_non_gpl_ffmpeg_libs.cmake
     )
 
+    make_torchcodec_libraries(8 ffmpeg8)
     make_torchcodec_libraries(7 ffmpeg7)
     make_torchcodec_libraries(6 ffmpeg6)
     make_torchcodec_libraries(4 ffmpeg4)

src/torchcodec/_core/fetch_and_expose_non_gpl_ffmpeg_libs.cmake

@@ -84,6 +84,16 @@ if (LINUX)
        libswscale.so.8
        libswresample.so.5
     )
+    set(
+       f8_library_file_names
+       libavutil.so.60
+       libavcodec.so.62
+       libavformat.so.62
+       libavdevice.so.62
+       libavfilter.so.11
+       libswscale.so.9
+       libswresample.so.6
+    )
 elseif (APPLE)
     set(lib_dir "lib")
     set(
@@ -147,6 +157,16 @@ elseif (APPLE)
        libswscale.8.dylib
        libswresample.5.dylib
     )
+    set(
+       f8_library_file_names
+       libavutil.60.dylib
+       libavcodec.62.dylib
+       libavformat.62.dylib
+       libavdevice.62.dylib
+       libavfilter.11.dylib
+       libswscale.9.dylib
+       libswresample.6.dylib
+    )
 
 elseif (WIN32)
     set(lib_dir "bin")
@@ -211,6 +231,16 @@ elseif (WIN32)
         swscale.lib
         swresample.lib
     )
+    set(
+        f8_library_file_names
+        avutil.lib
+        avcodec.lib
+        avformat.lib
+        avdevice.lib
+        avfilter.lib
+        swscale.lib
+        swresample.lib
+    )
 else()
     message(
         FATAL_ERROR
@@ -242,13 +272,20 @@ FetchContent_Declare(
     URL_HASH
     SHA256=${f7_sha256}
 )
+FetchContent_Declare(
+    f8
+    URL ${platform_url}/8.0.tar.gz
+    URL_HASH
+    SHA256=${f8_sha256}
+)
 
-FetchContent_MakeAvailable(f4 f5 f6 f7)
+FetchContent_MakeAvailable(f4 f5 f6 f7 f8)
 
 add_library(ffmpeg4 INTERFACE)
 add_library(ffmpeg5 INTERFACE)
 add_library(ffmpeg6 INTERFACE)
 add_library(ffmpeg7 INTERFACE)
+add_library(ffmpeg8 INTERFACE)
 
 # Note: the f?_SOURCE_DIR variables were set by FetchContent_MakeAvailable
 target_include_directories(ffmpeg4 INTERFACE ${f4_SOURCE_DIR}/include)