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

AudioDecoder: support ffmpeg 7.0 #3380

Merged
merged 1 commit into from
Apr 13, 2024
Merged

AudioDecoder: support ffmpeg 7.0 #3380

merged 1 commit into from
Apr 13, 2024

Conversation

scpeters
Copy link
Member

🦟 Bug fix

Fixes compilation with ffmpeg 7.0

Summary

Homebrew recently added ffmpeg 7.0, against which gazebo-classic fails to compile (see osrf/homebrew-simulation#2636 and osrf/homebrew-simulation#2637). This uses a portion of the changes from gazebosim/gz-common#329 to fix the reference to the channels variable, and removes some code added in #3195 by @traversaro with the following comment:

With respect to gazebosim/gz-common#325, I noticed a strange behaviour for which the avcodec_parameters_to_context function that in https://github.com/osrf/gazebo/pull/3195/files#diff-08c8dfc0ffe4733c2fcc1ebd0e3f67032e24b302b25a90c26e87994582503198R326 was not copying the members of the AVCodecParameters structure to the AVCodecContext structure. I was not able to understand why that happened, but copying the members manually worked fine, however it is probably worth to check that the tests work fine on another setup by commenting out https://github.com/osrf/gazebo/pull/3195/files#diff-08c8dfc0ffe4733c2fcc1ebd0e3f67032e24b302b25a90c26e87994582503198R334-R348 .

I removed the mentioned code, and it compiles and all parts of UNIT_AudioDecoder_TEST pass except for CheerFile, which has long been failing.

Checklist

  • Signed all commits for DCO
  • Added tests
  • Updated documentation (as needed)
  • Updated migration guide (as needed)
  • Consider updating Python bindings (if the library has them)
  • codecheck passed (See contributing)
  • All tests passed (See test coverage)
  • While waiting for a review on your PR, please help review another open pull request to support the maintainers

Note to maintainers: Remember to use Squash-Merge and edit the commit message to match the pull request summary while retaining Signed-off-by messages.

Signed-off-by: Steve Peters <scpeters@openrobotics.org>
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