Browse files

Do not attempt to play audio with more than 8 channels if not support…

…ed natively.

While trying to play an encrypted video over airplay, all nasty things would happen. So add a safeguard so we never try to play more than 8 channels audio unless the hardware supports it (e.g. not requiring downmixing)

[cherry-picked from c5b6e92]
  • Loading branch information...
1 parent 9743d9c commit c29d36f1634cd837276b4fd8cfea5d5d75304da8 @jyavenard jyavenard committed Feb 22, 2012
Showing with 7 additions and 0 deletions.
  1. +7 −0 mythtv/libs/libmyth/audiooutputbase.cpp
View
7 mythtv/libs/libmyth/audiooutputbase.cpp
@@ -421,6 +421,13 @@ void AudioOutputBase::Reconfigure(const AudioSettings &orig_settings)
.arg(output_settings->FormatToString(format))
.arg(samplerate/1000).arg(source_channels));
+ if (needs_downmix && source_channels > 8)
+ {
+ Error("Aborting Audio Reconfigure. "
+ "Can't handle audio with more than 8 channels.");
+ return;
+ }
+
/* Encode to AC-3 if we're allowed to passthru but aren't currently
and we have more than 2 channels but multichannel PCM is not supported
or if the device just doesn't support the number of channels */

0 comments on commit c29d36f

Please sign in to comment.