From cd86181d54b5bd04705a2406e88ea900e9201111 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= Date: Fri, 18 Mar 2022 19:03:57 +0200 Subject: [PATCH] videocrop: Rename PACKED_COMPLEX to PACKED_YVYU It's not handling any kind of complex packed format, only formats that are like YVYU. Part-of: --- .../gst-plugins-good/gst/videocrop/gstvideocrop.c | 9 ++++----- .../gst-plugins-good/gst/videocrop/gstvideocrop.h | 2 +- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/subprojects/gst-plugins-good/gst/videocrop/gstvideocrop.c b/subprojects/gst-plugins-good/gst/videocrop/gstvideocrop.c index 8d4ba909c1..1312976c11 100644 --- a/subprojects/gst-plugins-good/gst/videocrop/gstvideocrop.c +++ b/subprojects/gst-plugins-good/gst/videocrop/gstvideocrop.c @@ -243,7 +243,7 @@ gst_video_crop_init (GstVideoCrop * vcrop) #define ROUND_DOWN_2(n) ((n)&(~1)) static void -gst_video_crop_transform_packed_complex (GstVideoCrop * vcrop, +gst_video_crop_transform_packed_yvyu (GstVideoCrop * vcrop, GstVideoFrame * in_frame, GstVideoFrame * out_frame, gint x, gint y) { guint8 *in_data, *out_data; @@ -448,9 +448,8 @@ gst_video_crop_transform_frame (GstVideoFilter * vfilter, case VIDEO_CROP_PIXEL_FORMAT_PACKED_SIMPLE: gst_video_crop_transform_packed_simple (vcrop, in_frame, out_frame, x, y); break; - case VIDEO_CROP_PIXEL_FORMAT_PACKED_COMPLEX: - gst_video_crop_transform_packed_complex (vcrop, in_frame, out_frame, x, - y); + case VIDEO_CROP_PIXEL_FORMAT_PACKED_YVYU: + gst_video_crop_transform_packed_yvyu (vcrop, in_frame, out_frame, x, y); break; case VIDEO_CROP_PIXEL_FORMAT_PLANAR: gst_video_crop_transform_planar (vcrop, in_frame, out_frame, x, y); @@ -833,7 +832,7 @@ gst_video_crop_set_info (GstVideoFilter * vfilter, GstCaps * in, case GST_VIDEO_FORMAT_YVYU: case GST_VIDEO_FORMAT_YUY2: case GST_VIDEO_FORMAT_UYVY: - crop->packing = VIDEO_CROP_PIXEL_FORMAT_PACKED_COMPLEX; + crop->packing = VIDEO_CROP_PIXEL_FORMAT_PACKED_YVYU; if (GST_VIDEO_INFO_FORMAT (in_info) == GST_VIDEO_FORMAT_UYVY) { /* UYVY = 4:2:2 - [U0 Y0 V0 Y1] [U2 Y2 V2 Y3] [U4 Y4 V4 Y5] */ crop->macro_y_off = 1; diff --git a/subprojects/gst-plugins-good/gst/videocrop/gstvideocrop.h b/subprojects/gst-plugins-good/gst/videocrop/gstvideocrop.h index 6a05fb2546..09d54f16aa 100644 --- a/subprojects/gst-plugins-good/gst/videocrop/gstvideocrop.h +++ b/subprojects/gst-plugins-good/gst/videocrop/gstvideocrop.h @@ -41,7 +41,7 @@ typedef enum /* RGB (+ variants), ARGB (+ variants), AYUV, GRAY */ VIDEO_CROP_PIXEL_FORMAT_PACKED_SIMPLE = 0, /* YVYU, YUY2, UYVY */ - VIDEO_CROP_PIXEL_FORMAT_PACKED_COMPLEX, + VIDEO_CROP_PIXEL_FORMAT_PACKED_YVYU, /* I420, A420, YV12, Y444, Y42B, Y41B, * I420_10BE, A420_10BE, Y444_10BE, A444_10BE, I422_10BE, A422_10BE, * I420_10LE, A420_10LE, Y444_10LE, A444_10LE, I422_10LE, A422_10LE,