From: Arun Raghavan <arun.raghavan@collabora.co.uk>
Date: Tue, 13 Dec 2011 03:55:04 +0000 (+0530)
Subject: resampler: Remove invalid channel asserts in peak and trivial
X-Git-Tag: v1.99.1~109
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=a0b5f29b4289d5307104a52f4fbb66b45cc6dba0;p=platform%2Fupstream%2Fpulseaudio.git

resampler: Remove invalid channel asserts in peak and trivial

The incoming channel count will be fixed up by the remapping code before
the resampler is invoked.
---

diff --git a/src/pulsecore/resampler.c b/src/pulsecore/resampler.c
index b56c1f5..67f800b 100644
--- a/src/pulsecore/resampler.c
+++ b/src/pulsecore/resampler.c
@@ -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;