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

Channel fixes #58

Merged
merged 8 commits into from Jun 26, 2018
Merged

Channel fixes #58

merged 8 commits into from Jun 26, 2018

Conversation

@Manishearth
Copy link
Member

Manishearth commented Jun 26, 2018

  • Adds channel count modes
  • Adds channel interpretation modes
  • Adds all the upmix/downmix equations

Haven't yet written tests for this partially because I don't have quad/5.1 systems to test with.

r? @ferjm

@@ -124,7 +124,7 @@ impl AudioSink for GStreamerAudioSink {
// sometimes nothing reaches the output
if chunk.len() == 0 {
chunk.blocks.push(Default::default());
chunk.blocks[0].mix(channels as u8);
chunk.blocks[0].repeat(channels as u8);

This comment has been minimized.

@sdroege

sdroege Jun 26, 2018

Contributor

You probably want to also signal the actual channel layout to GStreamer via the channel-mask or the positions array in the GstAudioInfo

This comment has been minimized.

@Manishearth

Manishearth Jun 26, 2018

Author Member

We only support one layout in gstreamer right now, yeah?

This comment has been minimized.

@Manishearth

Manishearth Jun 26, 2018

Author Member

Oh, I see. I'll be working on this when I add better support for output channel counts. Currently it's hardcoded to be two.

@ferjm ferjm self-requested a review Jun 26, 2018
@ferjm
ferjm approved these changes Jun 26, 2018
Copy link
Member

ferjm left a comment

LGTM, with @sdroege feedback addressed.

self.resize_silence(channels);
}
} else {
// For speakers, we have to do special things based the

This comment has been minimized.

@ferjm

ferjm Jun 26, 2018

Member

typo: "based on the"

@Manishearth Manishearth merged commit d520ea9 into master Jun 26, 2018
@ferjm ferjm deleted the mixing branch Jun 27, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

3 participants
You can’t perform that action at this time.