[PATCH v4 2/4] winegstreamer: Better handle framerate.

[Ziqing Hui]

From: Ziqing Hui

Framerate is fps_n / fps_d. So fps_d should not be zero.
---
 dlls/winegstreamer/wg_format.c | 26 ++++++++++++++++++++++----
 1 file changed, 22 insertions(+), 4 deletions(-)

diff --git a/dlls/winegstreamer/wg_format.c b/dlls/winegstreamer/wg_format.c
index ac21b0af94f..771817c6df1 100644
--- a/dlls/winegstreamer/wg_format.c
+++ b/dlls/winegstreamer/wg_format.c
@@ -422,6 +422,16 @@ static GstCaps *wg_format_to_caps_video(const struct wg_format *format)
         return NULL;

gst_video_info_set_format(&info, video_format, format->u.video.width, abs(format->u.video.height));
+    if (format->u.video.fps_d)
+    {
+        GST_VIDEO_INFO_FPS_N(&info) = format->u.video.fps_n;
+        GST_VIDEO_INFO_FPS_D(&info) = format->u.video.fps_d;
+    }
+    else
+    {
+        GST_VIDEO_INFO_FPS_N(&info) = 0;
+        GST_VIDEO_INFO_FPS_D(&info) = 1;
+    }
     if ((caps = gst_video_info_to_caps(&info)))
     {
         for (i = 0; i < gst_caps_get_size(caps); ++i)
@@ -448,8 +458,10 @@ static GstCaps *wg_format_to_caps_video_cinepak(const struct wg_format *format)
         gst_caps_set_simple(caps, "width", G_TYPE_INT, format->u.video_cinepak.width, NULL);
     if (format->u.video_cinepak.height)
         gst_caps_set_simple(caps, "height", G_TYPE_INT, format->u.video_cinepak.height, NULL);
-    if (format->u.video_cinepak.fps_d || format->u.video_cinepak.fps_n)
+    if (format->u.video_cinepak.fps_d)
         gst_caps_set_simple(caps, "framerate", GST_TYPE_FRACTION, format->u.video_cinepak.fps_n, format->u.video_cinepak.fps_d, NULL);
+    else
+        gst_caps_set_simple(caps, "framerate", GST_TYPE_FRACTION, 0, 1, NULL);

return caps;
 }
@@ -505,8 +517,10 @@ static GstCaps *wg_format_to_caps_video_h264(const struct wg_format *format)
         gst_caps_set_simple(caps, "width", G_TYPE_INT, format->u.video_h264.width, NULL);
     if (format->u.video_h264.height)
         gst_caps_set_simple(caps, "height", G_TYPE_INT, format->u.video_h264.height, NULL);
-    if (format->u.video_h264.fps_n || format->u.video_h264.fps_d)
+    if (format->u.video_h264.fps_d)
         gst_caps_set_simple(caps, "framerate", GST_TYPE_FRACTION, format->u.video_h264.fps_n, format->u.video_h264.fps_d, NULL);
+    else
+        gst_caps_set_simple(caps, "framerate", GST_TYPE_FRACTION, 0, 1, NULL);

switch (format->u.video_h264.profile)
     {
@@ -602,8 +616,10 @@ static GstCaps *wg_format_to_caps_video_wmv(const struct wg_format *format)
         gst_caps_set_simple(caps, "width", G_TYPE_INT, format->u.video_wmv.width, NULL);
     if (format->u.video_wmv.height)
         gst_caps_set_simple(caps, "height", G_TYPE_INT, format->u.video_wmv.height, NULL);
-    if (format->u.video_wmv.fps_d || format->u.video_wmv.fps_n)
+    if (format->u.video_wmv.fps_d)
         gst_caps_set_simple(caps, "framerate", GST_TYPE_FRACTION, format->u.video_wmv.fps_n, format->u.video_wmv.fps_d, NULL);
+    else
+        gst_caps_set_simple(caps, "framerate", GST_TYPE_FRACTION, 0, 1, NULL);

return caps;
 }
@@ -619,8 +635,10 @@ static GstCaps *wg_format_to_caps_video_indeo(const struct wg_format *format)
         gst_caps_set_simple(caps, "width", G_TYPE_INT, format->u.video_indeo.width, NULL);
     if (format->u.video_indeo.height)
         gst_caps_set_simple(caps, "height", G_TYPE_INT, format->u.video_indeo.height, NULL);
-    if (format->u.video_indeo.fps_d || format->u.video_indeo.fps_n)
+    if (format->u.video_indeo.fps_d)
         gst_caps_set_simple(caps, "framerate", GST_TYPE_FRACTION, format->u.video_indeo.fps_n, format->u.video_indeo.fps_d, NULL);
+    else
+        gst_caps_set_simple(caps, "framerate", GST_TYPE_FRACTION, 0, 1, NULL);
     if (format->u.video_indeo.version)
         gst_caps_set_simple(caps, "indeoversion", G_TYPE_INT, format->u.video_indeo.version, NULL);