mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-04-26 04:46:13 +00:00
Code Issues 1 Projects Releases Wiki Activity

audioencoder: also adjust sample count upon discont to avoid ts overflow

Browse source 
Only adjusting the base_ts might lead to a negative ts and as such integer
overflow into a huge timestamp which then propagates into the granulepos
and so on.  Instead, resync to incoming buffer timestamp using both base_ts
and sample count rather than only base_ts.

Fixes https://bugzilla.gnome.org/show_bug.cgi?id=785948
This commit is contained in:
Mark Nauwelaerts 2017-08-08 20:35:25 +02:00
parent 2d632ff367
commit 00fa39befa
1 changed files with 20 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
gst-libs/gst/audio/gstaudioencoder.c
View file

@ -1325,7 +1325,18 @@ gst_audio_encoder_chain (GstPad * pad, GstObject * parent, GstBuffer * buffer)
} }
if (discont) { if (discont) {
/* now re-sync ts */ /* now re-sync ts */
priv->base_ts += diff; GstClockTime shift =
gst_util_uint64_scale (gst_adapter_available (priv->adapter),
GST_SECOND, ctx->info.rate * ctx->info.bpf);
if (G_UNLIKELY (shift > GST_BUFFER_TIMESTAMP (buffer))) {
/* ERROR */
goto wrong_time;
}
/* arrange for newly added samples to come out with the ts
* of the incoming buffer that adds these */
priv->base_ts = GST_BUFFER_TIMESTAMP (buffer) - shift;
priv->samples = 0;
gst_audio_encoder_set_base_gp (enc); gst_audio_encoder_set_base_gp (enc);
priv->discont |= discont; priv->discont |= discont;
} }
@ -1362,6 +1373,14 @@ wrong_buffer:
ret = GST_FLOW_ERROR; ret = GST_FLOW_ERROR;
goto done; goto done;
} }
wrong_time:
{
GST_ELEMENT_ERROR (enc, STREAM, ENCODE, (NULL),
("buffer going too far back in time"));
gst_buffer_unref (buffer);
ret = GST_FLOW_ERROR;
goto done;
}
} }
static gboolean static gboolean