Match Core Audio channel layouts for FLAC#848
Merged
Conversation
Contributor
There was a problem hiding this comment.
Pull request overview
This PR updates the channel layout mappings for FLAC files to better align with Core Audio's standard WAVE channel layout conventions. Specifically, it changes the decoder to use the "A" variants of WAVE layouts (which use standard surround positions Ls/Rs) instead of the "B" variants (which use rear surround positions Rls/Rrs), and switches from MPEG_3_0_A to WAVE_3_0 for 3-channel audio.
Changes:
- Changed 3-channel layout from MPEG_3_0_A to WAVE_3_0 for better consistency with WAVE conventions
- Changed 5-channel layout from WAVE_5_0_B (L R C Rls Rrs) to WAVE_5_0_A (L R C Ls Rs)
- Changed 6-channel layout from WAVE_5_1_B (L R C LFE Rls Rrs) to WAVE_5_1_A (L R C LFE Ls Rs)
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
The channel layouts for FLAC 4.0, 5.0, and 5.1 are possibly incorrect.
4 channels
ffmpeguses thequadlayout.CoreAudio uses
kAudioChannelLayoutTag_WAVE_4_0_B(L R Rls Rrs). This is the current behavior.It might be more correct to use
kAudioChannelLayoutTag_Quadraphonic(L R Ls Rs -- 90 degree speaker separation).5 channels (5.0)
CoreAudio uses
kAudioChannelLayoutTag_WAVE_5_0_A(L R C Ls Rs).This differs from the current behavior which is
kAudioChannelLayoutTag_WAVE_5_0_B(L R C Rls Rrs).6 channels (5.1)
CoreAudio uses
kAudioChannelLayoutTag_WAVE_5_1_A(L R C LFE Ls Rs).This differs from the current behavior which is
kAudioChannelLayoutTag_WAVE_5_1_B(L R C LFE Rls Rrs).The Core Audio channel definitions are: