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

videoencoder: Use the object lock to protect bytes/time tracking

Browse source
This commit is contained in:
Sebastian Dröge 2016-07-04 10:52:24 +02:00
parent d8111778bd
commit 3cabd3fe55
1 changed files with 8 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
gst-libs/gst/video/gstvideoencoder.c
View file

@ -355,8 +355,10 @@ gst_video_encoder_reset (GstVideoEncoder * encoder, gboolean hard)
priv->drained = TRUE; priv->drained = TRUE;
GST_OBJECT_LOCK (encoder);
priv->bytes = 0; priv->bytes = 0;
priv->time = 0; priv->time = 0;
GST_OBJECT_UNLOCK (encoder);
priv->time_adjustment = GST_CLOCK_TIME_NONE; priv->time_adjustment = GST_CLOCK_TIME_NONE;
@ -1237,9 +1239,11 @@ gst_video_encoder_src_query_default (GstVideoEncoder * enc, GstQuery * query)
gint64 src_val, dest_val; gint64 src_val, dest_val;
gst_query_parse_convert (query, &src_fmt, &src_val, &dest_fmt, &dest_val); gst_query_parse_convert (query, &src_fmt, &src_val, &dest_fmt, &dest_val);
GST_OBJECT_LOCK (enc);
res = res =
__gst_video_encoded_video_convert (priv->bytes, priv->time, src_fmt, __gst_video_encoded_video_convert (priv->bytes, priv->time, src_fmt,
src_val, &dest_fmt, &dest_val); src_val, &dest_fmt, &dest_val);
GST_OBJECT_UNLOCK (enc);
if (!res) if (!res)
goto error; goto error;
gst_query_set_convert (query, src_fmt, src_val, dest_fmt, dest_val); gst_query_set_convert (query, src_fmt, src_val, dest_fmt, dest_val);
@ -2096,6 +2100,7 @@ gst_video_encoder_finish_frame (GstVideoEncoder * encoder,
GST_BUFFER_DTS (frame->output_buffer) = frame->dts; GST_BUFFER_DTS (frame->output_buffer) = frame->dts;
GST_BUFFER_DURATION (frame->output_buffer) = frame->duration; GST_BUFFER_DURATION (frame->output_buffer) = frame->duration;
GST_OBJECT_LOCK (encoder);
/* update rate estimate */ /* update rate estimate */
priv->bytes += gst_buffer_get_size (frame->output_buffer); priv->bytes += gst_buffer_get_size (frame->output_buffer);
if (GST_CLOCK_TIME_IS_VALID (frame->duration)) { if (GST_CLOCK_TIME_IS_VALID (frame->duration)) {
@ -2104,6 +2109,7 @@ gst_video_encoder_finish_frame (GstVideoEncoder * encoder,
/* better none than nothing valid */ /* better none than nothing valid */
priv->time = GST_CLOCK_TIME_NONE; priv->time = GST_CLOCK_TIME_NONE;
} }
GST_OBJECT_UNLOCK (encoder);
if (G_UNLIKELY (send_headers || priv->new_headers)) { if (G_UNLIKELY (send_headers || priv->new_headers)) {
GList *tmp, *copy = NULL; GList *tmp, *copy = NULL;
@ -2122,7 +2128,9 @@ gst_video_encoder_finish_frame (GstVideoEncoder * encoder,
for (tmp = priv->headers; tmp; tmp = tmp->next) { for (tmp = priv->headers; tmp; tmp = tmp->next) {
GstBuffer *tmpbuf = GST_BUFFER (tmp->data); GstBuffer *tmpbuf = GST_BUFFER (tmp->data);
GST_OBJECT_LOCK (encoder);
priv->bytes += gst_buffer_get_size (tmpbuf); priv->bytes += gst_buffer_get_size (tmpbuf);
GST_OBJECT_UNLOCK (encoder);
if (G_UNLIKELY (discont)) { if (G_UNLIKELY (discont)) {
GST_LOG_OBJECT (encoder, "marking discont"); GST_LOG_OBJECT (encoder, "marking discont");
GST_BUFFER_FLAG_SET (tmpbuf, GST_BUFFER_FLAG_DISCONT); GST_BUFFER_FLAG_SET (tmpbuf, GST_BUFFER_FLAG_DISCONT);