mirrors/pulseaudio
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git synced 2025-11-07 13:30:03 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

resampler: fix identity check

Browse source 
Fix the identity matrix check for mono to stereo.
Help the compiler generate better code for the C implementation of the channel
remapping code.
This commit is contained in:
Wim Taymans 2009-08-19 17:24:23 +02:00
parent d04a6e935f
commit 548b735ccf
1 changed files with 6 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

16
src/pulsecore/resampler.c
View file

@ -1017,7 +1017,7 @@ static void calc_map_table(pa_resampler *r) {
/* find some common channel remappings, fall back to full matrix operation. */ /* find some common channel remappings, fall back to full matrix operation. */
if (r->i_ss.channels == 1 && r->o_ss.channels == 2 && if (r->i_ss.channels == 1 && r->o_ss.channels == 2 &&
r->map_table_i[0][0] == 1.0 && r->map_table_i[1][0] == 1.0) { r->map_table_f[0][0] >= 1.0 && r->map_table_f[1][0] >= 1.0) {
r->do_remap = (pa_do_remap_func_t) remap_mono_to_stereo;; r->do_remap = (pa_do_remap_func_t) remap_mono_to_stereo;;
pa_log_debug("Using mono to stereo remapping"); pa_log_debug("Using mono to stereo remapping");
} else { } else {
@ -1074,10 +1074,8 @@ static void remap_mono_to_stereo(pa_resampler *r, void *dst, const void *src, un
d = (float *) dst; d = (float *) dst;
s = (float *) src; s = (float *) src;
for (; n > 0; n--) { for (; n > 0; n--, s++, d += 2)
*d++ = *s; d[0] = d[1] = *s;
*d++ = *s++;
}
break; break;
} }
case PA_SAMPLE_S16NE: case PA_SAMPLE_S16NE:
@ -1087,10 +1085,8 @@ static void remap_mono_to_stereo(pa_resampler *r, void *dst, const void *src, un
d = (int16_t *) dst; d = (int16_t *) dst;
s = (int16_t *) src; s = (int16_t *) src;
for (; n > 0; n--) { for (; n > 0; n--, s++, d += 2)
*d++ = *s; d[0] = d[1] = *s;
*d++ = *s++;
}
break; break;
} }
default: default:
@ -1156,7 +1152,7 @@ static void remap_channels_matrix (pa_resampler *r, void *dst, const void *src,
*d += *s; *d += *s;
} else { } else {
for (i = n; i > 0; i--, s += n_ic, d += n_oc) for (i = n; i > 0; i--, s += n_ic, d += n_oc)
*d = (int16_t) (*d + (((int32_t)*s * vol) >> 16)); *d += (int16_t) (((int32_t)*s * vol) >> 16);
} }
} }
} }