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

Pulseaudio: Support 5-channel surround, optional in UI #1835

Merged
merged 1 commit into from Jan 9, 2015

Conversation

adamdmoss
Copy link
Contributor

Adds ability - if DPL2 option set in Audio prefs - to decode DPL2 and send PulseAudio a 5-channel output. (n.b. asking Pulse for 6-channel output gives 6.0 surround rather than 5.1, so 5.0 is it.) Tested as doing a convincing job of working with Eternal Darkness and a 5.0/5.1 physical setup.
Stereo path left unchanged.

@MayImilae
Copy link
Contributor

@skidau ^

Does anyone have a 5.1 system on linux to test this with?

@magumagu
Copy link
Contributor

magumagu commented Jan 6, 2015

Some quick web searching shows that pa_stream_new takes a pa_channel_map pointer... I think that lets you specify a true 5.1 setup.

@adamdmoss
Copy link
Contributor Author

You're right, that's cool - didn't find that info on first search - I'll do it that way.

@adamdmoss
Copy link
Contributor Author

Done - fork updated. Now submits audio in 5.1. LFE channel seems very quiet but I guess that's for the DPL2 decoder and the PA mixer levels to sort out between them. :)

@@ -22,8 +22,17 @@ PulseAudio::PulseAudio(CMixer *mixer)

bool PulseAudio::Start()
{
m_stereo = ! SConfig::GetInstance().m_LocalCoreStartupParameter.bDPL2Decoder;

This comment was marked as off-topic.

@adamdmoss
Copy link
Contributor Author

space removed.

@skidau
Copy link
Contributor

skidau commented Jan 7, 2015

Thanks, would you squash the four commits into one?

@adamdmoss
Copy link
Contributor Author

Ugh, squash fail. Will try again or submit a new pull request from a different branch.

@adamdmoss
Copy link
Contributor Author

Okay, squashed. Looks like I didn't freak github out.

@skidau
Copy link
Contributor

skidau commented Jan 8, 2015

@dolphin-emu-bot rebuild

@skidau
Copy link
Contributor

skidau commented Jan 8, 2015

The bot says there are trailing whitespaces in this commit. Would you please remove them?

@adamdmoss
Copy link
Contributor Author

done, and resquashed.

@skidau
Copy link
Contributor

skidau commented Jan 8, 2015

@dolphin-emu-bot rebuild

skidau added a commit that referenced this pull request Jan 9, 2015
Pulseaudio: Support 5-channel surround, optional in UI
@skidau skidau merged commit ac33423 into dolphin-emu:master Jan 9, 2015
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
4 participants