Zebediah Figura : winegstreamer: Move the wg_parser and wg_parser_stream definitions to wg_parser.c.
Alexandre Julliard
julliard at winehq.org
Thu Feb 18 16:06:05 CST 2021
Module: wine
Branch: master
Commit: 51f1ab47a72e698dfb4753620a7ce6463943601d
URL: https://source.winehq.org/git/wine.git/?a=commit;h=51f1ab47a72e698dfb4753620a7ce6463943601d
Author: Zebediah Figura <z.figura12 at gmail.com>
Date: Wed Feb 17 17:30:37 2021 -0600
winegstreamer: Move the wg_parser and wg_parser_stream definitions to wg_parser.c.
Signed-off-by: Zebediah Figura <z.figura12 at gmail.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/winegstreamer/gst_private.h | 52 ----------------------------------------
dlls/winegstreamer/wg_parser.c | 52 ++++++++++++++++++++++++++++++++++++++++
2 files changed, 52 insertions(+), 52 deletions(-)
diff --git a/dlls/winegstreamer/gst_private.h b/dlls/winegstreamer/gst_private.h
index e90de8803e5..75025fdf7d5 100644
--- a/dlls/winegstreamer/gst_private.h
+++ b/dlls/winegstreamer/gst_private.h
@@ -133,40 +133,6 @@ struct wg_format
} u;
};
-struct wg_parser
-{
- BOOL (*init_gst)(struct wg_parser *parser);
-
- struct wg_parser_stream **streams;
- unsigned int stream_count;
-
- GstElement *container;
- GstBus *bus;
- GstPad *my_src, *their_sink;
-
- guint64 file_size, start_offset, next_offset, stop_offset;
- guint64 next_pull_offset;
-
- pthread_t push_thread;
-
- pthread_mutex_t mutex;
-
- pthread_cond_t init_cond;
- bool no_more_pads, has_duration, error;
-
- pthread_cond_t read_cond, read_done_cond;
- struct
- {
- void *data;
- uint64_t offset;
- uint32_t size;
- bool done;
- bool ret;
- } read_request;
-
- bool flushing, sink_connected;
-};
-
enum wg_parser_event_type
{
WG_PARSER_EVENT_NONE = 0,
@@ -195,24 +161,6 @@ struct wg_parser_event
} u;
};
-struct wg_parser_stream
-{
- struct wg_parser *parser;
-
- GstPad *their_src, *post_sink, *post_src, *my_sink;
- GstElement *flip;
- struct wg_format preferred_format, current_format;
-
- pthread_cond_t event_cond, event_empty_cond;
- struct wg_parser_event event;
- GstBuffer *buffer;
- GstMapInfo map_info;
-
- bool flushing, eos, enabled, has_caps;
-
- uint64_t duration;
-};
-
struct unix_funcs
{
struct wg_parser *(CDECL *wg_decodebin_parser_create)(void);
diff --git a/dlls/winegstreamer/wg_parser.c b/dlls/winegstreamer/wg_parser.c
index 5d10ddf753c..272029217a9 100644
--- a/dlls/winegstreamer/wg_parser.c
+++ b/dlls/winegstreamer/wg_parser.c
@@ -36,6 +36,58 @@ WINE_DEFAULT_DEBUG_CHANNEL(gstreamer);
GST_DEBUG_CATEGORY_STATIC(wine);
#define GST_CAT_DEFAULT wine
+struct wg_parser
+{
+ BOOL (*init_gst)(struct wg_parser *parser);
+
+ struct wg_parser_stream **streams;
+ unsigned int stream_count;
+
+ GstElement *container;
+ GstBus *bus;
+ GstPad *my_src, *their_sink;
+
+ guint64 file_size, start_offset, next_offset, stop_offset;
+ guint64 next_pull_offset;
+
+ pthread_t push_thread;
+
+ pthread_mutex_t mutex;
+
+ pthread_cond_t init_cond;
+ bool no_more_pads, has_duration, error;
+
+ pthread_cond_t read_cond, read_done_cond;
+ struct
+ {
+ void *data;
+ uint64_t offset;
+ uint32_t size;
+ bool done;
+ bool ret;
+ } read_request;
+
+ bool flushing, sink_connected;
+};
+
+struct wg_parser_stream
+{
+ struct wg_parser *parser;
+
+ GstPad *their_src, *post_sink, *post_src, *my_sink;
+ GstElement *flip;
+ struct wg_format preferred_format, current_format;
+
+ pthread_cond_t event_cond, event_empty_cond;
+ struct wg_parser_event event;
+ GstBuffer *buffer;
+ GstMapInfo map_info;
+
+ bool flushing, eos, enabled, has_caps;
+
+ uint64_t duration;
+};
+
static enum wg_audio_format wg_audio_format_from_gst(GstAudioFormat format)
{
switch (format)
More information about the wine-cvs
mailing list