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

#578: Update to FFmpeg 7.1 #599

Merged

Conversation

williamwira
Copy link
Contributor

@williamwira williamwira commented Sep 30, 2024

Linked issues

Fixes #578

Summarize your change.

Upgraded FFmpeg to 7.1, and resolved build-time errors and deprecation warnings.
Added build flag RV_FFMPEG so app builder can decide between FFmpeg 6 and FFmpeg 7. (FFmpeg 6 is default)

Describe the reason for the change.

Maintenance Update

Describe what you have tested and on which operating system.

MacOS Sonoma 14.7
Linux RHEL 9.2

Add a list of changes, and note any that might need special attention during the review.

MovieFFMpeg
ffmpeg.cmake

Build with no RV_FFMPEG flag to build against FFmpeg 6, or do rvcfg -DRV_FFMPEG=7 to use FFmpeg 7.
After building: Open RV, load a QuickTime video file. Confirm the video loads and can be played.

Copy link

linux-foundation-easycla bot commented Sep 30, 2024

CLA Signed

The committers listed above are authorized under a signed CLA.

@williamwira williamwira marked this pull request as draft September 30, 2024 19:42
@williamwira williamwira changed the title #578: Update to FFmpeg 7.0.2 WIP #578: Update to FFmpeg 7.0.2 Sep 30, 2024
@williamwira williamwira force-pushed the review-wwira-578 branch 2 times, most recently from 277da13 to c65fd0c Compare October 2, 2024 11:17
@williamwira williamwira marked this pull request as ready for review October 2, 2024 11:22
@williamwira williamwira force-pushed the review-wwira-578 branch 3 times, most recently from b150cd2 to 6140261 Compare October 2, 2024 15:43
@williamwira williamwira changed the title #578: Update to FFmpeg 7.0.2 #578: Update to FFmpeg 7.1 Oct 4, 2024
Copy link
Contributor

@bernie-laberge bernie-laberge left a comment

Choose a reason for hiding this comment

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

LGTM
Thank you for this excellent contribution to Open RV Will !

Copy link
Contributor

@eloisebrosseau eloisebrosseau left a comment

Choose a reason for hiding this comment

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

Small nitpick, but this is really great! Thank you Will!

src/lib/image/MovieFFMpeg/MovieFFMpeg.cpp Outdated Show resolved Hide resolved
Upgrade ffmpeg to 7.1.
Fix deprecation errors and warnings when building with FFmpeg 7.1.

n/a

Maintenance Update

MacOS

Signed-off-by: Will Wira <[email protected]>
Optionally use build flag RV_FFMPEG to
select desired major version to build.

Build example:
rvcfg -DRV_FFMPEG=7

Supported versions: 6 (default), 7

Signed-off-by: Will Wira <[email protected]>
Updated all text references to FFmpeg so they match
the official product naming.

Signed-off-by: Will Wira <[email protected]>
…SoftwareFoundation#578)

* av_channel_name and av_channel_desc return values are valid
  for int > 0.
* Update c-style arrays in MovieFFMpeg::idAudioChannels to
  std::array.

Signed-off-by: Will Wira <[email protected]>
Include array header

Signed-off-by: Will Wira <[email protected]>
@bernie-laberge bernie-laberge enabled auto-merge (squash) October 22, 2024 02:02
@bernie-laberge bernie-laberge merged commit 576d569 into AcademySoftwareFoundation:main Oct 22, 2024
12 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

[Maintenance]: Update to FFmpeg 7.0.2
4 participants