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

[ffmpeg] Fix stereo upmixing #25032

Merged
merged 1 commit into from
Apr 21, 2024
Merged

Conversation

sundermann
Copy link
Contributor

Description

AVChannel was compared with channel masks instead of the AVChannel enum. This resulted in only the center and front right speaker being remapped in the matrix.

Motivation and context

Fixes #25028

How has this been tested?

MacOS

What is the effect on users?

Screenshots (if appropriate):

Types of change

  • Bug fix (non-breaking change which fixes an issue)
  • Clean up (non-breaking change which removes non-working, unmaintained functionality)
  • Improvement (non-breaking change which improves existing functionality)
  • New feature (non-breaking change which adds functionality)
  • Breaking change (fix or feature that will cause existing functionality to change)
  • Cosmetic change (non-breaking change that doesn't touch code)
  • Student submission (PR was done for educational purposes and will be treated as such)
  • None of the above (please explain below)

Checklist:

  • My code follows the Code Guidelines of this project
  • My change requires a change to the documentation, either Doxygen or wiki
  • I have updated the documentation accordingly
  • I have read the Contributing document
  • I have added tests to cover my change
  • All new and existing tests passed

@sundermann sundermann added Type: Fix non-breaking change which fixes an issue Component: Audio v22 "P" labels Apr 20, 2024
@sundermann sundermann added this to the "P" 22.0 Alpha 1 milestone Apr 20, 2024
@fritsch
Copy link
Member

fritsch commented Apr 21, 2024

Very good catch. I fear we have same issue somewhere else.

@sundermann
Copy link
Contributor Author

Only caught it by accidence because it was next to the code that broke channel remapping in ffmpeg 7.0. I did a quick grep through the code and the other direct uses of the AV_CH_* macros seem fine.

@sundermann
Copy link
Contributor Author

Jenkins build this please

@sundermann sundermann mentioned this pull request Apr 21, 2024
14 tasks
@sundermann sundermann merged commit 39b72ae into xbmc:master Apr 21, 2024
2 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Backport: Done Component: Audio Type: Fix non-breaking change which fixes an issue v22 "P"
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Stereo upmix is broken on several platforms
2 participants