mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-06-07 16:08:51 +00:00
Code Issues 1 Projects Releases Wiki Activity

Use intermediate guint when handling GstVideoMultiviewFlags

Browse source 
The underlying integer type of the enum GstVideoMultiviewFlags is
implementation defined and may not have the same size as guint.

https://bugzilla.gnome.org/show_bug.cgi?id=774293
This commit is contained in:
Scott D Phillips 2016-11-11 10:38:58 -08:00 committed by Sebastian Dröge
parent ab3c8caeed
commit ff8d49a4c8
3 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
gst-libs/gst/video/video-info.c
View file

@ -340,6 +340,7 @@ gst_video_info_from_caps (GstVideoInfo * info, const GstCaps * caps)
gint width = 0, height = 0; gint width = 0, height = 0;
gint fps_n, fps_d; gint fps_n, fps_d;
gint par_n, par_d; gint par_n, par_d;
guint multiview_flags;
g_return_val_if_fail (info != NULL, FALSE); g_return_val_if_fail (info != NULL, FALSE);
g_return_val_if_fail (caps != NULL, FALSE); g_return_val_if_fail (caps != NULL, FALSE);
@ -421,8 +422,9 @@ gst_video_info_from_caps (GstVideoInfo * info, const GstCaps * caps)
else else
GST_VIDEO_INFO_MULTIVIEW_MODE (info) = GST_VIDEO_MULTIVIEW_MODE_NONE; GST_VIDEO_INFO_MULTIVIEW_MODE (info) = GST_VIDEO_MULTIVIEW_MODE_NONE;
gst_structure_get_flagset (structure, "multiview-flags", gst_structure_get_flagset (structure, "multiview-flags", &multiview_flags,
&GST_VIDEO_INFO_MULTIVIEW_FLAGS (info), NULL); NULL);
GST_VIDEO_INFO_MULTIVIEW_FLAGS (info) = multiview_flags;
if (!gst_structure_get_int (structure, "views", &info->views)) if (!gst_structure_get_int (structure, "views", &info->views))
info->views = 1; info->views = 1;

2
gst/playback/gstplaybin2.c
View file

@ -3129,7 +3129,7 @@ update_video_multiview_caps (GstPlayBin * playbin, GstCaps * caps)
{ {
GstVideoMultiviewMode mv_mode; GstVideoMultiviewMode mv_mode;
GstVideoMultiviewMode cur_mv_mode; GstVideoMultiviewMode cur_mv_mode;
GstVideoMultiviewFlags mv_flags, cur_mv_flags; guint mv_flags, cur_mv_flags;
GstStructure *s; GstStructure *s;
const gchar *mview_mode_str; const gchar *mview_mode_str;
GstCaps *out_caps; GstCaps *out_caps;

2
gst/playback/gstplaybin3.c
View file

@ -2713,7 +2713,7 @@ update_video_multiview_caps (GstPlayBin3 * playbin, GstCaps * caps)
{ {
GstVideoMultiviewMode mv_mode; GstVideoMultiviewMode mv_mode;
GstVideoMultiviewMode cur_mv_mode; GstVideoMultiviewMode cur_mv_mode;
GstVideoMultiviewFlags mv_flags, cur_mv_flags; guint mv_flags, cur_mv_flags;
GstStructure *s; GstStructure *s;
const gchar *mview_mode_str; const gchar *mview_mode_str;
GstCaps *out_caps; GstCaps *out_caps;