Anton Baskanov : winegstreamer: Continue polling if duration is unavailable after duration-changed.
Alexandre Julliard
julliard at winehq.org
Thu Jul 22 16:28:18 CDT 2021
Module: wine
Branch: master
Commit: e0a281102b0c60748fa94aa733e70c444f31164e
URL: https://source.winehq.org/git/wine.git/?a=commit;h=e0a281102b0c60748fa94aa733e70c444f31164e
Author: Anton Baskanov <baskanov at gmail.com>
Date: Thu Jul 22 00:19:02 2021 -0500
winegstreamer: Continue polling if duration is unavailable after duration-changed.
Signed-off-by: Anton Baskanov <baskanov at gmail.com>
Signed-off-by: Zebediah Figura <zfigura at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/winegstreamer/wg_parser.c | 22 ++++++++++++++++++++--
1 file changed, 20 insertions(+), 2 deletions(-)
diff --git a/dlls/winegstreamer/wg_parser.c b/dlls/winegstreamer/wg_parser.c
index 76c096c4f68..eb53ac8efce 100644
--- a/dlls/winegstreamer/wg_parser.c
+++ b/dlls/winegstreamer/wg_parser.c
@@ -61,7 +61,7 @@ struct wg_parser
pthread_mutex_t mutex;
pthread_cond_t init_cond;
- bool no_more_pads, error;
+ bool no_more_pads, has_duration, error;
pthread_cond_t read_cond, read_done_cond;
struct
@@ -1401,6 +1401,9 @@ static GstBusSyncReply bus_handler_cb(GstBus *bus, GstMessage *msg, gpointer use
break;
case GST_MESSAGE_DURATION_CHANGED:
+ pthread_mutex_lock(&parser->mutex);
+ parser->has_duration = true;
+ pthread_mutex_unlock(&parser->mutex);
pthread_cond_signal(&parser->init_cond);
break;
@@ -1582,7 +1585,22 @@ static HRESULT CDECL wg_parser_connect(struct wg_parser *parser, uint64_t file_s
GST_WARNING("Failed to query duration.\n");
break;
}
- pthread_cond_wait(&parser->init_cond, &parser->mutex);
+
+ /* Elements based on GstBaseParse send duration-changed before
+ * actually updating the duration in GStreamer versions prior
+ * to 1.17.1. See <gstreamer.git:d28e0b4147fe7073b2>. So after
+ * receiving duration-changed we have to continue polling until
+ * the query succeeds. */
+ if (parser->has_duration)
+ {
+ pthread_mutex_unlock(&parser->mutex);
+ g_usleep(10000);
+ pthread_mutex_lock(&parser->mutex);
+ }
+ else
+ {
+ pthread_cond_wait(&parser->init_cond, &parser->mutex);
+ }
}
}
More information about the wine-cvs
mailing list