From d5fd9bc22bd9964e59c1640e688aa33034f115b4 Mon Sep 17 00:00:00 2001 From: Haihao Xiang Date: Fri, 23 Aug 2019 09:51:20 +0800 Subject: [PATCH] msdkvpp: support video-direction property video-direction property is common property in gstreamer. In addition, both mirroring & rotation properties are marked as deprecated, video-direction will override mirroring & rotation properties when they are set explicitly Fix https://gitlab.freedesktop.org/gstreamer/gst-plugins-bad/issues/1058 --- sys/msdk/gstmsdkvpp.c | 88 +++++++++++++++++++++++++++++++++---------- sys/msdk/gstmsdkvpp.h | 2 + sys/msdk/msdk-enums.c | 4 ++ sys/msdk/msdk.c | 45 ++++++++++++++++++++++ sys/msdk/msdk.h | 4 ++ 5 files changed, 124 insertions(+), 19 deletions(-) diff --git a/sys/msdk/gstmsdkvpp.c b/sys/msdk/gstmsdkvpp.c index 5a3eac5e33..937ea43401 100644 --- a/sys/msdk/gstmsdkvpp.c +++ b/sys/msdk/gstmsdkvpp.c @@ -109,7 +109,9 @@ enum PROP_HARDWARE, PROP_ASYNC_DEPTH, PROP_DENOISE, +#ifndef GST_REMOVE_DEPRECATED PROP_ROTATION, +#endif PROP_DEINTERLACE_MODE, PROP_DEINTERLACE_METHOD, PROP_HUE, @@ -117,17 +119,23 @@ enum PROP_BRIGHTNESS, PROP_CONTRAST, PROP_DETAIL, +#ifndef GST_REMOVE_DEPRECATED PROP_MIRRORING, +#endif PROP_SCALING_MODE, PROP_FORCE_ASPECT_RATIO, PROP_FRC_ALGORITHM, + PROP_VIDEO_DIRECTION, PROP_N, }; #define PROP_HARDWARE_DEFAULT TRUE #define PROP_ASYNC_DEPTH_DEFAULT 1 #define PROP_DENOISE_DEFAULT 0 +#ifndef GST_REMOVE_DEPRECATED #define PROP_ROTATION_DEFAULT MFX_ANGLE_0 +#define PROP_MIRRORING_DEFAULT MFX_MIRRORING_DISABLED +#endif #define PROP_DEINTERLACE_MODE_DEFAULT GST_MSDKVPP_DEINTERLACE_MODE_AUTO #define PROP_DEINTERLACE_METHOD_DEFAULT MFX_DEINTERLACING_BOB #define PROP_HUE_DEFAULT 0 @@ -135,10 +143,10 @@ enum #define PROP_BRIGHTNESS_DEFAULT 0 #define PROP_CONTRAST_DEFAULT 1 #define PROP_DETAIL_DEFAULT 0 -#define PROP_MIRRORING_DEFAULT MFX_MIRRORING_DISABLED #define PROP_SCALING_MODE_DEFAULT MFX_SCALING_MODE_DEFAULT #define PROP_FORCE_ASPECT_RATIO_DEFAULT TRUE #define PROP_FRC_ALGORITHM_DEFAULT _MFX_FRC_ALGORITHM_NONE +#define PROP_VIDEO_DIRECTION_DEFAULT GST_VIDEO_ORIENTATION_IDENTITY #define gst_msdkvpp_parent_class parent_class G_DEFINE_TYPE (GstMsdkVPP, gst_msdkvpp, GST_TYPE_BASE_TRANSFORM); @@ -820,7 +828,6 @@ gst_msdkvpp_close (GstMsdkVPP * thiz) static void ensure_filters (GstMsdkVPP * thiz) { - /* Denoise */ if (thiz->flags & GST_MSDK_FLAG_DENOISE) { mfxExtVPPDenoise *mfx_denoise = &thiz->mfx_denoise; @@ -831,7 +838,7 @@ ensure_filters (GstMsdkVPP * thiz) } /* Rotation */ - if (thiz->flags & GST_MSDK_FLAG_ROTATION) { + if (thiz->rotation != MFX_ANGLE_0) { mfxExtVPPRotation *mfx_rotation = &thiz->mfx_rotation; mfx_rotation->Header.BufferId = MFX_EXTBUFF_VPP_ROTATION; mfx_rotation->Header.BufferSz = sizeof (mfxExtVPPRotation); @@ -871,7 +878,7 @@ ensure_filters (GstMsdkVPP * thiz) } /* Mirroring */ - if (thiz->flags & GST_MSDK_FLAG_MIRRORING) { + if (thiz->mirroring != MFX_MIRRORING_DISABLED) { mfxExtVPPMirroring *mfx_mirroring = &thiz->mfx_mirroring; mfx_mirroring->Header.BufferId = MFX_EXTBUFF_VPP_MIRRORING; mfx_mirroring->Header.BufferSz = sizeof (mfxExtVPPMirroring); @@ -1171,6 +1178,14 @@ gst_msdkvpp_fixate_caps (GstBaseTransform * trans, result = gst_caps_fixate (result); use_dmabuf = &thiz->use_sinkpad_dmabuf; } else { + /* + * Override mirroring & rotation properties once video-direction + * is set explicitly + */ + if (thiz->flags & GST_MSDK_FLAG_VIDEO_DIRECTION) + gst_msdk_get_mfx_video_orientation_from_video_direction + (thiz->video_direction, &thiz->mirroring, &thiz->rotation); + result = gst_msdkvpp_fixate_srccaps (thiz, caps, othercaps); use_dmabuf = &thiz->use_srcpad_dmabuf; } @@ -1250,10 +1265,16 @@ gst_msdkvpp_set_property (GObject * object, guint prop_id, thiz->denoise_factor = g_value_get_uint (value); thiz->flags |= GST_MSDK_FLAG_DENOISE; break; +#ifndef GST_REMOVE_DEPRECATED case PROP_ROTATION: thiz->rotation = g_value_get_enum (value); thiz->flags |= GST_MSDK_FLAG_ROTATION; break; + case PROP_MIRRORING: + thiz->mirroring = g_value_get_enum (value); + thiz->flags |= GST_MSDK_FLAG_MIRRORING; + break; +#endif case PROP_DEINTERLACE_MODE: thiz->deinterlace_mode = g_value_get_enum (value); break; @@ -1280,10 +1301,6 @@ gst_msdkvpp_set_property (GObject * object, guint prop_id, thiz->detail = g_value_get_uint (value); thiz->flags |= GST_MSDK_FLAG_DETAIL; break; - case PROP_MIRRORING: - thiz->mirroring = g_value_get_enum (value); - thiz->flags |= GST_MSDK_FLAG_MIRRORING; - break; case PROP_SCALING_MODE: thiz->scaling_mode = g_value_get_enum (value); thiz->flags |= GST_MSDK_FLAG_SCALING_MODE; @@ -1294,6 +1311,10 @@ gst_msdkvpp_set_property (GObject * object, guint prop_id, case PROP_FRC_ALGORITHM: thiz->frc_algm = g_value_get_enum (value); break; + case PROP_VIDEO_DIRECTION: + thiz->video_direction = g_value_get_enum (value); + thiz->flags |= GST_MSDK_FLAG_VIDEO_DIRECTION; + break; default: G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); break; @@ -1316,9 +1337,14 @@ gst_msdkvpp_get_property (GObject * object, guint prop_id, case PROP_DENOISE: g_value_set_uint (value, thiz->denoise_factor); break; +#ifndef GST_REMOVE_DEPRECATED case PROP_ROTATION: g_value_set_enum (value, thiz->rotation); break; + case PROP_MIRRORING: + g_value_set_enum (value, thiz->mirroring); + break; +#endif case PROP_DEINTERLACE_MODE: g_value_set_enum (value, thiz->deinterlace_mode); break; @@ -1340,9 +1366,6 @@ gst_msdkvpp_get_property (GObject * object, guint prop_id, case PROP_DETAIL: g_value_set_uint (value, thiz->detail); break; - case PROP_MIRRORING: - g_value_set_enum (value, thiz->mirroring); - break; case PROP_SCALING_MODE: g_value_set_enum (value, thiz->scaling_mode); break; @@ -1352,6 +1375,9 @@ gst_msdkvpp_get_property (GObject * object, guint prop_id, case PROP_FRC_ALGORITHM: g_value_set_enum (value, thiz->frc_algm); break; + case PROP_VIDEO_DIRECTION: + g_value_set_enum (value, thiz->video_direction); + break; default: G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); break; @@ -1437,10 +1463,20 @@ gst_msdkvpp_class_init (GstMsdkVPPClass * klass) "Denoising Factor", 0, 100, PROP_DENOISE_DEFAULT, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS); +#ifndef GST_REMOVE_DEPRECATED obj_properties[PROP_ROTATION] = g_param_spec_enum ("rotation", "Rotation", - "Rotation Angle", gst_msdkvpp_rotation_get_type (), - PROP_ROTATION_DEFAULT, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS); + "Rotation Angle (DEPRECATED, use video-direction instead)", + gst_msdkvpp_rotation_get_type (), PROP_ROTATION_DEFAULT, + G_PARAM_DEPRECATED | G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS); + + obj_properties[PROP_MIRRORING] = + g_param_spec_enum ("mirroring", "Mirroring", + "The Mirroring type (DEPRECATED, use video-direction instead)", + gst_msdkvpp_mirroring_get_type (), PROP_MIRRORING_DEFAULT, + G_PARAM_DEPRECATED | G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS); + +#endif obj_properties[PROP_DEINTERLACE_MODE] = g_param_spec_enum ("deinterlace-mode", "Deinterlace Mode", @@ -1481,11 +1517,6 @@ gst_msdkvpp_class_init (GstMsdkVPPClass * klass) "The factor of detail/edge enhancement filter algorithm", 0, 100, PROP_DETAIL_DEFAULT, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS); - obj_properties[PROP_MIRRORING] = - g_param_spec_enum ("mirroring", "Mirroring", - "The Mirroring type", gst_msdkvpp_mirroring_get_type (), - PROP_MIRRORING_DEFAULT, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS); - obj_properties[PROP_SCALING_MODE] = g_param_spec_enum ("scaling-mode", "Scaling Mode", "The Scaling mode to use", gst_msdkvpp_scaling_mode_get_type (), @@ -1503,6 +1534,19 @@ gst_msdkvpp_class_init (GstMsdkVPPClass * klass) gst_msdkvpp_frc_algorithm_get_type (), PROP_FRC_ALGORITHM_DEFAULT, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS); + /* + * The video-direction to use, expressed as an enum value. See + * #GstVideoOrientationMethod. + */ + obj_properties[PROP_VIDEO_DIRECTION] = g_param_spec_enum ("video-direction", + "Video Direction", "Video direction: rotation and flipping" +#ifndef GST_REMOVE_DEPRECATED + ", it will override both mirroring & rotation properties if set explicitly" +#endif + , + GST_TYPE_VIDEO_ORIENTATION_METHOD, + PROP_VIDEO_DIRECTION_DEFAULT, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS); + g_object_class_install_properties (gobject_class, PROP_N, obj_properties); } @@ -1513,7 +1557,13 @@ gst_msdkvpp_init (GstMsdkVPP * thiz) thiz->hardware = PROP_HARDWARE_DEFAULT; thiz->async_depth = PROP_ASYNC_DEPTH_DEFAULT; thiz->denoise_factor = PROP_DENOISE_DEFAULT; +#ifndef GST_REMOVE_DEPRECATED thiz->rotation = PROP_ROTATION_DEFAULT; + thiz->mirroring = PROP_MIRRORING_DEFAULT; +#else + thiz->rotation = MFX_ANGLE_0; + thiz->mirroring = MFX_MIRRORING_DISABLED; +#endif thiz->deinterlace_mode = PROP_DEINTERLACE_MODE_DEFAULT; thiz->deinterlace_method = PROP_DEINTERLACE_METHOD_DEFAULT; thiz->buffer_duration = GST_CLOCK_TIME_NONE; @@ -1522,10 +1572,10 @@ gst_msdkvpp_init (GstMsdkVPP * thiz) thiz->brightness = PROP_BRIGHTNESS_DEFAULT; thiz->contrast = PROP_CONTRAST_DEFAULT; thiz->detail = PROP_DETAIL_DEFAULT; - thiz->mirroring = PROP_MIRRORING_DEFAULT; thiz->scaling_mode = PROP_SCALING_MODE_DEFAULT; thiz->keep_aspect = PROP_FORCE_ASPECT_RATIO_DEFAULT; thiz->frc_algm = PROP_FRC_ALGORITHM_DEFAULT; + thiz->video_direction = PROP_VIDEO_DIRECTION_DEFAULT; gst_video_info_init (&thiz->sinkpad_info); gst_video_info_init (&thiz->srcpad_info); } diff --git a/sys/msdk/gstmsdkvpp.h b/sys/msdk/gstmsdkvpp.h index e82925952e..e48ff7caa4 100644 --- a/sys/msdk/gstmsdkvpp.h +++ b/sys/msdk/gstmsdkvpp.h @@ -68,6 +68,7 @@ typedef enum { GST_MSDK_FLAG_MIRRORING = 1 << 8, GST_MSDK_FLAG_SCALING_MODE = 1 << 9, GST_MSDK_FLAG_FRC = 1 << 10, + GST_MSDK_FLAG_VIDEO_DIRECTION = 1 << 11, } GstMsdkVppFlags; struct _GstMsdkVPP @@ -119,6 +120,7 @@ struct _GstMsdkVPP guint scaling_mode; gboolean keep_aspect; guint frc_algm; + guint video_direction; GstClockTime buffer_duration; diff --git a/sys/msdk/msdk-enums.c b/sys/msdk/msdk-enums.c index 4ea47404d9..a318620104 100644 --- a/sys/msdk/msdk-enums.c +++ b/sys/msdk/msdk-enums.c @@ -178,6 +178,7 @@ gst_msdkenc_adaptive_b_get_type (void) /*========= MSDK VPP Enums =========================*/ +#ifndef GST_REMOVE_DEPRECATED GType gst_msdkvpp_rotation_get_type (void) { @@ -196,6 +197,7 @@ gst_msdkvpp_rotation_get_type (void) } return type; } +#endif GType gst_msdkvpp_deinterlace_mode_get_type (void) @@ -263,6 +265,7 @@ gst_msdkvpp_deinterlace_method_get_type (void) return type; } +#ifndef GST_REMOVE_DEPRECATED GType gst_msdkvpp_mirroring_get_type (void) { @@ -280,6 +283,7 @@ gst_msdkvpp_mirroring_get_type (void) } return type; } +#endif GType gst_msdkvpp_scaling_mode_get_type (void) diff --git a/sys/msdk/msdk.c b/sys/msdk/msdk.c index 3e96837adc..bbab8d9301 100644 --- a/sys/msdk/msdk.c +++ b/sys/msdk/msdk.c @@ -386,3 +386,48 @@ gst_msdk_update_mfx_frame_info_from_mfx_video_param (mfxFrameInfo * mfx_info, mfx_info->BitDepthChroma = param->mfx.FrameInfo.BitDepthChroma; mfx_info->Shift = param->mfx.FrameInfo.Shift; } + +void +gst_msdk_get_mfx_video_orientation_from_video_direction (guint value, + guint * mfx_mirror, guint * mfx_rotation) +{ + *mfx_mirror = MFX_MIRRORING_DISABLED; + *mfx_rotation = MFX_ANGLE_0; + + switch (value) { + case GST_VIDEO_ORIENTATION_IDENTITY: + *mfx_mirror = MFX_MIRRORING_DISABLED; + *mfx_rotation = MFX_ANGLE_0; + break; + case GST_VIDEO_ORIENTATION_HORIZ: + *mfx_mirror = MFX_MIRRORING_HORIZONTAL; + *mfx_rotation = MFX_ANGLE_0; + break; + case GST_VIDEO_ORIENTATION_VERT: + *mfx_mirror = MFX_MIRRORING_VERTICAL; + *mfx_rotation = MFX_ANGLE_0; + break; + case GST_VIDEO_ORIENTATION_90R: + *mfx_mirror = MFX_MIRRORING_DISABLED; + *mfx_rotation = MFX_ANGLE_90; + break; + case GST_VIDEO_ORIENTATION_180: + *mfx_mirror = MFX_MIRRORING_DISABLED; + *mfx_rotation = MFX_ANGLE_180; + break; + case GST_VIDEO_ORIENTATION_90L: + *mfx_mirror = MFX_MIRRORING_DISABLED; + *mfx_rotation = MFX_ANGLE_270; + break; + case GST_VIDEO_ORIENTATION_UL_LR: + *mfx_mirror = MFX_MIRRORING_HORIZONTAL; + *mfx_rotation = MFX_ANGLE_90; + break; + case GST_VIDEO_ORIENTATION_UR_LL: + *mfx_mirror = MFX_MIRRORING_VERTICAL; + *mfx_rotation = MFX_ANGLE_90; + break; + default: + break; + } +} diff --git a/sys/msdk/msdk.h b/sys/msdk/msdk.h index 0ab64af412..0423d2ac86 100644 --- a/sys/msdk/msdk.h +++ b/sys/msdk/msdk.h @@ -78,6 +78,10 @@ void gst_msdk_update_mfx_frame_info_from_mfx_video_param (mfxFrameInfo * mfx_info, mfxVideoParam * param); +void +gst_msdk_get_mfx_video_orientation_from_video_direction (guint value, + guint * mfx_mirror, guint * mfx_rotation); + G_END_DECLS #endif /* __MSDK_H__ */