Skip to content
Permalink
Browse files

Revert "AE: change usage of swr_set_compensation"

This reverts commit 7f4f89b.
  • Loading branch information
FernetMenta committed Sep 8, 2016
1 parent af13f6c commit 8ae935452744c6b655bafe73a6fc1190d0148300
@@ -58,7 +58,6 @@ bool CActiveAEResampleFFMPEG::Init(uint64_t dst_chan_layout, int dst_channels, i
m_src_fmt = src_fmt;
m_src_bits = src_bits;
m_src_dither_bits = src_dither;
m_resampleRatio = 1.0;

if (m_dst_chan_layout == 0)
m_dst_chan_layout = av_get_default_channel_layout(m_dst_channels);
@@ -181,18 +180,18 @@ bool CActiveAEResampleFFMPEG::Init(uint64_t dst_chan_layout, int dst_channels, i

int CActiveAEResampleFFMPEG::Resample(uint8_t **dst_buffer, int dst_samples, uint8_t **src_buffer, int src_samples, double ratio)
{

if (ratio != m_resampleRatio)
int delta = 0;
int distance = 0;
if (ratio != 1.0)
{
int delta = m_dst_rate * ratio - m_dst_rate;
int distance = m_dst_rate;
delta = (dst_samples*ratio-dst_samples)*m_dst_rate/m_src_rate;
distance = dst_samples*m_dst_rate/m_src_rate;
}

if (swr_set_compensation(m_pContext, delta, distance) < 0)
{
CLog::Log(LOGERROR, "CActiveAEResampleFFMPEG::Resample - set compensation failed");
return -1;
}
m_resampleRatio = ratio;
if (swr_set_compensation(m_pContext, delta, distance) < 0)
{
CLog::Log(LOGERROR, "CActiveAEResampleFFMPEG::Resample - set compensation failed");
return -1;
}

int ret = swr_convert(m_pContext, dst_buffer, dst_samples, (const uint8_t**)src_buffer, src_samples);
@@ -58,7 +58,6 @@ class CActiveAEResampleFFMPEG : public IAEResample
int m_src_dither_bits, m_dst_dither_bits;
SwrContext *m_pContext;
double m_rematrix[AE_CH_MAX][AE_CH_MAX];
double m_resampleRatio;
};

}

0 comments on commit 8ae9354

Please sign in to comment.