luisgulo/gambas-source-code
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix how MediaPipeline duration is retrieved. Now the duration is actually available when the 'Duration' event is raised.

Browse source 
[GB.MEDIA]
* BUG: Fix how MediaPipeline duration is retrieved. Now the duration is actually available when the 'Duration' event is raised.
This commit is contained in:
Benoît Minisini 2023-03-04 17:13:00 +01:00
parent d246caa642
commit c283836cb8
1 changed files with 16 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
gb.media/src/c_media.c
View file

@ -142,8 +142,6 @@ void MEDIA_set_flag(void *element, char *property, int flag, bool value)
g_object_set(G_OBJECT(element), property, flags, NULL);
}
static GB_TYPE to_gambas_type(const GValue *value)
{
switch (G_VALUE_TYPE(value))
@ -765,6 +763,13 @@ static void set_pipeline_rate(void *_object)
THIS_PIPELINE->rate = THIS_PIPELINE->next_rate;
}
static gint64 get_pipeline_duration(void *_object)
{
if (THIS_PIPELINE->duration < 0)
gst_element_query_duration(ELEMENT, GST_FORMAT_TIME, &THIS_PIPELINE->duration);
return THIS_PIPELINE->duration;
}
#if 0
//---- MediaSignalArguments -----------------------------------------------
@ -1794,13 +1799,17 @@ static int cb_message(CMEDIAPIPELINE *_object)
break;
}
case GST_MESSAGE_BUFFERING: GB.Raise(THIS, EVENT_Buffering, 0); break;
case GST_MESSAGE_DURATION_CHANGED: GB.Raise(THIS, EVENT_Duration, 0); break;
case GST_MESSAGE_DURATION_CHANGED:
THIS_PIPELINE->duration = -1;
GB.Raise(THIS, EVENT_Duration, 0);
break;
case GST_MESSAGE_PROGRESS: GB.Raise(THIS, EVENT_Progress, 0); break;
case GST_MESSAGE_STREAM_START:
THIS_PIPELINE->about_to_finish = FALSE;
THIS_PIPELINE->pos = 0;
gst_element_query_duration(ELEMENT, GST_FORMAT_TIME, &THIS_PIPELINE->duration);
GB.Raise(THIS, EVENT_Start, 0);
break;
@ -1824,7 +1833,7 @@ static int cb_message(CMEDIAPIPELINE *_object)
THIS_PIPELINE->pos = pos;
GB.Raise(THIS, EVENT_Position, 0);
//fprintf(stderr, "%" PRId64 " / %" PRId64 "\n", THIS_PIPELINE->pos, THIS_PIPELINE->duration);
if (!THIS_PIPELINE->about_to_finish && THIS_PIPELINE->pos > (THIS_PIPELINE->duration - 2000000000))
if (!THIS_PIPELINE->about_to_finish && THIS_PIPELINE->pos > (get_pipeline_duration(THIS_PIPELINE) - 2000000000))
{
THIS_PIPELINE->about_to_finish = TRUE;
GB.Raise(THIS, EVENT_AboutToFinish, 0);
@ -1880,6 +1889,7 @@ BEGIN_METHOD(MediaPipeline_new, GB_INTEGER polling)
}
THIS_PIPELINE->rate = THIS_PIPELINE->next_rate = 1.0;
THIS_PIPELINE->duration = -1;
END_METHOD
@ -1955,7 +1965,7 @@ END_PROPERTY
BEGIN_PROPERTY(MediaPipeline_Duration)
GB.ReturnFloat((double)(THIS_PIPELINE->duration / 1000) / 1E6);
GB.ReturnFloat((double)(get_pipeline_duration(THIS_PIPELINE) / 1000) / 1E6);
END_PROPERTY