/*****************************************************************************
* transform.c : transform image module for vlc
*****************************************************************************
- * Copyright (C) 2000-2006 the VideoLAN team
+ * Copyright (C) 2000-2006 VLC authors and VideoLAN
* Copyright (C) 2010 Laurent Aimar
* Copyright (C) 2012 Rémi Denis-Courmont
*
* Authors: Samuel Hocevar <sam@zoy.org>
* Laurent Aimar <fenrir _AT_ videolan _DOT_ org>
*
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; either version 2.1 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
*
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/
/*****************************************************************************
set_subcategory(SUBCAT_VIDEO_VFILTER)
add_string(CFG_PREFIX "type", "90", TYPE_TEXT, TYPE_TEXT, false)
- change_string_list(type_list, type_list_text, 0)
+ change_string_list(type_list, type_list_text)
change_safe()
add_shortcut("transform")
}
typedef void (*convert_t)(int *, int *, int, int, int, int);
-#define PLANAR(f) \
-static void Plane8_##f(plane_t *restrict dst, const plane_t *restrict src) \
+#define PLANE(f,bits) \
+static void Plane##bits##_##f(plane_t *restrict dst, const plane_t *restrict src) \
{ \
- for (int y = 0; y < dst->i_visible_lines; y++) { \
- for (int x = 0; x < dst->i_visible_pitch; x++) { \
- int sx, sy; \
- (f)(&sx, &sy, dst->i_visible_pitch, dst->i_visible_lines, x, y); \
- dst->p_pixels[y * dst->i_pitch + x] = \
- src->p_pixels[sy * src->i_pitch + sx]; \
- } \
- } \
-} \
- \
-static void Plane16_##f(plane_t *restrict dst, const plane_t *restrict src) \
-{ \
- const uint16_t *src_pixels = (const uint16_t *)src->p_pixels; \
- uint16_t *restrict dst_pixels = (uint16_t *)dst->p_pixels; \
- unsigned src_width = src->i_pitch / 2; \
- unsigned dst_width = dst->i_pitch / 2; \
- unsigned dst_visible_width = dst->i_visible_pitch / 2; \
+ const uint##bits##_t *src_pixels = (const void *)src->p_pixels; \
+ uint##bits##_t *restrict dst_pixels = (void *)dst->p_pixels; \
+ const unsigned src_width = src->i_pitch / sizeof (*src_pixels); \
+ const unsigned dst_width = dst->i_pitch / sizeof (*dst_pixels); \
+ const unsigned dst_visible_width = dst->i_visible_pitch / sizeof (*dst_pixels); \
\
for (int y = 0; y < dst->i_visible_lines; y++) { \
for (unsigned x = 0; x < dst_visible_width; x++) { \
src_pixels[sy * src_width + sx]; \
} \
} \
-} \
- \
-static void Plane32_##f(plane_t *restrict dst, const plane_t *restrict src) \
-{ \
- const uint32_t *src_pixels = (const uint32_t *)src->p_pixels; \
- uint32_t *restrict dst_pixels = (uint32_t *)dst->p_pixels; \
- unsigned src_width = src->i_pitch / 4; \
- unsigned dst_width = dst->i_pitch / 4; \
- unsigned dst_visible_width = dst->i_visible_pitch / 4; \
- \
- for (int y = 0; y < dst->i_visible_lines; y++) { \
- for (unsigned x = 0; x < dst_visible_width; x++) { \
- int sx, sy; \
- (f)(&sx, &sy, dst_visible_width, dst->i_visible_lines, x, y); \
- dst_pixels[y * dst_width + x] = \
- src_pixels[sy * src_width + sx]; \
- } \
- } \
-} \
- \
-static void YUYV_##f(plane_t *restrict dst, const plane_t *restrict src) \
+}
+
+static void Plane_VFlip(plane_t *restrict dst, const plane_t *restrict src)
+{
+ const uint8_t *src_pixels = src->p_pixels;
+ uint8_t *restrict dst_pixels = dst->p_pixels;
+
+ dst_pixels += dst->i_pitch * dst->i_visible_lines;
+ for (int y = 0; y < dst->i_visible_lines; y++) {
+ dst_pixels -= dst->i_pitch;
+ memcpy(dst_pixels, src_pixels, dst->i_visible_pitch);
+ src_pixels += src->i_pitch;
+ }
+}
+
+#define YUY2(f) \
+static void PlaneYUY2_##f(plane_t *restrict dst, const plane_t *restrict src) \
{ \
unsigned dst_visible_width = dst->i_visible_pitch / 2; \
\
} \
}
-PLANAR(HFlip)
-PLANAR(VFlip)
-PLANAR(Transpose)
-PLANAR(AntiTranspose)
-PLANAR(R90)
-PLANAR(R180)
-PLANAR(R270)
+#define PLANES(f) \
+PLANE(f,8) PLANE(f,16) PLANE(f,32)
+
+PLANES(HFlip)
+#define Plane8_VFlip Plane_VFlip
+#define Plane16_VFlip Plane_VFlip
+#define Plane32_VFlip Plane_VFlip
+PLANES(Transpose)
+PLANES(AntiTranspose)
+PLANES(R90)
+PLANES(R180)
+PLANES(R270)
+
+#define PlaneYUY2_HFlip Plane32_HFlip
+#define PlaneYUY2_VFlip Plane_VFlip
+#define PlaneYUY2_R180 Plane32_R180
+YUY2(Transpose)
+YUY2(AntiTranspose)
+YUY2(R90)
+YUY2(R270)
typedef struct {
char name[16];
- bool is_rotated;
convert_t convert;
convert_t iconvert;
void (*plane8) (plane_t *dst, const plane_t *src);
void (*yuyv)(plane_t *dst, const plane_t *src);
} transform_description_t;
-#define DESC(str, rotated, f, invf) \
- { str, rotated, f, invf, Plane8_##f, Plane16_##f, Plane32_##f, YUYV_##f }
+#define DESC(str, f, invf) \
+ { str, f, invf, Plane8_##f, Plane16_##f, Plane32_##f, PlaneYUY2_##f }
static const transform_description_t descriptions[] = {
- DESC("90", true, R90, R270),
- DESC("180", false, R180, R180),
- DESC("270", true, R270, R90),
- DESC("hflip", false, HFlip, HFlip),
- DESC("vflip", false, VFlip, VFlip),
- DESC("transpose", true, Transpose, Transpose),
- DESC("antitranspose", true, AntiTranspose, AntiTranspose),
+ DESC("90", R90, R270),
+ DESC("180", R180, R180),
+ DESC("270", R270, R90),
+ DESC("hflip", HFlip, HFlip),
+ DESC("vflip", VFlip, VFlip),
+ DESC("transpose", Transpose, Transpose),
+ DESC("antitranspose", AntiTranspose, AntiTranspose),
};
+static bool dsc_is_rotated(const transform_description_t *dsc)
+{
+ return dsc->plane32 != dsc->yuyv;
+}
+
static const size_t n_transforms =
sizeof (descriptions) / sizeof (descriptions[0]);
}
sys->convert = dsc->convert;
- if (dsc->is_rotated) {
+ if (dsc_is_rotated(dsc)) {
for (unsigned i = 0; i < chroma->plane_count; i++) {
if (chroma->p[i].w.num * chroma->p[i].h.den
!= chroma->p[i].h.num * chroma->p[i].w.den) {
/* Deal with weird packed formats */
switch (src->i_chroma) {
- case VLC_CODEC_YUYV:
- case VLC_CODEC_YVYU:
- sys->plane = dsc->is_rotated ? dsc->yuyv : dsc->plane32;
- break;
case VLC_CODEC_UYVY:
case VLC_CODEC_VYUY:
- if (dsc->is_rotated) {
+ if (dsc_is_rotated(dsc)) {
msg_Err(filter, "Format rotation not possible (chroma %4.4s)",
(char *)&src->i_chroma);
goto error;
}
- sys->plane = dsc->plane32; /* 32-bits, not 16-bits! */
+ /* fallthrough */
+ case VLC_CODEC_YUYV:
+ case VLC_CODEC_YVYU:
+ sys->plane = dsc->yuyv; /* 32-bits, not 16-bits! */
break;
case VLC_CODEC_NV12:
case VLC_CODEC_NV21:
projects / vlc / blobdiff