mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-26 19:51:11 +00:00
Code Issues 1 Projects Releases Wiki Activity

audio-resampler: Fix segfault when we can't output any frames

Browse source 
Sometimes the resampler has enough space to store all the incoming
samples without outputting anything. When this happens,
gst_audio_resampler_get_out_frames() returns 0.

In that case, the resampler should consume samples and just return.
Otherwise, we get a segfault when gst_audio_resampler_resample() tries
to resample into a NULL 'out' pointer.

Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/1343>
This commit is contained in:
Nirbheek Chauhan 2021-11-12 18:26:58 +05:30 committed by GStreamer Marge Bot
parent 41385ab6f7
commit 5d3009b7f8
1 changed files with 10 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
subprojects/gst-plugins-base/gst-libs/gst/audio/audio-resampler.c
View file

@ -1662,12 +1662,16 @@ gst_audio_resampler_get_out_frames (GstAudioResampler * resampler,
GST_LOG ("need %d = %d + %d + %d, avail %d = %d + %d", (gint) need, GST_LOG ("need %d = %d + %d + %d, avail %d = %d + %d", (gint) need,
resampler->n_taps, resampler->samp_index, resampler->skip, resampler->n_taps, resampler->samp_index, resampler->skip,
(gint) avail, (gint) resampler->samples_avail, (gint) in_frames); (gint) avail, (gint) resampler->samples_avail, (gint) in_frames);
if (avail < need) if (avail < need) {
GST_LOG ("avail %d < need %d", (int) avail, (int) need);
return 0; return 0;
}
out = (avail - need) * resampler->out_rate; out = (avail - need) * resampler->out_rate;
if (out < resampler->samp_phase) if (out < resampler->samp_phase) {
GST_LOG ("out %d < samp_phase %d", (int) out, (int) resampler->samp_phase);
return 0; return 0;
}
out = ((out - resampler->samp_phase) / resampler->in_rate) + 1; out = ((out - resampler->samp_phase) / resampler->in_rate) + 1;
GST_LOG ("out %d = ((%d * %d - %d) / %d) + 1", (gint) out, GST_LOG ("out %d = ((%d * %d - %d) / %d) + 1", (gint) out,
@ -1775,7 +1779,10 @@ gst_audio_resampler_resample (GstAudioResampler * resampler,
resampler->samples_avail = samples_avail += in_frames; resampler->samples_avail = samples_avail += in_frames;
need = resampler->n_taps + resampler->samp_index; need = resampler->n_taps + resampler->samp_index;
if (G_UNLIKELY (samples_avail < need)) { if (G_UNLIKELY (samples_avail < need || out_frames == 0)) {
GST_LOG ("not enough samples to start: need %" G_GSIZE_FORMAT ", avail %"
G_GSIZE_FORMAT ", out %" G_GSIZE_FORMAT, samples_avail, need,
out_frames);
/* not enough samples to start */ /* not enough samples to start */
return; return;
} }