summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBenjamin Otte <otte.benjamin@googlemail.com>2021-12-04 09:45:34 +0000
committerBenjamin Otte <otte.benjamin@googlemail.com>2021-12-04 09:45:34 +0000
commita0c09bc2a9e5e29720defab9b18f06eb1bf656f6 (patch)
tree6b4e57c9b08c396251cc7edea546ea638ca7f3a9
parentaca3b2da5824cc9a652a301b97abc1268ae532ec (diff)
parent604541863c711b14177c0fac1f41cb79adc43b13 (diff)
downloadgtk+-a0c09bc2a9e5e29720defab9b18f06eb1bf656f6.tar.gz
Merge branch 'check-for-unknown-duration' into 'main'
gstmediafile: Correctly report unknown duration See merge request GNOME/gtk!4217
-rw-r--r--modules/media/gtkgstmediafile.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/modules/media/gtkgstmediafile.c b/modules/media/gtkgstmediafile.c
index 6f09d1dbc8..0fead35bfa 100644
--- a/modules/media/gtkgstmediafile.c
+++ b/modules/media/gtkgstmediafile.c
@@ -137,11 +137,13 @@ gtk_gst_media_file_ensure_prepared (GtkGstMediaFile *self)
media_info = gst_player_get_media_info (self->player);
if (media_info)
{
+ GstClockTime duration = gst_player_media_info_get_duration (media_info);
+
gtk_media_stream_stream_prepared (GTK_MEDIA_STREAM (self),
gst_player_media_info_get_audio_streams (media_info) != NULL,
gst_player_media_info_get_video_streams (media_info) != NULL,
gst_player_media_info_is_seekable (media_info),
- FROM_GST_TIME (gst_player_media_info_get_duration (media_info)));
+ duration == GST_CLOCK_TIME_NONE ? 0 : FROM_GST_TIME (duration));
g_object_unref (media_info);
}