From e96c3b81cadd0ba84d43b1f3a54980df3785d9a5 Mon Sep 17 00:00:00 2001 From: Vittorio Giovara Date: Tue, 29 Jul 2014 14:02:09 +0100 Subject: avutil: rename AV_PIX_FMT_Y400A to AV_PIX_FMT_YA8 The rationale is that you have a packed format in form and shortening greyscale to 'G' might make one thing about Greenscale instead. An alias pixel format and color space name are provided for compatibility. --- libswscale/input.c | 4 ++-- libswscale/swscale-test.c | 2 +- libswscale/swscale_internal.h | 4 ++-- libswscale/swscale_unscaled.c | 4 ++-- libswscale/utils.c | 2 +- libswscale/x86/swscale.c | 4 ++-- 6 files changed, 10 insertions(+), 10 deletions(-) (limited to 'libswscale') diff --git a/libswscale/input.c b/libswscale/input.c index c1cfd7cf7d..1ffdfe534b 100644 --- a/libswscale/input.c +++ b/libswscale/input.c @@ -989,7 +989,7 @@ av_cold void ff_sws_init_input_funcs(SwsContext *c) #endif case AV_PIX_FMT_YUYV422: case AV_PIX_FMT_YVYU422: - case AV_PIX_FMT_Y400A: + case AV_PIX_FMT_YA8: c->lumToYV12 = yuy2ToY_c; break; case AV_PIX_FMT_UYVY422: @@ -1085,7 +1085,7 @@ av_cold void ff_sws_init_input_funcs(SwsContext *c) case AV_PIX_FMT_ARGB: c->alpToYV12 = abgrToA_c; break; - case AV_PIX_FMT_Y400A: + case AV_PIX_FMT_YA8: c->alpToYV12 = uyvyToY_c; break; } diff --git a/libswscale/swscale-test.c b/libswscale/swscale-test.c index 12fa9edd50..7cf2dc06af 100644 --- a/libswscale/swscale-test.c +++ b/libswscale/swscale-test.c @@ -37,7 +37,7 @@ * Should be removed when a cleaner pixel format system exists. */ #define isGray(x) \ ((x) == AV_PIX_FMT_GRAY8 || \ - (x) == AV_PIX_FMT_Y400A || \ + (x) == AV_PIX_FMT_YA8 || \ (x) == AV_PIX_FMT_GRAY16BE || \ (x) == AV_PIX_FMT_GRAY16LE) #define hasChroma(x) \ diff --git a/libswscale/swscale_internal.h b/libswscale/swscale_internal.h index 7ecf222e7f..4aef9617dd 100644 --- a/libswscale/swscale_internal.h +++ b/libswscale/swscale_internal.h @@ -606,7 +606,7 @@ static av_always_inline int isRGB(enum AVPixelFormat pix_fmt) #else #define isGray(x) \ ((x) == AV_PIX_FMT_GRAY8 || \ - (x) == AV_PIX_FMT_Y400A || \ + (x) == AV_PIX_FMT_YA8 || \ (x) == AV_PIX_FMT_GRAY16BE || \ (x) == AV_PIX_FMT_GRAY16LE) #endif @@ -697,7 +697,7 @@ static av_always_inline int usePal(enum AVPixelFormat pix_fmt) const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(pix_fmt); av_assert0(desc); return ((desc->flags & AV_PIX_FMT_FLAG_PAL) || (desc->flags & AV_PIX_FMT_FLAG_PSEUDOPAL) || - pix_fmt == AV_PIX_FMT_Y400A); + pix_fmt == AV_PIX_FMT_YA8); } extern const uint64_t ff_dither4[2]; diff --git a/libswscale/swscale_unscaled.c b/libswscale/swscale_unscaled.c index a1ccc5ab76..21762a72ae 100644 --- a/libswscale/swscale_unscaled.c +++ b/libswscale/swscale_unscaled.c @@ -351,7 +351,7 @@ static int palToRgbWrapper(SwsContext *c, const uint8_t *src[], int srcStride[], uint8_t *dstPtr = dst[0] + dstStride[0] * srcSliceY; const uint8_t *srcPtr = src[0]; - if (srcFormat == AV_PIX_FMT_Y400A) { + if (srcFormat == AV_PIX_FMT_YA8) { switch (dstFormat) { case AV_PIX_FMT_RGB32 : conv = gray8aToPacked32; break; case AV_PIX_FMT_BGR32 : conv = gray8aToPacked32; break; @@ -1204,7 +1204,7 @@ int attribute_align_arg sws_scale(struct SwsContext *c, g = ((i >> 1) & 3) * 85; b = ( i & 1) * 255; } else if (c->srcFormat == AV_PIX_FMT_GRAY8 || - c->srcFormat == AV_PIX_FMT_Y400A) { + c->srcFormat == AV_PIX_FMT_YA8) { r = g = b = i; } else { assert(c->srcFormat == AV_PIX_FMT_BGR4_BYTE); diff --git a/libswscale/utils.c b/libswscale/utils.c index fa00668c8e..ae121f8529 100644 --- a/libswscale/utils.c +++ b/libswscale/utils.c @@ -154,7 +154,7 @@ static const FormatEntry format_entries[AV_PIX_FMT_NB] = { [AV_PIX_FMT_RGB444BE] = { 1, 1 }, [AV_PIX_FMT_BGR444LE] = { 1, 1 }, [AV_PIX_FMT_BGR444BE] = { 1, 1 }, - [AV_PIX_FMT_Y400A] = { 1, 0 }, + [AV_PIX_FMT_YA8] = { 1, 0 }, [AV_PIX_FMT_BGR48BE] = { 1, 1 }, [AV_PIX_FMT_BGR48LE] = { 1, 1 }, [AV_PIX_FMT_BGRA64BE] = { 0, 0, 1 }, diff --git a/libswscale/x86/swscale.c b/libswscale/x86/swscale.c index a2bce48339..f310a7593f 100644 --- a/libswscale/x86/swscale.c +++ b/libswscale/x86/swscale.c @@ -363,7 +363,7 @@ switch(c->dstBpc){ \ ASSIGN_VSCALE_FUNC(c->yuv2plane1, mmx, mmxext, cpu_flags & AV_CPU_FLAG_MMXEXT); switch (c->srcFormat) { - case AV_PIX_FMT_Y400A: + case AV_PIX_FMT_YA8: c->lumToYV12 = ff_yuyvToY_mmx; if (c->alpPixBuf) c->alpToYV12 = ff_uyvyToY_mmx; @@ -412,7 +412,7 @@ switch(c->dstBpc){ \ ASSIGN_VSCALE_FUNC(c->yuv2plane1, sse2, sse2, 1); switch (c->srcFormat) { - case AV_PIX_FMT_Y400A: + case AV_PIX_FMT_YA8: c->lumToYV12 = ff_yuyvToY_sse2; if (c->alpPixBuf) c->alpToYV12 = ff_uyvyToY_sse2; -- cgit v1.2.3