[AE] - force re-create of ffmpeg resampler after error

mkortstiege · Feb 25, 2015 · 550f3b0 · 550f3b0
1 parent b4e08f9
commit 550f3b0
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 4 deletions.
diff --git a/xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAEBuffer.cpp b/xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAEBuffer.cpp
@@ -292,6 +292,13 @@ bool CActiveAEBufferPoolResample::ResampleBuffers(int64_t timestamp)
                                               in ? in->pkt->data : NULL,
                                               in ? in->pkt->nb_samples : 0,
                                               m_resampleRatio);
+      // in case of error, trigger re-create of resampler
+      if (out_samples < 0)
+      {
+        out_samples = 0;
+        m_changeResampler = true;
+      }
+
       m_procSample->pkt->nb_samples += out_samples;
       busy = true;
       m_empty = (out_samples == 0);

diff --git a/xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAEResampleFFMPEG.cpp b/xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAEResampleFFMPEG.cpp
@@ -184,19 +184,19 @@ int CActiveAEResampleFFMPEG::Resample(uint8_t **dst_buffer, int dst_samples, uin
   if (ratio != 1.0)
   {
     if (swr_set_compensation(m_pContext,
-                                            (dst_samples*ratio-dst_samples)*m_dst_rate/m_src_rate,
-                                             dst_samples*m_dst_rate/m_src_rate) < 0)
+                             (dst_samples*ratio-dst_samples)*m_dst_rate/m_src_rate,
+                             dst_samples*m_dst_rate/m_src_rate) < 0)
     {
       CLog::Log(LOGERROR, "CActiveAEResampleFFMPEG::Resample - set compensation failed");
-      return 0;
+      return -1;
     }
   }
 
   int ret = swr_convert(m_pContext, dst_buffer, dst_samples, (const uint8_t**)src_buffer, src_samples);
   if (ret < 0)
   {
     CLog::Log(LOGERROR, "CActiveAEResampleFFMPEG::Resample - resample failed");
-    return 0;
+    return -1;
   }
 
   // special handling for S24 formats which are carried in S32