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.

Sign up for GitHub

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

Jump to bottom

#578: Update to FFmpeg 7.1 #599

Merged
merged 5 commits into from
Oct 22, 2024
Merged

#578: Update to FFmpeg 7.1 #599

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
48c3e18
Update to FFmpeg 7 (#578)
williamwira Sep 30, 2024
9582567
Add build flag RV_FFMPEG (#578)
williamwira Oct 15, 2024
56ca5ae
Address code review feedback (#578)
williamwira Oct 16, 2024
e40a0f3
Update av_channel ret value handling, address code review fb (#578)
williamwira Oct 18, 2024
58d2299
Address build issue (#578)
williamwira Oct 18, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 16 additions & 0 deletions cmake/defaults/cxx_defaults.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,3 +72,19 @@ ELSEIF(RV_VFX_PLATFORM STREQUAL CY2023)
SET(RV_VFX_CY2023 ON)
ADD_COMPILE_DEFINITIONS(RV_VFX_CY2023)
ENDIF()

#
# FFmpeg option
#

# Add preprocessor variable for use in code and
# cmake to determine the current version of FFmpeg.
# Current version must be one of the supported
# versions, as defined in ffmpeg.cmake.
IF(RV_FFMPEG STREQUAL 6)
SET(RV_FFMPEG_6 ON)
ADD_COMPILE_DEFINITIONS(RV_FFMPEG_6)
ELSEIF(RV_FFMPEG STREQUAL 7)
SET(RV_FFMPEG_7 ON)
ADD_COMPILE_DEFINITIONS(RV_FFMPEG_7)
ENDIF()
36 changes: 35 additions & 1 deletion cmake/defaults/rv_options.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,4 +76,38 @@ SET(RV_VFX_PLATFORM
SET_PROPERTY(
CACHE RV_VFX_PLATFORM
PROPERTY STRINGS ${_RV_VFX_PLATFORM}
)
)

#
# FFmpeg option
#
# This option is to control the version of FFmpeg
# that OpenRV downloads and installs.
#
# There will be one version used by default per
# major release. Any other version will require
# RV_FFMPEG env var to be set with the desired
# major version.
#

# Supported FFmpeg versions.
SET(RV_FFMPEG_SUPPORTED_OPTIONS 6 7)
# Default option
SET(_RV_FFMPEG "6")

IF(DEFINED RV_FFMPEG)
set(_RV_FFMPEG ${RV_FFMPEG})
IF(NOT "${_RV_FFMPEG}" IN_LIST RV_FFMPEG_SUPPORTED_OPTIONS)
MESSAGE(FATAL_ERROR "RV_FFMPEG=${RV_FFMPEG} is unsupported. Supported values are: ${RV_FFMPEG_SUPPORTED_OPTIONS}")
ENDIF()
ENDIF()

# Overwrite the cache variable
SET(RV_FFMPEG
"${_RV_FFMPEG}"
CACHE STRING "Set FFmpeg version for installing external depdendency" FORCE
)
SET_PROPERTY(
CACHE RV_FFMPEG
PROPERTY STRINGS ${_RV_FFMPEG}
)
184 changes: 129 additions & 55 deletions cmake/dependencies/ffmpeg.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,17 +23,33 @@ SET(_target
"RV_DEPS_FFMPEG"
)

SET(_version
"n6.1.1"
)
IF(RV_FFMPEG_7)
SET(_version
"n7.1"
)

SET(_download_hash
"a7a85ec05c9bc3aeefee12743899d8ab"
)
ELSEIF(RV_FFMPEG_6)
SET(_version
"n6.1.1"
)

SET(_download_hash
"6dfc27fcb6da6f653c6ec025c2cd9b00"
)
ELSE()
# This shouldn't happen, but it could if there are changes the acceptable
# versions of FFmpeg in ffmpeg.cmake and this section is not
# updated accordingly.
message( FATAL_ERROR "The requested version of FFmpeg is not supported." )
ENDIF()

SET(_download_url
"https://github.com/FFmpeg/FFmpeg/archive/refs/tags/${_version}.zip"
)

SET(_download_hash
"6dfc27fcb6da6f653c6ec025c2cd9b00"
)

SET(_base_dir
${RV_DEPS_BASE_DIR}/${_target}
)
Expand Down Expand Up @@ -65,54 +81,112 @@ ELSE()
)
ENDIF()

IF(RV_TARGET_DARWIN)
SET(_ffmpeg_avutil_lib_name
${CMAKE_SHARED_LIBRARY_PREFIX}avutil.58${CMAKE_SHARED_LIBRARY_SUFFIX}
)
SET(_ffmpeg_swresample_lib_name
${CMAKE_SHARED_LIBRARY_PREFIX}swresample.4${CMAKE_SHARED_LIBRARY_SUFFIX}
)
SET(_ffmpeg_swscale_lib_name
${CMAKE_SHARED_LIBRARY_PREFIX}swscale.7${CMAKE_SHARED_LIBRARY_SUFFIX}
)
SET(_ffmpeg_avcodec_lib_name
${CMAKE_SHARED_LIBRARY_PREFIX}avcodec.60${CMAKE_SHARED_LIBRARY_SUFFIX}
)
SET(_ffmpeg_avformat_lib_name
${CMAKE_SHARED_LIBRARY_PREFIX}avformat.60${CMAKE_SHARED_LIBRARY_SUFFIX}
)
ELSEIF(RV_TARGET_LINUX)
SET(_ffmpeg_avutil_lib_name
${CMAKE_SHARED_LIBRARY_PREFIX}avutil${CMAKE_SHARED_LIBRARY_SUFFIX}.58
)
SET(_ffmpeg_swresample_lib_name
${CMAKE_SHARED_LIBRARY_PREFIX}swresample${CMAKE_SHARED_LIBRARY_SUFFIX}.4
)
SET(_ffmpeg_swscale_lib_name
${CMAKE_SHARED_LIBRARY_PREFIX}swscale${CMAKE_SHARED_LIBRARY_SUFFIX}.7
)
SET(_ffmpeg_avcodec_lib_name
${CMAKE_SHARED_LIBRARY_PREFIX}avcodec${CMAKE_SHARED_LIBRARY_SUFFIX}.60
)
SET(_ffmpeg_avformat_lib_name
${CMAKE_SHARED_LIBRARY_PREFIX}avformat${CMAKE_SHARED_LIBRARY_SUFFIX}.60
)
ELSEIF(RV_TARGET_WINDOWS)
SET(_ffmpeg_avutil_lib_name
${CMAKE_SHARED_LIBRARY_PREFIX}avutil-58${CMAKE_SHARED_LIBRARY_SUFFIX}
)
SET(_ffmpeg_swresample_lib_name
${CMAKE_SHARED_LIBRARY_PREFIX}swresample-4${CMAKE_SHARED_LIBRARY_SUFFIX}
)
SET(_ffmpeg_swscale_lib_name
${CMAKE_SHARED_LIBRARY_PREFIX}swscale-7${CMAKE_SHARED_LIBRARY_SUFFIX}
)
SET(_ffmpeg_avcodec_lib_name
${CMAKE_SHARED_LIBRARY_PREFIX}avcodec-60${CMAKE_SHARED_LIBRARY_SUFFIX}
)
SET(_ffmpeg_avformat_lib_name
${CMAKE_SHARED_LIBRARY_PREFIX}avformat-60${CMAKE_SHARED_LIBRARY_SUFFIX}
)

IF(RV_FFMPEG_7)
IF(RV_TARGET_DARWIN)
SET(_ffmpeg_avutil_lib_name
${CMAKE_SHARED_LIBRARY_PREFIX}avutil.59${CMAKE_SHARED_LIBRARY_SUFFIX}
)
SET(_ffmpeg_swresample_lib_name
${CMAKE_SHARED_LIBRARY_PREFIX}swresample.5${CMAKE_SHARED_LIBRARY_SUFFIX}
)
SET(_ffmpeg_swscale_lib_name
${CMAKE_SHARED_LIBRARY_PREFIX}swscale.8${CMAKE_SHARED_LIBRARY_SUFFIX}
)
SET(_ffmpeg_avcodec_lib_name
${CMAKE_SHARED_LIBRARY_PREFIX}avcodec.61${CMAKE_SHARED_LIBRARY_SUFFIX}
)
SET(_ffmpeg_avformat_lib_name
${CMAKE_SHARED_LIBRARY_PREFIX}avformat.61${CMAKE_SHARED_LIBRARY_SUFFIX}
)
ELSEIF(RV_TARGET_LINUX)
SET(_ffmpeg_avutil_lib_name
${CMAKE_SHARED_LIBRARY_PREFIX}avutil${CMAKE_SHARED_LIBRARY_SUFFIX}.59
)
SET(_ffmpeg_swresample_lib_name
${CMAKE_SHARED_LIBRARY_PREFIX}swresample${CMAKE_SHARED_LIBRARY_SUFFIX}.5
)
SET(_ffmpeg_swscale_lib_name
${CMAKE_SHARED_LIBRARY_PREFIX}swscale${CMAKE_SHARED_LIBRARY_SUFFIX}.8
)
SET(_ffmpeg_avcodec_lib_name
${CMAKE_SHARED_LIBRARY_PREFIX}avcodec${CMAKE_SHARED_LIBRARY_SUFFIX}.61
)
SET(_ffmpeg_avformat_lib_name
${CMAKE_SHARED_LIBRARY_PREFIX}avformat${CMAKE_SHARED_LIBRARY_SUFFIX}.61
)
ELSEIF(RV_TARGET_WINDOWS)
SET(_ffmpeg_avutil_lib_name
${CMAKE_SHARED_LIBRARY_PREFIX}avutil-59${CMAKE_SHARED_LIBRARY_SUFFIX}
)
SET(_ffmpeg_swresample_lib_name
${CMAKE_SHARED_LIBRARY_PREFIX}swresample-5${CMAKE_SHARED_LIBRARY_SUFFIX}
)
SET(_ffmpeg_swscale_lib_name
${CMAKE_SHARED_LIBRARY_PREFIX}swscale-8${CMAKE_SHARED_LIBRARY_SUFFIX}
)
SET(_ffmpeg_avcodec_lib_name
${CMAKE_SHARED_LIBRARY_PREFIX}avcodec-61${CMAKE_SHARED_LIBRARY_SUFFIX}
)
SET(_ffmpeg_avformat_lib_name
${CMAKE_SHARED_LIBRARY_PREFIX}avformat-61${CMAKE_SHARED_LIBRARY_SUFFIX}
)
ENDIF()
ELSEIF(RV_FFMPEG_6)
IF(RV_TARGET_DARWIN)
SET(_ffmpeg_avutil_lib_name
${CMAKE_SHARED_LIBRARY_PREFIX}avutil.58${CMAKE_SHARED_LIBRARY_SUFFIX}
)
SET(_ffmpeg_swresample_lib_name
${CMAKE_SHARED_LIBRARY_PREFIX}swresample.4${CMAKE_SHARED_LIBRARY_SUFFIX}
)
SET(_ffmpeg_swscale_lib_name
${CMAKE_SHARED_LIBRARY_PREFIX}swscale.7${CMAKE_SHARED_LIBRARY_SUFFIX}
)
SET(_ffmpeg_avcodec_lib_name
${CMAKE_SHARED_LIBRARY_PREFIX}avcodec.60${CMAKE_SHARED_LIBRARY_SUFFIX}
)
SET(_ffmpeg_avformat_lib_name
${CMAKE_SHARED_LIBRARY_PREFIX}avformat.60${CMAKE_SHARED_LIBRARY_SUFFIX}
)
ELSEIF(RV_TARGET_LINUX)
SET(_ffmpeg_avutil_lib_name
${CMAKE_SHARED_LIBRARY_PREFIX}avutil${CMAKE_SHARED_LIBRARY_SUFFIX}.58
)
SET(_ffmpeg_swresample_lib_name
${CMAKE_SHARED_LIBRARY_PREFIX}swresample${CMAKE_SHARED_LIBRARY_SUFFIX}.4
)
SET(_ffmpeg_swscale_lib_name
${CMAKE_SHARED_LIBRARY_PREFIX}swscale${CMAKE_SHARED_LIBRARY_SUFFIX}.7
)
SET(_ffmpeg_avcodec_lib_name
${CMAKE_SHARED_LIBRARY_PREFIX}avcodec${CMAKE_SHARED_LIBRARY_SUFFIX}.60
)
SET(_ffmpeg_avformat_lib_name
${CMAKE_SHARED_LIBRARY_PREFIX}avformat${CMAKE_SHARED_LIBRARY_SUFFIX}.60
)
ELSEIF(RV_TARGET_WINDOWS)
SET(_ffmpeg_avutil_lib_name
${CMAKE_SHARED_LIBRARY_PREFIX}avutil-58${CMAKE_SHARED_LIBRARY_SUFFIX}
)
SET(_ffmpeg_swresample_lib_name
${CMAKE_SHARED_LIBRARY_PREFIX}swresample-4${CMAKE_SHARED_LIBRARY_SUFFIX}
)
SET(_ffmpeg_swscale_lib_name
${CMAKE_SHARED_LIBRARY_PREFIX}swscale-7${CMAKE_SHARED_LIBRARY_SUFFIX}
)
SET(_ffmpeg_avcodec_lib_name
${CMAKE_SHARED_LIBRARY_PREFIX}avcodec-60${CMAKE_SHARED_LIBRARY_SUFFIX}
)
SET(_ffmpeg_avformat_lib_name
${CMAKE_SHARED_LIBRARY_PREFIX}avformat-60${CMAKE_SHARED_LIBRARY_SUFFIX}
)
ENDIF()
ELSE()
# This shouldn't happen. But it could if there are changes the acceptable
# versions of FFmpeg in ffmpeg.cmake and this section is not
# updated accordingly.
message( FATAL_ERROR "The requested version of FFmpeg is not supported." )
ENDIF()

SET(_ffmpeg_libs
Expand Down
Loading
Loading