size_t remap_buf_size;
unsigned resample_buf_samples;
unsigned from_work_format_buf_samples;
- pa_bool_t remap_buf_contains_leftover_data;
+ bool remap_buf_contains_leftover_data;
pa_sample_format_t work_format;
pa_convert_func_t from_work_format_func;
pa_remap_t remap;
- pa_bool_t map_required;
+ bool map_required;
void (*impl_free)(pa_resampler *r);
void (*impl_update_rates)(pa_resampler *r);
if (method == PA_RESAMPLER_AUTO) {
#ifdef HAVE_SPEEX
- method = PA_RESAMPLER_SPEEX_FLOAT_BASE + 3;
+ method = PA_RESAMPLER_SPEEX_FLOAT_BASE + 1;
#else
- method = PA_RESAMPLER_FFMPEG;
+ if (flags & PA_RESAMPLER_VARIABLE_RATE)
+ method = PA_RESAMPLER_TRIVIAL;
+ else
+ method = PA_RESAMPLER_FFMPEG;
#endif
}
if (r->map_required || a->format != b->format || method == PA_RESAMPLER_PEAKS) {
- if (a->format == PA_SAMPLE_S32NE || a->format == PA_SAMPLE_S32RE ||
+ if (a->format == PA_SAMPLE_S16NE || b->format == PA_SAMPLE_S16NE)
+ r->work_format = PA_SAMPLE_S16NE;
+ else if (a->format == PA_SAMPLE_S32NE || a->format == PA_SAMPLE_S32RE ||
a->format == PA_SAMPLE_FLOAT32NE || a->format == PA_SAMPLE_FLOAT32RE ||
a->format == PA_SAMPLE_S24NE || a->format == PA_SAMPLE_S24RE ||
a->format == PA_SAMPLE_S24_32NE || a->format == PA_SAMPLE_S24_32RE ||
* loops. When the leftover is ignored here, such loops would eventually
* terminate, because the leftover would grow each round, finally
* surpassing the minimum input threshold of the resampler. */
- return (((((out_length + r->o_fz-1) / r->o_fz) * r->i_ss.rate) + r->o_ss.rate-1) / r->o_ss.rate) * r->i_fz;
+ return ((((uint64_t) ((out_length + r->o_fz-1) / r->o_fz) * r->i_ss.rate) + r->o_ss.rate-1) / r->o_ss.rate) * r->i_fz;
}
size_t pa_resampler_result(pa_resampler *r, size_t in_length) {
if (r->remap_buf_contains_leftover_data)
frames += r->remap_buf.length / (r->w_sz * r->o_ss.channels);
- return ((frames * r->o_ss.rate + r->i_ss.rate - 1) / r->i_ss.rate) * r->o_fz;
+ return (((uint64_t) frames * r->o_ss.rate + r->i_ss.rate - 1) / r->i_ss.rate) * r->o_fz;
}
size_t pa_resampler_max_block_size(pa_resampler *r) {
if (r->remap_buf_contains_leftover_data)
frames -= r->remap_buf.length / (r->w_sz * r->o_ss.channels);
- return (frames * r->i_ss.rate / max_ss.rate) * r->i_fz;
+ return ((uint64_t) frames * r->i_ss.rate / max_ss.rate) * r->i_fz;
}
void pa_resampler_reset(pa_resampler *r) {
if (r->impl_reset)
r->impl_reset(r);
- r->remap_buf_contains_leftover_data = FALSE;
+ r->remap_buf_contains_leftover_data = false;
}
pa_resample_method_t pa_resampler_get_method(pa_resampler *r) {
return m;
if (pa_streq(string, "speex-fixed"))
- return PA_RESAMPLER_SPEEX_FIXED_BASE + 3;
+ return PA_RESAMPLER_SPEEX_FIXED_BASE + 1;
if (pa_streq(string, "speex-float"))
- return PA_RESAMPLER_SPEEX_FLOAT_BASE + 3;
+ return PA_RESAMPLER_SPEEX_FLOAT_BASE + 1;
return PA_RESAMPLER_INVALID;
}
-static pa_bool_t on_left(pa_channel_position_t p) {
+static bool on_left(pa_channel_position_t p) {
return
p == PA_CHANNEL_POSITION_FRONT_LEFT ||
p == PA_CHANNEL_POSITION_TOP_REAR_LEFT;
}
-static pa_bool_t on_right(pa_channel_position_t p) {
+static bool on_right(pa_channel_position_t p) {
return
p == PA_CHANNEL_POSITION_FRONT_RIGHT ||
p == PA_CHANNEL_POSITION_TOP_REAR_RIGHT;
}
-static pa_bool_t on_center(pa_channel_position_t p) {
+static bool on_center(pa_channel_position_t p) {
return
p == PA_CHANNEL_POSITION_FRONT_CENTER ||
p == PA_CHANNEL_POSITION_TOP_REAR_CENTER;
}
-static pa_bool_t on_lfe(pa_channel_position_t p) {
+static bool on_lfe(pa_channel_position_t p) {
return
p == PA_CHANNEL_POSITION_LFE;
}
-static pa_bool_t on_front(pa_channel_position_t p) {
+static bool on_front(pa_channel_position_t p) {
return
p == PA_CHANNEL_POSITION_FRONT_LEFT ||
p == PA_CHANNEL_POSITION_FRONT_RIGHT ||
p == PA_CHANNEL_POSITION_FRONT_RIGHT_OF_CENTER;
}
-static pa_bool_t on_rear(pa_channel_position_t p) {
+static bool on_rear(pa_channel_position_t p) {
return
p == PA_CHANNEL_POSITION_REAR_LEFT ||
p == PA_CHANNEL_POSITION_REAR_RIGHT ||
p == PA_CHANNEL_POSITION_TOP_REAR_CENTER;
}
-static pa_bool_t on_side(pa_channel_position_t p) {
+static bool on_side(pa_channel_position_t p) {
return
p == PA_CHANNEL_POSITION_SIDE_LEFT ||
p == PA_CHANNEL_POSITION_SIDE_RIGHT ||
static void calc_map_table(pa_resampler *r) {
unsigned oc, ic;
unsigned n_oc, n_ic;
- pa_bool_t ic_connected[PA_CHANNELS_MAX];
- pa_bool_t remix;
+ bool ic_connected[PA_CHANNELS_MAX];
+ bool remix;
pa_strbuf *s;
char *t;
pa_remap_t *m;
memset(m->map_table_i, 0, sizeof(m->map_table_i));
memset(ic_connected, 0, sizeof(ic_connected));
- remix = (r->flags & (PA_RESAMPLER_NO_REMAP|PA_RESAMPLER_NO_REMIX)) == 0;
+ remix = (r->flags & (PA_RESAMPLER_NO_REMAP | PA_RESAMPLER_NO_REMIX)) == 0;
- for (oc = 0; oc < n_oc; oc++) {
- pa_bool_t oc_connected = FALSE;
- pa_channel_position_t b = r->o_cm.map[oc];
+ if (r->flags & PA_RESAMPLER_NO_REMAP) {
+ pa_assert(!remix);
- for (ic = 0; ic < n_ic; ic++) {
- pa_channel_position_t a = r->i_cm.map[ic];
+ for (oc = 0; oc < PA_MIN(n_ic, n_oc); oc++)
+ m->map_table_f[oc][oc] = 1.0f;
- if (r->flags & PA_RESAMPLER_NO_REMAP) {
- /* We shall not do any remapping. Hence, just check by index */
+ } else if (r->flags & PA_RESAMPLER_NO_REMIX) {
+ pa_assert(!remix);
+ for (oc = 0; oc < n_oc; oc++) {
+ pa_channel_position_t b = r->o_cm.map[oc];
- if (ic == oc)
- m->map_table_f[oc][ic] = 1.0;
+ for (ic = 0; ic < n_ic; ic++) {
+ pa_channel_position_t a = r->i_cm.map[ic];
- continue;
+ /* We shall not do any remixing. Hence, just check by name */
+ if (a == b)
+ m->map_table_f[oc][ic] = 1.0f;
}
+ }
+ } else {
- if (r->flags & PA_RESAMPLER_NO_REMIX) {
- /* We shall not do any remixing. Hence, just check by name */
+ /* OK, we shall do the full monty: upmixing and downmixing. Our
+ * algorithm is relatively simple, does not do spacialization, delay
+ * elements or apply lowpass filters for LFE. Patches are always
+ * welcome, though. Oh, and it doesn't do any matrix decoding. (Which
+ * probably wouldn't make any sense anyway.)
+ *
+ * This code is not idempotent: downmixing an upmixed stereo stream is
+ * not identical to the original. The volume will not match, and the
+ * two channels will be a linear combination of both.
+ *
+ * This is loosely based on random suggestions found on the Internet,
+ * such as this:
+ * http://www.halfgaar.net/surround-sound-in-linux and the alsa upmix
+ * plugin.
+ *
+ * The algorithm works basically like this:
+ *
+ * 1) Connect all channels with matching names.
+ *
+ * 2) Mono Handling:
+ * S:Mono: Copy into all D:channels
+ * D:Mono: Avg all S:channels
+ *
+ * 3) Mix D:Left, D:Right:
+ * D:Left: If not connected, avg all S:Left
+ * D:Right: If not connected, avg all S:Right
+ *
+ * 4) Mix D:Center
+ * If not connected, avg all S:Center
+ * If still not connected, avg all S:Left, S:Right
+ *
+ * 5) Mix D:LFE
+ * If not connected, avg all S:*
+ *
+ * 6) Make sure S:Left/S:Right is used: S:Left/S:Right: If not
+ * connected, mix into all D:left and all D:right channels. Gain is
+ * 1/9.
+ *
+ * 7) Make sure S:Center, S:LFE is used:
+ *
+ * S:Center, S:LFE: If not connected, mix into all D:left, all
+ * D:right, all D:center channels. Gain is 0.5 for center and 0.375
+ * for LFE. C-front is only mixed into L-front/R-front if available,
+ * otherwise into all L/R channels. Similarly for C-rear.
+ *
+ * 8) Normalize each row in the matrix such that the sum for each row is
+ * not larger than 1.0 in order to avoid clipping.
+ *
+ * S: and D: shall relate to the source resp. destination channels.
+ *
+ * Rationale: 1, 2 are probably obvious. For 3: this copies front to
+ * rear if needed. For 4: we try to find some suitable C source for C,
+ * if we don't find any, we avg L and R. For 5: LFE is mixed from all
+ * channels. For 6: the rear channels should not be dropped entirely,
+ * however have only minimal impact. For 7: movies usually encode
+ * speech on the center channel. Thus we have to make sure this channel
+ * is distributed to L and R if not available in the output. Also, LFE
+ * is used to achieve a greater dynamic range, and thus we should try
+ * to do our best to pass it to L+R.
+ */
- if (a == b)
- m->map_table_f[oc][ic] = 1.0;
+ unsigned
+ ic_left = 0,
+ ic_right = 0,
+ ic_center = 0,
+ ic_unconnected_left = 0,
+ ic_unconnected_right = 0,
+ ic_unconnected_center = 0,
+ ic_unconnected_lfe = 0;
+ bool ic_unconnected_center_mixed_in = 0;
- continue;
- }
+ pa_assert(remix);
- pa_assert(remix);
-
- /* OK, we shall do the full monty: upmixing and
- * downmixing. Our algorithm is relatively simple, does
- * not do spacialization, delay elements or apply lowpass
- * filters for LFE. Patches are always welcome,
- * though. Oh, and it doesn't do any matrix
- * decoding. (Which probably wouldn't make any sense
- * anyway.)
- *
- * This code is not idempotent: downmixing an upmixed
- * stereo stream is not identical to the original. The
- * volume will not match, and the two channels will be a
- * linear combination of both.
- *
- * This is loosely based on random suggestions found on the
- * Internet, such as this:
- * http://www.halfgaar.net/surround-sound-in-linux and the
- * alsa upmix plugin.
- *
- * The algorithm works basically like this:
- *
- * 1) Connect all channels with matching names.
- *
- * 2) Mono Handling:
- * S:Mono: Copy into all D:channels
- * D:Mono: Copy in all S:channels
- *
- * 3) Mix D:Left, D:Right:
- * D:Left: If not connected, avg all S:Left
- * D:Right: If not connected, avg all S:Right
- *
- * 4) Mix D:Center
- * If not connected, avg all S:Center
- * If still not connected, avg all S:Left, S:Right
- *
- * 5) Mix D:LFE
- * If not connected, avg all S:*
- *
- * 6) Make sure S:Left/S:Right is used: S:Left/S:Right: If
- * not connected, mix into all D:left and all D:right
- * channels. Gain is 0.1, the current left and right
- * should be multiplied by 0.9.
- *
- * 7) Make sure S:Center, S:LFE is used:
- *
- * S:Center, S:LFE: If not connected, mix into all
- * D:left, all D:right, all D:center channels, gain is
- * 0.375. The current (as result of 1..6) factors
- * should be multiplied by 0.75. (Alt. suggestion: 0.25
- * vs. 0.5) If C-front is only mixed into
- * L-front/R-front if available, otherwise into all L/R
- * channels. Similarly for C-rear.
- *
- * S: and D: shall relate to the source resp. destination channels.
- *
- * Rationale: 1, 2 are probably obvious. For 3: this
- * copies front to rear if needed. For 4: we try to find
- * some suitable C source for C, if we don't find any, we
- * avg L and R. For 5: LFE is mixed from all channels. For
- * 6: the rear channels should not be dropped entirely,
- * however have only minimal impact. For 7: movies usually
- * encode speech on the center channel. Thus we have to
- * make sure this channel is distributed to L and R if not
- * available in the output. Also, LFE is used to achieve a
- * greater dynamic range, and thus we should try to do our
- * best to pass it to L+R.
- */
-
- if (a == b || a == PA_CHANNEL_POSITION_MONO || b == PA_CHANNEL_POSITION_MONO) {
- m->map_table_f[oc][ic] = 1.0;
-
- oc_connected = TRUE;
- ic_connected[ic] = TRUE;
- }
+ for (ic = 0; ic < n_ic; ic++) {
+ if (on_left(r->i_cm.map[ic]))
+ ic_left++;
+ if (on_right(r->i_cm.map[ic]))
+ ic_right++;
+ if (on_center(r->i_cm.map[ic]))
+ ic_center++;
}
- if (!oc_connected && remix) {
- /* OK, we shall remix */
+ for (oc = 0; oc < n_oc; oc++) {
+ bool oc_connected = false;
+ pa_channel_position_t b = r->o_cm.map[oc];
- /* Try to find matching input ports for this output port */
+ for (ic = 0; ic < n_ic; ic++) {
+ pa_channel_position_t a = r->i_cm.map[ic];
- if (on_left(b)) {
- unsigned n = 0;
+ if (a == b || a == PA_CHANNEL_POSITION_MONO) {
+ m->map_table_f[oc][ic] = 1.0f;
- /* We are not connected and on the left side, let's
- * average all left side input channels. */
+ oc_connected = true;
+ ic_connected[ic] = true;
+ }
+ else if (b == PA_CHANNEL_POSITION_MONO) {
+ m->map_table_f[oc][ic] = 1.0f / (float) n_ic;
- for (ic = 0; ic < n_ic; ic++)
- if (on_left(r->i_cm.map[ic]))
- n++;
+ oc_connected = true;
+ ic_connected[ic] = true;
+ }
+ }
- if (n > 0)
- for (ic = 0; ic < n_ic; ic++)
- if (on_left(r->i_cm.map[ic])) {
- m->map_table_f[oc][ic] = 1.0f / (float) n;
- ic_connected[ic] = TRUE;
- }
+ if (!oc_connected) {
+ /* Try to find matching input ports for this output port */
- /* We ignore the case where there is no left input
- * channel. Something is really wrong in this case
- * anyway. */
+ if (on_left(b)) {
- } else if (on_right(b)) {
- unsigned n = 0;
+ /* We are not connected and on the left side, let's
+ * average all left side input channels. */
- /* We are not connected and on the right side, let's
- * average all right side input channels. */
+ if (ic_left > 0)
+ for (ic = 0; ic < n_ic; ic++)
+ if (on_left(r->i_cm.map[ic])) {
+ m->map_table_f[oc][ic] = 1.0f / (float) ic_left;
+ ic_connected[ic] = true;
+ }
- for (ic = 0; ic < n_ic; ic++)
- if (on_right(r->i_cm.map[ic]))
- n++;
+ /* We ignore the case where there is no left input channel.
+ * Something is really wrong in this case anyway. */
- if (n > 0)
- for (ic = 0; ic < n_ic; ic++)
- if (on_right(r->i_cm.map[ic])) {
- m->map_table_f[oc][ic] = 1.0f / (float) n;
- ic_connected[ic] = TRUE;
- }
+ } else if (on_right(b)) {
- /* We ignore the case where there is no right input
- * channel. Something is really wrong in this case
- * anyway. */
+ /* We are not connected and on the right side, let's
+ * average all right side input channels. */
- } else if (on_center(b)) {
- unsigned n = 0;
+ if (ic_right > 0)
+ for (ic = 0; ic < n_ic; ic++)
+ if (on_right(r->i_cm.map[ic])) {
+ m->map_table_f[oc][ic] = 1.0f / (float) ic_right;
+ ic_connected[ic] = true;
+ }
- /* We are not connected and at the center. Let's
- * average all center input channels. */
+ /* We ignore the case where there is no right input
+ * channel. Something is really wrong in this case anyway.
+ * */
- for (ic = 0; ic < n_ic; ic++)
- if (on_center(r->i_cm.map[ic]))
- n++;
+ } else if (on_center(b)) {
- if (n > 0) {
- for (ic = 0; ic < n_ic; ic++)
- if (on_center(r->i_cm.map[ic])) {
- m->map_table_f[oc][ic] = 1.0f / (float) n;
- ic_connected[ic] = TRUE;
- }
- } else {
+ if (ic_center > 0) {
+
+ /* We are not connected and at the center. Let's average
+ * all center input channels. */
- /* Hmm, no center channel around, let's synthesize
- * it by mixing L and R.*/
+ for (ic = 0; ic < n_ic; ic++)
+ if (on_center(r->i_cm.map[ic])) {
+ m->map_table_f[oc][ic] = 1.0f / (float) ic_center;
+ ic_connected[ic] = true;
+ }
- n = 0;
+ } else if (ic_left + ic_right > 0) {
- for (ic = 0; ic < n_ic; ic++)
- if (on_left(r->i_cm.map[ic]) || on_right(r->i_cm.map[ic]))
- n++;
+ /* Hmm, no center channel around, let's synthesize it
+ * by mixing L and R.*/
- if (n > 0)
for (ic = 0; ic < n_ic; ic++)
if (on_left(r->i_cm.map[ic]) || on_right(r->i_cm.map[ic])) {
- m->map_table_f[oc][ic] = 1.0f / (float) n;
- ic_connected[ic] = TRUE;
+ m->map_table_f[oc][ic] = 1.0f / (float) (ic_left + ic_right);
+ ic_connected[ic] = true;
}
+ }
- /* We ignore the case where there is not even a
- * left or right input channel. Something is
- * really wrong in this case anyway. */
- }
-
- } else if (on_lfe(b)) {
+ /* We ignore the case where there is not even a left or
+ * right input channel. Something is really wrong in this
+ * case anyway. */
- /* We are not connected and an LFE. Let's average all
- * channels for LFE. */
+ } else if (on_lfe(b) && !(r->flags & PA_RESAMPLER_NO_LFE)) {
- for (ic = 0; ic < n_ic; ic++) {
+ /* We are not connected and an LFE. Let's average all
+ * channels for LFE. */
- if (!(r->flags & PA_RESAMPLER_NO_LFE))
+ for (ic = 0; ic < n_ic; ic++)
m->map_table_f[oc][ic] = 1.0f / (float) n_ic;
- else
- m->map_table_f[oc][ic] = 0;
- /* Please note that a channel connected to LFE
- * doesn't really count as connected. */
+ /* Please note that a channel connected to LFE doesn't
+ * really count as connected. */
}
}
}
- }
-
- if (remix) {
- unsigned
- ic_unconnected_left = 0,
- ic_unconnected_right = 0,
- ic_unconnected_center = 0,
- ic_unconnected_lfe = 0;
for (ic = 0; ic < n_ic; ic++) {
pa_channel_position_t a = r->i_cm.map[ic];
ic_unconnected_lfe++;
}
- if (ic_unconnected_left > 0) {
+ for (ic = 0; ic < n_ic; ic++) {
+ pa_channel_position_t a = r->i_cm.map[ic];
- /* OK, so there are unconnected input channels on the
- * left. Let's multiply all already connected channels on
- * the left side by .9 and add in our averaged unconnected
- * channels multiplied by .1 */
+ if (ic_connected[ic])
+ continue;
for (oc = 0; oc < n_oc; oc++) {
+ pa_channel_position_t b = r->o_cm.map[oc];
- if (!on_left(r->o_cm.map[oc]))
- continue;
+ if (on_left(a) && on_left(b))
+ m->map_table_f[oc][ic] = (1.f/9.f) / (float) ic_unconnected_left;
- for (ic = 0; ic < n_ic; ic++) {
+ else if (on_right(a) && on_right(b))
+ m->map_table_f[oc][ic] = (1.f/9.f) / (float) ic_unconnected_right;
- if (ic_connected[ic]) {
- m->map_table_f[oc][ic] *= .9f;
- continue;
- }
+ else if (on_center(a) && on_center(b)) {
+ m->map_table_f[oc][ic] = (1.f/9.f) / (float) ic_unconnected_center;
+ ic_unconnected_center_mixed_in = true;
- if (on_left(r->i_cm.map[ic]))
- m->map_table_f[oc][ic] = .1f / (float) ic_unconnected_left;
- }
+ } else if (on_lfe(a) && !(r->flags & PA_RESAMPLER_NO_LFE))
+ m->map_table_f[oc][ic] = .375f / (float) ic_unconnected_lfe;
}
}
- if (ic_unconnected_right > 0) {
+ if (ic_unconnected_center > 0 && !ic_unconnected_center_mixed_in) {
+ unsigned ncenter[PA_CHANNELS_MAX];
+ bool found_frs[PA_CHANNELS_MAX];
- /* OK, so there are unconnected input channels on the
- * right. Let's multiply all already connected channels on
- * the right side by .9 and add in our averaged unconnected
- * channels multiplied by .1 */
+ memset(ncenter, 0, sizeof(ncenter));
+ memset(found_frs, 0, sizeof(found_frs));
- for (oc = 0; oc < n_oc; oc++) {
+ /* Hmm, as it appears there was no center channel we
+ could mix our center channel in. In this case, mix it into
+ left and right. Using .5 as the factor. */
- if (!on_right(r->o_cm.map[oc]))
+ for (ic = 0; ic < n_ic; ic++) {
+
+ if (ic_connected[ic])
continue;
- for (ic = 0; ic < n_ic; ic++) {
+ if (!on_center(r->i_cm.map[ic]))
+ continue;
+
+ for (oc = 0; oc < n_oc; oc++) {
- if (ic_connected[ic]) {
- m->map_table_f[oc][ic] *= .9f;
+ if (!on_left(r->o_cm.map[oc]) && !on_right(r->o_cm.map[oc]))
continue;
- }
- if (on_right(r->i_cm.map[ic]))
- m->map_table_f[oc][ic] = .1f / (float) ic_unconnected_right;
+ if (front_rear_side(r->i_cm.map[ic]) == front_rear_side(r->o_cm.map[oc])) {
+ found_frs[ic] = true;
+ break;
+ }
}
- }
- }
-
- if (ic_unconnected_center > 0) {
- pa_bool_t mixed_in = FALSE;
-
- /* OK, so there are unconnected input channels on the
- * center. Let's multiply all already connected channels on
- * the center side by .9 and add in our averaged unconnected
- * channels multiplied by .1 */
-
- for (oc = 0; oc < n_oc; oc++) {
-
- if (!on_center(r->o_cm.map[oc]))
- continue;
- for (ic = 0; ic < n_ic; ic++) {
+ for (oc = 0; oc < n_oc; oc++) {
- if (ic_connected[ic]) {
- m->map_table_f[oc][ic] *= .9f;
+ if (!on_left(r->o_cm.map[oc]) && !on_right(r->o_cm.map[oc]))
continue;
- }
- if (on_center(r->i_cm.map[ic])) {
- m->map_table_f[oc][ic] = .1f / (float) ic_unconnected_center;
- mixed_in = TRUE;
- }
+ if (!found_frs[ic] || front_rear_side(r->i_cm.map[ic]) == front_rear_side(r->o_cm.map[oc]))
+ ncenter[oc]++;
}
}
- if (!mixed_in) {
- unsigned ncenter[PA_CHANNELS_MAX];
- pa_bool_t found_frs[PA_CHANNELS_MAX];
+ for (oc = 0; oc < n_oc; oc++) {
- memset(ncenter, 0, sizeof(ncenter));
- memset(found_frs, 0, sizeof(found_frs));
+ if (!on_left(r->o_cm.map[oc]) && !on_right(r->o_cm.map[oc]))
+ continue;
- /* Hmm, as it appears there was no center channel we
- could mix our center channel in. In this case, mix
- it into left and right. Using .375 and 0.75 as
- factors. */
+ if (ncenter[oc] <= 0)
+ continue;
for (ic = 0; ic < n_ic; ic++) {
- if (ic_connected[ic])
- continue;
-
if (!on_center(r->i_cm.map[ic]))
continue;
- for (oc = 0; oc < n_oc; oc++) {
-
- if (!on_left(r->o_cm.map[oc]) && !on_right(r->o_cm.map[oc]))
- continue;
-
- if (front_rear_side(r->i_cm.map[ic]) == front_rear_side(r->o_cm.map[oc])) {
- found_frs[ic] = TRUE;
- break;
- }
- }
-
- for (oc = 0; oc < n_oc; oc++) {
-
- if (!on_left(r->o_cm.map[oc]) && !on_right(r->o_cm.map[oc]))
- continue;
-
- if (!found_frs[ic] || front_rear_side(r->i_cm.map[ic]) == front_rear_side(r->o_cm.map[oc]))
- ncenter[oc]++;
- }
- }
-
- for (oc = 0; oc < n_oc; oc++) {
-
- if (!on_left(r->o_cm.map[oc]) && !on_right(r->o_cm.map[oc]))
- continue;
-
- if (ncenter[oc] <= 0)
- continue;
-
- for (ic = 0; ic < n_ic; ic++) {
-
- if (ic_connected[ic]) {
- m->map_table_f[oc][ic] *= .75f;
- continue;
- }
-
- if (!on_center(r->i_cm.map[ic]))
- continue;
-
- if (!found_frs[ic] || front_rear_side(r->i_cm.map[ic]) == front_rear_side(r->o_cm.map[oc]))
- m->map_table_f[oc][ic] = .375f / (float) ncenter[oc];
- }
+ if (!found_frs[ic] || front_rear_side(r->i_cm.map[ic]) == front_rear_side(r->o_cm.map[oc]))
+ m->map_table_f[oc][ic] = .5f / (float) ncenter[oc];
}
}
}
+ }
- if (ic_unconnected_lfe > 0 && !(r->flags & PA_RESAMPLER_NO_LFE)) {
-
- /* OK, so there is an unconnected LFE channel. Let's mix
- * it into all channels, with factor 0.375 */
-
- for (ic = 0; ic < n_ic; ic++) {
-
- if (!on_lfe(r->i_cm.map[ic]))
- continue;
+ for (oc = 0; oc < n_oc; oc++) {
+ float sum = 0.0f;
+ for (ic = 0; ic < n_ic; ic++)
+ sum += m->map_table_f[oc][ic];
- for (oc = 0; oc < n_oc; oc++)
- m->map_table_f[oc][ic] = 0.375f / (float) ic_unconnected_lfe;
- }
- }
+ if (sum > 1.0f)
+ for (ic = 0; ic < n_ic; ic++)
+ m->map_table_f[oc][ic] /= sum;
}
+
/* make an 16:16 int version of the matrix */
for (oc = 0; oc < n_oc; oc++)
for (ic = 0; ic < n_ic; ic++)
r->to_work_format_buf.memblock = pa_memblock_new(r->mempool, r->to_work_format_buf.length);
}
- src = (uint8_t*) pa_memblock_acquire(input->memblock) + input->index;
- dst = (uint8_t*) pa_memblock_acquire(r->to_work_format_buf.memblock);
+ src = pa_memblock_acquire_chunk(input);
+ dst = pa_memblock_acquire(r->to_work_format_buf.memblock);
r->to_work_format_func(n_samples, src, dst);
unsigned in_n_samples, out_n_samples, in_n_frames, out_n_frames;
void *src, *dst;
size_t leftover_length = 0;
- pa_bool_t have_leftover;
+ bool have_leftover;
pa_assert(r);
pa_assert(input);
* remapped, so it's not part of the input, it's part of the output. */
have_leftover = r->remap_buf_contains_leftover_data;
- r->remap_buf_contains_leftover_data = FALSE;
+ r->remap_buf_contains_leftover_data = false;
if (!have_leftover && (!r->map_required || input->length <= 0))
return input;
}
}
- src = (uint8_t *) pa_memblock_acquire(input->memblock) + input->index;
+ src = pa_memblock_acquire_chunk(input);
dst = (uint8_t *) pa_memblock_acquire(r->remap_buf.memblock) + leftover_length;
if (r->map_required) {
r->from_work_format_buf.memblock = pa_memblock_new(r->mempool, r->from_work_format_buf.length);
}
- src = (uint8_t*) pa_memblock_acquire(input->memblock) + input->index;
+ src = pa_memblock_acquire_chunk(input);
dst = pa_memblock_acquire(r->from_work_format_buf.memblock);
r->from_work_format_func(n_samples, src, dst);
pa_memblock_release(input->memblock);
pa_memblock_release(r->from_work_format_buf.memblock);
- r->from_work_format_buf.length = r->o_fz * n_frames;
-
return &r->from_work_format_buf;
}
memcpy(dst, buf, r->remap_buf.length);
pa_memblock_release(r->remap_buf.memblock);
- r->remap_buf_contains_leftover_data = TRUE;
+ r->remap_buf_contains_leftover_data = true;
}
/*** libsamplerate based implementation ***/
memset(&data, 0, sizeof(data));
- data.data_in = (float*) ((uint8_t*) pa_memblock_acquire(input->memblock) + input->index);
+ data.data_in = pa_memblock_acquire_chunk(input);
data.input_frames = (long int) in_n_frames;
- data.data_out = (float*) ((uint8_t*) pa_memblock_acquire(output->memblock) + output->index);
+ data.data_out = pa_memblock_acquire_chunk(output);
data.output_frames = (long int) *out_n_frames;
data.src_ratio = (double) r->o_ss.rate / r->i_ss.rate;
pa_assert(output);
pa_assert(out_n_frames);
- in = (float*) ((uint8_t*) pa_memblock_acquire(input->memblock) + input->index);
- out = (float*) ((uint8_t*) pa_memblock_acquire(output->memblock) + output->index);
+ in = pa_memblock_acquire_chunk(input);
+ out = pa_memblock_acquire_chunk(output);
pa_assert_se(speex_resampler_process_interleaved_float(r->speex.state, in, &inf, out, &outf) == 0);
pa_assert(output);
pa_assert(out_n_frames);
- in = (int16_t*) ((uint8_t*) pa_memblock_acquire(input->memblock) + input->index);
- out = (int16_t*) ((uint8_t*) pa_memblock_acquire(output->memblock) + output->index);
+ in = pa_memblock_acquire_chunk(input);
+ out = pa_memblock_acquire_chunk(output);
pa_assert_se(speex_resampler_process_interleaved_int(r->speex.state, in, &inf, out, &outf) == 0);
fz = r->w_sz * r->o_ss.channels;
- src = (uint8_t*) pa_memblock_acquire(input->memblock) + input->index;
- dst = (uint8_t*) pa_memblock_acquire(output->memblock) + output->index;
+ src = pa_memblock_acquire_chunk(input);
+ dst = pa_memblock_acquire_chunk(output);
for (o_index = 0;; o_index++, r->trivial.o_counter++) {
- i_index = (r->trivial.o_counter * r->i_ss.rate) / r->o_ss.rate;
+ i_index = ((uint64_t) r->trivial.o_counter * r->i_ss.rate) / r->o_ss.rate;
i_index = i_index > r->trivial.i_counter ? i_index - r->trivial.i_counter : 0;
if (i_index >= in_n_frames)
pa_assert(output);
pa_assert(out_n_frames);
- src = (uint8_t*) pa_memblock_acquire(input->memblock) + input->index;
- dst = (uint8_t*) pa_memblock_acquire(output->memblock) + output->index;
+ src = pa_memblock_acquire_chunk(input);
+ dst = pa_memblock_acquire_chunk(output);
- i = (r->peaks.o_counter * r->i_ss.rate) / r->o_ss.rate;
+ i = ((uint64_t) r->peaks.o_counter * r->i_ss.rate) / r->o_ss.rate;
i = i > r->peaks.i_counter ? i - r->peaks.i_counter : 0;
while (i_end < in_n_frames) {
- i_end = ((r->peaks.o_counter+1) * r->i_ss.rate) / r->o_ss.rate;
+ i_end = ((uint64_t) (r->peaks.o_counter + 1) * r->i_ss.rate) / r->o_ss.rate;
i_end = i_end > r->peaks.i_counter ? i_end - r->peaks.i_counter : 0;
pa_assert_fp(o_index * r->w_sz * r->o_ss.channels < pa_memblock_get_length(output->memblock));
p = pa_memblock_acquire(b);
/* Now copy the input data, splitting up channels */
- t = ((int16_t*) ((uint8_t*) pa_memblock_acquire(input->memblock) + input->index)) + c;
- k = (int16_t*) ((uint8_t*) p);
+ t = (int16_t*) pa_memblock_acquire_chunk(input) + c;
+ k = p;
for (u = 0; u < in_n_frames; u++) {
*k = *t;
t += r->o_ss.channels;
previous_consumed_frames = consumed_frames;
/* And place the results in the output buffer */
- s = (short*) ((uint8_t*) pa_memblock_acquire(output->memblock) + output->index) + c;
+ s = (int16_t *) pa_memblock_acquire_chunk(output) + c;
for (u = 0; u < used_frames; u++) {
*s = *q;
q++;
}
if (previous_consumed_frames < (int) in_n_frames) {
- void *leftover_data = (int16_t *) ((uint8_t *) pa_memblock_acquire(input->memblock) + output->index) + previous_consumed_frames * r->o_ss.channels;
+ void *leftover_data = (int16_t *) pa_memblock_acquire_chunk(input) + previous_consumed_frames * r->o_ss.channels;
size_t leftover_length = (in_n_frames - previous_consumed_frames) * r->o_ss.channels * sizeof(int16_t);
save_leftover(r, leftover_data, leftover_length);