diff --git a/subprojects/gst-plugins-base/ext/gl/gstglvideoflip.c b/subprojects/gst-plugins-base/ext/gl/gstglvideoflip.c index 252a847e73..814f4c3f55 100644 --- a/subprojects/gst-plugins-base/ext/gl/gstglvideoflip.c +++ b/subprojects/gst-plugins-base/ext/gl/gstglvideoflip.c @@ -41,7 +41,7 @@ #define GST_CAT_DEFAULT gst_gl_video_flip_debug GST_DEBUG_CATEGORY_STATIC (GST_CAT_DEFAULT); -#define DEFAULT_METHOD GST_GL_VIDEO_FLIP_METHOD_IDENTITY +#define DEFAULT_METHOD GST_VIDEO_ORIENTATION_IDENTITY enum { @@ -72,18 +72,18 @@ static GstStaticPadTemplate _src_template = GST_STATIC_PAD_TEMPLATE ("src", #define GST_TYPE_GL_VIDEO_FLIP_METHOD (gst_video_flip_method_get_type()) static const GEnumValue video_flip_methods[] = { - {GST_GL_VIDEO_FLIP_METHOD_IDENTITY, "Identity (no rotation)", "none"}, - {GST_GL_VIDEO_FLIP_METHOD_90R, "Rotate clockwise 90 degrees", "clockwise"}, - {GST_GL_VIDEO_FLIP_METHOD_180, "Rotate 180 degrees", "rotate-180"}, - {GST_GL_VIDEO_FLIP_METHOD_90L, "Rotate counter-clockwise 90 degrees", + {GST_VIDEO_ORIENTATION_IDENTITY, "Identity (no rotation)", "none"}, + {GST_VIDEO_ORIENTATION_90R, "Rotate clockwise 90 degrees", "clockwise"}, + {GST_VIDEO_ORIENTATION_180, "Rotate 180 degrees", "rotate-180"}, + {GST_VIDEO_ORIENTATION_90L, "Rotate counter-clockwise 90 degrees", "counterclockwise"}, - {GST_GL_VIDEO_FLIP_METHOD_FLIP_HORIZ, "Flip horizontally", "horizontal-flip"}, - {GST_GL_VIDEO_FLIP_METHOD_FLIP_VERT, "Flip vertically", "vertical-flip"}, - {GST_GL_VIDEO_FLIP_METHOD_FLIP_UL_LR, + {GST_VIDEO_ORIENTATION_HORIZ, "Flip horizontally", "horizontal-flip"}, + {GST_VIDEO_ORIENTATION_VERT, "Flip vertically", "vertical-flip"}, + {GST_VIDEO_ORIENTATION_UL_LR, "Flip across upper left/lower right diagonal", "upper-left-diagonal"}, - {GST_GL_VIDEO_FLIP_METHOD_FLIP_UR_LL, + {GST_VIDEO_ORIENTATION_UR_LL, "Flip across upper right/lower left diagonal", "upper-right-diagonal"}, - {GST_GL_VIDEO_FLIP_METHOD_AUTO, + {GST_VIDEO_ORIENTATION_AUTO, "Select flip method based on image-orientation tag", "automatic"}, {0, NULL, NULL}, }; diff --git a/subprojects/gst-plugins-base/ext/gl/gstglvideoflip.h b/subprojects/gst-plugins-base/ext/gl/gstglvideoflip.h index 36f8da07da..5976f8f0e7 100644 --- a/subprojects/gst-plugins-base/ext/gl/gstglvideoflip.h +++ b/subprojects/gst-plugins-base/ext/gl/gstglvideoflip.h @@ -22,6 +22,7 @@ #define _GST_GL_VIDEO_FLIP_H_ #include +#include G_BEGIN_DECLS @@ -32,31 +33,6 @@ G_BEGIN_DECLS #define GST_IS_GL_VIDEO_FLIP_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass) ,GST_TYPE_GL_VIDEO_FLIP)) #define GST_GL_VIDEO_FLIP_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS((obj) ,GST_TYPE_GL_VIDEO_FLIP,GstGLVideoFlipClass)) -/** - * GstVideoFlipMethod: - * @GST_GL_VIDEO_FLIP_METHOD_IDENTITY: Identity (no rotation) - * @GST_GL_VIDEO_FLIP_METHOD_90R: Rotate clockwise 90 degrees - * @GST_GL_VIDEO_FLIP_METHOD_180: Rotate 180 degrees - * @GST_GL_VIDEO_FLIP_METHOD_90L: Rotate counter-clockwise 90 degrees - * @GST_GL_VIDEO_FLIP_METHOD_FLIP_HORIZ: Flip horizontally - * @GST_GL_VIDEO_FLIP_METHOD_FLIP_VERT: Flip vertically - * @GST_GL_VIDEO_FLIP_METHOD_FLIP_UL_LR: Flip across upper left/lower right diagonal - * @GST_GL_VIDEO_FLIP_METHOD_FLIP_UR_LL: Flip across upper right/lower left diagonal - * @GST_GL_VIDEO_FLIP_METHOD_AUTO: Select flip method based on image-orientation tag - * - * The different flip methods. - */ -typedef enum { - GST_GL_VIDEO_FLIP_METHOD_IDENTITY, - GST_GL_VIDEO_FLIP_METHOD_90R, - GST_GL_VIDEO_FLIP_METHOD_180, - GST_GL_VIDEO_FLIP_METHOD_90L, - GST_GL_VIDEO_FLIP_METHOD_FLIP_HORIZ, - GST_GL_VIDEO_FLIP_METHOD_FLIP_VERT, - GST_GL_VIDEO_FLIP_METHOD_FLIP_UL_LR, - GST_GL_VIDEO_FLIP_METHOD_FLIP_UR_LL, - GST_GL_VIDEO_FLIP_METHOD_AUTO, -} GstGLVideoFlipMethod; typedef struct _GstGLVideoFlip GstGLVideoFlip; typedef struct _GstGLVideoFlipClass GstGLVideoFlipClass;