Repository navigation
Conversation
…ty lane Since commit cd3a74e ("media: rockchip: hdmirx: fix 5.1-channel audio capture") stopped overriding the speaker allocation, layouts whose Audio InfoFrame CA leaves a whole sample lane unused but whose source still transmits that lane are corrupted, e.g. CA 0x04 FL FR - - RC (3.0 with back centre) CA 0x08 FL FR - - RL RR (quad) AUDIO_FIFO_STATUS2 then reports underflow and overflow together (0x3000000) with a fill level of 0 on every poll, and the FIFO never recovers. AUD_SAMPLE_PRESENT shows lanes 0-2 (or 0-3) present. The previous fixed override (AUDIO_PROC_CONFIG3 = 0xffffffff) avoided this but starved the FIFO whenever fewer than four lanes are sent, e.g. 5.1 (lanes 0x7), which is what that commit fixed. AUDIO_PROC_CONFIG3 behaves as a per-channel-slot mask. Override the speaker allocation with a mask that marks both slots of every lane the source actually sends, read from AUD_SAMPLE_PRESENT. Stereo and the case where no lane is reported present keep the current behaviour. Tested on ROCK 5B+ with test clips for 20 CTA-861 speaker allocations, plus variants of CA 0x08-0x15 with side instead of rear speakers: no corruption, and every channel in its CTA-861 position. Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com> Signed-off-by: Graham Horner <graham@hornercs.co.uk>
Author
|
@liangyuanjinradxa please review |
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
1 participant
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.
…ty lane
PR #608 improves multi-channel audio capture but there remain some issues which this patch solves.