]> code.delx.au - pulseaudio/commitdiff
resampler: Remove invalid channel asserts in peak and trivial
authorArun Raghavan <arun.raghavan@collabora.co.uk>
Tue, 13 Dec 2011 03:55:04 +0000 (09:25 +0530)
committerArun Raghavan <arun.raghavan@collabora.co.uk>
Tue, 13 Dec 2011 03:56:12 +0000 (09:26 +0530)
The incoming channel count will be fixed up by the remapping code before
the resampler is invoked.

src/pulsecore/resampler.c

index b56c1f5985bb49400829dfcdec03aea586c420ea..67f800b900cf9d7f7da211129fee7f88583a964d 100644 (file)
@@ -1421,7 +1421,6 @@ static void trivial_resample(pa_resampler *r, const pa_memchunk *input, unsigned
     pa_assert(input);
     pa_assert(output);
     pa_assert(out_n_frames);
-    pa_assert(r->i_ss.channels == r->o_ss.channels);
 
     fz = r->w_sz * r->o_ss.channels;
 
@@ -1496,7 +1495,6 @@ static void peaks_resample(pa_resampler *r, const pa_memchunk *input, unsigned i
     pa_assert(output);
     pa_assert(out_n_frames);
     pa_assert(r->i_ss.rate >= r->o_ss.rate);
-    pa_assert(r->i_ss.channels == r->o_ss.channels);
     pa_assert(r->work_format == PA_SAMPLE_S16NE || r->work_format == PA_SAMPLE_FLOAT32NE);
 
     src = (uint8_t*) pa_memblock_acquire(input->memblock) + input->index;