[AE/osxsink] - don't set the altered outputformat which might have wrong channel count #4899
Conversation
This file contains 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
|
Testbuild running here (as its only osx code which was altered): |
|
After fixing my typo it even built http://jenkins.xbmc.org/job/XBMC-OSX-64/1215/ :) |
| @@ -779,8 +781,11 @@ bool CAESinkDARWINOSX::Initialize(AEAudioFormat &format, std::string &device) | |||
| CLog::Log(LOGDEBUG, "%s: New Virtual Format: %s", __FUNCTION__, StreamDescriptionToString(virtualFormat, formatString)); | |||
| CLog::Log(LOGDEBUG, "%s: New Physical Format: %s", __FUNCTION__, StreamDescriptionToString(outputFormat, formatString)); | |||
|
|
|||
| if (m_planes > 1) | |||
| CLog::Log(LOGDEBUG, "%s: Planar output will have %d channels", __FUNCTION__, (unsigned int)numOutputChannels); | |||
|
|
|||
This comment was marked as spam.
This comment was marked as spam.
Sorry, something went wrong.
This comment was marked as spam.
This comment was marked as spam.
Sorry, something went wrong.
|
Updated with combined logs (which is definitly better :) ) |
jmarshallnz
added a commit
that referenced
this pull request
Jun 12, 2014
[AE/osxsink] - don't set the altered outputformat which might have wrong channel count
jmarshallnz
added a commit
to jmarshallnz/xbmc
that referenced
this pull request
Jun 15, 2014
[AE/osxsink] - don't set the altered outputformat which might have wrong channel count Conflicts: xbmc/cores/AudioEngine/Sinks/AESinkDARWINOSX.cpp
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.
For planar devices we adapt the outputFormat from 1 channel to
std::min((size_t)format.m_channelLayout.Count(), streams.size());
here
https://github.com/xbmc/xbmc/blob/master/xbmc/cores/AudioEngine/Sinks/AESinkDARWINOSX.cpp#L748
When setting the physical format afterwards here
https://github.com/xbmc/xbmc/blob/master/xbmc/cores/AudioEngine/Sinks/AESinkDARWINOSX.cpp#L777
We get the error:
ERROR: CCoreAudioStream::SetPhysicalFormat: Unable to set physical format for stream 0x0061. Error = '!dat'
This PR ensures to set the unaltered format which was found during stream scoring and instead handling the number of output channels in a seperate variable.