dany/clapper
1
0
Fork 0
mirror of https://github.com/Rafostar/clapper.git synced 2025-08-30 16:02:00 +02:00
Code Issues Packages Projects Releases Wiki Activity

API: emit media info updated signal after video info updates

Browse Source 
This fixes problem with wrong video resolution reported in media info due to being emitted before values were updated.
This commit is contained in:
Rafał Dzięgiel
2021-04-12 17:38:44 +02:00
parent 24bb9f298b
commit ab32b2dbbc
1 changed files with 20 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
lib/gst/clapper/gstclapper.c vendored
View File

@@ -169,6 +169,9 @@ struct _GstClapper
* is emitted after gst_clapper_stop/pause() has been called by the user. */
gboolean inhibit_sigs;
/* If should emit media info updated signal */
gboolean needs_info_update;
/* For playbin3 */
gboolean use_playbin3;
GstStreamCollection *collection;
@@ -264,6 +267,7 @@ gst_clapper_init (GstClapper * self)
self->seek_position = GST_CLOCK_TIME_NONE;
self->last_seek_time = GST_CLOCK_TIME_NONE;
self->inhibit_sigs = FALSE;
self->needs_info_update = FALSE;
GST_TRACE_OBJECT (self, "Initialized");
}
@@ -878,6 +882,7 @@ emit_media_info_updated (GstClapper * self)
MediaInfoUpdatedSignalData *data = g_new (MediaInfoUpdatedSignalData, 1);
data->clapper = g_object_ref (self);
g_mutex_lock (&self->lock);
self->needs_info_update = FALSE;
data->info = gst_clapper_media_info_copy (self->media_info);
g_mutex_unlock (&self->lock);
@@ -1517,15 +1522,12 @@ notify_caps_cb (G_GNUC_UNUSED GObject * object,
GstClapper *self = GST_CLAPPER (user_data);
if (self->target_state >= GST_STATE_PAUSED) {
gboolean has_media_info = FALSE;
check_video_dimensions_changed (self);
g_mutex_lock (&self->lock);
has_media_info = (self->media_info != NULL);
g_mutex_unlock (&self->lock);
if (has_media_info)
emit_media_info_updated (self);
g_mutex_lock (&self->lock);
if (self->media_info != NULL)
self->needs_info_update = TRUE;
g_mutex_unlock (&self->lock);
}
}
@@ -2328,6 +2330,7 @@ stream_notify_cb (GstStreamCollection * collection, GstStream * stream,
{
GstClapperStreamInfo *info;
const gchar *stream_id;
gboolean emit_update = FALSE;
if (!self->media_info)
return;
@@ -2342,7 +2345,11 @@ stream_notify_cb (GstStreamCollection * collection, GstStream * stream,
gst_clapper_stream_info_find_from_stream_id (self->media_info, stream_id);
if (info)
gst_clapper_stream_info_update_from_stream (self, info, stream);
emit_update = (self->needs_info_update && GST_IS_CLAPPER_VIDEO_INFO (info));
g_mutex_unlock (&self->lock);
if (emit_update)
emit_media_info_updated (self);
}
static void
@@ -2731,8 +2738,13 @@ static void
video_tags_changed_cb (G_GNUC_UNUSED GstElement * playbin, gint stream_index,
gpointer user_data)
{
tags_changed_cb (GST_CLAPPER (user_data), stream_index,
GstClapper *self = GST_CLAPPER (user_data);
tags_changed_cb (self, stream_index,
GST_TYPE_CLAPPER_VIDEO_INFO);
if (self->needs_info_update)
emit_media_info_updated (self);
}
static void