]> code.delx.au - pulseaudio/commitdiff
resampler: Move some peak resampler asserts around
authorArun Raghavan <arun.raghavan@collabora.co.uk>
Tue, 13 Dec 2011 03:56:44 +0000 (09:26 +0530)
committerArun Raghavan <arun.raghavan@collabora.co.uk>
Tue, 13 Dec 2011 03:56:44 +0000 (09:26 +0530)
This moves a couple of asserts from peak_resample() to peaks_init()
since they're resampler parameters that shouldn't change after
initialisation.

src/pulsecore/resampler.c

index 67f800b900cf9d7f7da211129fee7f88583a964d..6676943761c3e0dbc1a3c7b3818ebff4d6269cf9 100644 (file)
@@ -1494,8 +1494,6 @@ static void peaks_resample(pa_resampler *r, const pa_memchunk *input, unsigned i
     pa_assert(input);
     pa_assert(output);
     pa_assert(out_n_frames);
-    pa_assert(r->i_ss.rate >= r->o_ss.rate);
-    pa_assert(r->work_format == PA_SAMPLE_S16NE || r->work_format == PA_SAMPLE_FLOAT32NE);
 
     src = (uint8_t*) pa_memblock_acquire(input->memblock) + input->index;
     dst = (uint8_t*) pa_memblock_acquire(output->memblock) + output->index;
@@ -1592,6 +1590,8 @@ static void peaks_update_rates_or_reset(pa_resampler *r) {
 
 static int peaks_init(pa_resampler*r) {
     pa_assert(r);
+    pa_assert(r->i_ss.rate >= r->o_ss.rate);
+    pa_assert(r->work_format == PA_SAMPLE_S16NE || r->work_format == PA_SAMPLE_FLOAT32NE);
 
     r->peaks.o_counter = r->peaks.i_counter = 0;
     memset(r->peaks.max_i, 0, sizeof(r->peaks.max_i));