From 20c4dc25fbbe68c9b7526059c50b74e818c12b10 Mon Sep 17 00:00:00 2001 From: Sebastian Dröge Date: Sat, 16 Dec 2017 10:22:44 +0200 Subject: player: Consistently use GstVideoMultiviewFramePacking instead of Mode The latter needs additional metadata, and the former was already used everywhere except for the functions: in properties in playbin itself. --- gst-libs/gst/player/gstplayer.c | 10 ++++++---- gst-libs/gst/player/gstplayer.h | 4 ++-- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/gst-libs/gst/player/gstplayer.c b/gst-libs/gst/player/gstplayer.c index 2b8541b27..183c84965 100644 --- a/gst-libs/gst/player/gstplayer.c +++ b/gst-libs/gst/player/gstplayer.c @@ -4227,12 +4227,13 @@ gst_player_get_color_balance (GstPlayer * self, GstPlayerColorBalanceType type) * * Since: 1.10 */ -GstVideoMultiviewMode +GstVideoMultiviewFramePacking gst_player_get_multiview_mode (GstPlayer * self) { - GstVideoMultiviewMode val = GST_VIDEO_MULTIVIEW_MODE_NONE; + GstVideoMultiviewFramePacking val = GST_VIDEO_MULTIVIEW_FRAME_PACKING_NONE; - g_return_val_if_fail (GST_IS_PLAYER (self), GST_VIDEO_MULTIVIEW_MODE_NONE); + g_return_val_if_fail (GST_IS_PLAYER (self), + GST_VIDEO_MULTIVIEW_FRAME_PACKING_NONE); g_object_get (self, "video-multiview-mode", &val, NULL); @@ -4250,7 +4251,8 @@ gst_player_get_multiview_mode (GstPlayer * self) * Since: 1.10 */ void -gst_player_set_multiview_mode (GstPlayer * self, GstVideoMultiviewMode mode) +gst_player_set_multiview_mode (GstPlayer * self, + GstVideoMultiviewFramePacking mode) { g_return_if_fail (GST_IS_PLAYER (self)); diff --git a/gst-libs/gst/player/gstplayer.h b/gst-libs/gst/player/gstplayer.h index 2a38ea6b2..f8b722247 100644 --- a/gst-libs/gst/player/gstplayer.h +++ b/gst-libs/gst/player/gstplayer.h @@ -228,11 +228,11 @@ gdouble gst_player_get_color_balance (GstPlayer * player, GST_EXPORT -GstVideoMultiviewMode gst_player_get_multiview_mode (GstPlayer * player); +GstVideoMultiviewFramePacking gst_player_get_multiview_mode (GstPlayer * player); GST_EXPORT void gst_player_set_multiview_mode (GstPlayer * player, - GstVideoMultiviewMode mode); + GstVideoMultiviewFramePacking mode); GST_EXPORT GstVideoMultiviewFlags gst_player_get_multiview_flags (GstPlayer * player); -- cgit v1.2.3