From: Kurt Kartaltepe kkartaltepe@gmail.com
--- dlls/winegstreamer/unix_private.h | 1 + dlls/winegstreamer/unixlib.h | 133 +++++++++++++++++------------- dlls/winegstreamer/wg_parser.c | 2 +- 3 files changed, 76 insertions(+), 60 deletions(-)
diff --git a/dlls/winegstreamer/unix_private.h b/dlls/winegstreamer/unix_private.h index f1847eb27ef..527822cf15b 100644 --- a/dlls/winegstreamer/unix_private.h +++ b/dlls/winegstreamer/unix_private.h @@ -23,6 +23,7 @@
#include "unixlib.h"
+#include <stdbool.h> #include <gst/gst.h>
/* unixlib.c */ diff --git a/dlls/winegstreamer/unixlib.h b/dlls/winegstreamer/unixlib.h index 076f3fc74ee..3224978c883 100644 --- a/dlls/winegstreamer/unixlib.h +++ b/dlls/winegstreamer/unixlib.h @@ -21,7 +21,6 @@ #ifndef __WINE_WINEGSTREAMER_UNIXLIB_H #define __WINE_WINEGSTREAMER_UNIXLIB_H
-#include <stdbool.h> #include <stdint.h> #include "windef.h" #include "winternl.h" @@ -30,37 +29,76 @@
#include "wine/unixlib.h"
+typedef uint8_t BOOL8; + +typedef UINT32 wg_major_type; +enum wg_major_type +{ + WG_MAJOR_TYPE_UNKNOWN = 0, + WG_MAJOR_TYPE_AUDIO, + WG_MAJOR_TYPE_AUDIO_MPEG1, + WG_MAJOR_TYPE_AUDIO_MPEG4, + WG_MAJOR_TYPE_AUDIO_WMA, + WG_MAJOR_TYPE_VIDEO, + WG_MAJOR_TYPE_VIDEO_CINEPAK, + WG_MAJOR_TYPE_VIDEO_H264, + WG_MAJOR_TYPE_VIDEO_WMV, + WG_MAJOR_TYPE_VIDEO_INDEO, +}; + +typedef UINT32 wg_audio_format; +enum wg_audio_format +{ + WG_AUDIO_FORMAT_UNKNOWN, + + WG_AUDIO_FORMAT_U8, + WG_AUDIO_FORMAT_S16LE, + WG_AUDIO_FORMAT_S24LE, + WG_AUDIO_FORMAT_S32LE, + WG_AUDIO_FORMAT_F32LE, + WG_AUDIO_FORMAT_F64LE, +}; + +typedef UINT32 wg_video_format; +enum wg_video_format +{ + WG_VIDEO_FORMAT_UNKNOWN, + + WG_VIDEO_FORMAT_BGRA, + WG_VIDEO_FORMAT_BGRx, + WG_VIDEO_FORMAT_BGR, + WG_VIDEO_FORMAT_RGB15, + WG_VIDEO_FORMAT_RGB16, + + WG_VIDEO_FORMAT_AYUV, + WG_VIDEO_FORMAT_I420, + WG_VIDEO_FORMAT_NV12, + WG_VIDEO_FORMAT_UYVY, + WG_VIDEO_FORMAT_YUY2, + WG_VIDEO_FORMAT_YV12, + WG_VIDEO_FORMAT_YVYU, +}; + +typedef UINT32 wg_wmv_video_format; +enum wg_wmv_video_format +{ + WG_WMV_VIDEO_FORMAT_UNKNOWN, + WG_WMV_VIDEO_FORMAT_WMV1, + WG_WMV_VIDEO_FORMAT_WMV2, + WG_WMV_VIDEO_FORMAT_WMV3, + WG_WMV_VIDEO_FORMAT_WMVA, + WG_WMV_VIDEO_FORMAT_WVC1, +}; + struct wg_format { - enum wg_major_type - { - WG_MAJOR_TYPE_UNKNOWN = 0, - WG_MAJOR_TYPE_AUDIO, - WG_MAJOR_TYPE_AUDIO_MPEG1, - WG_MAJOR_TYPE_AUDIO_MPEG4, - WG_MAJOR_TYPE_AUDIO_WMA, - WG_MAJOR_TYPE_VIDEO, - WG_MAJOR_TYPE_VIDEO_CINEPAK, - WG_MAJOR_TYPE_VIDEO_H264, - WG_MAJOR_TYPE_VIDEO_WMV, - WG_MAJOR_TYPE_VIDEO_INDEO, - } major_type; + wg_major_type major_type;
union { struct { - enum wg_audio_format - { - WG_AUDIO_FORMAT_UNKNOWN, - - WG_AUDIO_FORMAT_U8, - WG_AUDIO_FORMAT_S16LE, - WG_AUDIO_FORMAT_S24LE, - WG_AUDIO_FORMAT_S32LE, - WG_AUDIO_FORMAT_F32LE, - WG_AUDIO_FORMAT_F64LE, - } format; + wg_audio_format format;
uint32_t channels; uint32_t channel_mask; /* In WinMM format. */ @@ -92,24 +130,7 @@ struct wg_format
struct { - enum wg_video_format - { - WG_VIDEO_FORMAT_UNKNOWN, - - WG_VIDEO_FORMAT_BGRA, - WG_VIDEO_FORMAT_BGRx, - WG_VIDEO_FORMAT_BGR, - WG_VIDEO_FORMAT_RGB15, - WG_VIDEO_FORMAT_RGB16, - - WG_VIDEO_FORMAT_AYUV, - WG_VIDEO_FORMAT_I420, - WG_VIDEO_FORMAT_NV12, - WG_VIDEO_FORMAT_UYVY, - WG_VIDEO_FORMAT_YUY2, - WG_VIDEO_FORMAT_YV12, - WG_VIDEO_FORMAT_YVYU, - } format; + wg_video_format format; /* Positive height indicates top-down video; negative height * indicates bottom-up video. */ int32_t width, height; @@ -132,15 +153,7 @@ struct wg_format } video_h264; struct { - enum wg_wmv_video_format - { - WG_WMV_VIDEO_FORMAT_UNKNOWN, - WG_WMV_VIDEO_FORMAT_WMV1, - WG_WMV_VIDEO_FORMAT_WMV2, - WG_WMV_VIDEO_FORMAT_WMV3, - WG_WMV_VIDEO_FORMAT_WMVA, - WG_WMV_VIDEO_FORMAT_WVC1, - } format; + wg_wmv_video_format format; int32_t width, height; uint32_t fps_n, fps_d; } video_wmv; @@ -181,10 +194,11 @@ struct wg_parser_buffer UINT64 pts, duration; UINT32 size; UINT32 stream; - bool discontinuity, preroll, delta, has_pts, has_duration; + BOOL8 discontinuity, preroll, delta, has_pts, has_duration; }; C_ASSERT(sizeof(struct wg_parser_buffer) == 32);
+typedef UINT32 wg_parser_type; enum wg_parser_type { WG_PARSER_DECODEBIN, @@ -200,10 +214,10 @@ typedef UINT64 wg_transform_t; struct wg_parser_create_params { wg_parser_t parser; - enum wg_parser_type type; - bool unlimited_buffering; - bool err_on; - bool warn_on; + wg_parser_type type; + BOOL8 unlimited_buffering; + BOOL8 err_on; + BOOL8 warn_on; }; C_ASSERT(sizeof(struct wg_parser_create_params) == 16);
@@ -276,7 +290,7 @@ struct wg_parser_stream_copy_buffer_params struct wg_parser_stream_notify_qos_params { wg_parser_stream_t stream; - bool underflow; + BOOL8 underflow; DOUBLE proportion; INT64 diff; UINT64 timestamp; @@ -289,6 +303,7 @@ struct wg_parser_stream_get_duration_params UINT64 duration; };
+typedef UINT64 wg_parser_tag; enum wg_parser_tag { WG_PARSER_TAG_LANGUAGE, @@ -299,7 +314,7 @@ enum wg_parser_tag struct wg_parser_stream_get_tag_params { wg_parser_stream_t stream; - enum wg_parser_tag tag; + wg_parser_tag tag; char *buffer; UINT32 *size; }; diff --git a/dlls/winegstreamer/wg_parser.c b/dlls/winegstreamer/wg_parser.c index 51eaae178aa..9c020cbf055 100644 --- a/dlls/winegstreamer/wg_parser.c +++ b/dlls/winegstreamer/wg_parser.c @@ -2068,7 +2068,7 @@ static NTSTATUS wow64_wg_parser_stream_get_tag(void *args) struct { wg_parser_stream_t stream; - enum wg_parser_tag tag; + wg_parser_tag tag; PTR32 buffer; PTR32 size; } *params32 = args;