diff options
| author | huceke <ebsi4711@gmail.com> | 2013-11-28 20:46:51 -0800 |
|---|---|---|
| committer | huceke <ebsi4711@gmail.com> | 2013-11-28 20:46:51 -0800 |
| commit | 6998841e0f1347634ee76c870a14d91350b83463 (patch) | |
| tree | b479a51f184df5067dec3c4dc2da9f8fbb0c910f | |
| parent | 9572c323a71c037d1799dfe5265ba94a2efe8be4 (diff) | |
| parent | 9d696bb0e3987d6a164a53cc82614e323c70f4df (diff) | |
Merge pull request #3732 from popcornmix/low_sample
[rbp/omxplayer] Handle sample rates below 8kHz
| -rw-r--r-- | xbmc/cores/omxplayer/OMXAudio.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/xbmc/cores/omxplayer/OMXAudio.cpp b/xbmc/cores/omxplayer/OMXAudio.cpp index 1834ac6824..04749a8b64 100644 --- a/xbmc/cores/omxplayer/OMXAudio.cpp +++ b/xbmc/cores/omxplayer/OMXAudio.cpp @@ -148,7 +148,7 @@ bool COMXAudio::PortSettingsChanged() // round up to power of 2 m_pcm_output.nChannels = m_OutputChannels > 4 ? 8 : m_OutputChannels > 2 ? 4 : m_OutputChannels; /* limit samplerate (through resampling) if requested */ - m_pcm_output.nSamplingRate = std::min((int)m_pcm_output.nSamplingRate, CSettings::Get().GetInt("audiooutput.samplerate")); + m_pcm_output.nSamplingRate = std::min(std::max((int)m_pcm_output.nSamplingRate, 8000), CSettings::Get().GetInt("audiooutput.samplerate")); m_pcm_output.nPortIndex = m_omx_mixer.GetOutputPort(); omx_err = m_omx_mixer.SetParameter(OMX_IndexParamAudioPcm, &m_pcm_output); |